2010-09-19 [pawel] 3.7.6cvs40
authorPaweł Pękala <c0rn@gazeta.pl>
Sun, 19 Sep 2010 17:59:53 +0000 (17:59 +0000)
committerPaweł Pękala <c0rn@gazeta.pl>
Sun, 19 Sep 2010 17:59:53 +0000 (17:59 +0000)
* src/compose.c
* src/mainwindow.c
* src/summaryview.c
Set ML menus sensitivity accordingly to
possibility of reply to ML

ChangeLog
PATCHSETS
configure.ac
src/compose.c
src/mainwindow.c
src/summaryview.c

index e2d397e..df862f1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-09-19 [pawel]     3.7.6cvs40
+
+       * src/compose.c
+       * src/mainwindow.c
+       * src/summaryview.c
+               Set ML menus sensitivity accordingly to
+               possibility of reply to ML
+
 2010-09-19 [colin]     3.7.6cvs39
 
        * src/compose.c
index fdc6f03..4fcdb95 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.382.2.555 -r 1.382.2.556 src/compose.c;  ) > 3.7.6cvs37.patchset
 ( cvs diff -u -r 1.382.2.556 -r 1.382.2.557 src/compose.c;  ) > 3.7.6cvs38.patchset
 ( cvs diff -u -r 1.382.2.557 -r 1.382.2.558 src/compose.c;  ) > 3.7.6cvs39.patchset
+( cvs diff -u -r 1.382.2.558 -r 1.382.2.559 src/compose.c;  cvs diff -u -r 1.274.2.315 -r 1.274.2.316 src/mainwindow.c;  cvs diff -u -r 1.395.2.422 -r 1.395.2.423 src/summaryview.c;  ) > 3.7.6cvs40.patchset
index 326cfac..4a0af54 100644 (file)
@@ -12,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=6
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=39
+EXTRA_VERSION=40
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
index d88315a..7e97e46 100644 (file)
@@ -1535,7 +1535,9 @@ static Compose *compose_generic_reply(MsgInfo *msginfo,
                compose_destroy(compose);
                return NULL;
        }
-
+       if (!compose->ml_post)
+               cm_menu_set_sensitive_full(compose->ui_manager, "Menu/Options/ReplyMode/List", FALSE);
+       
        /* override from name according to folder properties */
        if (msginfo->folder && msginfo->folder->prefs &&
                msginfo->folder->prefs->reply_with_format &&
index 784c13d..a608ae3 100644 (file)
@@ -3348,10 +3348,13 @@ void main_create_mailing_list_menu (MainWindow *mainwin, MsgInfo *msginfo)
        
        if (msginfo) 
                is_menu = mailing_list_create_submenu (mainwin, msginfo);
-       if (is_menu)
+       if (is_menu) {
                cm_menu_set_sensitive_full(mainwin->ui_manager, "Menu/Message/MailingList", TRUE);
-       else
+               cm_menu_set_sensitive_full(mainwin->ui_manager, "Menu/Message/ReplyTo/List", TRUE);
+       } else {
                cm_menu_set_sensitive_full(mainwin->ui_manager, "Menu/Message/MailingList", FALSE);
+               cm_menu_set_sensitive_full(mainwin->ui_manager, "Menu/Message/ReplyTo/List", FALSE);
+       }       
 }
 
 static gint mailing_list_create_submenu (MainWindow *mainwin, MsgInfo *msginfo)
index 7efd189..2ecdb2c 100644 (file)
@@ -1620,6 +1620,7 @@ GSList *summary_get_selected_msg_list(SummaryView *summaryview)
 void summary_set_menu_sensitive(SummaryView *summaryview)
 {
        SensitiveCond state;
+       MsgInfo *msginfo;
        gboolean sensitive;
        gint i;
 
@@ -1695,6 +1696,15 @@ void summary_set_menu_sensitive(SummaryView *summaryview)
                cm_menu_set_sensitive_full(summaryview->mainwin->ui_manager, entry[i].entry, sensitive);
        }
 
+#ifndef GENERIC_UMPC
+       if ((msginfo = summary_get_selected_msg(summaryview)) && msginfo->extradata)
+               cm_menu_set_sensitive_full(summaryview->mainwin->ui_manager,
+                       "Menus/SummaryViewPopup/ReplyTo/MailingList", TRUE);
+       else
+               cm_menu_set_sensitive_full(summaryview->mainwin->ui_manager,
+                       "Menus/SummaryViewPopup/ReplyTo/MailingList", FALSE);
+#endif
+
        summary_lock(summaryview);
 #ifndef GENERIC_UMPC
        if (summaryview->messageview