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);
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_locale_charset_str();
gchar *mbox;
- 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);
}
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"));
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",