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

[claws.git] / src / import.c

diff --git a/src/import.c b/src/import.c
index df828b0bfb5c61c22addd53f7c2add9e11038807..ec458e1fa2eda01bfcfddb925b148be154e6ddac 100644 (file)
--- a/src/import.c
+++ b/src/import.c
@@ -19,6 +19,7 @@
 
 #ifdef HAVE_CONFIG_H
 #  include "config.h"
+#include "claws-features.h"
 #endif
 
 #include "defs.h"
@@ -113,6 +114,7 @@ static void import_create(void)
        gtk_container_set_border_width(GTK_CONTAINER(window), 5);
        gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER);
        gtk_window_set_resizable(GTK_WINDOW(window), TRUE);
+       gtk_window_set_type_hint(GTK_WINDOW(window), GDK_WINDOW_TYPE_HINT_DIALOG);
        g_signal_connect(G_OBJECT(window), "delete_event",
                         G_CALLBACK(delete_event), NULL);
        g_signal_connect(G_OBJECT(window), "key_press_event",
@@ -204,7 +206,7 @@ static void import_ok_cb(GtkWidget *widget, gpointer data)
        }
        if (destdir && !*destdir) {
                if (alertpanel(_("Import mbox file"), _("Destination folder is not set.\nImport mbox file to the Inbox folder?"),
-                                               GTK_STOCK_OK, GTK_STOCK_CANCEL, NULL)
+                                               GTK_STOCK_OK, GTK_STOCK_CANCEL, NULL, ALERTFOCUS_FIRST)
                        == G_ALERTALTERNATE) {
                        gtk_widget_grab_focus(dest_entry);
                        return;
@@ -213,7 +215,7 @@ static void import_ok_cb(GtkWidget *widget, gpointer data)
 
        mbox = g_filename_from_utf8(utf8mbox, -1, NULL, NULL, NULL);
        if (!mbox) {
-               g_warning("import_ok_cb(): failed to convert character set.\n");
+               g_warning("import_ok_cb(): failed to convert character set.");
                mbox = g_strdup(utf8mbox);
        }
 
@@ -230,6 +232,14 @@ static void import_ok_cb(GtkWidget *widget, gpointer data)
                g_free(mbox);
                return;
        } else {
+               gtk_widget_set_sensitive(file_entry, FALSE);
+               gtk_widget_set_sensitive(dest_entry, FALSE);
+               gtk_widget_set_sensitive(file_button, FALSE);
+               gtk_widget_set_sensitive(dest_button, FALSE);
+               gtk_widget_set_sensitive(ok_button, FALSE);
+               gtk_widget_set_sensitive(cancel_button, FALSE);
+               GTK_EVENTS_FLUSH();
+
                import_ok = proc_mbox(dest, mbox, FALSE, NULL);
        }
 
@@ -267,7 +277,8 @@ static void import_destsel_cb(GtkWidget *widget, gpointer data)
        FolderItem *dest;
        gchar *path;
 
-       dest = foldersel_folder_sel(NULL, FOLDER_SEL_COPY, NULL, FALSE);
+       dest = foldersel_folder_sel(NULL, FOLDER_SEL_COPY, NULL, FALSE,
+                       _("Select folder to import to"));
        if (!dest)
                 return;
        path = folder_item_get_identifier(dest);