talons

commit 237035ba937fa75b2a26c8aad7960f02396a21f6
parent 132a3c38dbb27e73141cfa572cc94426bfd6f00f
Author: Colin Leroy <colin@colino.net>
Date:   Fri, 28 Nov 2008 19:40:24 +0000

2008-11-28 [colin]	3.6.1cvs50

	* src/mainwindow.c
		Fix account selection in Mailing list
		menu

Diffstat:
M
ChangeLog
 | 
6
++++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
src/mainwindow.c
 | 
11
++++++++++-

4 files changed, 18 insertions(+), 2 deletions(-)
diff --git 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
diff --git a/PATCHSETS b/PATCHSETS
@@ -3631,3 +3631,4 @@
 ( 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
diff --git a/configure.ac b/configure.ac
@@ -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=
 
diff --git a/src/mainwindow.c b/src/mainwindow.c
@@ -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)