wayland: Remove non-existing gdkscreen-wayland.h from SOURCES

[~andy/gtk] / gtk / gtkshow.c

diff --git a/gtk/gtkshow.c b/gtk/gtkshow.c
index 3b24c7b3a630ba3f4782435e822fee80f24b671c..ad396a27f9f349dd010335956eabed1ba3abb069 100644 (file)
--- a/gtk/gtkshow.c
+++ b/gtk/gtkshow.c
@@ -51,7 +51,7 @@
  * This function can be used as a replacement for gnome_vfs_url_show()
  * and gnome_url_show().
  *
- * Returns: %TRUE on success, %FALSE on error.
+ * Returns: %TRUE on success, %FALSE on error
  *
  * Since: 2.14
  */
@@ -63,10 +63,16 @@ gtk_show_uri (GdkScreen    *screen,
 {
   GdkAppLaunchContext *context;
   gboolean ret;
+  GdkDisplay *display;
 
   g_return_val_if_fail (uri != NULL, FALSE);
 
-  context = gdk_display_get_app_launch_context (gdk_screen_get_display (screen));
+  if (screen != NULL)
+    display = gdk_screen_get_display (screen);
+  else
+    display = gdk_display_get_default ();
+
+  context = gdk_display_get_app_launch_context (display);
   gdk_app_launch_context_set_screen (context, screen);
   gdk_app_launch_context_set_timestamp (context, timestamp);