Actions:

	Moved "Edit/Actions" to "Tool/Actions"
	Made mainwindow/compose window sensitive as soon as
	no child process is running anymore even if the io dialog
	is open.
	Fixed a struct being initialized with a non constant char*

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 942eef466b99b4650f568b67db78203e3d1504b1..3fa424788099697084661f1be8831bd2412e24e6 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,14 @@
+2002-03-16 [melvin]    0.7.4claws16
+
+       * src/mainwindow.c
+       * src/compose.c
+       * src/prefs_actions.c
+               Moved "Edit/Actions" to "Tool/Actions"
+               Made mainwindow/compose window sensitive as soon as
+               no child process is running anymore even if the io dialog
+               is open.
+               Fixed a struct being initialized with a non constant char*
+
 2002-03-16 [christoph] 0.7.4claws15
 
        * configure.in

diff --git a/configure.in b/configure.in
index 8f310da9694afee26e4b23c97e0b49e1502585bd..63c34e5650a6d88ca2ba669052a9fd08655896c1 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -8,7 +8,7 @@ MINOR_VERSION=7
 MICRO_VERSION=4
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws14
+EXTRA_VERSION=claws16
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target

diff --git a/src/compose.c b/src/compose.c
index 3333d5c3aa0fb68e7201f3e78ade465a696dbb75..3098916083bbe5a063da86c27f2ba8c1701e203d 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -568,8 +568,6 @@ static GtkItemFactoryEntry compose_entries[] =
                                        "<control><alt>L", compose_wrap_line_all, 0, NULL},
        {N_("/_Edit/Edit with e_xternal editor"),
                                        "<shift><control>X", compose_ext_editor_cb, 0, NULL},
-       {N_("/_Edit/---"),              NULL, NULL, 0, "<Separator>"},
-       {N_("/_Edit/Actio_ns"),         NULL, NULL, 0, "<Branch>"},
 #if USE_PSPELL
        {N_("/_Spelling"),              NULL, NULL, 0, "<Branch>"},
        {N_("/_Spelling/_Check all or check selection"),
@@ -629,6 +627,7 @@ static GtkItemFactoryEntry compose_entries[] =
        {N_("/_Tool/Show _ruler"),      NULL, compose_toggle_ruler_cb, 0, "<ToggleItem>"},
        {N_("/_Tool/_Address book"),    "<shift><control>A", compose_address_cb , 0, NULL},
        {N_("/_Tool/_Template"),        NULL, NULL, 0, "<Branch>"},
+       {N_("/_Tool/Actio_ns"),         NULL, NULL, 0, "<Branch>"},
        {N_("/_Help"),                  NULL, NULL, 0, "<Branch>"},
        {N_("/_Help/_About"),           NULL, about_show, 0, NULL}
 };
@@ -4472,7 +4471,7 @@ static Compose *compose_create(PrefsAccount *account, ComposeMode mode)
        }
 #endif
 
-       update_compose_actions_menu(ifactory, "/Edit/Actions", compose);
+       update_compose_actions_menu(ifactory, "/Tool/Actions", compose);
 
 
        undostruct = undo_init(text);

diff --git a/src/mainwindow.c b/src/mainwindow.c
index 2fcaddb32c7a46de6a15f89a484ab92c90c7e2f7..13ce95be83b8abd5534764ab3b382b373661074a 100644 (file)
--- a/src/mainwindow.c
+++ b/src/mainwindow.c
@@ -492,9 +492,6 @@ static GtkItemFactoryEntry mainwin_entries[] =
        {N_("/_Edit/_Find in current message..."),
                                                "<control>F", search_cb, 0, NULL},
        {N_("/_Edit/_Search folder..."),        "<shift><control>F", search_cb, 1, NULL},
-       {N_("/_Edit/---"),                      NULL, NULL, 0, "<Separator>"},
-       {N_("/_Edit/Actio_ns"),                 NULL, NULL, 0, "<Branch>"},
-
        {N_("/_View"),                          NULL, NULL, 0, "<Branch>"},
        {N_("/_View/Separate _Folder Tree"),    NULL, NULL, SEPARATE_ACTION + SEPARATE_FOLDER,  "<ToggleItem>"},
        {N_("/_View/Separate _Message View"),   NULL, NULL, SEPARATE_ACTION + SEPARATE_MESSAGE, "<ToggleItem>"},
