From: Colin Leroy <colin@colino.net>
Date: Wed, 28 Jun 2006 17:40:30 +0000 (+0000)
Subject: 2006-06-28 [colin]	2.3.1cvs34
X-Git-Tag: rel_2_4_0~66
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=c2f057af5ce4435c171091a603cdaf586c49cf10

2006-06-28 [colin]	2.3.1cvs34

	* src/prefs_account.c
		Fix bug #977 (Can't add or edit imap accounts)
---

diff --git a/ChangeLog b/ChangeLog
index 6580644bc..86cbb9f4b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-06-28 [colin]	2.3.1cvs34
+
+	* src/prefs_account.c
+		Fix bug #977 (Can't add or edit imap accounts)
+
 2006-06-28 [colin]	2.3.1cvs33
 
 	* src/mimeview.c
diff --git a/PATCHSETS b/PATCHSETS
index cca855ffe..025954db6 100644
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -1634,3 +1634,4 @@
 ( cvs diff -u -r 1.179.2.122 -r 1.179.2.123 src/imap.c;  cvs diff -u -r 1.52.2.22 -r 1.52.2.23 src/prefs_folder_item.c;  ) > 2.3.1cvs31.patchset
 ( cvs diff -u -r 1.115.2.91 -r 1.115.2.92 src/main.c;  cvs diff -u -r 1.28.2.21 -r 1.28.2.22 src/mbox.c;  cvs diff -u -r 1.83.2.71 -r 1.83.2.72 src/mimeview.c;  cvs diff -u -r 1.13.2.18 -r 1.13.2.19 src/common/plugin.c;  cvs diff -u -r 1.5.2.5 -r 1.5.2.6 src/common/plugin.h;  cvs diff -u -r 1.7.2.7 -r 1.7.2.8 src/common/sylpheed.c;  cvs diff -u -r 1.36.2.68 -r 1.36.2.69 src/common/utils.c;  cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/plugins/pgpcore/sylpheed.def;  cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/plugins/pgpinline/sylpheed.def;  cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/plugins/pgpmime/sylpheed.def;  ) > 2.3.1cvs32.patchset
 ( cvs diff -u -r 1.83.2.72 -r 1.83.2.73 src/mimeview.c;  ) > 2.3.1cvs33.patchset
+( cvs diff -u -r 1.105.2.58 -r 1.105.2.59 src/prefs_account.c;  ) > 2.3.1cvs34.patchset
diff --git a/configure.ac b/configure.ac
index 1b3156b08..0b7bd12d5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=3
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=33
+EXTRA_VERSION=34
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/prefs_account.c b/src/prefs_account.c
index 66c959daf..1cdab92b3 100644
--- a/src/prefs_account.c
+++ b/src/prefs_account.c
@@ -2616,13 +2616,7 @@ static void prefs_account_enum_set_radiobtn(PrefParam *pparam)
 
 static void prefs_account_protocol_set_data_from_optmenu(PrefParam *pparam)
 {
-	GtkWidget *menu;
-	GtkWidget *menuitem;
-
-	menu = gtk_option_menu_get_menu(GTK_OPTION_MENU(*pparam->widget));
-	menuitem = gtk_menu_get_active(GTK_MENU(menu));
-	*((RecvProtocol *)pparam->data) = GPOINTER_TO_INT
-		(g_object_get_data(G_OBJECT(menuitem), MENU_VAL_ID));
+	*((RecvProtocol *)pparam->data) = combobox_get_active_data(GTK_WIDGET (*pparam->widget));
 }
 
 static void prefs_account_protocol_set_optmenu(PrefParam *pparam)