gvfs r1277 - in trunk: . client

[alexl svn gnome org]

Author: alexl
Date: Fri Feb 15 15:14:40 2008
New Revision: 1277
URL: http://svn.gnome.org/viewvc/gvfs?rev=1277&view=rev

Log:
2008-02-15  Alexander Larsson  <alexl redhat com>

        * client/gdaemonfile.c:
	Pass uri in query_info_async too.




Modified:
   trunk/ChangeLog
   trunk/client/gdaemonfile.c

Modified: trunk/client/gdaemonfile.c
==============================================================================
--- trunk/client/gdaemonfile.c	(original)
+++ trunk/client/gdaemonfile.c	Fri Feb 15 15:14:40 2008
@@ -744,7 +744,7 @@
 			     cancellable, error,
 			     DBUS_TYPE_STRING, &attributes,
 			     DBUS_TYPE_UINT32, &flags,
-			     uri != NULL ? DBUS_TYPE_STRING : 0, &uri,
+			     DBUS_TYPE_STRING, &uri,
 			     0);
 
   g_free (uri);
@@ -816,6 +816,9 @@
 				gpointer                    user_data)
 {
   guint32 dbus_flags;
+  char *uri;
+
+  uri = g_file_get_uri (file);
 
   dbus_flags = flags;
   do_async_path_call (file,
@@ -825,7 +828,10 @@
 		      query_info_async_cb, NULL, NULL,
 		      DBUS_TYPE_STRING, &attributes,
 		      DBUS_TYPE_UINT32, &dbus_flags,
+		      DBUS_TYPE_STRING, &uri,
 		      0);
+
+  g_free (uri);
 }
 
 static GFileInfo *