From e118c5cdbc09918fc648dd63d6f3c02cdcdfcdc2 Mon Sep 17 00:00:00 2001 From: JP Rosevear Date: Wed, 11 Jul 2001 23:46:29 +0000 Subject: no longer need to set a my address property 2001-07-11 JP Rosevear * mail-display.c (get_embedded_for_component): no longer need to set a my address property svn path=/trunk/; revision=11019 --- mail/ChangeLog | 5 +++++ mail/mail-display.c | 27 ++++++++++----------------- 2 files changed, 15 insertions(+), 17 deletions(-) (limited to 'mail') diff --git a/mail/ChangeLog b/mail/ChangeLog index 1f7a598314..7e797c0873 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,8 @@ +2001-07-11 JP Rosevear + + * mail-display.c (get_embedded_for_component): no longer need to + set a my address property + 2001-07-10 Federico Mena Quintero * mail-display.c (link_copy_location): Set the CLIPBOARD diff --git a/mail/mail-display.c b/mail/mail-display.c index 5edc1242a5..a7fd33dc64 100644 --- a/mail/mail-display.c +++ b/mail/mail-display.c @@ -672,24 +672,17 @@ get_embedded_for_component (const char *iid, MailDisplay *md) * to pass a bunch of useful things to all embedded controls. */ const CamelInternetAddress *from; - const MailConfigIdentity *id; - - id = mail_config_get_default_identity (); + char *from_address; + CORBA_exception_init (&ev); - if (id){ - char *from_address; - - - from = camel_mime_message_get_from (md->current_message); - from_address = camel_address_encode((CamelAddress *)from); - bonobo_property_bag_client_set_value_string ( - prop_bag, "from_address", - from_address, &ev); - bonobo_property_bag_client_set_value_string ( - prop_bag, "my_address", - id ? id->address : "", &ev); - g_free(from_address); - } + + from = camel_mime_message_get_from (md->current_message); + from_address = camel_address_encode((CamelAddress *)from); + bonobo_property_bag_client_set_value_string ( + prop_bag, "from_address", + from_address, &ev); + g_free(from_address); + Bonobo_Unknown_unref (prop_bag, &ev); CORBA_exception_free (&ev); } -- cgit