2004-12-08 [colin] 0.9.13cvs9

	* src/gtk/colorlabel.c
		Fix color label off-by-one
		Patch by Alfons

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 65f23951b93c03b17007d5a912d862c8879aeb61..cf053b0c8600df96eb03d834c03014f36fcd9c91 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,9 @@
+2004-12-08 [colin]     0.9.13cvs9
+
+       * src/gtk/colorlabel.c
+               Fix color label off-by-one
+               Patch by Alfons
+
 2004-12-08 [hoa]       0.9.13cvs8
 
        * src/quote_fmt_parse.y

diff --git a/PATCHSETS b/PATCHSETS
index 2c064c6b1ee682e0ff6960c606d06e1d66053e5b..b6b532c148871938a319c8ec042d0a14a5914bfc 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -178,3 +178,4 @@
 ( cvs diff -u -r 1.129 -r 1.130 src/textview.c; ) > 0.9.13cvs6.patchset
 ( cvs diff -u -r 1.36 -r 1.37 src/matcher_parser_parse.y; cvs diff -u -r 1.28 -r 1.29 src/msgcache.c; cvs diff -u -r 1.48 -r 1.49 src/prefs_matcher.c; cvs diff -u -r 1.60 -r 1.61 src/procheader.c; cvs diff -u -r 1.88 -r 1.89 src/matcher.c; cvs diff -u -r 1.17 -r 1.18 src/common/defs.h; ) > 0.9.13cvs7.patchset
 ( cvs diff -u -r 1.26 -r 1.27 src/quote_fmt_parse.y ) > 0.9.13cvs8.patchset
+( cvs diff -u -r 1.4 -r 1.5 src/gtk/colorlabel.c; ) > 0.9.13cvs9.patchset

diff --git a/configure.ac b/configure.ac
index 3a34fa33ccba35cb50b0d14eac228323c0c5f1e5..422bf4de087fd2cf419abbf333072f227ad66bc3 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=13
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=8
+EXTRA_VERSION=9
 EXTRA_RELEASE=
 
 if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then

diff --git a/src/gtk/colorlabel.c b/src/gtk/colorlabel.c
index a49d5ae91a1fda26d68de29a08ee08503e6ec479..1a8a1d21f4e3c63f916c4a126b2612fb131e4efd 100644 (file)
--- a/src/gtk/colorlabel.c
+++ b/src/gtk/colorlabel.c
@@ -280,12 +280,10 @@ GtkWidget *colorlabel_create_color_menu(void)
        menu = gtk_menu_new();
        gtk_object_set_data(GTK_OBJECT(menu), "label_color_menu", menu);
 
-#if 0
        item = gtk_menu_item_new_with_label(_("None"));
        gtk_menu_append(GTK_MENU(menu), item);
        gtk_object_set_data(GTK_OBJECT(item), "color", GUINT_TO_POINTER(0));
        gtk_widget_show(item);
-#endif
 
        /* and the color items */
        for (i = 0; i < LABEL_COLORS_ELEMS; i++) {