summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2008-10-06 17:02:48 +0000
committerMatthias Clasen <matthiasc@src.gnome.org>2008-10-06 17:02:48 +0000
commitfbff2d98af94935d5c0b1fb342509f5a59faf1f8 (patch)
treed83b0ce9d43ed7be95ed2027b6fa9bd76d93899f
parent8cbb16044a7440eda50303b24d221c148fa87eb8 (diff)
downloadnautilus-fbff2d98af94935d5c0b1fb342509f5a59faf1f8.tar.gz
Bug 553084 – leaks content type description
2008-10-06 Matthias Clasen <mclasen@redhat.com> Bug 553084 – leaks content type description * libnautilus-private/nautilus-open-with-dialog.c (set_uri_and_type): Don't leak the content type description. svn path=/branches/gnome-2-24/; revision=14696
-rw-r--r--ChangeLog9
-rw-r--r--libnautilus-private/nautilus-open-with-dialog.c4
2 files changed, 11 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index d7c196b7c..197161c70 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,15 @@
Merged from trunk:
+ Bug 553084 – leaks content type description
+
+ * libnautilus-private/nautilus-open-with-dialog.c (set_uri_and_type):
+ Don't leak the content type description.
+
+2008-10-06 Matthias Clasen <mclasen@redhat.com>
+
+ Merged from trunk:
+
Bug 553073 – invalid strcmp
* libnautilus-private/nautilus-file.c (update_info_internal):
diff --git a/libnautilus-private/nautilus-open-with-dialog.c b/libnautilus-private/nautilus-open-with-dialog.c
index 689b829c1..08e9463c6 100644
--- a/libnautilus-private/nautilus-open-with-dialog.c
+++ b/libnautilus-private/nautilus-open-with-dialog.c
@@ -907,10 +907,10 @@ set_uri_and_type (NautilusOpenWithDialog *dialog,
description = g_content_type_get_description (mime_type);
if (description == NULL) {
- description = _("Unknown");
+ description = g_strdup (_("Unknown"));
}
- dialog->details->type_description = g_strdup (description);
+ dialog->details->type_description = description;
}
g_free (extension);