summaryrefslogtreecommitdiff
path: root/gtk/gtksignal.c
diff options
context:
space:
mode:
authorOwen Taylor <otaylor@gtk.org>1998-06-09 23:18:11 +0000
committerOwen Taylor <otaylor@src.gnome.org>1998-06-09 23:18:11 +0000
commit2cabeeb1c3ec0c1a17c4c372191dbe64ce5987af (patch)
tree30c846619e032f4c47a2b4e70ff70b70988ec564 /gtk/gtksignal.c
parenta1fe6d0337f1f234a6ac3ece433be960d17a9578 (diff)
downloadgtk+-2cabeeb1c3ec0c1a17c4c372191dbe64ce5987af.tar.gz
Removed g_object_pointer_hash, which was just g_direct_hash.
Tue Jun 9 18:44:57 1998 Owen Taylor <otaylor@gtk.org> * gtk/gtkobject.c: Removed g_object_pointer_hash, which was just g_direct_hash. Mon May 25 19:54:20 1998 Owen Taylor <otaylor@gtk.org> * configure.in: x_libs=, not $x_libs=. Enough said. (Case only hit for --disable-xshm) Mon May 25 12:08:14 1998 Owen Taylor <otaylor@gtk.org> * configure.in (LDFLAGS): Add to $CFLAGS and $LDFLAGS when testing for X libraries, don't replace them. Because the user might have specified the path to the X libraries themself before running configure. * examples/**.c: Changed all gpointer * to gpointer Sat May 23 21:54:05 1998 Owen Taylor <otaylor@gtk.org> * configure.in (LDFLAGS): Bomb out with a moderately helpful message if detection of X libraries fails. Sat May 23 18:57:06 1998 Owen Taylor <otaylor@gtk.org> [ Combination of: gtk-rrh-980412-0.patch (Raja R Harinath <harinath@cs.umn.edu>) gtk-jbuhler-980516-0 (Jeremy Buhler <jbuhler@cs.washington.edu>) ] * gdk/gdk.h gdk/gdkcc.c gdk/gdkfont.c gtk/gtkmain.c gtk/gtksignal.c gtk/gtktext.c: Fixups for warnings from adding const to type of GHashFunc, GCompareFunc * gtk/gtkcombo.c (gtk_combo_entry_key_press): Minor style/ ansi-warnings fixups. Tue Jun 9 17:47:33 1998 Owen Taylor <otaylor@gtk.org> * glib.h: Remove #error - HP/UX. Sat May 23 19:00:01 1998 Owen Taylor <otaylor@gtk.org> [ Combination of: gtk-rrh-980412-0.patch (Raja R Harinath <harinath@cs.umn.edu>) gtk-jbuhler-980516-0 (Jeremy Buhler <jbuhler@cs.washington.edu>) ] * glib.h ghash.c gstring.c gdataset.c gutils.c: - Added new typedef g_const_pointer; expunged all incorrect uses of 'const gpointer'. - Fixed up warnings that that created, - Changed GHashFunc and GCompareFunc to take g_const_pointer arguments. (Necessary, but will cause warnings in existing code until fixed) - Added other new const in harmless positions.
Diffstat (limited to 'gtk/gtksignal.c')
-rw-r--r--gtk/gtksignal.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/gtk/gtksignal.c b/gtk/gtksignal.c
index 93251371c1..0e08565bb4 100644
--- a/gtk/gtksignal.c
+++ b/gtk/gtksignal.c
@@ -119,9 +119,9 @@ struct _GtkDisconnectInfo
};
-static guint gtk_signal_hash (const gpointer h);
-static gint gtk_signal_compare (const gpointer h1,
- const gpointer h2);
+static guint gtk_signal_hash (g_const_pointer h);
+static gint gtk_signal_compare (g_const_pointer h1,
+ g_const_pointer h2);
static GtkHandler* gtk_signal_handler_new (void);
static void gtk_signal_handler_ref (GtkHandler *handler);
static void gtk_signal_handler_unref (GtkHandler *handler,
@@ -1186,19 +1186,19 @@ gtk_signal_set_funcs (GtkSignalMarshal marshal_func,
}
static guint
-gtk_signal_hash (const gpointer h)
+gtk_signal_hash (g_const_pointer h)
{
- register GtkSignalHash *hash = h;
+ register const GtkSignalHash *hash = h;
return hash->object_type ^ hash->name_key_id;
}
static gint
-gtk_signal_compare (const gpointer h1,
- const gpointer h2)
+gtk_signal_compare (g_const_pointer h1,
+ g_const_pointer h2)
{
- register GtkSignalHash *hash1 = h1;
- register GtkSignalHash *hash2 = h2;
+ register const GtkSignalHash *hash1 = h1;
+ register const GtkSignalHash *hash2 = h2;
return (hash1->name_key_id == hash2->name_key_id &&
hash1->object_type == hash2->object_type);