aboutsummaryrefslogtreecommitdiffstats
path: root/mail
diff options
context:
space:
mode:
authorDan Winship <danw@src.gnome.org>2001-09-11 01:03:42 +0800
committerDan Winship <danw@src.gnome.org>2001-09-11 01:03:42 +0800
commit0ef4bba69846b14b805e219ea3a967e151b2686e (patch)
tree9b8cf16348097052dd869f6579f516cbd2964e60 /mail
parent30d3750b07abbdb0e7ab0dd9171bf9164387621a (diff)
downloadgsoc2013-evolution-0ef4bba69846b14b805e219ea3a967e151b2686e.tar
gsoc2013-evolution-0ef4bba69846b14b805e219ea3a967e151b2686e.tar.gz
gsoc2013-evolution-0ef4bba69846b14b805e219ea3a967e151b2686e.tar.bz2
gsoc2013-evolution-0ef4bba69846b14b805e219ea3a967e151b2686e.tar.lz
gsoc2013-evolution-0ef4bba69846b14b805e219ea3a967e151b2686e.tar.xz
gsoc2013-evolution-0ef4bba69846b14b805e219ea3a967e151b2686e.tar.zst
gsoc2013-evolution-0ef4bba69846b14b805e219ea3a967e151b2686e.zip
Fix obvious dumb mistake in previous commit that made it *always* complain
* mail-callbacks.c (composer_get_message): Fix obvious dumb mistake in previous commit that made it *always* complain you had invalid recipients. svn path=/trunk/; revision=12733
Diffstat (limited to 'mail')
-rw-r--r--mail/ChangeLog6
-rw-r--r--mail/mail-callbacks.c34
2 files changed, 24 insertions, 16 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 9ada2111ec..51df80a6c2 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,9 @@
+2001-09-10 Dan Winship <danw@ximian.com>
+
+ * mail-callbacks.c (composer_get_message): Fix obvious dumb
+ mistake in previous commit that made it *always* complain you had
+ invalid recipients.
+
2001-09-09 Jon Trowbridge <trow@ximian.com>
* mail-callbacks.c (composer_get_message): Complain if we are
diff --git a/mail/mail-callbacks.c b/mail/mail-callbacks.c
index 7f725f7f5f..f216410546 100644
--- a/mail/mail-callbacks.c
+++ b/mail/mail-callbacks.c
@@ -410,26 +410,28 @@ composer_get_message (EMsgComposer *composer)
have_invalid = TRUE;
}
- msg = _("This message contains invalid recipients:");
- for (i = 0; recipients[i]; ++i) {
- if (! e_destination_is_valid (recipients[i])) {
- new_msg = g_strdup_printf ("%s\n %s", msg, e_destination_get_address (recipients[i]));
- g_free (msg);
- msg = new_msg;
+ if (have_invalid) {
+ msg = _("This message contains invalid recipients:");
+ for (i = 0; recipients[i]; ++i) {
+ if (! e_destination_is_valid (recipients[i])) {
+ new_msg = g_strdup_printf ("%s\n %s", msg, e_destination_get_address (recipients[i]));
+ g_free (msg);
+ msg = new_msg;
+ }
}
- }
-
- new_msg = e_utf8_from_locale_string (msg);
- g_free (msg);
- msg = new_msg;
+
+ new_msg = e_utf8_from_locale_string (msg);
+ g_free (msg);
+ msg = new_msg;
- message_box = gnome_message_box_new (msg, GNOME_MESSAGE_BOX_WARNING, GNOME_STOCK_BUTTON_OK, NULL);
+ message_box = gnome_message_box_new (msg, GNOME_MESSAGE_BOX_WARNING, GNOME_STOCK_BUTTON_OK, NULL);
- gnome_dialog_run_and_close (GNOME_DIALOG (message_box));
+ gnome_dialog_run_and_close (GNOME_DIALOG (message_box));
- camel_object_unref (CAMEL_OBJECT (message));
- message = NULL;
- goto finished;
+ camel_object_unref (CAMEL_OBJECT (message));
+ message = NULL;
+ goto finished;
+ }
}
/* Check for recipients */