summaryrefslogtreecommitdiff
path: root/gtk/gtkapplication.c
diff options
context:
space:
mode:
authorBastien Nocera <hadess@hadess.net>2013-03-13 15:32:46 +0100
committerBastien Nocera <hadess@hadess.net>2013-03-14 17:48:20 +0100
commitee44ed75ca50cb078ba8d5cb62c6a5d9d568f0e6 (patch)
tree8c80e466e2a698bfd818d50248ff961f71b8cf77 /gtk/gtkapplication.c
parent64397962e82db618bf195fe7444ede6a23e111fb (diff)
downloadgtk+-ee44ed75ca50cb078ba8d5cb62c6a5d9d568f0e6.tar.gz
GtkApplication: Allow passing windows on non-X11 targets
It's not the application's fault that we don't do anything with the passed GtkWindow on non-X11, so don't try to get an XID on non-X11. https://bugzilla.gnome.org/show_bug.cgi?id=695783
Diffstat (limited to 'gtk/gtkapplication.c')
-rw-r--r--gtk/gtkapplication.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/gtk/gtkapplication.c b/gtk/gtkapplication.c
index 9072907513..d605846572 100644
--- a/gtk/gtkapplication.c
+++ b/gtk/gtkapplication.c
@@ -1431,8 +1431,10 @@ gtk_application_inhibit (GtkApplication *application,
gdkwindow = gtk_widget_get_window (GTK_WIDGET (window));
if (gdkwindow == NULL)
g_warning ("Inhibit called with an unrealized window");
- else
+#ifdef GDK_WINDOWING_X11
+ else if (GDK_IS_X11_WINDOW (gdkwindow))
xid = GDK_WINDOW_XID (gdkwindow);
+#endif
}
res = g_dbus_proxy_call_sync (application->priv->sm_proxy,