2008-11-28 [colin] 3.6.1cvs50
authorColin Leroy <colin@colino.net>
Fri, 28 Nov 2008 19:40:24 +0000 (19:40 +0000)
committerColin Leroy <colin@colino.net>
Fri, 28 Nov 2008 19:40:24 +0000 (19:40 +0000)
* src/mainwindow.c
Fix account selection in Mailing list
menu

ChangeLog
PATCHSETS
configure.ac
src/mainwindow.c

index f4d66f716d6b29ef7b03ed1d03cbc241e5c970f8..bcf65d464036c6ee32f2928933f6a386f2128ca0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-11-28 [colin]     3.6.1cvs50
+
+       * src/mainwindow.c
+               Fix account selection in Mailing list
+               menu
+
 2008-11-28 [paul]      3.6.1cvs49
 
        * po/Makefile.in.in
index e220479ffb38123ce226c17a796e52f6ba02ee81..2b041b569f9143a6116cc6ddaf8b2054c9191f50 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.60.2.48 -r 1.60.2.49 src/filtering.c;  cvs diff -u -r 1.75.2.62 -r 1.75.2.63 src/matcher.c;  ) > 3.6.1cvs47.patchset
 ( cvs diff -u -r 1.1.2.57 -r 1.1.2.58 src/plugins/pgpcore/sgpgme.c;  ) > 3.6.1cvs48.patchset
 ( cvs diff -u -r 1.6.2.9 -r 1.6.2.10 po/Makefile.in.in;  ) > 3.6.1cvs49.patchset
+( cvs diff -u -r 1.274.2.291 -r 1.274.2.292 src/mainwindow.c;  ) > 3.6.1cvs50.patchset
index e4b09c0d7d65c1e444d4a4ade1f4fd8050344313..0fd58ce5bea552af48a21a077544bfaed63a2e0b 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=6
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=49
+EXTRA_VERSION=50
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
index 121f3e6da971d17930b7c9f4ecea1f6e396091c3..8ca4be2ff22c1ca0c1a03ce95c22bd61a03a0ff5 100644 (file)
@@ -3507,10 +3507,19 @@ static void get_url_part (const gchar **buffer, gchar *url_decoded, gint maxlen)
 static void mailing_list_compose (GtkWidget *w, gpointer *data)
 {
        const gchar *mailto;
+       PrefsAccount *account = NULL;
+       FolderItem   *folder_item = NULL;
 
        mailto = gtk_label_get_text(GTK_LABEL (gtk_bin_get_child(GTK_BIN((w)))));
+       if (mainwindow_get_mainwindow()) {
+               folder_item = mainwindow_get_mainwindow()->summaryview->folder_item;
+               if (folder_item && folder_item->prefs && folder_item->prefs->enable_default_account)
+                       account = account_find_from_id(folder_item->prefs->default_account);
+               if (folder_item && !account)
+                       account = account_find_from_item(folder_item);
+       }
        if (mailto)
-               compose_new(NULL, mailto+7, NULL);
+               compose_new_with_folderitem(account, folder_item, mailto+7);
 }
  
  static void mailing_list_open_uri (GtkWidget *w, gpointer *data)