gtk+ r20684 - in trunk: . gtk

[mitch svn gnome org]

Author: mitch
Date: Tue Jun 24 19:11:30 2008
New Revision: 20684
URL: http://svn.gnome.org/viewvc/gtk+?rev=20684&view=rev

Log:
2008-06-24  Michael Natterer  <mitch imendio com>

	* gtk/gtktypeutils.h: deprecate gtk_type_init() unconditionally
	(also for GTK_COMPILATION). Move some deprecated typedefs around
	to reduce the mess with zillions of deprecated sections.

	* gtk/gtkmain.c (do_post_parse_initialization): replace the call
	to gtk_type_init() by g_type_init() and gtk_object_get_type() even
	though the latter is probably completely pointless.



Modified:
   trunk/ChangeLog
   trunk/gtk/gtkmain.c
   trunk/gtk/gtktypeutils.h

Modified: trunk/gtk/gtkmain.c
==============================================================================
--- trunk/gtk/gtkmain.c	(original)
+++ trunk/gtk/gtkmain.c	Tue Jun 24 19:11:30 2008
@@ -682,8 +682,11 @@
       g_warning ("Whoever translated default:LTR did so wrongly.\n");
   }
 
-  gtk_type_init (0);
- _gtk_accel_map_init ();  
+  /* do what the call to gtk_type_init() used to do */
+  g_type_init ();
+  gtk_object_get_type ();
+
+  _gtk_accel_map_init ();
   _gtk_rc_init ();
 
   /* Set the 'initialized' flag.

Modified: trunk/gtk/gtktypeutils.h
==============================================================================
--- trunk/gtk/gtktypeutils.h	(original)
+++ trunk/gtk/gtktypeutils.h	Tue Jun 24 19:11:30 2008
@@ -120,13 +120,6 @@
 				     guint         n_args,
 				     GtkArg       *args);
 
-#ifndef GTK_DISABLE_DEPRECATED
-
-typedef void (*GtkDestroyNotify)    (gpointer      data);
-typedef void (*GtkSignalFunc)       (void);
-
-#endif /* GTK_DISABLE_DEPRECATED */
-
 /* This used to be defined in gtkitemfactory.h, but moved over here after
  * the complete deprecation of that header
  */
@@ -135,6 +128,9 @@
 
 #ifndef GTK_DISABLE_DEPRECATED
 
+typedef void (*GtkDestroyNotify)    (gpointer      data);
+typedef void (*GtkSignalFunc)       (void);
+
 #define GTK_SIGNAL_FUNC(f)	    G_CALLBACK(f)
 
 typedef struct _GtkTypeInfo         GtkTypeInfo;
@@ -241,6 +237,7 @@
   GtkClassInitFunc	 base_class_init_func;
 };
 
+void            gtk_type_init   (GTypeDebugFlags    debug_flags);
 GtkType         gtk_type_unique (GtkType            parent_type,
                                  const GtkTypeInfo *gtkinfo);
 gpointer        gtk_type_class  (GtkType            type);
@@ -266,11 +263,6 @@
 
 #endif /* GTK_DISABLE_DEPRECATED */
 
-#if !defined (GTK_DISABLE_DEPRECATED) || defined (GTK_COMPILATION)
-/* deprecated, use g_type_init() instead */
-void		gtk_type_init	(GTypeDebugFlags debug_flags);
-#endif /* !GTK_DISABLE_DEPRECATED || GTK_COMPILATION */
-
 G_END_DECLS
 
 #endif /* __GTK_TYPE_UTILS_H__ */