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 8181f238f978bf068e7a8b4ce26524c94704f02e..ec458e1fa2eda01bfcfddb925b148be154e6ddac 100644 (file)
--- a/src/import.c
+++ b/src/import.c
@@ -1,10 +1,10 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws team
+ * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -13,12 +13,13 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * 
  */
 
 #ifdef HAVE_CONFIG_H
 #  include "config.h"
+#include "claws-features.h"
 #endif
 
 #include "defs.h"
@@ -26,19 +27,9 @@
 #include <glib.h>
 #include <glib/gi18n.h>
 #include <gdk/gdkkeysyms.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkwindow.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtktable.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtkhbbox.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtkfilesel.h>
-#include <gtk/gtksignal.h>
-
-#include "sylpheed.h"
+#include <gtk/gtk.h>
+
+#include "claws.h"
 #include "main.h"
 #include "inc.h"
 #include "mbox.h"
@@ -82,7 +73,8 @@ gint import_mbox(FolderItem *default_dest)
                gtk_widget_show(window);
        }
 
-       change_dir(sylpheed_get_startup_dir());
+       gtk_window_set_modal(GTK_WINDOW(window), TRUE);
+       change_dir(claws_get_startup_dir());
 
        if (default_dest && default_dest->path) {
                dest_id = folder_item_get_identifier(default_dest);
@@ -102,6 +94,7 @@ gint import_mbox(FolderItem *default_dest)
        gtk_main();
 
        gtk_widget_hide(window);
+       gtk_window_set_modal(GTK_WINDOW(window), FALSE);
 
        return import_ok;
 }
@@ -116,12 +109,12 @@ static void import_create(void)
        GtkWidget *dest_label;
        GtkWidget *confirm_area;
 
-       window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+       window = gtkut_window_new(GTK_WINDOW_TOPLEVEL, "import");
        gtk_window_set_title(GTK_WINDOW(window), _("Import mbox file"));
        gtk_container_set_border_width(GTK_CONTAINER(window), 5);
        gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER);
-       gtk_window_set_modal(GTK_WINDOW(window), TRUE);
        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",
@@ -212,8 +205,8 @@ static void import_ok_cb(GtkWidget *widget, gpointer data)
                return;
        }
        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)
+               if (alertpanel(_("Import mbox file"), _("Destination folder is not set.\nImport mbox file to the Inbox folder?"),
+                                               GTK_STOCK_OK, GTK_STOCK_CANCEL, NULL, ALERTFOCUS_FIRST)
                        == G_ALERTALTERNATE) {
                        gtk_widget_grab_focus(dest_entry);
                        return;
@@ -222,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);
        }
 
@@ -236,9 +229,18 @@ static void import_ok_cb(GtkWidget *widget, gpointer data)
        if (!dest) {
                alertpanel_error(_("Can't find the destination folder."));
                gtk_widget_grab_focus(dest_entry);
+               g_free(mbox);
                return;
        } else {
-               import_ok = proc_mbox(dest, mbox, FALSE);
+               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);
        }
 
        g_free(mbox);
@@ -275,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);
+       dest = foldersel_folder_sel(NULL, FOLDER_SEL_COPY, NULL, FALSE,
+                       _("Select folder to import to"));
        if (!dest)
                 return;
        path = folder_item_get_identifier(dest);
@@ -291,7 +294,7 @@ static gint delete_event(GtkWidget *widget, GdkEventAny *event, gpointer data)
 
 static gboolean key_pressed(GtkWidget *widget, GdkEventKey *event, gpointer data)
 {
-       if (event && event->keyval == GDK_Escape)
+       if (event && event->keyval == GDK_KEY_Escape)
                import_cancel_cb(NULL, NULL);
        return FALSE;
 }