* src/mainwindow.c

	make correct menu items sensitive

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 7058bf375316988e7dc87b34e631a3c1b0570fcb..cedf8d7d5a7d4bd7ab8d6d02faee49a099853df3 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,8 @@
+2003-07-15 [alfons]    0.9.3claws7
+
+       * src/mainwindow.c
+               make correct menu items sensitive       
+

 2003-07-14 [alfons]    0.9.3claws6
 
        * src/procmsg.c
 2003-07-14 [alfons]    0.9.3claws6
 
        * src/procmsg.c

diff --git a/configure.ac b/configure.ac
index 0a9d6b6e234ac39930163d59d065381c570d66ff..fc066902a12ec4291c136a4db87b67d5da4d240c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=3
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=3
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=claws6
+EXTRA_VERSION=claws7

 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target

diff --git a/src/mainwindow.c b/src/mainwindow.c
index de89af50277e747367b7af183cf8a308f09617dc..390fac0884dafe6c72c96b3bf6a183aba36d228e 100644 (file)
--- a/src/mainwindow.c
+++ b/src/mainwindow.c
@@ -1531,8 +1531,9 @@ void main_window_set_menu_sensitive(MainWindow *mainwin)
        } entry[] = {
                {"/File/Folder"                               , M_UNLOCKED},
                {"/File/Add mailbox..."                       , M_UNLOCKED},
        } entry[] = {
                {"/File/Folder"                               , M_UNLOCKED},
                {"/File/Add mailbox..."                       , M_UNLOCKED},

-                {"/File/Add mbox mailbox..."                         , M_UNLOCKED},
-               {"/File/Import mbox file..."                  , M_UNLOCKED},
+
+                {"/File/Add mailbox/MH..."                   , M_UNLOCKED},
+               {"/File/Add mailbox/mbox..."                  , M_UNLOCKED},

                {"/File/Export to mbox file..."               , M_UNLOCKED},
                {"/File/Empty trash"                          , M_UNLOCKED},
                {"/File/Work offline"                         , M_UNLOCKED},
                {"/File/Export to mbox file..."               , M_UNLOCKED},
                {"/File/Empty trash"                          , M_UNLOCKED},
                {"/File/Work offline"                         , M_UNLOCKED},


@@ -2657,6 +2658,9 @@ static void account_menu_cb(GtkMenuItem   *menuitem, gpointer data)
 {
        cur_account = (PrefsAccount *)data;
        main_window_reflect_prefs_all();
 {
        cur_account = (PrefsAccount *)data;
        main_window_reflect_prefs_all();

+       debug_print("XXX set account %s\n", cur_account == NULL ? 
+                   (const gchar *) "NULL ACCOUNT POINTER" : 
+                   cur_account->account_name);         

 }
 
 static void prefs_open_cb(GtkMenuItem *menuitem, gpointer data)
 }
 
 static void prefs_open_cb(GtkMenuItem *menuitem, gpointer data)