aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--composer/ChangeLog9
-rw-r--r--composer/e-msg-composer-hdrs.c18
-rw-r--r--composer/e-msg-composer.c4
3 files changed, 21 insertions, 10 deletions
diff --git a/composer/ChangeLog b/composer/ChangeLog
index 21cbe77127..00fa0377f6 100644
--- a/composer/ChangeLog
+++ b/composer/ChangeLog
@@ -1,3 +1,12 @@
+2002-06-06 Jeffrey Stedfast <fejj@ximian.com>
+
+ * e-msg-composer.c (setup_ui): Remove the customize toolbar thingy
+ since Michael said that this would fix bug #17952.
+
+ * e-msg-composer-hdrs.c (e_msg_composer_hdrs_set_from_account):
+ Clean up the logic in this. For one, we don't need to do strstr
+ using the account address (wtf??).
+
2002-06-05 Radek Doulik <rodo@ximian.com>
* e-msg-composer-hdrs.c (create_from_optionmenu): put option menu
diff --git a/composer/e-msg-composer-hdrs.c b/composer/e-msg-composer-hdrs.c
index f497f35f85..e6caed6184 100644
--- a/composer/e-msg-composer-hdrs.c
+++ b/composer/e-msg-composer-hdrs.c
@@ -246,12 +246,12 @@ create_from_optionmenu (EMsgComposerHdrs *hdrs)
gtk_option_menu_set_history (GTK_OPTION_MENU (omenu), history);
gtk_signal_emit_by_name (GTK_OBJECT (first), "activate", hdrs);
}
-
+
hbox = gtk_hbox_new (FALSE, 3);
gtk_box_pack_start_defaults (GTK_BOX (hbox), omenu);
gtk_widget_show (omenu);
gtk_widget_show (hbox);
-
+
return hbox;
}
@@ -822,10 +822,16 @@ e_msg_composer_hdrs_set_from_account (EMsgComposerHdrs *hdrs,
item = l->data;
account = gtk_object_get_data (GTK_OBJECT (item), "account");
- if (i == default_account ||
- (account_name && ((account->name && !strcmp (account_name, account->name))
- || (account->id->address && strstr (account_name, account->id->address))))) {
- /* set the correct optionlist item */
+ if (account_name) {
+ if (account->name && !strcmp (account_name, account->name)) {
+ /* set the correct optionlist item */
+ gtk_option_menu_set_history (omenu, i);
+ gtk_signal_emit_by_name (GTK_OBJECT (item), "activate", hdrs);
+
+ return;
+ }
+ } else if (i == default_account) {
+ /* set the default optionlist item */
gtk_option_menu_set_history (omenu, i);
gtk_signal_emit_by_name (GTK_OBJECT (item), "activate", hdrs);
diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c
index ab4ac99149..129a6249d0 100644
--- a/composer/e-msg-composer.c
+++ b/composer/e-msg-composer.c
@@ -1878,10 +1878,6 @@ setup_ui (EMsgComposer *composer)
bonobo_ui_component_add_verb_list_with_data (composer->uic, verbs, composer);
- /* Customize Toolbar thingie */
- bonobo_ui_engine_config_set_path (bonobo_window_get_ui_engine (BONOBO_WINDOW (composer)),
- "/evolution/UIConf/composer");
-
bonobo_ui_component_freeze (composer->uic, NULL);
bonobo_ui_util_set_ui (composer->uic, EVOLUTION_DATADIR,