diff options
| author | Iain Holmes <iain@src.gnome.org> | 2000-05-15 08:47:35 +0800 |
|---|---|---|
| committer | Iain Holmes <iain@src.gnome.org> | 2000-05-15 08:47:35 +0800 |
| commit | 68014b3ac54dab351f41f390dd482eb15ba01df0 (patch) | |
| tree | 20180581e069ce5da8942b90ca75ca3a148248a9 | |
| parent | 218b1a062c118d9d0ba3014e527c869384ed342a (diff) | |
| download | gsoc2013-evolution-68014b3ac54dab351f41f390dd482eb15ba01df0.tar gsoc2013-evolution-68014b3ac54dab351f41f390dd482eb15ba01df0.tar.gz gsoc2013-evolution-68014b3ac54dab351f41f390dd482eb15ba01df0.tar.bz2 gsoc2013-evolution-68014b3ac54dab351f41f390dd482eb15ba01df0.tar.lz gsoc2013-evolution-68014b3ac54dab351f41f390dd482eb15ba01df0.tar.xz gsoc2013-evolution-68014b3ac54dab351f41f390dd482eb15ba01df0.tar.zst gsoc2013-evolution-68014b3ac54dab351f41f390dd482eb15ba01df0.zip | |
Correctly access an xmlNodePtr->content
svn path=/trunk/; revision=3031
| -rw-r--r-- | shell/ChangeLog | 7 | ||||
| -rw-r--r-- | shell/e-local-folder.c | 2 | ||||
| -rw-r--r-- | shell/e-shortcuts.c | 10 |
3 files changed, 12 insertions, 7 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog index e692ac0cf3..b485d511d3 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,3 +1,10 @@ +2000-05-15 Iain Holmes <ih@csd.abdn.ac.uk> + + * e-local-folder.c (get_string_value): Use the correct function to + get the node's contents. + + * e-shortcuts.c (load_shortcuts): Same as above. + 2000-05-14 Ettore Perazzoli <ettore@helixcode.com> * e-folder-type-repository.c diff --git a/shell/e-local-folder.c b/shell/e-local-folder.c index 8ff2a2eb96..406341e793 100644 --- a/shell/e-local-folder.c +++ b/shell/e-local-folder.c @@ -70,7 +70,7 @@ get_string_value (xmlNode *node, if (p == NULL) return NULL; - return (const char *) p->content; + return (const char *) xmlNodeListGetString (node->doc, p, 1); } static gboolean diff --git a/shell/e-shortcuts.c b/shell/e-shortcuts.c index dcc9383638..5b0d2b72ad 100644 --- a/shell/e-shortcuts.c +++ b/shell/e-shortcuts.c @@ -155,17 +155,14 @@ load_shortcuts (EShortcuts *shortcuts, shortcut_group->shortcuts = NULL; for (q = p->childs; q != NULL; q = q->next) { - xmlNode *link_node; + gchar *content; if (strcmp ((char *) q->name, "item") != 0) continue; - link_node = e_xml_get_child_by_name (q, (xmlChar *) "text"); - if (link_node == NULL) - continue; - + content = xmlNodeListGetString (doc, q->childs, 1); shortcut_group->shortcuts = g_list_prepend (shortcut_group->shortcuts, - g_strdup (link_node->content)); + g_strdup (content)); } shortcut_group->shortcuts = g_list_reverse (shortcut_group->shortcuts); @@ -514,3 +511,4 @@ e_shortcuts_get_uri (EShortcuts *shortcuts, int group_num, int num) E_MAKE_TYPE (e_shortcuts, "EShortcuts", EShortcuts, class_init, init, PARENT_TYPE) + |