diff options
| -rw-r--r-- | composer/ChangeLog | 5 | ||||
| -rw-r--r-- | composer/e-msg-composer-hdrs.c | 15 |
2 files changed, 11 insertions, 9 deletions
diff --git a/composer/ChangeLog b/composer/ChangeLog index f5d2653b3f..1f6db3cb62 100644 --- a/composer/ChangeLog +++ b/composer/ChangeLog @@ -1,3 +1,8 @@ +2000-08-09 Jeffrey Stedfast <fejj@helixcode.com> + + * e-msg-composer-hdrs.c (create_dropdown_entry): Fixed the GList + identity stuff, should now display all configured identities. + 2000-08-09 Christopher James Lahey <clahey@helixcode.com> * e-msg-composer-address-dialog.c: Fixed some warnings. diff --git a/composer/e-msg-composer-hdrs.c b/composer/e-msg-composer-hdrs.c index bd861185af..59a29d4306 100644 --- a/composer/e-msg-composer-hdrs.c +++ b/composer/e-msg-composer-hdrs.c @@ -134,7 +134,6 @@ create_dropdown_entry (EMsgComposerHdrs *hdrs, combo = gtk_combo_new (); gtk_combo_set_use_arrows (GTK_COMBO (combo), TRUE); gtk_combo_set_case_sensitive (GTK_COMBO (combo), FALSE); - if (!strcmp (name, _("From:"))) { CamelInternetAddress *ciaddr; GSList *ids, *stmp; @@ -145,7 +144,7 @@ create_dropdown_entry (EMsgComposerHdrs *hdrs, ids = mail_config_get_identities (); stmp = ids; while (stmp) { - char *string; + char *address; id = stmp->data; g_assert (id); @@ -154,22 +153,20 @@ create_dropdown_entry (EMsgComposerHdrs *hdrs, ciaddr = camel_internet_address_new (); camel_internet_address_add (ciaddr, id->name, id->address); - string = camel_address_encode (CAMEL_ADDRESS (ciaddr)); - - g_list_append (values, string); + address = camel_address_encode (CAMEL_ADDRESS (ciaddr)); + values = g_list_append (values, address); stmp = stmp->next; } - if (values) - gtk_combo_set_popdown_strings (GTK_COMBO (combo), values); - + gtk_combo_set_popdown_strings (GTK_COMBO (combo), values); + tmp = values; while (tmp) { g_free (tmp->data); tmp = tmp->next; } g_list_free (values); - + id = mail_config_get_default_identity (); g_assert (id); g_assert (id->name); |