gtk+ r21498 - in trunk: . gtk

[mitch svn gnome org]

Author: mitch
Date: Tue Sep 23 18:24:33 2008
New Revision: 21498
URL: http://svn.gnome.org/viewvc/gtk+?rev=21498&view=rev

Log:
2008-09-23  Michael Natterer  <mitch imendio com>

	* gtk/gtkobject.c
	* gtk/gtksignal.[ch]: s/GtkType/GType/ and
	s/GtkSignalMarshaller/GSignalCMarshaller/.



Modified:
   trunk/ChangeLog
   trunk/gtk/gtkobject.c
   trunk/gtk/gtksignal.c
   trunk/gtk/gtksignal.h

Modified: trunk/gtk/gtkobject.c
==============================================================================
--- trunk/gtk/gtkobject.c	(original)
+++ trunk/gtk/gtkobject.c	Tue Sep 23 18:24:33 2008
@@ -216,7 +216,7 @@
 
 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 @@
 }
 
 GtkObject*
-gtk_object_new (GtkType      object_type,
+gtk_object_new (GType        object_type,
 		const gchar *first_property_name,
 		...)
 {

Modified: trunk/gtk/gtksignal.c
==============================================================================
--- trunk/gtk/gtksignal.c	(original)
+++ trunk/gtk/gtksignal.c	Tue Sep 23 18:24:33 2008
@@ -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 @@
 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 @@
       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

Modified: trunk/gtk/gtksignal.h
==============================================================================
--- trunk/gtk/gtksignal.h	(original)
+++ trunk/gtk/gtksignal.h	Tue Sep 23 18:24:33 2008
@@ -93,7 +93,7 @@
 						 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 @@
 						 GtkSignalRunType    signal_flags,
 						 GType               object_type,
 						 guint		     function_offset,
-						 GtkSignalMarshaller marshaller,
+						 GSignalCMarshaller  marshaller,
 						 GType               return_val,
 						 guint		     n_args,
 						 ...);