evolution r34964 - branches/mbarnes-composer/composer

[mbarnes svn gnome org]

Author: mbarnes
Date: Wed Feb  6 04:46:47 2008
New Revision: 34964
URL: http://svn.gnome.org/viewvc/evolution?rev=34964&view=rev

Log:
Delete the private "view" flags; use the toggle actions instead.
Remove Bonobo crud related to the View menu.


Modified:
   branches/mbarnes-composer/composer/e-composer-private.h
   branches/mbarnes-composer/composer/e-msg-composer.c

Modified: branches/mbarnes-composer/composer/e-composer-private.h
==============================================================================
--- branches/mbarnes-composer/composer/e-composer-private.h	(original)
+++ branches/mbarnes-composer/composer/e-composer-private.h	Wed Feb  6 04:46:47 2008
@@ -54,13 +54,6 @@
 	guint32 pgp_encrypt            : 1;
 	guint32 smime_sign             : 1;
 	guint32 smime_encrypt          : 1;
-	guint32 view_from              : 1;
-	guint32 view_replyto           : 1;
-	guint32 view_to                : 1;
-	guint32 view_postto            : 1;
-	guint32 view_bcc               : 1;
-	guint32 view_cc                : 1;
-	guint32 view_subject           : 1;
 	guint32 request_receipt        : 1;
 	guint32 set_priority	       : 1;
 	guint32 has_changed            : 1;

Modified: branches/mbarnes-composer/composer/e-msg-composer.c
==============================================================================
--- branches/mbarnes-composer/composer/e-msg-composer.c	(original)
+++ branches/mbarnes-composer/composer/e-msg-composer.c	Wed Feb  6 04:46:47 2008
@@ -1829,84 +1829,6 @@
 
 
 static void
-menu_view_from_cb (BonoboUIComponent           *component,
-		   const char                  *path,
-		   Bonobo_UIComponent_EventType type,
-		   const char                  *state,
-		   gpointer                     user_data)
-{
-	if (type != Bonobo_UIComponent_STATE_CHANGED)
-		return;
-
-	e_msg_composer_set_view_from (E_MSG_COMPOSER (user_data), atoi (state));
-}
-
-static void
-menu_view_replyto_cb (BonoboUIComponent           *component,
-		      const char                  *path,
-		      Bonobo_UIComponent_EventType type,
-		      const char                  *state,
-		      gpointer                     user_data)
-{
-	if (type != Bonobo_UIComponent_STATE_CHANGED)
-		return;
-
-	e_msg_composer_set_view_replyto (E_MSG_COMPOSER (user_data), atoi (state));
-}
-
-static void
-menu_view_to_cb (BonoboUIComponent           *component,
-		      const char                  *path,
-		      Bonobo_UIComponent_EventType type,
-		      const char                  *state,
-		      gpointer                     user_data)
-{
-	if (type != Bonobo_UIComponent_STATE_CHANGED)
-		return;
-
-	e_msg_composer_set_view_to (E_MSG_COMPOSER (user_data), atoi (state));
-}
-
-static void
-menu_view_postto_cb (BonoboUIComponent           *component,
-		      const char                  *path,
-		      Bonobo_UIComponent_EventType type,
-		      const char                  *state,
-		      gpointer                     user_data)
-{
-	if (type != Bonobo_UIComponent_STATE_CHANGED)
-		return;
-
-	e_msg_composer_set_view_postto (E_MSG_COMPOSER (user_data), atoi (state));
-}
-
-static void
-menu_view_cc_cb (BonoboUIComponent           *component,
-		 const char                  *path,
-		 Bonobo_UIComponent_EventType type,
-		 const char                  *state,
-		 gpointer                     user_data)
-{
-	if (type != Bonobo_UIComponent_STATE_CHANGED)
-		return;
-
-	e_msg_composer_set_view_cc (E_MSG_COMPOSER (user_data), atoi (state));
-}
-
-static void
-menu_view_bcc_cb (BonoboUIComponent           *component,
-		  const char                  *path,
-		  Bonobo_UIComponent_EventType type,
-		  const char                  *state,
-		  gpointer                     user_data)
-{
-	if (type != Bonobo_UIComponent_STATE_CHANGED)
-		return;
-
-	e_msg_composer_set_view_bcc (E_MSG_COMPOSER (user_data), atoi (state));
-}
-
-static void
 menu_insert_receipt_cb (BonoboUIComponent           *component,
 			const char                  *path,
 			Bonobo_UIComponent_EventType type,
@@ -2032,54 +1954,6 @@
 		p->uic, "FormatHtml",
 		menu_format_html_cb, composer);
 
