evolution r34967 - branches/mbarnes-composer/composer

[mbarnes svn gnome org]

Author: mbarnes
Date: Thu Feb  7 00:52:31 2008
New Revision: 34967
URL: http://svn.gnome.org/viewvc/evolution?rev=34967&view=rev

Log:
Remove some functions the rest of the application doesn't need.


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

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	Thu Feb  7 00:52:31 2008
@@ -2890,22 +2890,29 @@
 	/* Override header visibility based on our visible mask.
 	 * XXX Move this into msg_composer_init(). */
 
+	GtkToggleAction *action;
 	gboolean active;
 
 	/* if we're mailing, you cannot disable to so it should appear checked */
+	action = GTK_TOGGLE_ACTION (ACTION (VIEW_TO));
 	active = visible_mask & E_MSG_COMPOSER_VISIBLE_TO;
-	e_msg_composer_set_view_to (composer, active);
+	gtk_toggle_action_set_active (action, active);
 
 	/* ditto for post-to */
+	action = GTK_TOGGLE_ACTION (ACTION (VIEW_POST_TO));
 	active = visible_mask & E_MSG_COMPOSER_VISIBLE_POSTTO;
-	e_msg_composer_set_view_postto (composer, active);
+	gtk_toggle_action_set_active (action, active);
 
 	/* we set these to false initially if we're posting */
-	if (!(visible_mask & E_MSG_COMPOSER_VISIBLE_CC))
-		e_msg_composer_set_view_cc (composer, FALSE);
+	if (!(visible_mask & E_MSG_COMPOSER_VISIBLE_CC)) {
+		action = GTK_TOGGLE_ACTION (ACTION (VIEW_CC));
+		gtk_toggle_action_set_active (action, FALSE);
+	}
 
-	if (!(visible_mask & E_MSG_COMPOSER_VISIBLE_BCC))
-		e_msg_composer_set_view_bcc (composer, FALSE);
+	if (!(visible_mask & E_MSG_COMPOSER_VISIBLE_BCC)) {
+		action = GTK_TOGGLE_ACTION (ACTION (VIEW_BCC));
+		gtk_toggle_action_set_active (action, FALSE);
+	}
 }
 
 static int
