aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSrinivasa Ragavan <sragavan@src.gnome.org>2006-08-28 23:09:43 +0800
committerSrinivasa Ragavan <sragavan@src.gnome.org>2006-08-28 23:09:43 +0800
commitf4f8f32f59cba8f56cc866c6bc2b359817ba7fba (patch)
treeb568447e5b9a8e2be437390e80b1564352764b01
parente20e15498a31985b2842ed038d0e1e0ba97bb9b3 (diff)
downloadgsoc2013-evolution-f4f8f32f59cba8f56cc866c6bc2b359817ba7fba.tar
gsoc2013-evolution-f4f8f32f59cba8f56cc866c6bc2b359817ba7fba.tar.gz
gsoc2013-evolution-f4f8f32f59cba8f56cc866c6bc2b359817ba7fba.tar.bz2
gsoc2013-evolution-f4f8f32f59cba8f56cc866c6bc2b359817ba7fba.tar.lz
gsoc2013-evolution-f4f8f32f59cba8f56cc866c6bc2b359817ba7fba.tar.xz
gsoc2013-evolution-f4f8f32f59cba8f56cc866c6bc2b359817ba7fba.tar.zst
gsoc2013-evolution-f4f8f32f59cba8f56cc866c6bc2b359817ba7fba.zip
** Fixes bug #352982 and bug #336983
svn path=/trunk/; revision=32691
-rw-r--r--mail/ChangeLog8
-rw-r--r--mail/em-folder-view.c15
2 files changed, 21 insertions, 2 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 4bae752560..60c253fe80 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,5 +1,13 @@
2006-08-28 Srinivasa Ragavan <sragavan@novell.com>
+ ** Fixes bug #352982 and bug #336983
+
+ * em-folder-view.c: (emfv_popup_delete), (emfv_select_all_text):
+ Fixes the issue of thread jumping on delete and enables COPY menu item
+ when clicking Select All Text.
+
+2006-08-28 Srinivasa Ragavan <sragavan@novell.com>
+
* em-format-html.c: (efh_format_address): Fix for a crash during
displaying camel address group.
diff --git a/mail/em-folder-view.c b/mail/em-folder-view.c
index 67d532433e..df16ba28e1 100644
--- a/mail/em-folder-view.c
+++ b/mail/em-folder-view.c
@@ -955,9 +955,16 @@ emfv_popup_delete(EPopup *ep, EPopupItem *pitem, void *data)
count = em_folder_view_mark_selected(emfv, CAMEL_MESSAGE_SEEN|CAMEL_MESSAGE_DELETED, CAMEL_MESSAGE_SEEN|CAMEL_MESSAGE_DELETED);
if (count == 1) {
- if (!message_list_select (emfv->list, MESSAGE_LIST_SELECT_NEXT, 0, 0) && emfv->hide_deleted)
+ if (!emfv->list->threaded && !message_list_select (emfv->list, MESSAGE_LIST_SELECT_NEXT, 0, 0) && emfv->hide_deleted)
message_list_select (emfv->list, MESSAGE_LIST_SELECT_PREVIOUS, 0, 0);
+ else if (emfv->list->threaded) {
+ if (emfv->hide_deleted)
+ message_list_select_uid (emfv->list, "");
+ else
+ message_list_select (emfv->list, MESSAGE_LIST_SELECT_NEXT, 0, 0);
+ }
}
+
}
static void
@@ -1332,8 +1339,12 @@ static void
emfv_select_all_text(BonoboUIComponent *uid, void *data, const char *path)
{
EMFolderView *emfv = data;
-
+ gboolean selected;
+
gtk_html_select_all (((EMFormatHTML *)emfv->preview)->html);
+ selected = gtk_html_command (((EMFormatHTML *)emfv->preview)->html, "is-selection-active");
+ bonobo_ui_component_set_prop(emfv->uic, "/commands/EditCopy", "sensitive", selected?"1":"0", NULL);
+
}
static void