From 8068afb17d84ea09001e1f101e29bbcbc433de78 Mon Sep 17 00:00:00 2001 From: Colin Leroy Date: Tue, 26 Oct 2004 08:59:06 +0000 Subject: [PATCH 1/1] 2004-10-26 [colin] 0.9.12cvs132.2 * src/prefs_folder_item.c Fix auto-account selection --- ChangeLog-gtk2.claws | 5 +++++ PATCHSETS | 1 + configure.ac | 2 +- src/prefs_folder_item.c | 2 +- 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws index ee0009bcf..8065fd1f2 100644 --- a/ChangeLog-gtk2.claws +++ b/ChangeLog-gtk2.claws @@ -1,3 +1,8 @@ +2004-10-26 [colin] 0.9.12cvs132.2 + + * src/prefs_folder_item.c + Fix default-account selection + 2004-10-21 [colin] 0.9.12cvs133 * src/compose.c diff --git a/PATCHSETS b/PATCHSETS index 9c2f97615..bb58ffa56 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -206,3 +206,4 @@ ( cvs diff -u -r 1.2504.2.25 -r 1.2504.2.26 ChangeLog.claws; cvs diff -u -r 1.382.2.53 -r 1.382.2.54 src/compose.c; ) > 0.9.12cvs131.1.patchset ( cvs diff -u -r 1.382.2.54 -r 1.382.2.55 src/compose.c; cvs diff -u -r 1.9.2.7 -r 1.9.2.8 src/sourcewindow.c; ) > 0.9.12cvs131.2.patchset ( cvs diff -u -r 1.382.2.55 -r 1.382.2.56 src/compose.c; cvs diff -u -r 1.96.2.23 -r 1.96.2.24 src/textview.c; ) > 0.9.12cvs133.patchset +( cvs diff -u -r 1.52.2.7 -r 1.52.2.8 src/prefs_folder_item.c; ) > 0.9.12cvs132.2.patchset diff --git a/configure.ac b/configure.ac index 1507bfd6f..0a34a5bc1 100644 --- a/configure.ac +++ b/configure.ac @@ -13,7 +13,7 @@ INTERFACE_AGE=0 BINARY_AGE=0 EXTRA_VERSION=132 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_folder_item.c b/src/prefs_folder_item.c index ea2f95ea7..c45acb312 100644 --- a/src/prefs_folder_item.c +++ b/src/prefs_folder_item.c @@ -682,7 +682,7 @@ static void compose_save_folder_prefs(FolderItem *folder, FolderItemComposePage gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->checkbtn_enable_default_account)); menu = gtk_option_menu_get_menu(GTK_OPTION_MENU(page->optmenu_default_account)); menuitem = gtk_menu_get_active(GTK_MENU(menu)); - prefs->default_account = GPOINTER_TO_INT(gtk_object_get_user_data(GTK_OBJECT(menuitem))); + prefs->default_account = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(menuitem), MENU_VAL_ID)); } #if USE_ASPELL -- 2.25.1