2009-04-03 [colin] 3.7.1cvs37
[claws.git] / src / compose.c
index 34b4f07be74854f408401b737cf5fbf4f36e1a76..3c3cf4ab606cc0418090d08ad41e662635c575bb 100644 (file)
@@ -954,7 +954,7 @@ Compose *compose_generic_new(PrefsAccount *account, const gchar *mailto, FolderI
 
        /* if no account prefs set, fallback to the current one */
        if (!account) account = cur_account;
-       g_return_val_if_fail(account != NULL, NULL);
+       cm_return_val_if_fail(account != NULL, NULL);
 
        compose = compose_create(account, item, COMPOSE_NEW, FALSE);
 
@@ -1018,9 +1018,20 @@ Compose *compose_generic_new(PrefsAccount *account, const gchar *mailto, FolderI
                if (mailto && *mailto != '\0') {
                        compose_entries_set(compose, mailto, COMPOSE_TO);
 
-               } else if (item && item->prefs->enable_default_to) {
-                       compose_entry_append(compose, item->prefs->default_to, COMPOSE_TO);
-                       compose_entry_mark_default_to(compose, item->prefs->default_to);
+               } else if (item && item->prefs) {
+                       if (item->prefs->enable_default_bcc) {
+                               compose_entry_append(compose, item->prefs->default_bcc, COMPOSE_BCC);
+                       }
+                       if (item->prefs->enable_default_cc) {
+                               compose_entry_append(compose, item->prefs->default_cc, COMPOSE_CC);
+                       }
+                       if (item->prefs->enable_default_replyto) {
+                               compose_entry_append(compose, item->prefs->default_replyto, COMPOSE_REPLYTO);
+                       }
+                       if (item->prefs->enable_default_to) {
+                               compose_entry_append(compose, item->prefs->default_to, COMPOSE_TO);
+                               compose_entry_mark_default_to(compose, item->prefs->default_to);
+                       }
                }
                if (item && item->ret_rcpt) {
                        cm_toggle_menu_set_active_full(compose->ui_manager, "Menu/Options/RequestRetRcpt", TRUE);
@@ -1163,8 +1174,8 @@ static void compose_force_encryption(Compose *compose, PrefsAccount *account,
 {
        const gchar *privacy = NULL;
 
-       g_return_if_fail(compose != NULL);
-       g_return_if_fail(account != NULL);
+       cm_return_if_fail(compose != NULL);
+       cm_return_if_fail(account != NULL);
 
        if (override_pref == FALSE && account->default_encrypt_reply == FALSE)
                return;
@@ -1198,7 +1209,7 @@ static void compose_force_encryption(Compose *compose, PrefsAccount *account,
 
 static void compose_force_signing(Compose *compose, PrefsAccount *account, const gchar *system)
 {
-       gchar *privacy = NULL;
+       const gchar *privacy = NULL;
 
        if (system)
                privacy = system;
@@ -1230,10 +1241,10 @@ static Compose *compose_reply_mode(ComposeMode mode, GSList *msginfo_list, gchar
        guint list_len;
        Compose *compose = NULL;
        
-       g_return_val_if_fail(msginfo_list != NULL, NULL);
+       cm_return_val_if_fail(msginfo_list != NULL, NULL);
 
        msginfo = (MsgInfo*)g_slist_nth_data(msginfo_list, 0);
-       g_return_val_if_fail(msginfo != NULL, NULL);
+       cm_return_val_if_fail(msginfo != NULL, NULL);
 
        list_len = g_slist_length(msginfo_list);
 
@@ -1435,12 +1446,12 @@ static Compose *compose_generic_reply(MsgInfo *msginfo,
        const gchar *body_fmt = NULL;
        gchar *s_system = NULL;
        START_TIMING("");
-       g_return_val_if_fail(msginfo != NULL, NULL);
-       g_return_val_if_fail(msginfo->folder != NULL, NULL);
+       cm_return_val_if_fail(msginfo != NULL, NULL);
+       cm_return_val_if_fail(msginfo->folder != NULL, NULL);
 
        account = account_get_reply_account(msginfo, prefs_common.reply_account_autosel);
 
-       g_return_val_if_fail(account != NULL, NULL);
+       cm_return_val_if_fail(account != NULL, NULL);
 
        compose = compose_create(account, msginfo->folder, COMPOSE_REPLY, FALSE);
 
@@ -1608,8 +1619,8 @@ Compose *compose_forward(PrefsAccount *account, MsgInfo *msginfo,
        GtkTextBuffer *textbuf;
        GtkTextIter iter;
 
-       g_return_val_if_fail(msginfo != NULL, NULL);
-       g_return_val_if_fail(msginfo->folder != NULL, NULL);
+       cm_return_val_if_fail(msginfo != NULL, NULL);
+       cm_return_val_if_fail(msginfo->folder != NULL, NULL);
 
        if (!account && 
            !(account = compose_guess_forward_account_from_msginfo
@@ -1798,7 +1809,7 @@ static Compose *compose_forward_multiple(PrefsAccount *account, GSList *msginfo_
        gchar *msgfile;
        gboolean single_mail = TRUE;
        
-       g_return_val_if_fail(msginfo_list != NULL, NULL);
+       cm_return_val_if_fail(msginfo_list != NULL, NULL);
 
        if (g_slist_length(msginfo_list) > 1)
                single_mail = FALSE;
@@ -1813,11 +1824,18 @@ static Compose *compose_forward_multiple(PrefsAccount *account, GSList *msginfo_
                                (msginfo_list->data)))
                account = cur_account;
 
-       g_return_val_if_fail(account != NULL, NULL);
+       cm_return_val_if_fail(account != NULL, NULL);
 
        for (msginfo = msginfo_list; msginfo != NULL; msginfo = msginfo->next) {
-               MSG_UNSET_PERM_FLAGS(((MsgInfo *)msginfo->data)->flags, MSG_REPLIED);
-               MSG_SET_PERM_FLAGS(((MsgInfo *)msginfo->data)->flags, MSG_FORWARDED);
+               if (msginfo->data) {
+                       MSG_UNSET_PERM_FLAGS(((MsgInfo *)msginfo->data)->flags, MSG_REPLIED);
+                       MSG_SET_PERM_FLAGS(((MsgInfo *)msginfo->data)->flags, MSG_FORWARDED);
+               }
+       }
+
+       if (msginfo_list == NULL || msginfo_list->data == NULL) {
+               g_warning("no msginfo_list");
+               return NULL;
        }
 
        compose = compose_create(account, ((MsgInfo *)msginfo_list->data)->folder, COMPOSE_FORWARD, FALSE);
@@ -2020,8 +2038,8 @@ Compose *compose_reedit(MsgInfo *msginfo, gboolean batch)
        gboolean autowrap = prefs_common.autowrap;
        gboolean autoindent = prefs_common.auto_indent;
 
-       g_return_val_if_fail(msginfo != NULL, NULL);
-       g_return_val_if_fail(msginfo->folder != NULL, NULL);
+       cm_return_val_if_fail(msginfo != NULL, NULL);
+       cm_return_val_if_fail(msginfo->folder != NULL, NULL);
 
        if (compose_put_existing_to_front(msginfo)) {
                return NULL;
@@ -2138,7 +2156,7 @@ Compose *compose_reedit(MsgInfo *msginfo, gboolean batch)
         if (!account) {
                account = cur_account;
         }
-       g_return_val_if_fail(account != NULL, NULL);
+       cm_return_val_if_fail(account != NULL, NULL);
 
        compose = compose_create(account, msginfo->folder, COMPOSE_REEDIT, batch);
 
@@ -2260,12 +2278,12 @@ Compose *compose_redirect(PrefsAccount *account, MsgInfo *msginfo,
        gchar *filename;
        FolderItem *item;
 
-       g_return_val_if_fail(msginfo != NULL, NULL);
+       cm_return_val_if_fail(msginfo != NULL, NULL);
 
        if (!account)
                account = account_get_reply_account(msginfo,
                                        prefs_common.reply_account_autosel);
-       g_return_val_if_fail(account != NULL, NULL);
+       cm_return_val_if_fail(account != NULL, NULL);
 
        compose = compose_create(account, msginfo->folder, COMPOSE_REDIRECT, batch);
 
@@ -2466,7 +2484,7 @@ void compose_toolbar_cb(gint action, gpointer data)
        ToolbarItem *toolbar_item = (ToolbarItem*)data;
        Compose *compose = (Compose*)toolbar_item->parent;
        
-       g_return_if_fail(compose != NULL);
+       cm_return_if_fail(compose != NULL);
 
        switch(action) {
        case A_SEND:
@@ -2625,7 +2643,7 @@ static gint compose_parse_header(Compose *compose, MsgInfo *msginfo)
 
        FILE *fp;
 
-       g_return_val_if_fail(msginfo != NULL, -1);
+       cm_return_val_if_fail(msginfo != NULL, -1);
 
        if ((fp = procmsg_open_message(msginfo)) == NULL) return -1;
        procheader_get_header_fields(fp, hentry);
@@ -2978,8 +2996,8 @@ static void compose_reply_set_entry(Compose *compose, MsgInfo *msginfo,
        gboolean reply_to_ml = FALSE;
        gboolean default_reply_to = FALSE;
 
-       g_return_if_fail(compose->account != NULL);
-       g_return_if_fail(msginfo != NULL);
+       cm_return_if_fail(compose->account != NULL);
+       cm_return_if_fail(msginfo != NULL);
 
        reply_to_ml = to_ml && compose->ml_post;
 
@@ -2987,6 +3005,17 @@ static void compose_reply_set_entry(Compose *compose, MsgInfo *msginfo,
                msginfo->folder->prefs->enable_default_reply_to;
 
        if (compose->account->protocol != A_NNTP) {
+               if (msginfo && msginfo->folder && msginfo->folder->prefs) {
+                       if (msginfo->folder->prefs->enable_default_replyto) {
+                               compose_entry_append(compose, msginfo->folder->prefs->default_replyto, COMPOSE_REPLYTO);
+                       }
+                       if (msginfo->folder->prefs->enable_default_bcc) {
+                               compose_entry_append(compose, msginfo->folder->prefs->default_bcc, COMPOSE_BCC);
+                       }
+                       if (msginfo->folder->prefs->enable_default_cc) {
+                               compose_entry_append(compose, msginfo->folder->prefs->default_cc, COMPOSE_CC);
+                       }
+               }
                if (reply_to_ml && !default_reply_to) {
                        
                        gboolean is_subscr = is_subscription(compose->ml_post,
@@ -3172,7 +3201,7 @@ static void compose_reply_set_entry(Compose *compose, MsgInfo *msginfo,
 
 static void compose_reedit_set_entry(Compose *compose, MsgInfo *msginfo)
 {
-       g_return_if_fail(msginfo != NULL);
+       cm_return_if_fail(msginfo != NULL);
 
        SET_ENTRY(subject_entry, msginfo->subject);
        SET_ENTRY(from_name, msginfo->from);
@@ -3202,7 +3231,7 @@ static void compose_insert_sig(Compose *compose, gboolean replace)
        gboolean found = FALSE;
        gboolean exists = FALSE;
        
-       g_return_if_fail(compose->account != NULL);
+       cm_return_if_fail(compose->account != NULL);
 
        BLOCK_WRAP();
 
@@ -3302,7 +3331,7 @@ static ComposeInsertResult compose_insert_file(Compose *compose, const gchar *fi
        gboolean prev_autowrap;
        gboolean badtxt = FALSE;
 
-       g_return_val_if_fail(file != NULL, COMPOSE_INSERT_NO_FILE);
+       cm_return_val_if_fail(file != NULL, COMPOSE_INSERT_NO_FILE);
 
        if ((fp = g_fopen(file, "rb")) == NULL) {
                FILE_OP_ERROR(file, "fopen");
@@ -3528,15 +3557,16 @@ static void compose_attach_parts(Compose *compose, MsgInfo *msginfo)
        while (child && child->node->children && (child->type == MIMETYPE_MULTIPART))
                child = (MimeInfo *)child->node->children->data;
 
-       if (child->type == MIMETYPE_TEXT) {
-               firsttext = child;
-               debug_print("First text part found\n");
-       } else if (compose->mode == COMPOSE_REEDIT &&
-                child->type == MIMETYPE_APPLICATION &&
-                !g_ascii_strcasecmp(child->subtype, "pgp-encrypted")) {
-               encrypted = (MimeInfo *)child->node->parent->data;
+       if (child) {
+               if (child->type == MIMETYPE_TEXT) {
+                       firsttext = child;
+                       debug_print("First text part found\n");
+               } else if (compose->mode == COMPOSE_REEDIT &&
+                        child->type == MIMETYPE_APPLICATION &&
+                        !g_ascii_strcasecmp(child->subtype, "pgp-encrypted")) {
+                       encrypted = (MimeInfo *)child->node->parent->data;
+               }
        }
-     
        child = (MimeInfo *) mimeinfo->node->children->data;
        while (child != NULL) {
                gint err;
@@ -4088,6 +4118,7 @@ static gboolean compose_beautify_paragraph(Compose *compose, GtkTextIter *par_it
                        {"https://", strcasestr, get_uri_part,   make_uri_string},
                        {"ftp://",   strcasestr, get_uri_part,   make_uri_string},
                        {"sftp://",  strcasestr, get_uri_part,   make_uri_string},
+                       {"gopher://",strcasestr, get_uri_part,   make_uri_string},
                        {"www.",     strcasestr, get_uri_part,   make_http_string},
                        {"mailto:",  strcasestr, get_uri_part,   make_uri_string},
                        {"@",        strcasestr, get_email_part, make_email_string}
@@ -4510,9 +4541,10 @@ compose_current_mail_account(void)
 static void compose_select_account(Compose *compose, PrefsAccount *account,
                                   gboolean init)
 {
-       gchar *from = NULL;
+       gchar *from = NULL, *header;
+       ComposeHeaderEntry *header_entry;
 
-       g_return_if_fail(account != NULL);
+       cm_return_if_fail(account != NULL);
 
        compose->account = account;
 
@@ -4548,7 +4580,26 @@ static void compose_select_account(Compose *compose, PrefsAccount *account,
                compose_insert_sig(compose, TRUE);
                undo_unblock(compose->undostruct);
        }
-
+       
+       header_entry = (ComposeHeaderEntry *) compose->header_list->data;
+       header = gtk_combo_box_get_active_text(GTK_COMBO_BOX(header_entry->combo));
+       
+       if (header && !strlen(gtk_entry_get_text(GTK_ENTRY(header_entry->entry)))) {
+               if (account->protocol == A_NNTP) {
+                       if (!strcmp(header, _("To:")))
+                               combobox_select_by_text(
+                                       GTK_COMBO_BOX(header_entry->combo),
+                                       _("Newsgroups:"));
+               } else {
+                       if (!strcmp(header, _("Newsgroups:")))
+                               combobox_select_by_text(
+                                       GTK_COMBO_BOX(header_entry->combo),
+                                       _("To:"));
+               }
+               
+       }
+       g_free(header);
+       
 #ifdef USE_ENCHANT
        /* use account's dict info if set */
        if (compose->gtkaspell) {
@@ -4969,9 +5020,9 @@ static gint compose_redirect_write_headers(Compose *compose, FILE *fp)
        /* struct utsname utsbuf; */
        gboolean err = FALSE;
 
-       g_return_val_if_fail(fp != NULL, -1);
-       g_return_val_if_fail(compose->account != NULL, -1);
-       g_return_val_if_fail(compose->account->address != NULL, -1);
+       cm_return_val_if_fail(fp != NULL, -1);
+       cm_return_val_if_fail(compose->account != NULL, -1);
+       cm_return_val_if_fail(compose->account->address != NULL, -1);
 
        /* Resent-Date */
        get_rfc822_date(buf, sizeof(buf));
@@ -5400,14 +5451,14 @@ static gint compose_remove_reedit_target(Compose *compose, gboolean force)
        FolderItem *item;
        MsgInfo *msginfo = compose->targetinfo;
 
-       g_return_val_if_fail(compose->mode == COMPOSE_REEDIT, -1);
+       cm_return_val_if_fail(compose->mode == COMPOSE_REEDIT, -1);
        if (!msginfo) return -1;
 
        if (!force && MSG_IS_LOCKED(msginfo->flags))
                return 0;
 
        item = msginfo->folder;
-       g_return_val_if_fail(item != NULL, -1);
+       cm_return_val_if_fail(item != NULL, -1);
 
        if (procmsg_msg_exist(msginfo) &&
            (folder_has_parent_of_type(item, F_QUEUE) ||
@@ -5481,7 +5532,7 @@ static gint compose_queue_sub(Compose *compose, gint *msgnum, FolderItem **item,
        gboolean err = FALSE;
 
        debug_print("queueing message...\n");
-       g_return_val_if_fail(compose->account != NULL, -1);
+       cm_return_val_if_fail(compose->account != NULL, -1);
 
         lock = TRUE;
        
@@ -5514,9 +5565,9 @@ static gint compose_queue_sub(Compose *compose, gint *msgnum, FolderItem **item,
        if (compose->newsgroup_list) {
                 if (compose->account->protocol == A_NNTP)
                         newsac = compose->account;
-                else if (!newsac->protocol != A_NNTP) {
+                else {
                        lock = FALSE;
-                       alertpanel_error(_("No account for posting news available!"));
+                       alertpanel_error(_("Selected account isn't NNTP: Posting is impossible."));
                        return -1;
                }                       
        }
@@ -5873,8 +5924,8 @@ static gchar *compose_get_header(Compose *compose)
        gchar *from_name = NULL, *from_address = NULL;
        gchar *tmp;
 
-       g_return_val_if_fail(compose->account != NULL, NULL);
-       g_return_val_if_fail(compose->account->address != NULL, NULL);
+       cm_return_val_if_fail(compose->account != NULL, NULL);
+       cm_return_val_if_fail(compose->account->address != NULL, NULL);
 
        header = g_string_sized_new(64);
 
@@ -6142,8 +6193,8 @@ static void compose_convert_header(Compose *compose, gchar *dest, gint len, gcha
        gchar *tmpstr = NULL;
        const gchar *out_codeset = NULL;
 
-       g_return_if_fail(src != NULL);
-       g_return_if_fail(dest != NULL);
+       cm_return_if_fail(src != NULL);
+       cm_return_if_fail(dest != NULL);
 
        if (len < 1) return;
 
@@ -6203,7 +6254,7 @@ static void compose_add_to_addressbook_cb(GtkMenuItem *menuitem, gpointer user_d
 {
        gchar *address;
 
-       g_return_if_fail(user_data != NULL);
+       cm_return_if_fail(user_data != NULL);
 
        address = g_strdup(gtk_entry_get_text(GTK_ENTRY(user_data)));
        g_strstrip(address);
@@ -6220,8 +6271,8 @@ static void compose_entry_popup_extend(GtkEntry *entry, GtkMenu *menu, gpointer
        GtkWidget *menuitem;
        gchar *address;
 
-       g_return_if_fail(menu != NULL);
-       g_return_if_fail(GTK_IS_MENU_SHELL(menu));
+       cm_return_if_fail(menu != NULL);
+       cm_return_if_fail(GTK_IS_MENU_SHELL(menu));
 
        menuitem = gtk_separator_menu_item_new();
        gtk_menu_shell_prepend(GTK_MENU_SHELL(menu), menuitem);
@@ -6272,7 +6323,7 @@ static void compose_create_header_entry(Compose *compose)
        gtk_table_attach(GTK_TABLE(compose->header_table), combo, 0, 1,
                        compose->header_nextrow, compose->header_nextrow+1,
                        GTK_SHRINK, GTK_FILL, 0, 0);
-       if (compose->header_last) {     
+       if (compose->header_last && (compose->draft_timeout_tag != -2)) {
                const gchar *last_header_entry = gtk_entry_get_text(
                                GTK_ENTRY(gtk_bin_get_child(GTK_BIN((compose->header_last->combo)))));
                string = headers;
@@ -6766,7 +6817,7 @@ static Compose *compose_create(PrefsAccount *account,
 
        static GdkGeometry geometry;
 
-       g_return_val_if_fail(account != NULL, NULL);
+       cm_return_val_if_fail(account != NULL, NULL);
 
        debug_print("Creating compose window...\n");
        compose = g_new0(Compose, 1);
@@ -7391,7 +7442,7 @@ static GtkWidget *compose_account_option_menu_create(Compose *compose)
        gint num = 0, def_menu = 0;
        
        accounts = account_get_list();
-       g_return_val_if_fail(accounts != NULL, NULL);
+       cm_return_val_if_fail(accounts != NULL, NULL);
 
        optmenubox = gtk_event_box_new();
        optmenu = gtkut_sc_combobox_create(optmenubox, FALSE);
@@ -7469,7 +7520,7 @@ static void compose_reply_change_mode(Compose *compose,
 
        gboolean all = FALSE, ml = FALSE, sender = FALSE, followup = FALSE;
        
-       g_return_if_fail(compose->replyinfo != NULL);
+       cm_return_if_fail(compose->replyinfo != NULL);
        
        if (action == COMPOSE_REPLY && prefs_common.default_reply_list)
                ml = TRUE;
@@ -7541,7 +7592,7 @@ static void compose_set_privacy_system_cb(GtkWidget *widget, gpointer data)
        gchar *systemid;
        gboolean can_sign = FALSE, can_encrypt = FALSE;
 
-       g_return_if_fail(GTK_IS_CHECK_MENU_ITEM(widget));
+       cm_return_if_fail(GTK_IS_CHECK_MENU_ITEM(widget));
 
        if (!GTK_CHECK_MENU_ITEM(widget)->active)
                return;
@@ -7574,7 +7625,7 @@ static void compose_update_privacy_system_menu_item(Compose * compose, gboolean
                gchar *systemid;
                menuitem = gtk_menu_item_get_submenu(GTK_MENU_ITEM(
                                gtk_ui_manager_get_widget(compose->ui_manager, branch_path)));
-               g_return_if_fail(menuitem != NULL);
+               cm_return_if_fail(menuitem != NULL);
 
                amenu = GTK_MENU_SHELL(menuitem)->children;
                menuitem = NULL;
@@ -7764,7 +7815,7 @@ static const gchar *compose_quote_char_from_context(Compose *compose)
 {
        const gchar *qmark = NULL;
 
-       g_return_val_if_fail(compose != NULL, NULL);
+       cm_return_val_if_fail(compose != NULL, NULL);
 
        switch (compose->mode) {
                /* use forward-specific quote char */
@@ -8550,7 +8601,7 @@ static gint compose_exec_ext_editor_real(const gchar *file)
        gchar **cmdline;
        pid_t pid;
 
-       g_return_val_if_fail(file != NULL, -1);
+       cm_return_val_if_fail(file != NULL, -1);
 
        if ((pid = fork()) < 0) {
                perror("fork");
@@ -8811,7 +8862,7 @@ static void account_activated(GtkComboBox *optmenu, gpointer data)
        gtk_tree_model_get(menu, &iter, 1, &account_id, -1);
 
        ac = account_find_from_id(account_id);
-       g_return_if_fail(ac != NULL);
+       cm_return_if_fail(ac != NULL);
 
        if (ac != compose->account)
                compose_select_account(compose, ac, FALSE);
@@ -8923,7 +8974,9 @@ static void compose_send_later_cb(GtkAction *action, gpointer data)
        gint val;
 
        inc_lock();
+       compose_allow_user_actions(compose, FALSE);
        val = compose_queue_sub(compose, NULL, NULL, NULL, TRUE, TRUE);
+       compose_allow_user_actions(compose, TRUE);
        inc_unlock();
 
        if (!val) {
@@ -8983,7 +9036,7 @@ gboolean compose_draft (gpointer data, guint action)
                return TRUE;
 
        draft = account_get_special_folder(compose->account, F_DRAFT);
-       g_return_val_if_fail(draft != NULL, FALSE);
+       cm_return_val_if_fail(draft != NULL, FALSE);
        
        if (!g_mutex_trylock(compose->mutex)) {
                /* we don't want to lock the mutex once it's available,
@@ -9403,7 +9456,7 @@ static void compose_template_activate_cb(GtkWidget *widget, gpointer data)
        AlertValue val;
 
        tmpl = g_object_get_data(G_OBJECT(widget), "template");
-       g_return_if_fail(tmpl != NULL);
+       cm_return_if_fail(tmpl != NULL);
 
        msg = g_strdup_printf(_("Do you want to apply the template '%s' ?"),
                              tmpl->name);
@@ -9650,7 +9703,7 @@ static void textview_move_beginning_of_line (GtkTextView *text)
        GtkTextMark *mark;
        GtkTextIter ins;
 
-       g_return_if_fail(GTK_IS_TEXT_VIEW(text));
+       cm_return_if_fail(GTK_IS_TEXT_VIEW(text));
 
        buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(text));
        mark = gtk_text_buffer_get_insert(buffer);
@@ -9665,7 +9718,7 @@ static void textview_move_forward_character (GtkTextView *text)
        GtkTextMark *mark;
        GtkTextIter ins;
 
-       g_return_if_fail(GTK_IS_TEXT_VIEW(text));
+       cm_return_if_fail(GTK_IS_TEXT_VIEW(text));
 
        buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(text));
        mark = gtk_text_buffer_get_insert(buffer);
@@ -9680,7 +9733,7 @@ static void textview_move_backward_character (GtkTextView *text)
        GtkTextMark *mark;
        GtkTextIter ins;
 
-       g_return_if_fail(GTK_IS_TEXT_VIEW(text));
+       cm_return_if_fail(GTK_IS_TEXT_VIEW(text));
 
        buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(text));
        mark = gtk_text_buffer_get_insert(buffer);
@@ -9696,7 +9749,7 @@ static void textview_move_forward_word (GtkTextView *text)
        GtkTextIter ins;
        gint count;
 
-       g_return_if_fail(GTK_IS_TEXT_VIEW(text));
+       cm_return_if_fail(GTK_IS_TEXT_VIEW(text));
 
        buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(text));
        mark = gtk_text_buffer_get_insert(buffer);
@@ -9715,7 +9768,7 @@ static void textview_move_backward_word (GtkTextView *text)
        GtkTextIter ins;
        gint count;
 
-       g_return_if_fail(GTK_IS_TEXT_VIEW(text));
+       cm_return_if_fail(GTK_IS_TEXT_VIEW(text));
 
        buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(text));
        mark = gtk_text_buffer_get_insert(buffer);
@@ -9731,7 +9784,7 @@ static void textview_move_end_of_line (GtkTextView *text)
        GtkTextMark *mark;
        GtkTextIter ins;
 
-       g_return_if_fail(GTK_IS_TEXT_VIEW(text));
+       cm_return_if_fail(GTK_IS_TEXT_VIEW(text));
 
        buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(text));
        mark = gtk_text_buffer_get_insert(buffer);
@@ -9747,7 +9800,7 @@ static void textview_move_next_line (GtkTextView *text)
        GtkTextIter ins;
        gint offset;
 
-       g_return_if_fail(GTK_IS_TEXT_VIEW(text));
+       cm_return_if_fail(GTK_IS_TEXT_VIEW(text));
 
        buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(text));
        mark = gtk_text_buffer_get_insert(buffer);
@@ -9766,7 +9819,7 @@ static void textview_move_previous_line (GtkTextView *text)
        GtkTextIter ins;
        gint offset;
 
-       g_return_if_fail(GTK_IS_TEXT_VIEW(text));
+       cm_return_if_fail(GTK_IS_TEXT_VIEW(text));
 
        buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(text));
        mark = gtk_text_buffer_get_insert(buffer);
@@ -9784,7 +9837,7 @@ static void textview_delete_forward_character (GtkTextView *text)
        GtkTextMark *mark;
        GtkTextIter ins, end_iter;
 
-       g_return_if_fail(GTK_IS_TEXT_VIEW(text));
+       cm_return_if_fail(GTK_IS_TEXT_VIEW(text));
 
        buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(text));
        mark = gtk_text_buffer_get_insert(buffer);
@@ -9801,7 +9854,7 @@ static void textview_delete_backward_character (GtkTextView *text)
        GtkTextMark *mark;
        GtkTextIter ins, end_iter;
 
-       g_return_if_fail(GTK_IS_TEXT_VIEW(text));
+       cm_return_if_fail(GTK_IS_TEXT_VIEW(text));
 
        buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(text));
        mark = gtk_text_buffer_get_insert(buffer);
@@ -9818,7 +9871,7 @@ static void textview_delete_forward_word (GtkTextView *text)
        GtkTextMark *mark;
        GtkTextIter ins, end_iter;
 
-       g_return_if_fail(GTK_IS_TEXT_VIEW(text));
+       cm_return_if_fail(GTK_IS_TEXT_VIEW(text));
 
        buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(text));
        mark = gtk_text_buffer_get_insert(buffer);
@@ -9835,7 +9888,7 @@ static void textview_delete_backward_word (GtkTextView *text)
        GtkTextMark *mark;
        GtkTextIter ins, end_iter;
 
-       g_return_if_fail(GTK_IS_TEXT_VIEW(text));
+       cm_return_if_fail(GTK_IS_TEXT_VIEW(text));
 
        buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(text));
        mark = gtk_text_buffer_get_insert(buffer);
@@ -9852,7 +9905,7 @@ static void textview_delete_line (GtkTextView *text)
        GtkTextMark *mark;
        GtkTextIter ins, start_iter, end_iter;
 
-       g_return_if_fail(GTK_IS_TEXT_VIEW(text));
+       cm_return_if_fail(GTK_IS_TEXT_VIEW(text));
 
        buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(text));
        mark = gtk_text_buffer_get_insert(buffer);
@@ -9877,7 +9930,7 @@ static void textview_delete_to_line_end (GtkTextView *text)
        GtkTextMark *mark;
        GtkTextIter ins, end_iter;
 
-       g_return_if_fail(GTK_IS_TEXT_VIEW(text));
+       cm_return_if_fail(GTK_IS_TEXT_VIEW(text));
 
        buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(text));
        mark = gtk_text_buffer_get_insert(buffer);
@@ -10190,8 +10243,6 @@ static void compose_insert_drag_received_cb (GtkWidget          *widget,
 
        /* strangely, testing data->type == gdk_atom_intern("text/uri-list", TRUE)
         * does not work */
-       debug_print("drop: %s (%s)\n", gdk_atom_name(data->type)?gdk_atom_name(data->type):"nul",
-               (gchar *)(data->data?data->data:"nul"));
 #ifndef G_OS_WIN32
        if (gdk_atom_name(data->type) && !strcmp(gdk_atom_name(data->type), "text/uri-list")) {
 #else
@@ -10200,8 +10251,6 @@ static void compose_insert_drag_received_cb (GtkWidget          *widget,
                AlertValue val = G_ALERTDEFAULT;
 
                list = uri_list_extract_filenames((const gchar *)data->data);
-               debug_print("list: %p (%s)\n", list, 
-                       (gchar *)(data->data?data->data:"nul"));
                if (list == NULL && strstr((gchar *)(data->data), "://")) {
                        /* Assume a list of no files, and data has ://, is a remote link */
                        gchar *tmpdata = g_strstrip(g_strdup((const gchar *)data->data));
@@ -10380,9 +10429,9 @@ static void compose_show_first_last_header(Compose *compose, gboolean show_first
 {
        GtkAdjustment *vadj;
 
-       g_return_if_fail(compose);
-       g_return_if_fail(GTK_IS_WIDGET(compose->header_table));
-       g_return_if_fail(GTK_IS_VIEWPORT(compose->header_table->parent));
+       cm_return_if_fail(compose);
+       cm_return_if_fail(GTK_IS_WIDGET(compose->header_table));
+       cm_return_if_fail(GTK_IS_VIEWPORT(compose->header_table->parent));
 
        vadj = gtk_viewport_get_vadjustment(GTK_VIEWPORT(compose->header_table->parent));
        gtk_adjustment_set_value(vadj, (show_first ? vadj->lower : vadj->upper));
@@ -10396,7 +10445,7 @@ static void text_inserted(GtkTextBuffer *buffer, GtkTextIter *iter,
                                (G_OBJECT(compose->text), "paste_as_quotation"));
        GtkTextMark *mark;
 
-       g_return_if_fail(text != NULL);
+       cm_return_if_fail(text != NULL);
 
        g_signal_handlers_block_by_func(G_OBJECT(buffer),
                                        G_CALLBACK(text_inserted),
@@ -10562,9 +10611,9 @@ static PrefsAccount *compose_guess_forward_account_from_msginfo(MsgInfo *msginfo
 {
        PrefsAccount *account = NULL;
        
-       g_return_val_if_fail(msginfo, NULL);
-       g_return_val_if_fail(msginfo->folder, NULL);
-       g_return_val_if_fail(msginfo->folder->prefs, NULL);
+       cm_return_val_if_fail(msginfo, NULL);
+       cm_return_val_if_fail(msginfo->folder, NULL);
+       cm_return_val_if_fail(msginfo->folder->prefs, NULL);
 
        if (msginfo->folder->prefs->enable_default_account)
                account = account_find_from_id(msginfo->folder->prefs->default_account);
@@ -10615,7 +10664,7 @@ gboolean compose_close(Compose *compose)
                g_timeout_add (500, (GSourceFunc) compose_close, compose);
                return FALSE;
        }
-       g_return_val_if_fail(compose, FALSE);
+       cm_return_val_if_fail(compose, FALSE);
        gtkut_widget_get_uposition(compose->window, &x, &y);
        if (!compose->batch) {
                prefs_common.compose_x = x;
@@ -10653,9 +10702,9 @@ static void compose_reply_from_messageview_real(MessageView *msgview, GSList *ms
        Compose *compose = NULL;
        gchar *s_system = NULL;
 
-       g_return_if_fail(msgview != NULL);
+       cm_return_if_fail(msgview != NULL);
 
-       g_return_if_fail(msginfo_list != NULL);
+       cm_return_if_fail(msginfo_list != NULL);
 
        if (g_slist_length(msginfo_list) == 1 && !opening_multiple) {
                MimeInfo *mimeinfo = messageview_get_selected_mime_part(msgview);
@@ -10674,8 +10723,10 @@ static void compose_reply_from_messageview_real(MessageView *msgview, GSList *ms
 
                                tmp_msginfo->folder = orig_msginfo->folder;
                                tmp_msginfo->msgnum = orig_msginfo->msgnum; 
-                               if (orig_msginfo->tags)
+                               if (orig_msginfo->tags) {
                                        tmp_msginfo->tags = g_slist_copy(orig_msginfo->tags);
+                                       tmp_msginfo->folder->tags_dirty = TRUE;
+                               }
                        }
                }
        }
@@ -10766,7 +10817,7 @@ static MsgInfo *compose_msginfo_new_from_compose(Compose *compose)
        GSList *list;
        gchar buf[BUFFSIZE];
 
-       g_return_val_if_fail( compose != NULL, NULL );
+       cm_return_val_if_fail( compose != NULL, NULL );
 
        newmsginfo = procmsg_msginfo_new();
 
@@ -10835,7 +10886,7 @@ static MsgInfo *compose_msginfo_new_from_compose(Compose *compose)
 static void compose_set_dictionaries_from_folder_prefs(Compose *compose,
                                                FolderItem *folder_item)
 {
-       g_return_if_fail(compose != NULL);
+       cm_return_if_fail(compose != NULL);
 
        if (compose->gtkaspell && folder_item && folder_item->prefs) {
                FolderItemPrefs *prefs = folder_item->prefs;