diff options
| author | Ross Burton <ross@burtonini.com> | 2008-06-16 08:51:18 +0000 |
|---|---|---|
| committer | Ross Burton <rburton@src.gnome.org> | 2008-06-16 08:51:18 +0000 |
| commit | 0d8026356b42b2f90172e02d68d439078bee3188 (patch) | |
| tree | 0a7a23f02ec2870587e6e9a82cd68dab9b0ab19b | |
| parent | 528012756d3ee5a6e69b3701fcb16972f3b7c6f6 (diff) | |
| download | gvfs-0d8026356b42b2f90172e02d68d439078bee3188.tar.gz | |
Bug 536252 – GFileEnumerator should allow access to the containing GFile
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)
svn path=/trunk/; revision=1810
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | client/gdaemonfile.c | 4 | ||||
| -rw-r--r-- | client/gdaemonfileenumerator.c | 6 | ||||
| -rw-r--r-- | client/gdaemonfileenumerator.h | 2 |
4 files changed, 18 insertions, 5 deletions
@@ -1,3 +1,14 @@ +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) + 2008-06-11 Ross Burton <ross@burtonini.com> * programs/gvfs-mkdir.c: diff --git a/client/gdaemonfile.c b/client/gdaemonfile.c index a191b4ce..e9014919 100644 --- a/client/gdaemonfile.c +++ b/client/gdaemonfile.c @@ -709,7 +709,7 @@ g_daemon_file_enumerate_children (GFile *file, 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 @@ g_daemon_file_enumerate_children_async (GFile *file, 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); diff --git a/client/gdaemonfileenumerator.c b/client/gdaemonfileenumerator.c index 60bd7160..15e04785 100644 --- a/client/gdaemonfileenumerator.c +++ b/client/gdaemonfileenumerator.c @@ -112,11 +112,13 @@ g_daemon_file_enumerator_init (GDaemonFileEnumerator *daemon) } 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; } diff --git a/client/gdaemonfileenumerator.h b/client/gdaemonfileenumerator.h index cb5a14b3..25f5195a 100644 --- a/client/gdaemonfileenumerator.h +++ b/client/gdaemonfileenumerator.h @@ -46,7 +46,7 @@ struct _GDaemonFileEnumeratorClass 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); |