Fix warnings from sparse and gcc

svn path=/trunk/; revision=34458

4 files changed, 23 insertions, 13 deletions

diff --git a/plugins/exchange-operations/ChangeLog b/plugins/exchange-operations/ChangeLog
index 56d43fd1d7..9f4513eb46 100644
--- a/plugins/exchange-operations/ChangeLog
+++ b/plugins/exchange-operations/ChangeLog
@@ -1,3 +1,14 @@
+2007-10-26  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* exchange-account-setup.c: (org_gnome_exchange_settings),
+	(print_error), (set_oof_info), (destroy_oof_data):
+	* exchange-delegates-user.c: (exchange_delegates_user_edit):
+	* exchange-mail-send-options.c: (append_to_header):
+	Warning fixes:
+	- mark some code static
+	- use non-deprecated GSignal apis
+	- rename shadowing variable
+
 2007-10-09  Matthew Barnes  <mbarnes@redhat.com>
 
 	** Fixes part of bug #437579
diff --git a/plugins/exchange-operations/exchange-account-setup.c b/plugins/exchange-operations/exchange-account-setup.c
index 911b5e617b..24aa1935be 100644
--- a/plugins/exchange-operations/exchange-account-setup.c
+++ b/plugins/exchange-operations/exchange-account-setup.c
@@ -87,7 +87,7 @@ typedef struct {
 	GtkWidget *text_view;
 }OOFData;
 
-OOFData *oof_data;
+static OOFData *oof_data;
 
 static void
 update_state (GtkTextBuffer *buffer, gpointer data)
@@ -280,7 +280,7 @@ org_gnome_exchange_settings(EPlugin *epl, EConfigHookItemFactoryData *data)
 		radio_iof = (GtkRadioButton*) gtk_object_new (GTK_TYPE_RADIO_BUTTON, "label", _("I am in the office"), NULL);
 		radio_oof = (GtkRadioButton*) gtk_object_new (GTK_TYPE_RADIO_BUTTON, "label", _("I am out of the office"), "group", radio_iof, NULL);
 	}
-	gtk_signal_connect (GTK_OBJECT (radio_oof), "toggled", G_CALLBACK (toggled_state), NULL);
+	g_signal_connect (radio_oof, "toggled", G_CALLBACK (toggled_state), NULL);
 	
 
 	gtk_table_attach (tbl_oof_status, GTK_WIDGET (lbl_status), 0, 1, 0, 1, GTK_FILL, GTK_FILL, 0, 0);
@@ -335,7 +335,7 @@ org_gnome_exchange_settings(EPlugin *epl, EConfigHookItemFactoryData *data)
 	lbl_dass = (GtkLabel*) gtk_object_new (GTK_TYPE_LABEL, "label", _("Manage the delegate settings for Exchange account"), NULL);
 	gtk_misc_set_alignment (GTK_MISC (lbl_dass), 0, 0.5);
 	btn_dass = (GtkButton*) gtk_object_new (GTK_TYPE_BUTTON, "label", _("Delegation Assistant"), NULL);
-	gtk_signal_connect (GTK_OBJECT (btn_dass), "clicked", G_CALLBACK (btn_dass_clicked), NULL);
+	g_signal_connect (btn_dass, "clicked", G_CALLBACK (btn_dass_clicked), NULL);
 	/* Add items to the table */
 #ifdef HAVE_KRB5
 	gtk_table_attach_defaults (tbl_auth, GTK_WIDGET (lbl_chpass), 0, 1, 0, 1);
@@ -359,7 +359,7 @@ org_gnome_exchange_settings(EPlugin *epl, EConfigHookItemFactoryData *data)
 	lbl_fsize = (GtkLabel*) gtk_object_new (GTK_TYPE_LABEL, "label", _("View the size of all Exchange folders"), NULL);
 	gtk_misc_set_alignment (GTK_MISC (lbl_fsize), 0, 0.5);
 	btn_fsize = (GtkButton*) gtk_object_new (GTK_TYPE_BUTTON, "label", _("Folders Size"), NULL);
