Fix warnings. Patch by Kjartan Maraas.

2005-12-12  Vincent Untz  <vuntz@gnome.org>

	Fix warnings. Patch by Kjartan Maraas.

	* gnome-about/gnome-about.c: (display_contributors): remove
	contributor_rect
	(display_introduction_message): remove intro_rect
	* libgnome-desktop/gnome-desktop-item.c: (do_percent_subst): remove
	useless break
	* libgnome-desktop/test-ditem.c: (test_ditem): fix type warning
	* libgnome-desktop/test-hint.c: (main): remove unused code

5 files changed, 15 insertions, 28 deletions

diff --git a/ChangeLog b/ChangeLog
index 51e2a5b1..720de0a8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2005-12-12  Vincent Untz  <vuntz@gnome.org>
+
+	Fix warnings. Patch by Kjartan Maraas.
+
+	* gnome-about/gnome-about.c: (display_contributors): remove
+	contributor_rect
+	(display_introduction_message): remove intro_rect
+	* libgnome-desktop/gnome-desktop-item.c: (do_percent_subst): remove
+	useless break
+	* libgnome-desktop/test-ditem.c: (test_ditem): fix type warning
+	* libgnome-desktop/test-hint.c: (main): remove unused code
+
 2005-11-14  Vincent Untz  <vuntz@gnome.org>
 
 	* configure.in: post-release bump to 2.13.3
diff --git a/gnome-about/gnome-about.c b/gnome-about/gnome-about.c
index e431fe26..10e4d610 100644
--- a/gnome-about/gnome-about.c
+++ b/gnome-about/gnome-about.c
@@ -157,7 +157,6 @@ display_contributors (gpointer data)
 	AnimationData *ani_data;
 
 	static GnomeCanvasItem *contributor = NULL;
-	static GnomeCanvasItem *contributor_rect = NULL;
 	static GnomeCanvasItem *contributor_text = NULL;
 
 	if (contrib_i >= G_N_ELEMENTS (contributors))
@@ -171,12 +170,6 @@ display_contributors (gpointer data)
 					       gnome_canvas_group_get_type (),
 					       NULL);
 
-		contributor_rect =
-			gnome_canvas_item_new (GNOME_CANVAS_GROUP (contributor),
-					       gnome_canvas_rect_get_type (),
-					       "fill_color", "White",
-					       NULL);
-
 		text = g_strdup_printf ("<b>%s</b>", 
 					contributors[contrib_order[contrib_i]]);
 		contributor_text =
@@ -295,7 +288,6 @@ display_introduction_message (gpointer data)
 	AnimationData *ani_data;
 
 	static GnomeCanvasItem *intro = NULL;
-	static GnomeCanvasItem *intro_rect = NULL;
 	static GnomeCanvasItem *intro_text = NULL;
 	static gint intro_i = 0;
 
@@ -320,16 +312,6 @@ display_introduction_message (gpointer data)
 					       gnome_canvas_group_get_type (),
 					       NULL);
 
-		intro_rect =
-			gnome_canvas_item_new (GNOME_CANVAS_GROUP (intro),
-					       gnome_canvas_rect_get_type (),
-					       "fill_color", "White",
-					       "x1", -4.0,
-					       "y1", -4.0,
-					       "x2", 304.0,
-					       "y2", 84.0,
-					       NULL);
-
 		intro_text =
 			gnome_canvas_item_new (GNOME_CANVAS_GROUP (intro),
 					       gnome_canvas_rich_text_get_type (),
diff --git a/libgnome-desktop/gnome-desktop-item.c b/libgnome-desktop/gnome-desktop-item.c
index 99e75575..3e8278b9 100644
--- a/libgnome-desktop/gnome-desktop-item.c
+++ b/libgnome-desktop/gnome-desktop-item.c
@@ -117,7 +117,7 @@ typedef struct {
 	gboolean buf_needs_free;
 	gboolean past_first_read;
 	gboolean eof;
-	gsize size;
+	guint64 size;
 	gsize pos;
 } ReadBuf;
 
@@ -1416,7 +1416,6 @@ do_percent_subst (const GnomeDesktopItem  *item,
 		if (g_ascii_isdigit (arg [1])) 
 			g_string_append_c (str, '%');
 		return FALSE;
-		break;
 	}
 
 	return TRUE;
diff --git a/libgnome-desktop/test-ditem.c b/libgnome-desktop/test-ditem.c
index 971608f9..1d8a4e10 100644
--- a/libgnome-desktop/test-ditem.c
+++ b/libgnome-desktop/test-ditem.c
@@ -33,7 +33,7 @@ test_ditem (const char *file)
 	g_print ("LOCATION: |%s|\n", text);
 
 	type = gnome_desktop_item_get_entry_type (ditem);
-	g_print ("TYPE: |%d|\n", type);
+	g_print ("TYPE: |%u|\n", type);
 
 	text = gnome_desktop_item_get_string
 		(ditem, GNOME_DESKTOP_ITEM_TYPE);
diff --git a/libgnome-desktop/test-hint.c b/libgnome-desktop/test-hint.c
index 4e86fa16..bfabdcf3 100644
--- a/libgnome-desktop/test-hint.c
+++ b/libgnome-desktop/test-hint.c
@@ -9,12 +9,10 @@
 
 int main (int argc, char **argv) {
   GtkWidget *gnome_hint;
-  GnomeProgram *gnome_hint_program;
-  GConfClient* client;
 
   gchar *hintfile, *backimg, *logoimg;
 
-  gnome_hint_program = gnome_program_init("gnome-hint","0.1",LIBGNOMEUI_MODULE,
+  gnome_program_init("gnome-hint","0.1",LIBGNOMEUI_MODULE,
                                    argc, argv, NULL);
 
   if (argc !=4){
@@ -26,10 +24,6 @@ int main (int argc, char **argv) {
   backimg = g_strdup(argv[2]);
   logoimg = g_strdup(argv[3]);
 
-  client = gconf_client_get_default();
-/*  gconf_client_add_dir(client,"/apps/test-hint/",
-	GCONF_CLIENT_PRELOAD_NONE,NULL); */
-
   gnome_hint = gnome_hint_new (hintfile, "GNOME Test Hints",
 				backimg, logoimg, "/apps/test-hint/startup");