revert because it crashes on Reply and Compose
authorAlfons Hoogervorst <alfons@proteus.demon.nl>
Sat, 16 Mar 2002 20:51:31 +0000 (20:51 +0000)
committerAlfons Hoogervorst <alfons@proteus.demon.nl>
Sat, 16 Mar 2002 20:51:31 +0000 (20:51 +0000)
ChangeLog.claws
configure.in
src/compose.c
src/mainwindow.c
src/prefs_actions.c

index 1c2af2b..3f3ea9d 100644 (file)
@@ -1,10 +1,3 @@
-2002-03-16 [alfons]    0.7.4claws15
-
-       * src/compose.c
-       * src/prefs_actions.c
-       * src/mainwindow.c
-               move Edit/Actions to Tool/Actions
-
 2002-03-16 [paul]      0.7.4claws14
 
        * src/messageview.c
index b79e372..6a2f374 100644 (file)
@@ -8,7 +8,7 @@ MINOR_VERSION=7
 MICRO_VERSION=4
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws15
+EXTRA_VERSION=claws14
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target
index b69c077..3333d5c 100644 (file)
@@ -4472,7 +4472,7 @@ static Compose *compose_create(PrefsAccount *account, ComposeMode mode)
        }
 #endif
 
-       update_compose_actions_menu(ifactory, "/Tool/Actions", compose);
+       update_compose_actions_menu(ifactory, "/Edit/Actions", compose);
 
 
        undostruct = undo_init(text);
index fe4f758..2fcaddb 100644 (file)
@@ -492,6 +492,8 @@ 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>"},
@@ -683,9 +685,6 @@ static GtkItemFactoryEntry mainwin_entries[] =
                                                NULL, create_filter_cb, FILTER_BY_TO, NULL},
        {N_("/_Tool/_Create filter rule/by _Subject"),
                                                NULL, create_filter_cb, FILTER_BY_SUBJECT, NULL},
-       
-       {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>"},
@@ -1560,7 +1559,7 @@ void main_window_set_menu_sensitive(MainWindow *mainwin)
                /* {"/File/Close", M_UNLOCKED}, */
                {"/File/Exit" , M_UNLOCKED},
 
-               {"/Tool/Actions"                   , M_MSG_EXIST},
+               {"/Edit/Actions"                   , M_MSG_EXIST},
                {"/Edit/Select thread"             , M_SINGLE_TARGET_EXIST},
                {"/View/Sort"                      , M_MSG_EXIST},
                {"/View/Thread view"               , M_EXEC},
index 09b3b71..4c39766 100644 (file)
@@ -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, "/Tool/Actions", 
+       update_actions_menu(ifactory, "/Edit/Actions", 
                            mainwin_actions_execute_cb, 
                            mainwin);
 }