diff options
| author | Owen Taylor <otaylor@redhat.com> | 2001-11-17 23:28:51 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2001-11-17 23:28:51 +0000 |
| commit | a036c6e59f27ce53950c64a7672fa2cf51b21f19 (patch) | |
| tree | 0518e9cea97df1e5d4aeca65be4d2ccc95a5447d /gtk/gtkaccelgroup.c | |
| parent | 3a3468024984ecb9617af5422c76e5a57240c9d0 (diff) | |
| download | gtk+-a036c6e59f27ce53950c64a7672fa2cf51b21f19.tar.gz | |
Make gtkmarshal.list/gtkmarshal.h only for compatibility with GTK+-1.2;
Sat Nov 17 18:26:45 2001 Owen Taylor <otaylor@redhat.com>
* gtk/Makefile.am gtk/gtkmarshal.list gtk/gtkmarshalers.list
gtk/*.c gtk/gtksignal.h: Make gtkmarshal.list/gtkmarshal.h
only for compatibility with GTK+-1.2; and deprecate it;
put all marshalers we actually use into gtkmarshalers.list
and use the _gtk_marshal_ prefix for these marshalers.
Diffstat (limited to 'gtk/gtkaccelgroup.c')
| -rw-r--r-- | gtk/gtkaccelgroup.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/gtk/gtkaccelgroup.c b/gtk/gtkaccelgroup.c index a8c36b7643..7d5ec04b8f 100644 --- a/gtk/gtkaccelgroup.c +++ b/gtk/gtkaccelgroup.c @@ -26,6 +26,7 @@ #include "gtkaccelgroup.h" #include "gtkaccelmap.h" #include "gdk/gdkkeysyms.h" +#include "gtkmarshalers.h" #include "gtksignal.h" #include <ctype.h> @@ -119,14 +120,14 @@ gtk_accel_group_class_init (GtkAccelGroupClass *class) G_SIGNAL_DETAILED, 0, accel_activate_accumulator, NULL, - gtk_marshal_BOOLEAN__OBJECT_UINT_UINT, + _gtk_marshal_BOOLEAN__OBJECT_UINT_UINT, G_TYPE_BOOLEAN, 3, G_TYPE_OBJECT, G_TYPE_UINT, G_TYPE_UINT); signal_accel_changed = g_signal_new ("accel_changed", G_OBJECT_CLASS_TYPE (class), G_SIGNAL_RUN_FIRST | G_SIGNAL_DETAILED, G_STRUCT_OFFSET (GtkAccelGroupClass, accel_changed), NULL, NULL, - gtk_marshal_VOID__UINT_UINT_BOXED, + _gtk_marshal_VOID__UINT_UINT_BOXED, G_TYPE_NONE, 3, G_TYPE_UINT, G_TYPE_UINT, G_TYPE_CLOSURE); } |