From f030276189017d71806bb8e9c34cd9c690622496 Mon Sep 17 00:00:00 2001
From: Christoph Hohmann <reboot@gmx.ch>
Date: Fri, 27 Dec 2002 13:21:29 +0000
Subject: [PATCH] 0.8.8claws11

* src/compose.c
        MENUITEM_ADD casts the 4th argument from integer to pointer
        so it probably should not be a pointer, this means we
        should use account id for it and not the account's pointer
---
 ChangeLog.claws | 7 +++++++
 configure.in    | 2 +-
 src/compose.c   | 5 +++--
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 1ac304e2f..cf2712d4d 100644
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,10 @@
+2002-12-27 [christoph]	0.8.8claws11
+
+	* src/compose.c
+		MENUITEM_ADD casts the 4th argument from integer to pointer
+		so it probably should not be a pointer, this means we
+		should use account id for it and not the account's pointer
+
 2002-12-27 [paul]	0.8.8claws10
 
 	* src/mainwindow.c
diff --git a/configure.in b/configure.in
index d2a94b02c..19d08fd9d 100644
--- a/configure.in
+++ b/configure.in
@@ -11,7 +11,7 @@ MINOR_VERSION=8
 MICRO_VERSION=8
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws10
+EXTRA_VERSION=claws11
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target
diff --git a/src/compose.c b/src/compose.c
index 39594ede4..ad9e20be0 100644
--- a/src/compose.c
+++ b/src/compose.c
@@ -5042,7 +5042,7 @@ static GtkWidget *compose_account_option_menu_create(Compose *compose)
 		else
 			name = g_strdup_printf("%s: %s",
 					       ac->account_name, ac->address);
-		MENUITEM_ADD(menu, menuitem, name, ac);
+		MENUITEM_ADD(menu, menuitem, name, ac->account_id);
 		g_free(name);
 		gtk_signal_connect(GTK_OBJECT(menuitem), "activate",
 				   GTK_SIGNAL_FUNC(account_activated),
@@ -5955,7 +5955,8 @@ static void account_activated(GtkMenuItem *menuitem, gpointer data)
 
 	PrefsAccount *ac;
 
-	ac = (PrefsAccount *)gtk_object_get_user_data(GTK_OBJECT(menuitem));
+	ac = account_find_from_id(
+		GPOINTER_TO_INT(gtk_object_get_user_data(GTK_OBJECT(menuitem))));
 	g_return_if_fail(ac != NULL);
 
 	if (ac != compose->account)
-- 
2.11.4.GIT