Cleanups for eel

[Kjartan Maraas <kmaraas broadpark no>]

Hi.

This patch cleans up some dead code in various parts of eel. It also
adds a forgotten bump of the libgnome-menu dependency which should have
been commited for 2.14.1. See
here:http://bugzilla.gnome.org/show_bug.cgi?id=338438

Cheers
Kjartan

? warnings
? warnings-icc
? po/stamp-it
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/eel/ChangeLog,v
retrieving revision 1.790
diff -u -p -r1.790 ChangeLog
--- ChangeLog	25 Jul 2006 01:44:03 -0000	1.790
+++ ChangeLog	7 Aug 2006 11:19:31 -0000
@@ -1,3 +1,14 @@
+2006-08-07  Kjartan Maraas  <kmaraas gnome org>
+
+	* configure.in: Really depend on a newer libgnome-menu.
+	* eel/eel-string-list.c: (eel_self_check_string_list):
+	* test/test-eel-gtk-style.c: (style_get_color), (style_get_gc),
+	(color_box_expose_event), (gc_box_expose_event),
+	(pixmap_box_expose_event):
+	* test/test-eel-image-table.c: (image_table_child_enter_callback),
+	(image_table_child_leave_callback):
+	* test/test-eel-pixbuf-tile.c: Remove and #if 0 out some dead code.
+
 2006-07-25  Martin Wehner  <martin wehner gmail com>
 
 	* configure.in:
@@ -2737,7 +2748,7 @@ Wed Dec  4 12:50:35 2002  HideToshi Taji
 
 	* configure.in:
 	Removed -Wcast-align. This broke the build for Alpha on RH 7.1,
-	even in header files! And it's not that usefull.
+	even in header files! And it's not that useful.
 	See bug #79860.
 
 2002-04-27  Murray Cumming  <murrayc usa net>
Index: configure.in
===================================================================
RCS file: /cvs/gnome/eel/configure.in,v
retrieving revision 1.235
diff -u -p -r1.235 configure.in
--- configure.in	25 Jul 2006 01:44:03 -0000	1.235
+++ configure.in	7 Aug 2006 11:19:31 -0000
@@ -14,7 +14,7 @@ XML_REQUIRED=2.4.7
 GAIL_REQUIRED=0.16
 LIBGLADE_REQUIRED=2.0.0
 LIBGNOME_DESKTOP_REQUIRED=2.1.4
-LIBGNOME_MENU_REQUIRED=2.11.1
+LIBGNOME_MENU_REQUIRED=2.13.5
 
 AC_SUBST(ART_REQUIRED)
 AC_SUBST(GCONF_REQUIRED)
Index: eel/eel-string-list.c
===================================================================
RCS file: /cvs/gnome/eel/eel/eel-string-list.c,v
retrieving revision 1.19
diff -u -p -r1.19 eel-string-list.c
--- eel/eel-string-list.c	24 Jan 2005 11:23:04 -0000	1.19
+++ eel/eel-string-list.c	7 Aug 2006 11:19:33 -0000
@@ -1111,8 +1111,6 @@ eel_self_check_string_list (void)
 	 */
 
 	{
-		EelStringList *fruits;
-
 		fruits = eel_string_list_new (TRUE);
 		
 		eel_string_list_insert (fruits, "orange");
Index: test/test-eel-gtk-style.c
===================================================================
RCS file: /cvs/gnome/eel/test/test-eel-gtk-style.c,v
retrieving revision 1.11
diff -u -p -r1.11 test-eel-gtk-style.c
--- test/test-eel-gtk-style.c	22 Feb 2002 18:48:37 -0000	1.11
+++ test/test-eel-gtk-style.c	7 Aug 2006 11:19:33 -0000
@@ -51,7 +51,6 @@ style_get_color (const GtkStyle *style,
 	empty.pixel = 0;
 
 	g_return_val_if_fail (style != NULL, empty);
-	g_return_val_if_fail (n >= 0, empty);
 	g_return_val_if_fail (n < NUM_COLORS, empty);
 	g_return_val_if_fail (state >= GTK_STATE_NORMAL, empty);
 	g_return_val_if_fail (state <= GTK_STATE_INSENSITIVE, empty);
@@ -66,7 +65,6 @@ style_get_color (const GtkStyle *style,
 	case 6: return style->base[state];
 	}
 	g_return_val_if_reached (empty);
-	return empty;
 }
 
 static GdkGC *
@@ -75,7 +73,6 @@ style_get_gc (const GtkStyle *style,
 	      GtkStateType state)
 {
 	g_return_val_if_fail (style != NULL, NULL);
-	g_return_val_if_fail (n >= 0, NULL);
 	g_return_val_if_fail (n < NUM_COLORS, NULL);
 	g_return_val_if_fail (state >= GTK_STATE_NORMAL, NULL);
 	g_return_val_if_fail (state <= GTK_STATE_INSENSITIVE, NULL);
@@ -90,7 +87,6 @@ style_get_gc (const GtkStyle *style,
 	case 6: return style->base_gc[state];
 	}
 	g_return_val_if_reached (NULL);
-	return NULL;
 }
 
 static GdkPixmap *
@@ -111,7 +107,6 @@ color_box_expose_event (GtkWidget *widge
 {
 	guint col;
 	guint row;
-	GtkWidget *child;
 	ArtIRect dirty_area;
 	GdkColor color;
 	GdkGC *gc;
@@ -122,8 +117,6 @@ color_box_expose_event (GtkWidget *widge
 	col = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (widget), "col"));
 	row = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (widget), "row"));
 
