summaryrefslogtreecommitdiff
path: root/libmate-panel-applet
diff options
context:
space:
mode:
authorinfirit <[email protected]>2014-05-16 16:28:11 +0200
committerinfirit <[email protected]>2014-05-16 16:28:11 +0200
commit41ff2a970ebee68fc7ca335f10ae24a6210d1fd5 (patch)
tree1fece64eda0067255bbf37dc03835bb177bccfff /libmate-panel-applet
parent472ccc0025494452e705ac28dc82fe5abd431de8 (diff)
downloadmate-panel-41ff2a970ebee68fc7ca335f10ae24a6210d1fd5.tar.bz2
mate-panel-41ff2a970ebee68fc7ca335f10ae24a6210d1fd5.tar.xz
Use GDK_WINDOW_XID for gtk+2 and gtk+3
It was introduced in gdk2 already so clean up the code.
Diffstat (limited to 'libmate-panel-applet')
-rw-r--r--libmate-panel-applet/mate-panel-applet.c14
1 files changed, 0 insertions, 14 deletions
diff --git a/libmate-panel-applet/mate-panel-applet.c b/libmate-panel-applet/mate-panel-applet.c
index c11ac37a..efcca300 100644
--- a/libmate-panel-applet/mate-panel-applet.c
+++ b/libmate-panel-applet/mate-panel-applet.c
@@ -561,11 +561,7 @@ mate_panel_applet_request_focus (MatePanelApplet *applet,
display = gdk_screen_get_display (screen);
xdisplay = GDK_DISPLAY_XDISPLAY (display);
-#if GTK_CHECK_VERSION (3, 0, 0)
xroot = GDK_WINDOW_XID (root);
-#else
- xroot = GDK_WINDOW_XWINDOW (root);
-#endif
mate_panel_applet_init_atoms (xdisplay);
@@ -948,15 +944,9 @@ mate_panel_applet_button_event (GtkWidget *widget,
}
xevent.xbutton.display = GDK_WINDOW_XDISPLAY (window);
-#if GTK_CHECK_VERSION (3, 0, 0)
xevent.xbutton.window = GDK_WINDOW_XID (socket_window);
xevent.xbutton.root = GDK_WINDOW_XID (gdk_screen_get_root_window
(gdk_window_get_screen (window)));
-#else
- xevent.xbutton.window = GDK_WINDOW_XWINDOW (socket_window);
- xevent.xbutton.root = GDK_WINDOW_XWINDOW (gdk_screen_get_root_window
- (gdk_drawable_get_screen (window)));
-#endif
/*
* FIXME: the following might cause
* big problems for non-GTK apps
@@ -972,11 +962,7 @@ mate_panel_applet_button_event (GtkWidget *widget,
gdk_error_trap_push ();
XSendEvent (GDK_WINDOW_XDISPLAY (window),
-#if GTK_CHECK_VERSION (3, 0, 0)
GDK_WINDOW_XID (socket_window),
-#else
- GDK_WINDOW_XWINDOW (socket_window),
-#endif
False, NoEventMask, &xevent);
gdk_flush ();