Allow custom window title for the folder selection dialog.

[claws.git] / src / export.c

diff --git a/src/export.c b/src/export.c
index 993d2dad1ebc8310cdb6802660e6849e9bea1ef7..74e465ee22e3a040e1eb8eb4a3740b457e4b62ba 100644 (file)
--- a/src/export.c
+++ b/src/export.c
@@ -1,10 +1,10 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Claws Mail 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,17 +27,7 @@
 #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 <gtk/gtk.h>
 
 #include "claws.h"
 #include "main.h"
@@ -82,6 +73,7 @@ gint export_mbox(FolderItem *default_src)
                gtk_widget_show(window);
        }
 
+       gtk_window_set_modal(GTK_WINDOW(window), TRUE);
        change_dir(claws_get_startup_dir());
 
        if (default_src && default_src->path) {
@@ -102,6 +94,7 @@ gint export_mbox(FolderItem *default_src)
        gtk_main();
 
        gtk_widget_hide(window);
+       gtk_window_set_modal(GTK_WINDOW(window), FALSE);
 
        return export_ok;
 }
@@ -116,11 +109,10 @@ static void export_create(void)
        GtkWidget *src_label;
        GtkWidget *confirm_area;
 
-       window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+       window = gtkut_window_new(GTK_WINDOW_TOPLEVEL, "export");
        gtk_window_set_title(GTK_WINDOW(window), _("Export to 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);
        g_signal_connect(G_OBJECT(window), "delete_event",
                         G_CALLBACK(delete_event), NULL);
@@ -220,7 +212,7 @@ static void export_ok_cb(GtkWidget *widget, gpointer data)
 
        mbox = g_filename_from_utf8(utf8mbox, -1, NULL, NULL, NULL);
        if (!mbox) {
-               g_warning("export_ok_cb(): failed to convert character set.\n");
+               g_warning("export_ok_cb(): failed to convert character set.");
                mbox = g_strdup(utf8mbox);
        }
 
@@ -228,6 +220,7 @@ static void export_ok_cb(GtkWidget *widget, gpointer data)
        if (!src) {
                alertpanel_error(_("Couldn't find the source folder."));
                gtk_widget_grab_focus(src_entry);
+               g_free(mbox);
                return;
        } else {
                export_ok = export_to_mbox(src, mbox);
@@ -271,7 +264,8 @@ static void export_srcsel_cb(GtkWidget *widget, gpointer data)
 {
        FolderItem *src;
 
-       src = foldersel_folder_sel(NULL, FOLDER_SEL_ALL, NULL);
+       src = foldersel_folder_sel(NULL, FOLDER_SEL_ALL, NULL, FALSE,
+                       _("Select folder which to export"));
        if (src && src->path)
                gtk_entry_set_text(GTK_ENTRY(src_entry), src->path);
 }
@@ -284,7 +278,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)
                export_cancel_cb(NULL, NULL);
        return FALSE;
 }