summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--client/gdaemonmount.c3
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 4dce7d48..15cebe53 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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;