2007-09-07 mcrha Fix for bug #473903

svn path=/trunk/; revision=34192

10 files changed, 45 insertions, 15 deletions

diff --git a/plugins/bogo-junk-plugin/ChangeLog b/plugins/bogo-junk-plugin/ChangeLog
index db92715031..4479eddb61 100644
--- a/plugins/bogo-junk-plugin/ChangeLog
+++ b/plugins/bogo-junk-plugin/ChangeLog
@@ -1,3 +1,10 @@
+2007-09-07  Milan Crha  <mcrha@redhat.com>
+
+	** Part of fix for bug #473903
+
+	* bf-junk-filter.c: (em_junk_bf_validate_binary): Changing function
+	prototype to fit what is expected in 'invoke', returns value based on it.
+
 2007-08-27  Srinivasa Ragavan  <sragavan@novell.com>
 
 	* bf-junk-filter.c: (e_plugin_lib_enable): Avoid re-entrancy in
diff --git a/plugins/bogo-junk-plugin/bf-junk-filter.c b/plugins/bogo-junk-plugin/bf-junk-filter.c
index 87c1df28b7..e47e0382d8 100644
--- a/plugins/bogo-junk-plugin/bf-junk-filter.c
+++ b/plugins/bogo-junk-plugin/bf-junk-filter.c
@@ -60,7 +60,7 @@ GtkWidget * org_gnome_bogo_convert_unicode (struct _EPlugin *epl, struct _EConfi
 
 /* plugin fonction prototypes */
 gboolean em_junk_bf_check_junk (EPlugin *ep, EMJunkHookTarget *target);
-gboolean em_junk_bf_validate_binary (EPlugin *ep, EMJunkHookTarget *target);
+void *em_junk_bf_validate_binary (EPlugin *ep, EMJunkHookTarget *target);
 void em_junk_bf_report_junk (EPlugin *ep, EMJunkHookTarget *target);
 void em_junk_bf_report_non_junk (EPlugin *ep, EMJunkHookTarget *target);
 void em_junk_bf_commit_reports (EPlugin *ep, EMJunkHookTarget *target);
@@ -244,12 +244,10 @@ em_junk_bf_commit_reports (EPlugin *ep, EMJunkHookTarget *target)
 {
 }
 
-gboolean
+void *
 em_junk_bf_validate_binary (EPlugin *ep, EMJunkHookTarget *target)
 {
-
-	 return g_file_test (em_junk_bf_binary, G_FILE_TEST_EXISTS);
-	 
+	return g_file_test (em_junk_bf_binary, G_FILE_TEST_EXISTS) ? "1" : NULL;
 }
 
 int
diff --git a/plugins/exchange-operations/ChangeLog b/plugins/exchange-operations/ChangeLog
index ba98b49a20..d5317d3958 100644
--- a/plugins/exchange-operations/ChangeLog
+++ b/plugins/exchange-operations/ChangeLog
@@ -1,3 +1,12 @@
+2007-09-07  Milan Crha  <mcrha@redhat.com>
+
+	** Fix for bug #473903
+
+	* exchange-delegates.c: (email_look_up):
+	* exchange-mail-send-options.c: (append_to_header):
+	* exchange-delegates-user.c: (exchange_delegates_user_edit):
+	Fixes serious compiler warnings.
+
 2007-08-24  Srinivasa Ragavan  <sragavan@novell.com>
 
 	* org-gnome-exchange-cal-subscription.xml: Fix for empty menu in the
diff --git a/plugins/exchange-operations/exchange-delegates-user.c b/plugins/exchange-operations/exchange-delegates-user.c
index 8fa918f3a8..916498782b 100644
--- a/plugins/exchange-operations/exchange-delegates-user.c
+++ b/plugins/exchange-operations/exchange-delegates-user.c
@@ -421,10 +421,12 @@ exchange_delegates_user_edit (ExchangeAccount *account,
 			delegate_exchange_dn = e2k_entryid_to_dn (user->entryid);
 			recipient_address = email_look_up (delegate_exchange_dn,account);
 
-			addr = camel_internet_address_new ();
-			camel_address_decode (CAMEL_ADDRESS (addr), recipient_address);
-			camel_mime_message_set_recipients (delegate_mail, CAMEL_RECIPIENT_TYPE_TO, addr);
-			camel_object_unref (addr);
+			if (recipient_address) {
+				addr = camel_internet_address_new ();
+				camel_address_decode (CAMEL_ADDRESS (addr), recipient_address);
+				camel_mime_message_set_recipients (delegate_mail, CAMEL_RECIPIENT_TYPE_TO, addr);
+				camel_object_unref (addr);
+			}
 
 			eaccount = exchange_account_fetch (account);
 			if(eaccount) {
diff --git a/plugins/exchange-operations/exchange-delegates.c b/plugins/exchange-operations/exchange-delegates.c
index 12ef113f6f..4c4bc7efc9 100644
--- a/plugins/exchange-operations/exchange-delegates.c
+++ b/plugins/exchange-operations/exchange-delegates.c
@@ -528,7 +528,7 @@ email_look_up (const char *delegate_legacy, ExchangeAccount *account)
 	gc = exchange_account_get_global_catalog (account);
 	
 	if (!gc)
-		return;
+		return NULL;
 
 	status = e2k_global_catalog_lookup (
 			gc, NULL, E2K_GLOBAL_CATALOG_LOOKUP_BY_LEGACY_EXCHANGE_DN,
diff --git a/plugins/exchange-operations/exchange-mail-send-options.c b/plugins/exchange-operations/exchange-mail-send-options.c
index a54936677f..8e5b7e377a 100644
--- a/plugins/exchange-operations/exchange-mail-send-options.c
+++ b/plugins/exchange-operations/exchange-mail-send-options.c
@@ -44,7 +44,7 @@ append_to_header (ExchangeSendOptionsDialog *dialog, gint state, gpointer data)
 {
 	EMsgComposer *composer;
 	EMsgComposerHdrs *hdrs;
-	CamelInternetAddress *sender_address;
+	CamelAddress *sender_address;
 	const char *sender_id, *recipient_id;
 
 	composer = (EMsgComposer *)data;
diff --git a/plugins/mail-to-task/ChangeLog b/plugins/mail-to-task/ChangeLog
index c811d9dc7e..91e848aad1 100644
--- a/plugins/mail-to-task/ChangeLog
+++ b/plugins/mail-to-task/ChangeLog
@@ -1,3 +1,10 @@
+2007-09-07  Milan Crha  <mcrha@redhat.com>
+
+	** Fix for bug #473903
+
+	* mail-to-task.c: (set_attachments):
+	Fixes serious compiler warning.
+
 2007-08-16  Milan Crha  <mcrha@redhat.com>
 
 	** Part of fix for bug #350539
diff --git a/plugins/mail-to-task/mail-to-task.c b/plugins/mail-to-task/mail-to-task.c
index 0cabb9b978..1b0ba16998 100644
--- a/plugins/mail-to-task/mail-to-task.c
+++ b/plugins/mail-to-task/mail-to-task.c
@@ -199,7 +199,7 @@ set_attachments (ECal *client, ECalComponent *comp, CamelMimeMessage *message)
 	int parts, i;
 	GSList *list = NULL;
 	const char *uid;
-	char *store_uri;
+	const char *store_uri;
 	char *store_dir;
 	CamelDataWrapper *content;
 
diff --git a/plugins/sa-junk-plugin/ChangeLog b/plugins/sa-junk-plugin/ChangeLog
index 546a2982b8..ccade72b1f 100644
--- a/plugins/sa-junk-plugin/ChangeLog
+++ b/plugins/sa-junk-plugin/ChangeLog
@@ -1,3 +1,10 @@
+2007-09-07  Milan Crha  <mcrha@redhat.com>
+
+	** Part of fix for bug #473903
+
+	* em-junk-filter.c: (em_junk_sa_validate_binary): Changing function
+	prototype to fit what is expected in 'invoke', returns value based on it.
+
 2007-08-22  Srinivasa Ragavan  <sragavan@novell.com>
 
 	** Fix for bug #468303
diff --git a/plugins/sa-junk-plugin/em-junk-filter.c b/plugins/sa-junk-plugin/em-junk-filter.c
index 04262d9c9f..bfe1fbbd8d 100644
--- a/plugins/sa-junk-plugin/em-junk-filter.c
+++ b/plugins/sa-junk-plugin/em-junk-filter.c
@@ -65,7 +65,7 @@ gboolean em_junk_sa_check_junk (EPlugin *ep, EMJunkHookTarget *target);
 void em_junk_sa_report_junk (EPlugin *ep, EMJunkHookTarget *target);
 void em_junk_sa_report_non_junk (EPlugin *ep, EMJunkHookTarget *target);
 void em_junk_sa_commit_reports (EPlugin *ep, EMJunkHookTarget *target);
-gboolean em_junk_sa_validate_binary (EPlugin *ep, EMJunkHookTarget *target);
+void *em_junk_sa_validate_binary (EPlugin *ep, EMJunkHookTarget *target);
 GtkWidget *org_gnome_sa_use_remote_tests (struct _EPlugin *epl, struct _EConfigHookItemFactoryData *data);
 
 static void em_junk_sa_init (void);
@@ -721,10 +721,10 @@ em_junk_sa_commit_reports (EPlugin *ep, EMJunkHookTarget *target)
 	}
 }
 
-gboolean
+void *
 em_junk_sa_validate_binary (EPlugin *ep, EMJunkHookTarget *target)
 {
-	return em_junk_sa_is_available ();
+	return em_junk_sa_is_available () ? "1" : NULL;
 }
 
 static void