2004-11-18 [paul] 0.9.12cvs158.1

[claws.git] / src / mainwindow.c

diff --git a/src/mainwindow.c b/src/mainwindow.c
index 008528e526457c6fb28062e1233e4c50b43abe9a..7fda8ebc3b84a0df49265990a131249322feffce 100644 (file)
--- a/src/mainwindow.c
+++ b/src/mainwindow.c
@@ -747,8 +747,8 @@ static GtkItemFactoryEntry mainwin_entries[] =
        {N_("/_Configuration/_Edit accounts..."),
                                                NULL, account_edit_open, 0, NULL},
        {N_("/_Configuration/---"),             NULL, NULL, 0, "<Separator>"},
-       {N_("/_Configuration/_Common preferences..."),
-                                               NULL, prefs_common_open_cb, 0, NULL},
+       {N_("/_Configuration/_Preferences..."),
+                                               NULL, prefs_open_cb, 0, NULL},
        {N_("/_Configuration/Pre-processing..."),
                                                NULL, prefs_pre_processing_open_cb, 0, NULL},
        {N_("/_Configuration/Post-processing..."),
@@ -757,7 +757,6 @@ static GtkItemFactoryEntry mainwin_entries[] =
                                                NULL, prefs_filtering_open_cb, 0, NULL},
        {N_("/_Configuration/_Templates..."),   NULL, prefs_template_open_cb, 0, NULL},
        {N_("/_Configuration/_Actions..."),     NULL, prefs_actions_open_cb, 0, NULL},
-       {N_("/_Configuration/_Other Preferences..."),  NULL, prefs_open_cb, 0, NULL},
        {N_("/_Configuration/Plugins..."),      NULL, plugins_open_cb, 0, NULL},
 
        {N_("/_Help"),                          NULL, NULL, 0, "<Branch>"},
@@ -1637,8 +1636,8 @@ void main_window_add_mailbox(MainWindow *mainwin)
                return;
        }
        folder = folder_new(folder_get_class_from_string("mh"), 
-                           !strcmp(path, "Mail") ? _("Mailbox") : g_basename(path),
-                           path);
+                           !strcmp(path, "Mail") ? _("Mailbox") : 
+                           g_path_get_basename(path), path);
        g_free(path);
 
        if (folder->klass->create_tree(folder) < 0) {
@@ -2927,7 +2926,7 @@ static void create_processing_cb(MainWindow *mainwin, guint action,
 static void prefs_common_open_cb(MainWindow *mainwin, guint action,
                                 GtkWidget *widget)
 {
-       prefs_common_open();
+       /* prefs_common_open(); */
 }
 
 static void prefs_pre_processing_open_cb(MainWindow *mainwin, guint action,