gvfs r1810 - in trunk: . client

[rburton svn gnome org]

Author: rburton
Date: Mon Jun 16 08:51:18 2008
New Revision: 1810
URL: http://svn.gnome.org/viewvc/gvfs?rev=1810&view=rev

Log:
2008-06-16  Ross Burton  <ross burtonini com>

	Bug 536252 â GFileEnumerator should allow access to the containing
	GFile
	
	* client/gdaemonfile.c:
	* client/gdaemonfileenumerator.c:
	* client/gdaemonfileenumerator.h:
	Pass the GFile to the file enumerator constructor and use it to
	set the container property.  (Requires glib r7044)


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

Modified: trunk/client/gdaemonfile.c
==============================================================================
--- trunk/client/gdaemonfile.c	(original)
+++ trunk/client/gdaemonfile.c	Mon Jun 16 08:51:18 2008
@@ -709,7 +709,7 @@
   DBusConnection *connection;
   char *uri;
 
-  enumerator = g_daemon_file_enumerator_new ();
+  enumerator = g_daemon_file_enumerator_new (file);
   obj_path = g_daemon_file_enumerator_get_object_path (enumerator);
 
 
@@ -2425,7 +2425,7 @@
   GDaemonFileEnumerator *enumerator;
   char *uri;
 
-  enumerator = g_daemon_file_enumerator_new ();
+  enumerator = g_daemon_file_enumerator_new (file);
   obj_path = g_daemon_file_enumerator_get_object_path (enumerator);
 
   uri = g_file_get_uri (file);

Modified: trunk/client/gdaemonfileenumerator.c
==============================================================================
--- trunk/client/gdaemonfileenumerator.c	(original)
+++ trunk/client/gdaemonfileenumerator.c	Mon Jun 16 08:51:18 2008
@@ -112,11 +112,13 @@
 }
 
 GDaemonFileEnumerator *
-g_daemon_file_enumerator_new (void)
+g_daemon_file_enumerator_new (GFile *file)
 {
   GDaemonFileEnumerator *daemon;
 
-  daemon = g_object_new (G_TYPE_DAEMON_FILE_ENUMERATOR, NULL);
+  daemon = g_object_new (G_TYPE_DAEMON_FILE_ENUMERATOR,
+                         "container", file,
+                         NULL);
   
   return daemon;
 }

Modified: trunk/client/gdaemonfileenumerator.h
==============================================================================
--- trunk/client/gdaemonfileenumerator.h	(original)
+++ trunk/client/gdaemonfileenumerator.h	Mon Jun 16 08:51:18 2008
@@ -46,7 +46,7 @@
 
 GType g_daemon_file_enumerator_get_type (void) G_GNUC_CONST;
 
-GDaemonFileEnumerator *g_daemon_file_enumerator_new                 (void);
+GDaemonFileEnumerator *g_daemon_file_enumerator_new                 (GFile *file);
 char  *                g_daemon_file_enumerator_get_object_path     (GDaemonFileEnumerator *enumerator);
 void                   g_daemon_file_enumerator_set_sync_connection (GDaemonFileEnumerator *enumerator,
 								     DBusConnection        *connection);