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

From: subversion at stage.maemo.org subversion at stage.maemo.org
Date: Wed Jan 24 16:00:53 EET 2007 
Author: tko
Date: 2007-01-24 16:00:50 +0200 (Wed, 24 Jan 2007)
New Revision: 9300

Modified:
   projects/haf/trunk/sapwood/ChangeLog
   projects/haf/trunk/sapwood/src/sapwood-draw.c
Log:
remove unused allow_setbg parameter

2007-01-24  Tommi Komulainen  <tommi.komulainen at nokia.com>

	* src/sapwood-draw.c (draw_simple_image,draw_gap_image): remove unused
	allow_setbg parameter
	(draw_shadow,draw_arrow,draw_arrow,draw_arrow,draw_diamond,draw_box,
	draw_flat_box,draw_check,draw_option,draw_tab,draw_extension,draw_focus,
	draw_slider,draw_handle): update callers


Modified: projects/haf/trunk/sapwood/ChangeLog
===================================================================
--- projects/haf/trunk/sapwood/ChangeLog	2007-01-24 14:00:46 UTC (rev 9299)
+++ projects/haf/trunk/sapwood/ChangeLog	2007-01-24 14:00:50 UTC (rev 9300)
@@ -1,5 +1,13 @@
 2007-01-24  Tommi Komulainen  <tommi.komulainen at nokia.com>
 
+	* src/sapwood-draw.c (draw_simple_image,draw_gap_image): remove unused
+	allow_setbg parameter
+	(draw_shadow,draw_arrow,draw_arrow,draw_arrow,draw_diamond,draw_box,
+	draw_flat_box,draw_check,draw_option,draw_tab,draw_extension,draw_focus,
+	draw_slider,draw_handle): update callers
+
+2007-01-24  Tommi Komulainen  <tommi.komulainen at nokia.com>
+
 	* src/sapwood-draw.c (draw_simple_image, draw_gap_image): replace
 	deprecated gdk_window_get_size() call with gdk_drawable_get_size()
 

Modified: projects/haf/trunk/sapwood/src/sapwood-draw.c
===================================================================
--- projects/haf/trunk/sapwood/src/sapwood-draw.c	2007-01-24 14:00:46 UTC (rev 9299)
+++ projects/haf/trunk/sapwood/src/sapwood-draw.c	2007-01-24 14:00:50 UTC (rev 9300)
@@ -109,21 +109,15 @@
 		  GtkWidget      *widget,
 		  ThemeMatchData *match_data,
 		  gboolean        draw_center,
