summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2006-02-08 15:19:07 +0000
committerMatthias Clasen <matthiasc@src.gnome.org>2006-02-08 15:19:07 +0000
commit1ebbe4d37603fd3496c8a212230d010f89e4fbd0 (patch)
tree0bb6bb5f0f44374ef4cc8751f9418b74cdcdb4d4
parent37d5ad8f7a7e2c41fdc573140e00a43d0ee27b62 (diff)
downloadgtk+-1ebbe4d37603fd3496c8a212230d010f89e4fbd0.tar.gz
Copy the display_key as well. (#330389, Markku Vire)
2006-02-08 Matthias Clasen <mclasen@redhat.com> * gtk/gtkfilesystem.c (gtk_file_info_copy): Copy the display_key as well. (#330389, Markku Vire)
-rw-r--r--ChangeLog5
-rw-r--r--ChangeLog.pre-2-105
-rw-r--r--gtk/gtkfilesystem.c2
3 files changed, 12 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 2366a77345..845f9e46cf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-02-08 Matthias Clasen <mclasen@redhat.com>
+
+ * gtk/gtkfilesystem.c (gtk_file_info_copy): Copy the display_key
+ as well. (#330389, Markku Vire)
+
2006-02-08 Tor Lillqvist <tml@novell.com>
* gtk-zip.sh.in: Drop the timestamp from the zipfile names.
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 2366a77345..845f9e46cf 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2006-02-08 Matthias Clasen <mclasen@redhat.com>
+
+ * gtk/gtkfilesystem.c (gtk_file_info_copy): Copy the display_key
+ as well. (#330389, Markku Vire)
+
2006-02-08 Tor Lillqvist <tml@novell.com>
* gtk-zip.sh.in: Drop the timestamp from the zipfile names.
diff --git a/gtk/gtkfilesystem.c b/gtk/gtkfilesystem.c
index b679f6c725..6044390570 100644
--- a/gtk/gtkfilesystem.c
+++ b/gtk/gtkfilesystem.c
@@ -87,6 +87,8 @@ gtk_file_info_copy (GtkFileInfo *info)
new_info = g_memdup (info, sizeof (GtkFileInfo));
if (new_info->display_name)
new_info->display_name = g_strdup (new_info->display_name);
+ if (new_info->display_key)
+ new_info->display_key = g_strdup (new_info->display_key);
if (new_info->mime_type)
new_info->mime_type = g_strdup (new_info->mime_type);