Add gtkut_tree_view_get_selected_pointer() helper function.

[claws.git] / src / mimeview.c

diff --git a/src/mimeview.c b/src/mimeview.c
index 71447b372e747f4804144c0cac3b96331ee18fee..82cfd7850698b27cfe0211508aaa612cb9c6cc70 100644 (file)
--- a/src/mimeview.c
+++ b/src/mimeview.c
@@ -286,6 +286,7 @@ MimeView *mimeview_create(MainWindow *mainwin)
                                   G_TYPE_POINTER);
 
        ctree = gtk_tree_view_new_with_model(GTK_TREE_MODEL(model));
+       g_object_unref(model);
        gtk_tree_view_set_enable_search(GTK_TREE_VIEW(ctree), FALSE);
        gtk_tree_view_set_rules_hint(GTK_TREE_VIEW(ctree),
                                        prefs_common.use_stripes_everywhere);
@@ -299,9 +300,7 @@ MimeView *mimeview_create(MainWindow *mainwin)
        column = gtk_tree_view_get_column(GTK_TREE_VIEW(ctree), cols-1);
                                                           
        renderer = gtk_cell_renderer_text_new();
-#if(GTK_CHECK_VERSION(2,18,0))
        gtk_cell_renderer_set_alignment(renderer, 1, 0.5);
-#endif
        cols = gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(ctree),
                                        -1, titles[COL_SIZE], renderer,
                                        "text", COL_SIZE, NULL);
@@ -334,7 +333,7 @@ MimeView *mimeview_create(MainWindow *mainwin)
 
        mime_notebook = gtk_notebook_new();
         gtk_widget_show(mime_notebook);
-        gtkut_widget_set_can_focus(mime_notebook, FALSE);
+        gtk_widget_set_can_focus(mime_notebook, FALSE);
         gtk_notebook_set_show_tabs(GTK_NOTEBOOK(mime_notebook), FALSE);
         gtk_notebook_set_show_border(GTK_NOTEBOOK(mime_notebook), FALSE);
        
@@ -569,16 +568,8 @@ void mimeview_destroy(MimeView *mimeview)
 
 MimeInfo *mimeview_get_selected_part(MimeView *mimeview)
 {
-       GtkTreeModel *model = gtk_tree_view_get_model(GTK_TREE_VIEW(mimeview->ctree));
-       GtkTreeIter iter;
-       GtkTreeSelection *selection;
-       MimeInfo *partinfo = NULL;
-       
-       selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(mimeview->ctree));
-       if (gtk_tree_selection_get_selected(selection, NULL, &iter))
-               gtk_tree_model_get(model, &iter, COL_DATA, &partinfo, -1);
-
-       return partinfo;
+       return gtkut_tree_view_get_selected_pointer(
+                       GTK_TREE_VIEW(mimeview->ctree), COL_DATA);
 }
 
 MimeInfo *mimeview_get_node_part(MimeView *mimeview, GtkTreePath *path)
@@ -1841,7 +1832,7 @@ static gboolean mimeview_write_part(const gchar *filename,
                                      tmp);
                g_free(tmp);
                aval = alertpanel(_("Overwrite"), res, GTK_STOCK_CANCEL,
-                                 GTK_STOCK_OK, NULL);
+                                 GTK_STOCK_OK, NULL, ALERTFOCUS_FIRST);
                g_free(res);
                if (G_ALERTALTERNATE != aval) return FALSE;
        }
@@ -1861,12 +1852,12 @@ static gboolean mimeview_write_part(const gchar *filename,
 static AlertValue mimeview_save_all_error_ask(gint n)
 {
        gchar *message = g_strdup_printf(
-               _("An error has ocurred while saving attachment #%d. "
+               _("An error has occurred while saving message part #%d. "
                "Do you want to cancel operation or skip error and "
                "continue?"), n);
-       AlertValue av = alertpanel_full(_("Error saving all attachments"),
+       AlertValue av = alertpanel_full(_("Error saving all message parts"),
                message, GTK_STOCK_CANCEL, _("Skip"), _("Skip all"),
-               FALSE, NULL, ALERT_WARNING, G_ALERTDEFAULT);
+               ALERTFOCUS_FIRST, FALSE, NULL, ALERT_WARNING);
        g_free(message);
        return av;
 }
@@ -1875,24 +1866,24 @@ static void mimeview_save_all_info(gint errors, gint total)
 {
        if (!errors) {
                gchar *msg = g_strdup_printf(
-                               ngettext("%d attachment saved succesfully.",
-                                       "%d attachments saved succesfully.",
+                               ngettext("%d file saved successfully.",
+                                       "%d files saved successfully.",
                                        total),
                                total);
-               alertpanel_notice(msg);
+               alertpanel_notice("%s", msg);
                g_free(msg);
        } else {
                gchar *msg1 = g_strdup_printf(
-                               ngettext("%d attachment saved succesfully",
-                                       "%d attachments saved succesfully",
+                               ngettext("%d file saved successfully",
+                                       "%d files saved successfully",
                                        total - errors),
                                total - errors);
                gchar *msg2 = g_strdup_printf(
-                               ngettext("%s, %d attachment failed.",
-                                       "%s, %d attachments failed.",
+                               ngettext("%s, %d file failed.",
+                                       "%s, %d files failed.",
                                        errors),
                                msg1, errors);
-               alertpanel_warning(msg2);
+               alertpanel_warning("%s", msg2);
                g_free(msg2);
                g_free(msg1);
        }