fix bug 4239, 'Preferences: Text Options Header Display modal is not modal' (sic)

[claws.git] / src / addrduplicates.c

diff --git a/src/addrduplicates.c b/src/addrduplicates.c
index af3ad08ac341ebf3267af60554591d49ba4e9e79..80b83c57d198015b3be83072c93187f4081df218 100644 (file)
--- a/src/addrduplicates.c
+++ b/src/addrduplicates.c
@@ -335,6 +335,7 @@ static void present_finder_results(GtkWindow *parent)
                         (GCallback)detail_selection_changed, NULL);
 
        dialog = gtkut_window_new(GTK_WINDOW_TOPLEVEL, "address_dupes_finder");
+       gtk_window_set_type_hint(GTK_WINDOW(dialog), GDK_WINDOW_TYPE_HINT_DIALOG);
        gtk_window_set_transient_for(GTK_WINDOW(dialog),parent);
        gtk_window_set_modal(GTK_WINDOW(dialog),TRUE);
        if(!geometry.min_height) {
@@ -514,8 +515,7 @@ static gboolean is_editing_entry_only_selection(void)
                return FALSE;
 
        selected = gtk_tree_selection_get_selected_rows(sel_detail,&model);
-       if(!selected)
-               return FALSE;
+       cm_return_val_if_fail(selected, FALSE);
 
        gtk_tree_model_get_iter(model, &iter, (GtkTreePath*)selected->data);
        g_list_foreach(selected, (GFunc)gtk_tree_path_free, NULL);
@@ -786,9 +786,7 @@ static void cb_del_btn_clicked(GtkButton *button, gpointer data)
        selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(detail_view));
 
        list = gtk_tree_selection_get_selected_rows(selection, &model);
-
-       if(!list)
-               return;
+       cm_return_if_fail(list);
 
        aval = alertpanel(_("Delete address(es)"),
                          _("Really delete the address(es)?"),