2004-11-29 [colin] 0.9.12cvs176.1

	* src/folderview.c
		sync with HEAD (Fix disappearing separators in folderview's popup)

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index ee66982eff1bbfa80e5ca26c9bc3c0f62fda95ce..f8c48bf779dce045e5aea2ca73bf7cc65d2ca180 100644 (file)
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,8 @@
+2004-11-29 [colin]     0.9.12cvs176.1
+
+       * src/folderview.c
+               sync with HEAD (Fix disappearing separators in folderview's popup)
+
 2004-11-29 [colin]     0.9.12cvs175.1
 
        * src/procmime.c

diff --git a/PATCHSETS b/PATCHSETS
index 4014e51166baf8fc4e87b33512eb426bd06203cd..85d1faf2ef2f00bc5926c53d52b1c618a3818e60 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -265,3 +265,4 @@
 ( cvs diff -u -r 1.11.2.5 -r 1.11.2.6 src/common/smtp.c; cvs diff -u -r 1.6.2.2 -r 1.6.2.3 src/common/smtp.h; ) > 0.9.12cvs173.1.patchset
 ( cvs diff -u -r 1.56.2.28 -r 1.56.2.29 src/pop.c; ) > 0.9.12cvs174.1.patchset
 ( cvs diff -u -r 1.49.2.23 -r 1.49.2.24 src/procmime.c; ) > 0.9.12cvs175.1.patchset
+( cvs diff -u -r 1.207.2.22 -r 1.207.2.23 src/folderview.c; ) > 0.9.12cvs176.1.patchset

diff --git a/configure.ac b/configure.ac
index 0c41914354ce4469bbc4dd1613dbebcd4fdaba40..a12560c9a8a47e821c01965b05d0e83e2c7984ee 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=12
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=175
+EXTRA_VERSION=176
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=.1
 

diff --git a/src/folderview.c b/src/folderview.c
index b620b41b2ad2f0718ba6a55c547df80525540adc..2d9b6c4ef35580181dd432b8214cd7474b0038c6 100644 (file)
--- a/src/folderview.c
+++ b/src/folderview.c
@@ -243,7 +243,7 @@ static GtkItemFactoryEntry folderview_common_popup_entries[] =
 };
 
 static GtkItemFactoryEntry folder_view_trash_popup_entries[] = {
-       {N_("/---"),                    NULL, NULL, 0, "<Separator>"},
+       {N_("/------"),                 NULL, NULL, 0, "<Separator>"},
        {N_("/Empty trash..."),         NULL, folderview_empty_trash_cb, 0, NULL},
 };