2005-10-04 [colin] 1.9.15cvs7

[claws.git] / src / export.c

diff --git a/src/export.c b/src/export.c
index cc00d849dd20e6456ea419a707618d5bd9900b7b..74a52ebc69ec43778754a27a7f7a8bc65bec4712 100644 (file)
--- a/src/export.c
+++ b/src/export.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2002 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2005 Hiroyuki Yamamoto
  *
  * 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
@@ -14,7 +14,7 @@
  *
  * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
 #ifdef HAVE_CONFIG_H
@@ -24,6 +24,7 @@
 #include "defs.h"
 
 #include <glib.h>
+#include <glib/gi18n.h>
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtkmain.h>
 #include <gtk/gtkwidget.h>
@@ -37,7 +38,6 @@
 #include <gtk/gtkfilesel.h>
 #include <gtk/gtksignal.h>
 
-#include "intl.h"
 #include "sylpheed.h"
 #include "main.h"
 #include "inc.h"
@@ -72,21 +72,25 @@ gint export_mbox(FolderItem *default_src)
        gint ok = 0;
        gchar *src_id = NULL;
 
-       if (!window)
+       if (!window) {
                export_create();
-       else
+       }
+       else {
                gtk_widget_show(window);
+       }
 
        change_dir(sylpheed_get_startup_dir());
 
-       if (default_src && default_src->path)
+       if (default_src && default_src->path) {
                src_id = folder_item_get_identifier(default_src);
+       }
 
        if (src_id) {
                gtk_entry_set_text(GTK_ENTRY(src_entry), src_id);
                g_free(src_id);
-       } else
+       } else {
                gtk_entry_set_text(GTK_ENTRY(src_entry), "");
+       }
        gtk_entry_set_text(GTK_ENTRY(file_entry), "");
        gtk_widget_grab_focus(file_entry);
 
@@ -101,22 +105,20 @@ gint export_mbox(FolderItem *default_src)
                srcdir = gtk_entry_get_text(GTK_ENTRY(src_entry));
                utf8mbox = gtk_entry_get_text(GTK_ENTRY(file_entry));
                if (utf8mbox && *utf8mbox) {
-                       const gchar *src_codeset = CS_UTF_8;
-                       const gchar *dest_codeset = conv_get_current_charset_str();
                        gchar *mbox;
 
-#warning FIXME_GTK2 /* should we use g_filename_from_utf8()? */
-                       mbox = conv_codeset_strdup(utf8mbox, src_codeset, dest_codeset);
+                       mbox = g_filename_from_utf8(utf8mbox, -1, NULL, NULL, NULL);
                        if (!mbox) {
-                               g_warning("faild to convert character set\n");
+                               g_warning("Failed to convert character set.\n");
                                mbox = g_strdup(utf8mbox);
                        }
 
                        src = folder_find_item_from_identifier(srcdir);
-                       if (!src)
+                       if (!src) {
                                g_warning("Can't find the folder.\n");
-                       else
+                       } else {
                                ok = export_to_mbox(src, mbox);
+                       }
 
                        g_free(mbox);
                }
@@ -136,6 +138,7 @@ static void export_create(void)
        GtkWidget *file_label;
        GtkWidget *src_label;
        GtkWidget *confirm_area;
+       GtkWidget *image;
 
        window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
        gtk_window_set_title(GTK_WINDOW(window), _("Export"));
@@ -185,20 +188,25 @@ static void export_create(void)
        gtk_table_attach(GTK_TABLE(table), file_entry, 1, 2, 1, 2,
                         GTK_EXPAND|GTK_SHRINK|GTK_FILL, 0, 0, 0);
 
-       src_button = gtk_button_new_from_stock(GTK_STOCK_OPEN);
+       /* XXX GTK 2.6: GTK_STOCK_DIRECTORY */
+       src_button = gtk_button_new_with_mnemonic(_("_Browse"));
+       gtk_button_set_image((GtkButton*)src_button,
+               gtk_image_new_from_stock(GTK_STOCK_OPEN, GTK_ICON_SIZE_BUTTON));
        gtk_table_attach(GTK_TABLE(table), src_button, 2, 3, 0, 1,
                         0, 0, 0, 0);
        g_signal_connect(G_OBJECT(src_button), "clicked",
                         G_CALLBACK(export_srcsel_cb), NULL);
 
-       file_button = gtk_button_new_from_stock(GTK_STOCK_OPEN);
+       file_button = gtk_button_new_with_mnemonic(_("B_rowse"));
+       gtk_button_set_image((GtkButton*)file_button,
+               gtk_image_new_from_stock(GTK_STOCK_OPEN, GTK_ICON_SIZE_BUTTON));
        gtk_table_attach(GTK_TABLE(table), file_button, 2, 3, 1, 2,
                         0, 0, 0, 0);
        g_signal_connect(G_OBJECT(file_button), "clicked",
                         G_CALLBACK(export_filesel_cb), NULL);
 
-       gtkut_button_set_create_stock(&confirm_area,
-                                     &ok_button,     GTK_STOCK_OK,
+       gtkut_stock_button_set_create(&confirm_area,
+                                     &ok_button, GTK_STOCK_OK,
                                      &cancel_button, GTK_STOCK_CANCEL,
                                      NULL, NULL);
        gtk_box_pack_end(GTK_BOX(vbox), confirm_area, FALSE, FALSE, 0);
@@ -236,7 +244,7 @@ static void export_filesel_cb(GtkWidget *widget, gpointer data)
        if (g_getenv ("G_BROKEN_FILENAMES")) {
                const gchar *oldstr = filename;
                filename = conv_codeset_strdup (filename,
-                                               conv_get_current_charset_str(),
+                                               conv_get_locale_charset_str(),
                                                CS_UTF_8);
                if (!filename) {
                        g_warning("export_filesel_cb(): faild to convert character set.");