-	child = GTK_BIN (widget)->child;
-
 	color = style_get_color (widget->style, row, col);
 
 	gc = gdk_gc_new (widget->window);
@@ -152,7 +145,6 @@ gc_box_expose_event (GtkWidget *widget,
 {
 	guint col;
 	guint row;
-	GtkWidget *child;
 	ArtIRect dirty_area;
 	GdkGC *gc;
 
@@ -162,8 +154,6 @@ gc_box_expose_event (GtkWidget *widget,
 	col = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (widget), "col"));
 	row = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (widget), "row"));
 
-	child = GTK_BIN (widget)->child;
-
 	gc = style_get_gc (widget->style, row, col);
 	g_return_val_if_fail (gc != NULL, FALSE);
 
@@ -184,8 +174,6 @@ pixmap_box_expose_event (GtkWidget *widg
 			 gpointer callback_data)
 {
 	guint col;
-	guint row;
-	GtkWidget *child;
 	ArtIRect dirty_area;
 	GdkPixmap *pixmap;
 	GdkPixbuf *pixbuf;
@@ -197,9 +185,6 @@ pixmap_box_expose_event (GtkWidget *widg
  	g_return_val_if_fail (event != NULL, FALSE);
 
 	col = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (widget), "col"));
-	row = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (widget), "row"));
-
-	child = GTK_BIN (widget)->child;
 
 	pixmap = style_get_pixmap (widget->style, col);
 
Index: test/test-eel-image-table.c
===================================================================
RCS file: /cvs/gnome/eel/test/test-eel-image-table.c,v
retrieving revision 1.12
diff -u -p -r1.12 test-eel-image-table.c
--- test/test-eel-image-table.c	2 Mar 2004 14:31:26 -0000	1.12
+++ test/test-eel-image-table.c	7 Aug 2006 11:19:33 -0000
@@ -82,6 +82,7 @@ image_table_child_enter_callback (GtkWid
 			       GtkWidget *item,
 			       gpointer callback_data)
 {
+#if 0
 	char *text;
 
 	g_return_if_fail (EEL_IS_IMAGE_TABLE (image_table));
@@ -89,7 +90,8 @@ image_table_child_enter_callback (GtkWid
 
 	text = eel_labeled_image_get_text (EEL_LABELED_IMAGE (item));
 
-/*	g_print ("%s(%s)\n", G_GNUC_FUNCTION, text); */
+	g_print ("%s(%s)\n", G_GNUC_FUNCTION, text);
+#endif
 }
 
 static void
@@ -97,6 +99,7 @@ image_table_child_leave_callback (GtkWid
 			       GtkWidget *item,
 			       gpointer callback_data)
 {
+#if 0
 	char *text;
 
 	g_return_if_fail (EEL_IS_IMAGE_TABLE (image_table));
@@ -104,7 +107,8 @@ image_table_child_leave_callback (GtkWid
 
 	text = eel_labeled_image_get_text (EEL_LABELED_IMAGE (item));
 
-/*	g_print ("%s(%s)\n", G_GNUC_FUNCTION, text); */
+	g_print ("%s(%s)\n", G_GNUC_FUNCTION, text);
+#endif
 }
 
 static void
Index: test/test-eel-pixbuf-tile.c
===================================================================
RCS file: /cvs/gnome/eel/test/test-eel-pixbuf-tile.c,v
retrieving revision 1.10
diff -u -p -r1.10 test-eel-pixbuf-tile.c
--- test/test-eel-pixbuf-tile.c	10 Jul 2002 08:20:12 -0000	1.10
+++ test/test-eel-pixbuf-tile.c	7 Aug 2006 11:19:33 -0000
@@ -2,7 +2,6 @@
 
 #include <eel/eel-debug-drawing.h>
 
-static const char pixbuf_name[] = DATADIR "/pixmaps/gnome-globe.png";
 static const char tile_name[] = DATADIR "/nautilus/patterns/camouflage.png";
 
 static GdkPixbuf *global_buffer = NULL;