Johnny's composer changes for Anjal.

1 files changed, 37 insertions, 1 deletions

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,