summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2005-04-09 02:14:06 +0000
committerMatthias Clasen <matthiasc@src.gnome.org>2005-04-09 02:14:06 +0000
commit0d9888e7c5220f4724df80c44978f39fcfe0e9f4 (patch)
tree7d096b0d3dabcf83a469cf8301bfef83147e081a
parent43e76221dcd6c1bc01473a5091f60422353158d1 (diff)
downloadgdk-pixbuf-0d9888e7c5220f4724df80c44978f39fcfe0e9f4.tar.gz
Use the same function as in updateiconcache.c. (spotted by Morten
2005-04-08 Matthias Clasen <mclasen@redhat.com> * gtk/gtkiconcache.c (icon_name_hash): Use the same function as in updateiconcache.c. (spotted by Morten Welinder)
-rw-r--r--ChangeLog3
-rw-r--r--ChangeLog.pre-2-103
-rw-r--r--ChangeLog.pre-2-83
-rw-r--r--gtk/gtkiconcache.c4
4 files changed, 11 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 6c7114e7d..a7e693d7e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2005-04-08 Matthias Clasen <mclasen@redhat.com>
+ * gtk/gtkiconcache.c (icon_name_hash): Use the same function
+ as in updateiconcache.c. (spotted by Morten Welinder)
+
* gtk/gtkcombobox.c (gtk_combo_box_popdown): Make this
work when called from gtk_combo_box_destroy(). (#172999,
Christian Persch)
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 6c7114e7d..a7e693d7e 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,8 @@
2005-04-08 Matthias Clasen <mclasen@redhat.com>
+ * gtk/gtkiconcache.c (icon_name_hash): Use the same function
+ as in updateiconcache.c. (spotted by Morten Welinder)
+
* gtk/gtkcombobox.c (gtk_combo_box_popdown): Make this
work when called from gtk_combo_box_destroy(). (#172999,
Christian Persch)
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 6c7114e7d..a7e693d7e 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,5 +1,8 @@
2005-04-08 Matthias Clasen <mclasen@redhat.com>
+ * gtk/gtkiconcache.c (icon_name_hash): Use the same function
+ as in updateiconcache.c. (spotted by Morten Welinder)
+
* gtk/gtkcombobox.c (gtk_combo_box_popdown): Make this
work when called from gtk_combo_box_destroy(). (#172999,
Christian Persch)
diff --git a/gtk/gtkiconcache.c b/gtk/gtkiconcache.c
index fc44d036d..77e9f50d9 100644
--- a/gtk/gtkiconcache.c
+++ b/gtk/gtkiconcache.c
@@ -222,8 +222,8 @@ _gtk_icon_cache_has_directory (GtkIconCache *cache,
static guint
icon_name_hash (gconstpointer key)
{
- const char *p = key;
- guint h = *p;
+ const signed char *p = key;
+ guint32 h = *p;
if (h)
for (p += 1; *p != '\0'; p++)