filechooserbutton: In SELECT_FOLDER, when the selection is empty, show (None) in...

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

diff --git a/gtk/gtkshow.c b/gtk/gtkshow.c
index 8c916181ab30ced34591fa87a61f65ff8f443a62..4ec7489bfe10009635eed477faea70542c089e28 100644 (file)
--- a/gtk/gtkshow.c
+++ b/gtk/gtkshow.c
@@ -1,4 +1,4 @@
-/* 
+/*
  * GTK - The GIMP Toolkit
  * Copyright (C) 2008  Jaap Haitsma <jaap@haitsma.org>
  *
@@ -15,57 +15,63 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <config.h>
+#include "config.h"
 
-#include <glib.h>
-#include <gio/gio.h>
-#include "gdk/gdkscreen.h"
-#include "gdk/gdkapplaunchcontext.h"
+#include <gdk/gdk.h>
 
 #include "gtkshow.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 can amongst others (depending on support in gio/gvfs) take 
- * the following forms:
- * "file:///home/gnome/pict.jpg",
- * "http://www.gnome.org",
- * "mailto:me@gnome.org",
- * "ghelp:eog".
- * Ideally the timestamp is taken from the event triggering gtk_show_uri. 
- * If timestamp is not known you can take %GDK_CURRENT_TIME
+ * This is a convenience function for launching the default application
+ * 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>
+ *   <member><filename>mailto:me&commat;gnome.org</filename></member>
+ * </simplelist>
+ * Ideally the timestamp is taken from the event triggering
+ * the gtk_show_uri() call. If timestamp is not known you can take
+ * %GDK_CURRENT_TIME.
+ *
+ * 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
  */
 gboolean
-gtk_show_uri (GdkScreen *screen, 
-              const char* uri, 
-              guint32 timestamp, 
-              GError **error)
+gtk_show_uri (GdkScreen    *screen,
+              const gchar  *uri,
+              guint32       timestamp,
+              GError      **error)
 {
   GdkAppLaunchContext *context;
   gboolean ret;
+  GdkDisplay *display;
 
   g_return_val_if_fail (uri != NULL, FALSE);
 
-  context = gdk_app_launch_context_new ();
+  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);
 
   ret = g_app_info_launch_default_for_uri (uri, (GAppLaunchContext*)context, error);