empathy r737 - in trunk: . libempathy-gtk src

[xclaesse svn gnome org]

Author: xclaesse
Date: Tue Mar 11 09:27:31 2008
New Revision: 737
URL: http://svn.gnome.org/viewvc/empathy?rev=737&view=rev

Log:
Drop gnome-vfs dependency and use gio instead. Fixes bug #514380 (Cosimo Cecchi).


Modified:
   trunk/configure.ac
   trunk/libempathy-gtk/empathy-avatar-chooser.c
   trunk/libempathy-gtk/empathy-ui-utils.c
   trunk/src/empathy-chat-chandler.c
   trunk/src/empathy.c

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Tue Mar 11 09:27:31 2008
@@ -25,7 +25,7 @@
 AC_SUBST(LIBEMPATHY_GTK_REVISION)
 
 # Minimal version required
-GLIB_REQUIRED=2.14.0
+GLIB_REQUIRED=2.15.5
 GTK_REQUIRED=2.12.0
 GCONF_REQUIRED=1.2.0
 LIBGLADE_REQUIRED=2.0.0
@@ -93,11 +93,11 @@
 [
    glib-2.0 >= $GLIB_REQUIRED
    gobject-2.0
+   gio-2.0 >= $GLIB_REQUIRED
    gconf-2.0 >= $GCONF_REQUIRED
    libtelepathy >= $TELEPATHY_REQUIRED
    telepathy-glib >= $TELEPATHY_GLIB_REQUIRED
    libmissioncontrol >= $MISSION_CONTROL_REQUIRED
-   gnome-vfs-2.0
    gtk+-2.0 >= $GTK_REQUIRED
    x11
    libglade-2.0 >= $LIBGLADE_REQUIRED
@@ -178,7 +178,6 @@
       gtk+-2.0 >= $GTK_REQUIRED
       gconf-2.0 >= $GCONF_REQUIRED
       libglade-2.0 >= $LIBGLADE_REQUIRED 
-      gnome-vfs-2.0
       libtelepathy >= $TELEPATHY_REQUIRED
       libmissioncontrol >= $MISSION_CONTROL_REQUIRED
    ], have_megaphone="yes", have_megaphone="no")
@@ -264,7 +263,6 @@
          gobject-2.0
          gconf-2.0 >= $GCONF_REQUIRED
          libxml-2.0
-         gnome-vfs-2.0
          libtelepathy >= $TELEPATHY_REQUIRED
          libmissioncontrol >= $MISSION_CONTROL_REQUIRED
          gtk+-2.0 >= $GTK_REQUIRED

Modified: trunk/libempathy-gtk/empathy-avatar-chooser.c
==============================================================================
--- trunk/libempathy-gtk/empathy-avatar-chooser.c	(original)
+++ trunk/libempathy-gtk/empathy-avatar-chooser.c	Tue Mar 11 09:27:31 2008
@@ -27,7 +27,7 @@
 
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
-#include <libgnomevfs/gnome-vfs-ops.h>
+#include <gio/gio.h>
 
 #include <libempathy/empathy-debug.h>
 
@@ -329,9 +329,8 @@
 
 	target_type = gdk_atom_name (selection_data->target);
 	if (!strcmp (target_type, URI_LIST_TYPE)) {
-		GnomeVFSHandle   *handle = NULL;
-		GnomeVFSResult    result;
-		GnomeVFSFileInfo  info;
+		GFile            *file;
+		GFileInputStream *input_stream;
 		gchar            *uri;
 		gchar            *nl;
 		gchar            *data = NULL;
@@ -343,31 +342,41 @@
 		} else {
 			uri = g_strdup (selection_data->data);
 		}
