Make procmsg_msginfo_free() zero out pointers to freed memory.

[claws.git] / src / plugins / att_remover / att_remover.c

diff --git a/src/plugins/att_remover/att_remover.c b/src/plugins/att_remover/att_remover.c
index 518d2785a4733b6c4149614e76992e5db26dc2a8..c1cec12152782061907b8033208410ebb39d0534 100644 (file)
--- a/src/plugins/att_remover/att_remover.c
+++ b/src/plugins/att_remover/att_remover.c
@@ -116,7 +116,7 @@ static gint save_new_message(MsgInfo *oldmsg, MsgInfo *newmsg, MimeInfo *info,
        
        finalmsg = procmsg_msginfo_new_from_mimeinfo(newmsg, info);
        if (!finalmsg) {
-               procmsg_msginfo_free(newmsg);
+               procmsg_msginfo_free(&newmsg);
                return -1;
        }
 
@@ -133,14 +133,14 @@ static gint save_new_message(MsgInfo *oldmsg, MsgInfo *newmsg, MimeInfo *info,
        msgnum = folder_item_add_msg(item, finalmsg->plaintext_file, 
                        &flags, TRUE);
        finalmsg->msgnum = msgnum;
-       procmsg_msginfo_free(newmsg);
-       procmsg_msginfo_free(finalmsg);
+       procmsg_msginfo_free(&newmsg);
+       procmsg_msginfo_free(&finalmsg);
                
        newmsg = folder_item_get_msginfo(item, msgnum);
        if (newmsg && item) {
                procmsg_msginfo_unset_flags(newmsg, ~0, ~0);
                procmsg_msginfo_set_flags(newmsg, flags.perm_flags, flags.tmp_flags);
-               procmsg_msginfo_free(newmsg);
+               procmsg_msginfo_free(&newmsg);
        }
        
        return msgnum;
@@ -168,7 +168,7 @@ static void remove_attachments_cb(GtkWidget *widget, AttRemover *attremover)
        partinfo = procmime_mimeinfo_next(partinfo);
        if (!partinfo || !gtk_tree_model_get_iter_first(model, &iter)) {
                gtk_widget_destroy(attremover->window);
-               procmsg_msginfo_free(newmsg);
+               procmsg_msginfo_free(&newmsg);
                return;
        }
 
@@ -296,9 +296,9 @@ static void fill_attachment_store(GtkTreeView *list_view, MimeInfo *partinfo)
                if (!name)
                        name = _("unknown");
                
-               label = g_strconcat(_("<b>Type: </b>"), content_type, "   ",
-                       _("<b>Size: </b>"), to_human_readable((goffset)partinfo->length),
-                       "\n", _("<b>Filename: </b>"), name, NULL);
+               label = g_strconcat("<b>",_("Type:"), "</b> ", content_type, "   <b>",
+                        _("Size:"), "</b> ", to_human_readable((goffset)partinfo->length),
+                       "\n", "<b>", _("Filename:"), "</b> ", name, NULL);
 
                gtk_list_store_append(list_store, &iter);
                gtk_list_store_set(list_store, &iter,
@@ -349,7 +349,7 @@ static void remove_attachments_dialog(AttRemover *attremover)
                                  -1));
        list_view = GTK_TREE_VIEW(gtk_tree_view_new_with_model(model));
        g_object_unref(model);  
-       gtk_tree_view_set_rules_hint(list_view, prefs_common.use_stripes_everywhere);
+       gtk_tree_view_set_rules_hint(list_view, prefs_common_get_prefs()->use_stripes_everywhere);
        
        renderer = gtk_cell_renderer_toggle_new();
        g_signal_connect(renderer, "toggled", G_CALLBACK(remove_toggled_cb), model);
@@ -416,7 +416,7 @@ static void remove_attachments(GSList *msglist)
        
        if (alertpanel_full(_("Destroy attachments"),
                   _("Do you really want to remove all attachments from "
-                  "the selected messages ?\n\n"
+                  "the selected messages?\n\n"
                  "The deleted data will be unrecoverable."), 
                  GTK_STOCK_CANCEL, GTK_STOCK_DELETE, NULL,
                   FALSE, NULL, ALERT_QUESTION, G_ALERTALTERNATE) != G_ALERTALTERNATE)
@@ -440,7 +440,7 @@ static void remove_attachments(GSList *msglist)
                info = procmime_scan_message(newmsg);
        
                if ( !(partinfo = find_first_text_part(info)) ) {
-                       procmsg_msginfo_free(newmsg);
+                       procmsg_msginfo_free(&newmsg);
                        continue;
                }
                partinfo->node->next = NULL;
@@ -500,7 +500,6 @@ static guint main_menu_id = 0;
 gint plugin_init(gchar **error)
 {
        MainWindow *mainwin = mainwindow_get_mainwindow();
-       static gchar *path[3];
        gchar *rcpath;
        
        if( !check_plugin_version(MAKE_NUMERIC_VERSION(3,6,1,27),
@@ -516,10 +515,6 @@ gint plugin_init(gchar **error)
                          "Message/RemoveAtt", GTK_UI_MANAGER_MENUITEM,
                          context_menu_id)
 
-       path[0] = _("Plugins");
-       path[1] = "AttRemover";
-       path[2] = NULL;
-
        prefs_set_default(prefs);
        rcpath = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S, COMMON_RC, NULL);
        prefs_read_config(prefs, PREFS_BLOCK_NAME, rcpath, NULL);
@@ -531,7 +526,6 @@ gint plugin_init(gchar **error)
 gboolean plugin_done(void)
 {
        MainWindow *mainwin = mainwindow_get_mainwindow();
-       SummaryView *summaryview = NULL;
        PrefFile *pref_file;
        gchar *rc_file_path;
 
@@ -544,7 +538,7 @@ gboolean plugin_done(void)
                return TRUE;
         
        if (prefs_write_param(prefs, pref_file->fp) < 0) {
-               g_warning("failed to write AttRemover Plugin configuration\n");
+               g_warning("failed to write AttRemover Plugin configuration");
                prefs_file_close_revert(pref_file);
                return TRUE;
         }
@@ -558,8 +552,6 @@ gboolean plugin_done(void)
        if (mainwin == NULL)
                return TRUE;
 
-       summaryview = mainwin->summaryview;
-
        MENUITEM_REMUI_MANAGER(mainwin->ui_manager,mainwin->action_group, "Message/RemoveAtt", main_menu_id);
        main_menu_id = 0;