talons

commit fb797a407368ea6b30d4bd7f5c41065aad0c395c
parent 281365d012b2e012fb7fd64fd2bf122c797d3a0b
Author: Colin Leroy <colin@colino.net>
Date:   Wed, 26 Mar 2008 07:33:26 +0000

2008-03-26 [colin]	3.3.1cvs39

	* src/textview.c
		Fix bug 1555: current folder wasn't used when
		right-clicking on an email address

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

4 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,9 @@
+2008-03-26 [colin]	3.3.1cvs39
+
+	* src/textview.c
+		Fix bug 1555: current folder wasn't used when
+		right-clicking on an email address
+
 2008-03-25 [colin]	3.3.1cvs38
 
 	* src/plugins/bogofilter/bogofilter.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -3273,3 +3273,4 @@
 ( cvs diff -u -r 1.49.2.107 -r 1.49.2.108 src/procmime.c;  ) > 3.3.1cvs36.patchset
 ( cvs diff -u -r 1.105.2.128 -r 1.105.2.129 src/prefs_account.c;  ) > 3.3.1cvs37.patchset
 ( cvs diff -u -r 1.1.2.36 -r 1.1.2.37 src/plugins/bogofilter/bogofilter.c;  cvs diff -u -r 1.1.2.13 -r 1.1.2.14 src/plugins/bogofilter/bogofilter.h;  cvs diff -u -r 1.1.2.30 -r 1.1.2.31 src/plugins/bogofilter/bogofilter_gtk.c;  ) > 3.3.1cvs38.patchset
+( cvs diff -u -r 1.96.2.198 -r 1.96.2.199 src/textview.c;  ) > 3.3.1cvs39.patchset
diff --git a/configure.ac b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=3
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=38
+EXTRA_VERSION=39
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/textview.c b/src/textview.c
@@ -3024,8 +3024,11 @@ static void mail_to_uri_cb (TextView *textview, guint action, void *data)
 		folder_item = textview->messageview->msginfo->folder;
 		if (folder_item->prefs && folder_item->prefs->enable_default_account)
 			account = account_find_from_id(folder_item->prefs->default_account);
+		
+		compose_new_with_folderitem(account, folder_item, uri->uri+7);
+	} else {
+		compose_new(account, uri->uri + 7, NULL);
 	}
-	compose_new(account, uri->uri + 7, NULL);
 }
 
 static void copy_mail_to_uri_cb	(TextView *textview, guint action, void *data)