@@ -686,6 +683,8 @@ static GtkItemFactoryEntry mainwin_entries[] =
        {N_("/_Tool/_Create filter rule/by _Subject"),
                                                NULL, create_filter_cb, FILTER_BY_SUBJECT, NULL},
        {N_("/_Tool/---"),                      NULL, NULL, 0, "<Separator>"},
+       {N_("/_Tool/Actio_ns"),                 NULL, NULL, 0, "<Branch>"},
+       {N_("/_Tool/---"),                      NULL, NULL, 0, "<Separator>"},
        {N_("/_Tool/E_xecute"),                 "X", execute_summary_cb, 0, NULL},
        {N_("/_Tool/---"),                      NULL, NULL, 0, "<Separator>"},
        {N_("/_Tool/_Log window"),              "<control>L", log_window_show_cb, 0, NULL},
@@ -1559,7 +1558,6 @@ void main_window_set_menu_sensitive(MainWindow *mainwin)
                /* {"/File/Close", M_UNLOCKED}, */
                {"/File/Exit" , M_UNLOCKED},
 
-               {"/Edit/Actions"                   , M_MSG_EXIST},
                {"/Edit/Select thread"             , M_SINGLE_TARGET_EXIST},
                {"/View/Sort"                      , M_MSG_EXIST},
                {"/View/Thread view"               , M_EXEC},
@@ -1597,7 +1595,7 @@ void main_window_set_menu_sensitive(MainWindow *mainwin)
                {"/Tool/Filter messages"           , M_MSG_EXIST|M_EXEC|M_UNLOCKED},
                {"/Tool/Create filter rule"        , M_SINGLE_TARGET_EXIST|M_UNLOCKED},
                {"/Tool/Execute"                   , M_MSG_EXIST|M_EXEC|M_UNLOCKED},
-
+               {"/Tool/Actions"                   , M_MSG_EXIST},
                {"/Configuration", M_UNLOCKED},
 
                {NULL, 0}

diff --git a/src/prefs_actions.c b/src/prefs_actions.c
index 4c39766ac701b8f03adc7ba25108386182ddc352..7b4a1d56ffe165478e8f33b80a444679b3ee9c81 100644 (file)
--- a/src/prefs_actions.c
+++ b/src/prefs_actions.c
@@ -888,7 +888,7 @@ static void prefs_actions_ok                (GtkWidget *widget, gpointer data)
 void update_mainwin_actions_menu(GtkItemFactory *ifactory, 
                                 MainWindow *mainwin)
 {
-       update_actions_menu(ifactory, "/Edit/Actions", 
+       update_actions_menu(ifactory, "/Tool/Actions", 
                            mainwin_actions_execute_cb, 
                            mainwin);
 }
@@ -914,8 +914,10 @@ static void update_actions_menu(GtkItemFactory *ifactory,
        GtkWidget *menu;
        
        GtkItemFactoryEntry ifentry = {
-               branch_path, NULL, NULL, 0, "<Branch>"};
+               NULL, NULL, NULL, 0, "<Branch>"};
+       ifentry.path = branch_path;
        menuitem = gtk_item_factory_get_item(ifactory, branch_path);    
+       g_return_if_fail(menuitem);
        /* FIXME: is there a better way to remove unknown submenu items? */
        /* Deleting and recreating the parent looses the translation */
        menu = GTK_WIDGET(GTK_MENU_ITEM(menuitem)->submenu);
@@ -1435,6 +1437,7 @@ static void update_io_dialog(Children *children)
        if (!children->nb) {
                gtk_widget_set_sensitive(children->abort_btn, FALSE);
                gtk_widget_set_sensitive(children->hide_btn, TRUE);
+               gtk_widget_set_sensitive(children->window, TRUE);
                if (children->input_hbox)
                        gtk_widget_set_sensitive(children->input_hbox, FALSE);
        }