From: Paul Mangan <paul@claws-mail.org>
Date: Sat, 21 Aug 2004 07:24:31 +0000 (+0000)
Subject: 2004-08-21 [paul]	0.9.12cvs66.2
X-Git-Tag: gtk2_win32_last_merge~215
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=53bcad3ec484688299d1bb04a3f6b50cef4d4937

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 4a5c150ff..80e187a14 100644
--- 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
diff --git a/PATCHSETS b/PATCHSETS
index 8525d6b8b..99ab5b654 100644
--- 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.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 0e6d22508..25321d14c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -13,7 +13,7 @@ INTERFACE_AGE=0
 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}
diff --git a/src/prefs_account.c b/src/prefs_account.c
index 593ab093d..90cc7159e 100644
--- 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_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),
@@ -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_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",
-			  prefs_account_gnupg_inline_warning, NULL);
+			  G_CALLBACK(prefs_account_gnupg_inline_warning), 
+			  NULL);
 
 
 	PACK_FRAME (vbox1, frame1, _("Sign key"));