-
-		result = gnome_vfs_open (&handle, uri, GNOME_VFS_OPEN_READ);
-		if (result == GNOME_VFS_OK) {
-			result = gnome_vfs_get_file_info_from_handle (handle,
-								      &info,
-								      GNOME_VFS_FILE_INFO_DEFAULT);
-			if (result == GNOME_VFS_OK) {
-				GnomeVFSFileSize data_size;
-
-				data = g_malloc (info.size);
-
-				result = gnome_vfs_read (handle, data, info.size, &data_size);
-				if (result == GNOME_VFS_OK) {
+		
+		file = g_file_new_for_uri (uri);
+		input_stream = g_file_read (file, NULL, NULL);
+
+		if (input_stream != NULL) {
+			GFileInfo *info;
+			
+			info = g_file_query_info (file,
+						  G_FILE_ATTRIBUTE_STANDARD_SIZE,
+						  0, NULL, NULL);
+			if (info != NULL) {
+				goffset size;
+				gssize bytes_read;
+				
+				size = g_file_info_get_size (info);
+				data = g_malloc (size);
+
+				bytes_read = g_input_stream_read (G_INPUT_STREAM (input_stream),
+								  data, size,
+								  NULL, NULL);
+				g_object_unref (info);
+				if (bytes_read != -1) {
 					avatar_chooser_set_image_from_data (chooser,
 									    data,
-									    data_size);
+									    (gsize) bytes_read);
 					handled = TRUE;
 				} else {
 					g_free (data);
 				}
 			}
 
-			gnome_vfs_close (handle);
+			g_input_stream_close (G_INPUT_STREAM (input_stream), NULL, NULL);
 		}
-
+		
+		g_object_unref (file);
 		g_free (uri);
 	}
 

Modified: trunk/libempathy-gtk/empathy-ui-utils.c
==============================================================================
--- trunk/libempathy-gtk/empathy-ui-utils.c	(original)
+++ trunk/libempathy-gtk/empathy-ui-utils.c	Tue Mar 11 09:27:31 2008
@@ -35,8 +35,8 @@
 #include <gdk/gdkx.h>
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
+#include <gio/gio.h>
 #include <glade/glade.h>
-#include <libgnomevfs/gnome-vfs-utils.h>
 
 #include <libmissioncontrol/mc-profile.h>
 
@@ -1320,14 +1320,21 @@
 empathy_url_show (const char *url)
 {
 	gchar          *real_url;
-	GnomeVFSResult  res;
+	gboolean        res;
+	GError         *err;
 
 	real_url = fixup_url (url);
-	res = gnome_vfs_url_show (real_url);
-	if (res != GNOME_VFS_OK) {
+	/* FIXME: this does not work for multihead, we should use
+	 * GdkAppLaunchContext for that, when we can depend on GTK+ trunk
+	 */
+	res = g_app_info_launch_default_for_uri (real_url,
+						 NULL,
+						 &err);
+	if (!res) {
 		empathy_debug (DEBUG_DOMAIN, "Couldn't show URL %s: %s",
 			      real_url,
-			      gnome_vfs_result_to_string (res));
+			      err->message);
+		g_error_free (err);
 	}
 
 	g_free (real_url);

Modified: trunk/src/empathy-chat-chandler.c
==============================================================================
--- trunk/src/empathy-chat-chandler.c	(original)
+++ trunk/src/empathy-chat-chandler.c	Tue Mar 11 09:27:31 2008
@@ -28,8 +28,6 @@
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 
-#include <libgnomevfs/gnome-vfs.h>
-
 #include <libmissioncontrol/mission-control.h>
 
 #include <libempathy/empathy-chandler.h>
@@ -138,7 +136,6 @@
 	gtk_window_set_default_icon_name ("empathy");
 	gtk_icon_theme_append_search_path (gtk_icon_theme_get_default (),
 					   PKGDATADIR G_DIR_SEPARATOR_S "icons");
-	gnome_vfs_init ();
 
 	mc = empathy_mission_control_new ();
 	chandler = empathy_chandler_new (BUS_NAME, OBJECT_PATH);

Modified: trunk/src/empathy.c
==============================================================================
--- trunk/src/empathy.c	(original)
+++ trunk/src/empathy.c	Tue Mar 11 09:27:31 2008
@@ -31,7 +31,6 @@
 #include <gdk/gdkx.h>
 
 #include <libebook/e-book.h>
-#include <libgnomevfs/gnome-vfs.h>
 
 #include <telepathy-glib/util.h>
 #include <libmissioncontrol/mc-account.h>
@@ -299,7 +298,6 @@
 	gtk_window_set_default_icon_name ("empathy");
 	gtk_icon_theme_append_search_path (gtk_icon_theme_get_default (),
 					   PKGDATADIR G_DIR_SEPARATOR_S "icons");
-	gnome_vfs_init ();
 
         /* Setting up the bacon connection */
 	connection = bacon_message_connection_new ("empathy");