X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtktypeutils.c;h=a2c15e6aa3a8dac63be25fe32f1c46e51213c239;hb=10ba4fd066042b4335ae45e7560565872f71ba9b;hp=bac3c0296964034e25d0d7dddbd2b5be841a9868;hpb=3f98a849c70ae570b78095cef0152a33ec07c64e;p=~andy%2Fgtk diff --git a/gtk/gtktypeutils.c b/gtk/gtktypeutils.c index bac3c0296..a2c15e6aa 100644 --- a/gtk/gtktypeutils.c +++ b/gtk/gtktypeutils.c @@ -63,9 +63,6 @@ struct _GtkTypeNode } static void gtk_type_class_init (GtkType node_type); -static guint gtk_type_name_hash (const char *key); -static gint gtk_type_name_compare (const char *a, - const char *b); static void gtk_type_init_builtin_types (void); static GtkTypeNode *type_nodes = NULL; @@ -136,8 +133,7 @@ gtk_type_init (void) g_assert (sizeof (GtkType) >= 4); g_assert (TYPE_NODES_BLOCK_SIZE > GTK_TYPE_FUNDAMENTAL_MAX); - type_name_2_type_ht = g_hash_table_new ((GHashFunc) gtk_type_name_hash, - (GCompareFunc) gtk_type_name_compare); + type_name_2_type_ht = g_hash_table_new (g_str_hash, g_str_equal); gtk_type_init_builtin_types (); } @@ -908,25 +904,6 @@ gtk_type_query (GtkType type) return NULL; } -static guint -gtk_type_name_hash (const char *key) -{ - guint result; - - result = 0; - while (*key) - result += (result << 3) + *key++; - - return result; -} - -static gint -gtk_type_name_compare (const char *a, - const char *b) -{ - return (strcmp (a, b) == 0); -} - extern void gtk_object_init_type (void); #include "makeenums.h" /* include for various places