evolution r35733 - trunk/composer

[mcrha svn gnome org]

Author: mcrha
Date: Wed Jul  9 07:58:55 2008
New Revision: 35733
URL: http://svn.gnome.org/viewvc/evolution?rev=35733&view=rev

Log:
2008-07-09  Milan Crha  <mcrha redhat com>

	** Fix for bug #206592

	* evolution-composer.ui:
	* e-composer-actions.h:
	* e-composer-actions.c: (action_new_message_cb), (entries):
	Action to invoke New Message window from the composer itself.



Modified:
   trunk/composer/ChangeLog
   trunk/composer/e-composer-actions.c
   trunk/composer/e-composer-actions.h
   trunk/composer/evolution-composer.ui

Modified: trunk/composer/e-composer-actions.c
==============================================================================
--- trunk/composer/e-composer-actions.c	(original)
+++ trunk/composer/e-composer-actions.c	Wed Jul  9 07:58:55 2008
@@ -25,6 +25,7 @@
 #include <e-util/e-error.h>
 #include <mail/em-event.h>
 #include <mail/em-format-html-print.h>
+#include <mail/em-composer-utils.h>
 
 #include "misc/e-charset-picker.h"
 
@@ -340,6 +341,13 @@
 }
 
 static void
+action_new_message_cb (GtkAction *action,
+                        EMsgComposer *composer)
+{
+	em_utils_compose_new_message (NULL);
+}
+
+static void
 action_smime_encrypt_cb (GtkToggleAction *action,
                          EMsgComposer *composer)
 {
@@ -522,6 +530,13 @@
 	  N_("Insert Send options"),
 	  G_CALLBACK (action_send_options_cb) },
 
+	{ "new-message",
+	  "mail-message-new",
+	  N_("New _Message"),
+	  "<Control>n",
+	  N_("Open New Message window"),
+	  G_CALLBACK (action_new_message_cb) },
+
 	/* Menus */
 
 	{ "charset-menu",

Modified: trunk/composer/e-composer-actions.h
==============================================================================
--- trunk/composer/e-composer-actions.h	(original)
+++ trunk/composer/e-composer-actions.h	Wed Jul  9 07:58:55 2008
@@ -51,6 +51,8 @@
 	E_COMPOSER_ACTION ((composer), "send")
 #define E_COMPOSER_ACTION_SEND_OPTIONS(composer) \
 	E_COMPOSER_ACTION ((composer), "send-options")
+#define E_COMPOSER_ACTION_NEW_MESSAGE(composer) \
+	E_COMPOSER_ACTION ((composer), "new-message")
 #define E_COMPOSER_ACTION_SMIME_ENCRYPT(composer) \
 	E_COMPOSER_ACTION ((composer), "smime-encrypt")
 #define E_COMPOSER_ACTION_SMIME_SIGN(composer) \

Modified: trunk/composer/evolution-composer.ui
==============================================================================
--- trunk/composer/evolution-composer.ui	(original)
+++ trunk/composer/evolution-composer.ui	Wed Jul  9 07:58:55 2008
@@ -4,6 +4,8 @@
       <menu action='file-menu'>
         <menuitem action='send'/>
         <separator/>
+        <menuitem action='new-message'/>
+        <separator/>
         <menuitem action='save'/>
         <menuitem action='save-as'/>
         <menuitem action='save-draft'/>