gimp r26497 - in branches/soc-2008-tagging: . app/core

[aurisj svn gnome org]

Author: aurisj
Date: Mon Aug 11 11:58:06 2008
New Revision: 26497
URL: http://svn.gnome.org/viewvc/gimp?rev=26497&view=rev

Log:
2008-08-11  Aurimas JuÅka  <aurisj svn gnome org>

	* app/core/gimptag.c: fixed case insensitive tag handling.



Modified:
   branches/soc-2008-tagging/ChangeLog
   branches/soc-2008-tagging/app/core/gimptag.c

Modified: branches/soc-2008-tagging/app/core/gimptag.c
==============================================================================
--- branches/soc-2008-tagging/app/core/gimptag.c	(original)
+++ branches/soc-2008-tagging/app/core/gimptag.c	Mon Aug 11 11:58:06 2008
@@ -112,22 +112,22 @@
       return NULL;
     }
 
-  tag_quark = g_quark_try_string (tag_name);
-  if (! tag_quark)
-    {
-      g_free (tag_name);
-      return NULL;
-    }
-
   case_folded = g_utf8_casefold (tag_name, -1);
   collate_key = g_utf8_collate_key (case_folded, -1);
   collate_key_quark = g_quark_try_string (collate_key);
   g_free (collate_key);
   g_free (case_folded);
-  g_free (tag_name);
 
   if (! collate_key_quark)
     {
+      g_free (tag_name);
+      return NULL;
+    }
+
+  tag_quark = g_quark_from_string (tag_name);
+  g_free (tag_name);
+  if (! tag_quark)
+    {
       return NULL;
     }
 
@@ -184,7 +184,7 @@
   g_return_val_if_fail (GIMP_IS_TAG (tag), FALSE);
   g_return_val_if_fail (GIMP_IS_TAG (other), FALSE);
 
-  return tag->tag == other->tag;
+  return tag->collate_key == other->collate_key;
 }
 
 /**