From cb443937caaffd79c297d7799639b826411bf785 Mon Sep 17 00:00:00 2001 From: infirit Date: Fri, 16 May 2014 20:55:13 +0200 Subject: Use GDK_WINDOW_XID --- mate-panel/xstuff.c | 16 ---------------- 1 file changed, 16 deletions(-) (limited to 'mate-panel/xstuff.c') 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 } } -- cgit v1.2.1