aboutsummaryrefslogtreecommitdiffstats
path: root/modules/mail
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2010-07-14 07:27:18 +0800
committerMatthew Barnes <mbarnes@redhat.com>2010-07-14 07:30:20 +0800
commita972d9ab59660d7137fdf0918133b2e3f1c41545 (patch)
tree962a40a7418ca5b2de32d11ceacee47bd7f0e9c5 /modules/mail
parentdba7eededd03ad2de3c126301e9d048390bb6f43 (diff)
downloadgsoc2013-evolution-a972d9ab59660d7137fdf0918133b2e3f1c41545.tar
gsoc2013-evolution-a972d9ab59660d7137fdf0918133b2e3f1c41545.tar.gz
gsoc2013-evolution-a972d9ab59660d7137fdf0918133b2e3f1c41545.tar.bz2
gsoc2013-evolution-a972d9ab59660d7137fdf0918133b2e3f1c41545.tar.lz
gsoc2013-evolution-a972d9ab59660d7137fdf0918133b2e3f1c41545.tar.xz
gsoc2013-evolution-a972d9ab59660d7137fdf0918133b2e3f1c41545.tar.zst
gsoc2013-evolution-a972d9ab59660d7137fdf0918133b2e3f1c41545.zip
Bug 624285 - When replying, ignore text selection if preview is hidden
Diffstat (limited to 'modules/mail')
-rw-r--r--modules/mail/e-mail-shell-content.c20
-rw-r--r--modules/mail/e-mail-shell-view-private.c6
2 files changed, 26 insertions, 0 deletions
diff --git a/modules/mail/e-mail-shell-content.c b/modules/mail/e-mail-shell-content.c
index e7fb20d1cf..7cfa678aff 100644
--- a/modules/mail/e-mail-shell-content.c
+++ b/modules/mail/e-mail-shell-content.c
@@ -78,6 +78,7 @@ enum {
PROP_GROUP_BY_THREADS,
PROP_ORIENTATION,
PROP_PREVIEW_VISIBLE,
+ PROP_QUOTE_FROM_SELECTION,
PROP_SHOW_DELETED
};
@@ -292,6 +293,12 @@ mail_shell_content_set_property (GObject *object,
g_value_get_boolean (value));
return;
+ case PROP_QUOTE_FROM_SELECTION:
+ e_mail_reader_set_quote_from_selection (
+ E_MAIL_READER (object),
+ g_value_get_boolean (value));
+ return;
+
case PROP_SHOW_DELETED:
e_mail_shell_content_set_show_deleted (
E_MAIL_SHELL_CONTENT (object),
@@ -330,6 +337,13 @@ mail_shell_content_get_property (GObject *object,
E_MAIL_SHELL_CONTENT (object)));
return;
+ case PROP_QUOTE_FROM_SELECTION:
+ g_value_set_boolean (
+ value,
+ e_mail_reader_get_quote_from_selection (
+ E_MAIL_READER (object)));
+ return;
+
case PROP_SHOW_DELETED:
g_value_set_boolean (
value,
@@ -723,6 +737,12 @@ mail_shell_content_class_init (EMailShellContentClass *class)
TRUE,
G_PARAM_READWRITE));
+ /* Inherited from EMailReader */
+ g_object_class_override_property (
+ object_class,
+ PROP_QUOTE_FROM_SELECTION,
+ "quote-from-selection");
+
g_object_class_install_property (
object_class,
PROP_SHOW_DELETED,
diff --git a/modules/mail/e-mail-shell-view-private.c b/modules/mail/e-mail-shell-view-private.c
index 4aac0075f8..50cad27444 100644
--- a/modules/mail/e-mail-shell-view-private.c
+++ b/modules/mail/e-mail-shell-view-private.c
@@ -579,6 +579,12 @@ e_mail_shell_view_private_constructed (EMailShellView *mail_shell_view)
e_mail_shell_view_actions_init (mail_shell_view);
e_mail_shell_view_update_search_filter (mail_shell_view);
+ /* When replying, only quote from selected
+ * text if the message preview is visible. */
+ e_binding_new (
+ reader, "preview-visible",
+ reader, "quote-from-selection");
+
/* Populate built-in rules for search entry popup menu.
* Keep the assertions, please. If the conditions aren't
* met we're going to crash anyway, just more mysteriously. */