diff options
| author | Tomas Bzatek <tbzatek@redhat.com> | 2008-11-04 14:07:18 +0000 |
|---|---|---|
| committer | Tomas Bzatek <tbzatek@src.gnome.org> | 2008-11-04 14:07:18 +0000 |
| commit | 39b77412b39ec9964536b1161676b4229e7967dd (patch) | |
| tree | 0b986f6c374f5a04e16d4064b6bab94d08deb750 | |
| parent | bf73efc8a5cce60df6cbca16e5415e0b55868f27 (diff) | |
| download | gvfs-39b77412b39ec9964536b1161676b4229e7967dd.tar.gz | |
Return an empty array on success when no content type matches (#357468)
2008-11-04 Tomas Bzatek <tbzatek@redhat.com>
* client/gdaemonmount.c: (g_daemon_mount_guess_content_type_sync):
Return an empty array on success when no content type
matches (#357468)
svn path=/branches/gnome-2-24/; revision=2082
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | client/gdaemonmount.c | 3 |
2 files changed, 8 insertions, 1 deletions
@@ -1,3 +1,9 @@ +2008-11-04 Tomas Bzatek <tbzatek@redhat.com> + + * client/gdaemonmount.c: (g_daemon_mount_guess_content_type_sync): + Return an empty array on success when no content type + matches (#357468) + 2008-10-23 Alexander Larsson <alexl@redhat.com> Import from trunk: diff --git a/client/gdaemonmount.c b/client/gdaemonmount.c index 43d8e181..690d2bbe 100644 --- a/client/gdaemonmount.c +++ b/client/gdaemonmount.c @@ -366,11 +366,12 @@ g_daemon_mount_guess_content_type_sync (GMount *mount, GDaemonMount *daemon_mount = G_DAEMON_MOUNT (mount); char **result; - result = NULL; G_LOCK (daemon_mount); if (daemon_mount->mount_info->x_content_types != NULL && strlen (daemon_mount->mount_info->x_content_types) > 0) result = g_strsplit (daemon_mount->mount_info->x_content_types, " ", 0); + else + result = g_new0 (char *, 1); G_UNLOCK (daemon_mount); return result; |