diff options
| author | Alexander Larsson <alexl@redhat.com> | 2008-02-15 14:29:11 +0000 |
|---|---|---|
| committer | Alexander Larsson <alexl@src.gnome.org> | 2008-02-15 14:29:11 +0000 |
| commit | 6317daa2e09d54f98668588e89bf457d98383d57 (patch) | |
| tree | ef8e2bc0f5d9486823091fcc1e71e310cd07d564 /client/gdaemonfile.c | |
| parent | 873f1148616870fc3b7080688e32cd7d0f27a3ee (diff) | |
| download | gvfs-6317daa2e09d54f98668588e89bf457d98383d57.tar.gz | |
Pass an optional uri to query_info and enumerate
2008-02-15 Alexander Larsson <alexl@redhat.com>
* client/gdaemonfile.c:
Pass an optional uri to query_info and enumerate
* daemon/gvfsbackend.[ch]:
Add automatic info filling, implement thumbnail
checking if uri passed in.
* daemon/gvfsjobenumerate.[ch]:
* daemon/gvfsjobqueryinfo.[ch]:
Get optional uri argument.
Call automatic backend info filling.
svn path=/trunk/; revision=1276
Diffstat (limited to 'client/gdaemonfile.c')
| -rw-r--r-- | client/gdaemonfile.c | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/client/gdaemonfile.c b/client/gdaemonfile.c index 8e97af14..da6f98a1 100644 --- a/client/gdaemonfile.c +++ b/client/gdaemonfile.c @@ -681,10 +681,14 @@ g_daemon_file_enumerate_children (GFile *file, char *obj_path; GDaemonFileEnumerator *enumerator; DBusConnection *connection; + char *uri; enumerator = g_daemon_file_enumerator_new (); obj_path = g_daemon_file_enumerator_get_object_path (enumerator); - + + + uri = g_file_get_uri (file); + if (attributes == NULL) attributes = ""; flags_dbus = flags; @@ -695,8 +699,9 @@ g_daemon_file_enumerate_children (GFile *file, DBUS_TYPE_STRING, &obj_path, DBUS_TYPE_STRING, &attributes, DBUS_TYPE_UINT32, &flags_dbus, + DBUS_TYPE_STRING, &uri, 0); - + g_free (uri); g_free (obj_path); if (reply == NULL) @@ -718,7 +723,7 @@ g_daemon_file_enumerate_children (GFile *file, static GFileInfo * g_daemon_file_query_info (GFile *file, const char *attributes, - GFileQueryInfoFlags flags, + GFileQueryInfoFlags flags, GCancellable *cancellable, GError **error) { @@ -726,6 +731,9 @@ g_daemon_file_query_info (GFile *file, dbus_uint32_t flags_dbus; DBusMessageIter iter; GFileInfo *info; + char *uri; + + uri = g_file_get_uri (file); if (attributes == NULL) attributes = ""; @@ -736,7 +744,11 @@ g_daemon_file_query_info (GFile *file, cancellable, error, DBUS_TYPE_STRING, &attributes, DBUS_TYPE_UINT32, &flags, + uri != NULL ? DBUS_TYPE_STRING : 0, &uri, 0); + + g_free (uri); + if (reply == NULL) return NULL; |