-		  gboolean        allow_setbg,
 		  gint            x,
 		  gint            y,
 		  gint            width,
 		  gint            height)
 {
   ThemeImage *image;
-  gboolean setbg = FALSE;
   
   if ((width == -1) && (height == -1))
-    {
-      gdk_drawable_get_size (window, &width, &height);
-      if (allow_setbg)
-      	setbg = TRUE;
-    }
+    gdk_drawable_get_size (window, &width, &height);
   else if (width == -1)
     gdk_drawable_get_size (window, &width, NULL);
   else if (height == -1)
@@ -194,13 +188,9 @@
 	       gint            gap_width)
 {
   ThemeImage *image;
-  gboolean setbg = FALSE;
   
   if ((width == -1) && (height == -1))
-    {
-      gdk_drawable_get_size (window, &width, &height);
-      setbg = TRUE;
-    }
+    gdk_drawable_get_size (window, &width, &height);
   else if (width == -1)
     gdk_drawable_get_size (window, &width, NULL);
   else if (height == -1)
@@ -429,7 +419,7 @@
   match_data.shadow = shadow;
   match_data.state = state;
 
-  if (!draw_simple_image (style, window, area, widget, &match_data, FALSE, FALSE,
+  if (!draw_simple_image (style, window, area, widget, &match_data, FALSE,
 			  x, y, width, height))
     parent_class->draw_shadow (style, window, state, shadow, area, widget, detail,
 			       x, y, width, height);
@@ -529,7 +519,7 @@
       match_data.state = state;
       match_data.arrow_direction = arrow_direction;
       
-      if (draw_simple_image (style, window, area, widget, &match_data, TRUE, TRUE,
+      if (draw_simple_image (style, window, area, widget, &match_data, TRUE,
 			     box_x, box_y, box_width, box_height))
 	{
 	  /* The theme included stepper images, we're done */
@@ -544,7 +534,7 @@
       match_data.shadow = shadow;
       match_data.state = state;
       
-      if (!draw_simple_image (style, window, area, widget, &match_data, TRUE, TRUE,
+      if (!draw_simple_image (style, window, area, widget, &match_data, TRUE,
 			      box_x, box_y, box_width, box_height))
 	parent_class->draw_box (style, window, state, shadow, area, widget, detail,
 				box_x, box_y, box_width, box_height);
@@ -560,7 +550,7 @@
   match_data.state = state;
   match_data.arrow_direction = arrow_direction;
   
-  if (!draw_simple_image (style, window, area, widget, &match_data, TRUE, TRUE,
+  if (!draw_simple_image (style, window, area, widget, &match_data, TRUE,
 			  x, y, width, height))
     parent_class->draw_arrow (style, window, state, shadow, area, widget, detail,
 			      arrow_direction, fill, x, y, width, height);
@@ -590,7 +580,7 @@
   match_data.shadow = shadow;
   match_data.state = state;
   
-  if (!draw_simple_image (style, window, area, widget, &match_data, TRUE, TRUE,
+  if (!draw_simple_image (style, window, area, widget, &match_data, TRUE,
 			  x, y, width, height))
     parent_class->draw_diamond (style, window, state, shadow, area, widget, detail,
 				x, y, width, height);
@@ -665,7 +655,7 @@
   match_data.shadow = shadow;
   match_data.state = state;
 
-  if (!draw_simple_image (style, window, area, widget, &match_data, TRUE, TRUE,
+  if (!draw_simple_image (style, window, area, widget, &match_data, TRUE,
 			  x, y, width, height)) {
     parent_class->draw_box (style, window, state, shadow, area, widget, detail,
 			    x, y, width, height);
@@ -696,7 +686,7 @@
   match_data.shadow = shadow;
   match_data.state = state;
 
-  if (!draw_simple_image (style, window, area, widget, &match_data, TRUE, TRUE,
+  if (!draw_simple_image (style, window, area, widget, &match_data, TRUE,
 			  x, y, width, height))
     parent_class->draw_flat_box (style, window, state, shadow, area, widget, detail,
 				 x, y, width, height);
@@ -726,7 +716,7 @@
   match_data.shadow = shadow;
   match_data.state = state;
   
-  if (!draw_simple_image (style, window, area, widget, &match_data, TRUE, TRUE,
+  if (!draw_simple_image (style, window, area, widget, &match_data, TRUE,
 			  x, y, width, height))
     parent_class->draw_check (style, window, state, shadow, area, widget, detail,
 			      x, y, width, height);
@@ -756,7 +746,7 @@
   match_data.shadow = shadow;
   match_data.state = state;
   
-  if (!draw_simple_image (style, window, area, widget, &match_data, TRUE, TRUE,
+  if (!draw_simple_image (style, window, area, widget, &match_data, TRUE,
 			  x, y, width, height))
     parent_class->draw_option (style, window, state, shadow, area, widget, detail,
 			       x, y, width, height);
@@ -786,7 +776,7 @@
   match_data.shadow = shadow;
   match_data.state = state;
   
-  if (!draw_simple_image (style, window, area, widget, &match_data, TRUE, TRUE,
+  if (!draw_simple_image (style, window, area, widget, &match_data, TRUE,
 			  x, y, width, height))
     parent_class->draw_tab (style, window, state, shadow, area, widget, detail,
 			    x, y, width, height);
@@ -884,7 +874,7 @@
   match_data.state = state;
   match_data.gap_side = gap_side;
 
-  if (!draw_simple_image (style, window, area, widget, &match_data, TRUE, TRUE,
+  if (!draw_simple_image (style, window, area, widget, &match_data, TRUE,
 			  x, y, width, height))
     parent_class->draw_extension (style, window, state, shadow, area, widget, detail,
 				  x, y, width, height, gap_side);
@@ -912,7 +902,7 @@
   match_data.flags = THEME_MATCH_STATE;
   match_data.state = state;
   
-  if (!draw_simple_image (style, window, area, widget, &match_data, TRUE, FALSE,
+  if (!draw_simple_image (style, window, area, widget, &match_data, TRUE,
 			  x, y, width, height))
     parent_class->draw_focus (style, window, state, area, widget, detail,
 			      x, y, width, height);
@@ -946,7 +936,7 @@
   match_data.state = state;
   match_data.orientation = orientation;
 
-  if (!draw_simple_image (style, window, area, widget, &match_data, TRUE, TRUE,
+  if (!draw_simple_image (style, window, area, widget, &match_data, TRUE,
 			  x, y, width, height))
     parent_class->draw_slider (style, window, state, shadow, area, widget, detail,
 			       x, y, width, height, orientation);
@@ -981,7 +971,7 @@
   match_data.state = state;
   match_data.orientation = orientation;
 
-  if (!draw_simple_image (style, window, area, widget, &match_data, TRUE, TRUE,
+  if (!draw_simple_image (style, window, area, widget, &match_data, TRUE,
 			  x, y, width, height))
     parent_class->draw_handle (style, window, state, shadow, area, widget, detail,
 			       x, y, width, height, orientation);
More information about the maemo-commits mailing list