2004-08-21 [paul] 0.9.12cvs66.2

	* src/prefs_account.c
		fix GnuPG mode bugs

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index 4a5c150fff0bafc39986d2a1fca8ca00bed9597a..80e187a144d3cfa11b03bee9e00ee1d9e012c8e0 100644 (file)
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,9 @@
+2004-08-21 [paul]      0.9.12cvs66.2
+
+       * src/prefs_account.c
+               fix GnuPG mode bugs
+
+

 2004-08-20 [colin]     0.9.12cvs66.1
 
        * src/codeconv.c
 2004-08-20 [colin]     0.9.12cvs66.1
 
        * src/codeconv.c

diff --git a/PATCHSETS b/PATCHSETS
index 8525d6b8bca80d99598ccc3a4610b7a1bd58fdfd..99ab5b654aefc6aa2e3888b1df716e7d124d5821 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -122,3 +122,4 @@
 ( cvs diff -u -r 1.14.2.9 -r 1.14.2.10 src/plugins/trayicon/trayicon.c; ) > 0.9.12cvs60.3.patchset
 ( cvs diff -u -r 1.9.2.5 -r 1.9.2.6 src/common/ssl.c; cvs diff -u -r 1.1.2.1 -r 1.1.2.3 src/plugins/pgpmime/plugin.c; ) > 0.9.12cvs65.1.patchset
 ( cvs diff -u -r 1.65.2.10 -r 1.65.2.11 src/codeconv.c; ) > 0.9.12cvs66.1.patchset
 ( cvs diff -u -r 1.14.2.9 -r 1.14.2.10 src/plugins/trayicon/trayicon.c; ) > 0.9.12cvs60.3.patchset
 ( cvs diff -u -r 1.9.2.5 -r 1.9.2.6 src/common/ssl.c; cvs diff -u -r 1.1.2.1 -r 1.1.2.3 src/plugins/pgpmime/plugin.c; ) > 0.9.12cvs65.1.patchset
 ( cvs diff -u -r 1.65.2.10 -r 1.65.2.11 src/codeconv.c; ) > 0.9.12cvs66.1.patchset

+( cvs diff -u -r 1.105.2.7 -r 1.105.2.8 src/prefs_account.c; ) > 0.9.12cvs66.2.patchset

diff --git a/configure.ac b/configure.ac
index 0e6d225083ecf274bb6b6dba2db8c3819ad54b92..25321d14cbfa03dee5fd086f981ab105b1d8c033 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -13,7 +13,7 @@ INTERFACE_AGE=0
 BINARY_AGE=0
 EXTRA_VERSION=66
 EXTRA_RELEASE=
 BINARY_AGE=0
 EXTRA_VERSION=66
 EXTRA_RELEASE=

-EXTRA_GTK2_VERSION=.1
+EXTRA_GTK2_VERSION=.2

 
 if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}${EXTRA_RELEASE}${EXTRA_GTK2_VERSION}
 
 if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}${EXTRA_RELEASE}${EXTRA_GTK2_VERSION}

diff --git a/src/prefs_account.c b/src/prefs_account.c
index 593ab093deb09b102505d89b0c541e76a0ee0bce..90cc7159e0939cd672ca21232a5fb83caf512683 100644 (file)
--- a/src/prefs_account.c
+++ b/src/prefs_account.c
@@ -1704,8 +1704,9 @@ static void prefs_account_privacy_create(void)
        gtk_widget_show (gnupg_mime_radiobtn);
        gtk_box_pack_start (GTK_BOX (vbox_mode), gnupg_mime_radiobtn,
                            FALSE, FALSE, 0);
        gtk_widget_show (gnupg_mime_radiobtn);
        gtk_box_pack_start (GTK_BOX (vbox_mode), gnupg_mime_radiobtn,
                            FALSE, FALSE, 0);

-       gtk_object_set_user_data (GTK_OBJECT (gnupg_mime_radiobtn),
-                                 GINT_TO_POINTER (GNUPG_MODE_DETACH));
+       g_object_set_data (G_OBJECT (gnupg_mime_radiobtn), 
+                          MENU_VAL_ID,
+                          GINT_TO_POINTER (GNUPG_MODE_DETACH));

 
        gnupg_inline_radiobtn = gtk_radio_button_new_with_label_from_widget
                (GTK_RADIO_BUTTON (gnupg_mime_radiobtn),
 
        gnupg_inline_radiobtn = gtk_radio_button_new_with_label_from_widget
                (GTK_RADIO_BUTTON (gnupg_mime_radiobtn),


@@ -1713,10 +1714,12 @@ static void prefs_account_privacy_create(void)
        gtk_widget_show (gnupg_inline_radiobtn);
        gtk_box_pack_start (GTK_BOX (vbox_mode), gnupg_inline_radiobtn,
                            FALSE, FALSE, 0);
        gtk_widget_show (gnupg_inline_radiobtn);
        gtk_box_pack_start (GTK_BOX (vbox_mode), gnupg_inline_radiobtn,
                            FALSE, FALSE, 0);

-       gtk_object_set_user_data (GTK_OBJECT (gnupg_inline_radiobtn),
-                                 GINT_TO_POINTER (GNUPG_MODE_INLINE));
+       g_object_set_data(G_OBJECT (gnupg_inline_radiobtn), 
+                         MENU_VAL_ID,
+                         GINT_TO_POINTER (GNUPG_MODE_INLINE));

        g_signal_connect (G_OBJECT (gnupg_inline_radiobtn), "clicked",
        g_signal_connect (G_OBJECT (gnupg_inline_radiobtn), "clicked",

-                         prefs_account_gnupg_inline_warning, NULL);
+                         G_CALLBACK(prefs_account_gnupg_inline_warning), 
+                         NULL);

 
 
        PACK_FRAME (vbox1, frame1, _("Sign key"));
 
 
        PACK_FRAME (vbox1, frame1, _("Sign key"));