2006-03-01 [wwp] 2.0.0cvs90

	* src/compose.c
		some work around the compose window's account menu,
		patch by Fabien Vantard.

diff --git a/ChangeLog b/ChangeLog
index 1e6c3c68249fe198e9c44944554d82c5e7a749f8..6f5d6425371565b08c8e26debd9347bf2ebc83f7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-03-01 [wwp]       2.0.0cvs90
+
+       * src/compose.c
+               some work around the compose window's account menu,
+               patch by Fabien Vantard.
+
 2006-03-01 [wwp]       2.0.0cvs89
 
        * src/plugins/spamassassin/spamassassin.c

diff --git a/PATCHSETS b/PATCHSETS
index dc2a37bfb9dfb9d98c3bb75eb0953d6fb8248d84..925028f9981fd6050b4003a2a44674ce0df9cda2 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -1273,3 +1273,4 @@
 ( cvs diff -u -r 1.18.2.22 -r 1.18.2.23 src/plugins/spamassassin/spamassassin.c;  ) > 2.0.0cvs87.patchset
 ( cvs diff -u -r 1.18.2.23 -r 1.18.2.24 src/plugins/spamassassin/spamassassin.c;  cvs diff -u -r 1.4.2.8 -r 1.4.2.9 src/plugins/spamassassin/spamassassin.h;  cvs diff -u -r 1.23.2.21 -r 1.23.2.22 src/plugins/spamassassin/spamassassin_gtk.c;  ) > 2.0.0cvs88.patchset
 ( cvs diff -u -r 1.18.2.24 -r 1.18.2.25 src/plugins/spamassassin/spamassassin.c;  ) > 2.0.0cvs89.patchset
+( cvs diff -u -r 1.382.2.247 -r 1.382.2.248 src/compose.c;  ) > 2.0.0cvs90.patchset

diff --git a/configure.ac b/configure.ac
index c3120b8fd3ab0ca7d368a7b554a3e859f6dd3504..6b6e6d290c55f5868217966c5361fa7f40c83e6d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=0
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=89
+EXTRA_VERSION=90
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/compose.c b/src/compose.c
index 71a2c0aaf75ef758231e89661b434d6b21137c08..4659733245e59a5b91793073ee5d4e1991d6bda7 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -5816,7 +5816,6 @@ static Compose *compose_create(PrefsAccount *account, ComposeMode mode,
 static GtkWidget *compose_account_option_menu_create(Compose *compose)
 {
        GList *accounts;
-       GtkWidget *hbox;
        GtkWidget *optmenu;
        GtkWidget *menu;
        gint num = 0, def_menu = 0;
@@ -5824,9 +5823,7 @@ static GtkWidget *compose_account_option_menu_create(Compose *compose)
        accounts = account_get_list();
        g_return_val_if_fail(accounts != NULL, NULL);
 
-       hbox = gtk_hbox_new(FALSE, 0);
        optmenu = gtk_option_menu_new();
-       gtk_box_pack_start(GTK_BOX(hbox), optmenu, FALSE, FALSE, 0);
        menu = gtk_menu_new();
 
        for (; accounts != NULL; accounts = accounts->next, num++) {
@@ -5837,13 +5834,16 @@ static GtkWidget *compose_account_option_menu_create(Compose *compose)
                if (ac == compose->account) def_menu = num;
 
                if (ac->name)
-                       name = g_strdup_printf("%s: %s <%s>",
+                       name = g_strdup_printf("<i>%s</i> : %s &lt;<b>%s</b>&gt;",
                                               ac->account_name,
                                               ac->name, ac->address);
                else
-                       name = g_strdup_printf("%s: %s",
+                       name = g_strdup_printf("<i>%s</i> : &lt;<b>%s</b>&gt;",
                                               ac->account_name, ac->address);
                MENUITEM_ADD(menu, menuitem, name, ac->account_id);
+               gtk_label_set_use_markup (
+                               GTK_LABEL (gtk_bin_get_child (GTK_BIN (menuitem))),
+                               TRUE);
                g_free(name);
                g_signal_connect(G_OBJECT(menuitem), "activate",
                                 G_CALLBACK(account_activated),
@@ -5853,7 +5853,7 @@ static GtkWidget *compose_account_option_menu_create(Compose *compose)
        gtk_option_menu_set_menu(GTK_OPTION_MENU(optmenu), menu);
        gtk_option_menu_set_history(GTK_OPTION_MENU(optmenu), def_menu);
 
-       return hbox;
+       return optmenu;
 }
 
 static void compose_set_priority_cb(gpointer data,