Mention gvfs in the gtk_show_uri() docs

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

diff --git a/gtk/gtkshow.c b/gtk/gtkshow.c
index 12b0fdfd48892a93a33961524cd451b64e5d6530..3b24c7b3a630ba3f4782435e822fee80f24b671c 100644 (file)
--- a/gtk/gtkshow.c
+++ b/gtk/gtkshow.c
@@ -22,24 +22,23 @@
 
 #include "config.h"
 
-#include <glib.h>
-#include <gio/gio.h>
+#include <gdk/gdk.h>
 
 #include "gtkshow.h"
 
-#include "gtkalias.h"
-
-
 /**
  * gtk_show_uri:
- * @screen: screen to show the uri on or %NULL for the default screen
+ * @screen: (allow-none): screen to show the uri on
+ *     or %NULL for the default screen
  * @uri: the uri to show
- * @timestamp: a timestamp to prevent focus stealing.
+ * @timestamp: a timestamp to prevent focus stealing
  * @error: a #GError that is returned in case of errors
  *
  * This is a convenience function for launching the default application
- * to show the uri. The uri must be of a form understood by GIO. Typical
- * examples are
+ * to show the uri. The uri must be of a form understood by GIO (i.e. you
+ * need to install gvfs to get support for uri schemes such as http://
+ * or ftp://, as only local files are handled by GIO itself).
+ * Typical examples are
  * <simplelist>
  *   <member><filename>file:///home/gnome/pict.jpg</filename></member>
  *   <member><filename>http://www.gnome.org</filename></member>
@@ -67,7 +66,7 @@ gtk_show_uri (GdkScreen    *screen,
 
   g_return_val_if_fail (uri != NULL, FALSE);
 
-  context = gdk_app_launch_context_new ();
+  context = gdk_display_get_app_launch_context (gdk_screen_get_display (screen));
   gdk_app_launch_context_set_screen (context, screen);
   gdk_app_launch_context_set_timestamp (context, timestamp);
 
@@ -76,7 +75,3 @@ gtk_show_uri (GdkScreen    *screen,
 
   return ret;
 }
-
-
-#define __GTK_SHOW_C__
-#include "gtkaliasdef.c"