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

diff --git a/ChangeLog b/ChangeLog
index e2d397ee4108f21424f6a5e79341be4d8fbd83e5..df862f106847dcfcf8f17bd69a32f43dc39ca443 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

diff --git a/PATCHSETS b/PATCHSETS
index fdc6f03689920afa25c597fb64f276a142283382..4fcdb95d3b994b8e565215595284030d93e5b5ca 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -4035,3 +4035,4 @@
 ( 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

diff --git a/configure.ac b/configure.ac
index 326cfaca74f6df9cf11d7f21ec832802a03ff6bc..4a0af54c2aa9b4acfddc037f4e8bda974f519fc1 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -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=
 

diff --git a/src/compose.c b/src/compose.c
index d88315a1ac6fb37c2be4844cab28ea883ff0b02b..7e97e46a3498626bd8cdded5691eba3c9ea6b9da 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -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 &&

diff --git a/src/mainwindow.c b/src/mainwindow.c
index 784c13d018a65d3c2d7b576b2491dd7bfce68020..a608ae34e083f268f559b83e2007ffcdf733e69e 100644 (file)
--- a/src/mainwindow.c
+++ b/src/mainwindow.c
@@ -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)

diff --git a/src/summaryview.c b/src/summaryview.c
index 7efd189d5580a510a90feb0eeae1f5a7bab2925d..2ecdb2c345569a9044b25f92bbb6e3c3915fcc1f 100644 (file)
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -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