[evolution-patches] Warning fixes

[David Malcolm <dmalcolm redhat com>]

Two patches should be attached for what I believe are trivial warning
fixes; OK to commit?

Dave

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/mail/ChangeLog,v
retrieving revision 1.3293
diff -u -p -r1.3293 ChangeLog
--- ChangeLog	6 May 2004 20:24:33 -0000	1.3293
+++ ChangeLog	6 May 2004 23:54:26 -0000
@@ -1,3 +1,7 @@
+2004-05-06  David Malcolm  <dmalcolm redhat com>
+
+	* em-subscribe-editor.c (sub_queue_fill_level): Fixed warning
+
 2004-05-06  Jeffrey Stedfast  <fejj ximian com>
 
 	* mail-component.c (folder_selected_cb): Check that the folder is
Index: em-subscribe-editor.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/em-subscribe-editor.c,v
retrieving revision 1.11
diff -u -p -r1.11 em-subscribe-editor.c
--- em-subscribe-editor.c	31 Mar 2004 17:00:24 -0000	1.11
+++ em-subscribe-editor.c	6 May 2004 23:54:26 -0000
@@ -124,7 +124,7 @@ struct _EMSubscribeNode {
 };
 
 static void sub_editor_busy(EMSubscribeEditor *se, int dir);
-static int sub_queue_fill_level(EMSubscribe *sub, EMSubscribeNode *node);
+static void sub_queue_fill_level(EMSubscribe *sub, EMSubscribeNode *node);
 static void sub_selection_changed(GtkTreeSelection *selection, EMSubscribe *sub);
 
 static void
@@ -394,11 +394,10 @@ static struct _mail_msg_op sub_folderinf
 	sub_folderinfo_free,
 };
 
-static int
+static void
 sub_queue_fill_level(EMSubscribe *sub, EMSubscribeNode *node)
 {
 	struct _emse_folderinfo_msg *m;
-	int id;
 
 	d(printf("Starting get folderinfo of '%s'\n", node?node->info->full_name:"<root>"));
 
@@ -412,7 +411,6 @@ sub_queue_fill_level(EMSubscribe *sub, E
 	sub_editor_busy(sub->editor, 1);
 
 	e_thread_put (mail_thread_new, (EMsg *)m);
-	return id;
 }
 
 /* ********************************************************************** */

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/shell/ChangeLog,v
retrieving revision 1.1428
diff -u -p -r1.1428 ChangeLog
--- ChangeLog	5 May 2004 15:36:37 -0000	1.1428
+++ ChangeLog	6 May 2004 23:47:41 -0000
@@ -1,3 +1,7 @@
+2004-05-06  David Malcolm  <dmalcolm redhat com>
+
+	* e-shell-offline-handler.c (cancel_offline): Fix warning
+
 2004-05-05  Dan Winship  <danw ximian com>
 
 	* e-sidebar.c (layout_buttons): Change the algorithm so that if
Index: e-shell-offline-handler.c
===================================================================
RCS file: /cvs/gnome/evolution/shell/e-shell-offline-handler.c,v
retrieving revision 1.37
diff -u -p -r1.37 e-shell-offline-handler.c
--- e-shell-offline-handler.c	31 Mar 2004 17:05:52 -0000	1.37
+++ e-shell-offline-handler.c	6 May 2004 23:47:41 -0000
@@ -372,7 +372,6 @@ cancel_offline (EShellOfflineHandler *of
 		EComponentInfo *info = p->data;
 		GNOME_Evolution_Offline offline_interface;
 		CORBA_Environment ev;
-		const char *id;
 
 		offline_interface = get_offline_interface (info->iface);
 		if (offline_interface == CORBA_OBJECT_NIL)
@@ -382,7 +381,7 @@ cancel_offline (EShellOfflineHandler *of
 
 		GNOME_Evolution_Offline_goOnline (offline_interface, &ev);
 		if (ev._major != CORBA_NO_EXCEPTION)
-			g_warning ("Error putting component `%s' on-line.", id);
+ 			g_warning ("Error putting component `%s' on-line.", info->id);
 
 		CORBA_exception_free (&ev);
 	}