Fix warnings from sparse and gcc

svn path=/trunk/; revision=34458

4 files changed, 13 insertions, 3 deletions

diff --git a/plugins/groupwise-features/ChangeLog b/plugins/groupwise-features/ChangeLog
index 6af2116224..83089bb2c1 100644
--- a/plugins/groupwise-features/ChangeLog
+++ b/plugins/groupwise-features/ChangeLog
@@ -1,3 +1,13 @@
+2007-10-26  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* junk-mail-settings.c: (junk_mail_settings),
+	(org_gnome_junk_settings):
+	* send-options.c: (send_options_finalize), (get_source):
+	* status-track.c: (track_status), (org_gnome_track_status):
+	Warning fixes:
+	- mixing code and declarations
+	- ANSIfication of function declaration
+
 2007-09-27  Matthew Barnes  <mbarnes@redhat.com>
 
 	** Fixes part of bug #477045
diff --git a/plugins/groupwise-features/junk-mail-settings.c b/plugins/groupwise-features/junk-mail-settings.c
index 6803c9aea7..89c5e9fe3c 100644
--- a/plugins/groupwise-features/junk-mail-settings.c
+++ b/plugins/groupwise-features/junk-mail-settings.c
@@ -70,10 +70,10 @@ junk_mail_settings (EPopup *ep, EPopupItem *item, void *data)
 	JunkSettings *junk_tab;
 	int page_count =0;
 	EGwConnection *cnc;
+	gchar *msg;
 	CamelFolder *folder = (CamelFolder *)data;
 	CamelStore *store = folder->parent_store;	
 	cnc = get_cnc (store);	
-	gchar *msg;
 
 	dialog =  gtk_dialog_new_with_buttons (_("Junk Settings"),
 			NULL,
diff --git a/plugins/groupwise-features/send-options.c b/plugins/groupwise-features/send-options.c
index d303890c90..e6b07664ae 100644
--- a/plugins/groupwise-features/send-options.c
+++ b/plugins/groupwise-features/send-options.c
@@ -229,7 +229,7 @@ org_gnome_send_options (EPlugin *epl, EConfigHookItemFactoryData *data)
 }
 
 static void
-send_options_finalize ()
+send_options_finalize (void)
 {
 	if (n_cnc) {
 		g_object_unref (n_cnc);
diff --git a/plugins/groupwise-features/status-track.c b/plugins/groupwise-features/status-track.c
index e4a130dd1b..7606fe0bf3 100644
--- a/plugins/groupwise-features/status-track.c
+++ b/plugins/groupwise-features/status-track.c
@@ -177,6 +177,7 @@ track_status (EPopup *ep, EPopupItem *item, void *data)
 		{
 			EGwItemRecipient *recipient;
 			GString *label = NULL;
+			GtkLabel *detail;
 
 			label = g_string_new("");
 			recipient = recipient_list->data;
@@ -226,7 +227,6 @@ track_status (EPopup *ep, EPopupItem *item, void *data)
 				label = g_string_append_c (label, '\n');
 			}
 
-			GtkLabel *detail;
 			detail = GTK_LABEL(gtk_label_new (label->str));
 			g_string_free (label, TRUE);
 			gtk_label_set_selectable (detail, TRUE);