gtk+ r22383 - in branches/gtk-2-14: . gdk/directfb

[neo svn gnome org]

Author: neo
Date: Thu Feb 19 21:40:35 2009
New Revision: 22383
URL: http://svn.gnome.org/viewvc/gtk+?rev=22383&view=rev

Log:
2009-02-19  Sven Neumann  <sven gimp org>

	Merged from trunk:

	* gdk/directfb/gdkdisplay-directfb.c (gdk_display_open): move 
the
	call to _gdk_windowing_window_init() up a little. Fixes a crash
	when running on pseudo-color visuals. Thanks to Masse Nicolas 
for
	pointing this out.



Modified:
   branches/gtk-2-14/ChangeLog
   branches/gtk-2-14/gdk/directfb/gdkdisplay-directfb.c

Modified: branches/gtk-2-14/gdk/directfb/gdkdisplay-directfb.c
==============================================================================
--- branches/gtk-2-14/gdk/directfb/gdkdisplay-directfb.c	(original)
+++ branches/gtk-2-14/gdk/directfb/gdkdisplay-directfb.c	Thu Feb 19 21:40:35 2009
@@ -35,14 +35,13 @@
 #include "gdkalias.h"
 
 
-
-extern void _gdk_visual_init (void);
-extern void _gdk_events_init (void);
-extern void _gdk_input_init (void);
-extern void _gdk_dnd_init (void);
-extern void _gdk_windowing_window_init (void);
-extern void _gdk_windowing_image_init (void);
-extern void _gdk_directfb_keyboard_init      (void);
+extern void _gdk_visual_init            (void);
+extern void _gdk_events_init            (void);
+extern void _gdk_input_init             (void);
+extern void _gdk_dnd_init               (void);
+extern void _gdk_windowing_window_init  (void);
+extern void _gdk_windowing_image_init   (void);
+extern void _gdk_directfb_keyboard_init (void);
 
 static gboolean   gdk_directfb_argb_font           = FALSE;
 static gint       gdk_directfb_glyph_surface_cache = 8;
@@ -118,11 +117,10 @@
   _gdk_screen = g_object_new (GDK_TYPE_SCREEN, NULL);
 
   _gdk_visual_init ();
+  _gdk_windowing_window_init ();
 
   gdk_screen_set_default_colormap (_gdk_screen,
-                                   gdk_screen_get_system_colormap (_gdk_screen));
-  _gdk_windowing_window_init ();
-  _gdk_windowing_image_init ();
+                                   gdk_screen_get_system_colormap (_gdk_screen));  _gdk_windowing_image_init ();
 
   _gdk_input_init ();
   _gdk_dnd_init ();