summaryrefslogtreecommitdiff
path: root/gdk
diff options
context:
space:
mode:
authorSven Neumann <sven@gimp.org>2009-02-19 21:39:43 +0000
committerSven Neumann <neo@src.gnome.org>2009-02-19 21:39:43 +0000
commit69fe31489ccef0764c0856aae88185c84b86188e (patch)
tree230efb7cfadf632fdcd8b93564d50a7f82b04839 /gdk
parent03796c0a90493ac5ee103429193b5cbf2661afe1 (diff)
downloadgtk+-69fe31489ccef0764c0856aae88185c84b86188e.tar.gz
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
Diffstat (limited to 'gdk')
-rw-r--r--gdk/directfb/gdkdisplay-directfb.c20
1 files changed, 9 insertions, 11 deletions
diff --git a/gdk/directfb/gdkdisplay-directfb.c b/gdk/directfb/gdkdisplay-directfb.c
index 4cbda0934d..143ff1ad8f 100644
--- 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 ();