2007-09-02 [colin] 2.10.0cvs190

	* src/edittags.c
	* src/common/tags.c
		Prevent empty or white-space tags

diff --git a/ChangeLog b/ChangeLog
index 81febc1987cc6c25180d14fd295d030dd16d0d97..1f54b26fbb015370d9448cb70d4ed3768b5d36ca 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-09-02 [colin]     2.10.0cvs190
+
+       * src/edittags.c
+       * src/common/tags.c
+               Prevent empty or white-space tags
+
 2007-09-01 [colin]     2.10.0cvs189
 
        * src/main.c

diff --git a/PATCHSETS b/PATCHSETS
index e4b5e3ae28a5500e1d6e16daa88ed1eb5f39b5e4..3d22fad11dedc097d469ac4ed956724a26d3e34c 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2844,3 +2844,4 @@
 ( cvs diff -u -r 1.60.2.96 -r 1.60.2.97 src/addressbook.c;  cvs diff -u -r 1.382.2.405 -r 1.382.2.406 src/compose.c;  cvs diff -u -r 1.207.2.180 -r 1.207.2.181 src/folderview.c;  cvs diff -u -r 1.1.2.18 -r 1.1.2.19 src/image_viewer.c;  cvs diff -u -r 1.83.2.114 -r 1.83.2.115 src/mimeview.c;  cvs diff -u -r 1.395.2.323 -r 1.395.2.324 src/summaryview.c;  cvs diff -u -r 1.1.4.83 -r 1.1.4.84 src/etpan/imap-thread.c;  cvs diff -u -r 1.12.2.41 -r 1.12.2.42 src/gtk/prefswindow.c;  ) > 2.10.0cvs187.patchset
 ( cvs diff -u -r 1.1.2.60 -r 1.1.2.61 src/wizard.c;  ) > 2.10.0cvs188.patchset
 ( cvs diff -u -r 1.115.2.165 -r 1.115.2.166 src/main.c;  cvs diff -u -r 1.274.2.209 -r 1.274.2.210 src/mainwindow.c;  ) > 2.10.0cvs189.patchset
+( cvs diff -u -r 1.1.2.5 -r 1.1.2.6 src/edittags.c;  cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/common/tags.c;  ) > 2.10.0cvs190.patchset

diff --git a/configure.ac b/configure.ac
index 0364c523608fbb2721a487e0d0d3e9ff6c7dfc63..f70c51e67c41386e269c15ed790218e44167aba3 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=10
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=189
+EXTRA_VERSION=190
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/common/tags.c b/src/common/tags.c
index 30a8dbb18682b8194257b16b7f1f973b7ce74144..b9ced957161fd00fb473b16e38c3ed6292cec042 100644 (file)
--- a/src/common/tags.c
+++ b/src/common/tags.c
@@ -150,6 +150,9 @@ void tags_write_tags(void)
 
 gint tags_add_tag(const gchar *tag)
 {
+       if (!tag || !(*tag))
+               return -1;
+
        if (g_hash_table_lookup(tags_reverse_table, tag))
                return -1;
 

diff --git a/src/edittags.c b/src/edittags.c
index 4395e5c0b24c8ebcea9d4c705011a54a2956dc4a..396ad0a779b5ca6d8499db2b39e7d19b931a1e0a 100644 (file)
--- a/src/edittags.c
+++ b/src/edittags.c
@@ -334,12 +334,12 @@ static gint prefs_tags_clist_set_row(GtkTreeIter *row)
        
 
        tag = gtk_editable_get_chars(GTK_EDITABLE(tags.name_entry), 0, -1);
+       g_strstrip(tag);
        if (tag[0] == '\0') {
                alertpanel_error(_("Tag is not set."));
                return -1;
        }
 
-       g_strstrip(tag);
        if (row == NULL) {
                if ((id = tags_add_tag(tag)) != -1) {
                        prefs_tags_list_view_insert_tag(tags.tags_list_view,
@@ -565,6 +565,7 @@ gint prefs_tags_create_new(MainWindow *mainwin)
        if (!new_tag || !(*new_tag))
                return -1;
        
+       g_strstrip(new_tag);
        id = tags_get_id_for_str(new_tag);
        if (id != -1) {
                g_free(new_tag);
@@ -735,7 +736,8 @@ static gboolean find_tag_in_store(GtkTreeModel *model,
 static void apply_window_add_tag(void)
 {
        gchar *new_tag = gtk_editable_get_chars(GTK_EDITABLE(applywindow.add_entry), 0, -1);
-       if (new_tag) {
+       g_strstrip(new_tag);
+       if (new_tag && *new_tag) {
                gint id = tags_get_id_for_str(new_tag);
                if (id == -1) {
                        id = tags_add_tag(new_tag);
@@ -774,6 +776,8 @@ static void apply_window_add_tag(void)
                        }
                }
                g_free(new_tag);
+       } else {
+               alertpanel_error(_("Tag is not set."));
        }
 }