diff options
| author | Stefano Karapetsas <[email protected]> | 2013-07-07 09:34:44 -0700 |
|---|---|---|
| committer | Stefano Karapetsas <[email protected]> | 2013-07-07 09:34:44 -0700 |
| commit | 0ebd2b956ab49e022bac0bfc3741a88f82719013 (patch) | |
| tree | 5fc54aa63c7580129cc70c6080628d8e176e9b47 | |
| parent | 73937e2949c41ed0f5c7e0825c188da2248bb7fd (diff) | |
| parent | 0393e55bde712d4a20918e27a1aca133bca62fdb (diff) | |
| download | mate-desktop-0ebd2b956ab49e022bac0bfc3741a88f82719013.tar.bz2 mate-desktop-0ebd2b956ab49e022bac0bfc3741a88f82719013.tar.xz | |
Merge pull request #67 from Semmu/dev-gtk3
GTK3 compatibility.
| -rw-r--r-- | libmate-desktop/mate-bg-crossfade.c | 4 | ||||
| -rw-r--r-- | libmate-desktop/mate-rr.c | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/libmate-desktop/mate-bg-crossfade.c b/libmate-desktop/mate-bg-crossfade.c index 40439a5..3c870f1 100644 --- a/libmate-desktop/mate-bg-crossfade.c +++ b/libmate-desktop/mate-bg-crossfade.c @@ -45,6 +45,10 @@ #define cairo_surface_destroy g_object_unref #endif +#if GTK_CHECK_VERSION(3, 0, 0) +#define GDK_WINDOW_TYPE(d) (gdk_window_get_window_type (GDK_WINDOW (d))) +#endif + struct _MateBGCrossfadePrivate { GdkWindow *window; diff --git a/libmate-desktop/mate-rr.c b/libmate-desktop/mate-rr.c index 7b2d32a..d61dd45 100644 --- a/libmate-desktop/mate-rr.c +++ b/libmate-desktop/mate-rr.c @@ -673,7 +673,11 @@ mate_rr_screen_new (GdkScreen *gdk_screen, screen->gdk_screen = gdk_screen; screen->gdk_root = gdk_screen_get_root_window (gdk_screen); + #if GTK_CHECK_VERSION(3, 0, 0) + screen->xroot = gdk_x11_window_get_xid (screen->gdk_root); + #else screen->xroot = gdk_x11_drawable_get_xid (screen->gdk_root); + #endif screen->xdisplay = dpy; screen->xscreen = gdk_x11_screen_get_xscreen (screen->gdk_screen); screen->connector_type_atom = XInternAtom (dpy, "ConnectorType", FALSE); |