From e0965ab239c03af7a2bec82b1d39bb5f085e6e23 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Fri, 7 Sep 2007 07:51:47 +0000 Subject: 2007-09-07 mcrha Fix for bug #473903 svn path=/trunk/; revision=34192 --- plugins/exchange-operations/ChangeLog | 9 +++++++++ plugins/exchange-operations/exchange-delegates-user.c | 10 ++++++---- plugins/exchange-operations/exchange-delegates.c | 2 +- plugins/exchange-operations/exchange-mail-send-options.c | 2 +- 4 files changed, 17 insertions(+), 6 deletions(-) (limited to 'plugins/exchange-operations') 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 + + ** 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 * 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; -- cgit v1.2.3