From 2864da8135dfd208bb5a4cc3d51cbcc006cf0586 Mon Sep 17 00:00:00 2001 From: Not Zed Date: Wed, 14 Apr 2004 08:25:43 +0000 Subject: ** See bug #56149. 2004-04-14 Not Zed ** See bug #56149. * em-folder-view.c (emfv_edit_cut): similar to below, use focus to determine who we select from. (emfv_edit_copy): ditto. * message-list.c: Remove primary selection stuff. It just annoys. * em-folder-browser.c (emfb_edit_copy): use focus rather than selection owner to determine who to copy from. (emfb_edit_cut): similarly. svn path=/trunk/; revision=25455 --- mail/em-folder-browser.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'mail/em-folder-browser.c') diff --git a/mail/em-folder-browser.c b/mail/em-folder-browser.c index e09277a09a..38eece3e5d 100644 --- a/mail/em-folder-browser.c +++ b/mail/em-folder-browser.c @@ -489,10 +489,10 @@ emfb_edit_cut(BonoboUIComponent *uid, void *data, const char *path) if (GTK_WIDGET_HAS_FOCUS(((ESearchBar *)emfb->search)->entry)) gtk_editable_cut_clipboard((GtkEditable *)((ESearchBar *)emfb->search)->entry); - else if (message_list_has_primary_selection(emfb->view.list)) - message_list_copy(emfb->view.list, TRUE); - else if (emfb->view.preview_active) + else if (GTK_WIDGET_HAS_FOCUS(emfb->view.preview->formathtml.html)) em_format_html_display_cut(emfb->view.preview); + else + message_list_copy(emfb->view.list, TRUE); } static void @@ -502,10 +502,10 @@ emfb_edit_copy(BonoboUIComponent *uid, void *data, const char *path) if (GTK_WIDGET_HAS_FOCUS(((ESearchBar *)emfb->search)->entry)) gtk_editable_copy_clipboard((GtkEditable *)((ESearchBar *)emfb->search)->entry); - else if (message_list_has_primary_selection(emfb->view.list)) - message_list_copy(emfb->view.list, FALSE); - else if (emfb->view.preview_active) + else if (GTK_WIDGET_HAS_FOCUS(emfb->view.preview->formathtml.html)) em_format_html_display_copy(emfb->view.preview); + else + message_list_copy(emfb->view.list, FALSE); } static void -- cgit