diff options
| author | infirit <[email protected]> | 2014-05-16 20:55:13 +0200 |
|---|---|---|
| committer | infirit <[email protected]> | 2014-05-16 21:47:47 +0200 |
| commit | cb443937caaffd79c297d7799639b826411bf785 (patch) | |
| tree | 7b6be270c571b6edb8932ed25d5753b032edeed5 | |
| parent | dd5556550e07876cf74db99909be97ef8a87a508 (diff) | |
| download | mate-panel-cb443937caaffd79c297d7799639b826411bf785.tar.bz2 mate-panel-cb443937caaffd79c297d7799639b826411bf785.tar.xz | |
Use GDK_WINDOW_XID
| -rw-r--r-- | mate-panel/panel-background-monitor.c | 6 | ||||
| -rw-r--r-- | mate-panel/panel-background.c | 3 | ||||
| -rw-r--r-- | mate-panel/xstuff.c | 16 |
3 files changed, 2 insertions, 23 deletions
diff --git a/mate-panel/panel-background-monitor.c b/mate-panel/panel-background-monitor.c index a7e67e05..ce9737cf 100644 --- a/mate-panel/panel-background-monitor.c +++ b/mate-panel/panel-background-monitor.c @@ -166,11 +166,7 @@ panel_background_monitor_connect_to_screen (PanelBackgroundMonitor *monitor, G_CALLBACK (panel_background_monitor_changed), monitor); monitor->gdkwindow = gdk_screen_get_root_window (screen); -#if GTK_CHECK_VERSION (3, 0, 0) - monitor->xwindow = gdk_x11_window_get_xid (monitor->gdkwindow); -#else - monitor->xwindow = gdk_x11_drawable_get_xid (monitor->gdkwindow); -#endif + monitor->xwindow = GDK_WINDOW_XID (monitor->gdkwindow); gdk_window_add_filter ( monitor->gdkwindow, panel_background_monitor_xevent_filter, monitor); diff --git a/mate-panel/panel-background.c b/mate-panel/panel-background.c index f85fb939..bd5370c0 100644 --- a/mate-panel/panel-background.c +++ b/mate-panel/panel-background.c @@ -1296,8 +1296,7 @@ panel_background_make_string (PanelBackground *background, retval = g_strdup_printf ("pixmap:%d,%d,%d", (guint32)cairo_xlib_surface_get_drawable (surface), x, y); #else - pixmap_xid = gdk_x11_drawable_get_xid ( - GDK_DRAWABLE (background->pixmap)); + pixmap_xid = GDK_WINDOW_XID (GDK_DRAWABLE (background->pixmap)); retval = g_strdup_printf ("pixmap:%d,%d,%d", pixmap_xid, x, y); #endif diff --git a/mate-panel/xstuff.c b/mate-panel/xstuff.c index 8c375deb..9af5d919 100644 --- a/mate-panel/xstuff.c +++ b/mate-panel/xstuff.c @@ -498,11 +498,7 @@ draw_zoom_animation (GdkScreen *gscreen, int depth; dpy = gdk_x11_display_get_xdisplay (gdk_screen_get_display (gscreen)); -#if GTK_CHECK_VERSION (3, 0, 0) root_win = GDK_WINDOW_XID (gdk_screen_get_root_window (gscreen)); -#else - root_win = gdk_x11_drawable_get_xid (gdk_screen_get_root_window (gscreen)); -#endif screen = gdk_screen_get_number (gscreen); #if GTK_CHECK_VERSION (3, 0, 0) depth = DefaultDepth(dpy,screen); @@ -670,11 +666,7 @@ xstuff_get_current_workspace (GdkScreen *screen) int result; int retval; -#if GTK_CHECK_VERSION (3, 0, 0) root_window = GDK_WINDOW_XID (gdk_screen_get_root_window (screen)); -#else - root_window = gdk_x11_drawable_get_xid (gdk_screen_get_root_window (screen)); -#endif gdk_error_trap_push (); result = XGetWindowProperty (GDK_DISPLAY_XDISPLAY (gdk_screen_get_display (screen)), @@ -719,20 +711,12 @@ xstuff_grab_key_on_all_screens (int keycode, if (grab) XGrabKey (gdk_x11_display_get_xdisplay (display), keycode, modifiers, -#if GTK_CHECK_VERSION (3, 0, 0) GDK_WINDOW_XID (root), -#else - gdk_x11_drawable_get_xid (root), -#endif True, GrabModeAsync, GrabModeAsync); else XUngrabKey (gdk_x11_display_get_xdisplay (display), keycode, modifiers, -#if GTK_CHECK_VERSION (3, 0, 0) GDK_WINDOW_XID (root)); -#else - gdk_x11_drawable_get_xid (root)); -#endif } } |