2004-09-02 [colin] 0.9.12cvs91.1

	* src/gtk/menu.c
		Sync with HEAD (menu accel don't work, but whatever)

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index 7a8c4c0af34bf286f53bab010be5dea5a42f12d2..f2a2f0f72961de797a0e8dc7c106f6710dba9f04 100644 (file)
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,8 @@
+2004-09-02 [colin]     0.9.12cvs91.1
+
+       * src/gtk/menu.c
+               Sync with HEAD (menu accel don't work, but whatever)
+

 2004-09-02 [colin]     0.9.12cvs90.1
 
        * src/account.c
 2004-09-02 [colin]     0.9.12cvs90.1
 
        * src/account.c

diff --git a/PATCHSETS b/PATCHSETS
index 1c706b964a48fa8387477eb079addc1b471c8d3f..28eafde7cc38787b98952fc3515ff13726f85ef4 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -154,4 +154,5 @@
 ( cvs diff -u -r 1.5.2.3 -r 1.5.2.4 src/prefs_spelling.c; ) > 0.9.12cvs87.1.patchset
 ( cvs diff -u -r 1.3.2.2 -r 1.3.2.3 src/ldapquery.c; ) > 0.9.12cvs88.1.patchset
 ( cvs diff -u -r 1.28.2.2 -r 1.28.2.3 src/addrindex.c; ) > 0.9.12cvs89.1.patchset
 ( cvs diff -u -r 1.5.2.3 -r 1.5.2.4 src/prefs_spelling.c; ) > 0.9.12cvs87.1.patchset
 ( cvs diff -u -r 1.3.2.2 -r 1.3.2.3 src/ldapquery.c; ) > 0.9.12cvs88.1.patchset
 ( cvs diff -u -r 1.28.2.2 -r 1.28.2.3 src/addrindex.c; ) > 0.9.12cvs89.1.patchset

-( cvs diff -u -r 1.61.2.8 -r 1.61.2.9 src/account.c; ) > 0.9.12cvs90.1.patchset
+( cvs diff -u -r 1.61.2.8 -r 1.61.2.10 src/account.c; ) > 0.9.12cvs90.1.patchset
+( cvs diff -u -r 1.5.2.10 -r 1.5.2.11 src/gtk/menu.c; ) > 0.9.12cvs91.1.patchset

diff --git a/configure.ac b/configure.ac
index 5e1502bed4f94859746e0df4e1e31ec37eccacdc..e71c94ae9941194c61935da2c8413b91ab348bfa 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=12
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=12
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=90
+EXTRA_VERSION=91

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=.1
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=.1
 

diff --git a/src/gtk/menu.c b/src/gtk/menu.c
index d5314bf43c770b1e1c0f31469bb40ee9e272e159..2fd4de227d9b08451a5847bfe549d75d688c284c 100644 (file)
--- a/src/gtk/menu.c
+++ b/src/gtk/menu.c
@@ -278,10 +278,17 @@ void menu_connect_identical_items(void)
                {"<Main>/Message/Mark/Mark as read",            "<SummaryView>/Mark/Mark as read"},
                {"<Main>/Message/Mark/Mark all read",           "<SummaryView>/Mark/Mark all read"},
                {"<Main>/Tools/Add sender to address book",     "<SummaryView>/Add sender to address book"},
                {"<Main>/Message/Mark/Mark as read",            "<SummaryView>/Mark/Mark as read"},
                {"<Main>/Message/Mark/Mark all read",           "<SummaryView>/Mark/Mark all read"},
                {"<Main>/Tools/Add sender to address book",     "<SummaryView>/Add sender to address book"},

-               {"<Main>/Tools/Create filter rule/Automatically",       "<SummaryView>/Create filter rule/Automatically"},
+               {"<Main>/Tools/Create filter rule/Automatically",       
+                                                               "<SummaryView>/Create filter rule/Automatically"},

                {"<Main>/Tools/Create filter rule/by From",     "<SummaryView>/Create filter rule/by From"},
                {"<Main>/Tools/Create filter rule/by To",       "<SummaryView>/Create filter rule/by To"},
                {"<Main>/Tools/Create filter rule/by Subject",  "<SummaryView>/Create filter rule/by Subject"},
                {"<Main>/Tools/Create filter rule/by From",     "<SummaryView>/Create filter rule/by From"},
                {"<Main>/Tools/Create filter rule/by To",       "<SummaryView>/Create filter rule/by To"},
                {"<Main>/Tools/Create filter rule/by Subject",  "<SummaryView>/Create filter rule/by Subject"},

+               {"<Main>/Tools/Create processing rule/Automatically",
+                                                               "<SummaryView>/Create processing rule/Automatically"},
+               {"<Main>/Tools/Create processing rule/by From", "<SummaryView>/Create processing rule/by From"},
+               {"<Main>/Tools/Create processing rule/by To",   "<SummaryView>/Create processing rule/by To"},
+               {"<Main>/Tools/Create processing rule/by Subject",
+                                                               "<SummaryView>/Create processing rule/by Subject"},

                {"<Main>/View/Open in new window",              "<SummaryView>/View/Open in new window"},
                {"<Main>/View/Message source",                  "<SummaryView>/View/Source"},
                {"<Main>/View/Show all headers",                "<SummaryView>/View/All header"},
                {"<Main>/View/Open in new window",              "<SummaryView>/View/Open in new window"},
                {"<Main>/View/Message source",                  "<SummaryView>/View/Source"},
                {"<Main>/View/Show all headers",                "<SummaryView>/View/All header"},