-	/* View/From */
-	bonobo_ui_component_set_prop (
-		p->uic, "/commands/ViewFrom",
-		"state", p->view_from ? "1" : "0", NULL);
-	bonobo_ui_component_add_listener (
-		p->uic, "ViewFrom",
-		menu_view_from_cb, composer);
-
-	/* View/ReplyTo */
-	bonobo_ui_component_set_prop (
-		p->uic, "/commands/ViewReplyTo",
-		"state", p->view_replyto ? "1" : "0", NULL);
-	bonobo_ui_component_add_listener (
-		p->uic, "ViewReplyTo",
-		menu_view_replyto_cb, composer);
-
-	/* View/To */
-	bonobo_ui_component_set_prop (
-		p->uic, "/commands/ViewTo",
-		"state", p->view_to ? "1" : "0", NULL);
-	bonobo_ui_component_add_listener (
-		p->uic, "ViewTo",
-		menu_view_to_cb, composer);
-
-	/* View/PostTo */
-	bonobo_ui_component_set_prop (
-		p->uic, "/commands/ViewPostTo",
-		"state", p->view_postto ? "1" : "0", NULL);
-	bonobo_ui_component_add_listener (
-		p->uic, "ViewPostTo",
-		menu_view_postto_cb, composer);
-
-	/* View/CC */
-	bonobo_ui_component_set_prop (
-		p->uic, "/commands/ViewCC",
-		"state", p->view_cc ? "1" : "0", NULL);
-	bonobo_ui_component_add_listener (
-		p->uic, "ViewCC",
-		menu_view_cc_cb, composer);
-
-	/* View/BCC */
-	bonobo_ui_component_set_prop (
-		p->uic, "/commands/ViewBCC",
-		"state", p->view_bcc ? "1" : "0", NULL);
-	bonobo_ui_component_add_listener (
-		p->uic, "ViewBCC",
-		menu_view_bcc_cb, composer);
-
 	/* Insert/Request Receipt */
 	bonobo_ui_component_set_prop (
 		p->uic, "/commands/RequestReceipt",
@@ -3013,67 +2887,59 @@
 static void
 e_msg_composer_load_config (EMsgComposer *composer, int visible_mask)
 {
-	GConfClient *gconf;
-	EMsgComposerPrivate *p = composer->priv;
+	/* Override header visibility based on our visible mask.
+	 * XXX Move this into msg_composer_init(). */
 
-	gconf = gconf_client_get_default ();
-
-	p->view_from = gconf_client_get_bool (
-		gconf, "/apps/evolution/mail/composer/view/From", NULL);
-	p->view_replyto = gconf_client_get_bool (
-		gconf, "/apps/evolution/mail/composer/view/ReplyTo", NULL);
-	p->view_to = gconf_client_get_bool (
-		gconf, "/apps/evolution/mail/composer/view/To", NULL);
-	p->view_postto = gconf_client_get_bool (
-		gconf, "/apps/evolution/mail/composer/view/PostTo", NULL);
-	p->view_cc = gconf_client_get_bool (
-		gconf, "/apps/evolution/mail/composer/view/Cc", NULL);
-	p->view_bcc = gconf_client_get_bool (
-		gconf, "/apps/evolution/mail/composer/view/Bcc", NULL);
-	p->view_subject = gconf_client_get_bool (
-		gconf, "/apps/evolution/mail/composer/view/Subject", NULL);
+	gboolean active;
 
 	/* if we're mailing, you cannot disable to so it should appear checked */
-	if (visible_mask & E_MSG_COMPOSER_VISIBLE_TO)
-		p->view_to = TRUE;
-	else
-		p->view_to = FALSE;
+	active = visible_mask & E_MSG_COMPOSER_VISIBLE_TO;
+	e_msg_composer_set_view_to (composer, active);
 
 	/* ditto for post-to */
-	if (visible_mask & E_MSG_COMPOSER_VISIBLE_POSTTO)
-		p->view_postto = TRUE;
-	else
-		p->view_postto = FALSE;
+	active = visible_mask & E_MSG_COMPOSER_VISIBLE_POSTTO;
+	e_msg_composer_set_view_postto (composer, active);
 
 	/* we set these to false initially if we're posting */
 	if (!(visible_mask & E_MSG_COMPOSER_VISIBLE_CC))
-		p->view_cc = FALSE;
+		e_msg_composer_set_view_cc (composer, FALSE);
 
 	if (!(visible_mask & E_MSG_COMPOSER_VISIBLE_BCC))
-		p->view_bcc = FALSE;
-
-	g_object_unref (gconf);
+		e_msg_composer_set_view_bcc (composer, FALSE);
 }
 
 static int
 e_msg_composer_get_visible_flags (EMsgComposer *composer)
 {
-	int flags = 0;
-	EMsgComposerPrivate *p = composer->priv;
+	GtkToggleAction *action;
+	gint flags = 0;
 
-	if (p->view_from)
+	action = GTK_TOGGLE_ACTION (ACTION (VIEW_FROM));
+	if (gtk_toggle_action_get_active (action))
 		flags |= E_MSG_COMPOSER_VISIBLE_FROM;
-	if (p->view_replyto)
+
+	action = GTK_TOGGLE_ACTION (ACTION (VIEW_REPLY_TO));
+	if (gtk_toggle_action_get_active (action))
 		flags |= E_MSG_COMPOSER_VISIBLE_REPLYTO;
-	if (p->view_to)
+
+	action = GTK_TOGGLE_ACTION (ACTION (VIEW_TO));
+	if (gtk_toggle_action_get_active (action))
 		flags |= E_MSG_COMPOSER_VISIBLE_TO;
-	if (p->view_postto)
+
+	action = GTK_TOGGLE_ACTION (ACTION (VIEW_POST_TO));
+	if (gtk_toggle_action_get_active (action))
 		flags |= E_MSG_COMPOSER_VISIBLE_POSTTO;
-	if (p->view_cc)
+
+	action = GTK_TOGGLE_ACTION (ACTION (VIEW_CC));
+	if (gtk_toggle_action_get_active (action))
 		flags |= E_MSG_COMPOSER_VISIBLE_CC;
-	if (p->view_bcc)
+
+	action = GTK_TOGGLE_ACTION (ACTION (VIEW_BCC));
+	if (gtk_toggle_action_get_active (action))
 		flags |= E_MSG_COMPOSER_VISIBLE_BCC;
-	if (p->view_subject)
+
+	action = GTK_TOGGLE_ACTION (ACTION (VIEW_SUBJECT));
+	if (gtk_toggle_action_get_active (action))
 		flags |= E_MSG_COMPOSER_VISIBLE_SUBJECT;
 
 	/*