2006-12-12 [colin] 2.6.1cvs22

	* src/gtk/menu.h
		Add another menu data type
	* src/prefs_account.c
		Complete the completion of bug 1076
		(doesn't lose the pref on apply)

diff --git a/ChangeLog b/ChangeLog
index a21d22b7c1764acb65fb6e99a5b66d3116722983..ba14e7dbc0793fc95bbc3fea99a6dbf5ea6a4f54 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-12-12 [colin]     2.6.1cvs22
+
+       * src/gtk/menu.h
+               Add another menu data type
+       * src/prefs_account.c
+               Complete the completion of bug 1076
+               (doesn't lose the pref on apply)
+

 2006-12-12 [paul]      2.6.1cvs21
 
        * src/prefs_account.c
 2006-12-12 [paul]      2.6.1cvs21
 
        * src/prefs_account.c

diff --git a/PATCHSETS b/PATCHSETS
index e3af64fc343ff9432447993f6a9fcccdf1ff0cf9..d61591349c868b05dd635fe5616e530609b64433 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2129,3 +2129,4 @@
 ( cvs diff -u -r 1.1.2.41 -r 1.1.2.42 src/wizard.c;  ) > 2.6.1cvs19.patchset
 ( cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/gtk/combobox.c;  ) > 2.6.1cvs20.patchset
 ( cvs diff -u -r 1.105.2.73 -r 1.105.2.74 src/prefs_account.c;  ) > 2.6.1cvs21.patchset
 ( cvs diff -u -r 1.1.2.41 -r 1.1.2.42 src/wizard.c;  ) > 2.6.1cvs19.patchset
 ( cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/gtk/combobox.c;  ) > 2.6.1cvs20.patchset
 ( cvs diff -u -r 1.105.2.73 -r 1.105.2.74 src/prefs_account.c;  ) > 2.6.1cvs21.patchset

+( cvs diff -u -r 1.4.2.8 -r 1.4.2.9 src/gtk/menu.h;  cvs diff -u -r 1.105.2.74 -r 1.105.2.75 src/prefs_account.c;  ) > 2.6.1cvs22.patchset

diff --git a/configure.ac b/configure.ac
index f91d4d80f360ea9aaefffa91868d3fabbf683951..044d06525f367faa38aa20b6b85c03ee3750e192 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=6
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=21
+EXTRA_VERSION=22

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/gtk/menu.h b/src/gtk/menu.h
index a11851f1d0d1c202e6121f6318a6394950e33b28..92943526e804d25e37493ba00ad4b5f54a0a587a 100644 (file)
--- a/src/gtk/menu.h
+++ b/src/gtk/menu.h
@@ -27,7 +27,8 @@
 #include <gtk/gtkmenushell.h>
 #include <gtk/gtkoptionmenu.h>
 
 #include <gtk/gtkmenushell.h>
 #include <gtk/gtkoptionmenu.h>
 

-#define MENU_VAL_ID "Sylpheed::Menu::ValueID"
+#define MENU_VAL_ID "Claws::Menu::ValueID"
+#define MENU_VAL_DATA "Claws::Menu::ValueDATA"

 
 #define MENUITEM_ADD(menu, menuitem, label, data)               \
 {                                                               \
 
 #define MENUITEM_ADD(menu, menuitem, label, data)               \
 {                                                               \

diff --git a/src/prefs_account.c b/src/prefs_account.c
index ce3434bff6720cefa12568c064cf636e7f277729..548ab1ba7e97c6f82207c03aab6a87dd42e57fdb 100644 (file)
--- a/src/prefs_account.c
+++ b/src/prefs_account.c
@@ -644,6 +644,10 @@ static void privacy_system_activated(GtkMenuItem *menuitem)
        
        privacy_enabled = strcmp(system_id, "");
 
        
        privacy_enabled = strcmp(system_id, "");
 

+       if (g_object_get_data(G_OBJECT(menuitem), MENU_VAL_DATA) == NULL ||
+           GPOINTER_TO_INT(g_object_get_data(G_OBJECT(menuitem), MENU_VAL_DATA)) == FALSE)
+               privacy_enabled = FALSE;
+

        gtk_widget_set_sensitive (privacy.default_encrypt_chkbtn, privacy_enabled);
        gtk_widget_set_sensitive (privacy.default_encrypt_reply_chkbtn, privacy_enabled);
        gtk_widget_set_sensitive (privacy.default_sign_chkbtn, privacy_enabled);
        gtk_widget_set_sensitive (privacy.default_encrypt_chkbtn, privacy_enabled);
        gtk_widget_set_sensitive (privacy.default_encrypt_reply_chkbtn, privacy_enabled);
        gtk_widget_set_sensitive (privacy.default_sign_chkbtn, privacy_enabled);


@@ -663,6 +667,7 @@ void update_privacy_system_menu() {
        menuitem = gtk_menu_item_new_with_label(_("None"));
        gtk_widget_show(menuitem);
        g_object_set_data(G_OBJECT(menuitem), MENU_VAL_ID, "");
        menuitem = gtk_menu_item_new_with_label(_("None"));
        gtk_widget_show(menuitem);
        g_object_set_data(G_OBJECT(menuitem), MENU_VAL_ID, "");

+       g_object_set_data(G_OBJECT(menuitem), MENU_VAL_DATA, GINT_TO_POINTER(FALSE));

        gtk_menu_append(GTK_MENU(menu), menuitem);
 
        g_signal_connect(G_OBJECT(menuitem), "activate",
        gtk_menu_append(GTK_MENU(menu), menuitem);
 
        g_signal_connect(G_OBJECT(menuitem), "activate",


@@ -678,6 +683,8 @@ void update_privacy_system_menu() {
                menuitem = gtk_menu_item_new_with_label(name);
                gtk_widget_show(menuitem);
                g_object_set_data_full(G_OBJECT(menuitem), MENU_VAL_ID, id, g_free);
                menuitem = gtk_menu_item_new_with_label(name);
                gtk_widget_show(menuitem);
                g_object_set_data_full(G_OBJECT(menuitem), MENU_VAL_ID, id, g_free);

+               g_object_set_data(G_OBJECT(menuitem), MENU_VAL_DATA, GINT_TO_POINTER(TRUE));
+

                gtk_menu_append(GTK_MENU(menu), menuitem);
 
                g_signal_connect(G_OBJECT(menuitem), "activate",
                gtk_menu_append(GTK_MENU(menu), menuitem);
 
                g_signal_connect(G_OBJECT(menuitem), "activate",


@@ -2862,12 +2869,16 @@ static void prefs_account_set_optmenu_from_string(PrefParam *pparam)
                name = g_strdup_printf(_("%s (plugin not loaded)"), prefsid);
                menuitem = gtk_menu_item_new_with_label(name);
                gtk_widget_show(menuitem);
                name = g_strdup_printf(_("%s (plugin not loaded)"), prefsid);
                menuitem = gtk_menu_item_new_with_label(name);
                gtk_widget_show(menuitem);

-               g_object_set_data(G_OBJECT(menuitem), MENU_VAL_ID, "");
+               g_object_set_data(G_OBJECT(menuitem), MENU_VAL_ID, prefsid);
+               g_object_set_data(G_OBJECT(menuitem), MENU_VAL_DATA, GINT_TO_POINTER(FALSE));

                gtk_menu_append(GTK_MENU(menu), menuitem);
                g_free(name);
 
                gtk_option_menu_set_history(GTK_OPTION_MENU(optionmenu), i);
                privacy_system_activated(GTK_MENU_ITEM(menuitem));
                gtk_menu_append(GTK_MENU(menu), menuitem);
                g_free(name);
 
                gtk_option_menu_set_history(GTK_OPTION_MENU(optionmenu), i);
                privacy_system_activated(GTK_MENU_ITEM(menuitem));

+               g_signal_connect(G_OBJECT(menuitem), "activate",
+                                G_CALLBACK(privacy_system_activated),
+                                NULL);

        }
 
        g_list_free(children);
        }
 
        g_list_free(children);