summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Clasen <matthiasc@src.gnome.org>2008-10-06 17:28:51 +0000
committerMatthias Clasen <matthiasc@src.gnome.org>2008-10-06 17:28:51 +0000
commit275cd90c913dbd42918462f8fafcfa45e73558a2 (patch)
tree7ac67d881d0ee8d9d2bbbfd0cdce5f1418984b2a
parentfbff2d98af94935d5c0b1fb342509f5a59faf1f8 (diff)
downloadnautilus-275cd90c913dbd42918462f8fafcfa45e73558a2.tar.gz
Fix the build
svn path=/branches/gnome-2-24/; revision=14698
-rw-r--r--ChangeLog5
-rw-r--r--libnautilus-private/nautilus-open-with-dialog.c3
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 197161c70..d9207871c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2008-10-06 Matthias Clasen <mclasen@redhat.com>
+ * libnautilus-private/nautilus-open-with-dialog.c (set_uri_and_type):
+ Fix the build
+
+2008-10-06 Matthias Clasen <mclasen@redhat.com>
+
Merged from trunk:
Bug 553084 – leaks content type description
diff --git a/libnautilus-private/nautilus-open-with-dialog.c b/libnautilus-private/nautilus-open-with-dialog.c
index 08e9463c6..e0e4e399e 100644
--- a/libnautilus-private/nautilus-open-with-dialog.c
+++ b/libnautilus-private/nautilus-open-with-dialog.c
@@ -877,8 +877,7 @@ set_uri_and_type (NautilusOpenWithDialog *dialog,
char *label;
char *emname;
char *name, *extension;
-
- const char *description;
+ char *description;
name = NULL;
extension = NULL;