[maemo-commits] [maemo-commits] r13351 - in projects/haf/trunk/sapwood: . src

[From: subversion at stage.maemo.org]

Author: tko
Date: 2007-08-22 17:59:41 +0300 (Wed, 22 Aug 2007)
New Revision: 13351

Modified:
   projects/haf/trunk/sapwood/ChangeLog
   projects/haf/trunk/sapwood/src/sapwood-draw.c
   projects/haf/trunk/sapwood/src/theme-pixbuf.h
Log:
Ignore arrows of type none

2007-08-22  Tommi Komulainen  <tommi.komulainen at nokia.com>

	* src/sapwood-draw.c (draw_arrow): Ignore arrows of type none. (Patch
	from Xan, added #ifdef guard) (NB#61844)
	* src/theme-pixbuf.h (ThemeMatchData): Replace GtkArrowType with
	'guint : 2' to silence compiler warnings. (GtkArrowType was extended
	with 'NONE' which doesn't make sense in rc files.)


Modified: projects/haf/trunk/sapwood/ChangeLog
===================================================================
--- projects/haf/trunk/sapwood/ChangeLog	2007-08-22 14:59:37 UTC (rev 13350)
+++ projects/haf/trunk/sapwood/ChangeLog	2007-08-22 14:59:41 UTC (rev 13351)
@@ -1,5 +1,13 @@
 2007-08-22  Tommi Komulainen  <tommi.komulainen at nokia.com>
 
+	* src/sapwood-draw.c (draw_arrow): Ignore arrows of type none. (Patch
+	from Xan, added #ifdef guard) (NB#61844)
+	* src/theme-pixbuf.h (ThemeMatchData): Replace GtkArrowType with
+	'guint : 2' to silence compiler warnings. (GtkArrowType was extended
+	with 'NONE' which doesn't make sense in rc files.)
+
+2007-08-22  Tommi Komulainen  <tommi.komulainen at nokia.com>
+
 	* HACKING
 	* src/sapwood-proto.h (PixbufOpenRequest)
 	* src/theme-pixbuf.h (ThemePixbuf): increase the size of the border

Modified: projects/haf/trunk/sapwood/src/sapwood-draw.c
===================================================================
--- projects/haf/trunk/sapwood/src/sapwood-draw.c	2007-08-22 14:59:37 UTC (rev 13350)
+++ projects/haf/trunk/sapwood/src/sapwood-draw.c	2007-08-22 14:59:41 UTC (rev 13351)
@@ -676,6 +676,10 @@
 				box_x, box_y, box_width, box_height);
     }
 
+#if GTK_CHECK_VERSION(2,9,2)
+  if (arrow_direction == GTK_ARROW_NONE)
+    return;
+#endif
 
   match_data.function = TOKEN_D_ARROW;
   match_data.detail = (gchar *)detail;

Modified: projects/haf/trunk/sapwood/src/theme-pixbuf.h
===================================================================
--- projects/haf/trunk/sapwood/src/theme-pixbuf.h	2007-08-22 14:59:37 UTC (rev 13350)
+++ projects/haf/trunk/sapwood/src/theme-pixbuf.h	2007-08-22 14:59:41 UTC (rev 13351)
@@ -157,7 +157,7 @@
   GtkStateType    state           : 3;
   GtkShadowType   shadow          : 3;
   GtkPositionType gap_side        : 2;
-  GtkArrowType    arrow_direction : 2;
+  guint           arrow_direction : 2;	/* GtkArrowType, but without NONE */
   GtkOrientation  orientation     : 1;
 };