aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEttore Perazzoli <ettore@src.gnome.org>2001-08-08 19:54:51 +0800
committerEttore Perazzoli <ettore@src.gnome.org>2001-08-08 19:54:51 +0800
commit31047e36feace597af23cb60297f2ce54c5138f8 (patch)
treedf597319c7656c176d3cb05c9e37f59bf4995571
parente9bd546cbe64b86b61308a713b520bddba1ef247 (diff)
downloadgsoc2013-evolution-31047e36feace597af23cb60297f2ce54c5138f8.tar
gsoc2013-evolution-31047e36feace597af23cb60297f2ce54c5138f8.tar.gz
gsoc2013-evolution-31047e36feace597af23cb60297f2ce54c5138f8.tar.bz2
gsoc2013-evolution-31047e36feace597af23cb60297f2ce54c5138f8.tar.lz
gsoc2013-evolution-31047e36feace597af23cb60297f2ce54c5138f8.tar.xz
gsoc2013-evolution-31047e36feace597af23cb60297f2ce54c5138f8.tar.zst
gsoc2013-evolution-31047e36feace597af23cb60297f2ce54c5138f8.zip
[Fixes, among other things, #5705, "Ampersands not handled
correctly in drag + drop". Thanks to Nat for actually discovering the problem.] * e-shortcuts.c (save_shortcuts): Use `xmlNewTextChild()' instead of `xmlNewChild()'. * e-local-folder.c (save_metadata): Use `xmlNewTextChild' instead of `xmlNewChild()'. svn path=/trunk/; revision=11783
-rw-r--r--shell/ChangeLog12
-rw-r--r--shell/e-local-folder.c4
-rw-r--r--shell/e-shortcuts.c3
3 files changed, 16 insertions, 3 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog
index 74368d26c4..c4e386fd0a 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,5 +1,17 @@
2001-08-08 Ettore Perazzoli <ettore@ximian.com>
+ [Fixes, among other things, #5705, "Ampersands not handled
+ correctly in drag + drop". Thanks to Nat for actually discovering
+ the problem.]
+
+ * e-shortcuts.c (save_shortcuts): Use `xmlNewTextChild()' instead
+ of `xmlNewChild()'.
+
+ * e-local-folder.c (save_metadata): Use `xmlNewTextChild' instead
+ of `xmlNewChild()'.
+
+2001-08-08 Ettore Perazzoli <ettore@ximian.com>
+
* evolution-shell-component.c
(fill_corba_sequence_from_null_terminated_string_array): Set the
release flag on the sequence, and CORBA_string_dup() the strings
diff --git a/shell/e-local-folder.c b/shell/e-local-folder.c
index 41fe1a4150..2b79820da3 100644
--- a/shell/e-local-folder.c
+++ b/shell/e-local-folder.c
@@ -327,8 +327,8 @@ save_metadata (ELocalFolder *local_folder)
(xmlChar *) e_folder_get_type_string (folder));
if (e_folder_get_description (folder) != NULL)
- xmlNewChild (root, NULL, (xmlChar *) "description",
- (xmlChar *) e_folder_get_description (folder));
+ xmlNewTextChild (root, NULL, (xmlChar *) "description",
+ (xmlChar *) e_folder_get_description (folder));
physical_directory = e_folder_get_physical_uri (folder) + URI_PREFIX_LEN - 1;
physical_path = g_concat_dir_and_file (physical_directory, E_LOCAL_FOLDER_METADATA_FILE_NAME);
diff --git a/shell/e-shortcuts.c b/shell/e-shortcuts.c
index a6a35d49de..7dbeaecc9b 100644
--- a/shell/e-shortcuts.c
+++ b/shell/e-shortcuts.c
@@ -402,7 +402,8 @@ save_shortcuts (EShortcuts *shortcuts,
xmlNode *shortcut_node;
shortcut = (EShortcutItem *) q->data;
- shortcut_node = xmlNewChild (group_node, NULL, (xmlChar *) "item", (xmlChar *) shortcut->uri);
+ shortcut_node = xmlNewTextChild (group_node, NULL, (xmlChar *) "item",
+ (xmlChar *) shortcut->uri);
if (shortcut->name != NULL)
xmlSetProp (shortcut_node, (xmlChar *) "name", shortcut->name);