diff options
| author | Sven Neumann <sven@gimp.org> | 2009-02-19 21:31:55 +0000 |
|---|---|---|
| committer | Sven Neumann <neo@src.gnome.org> | 2009-02-19 21:31:55 +0000 |
| commit | 35ea47ed4d4c533bca87a5b18c74f4c80e2428bc (patch) | |
| tree | e2d256cc4ce0cb6f5c005e5b66d30d41fa2570ba | |
| parent | d722067aa3808446ebcbe5ea6cba10c218a6851a (diff) | |
| download | gtk+-35ea47ed4d4c533bca87a5b18c74f4c80e2428bc.tar.gz | |
Merged from trunk:
2009-02-19 Sven Neumann <sven@gimp.org>
Merged from trunk:
* gdk/directfb/gdkwindow-directfb.c
(gdk_window_foreign_new_for_display, gdk_directfb_window_new):
initialize private->impl. Thanks to Masse Nicolas for pointing
this out.
svn path=/branches/gtk-2-14/; revision=22381
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | gdk/directfb/gdkwindow-directfb.c | 5 |
2 files changed, 12 insertions, 2 deletions
@@ -1,3 +1,12 @@ +2009-02-19 Sven Neumann <sven@gimp.org> + + Merged from trunk: + + * gdk/directfb/gdkwindow-directfb.c + (gdk_window_foreign_new_for_display, gdk_directfb_window_new): + initialize private->impl. Thanks to Masse Nicolas for pointing + this out. + 2009-02-18 Sven Neumann <sven@gimp.org> Merged from trunk: diff --git a/gdk/directfb/gdkwindow-directfb.c b/gdk/directfb/gdkwindow-directfb.c index 0acfb42f55..e881a5a9a7 100644 --- a/gdk/directfb/gdkwindow-directfb.c +++ b/gdk/directfb/gdkwindow-directfb.c @@ -411,8 +411,7 @@ _gdk_windowing_window_init (void) g_assert (_gdk_parent_root == NULL); - _gdk_display->layer->GetConfiguration( - _gdk_display->layer, &dlc ); + _gdk_display->layer->GetConfiguration (_gdk_display->layer, &dlc); _gdk_parent_root = g_object_new (GDK_TYPE_WINDOW, NULL); private = GDK_WINDOW_OBJECT (_gdk_parent_root); @@ -2653,6 +2652,7 @@ GdkWindow *gdk_directfb_create_child_window(GdkWindow *parent, window = g_object_new (GDK_TYPE_WINDOW, NULL); private = GDK_WINDOW_OBJECT (window); + private->impl = g_object_new (_gdk_window_impl_get_type (), NULL); parent_private = GDK_WINDOW_OBJECT (parent); parent_impl = GDK_WINDOW_IMPL_DIRECTFB (parent_private->impl); private->parent = parent_private; @@ -2731,6 +2731,7 @@ gdk_window_foreign_new_for_display (GdkDisplay* display,GdkNativeWindow anid) /* we hold a reference count on ourselves */ g_object_ref (window); private = GDK_WINDOW_OBJECT (window); + private->impl = g_object_new (_gdk_window_impl_get_type (), NULL); private->parent = parent_private; private->window_type = GDK_WINDOW_TOPLEVEL; impl = GDK_WINDOW_IMPL_DIRECTFB (private->impl); |