From d305e8ff1052c9ec109a0d220c05c669e2180662 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 19 Oct 2010 13:32:26 -0400 Subject: 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. --- mail/e-mail-paned-view.c | 42 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 41 insertions(+), 1 deletion(-) (limited to 'mail/e-mail-paned-view.c') diff --git a/mail/e-mail-paned-view.c b/mail/e-mail-paned-view.c index 236c7cb782..b298c5e08f 100644 --- a/mail/e-mail-paned-view.c +++ b/mail/e-mail-paned-view.c @@ -75,7 +75,9 @@ struct _EMailPanedViewPrivate { enum { PROP_0, - PROP_GROUP_BY_THREADS + PROP_FORWARD_STYLE, + PROP_GROUP_BY_THREADS, + PROP_REPLY_STYLE }; #define STATE_KEY_GROUP_BY_THREADS "GroupByThreads" @@ -260,11 +262,23 @@ mail_paned_view_set_property (GObject *object, GParamSpec *pspec) { switch (property_id) { + 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; } G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); @@ -277,12 +291,26 @@ mail_paned_view_get_property (GObject *object, GParamSpec *pspec) { switch (property_id) { + 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; } G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); @@ -892,11 +920,23 @@ e_mail_paned_view_class_init (EMailPanedViewClass *class) class->open_selected_mail = mail_paned_view_open_selected_mail; + /* 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"); } static void -- cgit v1.2.3