diff options
| author | Alexander Larsson <alexl@redhat.com> | 2008-03-03 15:52:43 +0000 |
|---|---|---|
| committer | Alexander Larsson <alexl@src.gnome.org> | 2008-03-03 15:52:43 +0000 |
| commit | a68aa2319d3e930d4347cf4e5e29a024221e74c5 (patch) | |
| tree | 1e361ed1045a5f253301aefdd56412e25493ef1c /daemon/gvfsdaemonutils.c | |
| parent | 09a031a4b2fdb102942d6f407847c222969d7d9b (diff) | |
| download | gvfs-a68aa2319d3e930d4347cf4e5e29a024221e74c5.tar.gz | |
Add _g_dbus_message_iter_append_args_valist and
2008-03-03 Alexander Larsson <alexl@redhat.com>
* common/gdbusutils.[ch]:
Add _g_dbus_message_iter_append_args_valist and
_g_dbus_message_iter_append_args.
* common/gvfsdaemonprotocol.h:
Add G_VFS_DBUS_MOUNTTRACKER_OP_LIST_MOUNTABLE_INFO
* client/Makefile.am:
* client/gdaemonvfs.c:
Use listMountableInfo to get supported uri schemes
and information for default uri handling.
Handle default port in uris and if host_is_inet normalize hostnames,
including removing ipv6 brackets.
* client/sftpuri.c:
Removed, as the previous work replaces it
* daemon/gvfsdaemonutils.c:
(gvfs_file_info_populate_content_types):
Fix uninitialized variable warning.
* daemon/mount.c:
Read new mountfile info and implement
list_mountable_info.
* daemon/sftp.mount.in:
Add info for sftp
svn path=/trunk/; revision=1508
Diffstat (limited to 'daemon/gvfsdaemonutils.c')
| -rw-r--r-- | daemon/gvfsdaemonutils.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/daemon/gvfsdaemonutils.c b/daemon/gvfsdaemonutils.c index 9f45bee9..32c70f2b 100644 --- a/daemon/gvfsdaemonutils.c +++ b/daemon/gvfsdaemonutils.c @@ -270,7 +270,8 @@ gvfs_file_info_populate_content_types (GFileInfo *info, g_file_info_set_content_type (info, mimetype); g_file_info_set_attribute_string (info, G_FILE_ATTRIBUTE_STANDARD_FAST_CONTENT_TYPE, mimetype); - + + icon = NULL; if (type == G_FILE_TYPE_DIRECTORY) icon = g_themed_icon_new ("folder"); else if (mimetype) |