Add gtk_widget_add_tick_callback(), remove GtkTimeline, etc.

[~andy/gtk] / gdk / gdk.c

diff --git a/gdk/gdk.c b/gdk/gdk.c
index 752625e55ab13b77be71c3f02585edd8d7442a26..babe08028d6b3a108105546642349d3bb65073a9 100644 (file)
--- a/gdk/gdk.c
+++ b/gdk/gdk.c
@@ -138,7 +138,8 @@ static const GDebugKey gdk_debug_keys[] = {
   {"multihead",     GDK_DEBUG_MULTIHEAD},
   {"xinerama",      GDK_DEBUG_XINERAMA},
   {"draw",          GDK_DEBUG_DRAW},
-  {"eventloop",     GDK_DEBUG_EVENTLOOP}
+  {"eventloop",     GDK_DEBUG_EVENTLOOP},
+  {"frames",        GDK_DEBUG_FRAMES}
 };
 
 static gboolean
@@ -274,8 +275,6 @@ gdk_pre_parse_libgtk_only (void)
         _gdk_rendering_mode = GDK_RENDERING_MODE_RECORDING;
     }
 
-  g_type_init ();
-
   /* Do any setup particular to the windowing system */
   gdk_display_manager_get ();
 }
@@ -661,7 +660,9 @@ gdk_init (int *argc, char ***argv)
  * it is recommended to use g_idle_add(), g_main_context_invoke()
  * and similar functions to make these calls from the main thread
  * instead. The main thread is the thread which has called gtk_init()
- * and is running the GTK+ mainloop.
+ * and is running the GTK+ mainloop. GTK+ itself will continue to
+ * use the GDK lock internally as long as the deprecated functionality
+ * is still available, and other libraries should probably do the same.
  */