diff options
author | Matthew Barnes <mbarnes@redhat.com> | 2010-10-20 01:32:26 +0800 |
---|---|---|
committer | Matthew Barnes <mbarnes@redhat.com> | 2010-10-20 01:41:14 +0800 |
commit | d305e8ff1052c9ec109a0d220c05c669e2180662 (patch) | |
tree | e4bfa16c9165be5159b0a07f5d0e006f20f30019 /mail/e-mail-browser.c | |
parent | 689bb1148d8494b71036f9dcce8a9f79b53cbfe6 (diff) | |
download | gsoc2013-evolution-d305e8ff1052c9ec109a0d220c05c669e2180662.tar.gz gsoc2013-evolution-d305e8ff1052c9ec109a0d220c05c669e2180662.tar.zst gsoc2013-evolution-d305e8ff1052c9ec109a0d220c05c669e2180662.zip |
Reduce GConf usage in em-composer-utils.c.
To reduce GConf usage in em-composer-utils.c:
- Relevant functions in em-composer-utils.c now take arguments for
reply and forward styles.
- Redundant forwarding functions were removed:
em_utils_forward_attached()
em_utils_forward_inline()
em_utils_forward_quoted()
- EMailReader now has "forward-style" and "reply-style" properties,
which get bound to the appropriate EShellSettings properties in
modules/mail/e-mail-config-reader.c. These same EShellSettings
properties are bound to the combo boxes in Composer Preferences.
Diffstat (limited to 'mail/e-mail-browser.c')
-rw-r--r-- | mail/e-mail-browser.c | 38 |
1 files changed, 38 insertions, 0 deletions
diff --git a/mail/e-mail-browser.c b/mail/e-mail-browser.c index d1fe7ca90c..ed4d4c471c 100644 --- a/mail/e-mail-browser.c +++ b/mail/e-mail-browser.c @@ -67,8 +67,10 @@ enum { PROP_0, PROP_BACKEND, PROP_FOCUS_TRACKER, + PROP_FORWARD_STYLE, PROP_GROUP_BY_THREADS, PROP_SHOW_DELETED, + PROP_REPLY_STYLE, PROP_UI_MANAGER }; @@ -361,12 +363,24 @@ mail_browser_set_property (GObject *object, g_value_get_object (value)); return; + case PROP_FORWARD_STYLE: + e_mail_reader_set_forward_style ( + E_MAIL_READER (object), + g_value_get_enum (value)); + return; + case PROP_GROUP_BY_THREADS: e_mail_reader_set_group_by_threads ( E_MAIL_READER (object), g_value_get_boolean (value)); return; + case PROP_REPLY_STYLE: + e_mail_reader_set_reply_style ( + E_MAIL_READER (object), + g_value_get_enum (value)); + return; + case PROP_SHOW_DELETED: e_mail_browser_set_show_deleted ( E_MAIL_BROWSER (object), @@ -396,12 +410,24 @@ mail_browser_get_property (GObject *object, E_MAIL_BROWSER (object))); return; + case PROP_FORWARD_STYLE: + g_value_set_enum ( + value, e_mail_reader_get_forward_style ( + E_MAIL_READER (object))); + return; + case PROP_GROUP_BY_THREADS: g_value_set_boolean ( value, e_mail_reader_get_group_by_threads ( E_MAIL_READER (object))); return; + case PROP_REPLY_STYLE: + g_value_set_enum ( + value, e_mail_reader_get_reply_style ( + E_MAIL_READER (object))); + return; + case PROP_SHOW_DELETED: g_value_set_boolean ( value, e_mail_browser_get_show_deleted ( @@ -805,9 +831,21 @@ mail_browser_class_init (EMailBrowserClass *class) /* Inherited from EMailReader */ g_object_class_override_property ( object_class, + PROP_FORWARD_STYLE, + "forward-style"); + + /* Inherited from EMailReader */ + g_object_class_override_property ( + object_class, PROP_GROUP_BY_THREADS, "group-by-threads"); + /* Inherited from EMailReader */ + g_object_class_override_property ( + object_class, + PROP_REPLY_STYLE, + "reply-style"); + g_object_class_install_property ( object_class, PROP_SHOW_DELETED, |