From 6dce401d7379e8b5724bccde1f731de65435089f Mon Sep 17 00:00:00 2001
From: Federico Mena Quintero <federico@novell.com>
Date: Tue, 4 May 2010 15:40:31 -0500
Subject: Remove the 'View From' menu item from the composer

Now the From header will only be shown if you have more than
one mail account.

Signed-off-by: Federico Mena Quintero <federico@novell.com>
---
 composer/e-composer-actions.c  | 8 --------
 composer/e-composer-actions.h  | 2 --
 composer/e-composer-private.c  | 4 ----
 composer/evolution-composer.ui | 1 -
 4 files changed, 15 deletions(-)

(limited to 'composer')

diff --git a/composer/e-composer-actions.c b/composer/e-composer-actions.c
index 0c1a28b130..70f7c44ed9 100644
--- a/composer/e-composer-actions.c
+++ b/composer/e-composer-actions.c
@@ -420,14 +420,6 @@ static GtkToggleActionEntry toggle_entries[] = {
 	  NULL,  /* Handled by property bindings */
 	  FALSE },
 
-	{ "view-from",
-	  NULL,
-	  N_("_From Field"),
-	  NULL,
-	  N_("Toggles whether the From chooser is displayed"),
-	  NULL,  /* Handled by property bindings */
-	  FALSE },
-
 	{ "view-reply-to",
 	  NULL,
 	  N_("_Reply-To Field"),
diff --git a/composer/e-composer-actions.h b/composer/e-composer-actions.h
index 18c75eb3be..80147a8f24 100644
--- a/composer/e-composer-actions.h
+++ b/composer/e-composer-actions.h
@@ -57,8 +57,6 @@
 	E_COMPOSER_ACTION ((composer), "view-bcc")
 #define E_COMPOSER_ACTION_VIEW_CC(composer) \
 	E_COMPOSER_ACTION ((composer), "view-cc")
-#define E_COMPOSER_ACTION_VIEW_FROM(composer) \
-	E_COMPOSER_ACTION ((composer), "view-from")
 #define E_COMPOSER_ACTION_VIEW_REPLY_TO(composer) \
 	E_COMPOSER_ACTION ((composer), "view-reply-to")
 
diff --git a/composer/e-composer-private.c b/composer/e-composer-private.c
index ba022f3972..293393cf35 100644
--- a/composer/e-composer-private.c
+++ b/composer/e-composer-private.c
@@ -351,10 +351,6 @@ e_composer_private_constructed (EMsgComposer *composer)
 				action = ACTION (VIEW_CC);
 				break;
 
-			case E_COMPOSER_HEADER_FROM:
-				action = ACTION (VIEW_FROM);
-				break;
-
 			case E_COMPOSER_HEADER_REPLY_TO:
 				action = ACTION (VIEW_REPLY_TO);
 				break;
diff --git a/composer/evolution-composer.ui b/composer/evolution-composer.ui
index 3b1fee7a72..f283d35dcb 100644
--- a/composer/evolution-composer.ui
+++ b/composer/evolution-composer.ui
@@ -22,7 +22,6 @@
     </placeholder>
     <placeholder name='pre-insert-menu'>
       <menu action='view-menu'>
-        <menuitem action='view-from'/>
         <menuitem action='view-reply-to'/>
         <menuitem action='view-cc'/>
         <menuitem action='view-bcc'/>
-- 
cgit v1.2.3