aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mail/ChangeLog6
-rw-r--r--mail/folder-browser.c7
2 files changed, 13 insertions, 0 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 618a57f702..1b9448981d 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,9 @@
+2001-08-01 Jeffrey Stedfast <fejj@ximian.com>
+
+ * folder-browser.c (folder_browser_copy): Do the Right Thing (tm)
+ if the message list is not the widget in focus (which is to copy
+ the text selected in the html viewer instead). Fixes bug #5868.
+
2001-08-01 Jason Leach <jleach@ximian.com>
* folder-browser-ui.c: Use the new Save As and Message Search
diff --git a/mail/folder-browser.c b/mail/folder-browser.c
index 3d6b763265..b024b11324 100644
--- a/mail/folder-browser.c
+++ b/mail/folder-browser.c
@@ -27,6 +27,7 @@
#include <libgnomeui/gnome-dialog-util.h>
#include <gtkhtml/htmlengine.h>
+#include <gtkhtml/htmlengine-edit-cut-and-paste.h>
#include "filter/vfolder-rule.h"
#include "filter/vfolder-context.h"
@@ -621,6 +622,12 @@ folder_browser_copy (GtkWidget *menuitem, FolderBrowser *fb)
cut = menuitem == NULL;
+ if (!GTK_WIDGET_HAS_FOCUS (fb->message_list)) {
+ /* Copy text from the HTML Engine */
+ html_engine_copy (fb->mail_display->html->engine);
+ return;
+ }
+
if (fb->clipboard_selection) {
g_byte_array_free (fb->clipboard_selection, TRUE);
fb->clipboard_selection = NULL;