From e06c2e80e778e0077cf8bf1e71d7bcca06cdbff8 Mon Sep 17 00:00:00 2001
From: Milan Crha <mcrha@redhat.com>
Date: Wed, 9 Jul 2008 07:58:55 +0000
Subject: ** Fix for bug #206592

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.


svn path=/trunk/; revision=35733
---
 composer/ChangeLog             |  9 +++++++++
 composer/e-composer-actions.c  | 15 +++++++++++++++
 composer/e-composer-actions.h  |  2 ++
 composer/evolution-composer.ui |  2 ++
 4 files changed, 28 insertions(+)

diff --git a/composer/ChangeLog b/composer/ChangeLog
index d990d1bf70..1eeb5bb7e2 100644
--- a/composer/ChangeLog
+++ b/composer/ChangeLog
@@ -1,3 +1,12 @@
+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.
+
 2008-06-30  Matthew Barnes  <mbarnes@redhat.com>
 
 	* e-composer-post-header.c (composer_post_header_finalize):
diff --git a/composer/e-composer-actions.c b/composer/e-composer-actions.c
index 0d86e64d48..07ec555452 100644
--- a/composer/e-composer-actions.c
+++ b/composer/e-composer-actions.c
@@ -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"
 
@@ -339,6 +340,13 @@ action_send_options_cb (GtkAction *action,
 			"mail-composer:send-options-support", NULL);
 }
 
+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 @@ static GtkActionEntry entries[] = {
 	  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",
diff --git a/composer/e-composer-actions.h b/composer/e-composer-actions.h
index ccbaa37383..9780fd8dc9 100644
--- a/composer/e-composer-actions.h
+++ b/composer/e-composer-actions.h
@@ -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) \
diff --git a/composer/evolution-composer.ui b/composer/evolution-composer.ui
index feb9cdfa9b..7413770af9 100644
--- a/composer/evolution-composer.ui
+++ b/composer/evolution-composer.ui
@@ -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'/>
-- 
cgit v1.2.3