aboutsummaryrefslogtreecommitdiffstats
path: root/mail
diff options
context:
space:
mode:
Diffstat (limited to 'mail')
-rw-r--r--mail/ChangeLog7
-rw-r--r--mail/mail-ops.c10
2 files changed, 12 insertions, 5 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 4c418ad95e..d6c766f980 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,9 @@
+2001-08-10 Not Zed <NotZed@Ximian.com>
+
+ * mail-ops.c (mail_transfer_messages): Dont want it to keep on
+ running if it got bad arguments, want it to bloody well crash.
+ (mail_append_mail): Same here.
+
2001-08-09 Jeffrey Stedfast <fejj@ximian.com>
* message-list.c (mlfe_callback): Added a g_assert_not_reached() -
@@ -44,6 +50,7 @@
* message-browser.c (set_bonobo_ui): Remove the "Customize
Toolbar" thing.
+>>>>>>> 1.1526
2001-08-08 Not Zed <NotZed@Ximian.com>
* mail-ops.c (send_mail_send): Dont double-register this
diff --git a/mail/mail-ops.c b/mail/mail-ops.c
index 6f293502cc..c06069dddc 100644
--- a/mail/mail-ops.c
+++ b/mail/mail-ops.c
@@ -863,8 +863,8 @@ mail_append_mail (CamelFolder *folder, CamelMimeMessage *message, CamelMessageIn
{
struct _append_msg *m;
- g_return_if_fail (CAMEL_IS_FOLDER (folder));
- g_return_if_fail (CAMEL_IS_MIME_MESSAGE (message));
+ g_assert(CAMEL_IS_FOLDER (folder));
+ g_assert(CAMEL_IS_MIME_MESSAGE (message));
m = mail_msg_new (&append_mail_op, NULL, sizeof (*m));
m->folder = folder;
@@ -996,9 +996,9 @@ mail_transfer_messages (CamelFolder *source, GPtrArray *uids,
{
struct _transfer_msg *m;
- g_return_if_fail (CAMEL_IS_FOLDER (source));
- g_return_if_fail (uids != NULL);
- g_return_if_fail (dest_uri != NULL);
+ g_assert(CAMEL_IS_FOLDER (source));
+ g_assert(uids != NULL);
+ g_assert(dest_uri != NULL);
m = mail_msg_new(&transfer_messages_op, NULL, sizeof(*m));
m->source = source;