libgnome r3806 - in trunk: . libgnome

[chpe svn gnome org]

Author: chpe
Date: Mon Sep  8 20:02:04 2008
New Revision: 3806
URL: http://svn.gnome.org/viewvc/libgnome?rev=3806&view=rev

Log:
Port gnome-open to GIO. Bug #530752.

Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/libgnome/Makefile.am
   trunk/libgnome/gnome-open.c

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Mon Sep  8 20:02:04 2008
@@ -23,6 +23,7 @@
 m4_define([gnome_vfs_required_version], [2.5.3])
 m4_define([libbonobo_required_version], [2.13.0])
 m4_define([gobject_required_version], [2.0.0])
+m4_define([gio_required_version],       [2.16.0])
 
 dnl libtool versioning from libgnome
 m4_define([libgnome_current], [m4_eval(100 * libgnome_minor_version + libgnome_micro_version - libgnome_interface_age)])
@@ -171,6 +172,9 @@
   gconf-2.0 >= gconf_required_version dnl
   $SOUND_MODULES])
 
+# for gnome-open
+PKG_CHECK_MODULES([GIO],[gio-2.0 >= gio_required_version])
+
 dnl
 dnl Check for gtk-doc
 dnl

Modified: trunk/libgnome/Makefile.am
==============================================================================
--- trunk/libgnome/Makefile.am	(original)
+++ trunk/libgnome/Makefile.am	Mon Sep  8 20:02:04 2008
@@ -79,7 +79,8 @@
 
 gnome_open_LDADD = \
 	libgnome-2.la	\
-	$(LIBGNOME_LIBS)
+	$(LIBGNOME_LIBS) \
+	$(GIO_LIBS)
 
 libgnometypebuiltins.h: stamp-libgnometypebuiltins.h
 	@true

Modified: trunk/libgnome/gnome-open.c
==============================================================================
--- trunk/libgnome/gnome-open.c	(original)
+++ trunk/libgnome/gnome-open.c	Mon Sep  8 20:02:04 2008
@@ -2,6 +2,7 @@
 
 #include <glib.h>
 #include <glib/gi18n-lib.h>
+#include <gio/gio.h>
 
 #include <stdio.h>
 
@@ -9,12 +10,11 @@
 #include "gnome-program.h"
 #include "gnome-init.h"
 
-#include <libgnomevfs/gnome-vfs-utils.h>
-
 int
 main (int argc, char *argv[])
 {
   GError *err = NULL;
+  GFile *file;
   char *uri;
 
   if (argc < 2)
@@ -28,9 +28,11 @@
 		      argc, argv,
 		      NULL);
 
-  uri = gnome_vfs_make_uri_from_input_with_dirs (argv[1],
-						 GNOME_VFS_MAKE_URI_DIR_CURRENT);
-  if (gnome_url_show (uri, &err))
+  file = g_file_new_for_commandline_arg (argv[1]);
+  uri = g_file_get_uri (file);
+  g_object_unref (file);
+
+  if (g_app_info_launch_default_for_uri (uri, NULL, &err))
     return 0;
 
   fprintf (stderr, _("Error showing url: %s\n"), err->message);