@@ -5251,256 +5258,6 @@
 
 
 /**
- * e_msg_composer_get_view_from:
- * @composer: A message composer widget
- *
- * Get the status of the "View From header" flag.
- *
- * Return value: The status of the "View From header" flag.
- **/
-gboolean
-e_msg_composer_get_view_from (EMsgComposer *composer)
-{
-	GtkToggleAction *action;
-
-	g_return_val_if_fail (E_IS_MSG_COMPOSER (composer), FALSE);
-
-	action = GTK_TOGGLE_ACTION (ACTION (VIEW_FROM));
-
-	return gtk_toggle_action_get_active (action);
-}
-
-
-/**
- * e_msg_composer_set_view_from:
- * @composer: A message composer widget
- * @state: whether to show or hide the From selector
- *
- * Controls the state of the From selector
- */
-void
-e_msg_composer_set_view_from (EMsgComposer *composer,
-                              gboolean active)
-{
-	GtkToggleAction *action;
-
-	g_return_if_fail (E_IS_MSG_COMPOSER (composer));
-
-	action = GTK_TOGGLE_ACTION (ACTION (VIEW_FROM));
-
-	gtk_toggle_action_set_active (action, active);
-}
-
-/**
- * e_msg_composer_get_view_replyto:
- * @composer: A message composer widget
- *
- * Get the status of the "View Reply-To header" flag.
- *
- * Return value: The status of the "View Reply-To header" flag.
- **/
-gboolean
-e_msg_composer_get_view_replyto (EMsgComposer *composer)
-{
-	GtkToggleAction *action;
-
-	g_return_val_if_fail (E_IS_MSG_COMPOSER (composer), FALSE);
-
-	action = GTK_TOGGLE_ACTION (ACTION (VIEW_REPLY_TO));
-
-	return gtk_toggle_action_get_active (action);
-}
-
-/**
- * e_msg_composer_set_view_replyto:
- * @composer: A message composer widget
- * @state: whether to show or hide the Reply-To selector
- *
- * Controls the state of the Reply-To selector
- */
-void
-e_msg_composer_set_view_replyto (EMsgComposer *composer,
-                                 gboolean active)
-{
-	GtkToggleAction *action;
-
-	g_return_if_fail (E_IS_MSG_COMPOSER (composer));
-
-	action = GTK_TOGGLE_ACTION (ACTION (VIEW_REPLY_TO));
-
-	gtk_toggle_action_set_active (action, active);
-}
-
-
-/**
- * e_msg_composer_get_view_to:
- * @composer: A message composer widget
- *
- * Get the status of the "View To header" flag.
- *
- * Return value: The status of the "View To header" flag.
- **/
-gboolean
-e_msg_composer_get_view_to (EMsgComposer *composer)
-{
-	GtkToggleAction *action;
-
-	g_return_val_if_fail (E_IS_MSG_COMPOSER (composer), FALSE);
-
-	action = GTK_TOGGLE_ACTION (ACTION (VIEW_TO));
-
-	return gtk_toggle_action_get_active (action);
-}
-
-
-/**
- * e_msg_composer_set_view_to:
- * @composer: A message composer widget
- * @state: whether to show or hide the To selector
- *
- * Controls the state of the To selector
- */
-void
-e_msg_composer_set_view_to (EMsgComposer *composer,
-                            gboolean active)
-{
-	GtkToggleAction *action;
-
-	g_return_if_fail (E_IS_MSG_COMPOSER (composer));
-
-	action = GTK_TOGGLE_ACTION (ACTION (VIEW_TO));
-
-	gtk_toggle_action_set_active (action, active);
-}
-
-
-/**
- * e_msg_composer_get_view_postto:
- * @composer: A message composer widget
- *
- * Get the status of the "View PostTo header" flag.
- *
- * Return value: The status of the "View PostTo header" flag.
- **/
-gboolean
-e_msg_composer_get_view_postto (EMsgComposer *composer)
-{
-	GtkToggleAction *action;
-
-	g_return_val_if_fail (E_IS_MSG_COMPOSER (composer), FALSE);
-
-	action = GTK_TOGGLE_ACTION (ACTION (VIEW_POST_TO));
-
-	return gtk_toggle_action_get_active (action);
-}
-
-
-/**
- * e_msg_composer_set_view_postto:
- * @composer: A message composer widget
- * @state: whether to show or hide the PostTo selector
- *
- * Controls the state of the PostTo selector
- */
-void
-e_msg_composer_set_view_postto (EMsgComposer *composer,
-                                gboolean active)
-{
-	GtkToggleAction *action;
-
-	g_return_if_fail (E_IS_MSG_COMPOSER (composer));
-
-	action = GTK_TOGGLE_ACTION (ACTION (VIEW_POST_TO));
-
-	gtk_toggle_action_set_active (action, active);
-}
-
-
-/**
- * e_msg_composer_get_view_cc:
- * @composer: A message composer widget
- *
- * Get the status of the "View CC header" flag.
- *
- * Return value: The status of the "View CC header" flag.
- **/
-gboolean
-e_msg_composer_get_view_cc (EMsgComposer *composer)
-{
-	GtkToggleAction *action;
-
-	g_return_val_if_fail (E_IS_MSG_COMPOSER (composer), FALSE);
-
-	action = GTK_TOGGLE_ACTION (ACTION (VIEW_CC));
-
-	return gtk_toggle_action_get_active (action);
-}
-
-
-/**
- * e_msg_composer_set_view_cc:
- * @composer: A message composer widget
- * @state: whether to show or hide the cc view
- *
- * Controls the state of the CC display
- */
-void
-e_msg_composer_set_view_cc (EMsgComposer *composer,
-                            gboolean active)
-{
-	GtkToggleAction *action;
-
-	g_return_if_fail (E_IS_MSG_COMPOSER (composer));
-
-	action = GTK_TOGGLE_ACTION (ACTION (VIEW_CC));
-
-	gtk_toggle_action_set_active (action, active);
-}
-
-
-/**
- * e_msg_composer_get_view_bcc:
- * @composer: A message composer widget
- *
- * Get the status of the "View BCC header" flag.
- *
- * Return value: The status of the "View BCC header" flag.
- **/
-gboolean
-e_msg_composer_get_view_bcc (EMsgComposer *composer)
-{
-	GtkToggleAction *action;
-
-	g_return_val_if_fail (E_IS_MSG_COMPOSER (composer), FALSE);
-
-	action = GTK_TOGGLE_ACTION (ACTION (VIEW_BCC));
-
-	return gtk_toggle_action_get_active (action);
-}
-
-
-/**
- * e_msg_composer_set_view_bcc:
- * @composer: A message composer widget
- * @state: whether to show or hide the bcc view
- *
- * Controls the state of the BCC display
- */
-void
-e_msg_composer_set_view_bcc (EMsgComposer *composer,
-                             gboolean active)
-{
-	GtkToggleAction *action;
-
-	g_return_if_fail (E_IS_MSG_COMPOSER (composer));
-
-	action = GTK_TOGGLE_ACTION (ACTION (VIEW_BCC));
-
-	gtk_toggle_action_set_active (action, active);
-}
-
-
-/**
  * e_msg_composer_get_request_receipt
  * @composer: A message composer widget
  *

Modified: branches/mbarnes-composer/composer/e-msg-composer.h
==============================================================================
--- branches/mbarnes-composer/composer/e-msg-composer.h	(original)
+++ branches/mbarnes-composer/composer/e-msg-composer.h	Thu Feb  7 00:52:31 2008
@@ -122,25 +122,6 @@
 void                     e_msg_composer_set_send_html                    (EMsgComposer      *composer,
 									  gboolean           send_html);
 
-gboolean                 e_msg_composer_get_view_from                    (EMsgComposer      *composer);
-void                     e_msg_composer_set_view_from                    (EMsgComposer      *composer,
-									  gboolean           active);
-gboolean                 e_msg_composer_get_view_to                      (EMsgComposer      *composer);
-void                     e_msg_composer_set_view_to                      (EMsgComposer      *composer,
-									  gboolean           active);
-gboolean                 e_msg_composer_get_view_replyto                 (EMsgComposer      *composer);
-void                     e_msg_composer_set_view_replyto                 (EMsgComposer      *composer,
-									  gboolean           active);
-gboolean                 e_msg_composer_get_view_postto                  (EMsgComposer      *composer);
-void                     e_msg_composer_set_view_postto                  (EMsgComposer      *composer,
-									  gboolean           active);
-gboolean                 e_msg_composer_get_view_cc                      (EMsgComposer      *composer);
-void                     e_msg_composer_set_view_cc                      (EMsgComposer      *composer,
-									  gboolean           active);
-gboolean                 e_msg_composer_get_view_bcc                     (EMsgComposer      *composer);
-void                     e_msg_composer_set_view_bcc                     (EMsgComposer      *composer,
-									  gboolean           active);
-
 gboolean                 e_msg_composer_get_request_receipt              (EMsgComposer *composer);
 void                     e_msg_composer_set_request_receipt              (EMsgComposer *composer,
 									  gboolean      request_receipt);