From 9b0e9dc0aeffd627ce2bdea049cc7c47bb7418f0 Mon Sep 17 00:00:00 2001 From: Srinivasa Ragavan Date: Fri, 22 May 2009 17:00:53 +0530 Subject: Johnny's composer changes for Anjal. --- composer/e-msg-composer.c | 38 +++++++++++++++++++++++++++++++++++++- 1 file changed, 37 insertions(+), 1 deletion(-) (limited to 'composer/e-msg-composer.c') diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c index 9b526f63ac..3bf82a229f 100644 --- a/composer/e-msg-composer.c +++ b/composer/e-msg-composer.c @@ -119,6 +119,8 @@ enum { LAST_SIGNAL }; +gboolean composer_lite = FALSE; + static gpointer parent_class; static guint signals[LAST_SIGNAL]; @@ -1429,7 +1431,14 @@ msg_composer_update_preferences (GConfClient *client, GError *error = NULL; editor = GTKHTML_EDITOR (composer); - + + if (entry) { + if (strcmp(gconf_entry_get_key(entry), COMPOSER_GCONF_INLINE_SPELLING_KEY) != 0 && + strcmp(gconf_entry_get_key(entry), COMPOSER_GCONF_MAGIC_LINKS_KEY) != 0 && + strcmp(gconf_entry_get_key(entry), COMPOSER_GCONF_MAGIC_SMILEYS_KEY) != 0) + return; + } + enable = gconf_client_get_bool ( client, COMPOSER_GCONF_INLINE_SPELLING_KEY, &error); if (error == NULL) @@ -2146,6 +2155,7 @@ msg_composer_init (EMsgComposer *composer) GtkHTML *html; gint n_targets; + composer->lite = composer_lite; composer->priv = E_MSG_COMPOSER_GET_PRIVATE (composer); e_composer_private_init (composer); @@ -2277,6 +2287,32 @@ e_msg_composer_new (void) return g_object_new (E_TYPE_MSG_COMPOSER, NULL); } + +void +e_msg_composer_set_lite (void) +{ + composer_lite = TRUE; +} + +gboolean +e_msg_composer_get_lite (void) +{ + return composer_lite; +} + +EMsgComposer * +e_msg_composer_lite_new (void) +{ + EMsgComposer *composer; + + /* Init lite-composer for ever for the session */ + composer_lite = TRUE; + + composer = e_msg_composer_new (); + + return composer; +} + static void e_msg_composer_set_pending_body (EMsgComposer *composer, gchar *text, -- cgit v1.2.3 From 75a36a295adb64a012521c01724d6b2951986653 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 26 May 2009 22:55:38 -0400 Subject: Fix composer header regression caused by Anjal merge. --- composer/e-msg-composer.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'composer/e-msg-composer.c') diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c index 3bf82a229f..a715774e0d 100644 --- a/composer/e-msg-composer.c +++ b/composer/e-msg-composer.c @@ -1431,14 +1431,14 @@ msg_composer_update_preferences (GConfClient *client, GError *error = NULL; editor = GTKHTML_EDITOR (composer); - + if (entry) { if (strcmp(gconf_entry_get_key(entry), COMPOSER_GCONF_INLINE_SPELLING_KEY) != 0 && strcmp(gconf_entry_get_key(entry), COMPOSER_GCONF_MAGIC_LINKS_KEY) != 0 && strcmp(gconf_entry_get_key(entry), COMPOSER_GCONF_MAGIC_SMILEYS_KEY) != 0) return; } - + enable = gconf_client_get_bool ( client, COMPOSER_GCONF_INLINE_SPELLING_KEY, &error); if (error == NULL) @@ -2294,7 +2294,7 @@ e_msg_composer_set_lite (void) composer_lite = TRUE; } -gboolean +gboolean e_msg_composer_get_lite (void) { return composer_lite; @@ -2308,7 +2308,7 @@ e_msg_composer_lite_new (void) /* Init lite-composer for ever for the session */ composer_lite = TRUE; - composer = e_msg_composer_new (); + composer = e_msg_composer_new (); return composer; } -- cgit v1.2.3 From e4afd3f9fb962ea1295a0657ec9f83a427829171 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 26 May 2009 23:21:02 -0400 Subject: Remove trailing whitespace, again. --- composer/e-msg-composer.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'composer/e-msg-composer.c') diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c index a715774e0d..946bff28c1 100644 --- a/composer/e-msg-composer.c +++ b/composer/e-msg-composer.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -1434,7 +1434,7 @@ msg_composer_update_preferences (GConfClient *client, if (entry) { if (strcmp(gconf_entry_get_key(entry), COMPOSER_GCONF_INLINE_SPELLING_KEY) != 0 && - strcmp(gconf_entry_get_key(entry), COMPOSER_GCONF_MAGIC_LINKS_KEY) != 0 && + strcmp(gconf_entry_get_key(entry), COMPOSER_GCONF_MAGIC_LINKS_KEY) != 0 && strcmp(gconf_entry_get_key(entry), COMPOSER_GCONF_MAGIC_SMILEYS_KEY) != 0) return; } @@ -2928,13 +2928,13 @@ e_msg_composer_new_with_message (CamelMimeMessage *message) /* Remove any other X-Evolution-* headers that may have been set */ xev = mail_tool_remove_xevolution_headers (message); camel_header_raw_clear (&xev); - + /* Check for receipt request */ if (camel_medium_get_header (CAMEL_MEDIUM (message), "Disposition-Notification-To")) { action = GTK_TOGGLE_ACTION (ACTION (REQUEST_READ_RECEIPT)); gtk_toggle_action_set_active (action, TRUE); } - + /* Check for mail priority */ if (camel_medium_get_header (CAMEL_MEDIUM (message), "X-Priority")) { action = GTK_TOGGLE_ACTION (ACTION (PRIORITIZE_MESSAGE)); @@ -3907,7 +3907,7 @@ e_msg_composer_request_close_all (void) /* Try to autosave before closing. If it fails for * some reason, the CLOSE action will still detect - * unsaved changes and prompt the user. + * unsaved changes and prompt the user. * * FIXME If it /does/ prompt the user, the Cancel * button will act the same as Discard Changes, @@ -4094,7 +4094,7 @@ e_load_spell_languages (void) const GtkhtmlSpellLanguage *language; language = gtkhtml_spell_language_lookup (NULL); - + if (language) { spell_languages = g_list_prepend ( spell_languages, (gpointer) language); -- cgit v1.2.3