diff options
| author | infirit <[email protected]> | 2014-12-07 19:45:27 +0100 |
|---|---|---|
| committer | infirit <[email protected]> | 2014-12-07 19:45:27 +0100 |
| commit | a52688bf134120536eddfb0dc398e06992368587 (patch) | |
| tree | cc189e9e413ad089d5f81c29640e5fe829d68528 | |
| parent | 05c072c13e441ff5725b228fce13bc6b820c219f (diff) | |
| download | mate-panel-a52688bf134120536eddfb0dc398e06992368587.tar.bz2 mate-panel-a52688bf134120536eddfb0dc398e06992368587.tar.xz | |
Revert "gdk_x11_window_lookup_for_display was added in Gtk+2.24"
This reverts commit 9a8965fa0c783bc8221a1ccd55247e5e6a4ee88a.
It caused the run dialog to fail.
| -rw-r--r-- | mate-panel/panel-action-protocol.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/mate-panel/panel-action-protocol.c b/mate-panel/panel-action-protocol.c index 01da869f..ca5b7b5b 100644 --- a/mate-panel/panel-action-protocol.c +++ b/mate-panel/panel-action-protocol.c @@ -101,7 +101,9 @@ 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) @@ -111,9 +113,14 @@ 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; |