From 7792032178886cb9eafaddaa7b45895766f42f16 Mon Sep 17 00:00:00 2001
From: Peter Williams <peterw@src.gnome.org>
Date: Thu, 3 Aug 2000 15:35:09 +0000
Subject: Check for identity before sending ; remove gconf_init call

svn path=/trunk/; revision=4505
---
 mail/ChangeLog  |  7 +++++++
 mail/mail-ops.c | 11 +++++++++++
 mail/main.c     |  4 ++--
 3 files changed, 20 insertions(+), 2 deletions(-)

(limited to 'mail')

diff --git a/mail/ChangeLog b/mail/ChangeLog
index a4a4ea74ed..40a3dc20a0 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,10 @@
+2000-08-03  Peter Williams  <peterw@helixcode.com>
+
+	* main.c (main): One more gconf reference to take out...
+
+	* mail-ops.c (composer_send_cb): Check for an identity before
+	sending.
+	
 2000-08-03  JP Rosevear  <jpr@helixcode.com>
 
 	* mail-config.glade: Increase window size slightly, rename
diff --git a/mail/mail-ops.c b/mail/mail-ops.c
index 76030e996a..036dd28a2b 100644
--- a/mail/mail-ops.c
+++ b/mail/mail-ops.c
@@ -519,6 +519,17 @@ composer_send_cb (EMsgComposer *composer, gpointer data)
 
 	config = mail_config_fetch ();
 	
+	if (!check_configured() || !config->ids) {
+		GtkWidget *message;
+
+		message = gnome_warning_dialog_parented (_("You need to configure an identity\n"
+							   "before you can send mail."),
+							 gtk_widget_get_ancestor (GTK_WIDGET (composer),
+										  GTK_TYPE_WINDOW));
+		gnome_dialog_run_and_close (GNOME_DIALOG (message));
+		return;
+	}
+
 	if (!from) {
 		CamelInternetAddress *ciaddr;
 
diff --git a/mail/main.c b/mail/main.c
index c330f412e5..93f118da5f 100644
--- a/mail/main.c
+++ b/mail/main.c
@@ -12,7 +12,7 @@
 #include <bonobo/bonobo-main.h>
 #include <bonobo/bonobo-object-directory.h>
 #include <glade/glade.h>
-#include <gconf/gconf.h>
+/*#include <gconf/gconf.h>*/
 #include <liboaf/liboaf.h>
 
 #include "e-util/e-gui-utils.h"
@@ -44,7 +44,7 @@ main (int argc, char *argv [])
 			 "Bonobo against GOAD instead of OAF.");
 	}
 
-	gconf_init (argc, argv, NULL);
+	/*gconf_init (argc, argv, NULL);*/
 
 	glade_gnome_init ();
 
-- 
cgit v1.2.3