move the call to _gdk_windowing_window_init() up a little. Fixes a crash

2009-02-19  Sven Neumann  <sven@gimp.org>

	* 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.

svn path=/trunk/; revision=22382

diff --git a/ChangeLog b/ChangeLog
index 14b5d4253047ef5323a23463568b0eb80e54d684..b194f0b542ee1172dd307d85423e9f1a197fb0ea 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2009-02-19  Sven Neumann  <sven@gimp.org>
+
+       * 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.
+
 2009-02-19  Sven Neumann  <sven@gimp.org>
 
        * gdk/directfb/gdkwindow-directfb.c

diff --git a/gdk/directfb/gdkdisplay-directfb.c b/gdk/directfb/gdkdisplay-directfb.c
index 4cbda0934d128f3719ce89371487d7eb0e87e76e..143ff1ad8fb87c0e28baf5ef4b73b73f70b3649c 100644 (file)
--- a/gdk/directfb/gdkdisplay-directfb.c
+++ b/gdk/directfb/gdkdisplay-directfb.c
@@ -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 @@ GdkDisplay * gdk_display_open (const gchar *display_name)
   _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 ();