diff options
| author | Peter Williams <peterw@src.gnome.org> | 2000-08-03 23:35:09 +0800 |
|---|---|---|
| committer | Peter Williams <peterw@src.gnome.org> | 2000-08-03 23:35:09 +0800 |
| commit | 7792032178886cb9eafaddaa7b45895766f42f16 (patch) | |
| tree | 05716206c83253abe1a31a548a1c0178fc953e05 | |
| parent | c63dfc2f5181fe3e6f43c82e1ae4b6d0b694d942 (diff) | |
| download | gsoc2013-evolution-7792032178886cb9eafaddaa7b45895766f42f16.tar gsoc2013-evolution-7792032178886cb9eafaddaa7b45895766f42f16.tar.gz gsoc2013-evolution-7792032178886cb9eafaddaa7b45895766f42f16.tar.bz2 gsoc2013-evolution-7792032178886cb9eafaddaa7b45895766f42f16.tar.lz gsoc2013-evolution-7792032178886cb9eafaddaa7b45895766f42f16.tar.xz gsoc2013-evolution-7792032178886cb9eafaddaa7b45895766f42f16.tar.zst gsoc2013-evolution-7792032178886cb9eafaddaa7b45895766f42f16.zip | |
Check for identity before sending ; remove gconf_init call
svn path=/trunk/; revision=4505
| -rw-r--r-- | mail/ChangeLog | 7 | ||||
| -rw-r--r-- | mail/mail-ops.c | 11 | ||||
| -rw-r--r-- | mail/main.c | 4 |
3 files changed, 20 insertions, 2 deletions
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 (); |