diff options
| author | hiro <hiro@ee746299-78ed-0310-b773-934348b2243d> | 2006-03-06 07:21:42 +0000 |
|---|---|---|
| committer | hiro <hiro@ee746299-78ed-0310-b773-934348b2243d> | 2006-03-06 07:21:42 +0000 |
| commit | ecd490d2e97a6f43c8a2d7f9a684f6ec4d0bd3da (patch) | |
| tree | 014b912c8eefc97357612342b6c7725356bb623d | |
| parent | daabf1aad5f19de331c4545e3ff01cae45571bec (diff) | |
enabled View/Cc menu on mail accounts.
git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@1027 ee746299-78ed-0310-b773-934348b2243d
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ChangeLog.ja | 5 | ||||
| -rw-r--r-- | src/compose.c | 10 |
3 files changed, 16 insertions, 4 deletions
@@ -1,3 +1,8 @@ +2006-03-06 + + * src/compose.c: compose_select_account(): enabled View/Cc menu on + mail accounts. + 2006-03-03 * version 2.2.2 diff --git a/ChangeLog.ja b/ChangeLog.ja index df3727c1..b7c0073a 100644 --- a/ChangeLog.ja +++ b/ChangeLog.ja @@ -1,3 +1,8 @@ +2006-03-06 + + * src/compose.c: compose_select_account(): メールアカウントで View/Cc + メニューを有効にした。 + 2006-03-03 * version 2.2.2 diff --git a/src/compose.c b/src/compose.c index bd4544d7..775d56e0 100644 --- a/src/compose.c +++ b/src/compose.c @@ -2516,16 +2516,19 @@ static void compose_select_account(Compose *compose, PrefsAccount *account, gboolean init) { GtkItemFactory *ifactory; + PrefsAccount *prev_account; g_return_if_fail(account != NULL); + prev_account = compose->account; compose->account = account; compose_set_title(compose); ifactory = gtk_item_factory_from_widget(compose->menubar); - if (account->protocol == A_NNTP) { + if (account->protocol == A_NNTP && + (init || prev_account->protocol != A_NNTP)) { gtk_widget_show(compose->newsgroups_hbox); gtk_widget_show(compose->newsgroups_entry); gtk_table_set_row_spacing(GTK_TABLE(compose->table), 2, 4); @@ -2534,9 +2537,9 @@ static void compose_select_account(Compose *compose, PrefsAccount *account, menu_set_active(ifactory, "/View/To", FALSE); menu_set_sensitive(ifactory, "/View/To", TRUE); menu_set_active(ifactory, "/View/Cc", FALSE); - menu_set_sensitive(ifactory, "/View/Cc", TRUE); menu_set_sensitive(ifactory, "/View/Followup to", TRUE); - } else { + } else if (account->protocol != A_NNTP && + (init || prev_account->protocol == A_NNTP)) { gtk_widget_hide(compose->newsgroups_hbox); gtk_widget_hide(compose->newsgroups_entry); gtk_table_set_row_spacing(GTK_TABLE(compose->table), 2, 0); @@ -2546,7 +2549,6 @@ static void compose_select_account(Compose *compose, PrefsAccount *account, menu_set_active(ifactory, "/View/To", TRUE); menu_set_sensitive(ifactory, "/View/To", FALSE); menu_set_active(ifactory, "/View/Cc", TRUE); - menu_set_sensitive(ifactory, "/View/Cc", FALSE); menu_set_active(ifactory, "/View/Followup to", FALSE); menu_set_sensitive(ifactory, "/View/Followup to", FALSE); } |