From: Colin Leroy <colin@colino.net>
Date: Wed, 8 Dec 2004 19:21:14 +0000 (+0000)
Subject: 2004-12-08 [colin]	0.9.13cvs9.1
X-Git-Tag: gtk2_win32_last_merge~34
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=ae8ddc30424f79a9394c0a7e6432331be0acc99e

2004-12-08 [colin]	0.9.13cvs9.1

	* src/gtk/colorlabel.c
		Sync with HEAD
---

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index 14668d1b5..c136d3063 100644
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,8 @@
+2004-12-08 [colin]	0.9.13cvs9.1
+
+	* src/gtk/colorlabel.c
+		Sync with HEAD
+
 2004-12-08 [paul]	0.9.13cvs8.2
 
 	* src/gtk/pluginwindow.c
diff --git a/PATCHSETS b/PATCHSETS
index 93008ce5b..d61d8a66a 100644
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -283,3 +283,4 @@
 ( cvs diff -u -r 1.25.2.6 -r 1.25.2.7 src/matcher_parser_parse.y; cvs diff -u -r 1.16.2.10 -r 1.16.2.11 src/msgcache.c; cvs diff -u -r 1.43.2.10 -r 1.43.2.11 src/prefs_matcher.c; cvs diff -u -r 1.47.2.11 -r 1.47.2.12 src/procheader.c; cvs diff -u -r 1.75.2.3 -r 1.75.2.4 src/matcher.c; cvs diff -u -r 1.9.2.8 -r 1.9.2.9 src/common/defs.h; cvs diff -u -r 1.17.2.6 -r 1.17.2.7 po/sr.po; ) > 0.9.13cvs7.1.patchset
 ( cvs diff -u -r 1.22.2.4 -r 1.22.2.5 src/quote_fmt_parse.y; ) > 0.9.13cvs8.1.patchset
 ( cvs diff -u -r 1.5.2.8 -r 1.5.2.9 src/gtk/pluginwindow.c; ) > 0.9.13cvs8.2.patchset
+( cvs diff -u -r 1.2.2.3 -r 1.2.2.4 src/gtk/colorlabel.c; ) > 0.9.13cvs9.1.patchset
diff --git a/configure.ac b/configure.ac
index 4860831b8..ad111cd58 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,9 +11,9 @@ MINOR_VERSION=9
 MICRO_VERSION=13
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=8
+EXTRA_VERSION=9
 EXTRA_RELEASE=
-EXTRA_GTK2_VERSION=.2
+EXTRA_GTK2_VERSION=.1
 
 if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}${EXTRA_RELEASE}${EXTRA_GTK2_VERSION}
diff --git a/src/gtk/colorlabel.c b/src/gtk/colorlabel.c
index 73c130de1..80c222d64 100644
--- a/src/gtk/colorlabel.c
+++ b/src/gtk/colorlabel.c
@@ -283,12 +283,10 @@ GtkWidget *colorlabel_create_color_menu(void)
 	menu = gtk_menu_new();
 	g_object_set_data(G_OBJECT(menu), "label_color_menu", menu);
 
-#if 0
 	item = gtk_menu_item_new_with_label(_("None"));
 	gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
 	g_object_set_data(G_OBJECT(item), "color", GUINT_TO_POINTER(0));
 	gtk_widget_show(item);
-#endif
 
 	/* and the color items */
 	for (i = 0; i < LABEL_COLORS_ELEMS; i++) {