From 7a65fa93f1161e07356a7cc9e63b976c1ce1453e Mon Sep 17 00:00:00 2001
From: Not Zed <NotZed@Ximian.com>
Date: Thu, 8 Jan 2004 06:09:33 +0000
Subject: ** See bug #50786

2004-01-08  Not Zed  <NotZed@Ximian.com>

        ** See bug #50786

        * GNOME_Evolution_Mail.server.in.in: Remove :: from startup wizard
        iid, and put the mail wizard into the right factory.

        * mail-component.c (impl_requestCreateItem, impl_handleURI):
        * em-folder-browser.c (emfb_mail_compose): check we have an
        account before trying to send mail.

svn path=/trunk/; revision=24104
---
 mail/ChangeLog                         | 11 +++++++++++
 mail/GNOME_Evolution_Mail.server.in.in |  4 ++--
 mail/em-folder-browser.c               |  3 +++
 mail/mail-component.c                  |  6 ++++++
 4 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/mail/ChangeLog b/mail/ChangeLog
index 72f1b12eb3..60ec0d03c6 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,14 @@
+2004-01-08  Not Zed  <NotZed@Ximian.com>
+
+	** See bug #50786
+	
+	* GNOME_Evolution_Mail.server.in.in: Remove :: from startup wizard
+	iid, and put the mail wizard into the right factory.
+
+	* mail-component.c (impl_requestCreateItem, impl_handleURI): 
+	* em-folder-browser.c (emfb_mail_compose): check we have an
+	account before trying to send mail.
+
 2004-01-07  Jeffrey Stedfast  <fejj@ximian.com>
 
 	* mail-component.c (mail_component_init): Don't migrate stuff here
diff --git a/mail/GNOME_Evolution_Mail.server.in.in b/mail/GNOME_Evolution_Mail.server.in.in
index b52a80267b..36e48bce0d 100644
--- a/mail/GNOME_Evolution_Mail.server.in.in
+++ b/mail/GNOME_Evolution_Mail.server.in.in
@@ -95,10 +95,10 @@
   <!-- (wizard) -->
   <oaf_server iid="OAFIID:GNOME_Evolution_Mail_Wizard:@VERSION@"
 	      type="factory"
-	      location="OAFIID:GNOME_Evolution_Mail_ControlFactory:@VERSION@">
+	      location="OAFIID:GNOME_Evolution_Mail_Factory:@VERSION@">
 
     <oaf_attribute name="repo_ids" type="stringv">
-      <item value="IDL:GNOME/Evolution/StartupWizard::@VERSION@"/>
+      <item value="IDL:GNOME/Evolution/StartupWizard:@VERSION@"/>
     </oaf_attribute>
 
     <oaf_attribute name="evolution:startup_wizard:priority" type="number"
diff --git a/mail/em-folder-browser.c b/mail/em-folder-browser.c
index 563baa8071..ea89bd15a7 100644
--- a/mail/em-folder-browser.c
+++ b/mail/em-folder-browser.c
@@ -602,6 +602,9 @@ emfb_forget_passwords(BonoboUIComponent *uid, void *data, const char *path)
 static void
 emfb_mail_compose(BonoboUIComponent *uid, void *data, const char *path)
 {
+	if (!em_utils_check_user_can_send_mail((GtkWidget *)data))
+		return;
+
 	em_utils_compose_new_message ();
 }
 
diff --git a/mail/mail-component.c b/mail/mail-component.c
index a05dbd7526..af9add5a80 100644
--- a/mail/mail-component.c
+++ b/mail/mail-component.c
@@ -405,6 +405,9 @@ impl_requestCreateItem (PortableServer_Servant servant,
 				     ex_GNOME_Evolution_Component_UnknownType, NULL);
 		return;
 	}
+
+	if (!em_utils_check_user_can_send_mail(NULL))
+		return;
 	
 	em_utils_compose_new_message ();
 }
@@ -413,6 +416,9 @@ static void
 impl_handleURI (PortableServer_Servant servant, const char *uri, CORBA_Environment *ev)
 {
 	if (!strncmp (uri, "mailto:", 7)) {
+		if (!em_utils_check_user_can_send_mail(NULL))
+			return;
+
 		em_utils_compose_new_message_with_mailto (uri);
 	}
 }
-- 
cgit v1.2.3