talons

commit 7a514b11fb04ea14c0d3b021b79c5891aea8c1e7
parent 0cbfa2a250aa70381fd6cf0c4bc6b0498faba6df
Author: Ricardo Mones <mones@claws-mail.org>
Date:   Wed,  6 Jul 2011 07:13:17 +0000

2011-07-06 [mones]	3.7.9cvs33

	* src/edittags.c
		Do not create an empty tag name row in panel and
		warn user about using a non-reserved tag instead

Diffstat:
M
ChangeLog
 | 
6
++++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
src/edittags.c
 | 
8
+++++++-

4 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,9 @@
+2011-07-06 [mones]	3.7.9cvs33
+
+	* src/edittags.c
+		Do not create an empty tag name row in panel and
+		warn user about using a non-reserved tag instead
+
 2011-07-05 [mones]	3.7.9cvs32
 
 	* src/imap.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -4184,3 +4184,4 @@
 ( cvs diff -u -r 1.115.2.238 -r 1.115.2.239 src/main.c;  ) > 3.7.9cvs30.patchset
 ( cvs diff -u -r 1.382.2.576 -r 1.382.2.577 src/compose.c;  ) > 3.7.9cvs31.patchset
 ( cvs diff -u -r 1.179.2.255 -r 1.179.2.256 src/imap.c;  cvs diff -u -r 1.1.2.11 -r 1.1.2.12 src/common/tags.c;  cvs diff -u -r 1.1.2.6 -r 1.1.2.7 src/common/tags.h;  cvs diff -u -r 1.1.4.113 -r 1.1.4.114 src/etpan/imap-thread.c;  ) > 3.7.9cvs32.patchset
+( cvs diff -u -r 1.1.2.22 -r 1.1.2.23 src/edittags.c;  ) > 3.7.9cvs33.patchset
diff --git a/configure.ac b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=9
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=32
+EXTRA_VERSION=33
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/edittags.c b/src/edittags.c
@@ -415,8 +415,14 @@ static void apply_window_add_tag(void)
 	gchar *new_tag = gtk_editable_get_chars(GTK_EDITABLE(applywindow.add_entry), 0, -1);
 	g_strstrip(new_tag);
 	if (new_tag && *new_tag) {
-		gint id = tags_get_id_for_str(new_tag);
+		gint id;
 		FindTagInStore fis;
+		if (!(IS_NOT_RESERVED_TAG(new_tag))) {
+			alertpanel_error(_("You entered a reserved tag name, please choose other instead."));
+			g_free(new_tag);
+			return;
+		}
+		id = tags_get_id_for_str(new_tag);
 		APPLYWINDOW_LOCK();
 		if (id == -1) {
 			id = tags_add_tag(new_tag);