diff options
| author | David Zeuthen <davidz@redhat.com> | 2008-07-29 18:27:21 +0000 |
|---|---|---|
| committer | David Zeuthen <davidz@src.gnome.org> | 2008-07-29 18:27:21 +0000 |
| commit | 9510e8d3d62df724d1a223a97cb4fd256fbcb735 (patch) | |
| tree | cbc514ade6498048698b27b9ca4dc0b627990e67 /common/gmounttracker.c | |
| parent | 55c35a750f678ed7f3f413d5c1058cf76f2881bb (diff) | |
| download | gvfs-9510e8d3d62df724d1a223a97cb4fd256fbcb735.tar.gz | |
Add x-content/* support to daemon mounts. Right now a backend can only set
2008-07-29 David Zeuthen <davidz@redhat.com>
* client/gdaemonmount.c:
* common/gmounttracker.c:
* common/gmounttracker.h:
* daemon/gvfsbackend.c:
* daemon/gvfsbackend.h:
* daemon/gvfsbackendcdda.c:
* daemon/gvfsbackendgphoto2.c:
* daemon/mount.c:
Add x-content/* support to daemon mounts. Right now a backend
can only set the x-content/* type ahead of time. We might want
to add support dynamically obtaining it too (e.g. support
force_rescan).
* monitor/hal/ghalmount.c:
* monitor/hal/ghalvolume.c:
* monitor/hal/ghalvolumemonitor.c:
* monitor/hal/hal-utils.c:
* monitor/hal/hal-utils.h:
Add x-content/* support to the HAL volume monitor.
* monitor/proxy/gproxymount.c:
* monitor/proxy/gproxymount.h:
* monitor/proxy/gproxyvolumemonitor.c:
* monitor/proxy/gproxyvolumemonitor.h:
* monitor/proxy/gvfsproxyvolumemonitordaemon.c:
Add x-content/* support to proxy volume monitor. Also fix
a number of bugs the initial implementation had.
* programs/gvfs-mount.c:
Print out x-content-types.
svn path=/trunk/; revision=1845
Diffstat (limited to 'common/gmounttracker.c')
| -rw-r--r-- | common/gmounttracker.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/common/gmounttracker.c b/common/gmounttracker.c index b6a13d64..5d97d0c9 100644 --- a/common/gmounttracker.c +++ b/common/gmounttracker.c @@ -115,6 +115,7 @@ g_mount_info_dup (GMountInfo *info) copy->ref_count = 1; copy->display_name = g_strdup (info->display_name); copy->stable_name = g_strdup (info->stable_name); + copy->x_content_types = g_strdup (info->x_content_types); copy->icon = g_strdup (info->icon); copy->dbus_id = g_strdup (info->dbus_id); copy->object_path = g_strdup (info->object_path); @@ -140,6 +141,7 @@ g_mount_info_unref (GMountInfo *info) { g_free (info->display_name); g_free (info->stable_name); + g_free (info->x_content_types); g_free (info->icon); g_free (info->dbus_id); g_free (info->object_path); @@ -184,6 +186,7 @@ g_mount_info_from_dbus (DBusMessageIter *iter) dbus_bool_t user_visible; char *display_name; char *stable_name; + char *x_content_types; char *icon; char *prefered_filename_encoding; char *dbus_id; @@ -200,6 +203,7 @@ g_mount_info_from_dbus (DBusMessageIter *iter) DBUS_TYPE_OBJECT_PATH, &obj_path, DBUS_TYPE_STRING, &display_name, DBUS_TYPE_STRING, &stable_name, + DBUS_TYPE_STRING, &x_content_types, DBUS_TYPE_STRING, &icon, DBUS_TYPE_STRING, &prefered_filename_encoding, DBUS_TYPE_BOOLEAN, &user_visible, @@ -217,6 +221,7 @@ g_mount_info_from_dbus (DBusMessageIter *iter) info->ref_count = 1; info->display_name = g_strdup (display_name); info->stable_name = g_strdup (stable_name); + info->x_content_types = g_strdup (x_content_types); info->icon = g_strdup (icon); info->dbus_id = g_strdup (dbus_id); info->object_path = g_strdup (obj_path); |