From 781850fc6470c6437017ead6e470d4ccdffe906b Mon Sep 17 00:00:00 2001 From: Michael Natterer Date: Tue, 23 Sep 2008 18:24:33 +0000 Subject: [PATCH] gtk/gtkobject.c s/GtkType/GType/ and 2008-09-23 Michael Natterer * gtk/gtkobject.c * gtk/gtksignal.[ch]: s/GtkType/GType/ and s/GtkSignalMarshaller/GSignalCMarshaller/. svn path=/trunk/; revision=21498 --- ChangeLog | 6 ++++++ gtk/gtkobject.c | 4 ++-- gtk/gtksignal.c | 20 ++++++++++---------- gtk/gtksignal.h | 4 ++-- 4 files changed, 20 insertions(+), 14 deletions(-) diff --git a/ChangeLog b/ChangeLog index 74a223164c..460af28c66 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-09-23 Michael Natterer + + * gtk/gtkobject.c + * gtk/gtksignal.[ch]: s/GtkType/GType/ and + s/GtkSignalMarshaller/GSignalCMarshaller/. + 2008-09-23 Michael Natterer * gdk/x11/gdkevents-x11.c (gdk_event_translate): remove unused diff --git a/gtk/gtkobject.c b/gtk/gtkobject.c index 89d940edc2..a90f26bb69 100644 --- a/gtk/gtkobject.c +++ b/gtk/gtkobject.c @@ -216,7 +216,7 @@ gtk_arg_proxy_get_property (GObject *object, void gtk_object_add_arg_type (const gchar *arg_name, - GtkType arg_type, + GType arg_type, guint arg_flags, guint arg_id) { @@ -593,7 +593,7 @@ gtk_object_notify_weaks (GtkObject *object) } GtkObject* -gtk_object_new (GtkType object_type, +gtk_object_new (GType object_type, const gchar *first_property_name, ...) { diff --git a/gtk/gtksignal.c b/gtk/gtksignal.c index 3016dcc986..c855582da5 100644 --- a/gtk/gtksignal.c +++ b/gtk/gtksignal.c @@ -34,12 +34,12 @@ guint gtk_signal_newv (const gchar *name, GtkSignalRunType signal_flags, - GtkType object_type, + GType object_type, guint function_offset, - GtkSignalMarshaller marshaller, - GtkType return_val, + GSignalCMarshaller marshaller, + GType return_val, guint n_params, - GtkType *params) + GType *params) { GClosure *closure; @@ -54,14 +54,14 @@ gtk_signal_newv (const gchar *name, guint gtk_signal_new (const gchar *name, GtkSignalRunType signal_flags, - GtkType object_type, + GType object_type, guint function_offset, - GtkSignalMarshaller marshaller, - GtkType return_val, + GSignalCMarshaller marshaller, + GType return_val, guint n_params, ...) { - GtkType *params; + GType *params; guint signal_id; if (n_params) @@ -69,10 +69,10 @@ gtk_signal_new (const gchar *name, va_list args; guint i; - params = g_new (GtkType, n_params); + params = g_new (GType, n_params); va_start (args, n_params); for (i = 0; i < n_params; i++) - params[i] = va_arg (args, GtkType); + params[i] = va_arg (args, GType); va_end (args); } else diff --git a/gtk/gtksignal.h b/gtk/gtksignal.h index 8a4654f849..dbb5c430b6 100644 --- a/gtk/gtksignal.h +++ b/gtk/gtksignal.h @@ -93,7 +93,7 @@ guint gtk_signal_newv (const gchar *name, GtkSignalRunType signal_flags, GType object_type, guint function_offset, - GtkSignalMarshaller marshaller, + GSignalCMarshaller marshaller, GType return_val, guint n_args, GType *args); @@ -101,7 +101,7 @@ guint gtk_signal_new (const gchar *name, GtkSignalRunType signal_flags, GType object_type, guint function_offset, - GtkSignalMarshaller marshaller, + GSignalCMarshaller marshaller, GType return_val, guint n_args, ...);