summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorinfirit <[email protected]>2014-11-22 12:33:44 +0100
committerinfirit <[email protected]>2014-11-22 15:13:50 +0100
commit9a8965fa0c783bc8221a1ccd55247e5e6a4ee88a (patch)
tree5679d3af39797c0d04b493489dad4bb18a9ede4d
parentaa4e6f2cdcb5fedd208f99216e5443caf200245e (diff)
downloadmate-panel-9a8965fa0c783bc8221a1ccd55247e5e6a4ee88a.tar.bz2
mate-panel-9a8965fa0c783bc8221a1ccd55247e5e6a4ee88a.tar.xz
gdk_x11_window_lookup_for_display was added in Gtk+2.24
So cut down on the ifdef hell a bit.
-rw-r--r--mate-panel/panel-action-protocol.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/mate-panel/panel-action-protocol.c b/mate-panel/panel-action-protocol.c
index ca5b7b5b..01da869f 100644
--- a/mate-panel/panel-action-protocol.c
+++ b/mate-panel/panel-action-protocol.c
@@ -101,9 +101,7 @@ panel_action_protocol_filter (GdkXEvent *gdk_xevent,
{
GdkWindow *window;
GdkScreen *screen;
-#if GTK_CHECK_VERSION (3, 0, 0)
GdkDisplay *display;
-#endif
XEvent *xevent = (XEvent *) gdk_xevent;
if (xevent->type != ClientMessage)
@@ -113,14 +111,9 @@ panel_action_protocol_filter (GdkXEvent *gdk_xevent,
(xevent->xclient.message_type != atom_gnome_panel_action))
return GDK_FILTER_CONTINUE;
-#if GTK_CHECK_VERSION (3, 0, 0)
screen = gdk_event_get_screen (event);
display = gdk_screen_get_display (screen);
window = gdk_x11_window_lookup_for_display (display, xevent->xclient.window);
-#else
- window = gdk_window_lookup (xevent->xclient.window);
- screen = gdk_drawable_get_screen (window);
-#endif
if (!window)
return GDK_FILTER_CONTINUE;