From: Matthias Clasen <mclasen@redhat.com>
Date: Sat, 26 Mar 2005 03:00:44 +0000 (+0000)
Subject: Don't do the second lookup if the name was already canonical. (#171502,
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=45dc8b5c9af2c74da1eed2bdd2f4893d2f6beac8;p=dana%2Fcg-glib.git

Don't do the second lookup if the name was already canonical. (#171502,

2005-03-25  Matthias Clasen  <mclasen@redhat.com>

	* gparam.c (param_spec_ht_lookup): Don't do the second
	lookup if the name was already canonical.  (#171502, Morten
	Welinder)
---

diff --git a/gobject/ChangeLog b/gobject/ChangeLog
index 4f0d5e3d..8b9636f5 100644
--- a/gobject/ChangeLog
+++ b/gobject/ChangeLog
@@ -1,3 +1,9 @@
+2005-03-25  Matthias Clasen  <mclasen@redhat.com>
+
+	* gparam.c (param_spec_ht_lookup): Don't do the second
+	lookup if the name was already canonical.  (#171502, Morten
+	Welinder)
+
 Tue Mar 22 14:15:23 2005  Manish Singh <yosh@gimp.org>
 
 	* gparam.c (g_param_spec_internal): cast away any constness on
diff --git a/gobject/gparam.c b/gobject/gparam.c
index b6732cb1..914bc123 100644
--- a/gobject/gparam.c
+++ b/gobject/gparam.c
@@ -739,7 +739,7 @@ param_spec_ht_lookup (GHashTable  *hash_table,
   else
     pspec = g_hash_table_lookup (hash_table, &key);
 
-  if (!pspec)
+  if (!pspec && !is_canonical (param_name))
     {
       /* try canonicalized form */
       key.name = g_strdup (param_name);