2005-10-10 [colin] 1.9.15cvs29
authorColin Leroy <colin@colino.net>
Mon, 10 Oct 2005 17:36:15 +0000 (17:36 +0000)
committerColin Leroy <colin@colino.net>
Mon, 10 Oct 2005 17:36:15 +0000 (17:36 +0000)
* src/compose.c
Reselect "None" Privacy system when selecting an
account with no privacy system defined

ChangeLog-gtk2.claws
PATCHSETS
configure.ac
src/compose.c

index b7bb50783dbd0649e310ed0eff3550b2052051e5..cde2d7620a5d813a95d99148e134989dd637fbe7 100644 (file)
@@ -1,3 +1,9 @@
+2005-10-10 [colin]     1.9.15cvs29
+
+       * src/compose.c
+               Reselect "None" Privacy system when selecting an
+               account with no privacy system defined
+
 2005-10-10 [colin]     1.9.15cvs28
 
        * src/mainwindow.c
index e7c0e3239671bc13f788053c49f3c2ef5a8f72ff..a519fc39e5c157037359df1bb506b19ea193bf24 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.274.2.70 -r 1.274.2.71 src/mainwindow.c;  cvs diff -u -r 1.94.2.66 -r 1.94.2.67 src/messageview.c;  cvs diff -u -r 1.395.2.133 -r 1.395.2.134 src/summaryview.c;  ) > 1.9.15cvs26.patchset
 ( cvs diff -u -r 1.8.2.12 -r 1.8.2.13 src/export.c;  cvs diff -u -r 1.13.2.11 -r 1.13.2.12 src/import.c;  ) > 1.9.15cvs27.patchset
 ( cvs diff -u -r 1.115.2.57 -r 1.115.2.58 src/main.c;  cvs diff -u -r 1.274.2.71 -r 1.274.2.72 src/mainwindow.c;  cvs diff -u -r 1.16.2.27 -r 1.16.2.28 src/msgcache.c;  cvs diff -u -r 1.204.2.60 -r 1.204.2.61 src/prefs_common.c;  cvs diff -u -r 1.43.2.25 -r 1.43.2.26 src/prefs_matcher.c;  cvs diff -u -r 1.1.4.22 -r 1.1.4.23 src/etpan/imap-thread.c;  cvs diff -u -r 1.2.2.8 -r 1.2.2.9 src/gtk/colorlabel.c;  ) > 1.9.15cvs28.patchset
+( cvs diff -u -r 1.382.2.181 -r 1.382.2.182 src/compose.c;  ) > 1.9.15cvs29.patchset
index 53d945372a34ebea1bcc9fa35515f61c3a5e69a5..c3cf576e759203956a7384e63daa3c2fa65f5e1d 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=15
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=28
+EXTRA_VERSION=29
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
index 89c0f52b8cb58eebe3211a943246701c24219e42..f2218ea967a701b835dce7b91118ec2d46b4d3e4 100644 (file)
@@ -5590,7 +5590,7 @@ static void compose_update_privacy_system_menu_item(Compose * compose, gboolean
                        GList *alist = amenu->next;
 
                        systemid = g_object_get_data(G_OBJECT(amenu->data), "privacy_system");
-                       if (systemid != NULL)
+                       if (systemid != NULL) {
                                if (strcmp(systemid, compose->privacy_system) == 0) {
                                        menuitem = GTK_WIDGET(amenu->data);
 
@@ -5598,7 +5598,15 @@ static void compose_update_privacy_system_menu_item(Compose * compose, gboolean
                                        can_encrypt = privacy_system_can_encrypt(systemid);
                                        found = TRUE;
                                        break;
-                               }
+                               } 
+                       } else if (strlen(compose->privacy_system) == 0) {
+                                       menuitem = GTK_WIDGET(amenu->data);
+
+                                       can_sign = FALSE;
+                                       can_encrypt = FALSE;
+                                       found = TRUE;
+                                       break;
+                       }
 
                        amenu = alist;
                }
@@ -5613,7 +5621,7 @@ static void compose_update_privacy_system_menu_item(Compose * compose, gboolean
                        alertpanel_warning(tmp);
                        g_free(tmp);
                }
-       }
+       } 
 
        menu_set_sensitive(ifactory, "/Options/Sign", can_sign);
        menu_set_sensitive(ifactory, "/Options/Encrypt", can_encrypt);
@@ -7554,6 +7562,7 @@ static void compose_toggle_encrypt_cb(gpointer data, guint action,
 static void activate_privacy_system(Compose *compose, PrefsAccount *account, gboolean warn) 
 {
        g_free(compose->privacy_system);
+
        compose->privacy_system = g_strdup(account->default_privacy_system);
        compose_update_privacy_system_menu_item(compose, warn);
 }