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

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 1ac304e2f096a0c9935a04c0bd755bdd8195c2db..cf2712d4d1a277ba003e892c851610478331fa51 100644 (file)
--- 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 d2a94b02c2349a8abcdece86445438feac8a23b0..19d08fd9dc54d4d806688bc46ab9ec327c52905b 100644 (file)
--- 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 39594ede480e898da9e2751d97c4335589e46166..ad9e20be06b293ab7694b6f110df5c8247e04cff 100644 (file)
--- 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)