aboutsummaryrefslogtreecommitdiffstats
path: root/mail
diff options
context:
space:
mode:
Diffstat (limited to 'mail')
-rw-r--r--mail/ChangeLog3
-rw-r--r--mail/mail-callbacks.c18
-rw-r--r--mail/mail-display.c2
3 files changed, 13 insertions, 10 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 0ddaf80b0b..afa6f28368 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,5 +1,8 @@
2001-09-16 Jeffrey Stedfast <fejj@ximian.com>
+ * mail-display.c (pixbuf_gen_idle): Don;t destroy the pixbuf
+ loader, unref it instead.
+
* mail-config.c (mail_config_folder_to_cachename): Use
camel_folder_get_uri().
diff --git a/mail/mail-callbacks.c b/mail/mail-callbacks.c
index b6b50e36d0..90e191612b 100644
--- a/mail/mail-callbacks.c
+++ b/mail/mail-callbacks.c
@@ -404,17 +404,18 @@ composer_get_message (EMsgComposer *composer)
gboolean have_invalid = FALSE;
gchar *msg, *new_msg;
GtkWidget *message_box;
-
+
for (i = 0; recipients[i] && !have_invalid; ++i) {
- if (! e_destination_is_valid (recipients[i]))
+ if (!e_destination_is_valid (recipients[i]))
have_invalid = TRUE;
}
-
+
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]));
+ 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;
}
@@ -423,11 +424,11 @@ composer_get_message (EMsgComposer *composer)
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);
-
+
gnome_dialog_run_and_close (GNOME_DIALOG (message_box));
-
+
camel_object_unref (CAMEL_OBJECT (message));
message = NULL;
goto finished;
@@ -524,7 +525,6 @@ composer_get_message (EMsgComposer *composer)
recipients = e_msg_composer_get_recipients (composer);
e_destination_touchv (recipients);
-
finished:
e_destination_freev (recipients);
return message;
diff --git a/mail/mail-display.c b/mail/mail-display.c
index fab2184652..99e5710e57 100644
--- a/mail/mail-display.c
+++ b/mail/mail-display.c
@@ -591,7 +591,7 @@ pixbuf_gen_idle (struct _PixbufLoader *pbl)
gtk_signal_disconnect (GTK_OBJECT (pbl->eb), pbl->destroy_id);
if (pbl->loader) {
gdk_pixbuf_loader_close (pbl->loader);
- gtk_object_destroy (GTK_OBJECT (pbl->loader));
+ gtk_object_unref (GTK_OBJECT (pbl->loader));
camel_object_unref (CAMEL_OBJECT (pbl->mstream));
}
g_free (pbl->type);