-	gtk_signal_connect (GTK_OBJECT (btn_fsize), "clicked", G_CALLBACK (btn_fsize_clicked), NULL);
+	g_signal_connect (btn_fsize, "clicked", G_CALLBACK (btn_fsize_clicked), NULL);
 	gtk_table_attach_defaults (tbl_misc, GTK_WIDGET (lbl_fsize), 0, 1, 0, 1);
 	gtk_table_attach (tbl_misc, GTK_WIDGET (btn_fsize), 1, 2, 0, 1, GTK_FILL, GTK_FILL, 0, 0);
 	gtk_box_pack_start (GTK_BOX (vbox_misc), GTK_WIDGET (tbl_misc), FALSE, FALSE, 0);
@@ -694,7 +694,7 @@ org_gnome_exchange_check_options(EPlugin *epl, EConfigHookPageCheckData *data)
 }
 
 static void 
-set_oof_info ()
+set_oof_info (void)
 {
 	ExchangeAccount *account;
 
@@ -707,7 +707,7 @@ set_oof_info ()
 }
 
 static void
-destroy_oof_data ()
+destroy_oof_data (void)
 {
 	if (oof_data->message)
 		g_free (oof_data->message);
diff --git a/plugins/exchange-operations/exchange-delegates-user.c b/plugins/exchange-operations/exchange-delegates-user.c
index 916498782b..062a11a193 100644
--- a/plugins/exchange-operations/exchange-delegates-user.c
+++ b/plugins/exchange-operations/exchange-delegates-user.c
@@ -79,7 +79,7 @@ const char *exchange_delegates_user_folder_names[] = {
 /* To translators: The folder names to be displayed in the message being 
    sent to the delegatee. 
 */
-const char *folder_names_for_display[] = {
+static const char *folder_names_for_display[] = {
 	N_("Calendar"), N_("Tasks"), N_("Inbox"), N_("Contacts")
 };
 
@@ -442,7 +442,7 @@ exchange_delegates_user_edit (ExchangeAccount *account,
 			out_folder = mail_component_get_folder (NULL, MAIL_COMPONENT_FOLDER_OUTBOX);
 			info = camel_message_info_new (NULL);
 			camel_message_info_set_flags (info, CAMEL_MESSAGE_SEEN, CAMEL_MESSAGE_SEEN);
-			mail_append_mail (out_folder, delegate_mail, info, em_utils_delegates_done, 0);
+			mail_append_mail (out_folder, delegate_mail, info, em_utils_delegates_done, NULL);
 
 		}
 
diff --git a/plugins/exchange-operations/exchange-mail-send-options.c b/plugins/exchange-operations/exchange-mail-send-options.c
index 8e5b7e377a..df23f7f6a2 100644
--- a/plugins/exchange-operations/exchange-mail-send-options.c
+++ b/plugins/exchange-operations/exchange-mail-send-options.c
@@ -46,6 +46,8 @@ append_to_header (ExchangeSendOptionsDialog *dialog, gint state, gpointer data)
 	EMsgComposerHdrs *hdrs;
 	CamelAddress *sender_address;
 	const char *sender_id, *recipient_id;
+	struct _camel_header_address *addr;
+	struct _camel_header_address *sender_addr;
 
 	composer = (EMsgComposer *)data;
 	if (state == GTK_RESPONSE_OK) {
@@ -88,11 +90,8 @@ append_to_header (ExchangeSendOptionsDialog *dialog, gint state, gpointer data)
 		sender_address = (CamelAddress *) e_msg_composer_hdrs_get_from (hdrs);
 		sender_id = (const char*) camel_address_encode (sender_address);
 	
-		struct _camel_header_address *addr = camel_header_address_decode (
-						dialog->options->delegate_address, NULL);
-
-		struct _camel_header_address *sender_addr = camel_header_address_decode (
-						sender_id, NULL);
+		addr = camel_header_address_decode (dialog->options->delegate_address, NULL);
+		sender_addr = camel_header_address_decode (sender_id, NULL);
 		
  		if(dialog->options->send_as_del_enabled && 
 			dialog->options->delegate_address &&