Mon, 11 Nov 2019 20:43:31 -0600
closing merged branch
|
20147
66f05a854eee
applied changes from 8a731bbd0197fbcc91a705c2d8f528154216defa
Richard Laager <rlaager@pidgin.im>
parents:
19897
diff
changeset
|
1 | /* purple |
| 7131 | 2 | * |
| 15884 | 3 | * Purple is the legal property of its developers, whose names are too numerous |
| 8046 | 4 | * to list here. Please refer to the COPYRIGHT file distributed with this |
| 5 | * source distribution. | |
| 7131 | 6 | * |
| 7 | * This program is free software; you can redistribute it and/or modify | |
| 8 | * it under the terms of the GNU General Public License as published by | |
| 9 | * the Free Software Foundation; either version 2 of the License, or | |
| 10 | * (at your option) any later version. | |
| 11 | * | |
| 12 | * This program is distributed in the hope that it will be useful, | |
| 13 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 14 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
| 15 | * GNU General Public License for more details. | |
| 16 | * | |
| 17 | * You should have received a copy of the GNU General Public License | |
| 18 | * along with this program; if not, write to the Free Software | |
|
19859
71d37b57eff2
The FSF changed its address a while ago; our files were out of date.
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
19821
diff
changeset
|
19 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA |
| 7131 | 20 | */ |
| 21 | ||
| 22 | /* A lot of this code at least resembles the code in libxode, but since | |
| 23 | * libxode uses memory pools that we simply have no need for, I decided to | |
| 24 | * write my own stuff. Also, re-writing this lets me be as lightweight | |
| 25 | * as I want to be. Thank you libxode for giving me a good starting point */ | |
| 26 | ||
|
28981
4e3922ab4844
Include 'internal.h' before all other headers to make some non-gcc compilers happy.
Paul Aurich <darkrain42@pidgin.im>
parents:
27361
diff
changeset
|
27 | #include "internal.h" |
|
15977
057b184c15d9
Don't advertise that we support the adverts, invite and translate
Mark Doliner <markdoliner@pidgin.im>
parents:
15884
diff
changeset
|
28 | #include "debug.h" |
| 7131 | 29 | |
| 13808 | 30 | #include <libxml/parser.h> |
| 7131 | 31 | #include <string.h> |
| 32 | #include <glib.h> | |
| 33 | ||
|
14233
4f5fe687b21d
[gaim-migrate @ 16821]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
14097
diff
changeset
|
34 | #include "util.h" |
| 7131 | 35 | #include "xmlnode.h" |
| 36 | ||
|
12041
a297893ebdbd
[gaim-migrate @ 14334]
Daniel Atallah <datallah@pidgin.im>
parents:
11705
diff
changeset
|
37 | #ifdef _WIN32 |
|
a297893ebdbd
[gaim-migrate @ 14334]
Daniel Atallah <datallah@pidgin.im>
parents:
11705
diff
changeset
|
38 | # define NEWLINE_S "\r\n" |
|
a297893ebdbd
[gaim-migrate @ 14334]
Daniel Atallah <datallah@pidgin.im>
parents:
11705
diff
changeset
|
39 | #else |
|
a297893ebdbd
[gaim-migrate @ 14334]
Daniel Atallah <datallah@pidgin.im>
parents:
11705
diff
changeset
|
40 | # define NEWLINE_S "\n" |
|
a297893ebdbd
[gaim-migrate @ 14334]
Daniel Atallah <datallah@pidgin.im>
parents:
11705
diff
changeset
|
41 | #endif |
|
a297893ebdbd
[gaim-migrate @ 14334]
Daniel Atallah <datallah@pidgin.im>
parents:
11705
diff
changeset
|
42 | |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
43 | static PurpleXmlNode* |
|
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
44 | new_node(const char *name, PurpleXmlNodeType type) |
| 7131 | 45 | { |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
46 | PurpleXmlNode *node = g_new0(PurpleXmlNode, 1); |
|
10423
4663a8238def
[gaim-migrate @ 11675]
Mark Doliner <markdoliner@pidgin.im>
parents:
10415
diff
changeset
|
47 | |
|
14097
0c340861ab79
[gaim-migrate @ 16638]
Mark Doliner <markdoliner@pidgin.im>
parents:
13833
diff
changeset
|
48 | node->name = g_strdup(name); |
| 7131 | 49 | node->type = type; |
| 50 | ||
| 51 | return node; | |
| 52 | } | |
| 53 | ||
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
54 | PurpleXmlNode* |
|
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
55 | purple_xmlnode_new(const char *name) |
| 7131 | 56 | { |
|
31935
77896a9a09c2
jabber: Check for empty string when setting mood.
Paul Aurich <darkrain42@pidgin.im>
parents:
31549
diff
changeset
|
57 | g_return_val_if_fail(name != NULL && *name != '\0', NULL); |
| 7131 | 58 | |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
59 | return new_node(name, PURPLE_XMLNODE_TYPE_TAG); |
| 7131 | 60 | } |
| 61 | ||
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
62 | PurpleXmlNode * |
|
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
63 | purple_xmlnode_new_child(PurpleXmlNode *parent, const char *name) |
| 7131 | 64 | { |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
65 | PurpleXmlNode *node; |
| 7131 | 66 | |
| 67 | g_return_val_if_fail(parent != NULL, NULL); | |
|
31935
77896a9a09c2
jabber: Check for empty string when setting mood.
Paul Aurich <darkrain42@pidgin.im>
parents:
31549
diff
changeset
|
68 | g_return_val_if_fail(name != NULL && *name != '\0', NULL); |
| 7131 | 69 | |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
70 | node = new_node(name, PURPLE_XMLNODE_TYPE_TAG); |
| 7131 | 71 | |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
72 | purple_xmlnode_insert_child(parent, node); |
| 7131 | 73 | |
| 74 | return node; | |
| 75 | } | |
| 76 | ||
| 77 | void | |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
78 | purple_xmlnode_insert_child(PurpleXmlNode *parent, PurpleXmlNode *child) |
| 7131 | 79 | { |
| 80 | g_return_if_fail(parent != NULL); | |
| 81 | g_return_if_fail(child != NULL); | |
| 82 | ||
| 83 | child->parent = parent; | |
| 84 | ||
|
12233
0570720fee6c
[gaim-migrate @ 14535]
Michael Carlson <corfe83@users.sourceforge.net>
parents:
12198
diff
changeset
|
85 | if(parent->lastchild) { |
|
0570720fee6c
[gaim-migrate @ 14535]
Michael Carlson <corfe83@users.sourceforge.net>
parents:
12198
diff
changeset
|
86 | parent->lastchild->next = child; |
| 7131 | 87 | } else { |
| 88 | parent->child = child; | |
| 89 | } | |
|
12233
0570720fee6c
[gaim-migrate @ 14535]
Michael Carlson <corfe83@users.sourceforge.net>
parents:
12198
diff
changeset
|
90 | |
|
0570720fee6c
[gaim-migrate @ 14535]
Michael Carlson <corfe83@users.sourceforge.net>
parents:
12198
diff
changeset
|
91 | parent->lastchild = child; |
| 7131 | 92 | } |
| 93 | ||
| 94 | void | |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
95 | purple_xmlnode_insert_data(PurpleXmlNode *node, const char *data, gssize size) |
| 7131 | 96 | { |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
97 | PurpleXmlNode *child; |
| 10848 | 98 | gsize real_size; |
| 7131 | 99 | |
|
10415
faceb835eb87
[gaim-migrate @ 11665]
Mark Doliner <markdoliner@pidgin.im>
parents:
10331
diff
changeset
|
100 | g_return_if_fail(node != NULL); |
| 7131 | 101 | g_return_if_fail(data != NULL); |
| 102 | g_return_if_fail(size != 0); | |
| 103 | ||
|
36256
a437550a9308
Remove -Wno-sign-compare and backport fixes from default.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
36025
diff
changeset
|
104 | real_size = size == -1 ? strlen(data) : (gsize)size; |
| 7131 | 105 | |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
106 | child = new_node(NULL, PURPLE_XMLNODE_TYPE_DATA); |
| 7131 | 107 | |
|
10415
faceb835eb87
[gaim-migrate @ 11665]
Mark Doliner <markdoliner@pidgin.im>
parents:
10331
diff
changeset
|
108 | child->data = g_memdup(data, real_size); |
|
faceb835eb87
[gaim-migrate @ 11665]
Mark Doliner <markdoliner@pidgin.im>
parents:
10331
diff
changeset
|
109 | child->data_sz = real_size; |
| 7131 | 110 | |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
111 | purple_xmlnode_insert_child(node, child); |
| 7131 | 112 | } |
| 113 | ||
| 114 | void | |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
115 | purple_xmlnode_remove_attrib(PurpleXmlNode *node, const char *attr) |
| 7131 | 116 | { |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
117 | PurpleXmlNode *attr_node, *sibling = NULL; |
| 7131 | 118 | |
| 119 | g_return_if_fail(node != NULL); | |
| 120 | g_return_if_fail(attr != NULL); | |
| 121 | ||
|
26393
7420fd99903a
Add xmlnode_set_attrib_full that enables you to set an attribute with both
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25911
diff
changeset
|
122 | attr_node = node->child; |
|
7420fd99903a
Add xmlnode_set_attrib_full that enables you to set an attribute with both
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25911
diff
changeset
|
123 | while (attr_node) { |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
124 | if(attr_node->type == PURPLE_XMLNODE_TYPE_ATTRIB && |
|
25859
b42be7bb9dac
Patch from Paul Aurich to add purple_strequal to help readability and simplicity of code. Ie, don't need to negate the value of strcmp, since this does a strcmp and does the negation for us
Paul Aurich <darkrain42@pidgin.im>
parents:
25854
diff
changeset
|
125 | purple_strequal(attr_node->name, attr)) |
|
15277
7f9e97dffc4f
[gaim-migrate @ 18005]
Mark Doliner <markdoliner@pidgin.im>
parents:
15265
diff
changeset
|
126 | { |
|
7f9e97dffc4f
[gaim-migrate @ 18005]
Mark Doliner <markdoliner@pidgin.im>
parents:
15265
diff
changeset
|
127 | if (node->lastchild == attr_node) { |
|
7f9e97dffc4f
[gaim-migrate @ 18005]
Mark Doliner <markdoliner@pidgin.im>
parents:
15265
diff
changeset
|
128 | node->lastchild = sibling; |
|
7f9e97dffc4f
[gaim-migrate @ 18005]
Mark Doliner <markdoliner@pidgin.im>
parents:
15265
diff
changeset
|
129 | } |
|
26393
7420fd99903a
Add xmlnode_set_attrib_full that enables you to set an attribute with both
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25911
diff
changeset
|
130 | if (sibling == NULL) { |
|
7420fd99903a
Add xmlnode_set_attrib_full that enables you to set an attribute with both
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25911
diff
changeset
|
131 | node->child = attr_node->next; |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
132 | purple_xmlnode_free(attr_node); |
|
26393
7420fd99903a
Add xmlnode_set_attrib_full that enables you to set an attribute with both
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25911
diff
changeset
|
133 | attr_node = node->child; |
|
7420fd99903a
Add xmlnode_set_attrib_full that enables you to set an attribute with both
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25911
diff
changeset
|
134 | } else { |
|
7420fd99903a
Add xmlnode_set_attrib_full that enables you to set an attribute with both
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25911
diff
changeset
|
135 | sibling->next = attr_node->next; |
|
7420fd99903a
Add xmlnode_set_attrib_full that enables you to set an attribute with both
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25911
diff
changeset
|
136 | sibling = attr_node->next; |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
137 | purple_xmlnode_free(attr_node); |
|
26393
7420fd99903a
Add xmlnode_set_attrib_full that enables you to set an attribute with both
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25911
diff
changeset
|
138 | attr_node = sibling; |
|
7420fd99903a
Add xmlnode_set_attrib_full that enables you to set an attribute with both
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25911
diff
changeset
|
139 | } |
|
7420fd99903a
Add xmlnode_set_attrib_full that enables you to set an attribute with both
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25911
diff
changeset
|
140 | } |
|
7420fd99903a
Add xmlnode_set_attrib_full that enables you to set an attribute with both
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25911
diff
changeset
|
141 | else |
|
7420fd99903a
Add xmlnode_set_attrib_full that enables you to set an attribute with both
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25911
diff
changeset
|
142 | { |
|
7420fd99903a
Add xmlnode_set_attrib_full that enables you to set an attribute with both
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25911
diff
changeset
|
143 | attr_node = attr_node->next; |
| 7131 | 144 | } |
| 145 | sibling = attr_node; | |
| 146 | } | |
| 147 | } | |
| 148 | ||
| 15265 | 149 | void |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
150 | purple_xmlnode_remove_attrib_with_namespace(PurpleXmlNode *node, const char *attr, const char *xmlns) |
| 15265 | 151 | { |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
152 | PurpleXmlNode *attr_node, *sibling = NULL; |
| 15265 | 153 | |
| 154 | g_return_if_fail(node != NULL); | |
| 155 | g_return_if_fail(attr != NULL); | |
| 156 | ||
| 157 | for(attr_node = node->child; attr_node; attr_node = attr_node->next) | |
| 158 | { | |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
159 | if(attr_node->type == PURPLE_XMLNODE_TYPE_ATTRIB && |
|
25859
b42be7bb9dac
Patch from Paul Aurich to add purple_strequal to help readability and simplicity of code. Ie, don't need to negate the value of strcmp, since this does a strcmp and does the negation for us
Paul Aurich <darkrain42@pidgin.im>
parents:
25854
diff
changeset
|
160 | purple_strequal(attr, attr_node->name) && |
|
b42be7bb9dac
Patch from Paul Aurich to add purple_strequal to help readability and simplicity of code. Ie, don't need to negate the value of strcmp, since this does a strcmp and does the negation for us
Paul Aurich <darkrain42@pidgin.im>
parents:
25854
diff
changeset
|
161 | purple_strequal(xmlns, attr_node->xmlns)) |
|
15277
7f9e97dffc4f
[gaim-migrate @ 18005]
Mark Doliner <markdoliner@pidgin.im>
parents:
15265
diff
changeset
|
162 | { |
|
20228
ce019944d765
applied changes from 9d35dde0c779cca73548172223ba557f27d61882
Luke Schierer <lschiere@pidgin.im>
parents:
20224
diff
changeset
|
163 | if(sibling == NULL) { |
| 15265 | 164 | node->child = attr_node->next; |
| 165 | } else { | |
| 166 | sibling->next = attr_node->next; | |
| 167 | } | |
|
15277
7f9e97dffc4f
[gaim-migrate @ 18005]
Mark Doliner <markdoliner@pidgin.im>
parents:
15265
diff
changeset
|
168 | if (node->lastchild == attr_node) { |
|
7f9e97dffc4f
[gaim-migrate @ 18005]
Mark Doliner <markdoliner@pidgin.im>
parents:
15265
diff
changeset
|
169 | node->lastchild = sibling; |
|
7f9e97dffc4f
[gaim-migrate @ 18005]
Mark Doliner <markdoliner@pidgin.im>
parents:
15265
diff
changeset
|
170 | } |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
171 | purple_xmlnode_free(attr_node); |
| 15265 | 172 | return; |
| 173 | } | |
| 174 | sibling = attr_node; | |
| 175 | } | |
| 176 | } | |
| 177 | ||
| 7131 | 178 | void |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
179 | purple_xmlnode_set_attrib(PurpleXmlNode *node, const char *attr, const char *value) |
| 7131 | 180 | { |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
181 | purple_xmlnode_remove_attrib(node, attr); |
|
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
182 | purple_xmlnode_set_attrib_full(node, attr, NULL, NULL, value); |
| 7131 | 183 | } |
| 184 | ||
| 15265 | 185 | void |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
186 | purple_xmlnode_set_attrib_full(PurpleXmlNode *node, const char *attr, const char *xmlns, const char *prefix, const char *value) |
|
26393
7420fd99903a
Add xmlnode_set_attrib_full that enables you to set an attribute with both
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25911
diff
changeset
|
187 | { |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
188 | PurpleXmlNode *attrib_node; |
| 15265 | 189 | |
| 190 | g_return_if_fail(node != NULL); | |
| 191 | g_return_if_fail(attr != NULL); | |
| 192 | g_return_if_fail(value != NULL); | |
| 193 | ||
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
194 | purple_xmlnode_remove_attrib_with_namespace(node, attr, xmlns); |
|
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
195 | attrib_node = new_node(attr, PURPLE_XMLNODE_TYPE_ATTRIB); |
| 15265 | 196 | |
| 197 | attrib_node->data = g_strdup(value); | |
| 198 | attrib_node->xmlns = g_strdup(xmlns); | |
|
21454
2ca06ee152ac
make our xmlnode preserve prefixes
Ka-Hing Cheung <khc@pidgin.im>
parents:
20228
diff
changeset
|
199 | attrib_node->prefix = g_strdup(prefix); |
|
2ca06ee152ac
make our xmlnode preserve prefixes
Ka-Hing Cheung <khc@pidgin.im>
parents:
20228
diff
changeset
|
200 | |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
201 | purple_xmlnode_insert_child(node, attrib_node); |
|
21454
2ca06ee152ac
make our xmlnode preserve prefixes
Ka-Hing Cheung <khc@pidgin.im>
parents:
20228
diff
changeset
|
202 | } |
|
2ca06ee152ac
make our xmlnode preserve prefixes
Ka-Hing Cheung <khc@pidgin.im>
parents:
20228
diff
changeset
|
203 | |
|
2ca06ee152ac
make our xmlnode preserve prefixes
Ka-Hing Cheung <khc@pidgin.im>
parents:
20228
diff
changeset
|
204 | |
|
10425
d82cef15da95
[gaim-migrate @ 11677]
Mark Doliner <markdoliner@pidgin.im>
parents:
10424
diff
changeset
|
205 | const char * |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
206 | purple_xmlnode_get_attrib(const PurpleXmlNode *node, const char *attr) |
| 7131 | 207 | { |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
208 | PurpleXmlNode *x; |
| 7131 | 209 | |
| 210 | g_return_val_if_fail(node != NULL, NULL); | |
| 24639 | 211 | g_return_val_if_fail(attr != NULL, NULL); |
| 7131 | 212 | |
| 213 | for(x = node->child; x; x = x->next) { | |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
214 | if(x->type == PURPLE_XMLNODE_TYPE_ATTRIB && purple_strequal(attr, x->name)) { |
| 7131 | 215 | return x->data; |
| 216 | } | |
| 217 | } | |
| 218 | ||
| 219 | return NULL; | |
| 220 | } | |
| 221 | ||
| 15265 | 222 | const char * |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
223 | purple_xmlnode_get_attrib_with_namespace(const PurpleXmlNode *node, const char *attr, const char *xmlns) |
| 15265 | 224 | { |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
225 | const PurpleXmlNode *x; |
| 15265 | 226 | |
| 227 | g_return_val_if_fail(node != NULL, NULL); | |
| 24639 | 228 | g_return_val_if_fail(attr != NULL, NULL); |
| 15265 | 229 | |
| 230 | for(x = node->child; x; x = x->next) { | |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
231 | if(x->type == PURPLE_XMLNODE_TYPE_ATTRIB && |
|
25859
b42be7bb9dac
Patch from Paul Aurich to add purple_strequal to help readability and simplicity of code. Ie, don't need to negate the value of strcmp, since this does a strcmp and does the negation for us
Paul Aurich <darkrain42@pidgin.im>
parents:
25854
diff
changeset
|
232 | purple_strequal(attr, x->name) && |
|
b42be7bb9dac
Patch from Paul Aurich to add purple_strequal to help readability and simplicity of code. Ie, don't need to negate the value of strcmp, since this does a strcmp and does the negation for us
Paul Aurich <darkrain42@pidgin.im>
parents:
25854
diff
changeset
|
233 | purple_strequal(xmlns, x->xmlns)) { |
| 15265 | 234 | return x->data; |
| 235 | } | |
| 236 | } | |
| 237 | ||
|
15277
7f9e97dffc4f
[gaim-migrate @ 18005]
Mark Doliner <markdoliner@pidgin.im>
parents:
15265
diff
changeset
|
238 | return NULL; |
| 15265 | 239 | } |
| 240 | ||
| 13808 | 241 | |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
242 | void purple_xmlnode_set_namespace(PurpleXmlNode *node, const char *xmlns) |
| 13808 | 243 | { |
|
32322
5c1dd6d9d57f
xmlnode: Add xmlnode_strip_prefixes
Paul Aurich <darkrain42@pidgin.im>
parents:
32321
diff
changeset
|
244 | char *tmp; |
| 13808 | 245 | g_return_if_fail(node != NULL); |
| 246 | ||
|
32322
5c1dd6d9d57f
xmlnode: Add xmlnode_strip_prefixes
Paul Aurich <darkrain42@pidgin.im>
parents:
32321
diff
changeset
|
247 | tmp = node->xmlns; |
|
15238
e52522b871ee
[gaim-migrate @ 17963]
Mark Doliner <markdoliner@pidgin.im>
parents:
15184
diff
changeset
|
248 | node->xmlns = g_strdup(xmlns); |
|
32322
5c1dd6d9d57f
xmlnode: Add xmlnode_strip_prefixes
Paul Aurich <darkrain42@pidgin.im>
parents:
32321
diff
changeset
|
249 | |
|
5c1dd6d9d57f
xmlnode: Add xmlnode_strip_prefixes
Paul Aurich <darkrain42@pidgin.im>
parents:
32321
diff
changeset
|
250 | if (node->namespace_map) { |
|
5c1dd6d9d57f
xmlnode: Add xmlnode_strip_prefixes
Paul Aurich <darkrain42@pidgin.im>
parents:
32321
diff
changeset
|
251 | g_hash_table_insert(node->namespace_map, |
|
5c1dd6d9d57f
xmlnode: Add xmlnode_strip_prefixes
Paul Aurich <darkrain42@pidgin.im>
parents:
32321
diff
changeset
|
252 | g_strdup(""), g_strdup(xmlns)); |
|
5c1dd6d9d57f
xmlnode: Add xmlnode_strip_prefixes
Paul Aurich <darkrain42@pidgin.im>
parents:
32321
diff
changeset
|
253 | } |
|
5c1dd6d9d57f
xmlnode: Add xmlnode_strip_prefixes
Paul Aurich <darkrain42@pidgin.im>
parents:
32321
diff
changeset
|
254 | |
|
5c1dd6d9d57f
xmlnode: Add xmlnode_strip_prefixes
Paul Aurich <darkrain42@pidgin.im>
parents:
32321
diff
changeset
|
255 | g_free(tmp); |
| 13808 | 256 | } |
| 257 | ||
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
258 | const char *purple_xmlnode_get_namespace(const PurpleXmlNode *node) |
| 13808 | 259 | { |
| 260 | g_return_val_if_fail(node != NULL, NULL); | |
| 261 | ||
|
15238
e52522b871ee
[gaim-migrate @ 17963]
Mark Doliner <markdoliner@pidgin.im>
parents:
15184
diff
changeset
|
262 | return node->xmlns; |
| 13808 | 263 | } |
| 264 | ||
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
265 | const char *purple_xmlnode_get_default_namespace(const PurpleXmlNode *node) |
|
32321
ae17a89ef666
xmlnode: Fix some brokeness in xmlnode serialization with prefixed elements.
Paul Aurich <darkrain42@pidgin.im>
parents:
32313
diff
changeset
|
266 | { |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
267 | const PurpleXmlNode *current_node; |
|
32321
ae17a89ef666
xmlnode: Fix some brokeness in xmlnode serialization with prefixed elements.
Paul Aurich <darkrain42@pidgin.im>
parents:
32313
diff
changeset
|
268 | const char *ns = NULL; |
|
32322
5c1dd6d9d57f
xmlnode: Add xmlnode_strip_prefixes
Paul Aurich <darkrain42@pidgin.im>
parents:
32321
diff
changeset
|
269 | |
|
32321
ae17a89ef666
xmlnode: Fix some brokeness in xmlnode serialization with prefixed elements.
Paul Aurich <darkrain42@pidgin.im>
parents:
32313
diff
changeset
|
270 | g_return_val_if_fail(node != NULL, NULL); |
|
ae17a89ef666
xmlnode: Fix some brokeness in xmlnode serialization with prefixed elements.
Paul Aurich <darkrain42@pidgin.im>
parents:
32313
diff
changeset
|
271 | |
|
32322
5c1dd6d9d57f
xmlnode: Add xmlnode_strip_prefixes
Paul Aurich <darkrain42@pidgin.im>
parents:
32321
diff
changeset
|
272 | current_node = node; |
|
5c1dd6d9d57f
xmlnode: Add xmlnode_strip_prefixes
Paul Aurich <darkrain42@pidgin.im>
parents:
32321
diff
changeset
|
273 | while (current_node) { |
|
5c1dd6d9d57f
xmlnode: Add xmlnode_strip_prefixes
Paul Aurich <darkrain42@pidgin.im>
parents:
32321
diff
changeset
|
274 | /* If this node does *not* have a prefix, node->xmlns is the default |
|
5c1dd6d9d57f
xmlnode: Add xmlnode_strip_prefixes
Paul Aurich <darkrain42@pidgin.im>
parents:
32321
diff
changeset
|
275 | * namespace. Otherwise, it's the prefix namespace. |
|
5c1dd6d9d57f
xmlnode: Add xmlnode_strip_prefixes
Paul Aurich <darkrain42@pidgin.im>
parents:
32321
diff
changeset
|
276 | */ |
|
5c1dd6d9d57f
xmlnode: Add xmlnode_strip_prefixes
Paul Aurich <darkrain42@pidgin.im>
parents:
32321
diff
changeset
|
277 | if (!current_node->prefix && current_node->xmlns) { |
|
5c1dd6d9d57f
xmlnode: Add xmlnode_strip_prefixes
Paul Aurich <darkrain42@pidgin.im>
parents:
32321
diff
changeset
|
278 | return current_node->xmlns; |
|
5c1dd6d9d57f
xmlnode: Add xmlnode_strip_prefixes
Paul Aurich <darkrain42@pidgin.im>
parents:
32321
diff
changeset
|
279 | } else if (current_node->namespace_map) { |
|
5c1dd6d9d57f
xmlnode: Add xmlnode_strip_prefixes
Paul Aurich <darkrain42@pidgin.im>
parents:
32321
diff
changeset
|
280 | ns = g_hash_table_lookup(current_node->namespace_map, ""); |
|
5c1dd6d9d57f
xmlnode: Add xmlnode_strip_prefixes
Paul Aurich <darkrain42@pidgin.im>
parents:
32321
diff
changeset
|
281 | if (ns && *ns) |
|
5c1dd6d9d57f
xmlnode: Add xmlnode_strip_prefixes
Paul Aurich <darkrain42@pidgin.im>
parents:
32321
diff
changeset
|
282 | return ns; |
|
5c1dd6d9d57f
xmlnode: Add xmlnode_strip_prefixes
Paul Aurich <darkrain42@pidgin.im>
parents:
32321
diff
changeset
|
283 | } |
|
5c1dd6d9d57f
xmlnode: Add xmlnode_strip_prefixes
Paul Aurich <darkrain42@pidgin.im>
parents:
32321
diff
changeset
|
284 | |
|
5c1dd6d9d57f
xmlnode: Add xmlnode_strip_prefixes
Paul Aurich <darkrain42@pidgin.im>
parents:
32321
diff
changeset
|
285 | current_node = current_node->parent; |
|
32321
ae17a89ef666
xmlnode: Fix some brokeness in xmlnode serialization with prefixed elements.
Paul Aurich <darkrain42@pidgin.im>
parents:
32313
diff
changeset
|
286 | } |
|
ae17a89ef666
xmlnode: Fix some brokeness in xmlnode serialization with prefixed elements.
Paul Aurich <darkrain42@pidgin.im>
parents:
32313
diff
changeset
|
287 | |
|
ae17a89ef666
xmlnode: Fix some brokeness in xmlnode serialization with prefixed elements.
Paul Aurich <darkrain42@pidgin.im>
parents:
32313
diff
changeset
|
288 | return ns; |
|
ae17a89ef666
xmlnode: Fix some brokeness in xmlnode serialization with prefixed elements.
Paul Aurich <darkrain42@pidgin.im>
parents:
32313
diff
changeset
|
289 | } |
|
ae17a89ef666
xmlnode: Fix some brokeness in xmlnode serialization with prefixed elements.
Paul Aurich <darkrain42@pidgin.im>
parents:
32313
diff
changeset
|
290 | |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
291 | void purple_xmlnode_set_prefix(PurpleXmlNode *node, const char *prefix) |
|
21454
2ca06ee152ac
make our xmlnode preserve prefixes
Ka-Hing Cheung <khc@pidgin.im>
parents:
20228
diff
changeset
|
292 | { |
|
2ca06ee152ac
make our xmlnode preserve prefixes
Ka-Hing Cheung <khc@pidgin.im>
parents:
20228
diff
changeset
|
293 | g_return_if_fail(node != NULL); |
|
2ca06ee152ac
make our xmlnode preserve prefixes
Ka-Hing Cheung <khc@pidgin.im>
parents:
20228
diff
changeset
|
294 | |
|
2ca06ee152ac
make our xmlnode preserve prefixes
Ka-Hing Cheung <khc@pidgin.im>
parents:
20228
diff
changeset
|
295 | g_free(node->prefix); |
|
2ca06ee152ac
make our xmlnode preserve prefixes
Ka-Hing Cheung <khc@pidgin.im>
parents:
20228
diff
changeset
|
296 | node->prefix = g_strdup(prefix); |
|
2ca06ee152ac
make our xmlnode preserve prefixes
Ka-Hing Cheung <khc@pidgin.im>
parents:
20228
diff
changeset
|
297 | } |
|
2ca06ee152ac
make our xmlnode preserve prefixes
Ka-Hing Cheung <khc@pidgin.im>
parents:
20228
diff
changeset
|
298 | |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
299 | const char *purple_xmlnode_get_prefix(const PurpleXmlNode *node) |
|
21454
2ca06ee152ac
make our xmlnode preserve prefixes
Ka-Hing Cheung <khc@pidgin.im>
parents:
20228
diff
changeset
|
300 | { |
|
21720
235394d5c7f4
Pull a bunch of bugfix only changes to im.pidgin.pidgin.2.3.1,
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
21487
diff
changeset
|
301 | g_return_val_if_fail(node != NULL, NULL); |
|
21454
2ca06ee152ac
make our xmlnode preserve prefixes
Ka-Hing Cheung <khc@pidgin.im>
parents:
20228
diff
changeset
|
302 | return node->prefix; |
|
2ca06ee152ac
make our xmlnode preserve prefixes
Ka-Hing Cheung <khc@pidgin.im>
parents:
20228
diff
changeset
|
303 | } |
|
2ca06ee152ac
make our xmlnode preserve prefixes
Ka-Hing Cheung <khc@pidgin.im>
parents:
20228
diff
changeset
|
304 | |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
305 | const char *purple_xmlnode_get_prefix_namespace(const PurpleXmlNode *node, const char *prefix) |
|
32322
5c1dd6d9d57f
xmlnode: Add xmlnode_strip_prefixes
Paul Aurich <darkrain42@pidgin.im>
parents:
32321
diff
changeset
|
306 | { |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
307 | const PurpleXmlNode *current_node; |
|
32322
5c1dd6d9d57f
xmlnode: Add xmlnode_strip_prefixes
Paul Aurich <darkrain42@pidgin.im>
parents:
32321
diff
changeset
|
308 | |
|
5c1dd6d9d57f
xmlnode: Add xmlnode_strip_prefixes
Paul Aurich <darkrain42@pidgin.im>
parents:
32321
diff
changeset
|
309 | g_return_val_if_fail(node != NULL, NULL); |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
310 | g_return_val_if_fail(prefix != NULL, purple_xmlnode_get_default_namespace(node)); |
|
32322
5c1dd6d9d57f
xmlnode: Add xmlnode_strip_prefixes
Paul Aurich <darkrain42@pidgin.im>
parents:
32321
diff
changeset
|
311 | |
|
5c1dd6d9d57f
xmlnode: Add xmlnode_strip_prefixes
Paul Aurich <darkrain42@pidgin.im>
parents:
32321
diff
changeset
|
312 | current_node = node; |
|
5c1dd6d9d57f
xmlnode: Add xmlnode_strip_prefixes
Paul Aurich <darkrain42@pidgin.im>
parents:
32321
diff
changeset
|
313 | while (current_node) { |
|
5c1dd6d9d57f
xmlnode: Add xmlnode_strip_prefixes
Paul Aurich <darkrain42@pidgin.im>
parents:
32321
diff
changeset
|
314 | if (current_node->prefix && g_str_equal(prefix, current_node->prefix) && |
|
5c1dd6d9d57f
xmlnode: Add xmlnode_strip_prefixes
Paul Aurich <darkrain42@pidgin.im>
parents:
32321
diff
changeset
|
315 | current_node->xmlns) { |
|
5c1dd6d9d57f
xmlnode: Add xmlnode_strip_prefixes
Paul Aurich <darkrain42@pidgin.im>
parents:
32321
diff
changeset
|
316 | return current_node->xmlns; |
|
5c1dd6d9d57f
xmlnode: Add xmlnode_strip_prefixes
Paul Aurich <darkrain42@pidgin.im>
parents:
32321
diff
changeset
|
317 | } else if (current_node->namespace_map) { |
|
5c1dd6d9d57f
xmlnode: Add xmlnode_strip_prefixes
Paul Aurich <darkrain42@pidgin.im>
parents:
32321
diff
changeset
|
318 | const char *ns = g_hash_table_lookup(current_node->namespace_map, prefix); |
|
5c1dd6d9d57f
xmlnode: Add xmlnode_strip_prefixes
Paul Aurich <darkrain42@pidgin.im>
parents:
32321
diff
changeset
|
319 | if (ns && *ns) { |
|
5c1dd6d9d57f
xmlnode: Add xmlnode_strip_prefixes
Paul Aurich <darkrain42@pidgin.im>
parents:
32321
diff
changeset
|
320 | return ns; |
|
5c1dd6d9d57f
xmlnode: Add xmlnode_strip_prefixes
Paul Aurich <darkrain42@pidgin.im>
parents:
32321
diff
changeset
|
321 | } |
|
5c1dd6d9d57f
xmlnode: Add xmlnode_strip_prefixes
Paul Aurich <darkrain42@pidgin.im>
parents:
32321
diff
changeset
|
322 | } |
|
5c1dd6d9d57f
xmlnode: Add xmlnode_strip_prefixes
Paul Aurich <darkrain42@pidgin.im>
parents:
32321
diff
changeset
|
323 | |
|
5c1dd6d9d57f
xmlnode: Add xmlnode_strip_prefixes
Paul Aurich <darkrain42@pidgin.im>
parents:
32321
diff
changeset
|
324 | current_node = current_node->parent; |
|
5c1dd6d9d57f
xmlnode: Add xmlnode_strip_prefixes
Paul Aurich <darkrain42@pidgin.im>
parents:
32321
diff
changeset
|
325 | } |
|
5c1dd6d9d57f
xmlnode: Add xmlnode_strip_prefixes
Paul Aurich <darkrain42@pidgin.im>
parents:
32321
diff
changeset
|
326 | |
|
5c1dd6d9d57f
xmlnode: Add xmlnode_strip_prefixes
Paul Aurich <darkrain42@pidgin.im>
parents:
32321
diff
changeset
|
327 | return NULL; |
|
5c1dd6d9d57f
xmlnode: Add xmlnode_strip_prefixes
Paul Aurich <darkrain42@pidgin.im>
parents:
32321
diff
changeset
|
328 | } |
|
5c1dd6d9d57f
xmlnode: Add xmlnode_strip_prefixes
Paul Aurich <darkrain42@pidgin.im>
parents:
32321
diff
changeset
|
329 | |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
330 | void purple_xmlnode_strip_prefixes(PurpleXmlNode *node) |
|
32322
5c1dd6d9d57f
xmlnode: Add xmlnode_strip_prefixes
Paul Aurich <darkrain42@pidgin.im>
parents:
32321
diff
changeset
|
331 | { |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
332 | PurpleXmlNode *child; |
|
32322
5c1dd6d9d57f
xmlnode: Add xmlnode_strip_prefixes
Paul Aurich <darkrain42@pidgin.im>
parents:
32321
diff
changeset
|
333 | const char *prefix; |
|
5c1dd6d9d57f
xmlnode: Add xmlnode_strip_prefixes
Paul Aurich <darkrain42@pidgin.im>
parents:
32321
diff
changeset
|
334 | |
|
5c1dd6d9d57f
xmlnode: Add xmlnode_strip_prefixes
Paul Aurich <darkrain42@pidgin.im>
parents:
32321
diff
changeset
|
335 | g_return_if_fail(node != NULL); |
|
5c1dd6d9d57f
xmlnode: Add xmlnode_strip_prefixes
Paul Aurich <darkrain42@pidgin.im>
parents:
32321
diff
changeset
|
336 | |
|
5c1dd6d9d57f
xmlnode: Add xmlnode_strip_prefixes
Paul Aurich <darkrain42@pidgin.im>
parents:
32321
diff
changeset
|
337 | for (child = node->child; child; child = child->next) { |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
338 | if (child->type == PURPLE_XMLNODE_TYPE_TAG) |
|
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
339 | purple_xmlnode_strip_prefixes(child); |
|
32322
5c1dd6d9d57f
xmlnode: Add xmlnode_strip_prefixes
Paul Aurich <darkrain42@pidgin.im>
parents:
32321
diff
changeset
|
340 | } |
|
5c1dd6d9d57f
xmlnode: Add xmlnode_strip_prefixes
Paul Aurich <darkrain42@pidgin.im>
parents:
32321
diff
changeset
|
341 | |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
342 | prefix = purple_xmlnode_get_prefix(node); |
|
32322
5c1dd6d9d57f
xmlnode: Add xmlnode_strip_prefixes
Paul Aurich <darkrain42@pidgin.im>
parents:
32321
diff
changeset
|
343 | if (prefix) { |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
344 | const char *ns = purple_xmlnode_get_prefix_namespace(node, prefix); |
|
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
345 | purple_xmlnode_set_namespace(node, ns); |
|
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
346 | purple_xmlnode_set_prefix(node, NULL); |
|
32322
5c1dd6d9d57f
xmlnode: Add xmlnode_strip_prefixes
Paul Aurich <darkrain42@pidgin.im>
parents:
32321
diff
changeset
|
347 | } else { |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
348 | purple_xmlnode_set_namespace(node, purple_xmlnode_get_default_namespace(node)); |
|
32322
5c1dd6d9d57f
xmlnode: Add xmlnode_strip_prefixes
Paul Aurich <darkrain42@pidgin.im>
parents:
32321
diff
changeset
|
349 | } |
|
5c1dd6d9d57f
xmlnode: Add xmlnode_strip_prefixes
Paul Aurich <darkrain42@pidgin.im>
parents:
32321
diff
changeset
|
350 | } |
|
5c1dd6d9d57f
xmlnode: Add xmlnode_strip_prefixes
Paul Aurich <darkrain42@pidgin.im>
parents:
32321
diff
changeset
|
351 | |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
352 | PurpleXmlNode *purple_xmlnode_get_parent(const PurpleXmlNode *child) |
|
23750
57baab09bf45
Added xmlnode_get_parent.
Michael Ruprecht <maiku@pidgin.im>
parents:
22083
diff
changeset
|
353 | { |
|
57baab09bf45
Added xmlnode_get_parent.
Michael Ruprecht <maiku@pidgin.im>
parents:
22083
diff
changeset
|
354 | g_return_val_if_fail(child != NULL, NULL); |
|
57baab09bf45
Added xmlnode_get_parent.
Michael Ruprecht <maiku@pidgin.im>
parents:
22083
diff
changeset
|
355 | return child->parent; |
|
57baab09bf45
Added xmlnode_get_parent.
Michael Ruprecht <maiku@pidgin.im>
parents:
22083
diff
changeset
|
356 | } |
|
57baab09bf45
Added xmlnode_get_parent.
Michael Ruprecht <maiku@pidgin.im>
parents:
22083
diff
changeset
|
357 | |
|
10423
4663a8238def
[gaim-migrate @ 11675]
Mark Doliner <markdoliner@pidgin.im>
parents:
10415
diff
changeset
|
358 | void |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
359 | purple_xmlnode_free(PurpleXmlNode *node) |
| 7131 | 360 | { |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
361 | PurpleXmlNode *x, *y; |
| 7131 | 362 | |
| 363 | g_return_if_fail(node != NULL); | |
| 364 | ||
|
18315
10dbbd7540b8
fix a buddy icon bug in jabber
Nathan Walp <nwalp@pidgin.im>
parents:
18131
diff
changeset
|
365 | /* if we're part of a tree, remove ourselves from the tree first */ |
|
10dbbd7540b8
fix a buddy icon bug in jabber
Nathan Walp <nwalp@pidgin.im>
parents:
18131
diff
changeset
|
366 | if(NULL != node->parent) { |
|
10dbbd7540b8
fix a buddy icon bug in jabber
Nathan Walp <nwalp@pidgin.im>
parents:
18131
diff
changeset
|
367 | if(node->parent->child == node) { |
|
10dbbd7540b8
fix a buddy icon bug in jabber
Nathan Walp <nwalp@pidgin.im>
parents:
18131
diff
changeset
|
368 | node->parent->child = node->next; |
|
19568
1daa0179da7b
xmlnode bugfix patch from Mauro Brasil
Sean Egan <seanegan@pidgin.im>
parents:
18315
diff
changeset
|
369 | if (node->parent->lastchild == node) |
|
1daa0179da7b
xmlnode bugfix patch from Mauro Brasil
Sean Egan <seanegan@pidgin.im>
parents:
18315
diff
changeset
|
370 | node->parent->lastchild = node->next; |
|
18315
10dbbd7540b8
fix a buddy icon bug in jabber
Nathan Walp <nwalp@pidgin.im>
parents:
18131
diff
changeset
|
371 | } else { |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
372 | PurpleXmlNode *prev = node->parent->child; |
|
18315
10dbbd7540b8
fix a buddy icon bug in jabber
Nathan Walp <nwalp@pidgin.im>
parents:
18131
diff
changeset
|
373 | while(prev && prev->next != node) { |
|
10dbbd7540b8
fix a buddy icon bug in jabber
Nathan Walp <nwalp@pidgin.im>
parents:
18131
diff
changeset
|
374 | prev = prev->next; |
|
10dbbd7540b8
fix a buddy icon bug in jabber
Nathan Walp <nwalp@pidgin.im>
parents:
18131
diff
changeset
|
375 | } |
|
10dbbd7540b8
fix a buddy icon bug in jabber
Nathan Walp <nwalp@pidgin.im>
parents:
18131
diff
changeset
|
376 | if(prev) { |
|
10dbbd7540b8
fix a buddy icon bug in jabber
Nathan Walp <nwalp@pidgin.im>
parents:
18131
diff
changeset
|
377 | prev->next = node->next; |
|
19568
1daa0179da7b
xmlnode bugfix patch from Mauro Brasil
Sean Egan <seanegan@pidgin.im>
parents:
18315
diff
changeset
|
378 | if (node->parent->lastchild == node) |
|
1daa0179da7b
xmlnode bugfix patch from Mauro Brasil
Sean Egan <seanegan@pidgin.im>
parents:
18315
diff
changeset
|
379 | node->parent->lastchild = prev; |
|
18315
10dbbd7540b8
fix a buddy icon bug in jabber
Nathan Walp <nwalp@pidgin.im>
parents:
18131
diff
changeset
|
380 | } |
|
10dbbd7540b8
fix a buddy icon bug in jabber
Nathan Walp <nwalp@pidgin.im>
parents:
18131
diff
changeset
|
381 | } |
|
10dbbd7540b8
fix a buddy icon bug in jabber
Nathan Walp <nwalp@pidgin.im>
parents:
18131
diff
changeset
|
382 | } |
|
10dbbd7540b8
fix a buddy icon bug in jabber
Nathan Walp <nwalp@pidgin.im>
parents:
18131
diff
changeset
|
383 | |
|
10dbbd7540b8
fix a buddy icon bug in jabber
Nathan Walp <nwalp@pidgin.im>
parents:
18131
diff
changeset
|
384 | /* now free our children */ |
| 7131 | 385 | x = node->child; |
| 386 | while(x) { | |
| 387 | y = x->next; | |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
388 | purple_xmlnode_free(x); |
| 7131 | 389 | x = y; |
| 390 | } | |
| 391 | ||
|
18315
10dbbd7540b8
fix a buddy icon bug in jabber
Nathan Walp <nwalp@pidgin.im>
parents:
18131
diff
changeset
|
392 | /* now dispose of ourselves */ |
|
14097
0c340861ab79
[gaim-migrate @ 16638]
Mark Doliner <markdoliner@pidgin.im>
parents:
13833
diff
changeset
|
393 | g_free(node->name); |
|
0c340861ab79
[gaim-migrate @ 16638]
Mark Doliner <markdoliner@pidgin.im>
parents:
13833
diff
changeset
|
394 | g_free(node->data); |
|
15238
e52522b871ee
[gaim-migrate @ 17963]
Mark Doliner <markdoliner@pidgin.im>
parents:
15184
diff
changeset
|
395 | g_free(node->xmlns); |
| 22061 | 396 | g_free(node->prefix); |
| 14386 | 397 | |
|
21720
235394d5c7f4
Pull a bunch of bugfix only changes to im.pidgin.pidgin.2.3.1,
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
21487
diff
changeset
|
398 | if(node->namespace_map) |
|
235394d5c7f4
Pull a bunch of bugfix only changes to im.pidgin.pidgin.2.3.1,
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
21487
diff
changeset
|
399 | g_hash_table_destroy(node->namespace_map); |
|
235394d5c7f4
Pull a bunch of bugfix only changes to im.pidgin.pidgin.2.3.1,
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
21487
diff
changeset
|
400 | |
| 7131 | 401 | g_free(node); |
| 402 | } | |
| 403 | ||
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
404 | PurpleXmlNode* |
|
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
405 | purple_xmlnode_get_child(const PurpleXmlNode *parent, const char *name) |
|
10736
fb529f29c25c
[gaim-migrate @ 12338]
Mark Doliner <markdoliner@pidgin.im>
parents:
10425
diff
changeset
|
406 | { |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
407 | return purple_xmlnode_get_child_with_namespace(parent, name, NULL); |
|
10736
fb529f29c25c
[gaim-migrate @ 12338]
Mark Doliner <markdoliner@pidgin.im>
parents:
10425
diff
changeset
|
408 | } |
|
fb529f29c25c
[gaim-migrate @ 12338]
Mark Doliner <markdoliner@pidgin.im>
parents:
10425
diff
changeset
|
409 | |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
410 | PurpleXmlNode * |
|
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
411 | purple_xmlnode_get_child_with_namespace(const PurpleXmlNode *parent, const char *name, const char *ns) |
| 7131 | 412 | { |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
413 | PurpleXmlNode *x, *ret = NULL; |
| 7131 | 414 | char **names; |
| 415 | char *parent_name, *child_name; | |
| 416 | ||
| 417 | g_return_val_if_fail(parent != NULL, NULL); | |
|
12233
0570720fee6c
[gaim-migrate @ 14535]
Michael Carlson <corfe83@users.sourceforge.net>
parents:
12198
diff
changeset
|
418 | g_return_val_if_fail(name != NULL, NULL); |
| 7131 | 419 | |
| 420 | names = g_strsplit(name, "/", 2); | |
| 421 | parent_name = names[0]; | |
| 422 | child_name = names[1]; | |
| 423 | ||
| 424 | for(x = parent->child; x; x = x->next) { | |
|
20224
d4b827c606db
applied changes from 4d50bf3b08569aa2108a9f5da47fb1548d0c7dd9
Luke Schierer <lschiere@pidgin.im>
parents:
20147
diff
changeset
|
425 | /* XXX: Is it correct to ignore the namespace for the match if none was specified? */ |
| 8262 | 426 | const char *xmlns = NULL; |
| 427 | if(ns) | |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
428 | xmlns = purple_xmlnode_get_namespace(x); |
| 8262 | 429 | |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
430 | if(x->type == PURPLE_XMLNODE_TYPE_TAG && purple_strequal(parent_name, x->name) |
|
25859
b42be7bb9dac
Patch from Paul Aurich to add purple_strequal to help readability and simplicity of code. Ie, don't need to negate the value of strcmp, since this does a strcmp and does the negation for us
Paul Aurich <darkrain42@pidgin.im>
parents:
25854
diff
changeset
|
431 | && purple_strequal(ns, xmlns)) { |
| 7131 | 432 | ret = x; |
| 433 | break; | |
| 434 | } | |
| 435 | } | |
| 436 | ||
| 437 | if(child_name && ret) | |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
438 | ret = purple_xmlnode_get_child(ret, child_name); |
| 7131 | 439 | |
| 440 | g_strfreev(names); | |
| 441 | return ret; | |
| 442 | } | |
| 443 | ||
| 444 | char * | |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
445 | purple_xmlnode_get_data(const PurpleXmlNode *node) |
| 7131 | 446 | { |
| 447 | GString *str = NULL; | |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
448 | PurpleXmlNode *c; |
| 7131 | 449 | |
| 450 | g_return_val_if_fail(node != NULL, NULL); | |
| 451 | ||
| 452 | for(c = node->child; c; c = c->next) { | |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
453 | if(c->type == PURPLE_XMLNODE_TYPE_DATA) { |
| 7131 | 454 | if(!str) |
|
18131
7127441da3ba
add xmlnode_get_data_unescaped(), and got rid of an unecessary realloc
Nathan Walp <nwalp@pidgin.im>
parents:
17550
diff
changeset
|
455 | str = g_string_new_len(c->data, c->data_sz); |
|
7127441da3ba
add xmlnode_get_data_unescaped(), and got rid of an unecessary realloc
Nathan Walp <nwalp@pidgin.im>
parents:
17550
diff
changeset
|
456 | else |
|
7127441da3ba
add xmlnode_get_data_unescaped(), and got rid of an unecessary realloc
Nathan Walp <nwalp@pidgin.im>
parents:
17550
diff
changeset
|
457 | str = g_string_append_len(str, c->data, c->data_sz); |
| 7131 | 458 | } |
| 459 | } | |
| 460 | ||
|
10331
9955b6f7c998
[gaim-migrate @ 11538]
Mark Doliner <markdoliner@pidgin.im>
parents:
9838
diff
changeset
|
461 | if (str == NULL) |
|
9955b6f7c998
[gaim-migrate @ 11538]
Mark Doliner <markdoliner@pidgin.im>
parents:
9838
diff
changeset
|
462 | return NULL; |
| 7131 | 463 | |
|
10331
9955b6f7c998
[gaim-migrate @ 11538]
Mark Doliner <markdoliner@pidgin.im>
parents:
9838
diff
changeset
|
464 | return g_string_free(str, FALSE); |
| 7131 | 465 | } |
| 466 | ||
|
18131
7127441da3ba
add xmlnode_get_data_unescaped(), and got rid of an unecessary realloc
Nathan Walp <nwalp@pidgin.im>
parents:
17550
diff
changeset
|
467 | char * |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
468 | purple_xmlnode_get_data_unescaped(const PurpleXmlNode *node) |
|
18131
7127441da3ba
add xmlnode_get_data_unescaped(), and got rid of an unecessary realloc
Nathan Walp <nwalp@pidgin.im>
parents:
17550
diff
changeset
|
469 | { |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
470 | char *escaped = purple_xmlnode_get_data(node); |
|
18131
7127441da3ba
add xmlnode_get_data_unescaped(), and got rid of an unecessary realloc
Nathan Walp <nwalp@pidgin.im>
parents:
17550
diff
changeset
|
471 | |
|
7127441da3ba
add xmlnode_get_data_unescaped(), and got rid of an unecessary realloc
Nathan Walp <nwalp@pidgin.im>
parents:
17550
diff
changeset
|
472 | char *unescaped = escaped ? purple_unescape_html(escaped) : NULL; |
|
7127441da3ba
add xmlnode_get_data_unescaped(), and got rid of an unecessary realloc
Nathan Walp <nwalp@pidgin.im>
parents:
17550
diff
changeset
|
473 | |
|
7127441da3ba
add xmlnode_get_data_unescaped(), and got rid of an unecessary realloc
Nathan Walp <nwalp@pidgin.im>
parents:
17550
diff
changeset
|
474 | g_free(escaped); |
|
7127441da3ba
add xmlnode_get_data_unescaped(), and got rid of an unecessary realloc
Nathan Walp <nwalp@pidgin.im>
parents:
17550
diff
changeset
|
475 | |
|
7127441da3ba
add xmlnode_get_data_unescaped(), and got rid of an unecessary realloc
Nathan Walp <nwalp@pidgin.im>
parents:
17550
diff
changeset
|
476 | return unescaped; |
|
7127441da3ba
add xmlnode_get_data_unescaped(), and got rid of an unecessary realloc
Nathan Walp <nwalp@pidgin.im>
parents:
17550
diff
changeset
|
477 | } |
|
7127441da3ba
add xmlnode_get_data_unescaped(), and got rid of an unecessary realloc
Nathan Walp <nwalp@pidgin.im>
parents:
17550
diff
changeset
|
478 | |
|
21454
2ca06ee152ac
make our xmlnode preserve prefixes
Ka-Hing Cheung <khc@pidgin.im>
parents:
20228
diff
changeset
|
479 | static void |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
480 | purple_xmlnode_to_str_foreach_append_ns(const char *key, const char *value, |
|
21454
2ca06ee152ac
make our xmlnode preserve prefixes
Ka-Hing Cheung <khc@pidgin.im>
parents:
20228
diff
changeset
|
481 | GString *buf) |
|
2ca06ee152ac
make our xmlnode preserve prefixes
Ka-Hing Cheung <khc@pidgin.im>
parents:
20228
diff
changeset
|
482 | { |
|
2ca06ee152ac
make our xmlnode preserve prefixes
Ka-Hing Cheung <khc@pidgin.im>
parents:
20228
diff
changeset
|
483 | if (*key) { |
|
2ca06ee152ac
make our xmlnode preserve prefixes
Ka-Hing Cheung <khc@pidgin.im>
parents:
20228
diff
changeset
|
484 | g_string_append_printf(buf, " xmlns:%s='%s'", key, value); |
|
2ca06ee152ac
make our xmlnode preserve prefixes
Ka-Hing Cheung <khc@pidgin.im>
parents:
20228
diff
changeset
|
485 | } else { |
|
2ca06ee152ac
make our xmlnode preserve prefixes
Ka-Hing Cheung <khc@pidgin.im>
parents:
20228
diff
changeset
|
486 | g_string_append_printf(buf, " xmlns='%s'", value); |
|
2ca06ee152ac
make our xmlnode preserve prefixes
Ka-Hing Cheung <khc@pidgin.im>
parents:
20228
diff
changeset
|
487 | } |
|
2ca06ee152ac
make our xmlnode preserve prefixes
Ka-Hing Cheung <khc@pidgin.im>
parents:
20228
diff
changeset
|
488 | } |
|
2ca06ee152ac
make our xmlnode preserve prefixes
Ka-Hing Cheung <khc@pidgin.im>
parents:
20228
diff
changeset
|
489 | |
|
10425
d82cef15da95
[gaim-migrate @ 11677]
Mark Doliner <markdoliner@pidgin.im>
parents:
10424
diff
changeset
|
490 | static char * |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
491 | purple_xmlnode_to_str_helper(const PurpleXmlNode *node, int *len, gboolean formatting, int depth) |
| 7131 | 492 | { |
|
39918
1c8e11f9274f
Fix several memory leaks.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
39659
diff
changeset
|
493 | GString *text; |
|
21454
2ca06ee152ac
make our xmlnode preserve prefixes
Ka-Hing Cheung <khc@pidgin.im>
parents:
20228
diff
changeset
|
494 | const char *prefix; |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
495 | const PurpleXmlNode *c; |
| 9837 | 496 | char *node_name, *esc, *esc2, *tab = NULL; |
| 9838 | 497 | gboolean need_end = FALSE, pretty = formatting; |
| 9837 | 498 | |
|
12233
0570720fee6c
[gaim-migrate @ 14535]
Michael Carlson <corfe83@users.sourceforge.net>
parents:
12198
diff
changeset
|
499 | g_return_val_if_fail(node != NULL, NULL); |
|
0570720fee6c
[gaim-migrate @ 14535]
Michael Carlson <corfe83@users.sourceforge.net>
parents:
12198
diff
changeset
|
500 | |
|
39918
1c8e11f9274f
Fix several memory leaks.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
39659
diff
changeset
|
501 | text = g_string_new(""); |
|
1c8e11f9274f
Fix several memory leaks.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
39659
diff
changeset
|
502 | |
| 9837 | 503 | if(pretty && depth) { |
| 504 | tab = g_strnfill(depth, '\t'); | |
| 505 | text = g_string_append(text, tab); | |
| 506 | } | |
| 7131 | 507 | |
| 508 | node_name = g_markup_escape_text(node->name, -1); | |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
509 | prefix = purple_xmlnode_get_prefix(node); |
| 7131 | 510 | |
|
21454
2ca06ee152ac
make our xmlnode preserve prefixes
Ka-Hing Cheung <khc@pidgin.im>
parents:
20228
diff
changeset
|
511 | if (prefix) { |
|
2ca06ee152ac
make our xmlnode preserve prefixes
Ka-Hing Cheung <khc@pidgin.im>
parents:
20228
diff
changeset
|
512 | g_string_append_printf(text, "<%s:%s", prefix, node_name); |
|
2ca06ee152ac
make our xmlnode preserve prefixes
Ka-Hing Cheung <khc@pidgin.im>
parents:
20228
diff
changeset
|
513 | } else { |
|
2ca06ee152ac
make our xmlnode preserve prefixes
Ka-Hing Cheung <khc@pidgin.im>
parents:
20228
diff
changeset
|
514 | g_string_append_printf(text, "<%s", node_name); |
|
2ca06ee152ac
make our xmlnode preserve prefixes
Ka-Hing Cheung <khc@pidgin.im>
parents:
20228
diff
changeset
|
515 | } |
|
2ca06ee152ac
make our xmlnode preserve prefixes
Ka-Hing Cheung <khc@pidgin.im>
parents:
20228
diff
changeset
|
516 | |
|
2ca06ee152ac
make our xmlnode preserve prefixes
Ka-Hing Cheung <khc@pidgin.im>
parents:
20228
diff
changeset
|
517 | if (node->namespace_map) { |
|
2ca06ee152ac
make our xmlnode preserve prefixes
Ka-Hing Cheung <khc@pidgin.im>
parents:
20228
diff
changeset
|
518 | g_hash_table_foreach(node->namespace_map, |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
519 | (GHFunc)purple_xmlnode_to_str_foreach_append_ns, text); |
|
32321
ae17a89ef666
xmlnode: Fix some brokeness in xmlnode serialization with prefixed elements.
Paul Aurich <darkrain42@pidgin.im>
parents:
32313
diff
changeset
|
520 | } else { |
|
ae17a89ef666
xmlnode: Fix some brokeness in xmlnode serialization with prefixed elements.
Paul Aurich <darkrain42@pidgin.im>
parents:
32313
diff
changeset
|
521 | /* Figure out if this node has a different default namespace from parent */ |
|
ae17a89ef666
xmlnode: Fix some brokeness in xmlnode serialization with prefixed elements.
Paul Aurich <darkrain42@pidgin.im>
parents:
32313
diff
changeset
|
522 | const char *xmlns = NULL; |
|
ae17a89ef666
xmlnode: Fix some brokeness in xmlnode serialization with prefixed elements.
Paul Aurich <darkrain42@pidgin.im>
parents:
32313
diff
changeset
|
523 | const char *parent_xmlns = NULL; |
|
ae17a89ef666
xmlnode: Fix some brokeness in xmlnode serialization with prefixed elements.
Paul Aurich <darkrain42@pidgin.im>
parents:
32313
diff
changeset
|
524 | if (!prefix) |
|
ae17a89ef666
xmlnode: Fix some brokeness in xmlnode serialization with prefixed elements.
Paul Aurich <darkrain42@pidgin.im>
parents:
32313
diff
changeset
|
525 | xmlns = node->xmlns; |
|
ae17a89ef666
xmlnode: Fix some brokeness in xmlnode serialization with prefixed elements.
Paul Aurich <darkrain42@pidgin.im>
parents:
32313
diff
changeset
|
526 | |
|
ae17a89ef666
xmlnode: Fix some brokeness in xmlnode serialization with prefixed elements.
Paul Aurich <darkrain42@pidgin.im>
parents:
32313
diff
changeset
|
527 | if (!xmlns) |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
528 | xmlns = purple_xmlnode_get_default_namespace(node); |
|
32321
ae17a89ef666
xmlnode: Fix some brokeness in xmlnode serialization with prefixed elements.
Paul Aurich <darkrain42@pidgin.im>
parents:
32313
diff
changeset
|
529 | if (node->parent) |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
530 | parent_xmlns = purple_xmlnode_get_default_namespace(node->parent); |
|
32321
ae17a89ef666
xmlnode: Fix some brokeness in xmlnode serialization with prefixed elements.
Paul Aurich <darkrain42@pidgin.im>
parents:
32313
diff
changeset
|
531 | if (!purple_strequal(xmlns, parent_xmlns)) |
| 15184 | 532 | { |
|
32321
ae17a89ef666
xmlnode: Fix some brokeness in xmlnode serialization with prefixed elements.
Paul Aurich <darkrain42@pidgin.im>
parents:
32313
diff
changeset
|
533 | char *escaped_xmlns = g_markup_escape_text(xmlns, -1); |
|
ae17a89ef666
xmlnode: Fix some brokeness in xmlnode serialization with prefixed elements.
Paul Aurich <darkrain42@pidgin.im>
parents:
32313
diff
changeset
|
534 | g_string_append_printf(text, " xmlns='%s'", escaped_xmlns); |
|
ae17a89ef666
xmlnode: Fix some brokeness in xmlnode serialization with prefixed elements.
Paul Aurich <darkrain42@pidgin.im>
parents:
32313
diff
changeset
|
535 | g_free(escaped_xmlns); |
| 15184 | 536 | } |
| 13808 | 537 | } |
| 7131 | 538 | for(c = node->child; c; c = c->next) |
| 539 | { | |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
540 | if(c->type == PURPLE_XMLNODE_TYPE_ATTRIB) { |
|
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
541 | const char *aprefix = purple_xmlnode_get_prefix(c); |
| 7131 | 542 | esc = g_markup_escape_text(c->name, -1); |
| 543 | esc2 = g_markup_escape_text(c->data, -1); | |
|
21454
2ca06ee152ac
make our xmlnode preserve prefixes
Ka-Hing Cheung <khc@pidgin.im>
parents:
20228
diff
changeset
|
544 | if (aprefix) { |
|
2ca06ee152ac
make our xmlnode preserve prefixes
Ka-Hing Cheung <khc@pidgin.im>
parents:
20228
diff
changeset
|
545 | g_string_append_printf(text, " %s:%s='%s'", aprefix, esc, esc2); |
|
2ca06ee152ac
make our xmlnode preserve prefixes
Ka-Hing Cheung <khc@pidgin.im>
parents:
20228
diff
changeset
|
546 | } else { |
|
2ca06ee152ac
make our xmlnode preserve prefixes
Ka-Hing Cheung <khc@pidgin.im>
parents:
20228
diff
changeset
|
547 | g_string_append_printf(text, " %s='%s'", esc, esc2); |
|
2ca06ee152ac
make our xmlnode preserve prefixes
Ka-Hing Cheung <khc@pidgin.im>
parents:
20228
diff
changeset
|
548 | } |
| 7131 | 549 | g_free(esc); |
| 550 | g_free(esc2); | |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
551 | } else if(c->type == PURPLE_XMLNODE_TYPE_TAG || c->type == PURPLE_XMLNODE_TYPE_DATA) { |
|
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
552 | if(c->type == PURPLE_XMLNODE_TYPE_DATA) |
| 9838 | 553 | pretty = FALSE; |
| 7131 | 554 | need_end = TRUE; |
| 555 | } | |
| 556 | } | |
| 557 | ||
| 558 | if(need_end) { | |
|
12041
a297893ebdbd
[gaim-migrate @ 14334]
Daniel Atallah <datallah@pidgin.im>
parents:
11705
diff
changeset
|
559 | g_string_append_printf(text, ">%s", pretty ? NEWLINE_S : ""); |
| 7131 | 560 | |
| 561 | for(c = node->child; c; c = c->next) | |
| 562 | { | |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
563 | if(c->type == PURPLE_XMLNODE_TYPE_TAG) { |
| 7642 | 564 | int esc_len; |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
565 | esc = purple_xmlnode_to_str_helper(c, &esc_len, pretty, depth+1); |
| 7642 | 566 | text = g_string_append_len(text, esc, esc_len); |
| 7131 | 567 | g_free(esc); |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
568 | } else if(c->type == PURPLE_XMLNODE_TYPE_DATA && c->data_sz > 0) { |
| 7131 | 569 | esc = g_markup_escape_text(c->data, c->data_sz); |
| 7642 | 570 | text = g_string_append(text, esc); |
| 7131 | 571 | g_free(esc); |
| 572 | } | |
| 573 | } | |
| 574 | ||
| 9838 | 575 | if(tab && pretty) |
| 9837 | 576 | text = g_string_append(text, tab); |
|
21454
2ca06ee152ac
make our xmlnode preserve prefixes
Ka-Hing Cheung <khc@pidgin.im>
parents:
20228
diff
changeset
|
577 | if (prefix) { |
|
2ca06ee152ac
make our xmlnode preserve prefixes
Ka-Hing Cheung <khc@pidgin.im>
parents:
20228
diff
changeset
|
578 | g_string_append_printf(text, "</%s:%s>%s", prefix, node_name, formatting ? NEWLINE_S : ""); |
|
2ca06ee152ac
make our xmlnode preserve prefixes
Ka-Hing Cheung <khc@pidgin.im>
parents:
20228
diff
changeset
|
579 | } else { |
|
2ca06ee152ac
make our xmlnode preserve prefixes
Ka-Hing Cheung <khc@pidgin.im>
parents:
20228
diff
changeset
|
580 | g_string_append_printf(text, "</%s>%s", node_name, formatting ? NEWLINE_S : ""); |
|
2ca06ee152ac
make our xmlnode preserve prefixes
Ka-Hing Cheung <khc@pidgin.im>
parents:
20228
diff
changeset
|
581 | } |
| 7131 | 582 | } else { |
|
12041
a297893ebdbd
[gaim-migrate @ 14334]
Daniel Atallah <datallah@pidgin.im>
parents:
11705
diff
changeset
|
583 | g_string_append_printf(text, "/>%s", formatting ? NEWLINE_S : ""); |
| 7131 | 584 | } |
| 585 | ||
| 586 | g_free(node_name); | |
| 587 | ||
|
14097
0c340861ab79
[gaim-migrate @ 16638]
Mark Doliner <markdoliner@pidgin.im>
parents:
13833
diff
changeset
|
588 | g_free(tab); |
| 9837 | 589 | |
| 7642 | 590 | if(len) |
| 591 | *len = text->len; | |
|
10331
9955b6f7c998
[gaim-migrate @ 11538]
Mark Doliner <markdoliner@pidgin.im>
parents:
9838
diff
changeset
|
592 | |
|
9955b6f7c998
[gaim-migrate @ 11538]
Mark Doliner <markdoliner@pidgin.im>
parents:
9838
diff
changeset
|
593 | return g_string_free(text, FALSE); |
| 7131 | 594 | } |
| 595 | ||
|
10425
d82cef15da95
[gaim-migrate @ 11677]
Mark Doliner <markdoliner@pidgin.im>
parents:
10424
diff
changeset
|
596 | char * |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
597 | purple_xmlnode_to_str(const PurpleXmlNode *node, int *len) |
|
10423
4663a8238def
[gaim-migrate @ 11675]
Mark Doliner <markdoliner@pidgin.im>
parents:
10415
diff
changeset
|
598 | { |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
599 | return purple_xmlnode_to_str_helper(node, len, FALSE, 0); |
| 9837 | 600 | } |
| 601 | ||
|
10425
d82cef15da95
[gaim-migrate @ 11677]
Mark Doliner <markdoliner@pidgin.im>
parents:
10424
diff
changeset
|
602 | char * |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
603 | purple_xmlnode_to_formatted_str(const PurpleXmlNode *node, int *len) |
|
10423
4663a8238def
[gaim-migrate @ 11675]
Mark Doliner <markdoliner@pidgin.im>
parents:
10415
diff
changeset
|
604 | { |
|
10425
d82cef15da95
[gaim-migrate @ 11677]
Mark Doliner <markdoliner@pidgin.im>
parents:
10424
diff
changeset
|
605 | char *xml, *xml_with_declaration; |
|
10415
faceb835eb87
[gaim-migrate @ 11665]
Mark Doliner <markdoliner@pidgin.im>
parents:
10331
diff
changeset
|
606 | |
|
12233
0570720fee6c
[gaim-migrate @ 14535]
Michael Carlson <corfe83@users.sourceforge.net>
parents:
12198
diff
changeset
|
607 | g_return_val_if_fail(node != NULL, NULL); |
|
0570720fee6c
[gaim-migrate @ 14535]
Michael Carlson <corfe83@users.sourceforge.net>
parents:
12198
diff
changeset
|
608 | |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
609 | xml = purple_xmlnode_to_str_helper(node, len, TRUE, 0); |
|
10415
faceb835eb87
[gaim-migrate @ 11665]
Mark Doliner <markdoliner@pidgin.im>
parents:
10331
diff
changeset
|
610 | xml_with_declaration = |
|
12041
a297893ebdbd
[gaim-migrate @ 14334]
Daniel Atallah <datallah@pidgin.im>
parents:
11705
diff
changeset
|
611 | g_strdup_printf("<?xml version='1.0' encoding='UTF-8' ?>" NEWLINE_S NEWLINE_S "%s", xml); |
|
10415
faceb835eb87
[gaim-migrate @ 11665]
Mark Doliner <markdoliner@pidgin.im>
parents:
10331
diff
changeset
|
612 | g_free(xml); |
|
faceb835eb87
[gaim-migrate @ 11665]
Mark Doliner <markdoliner@pidgin.im>
parents:
10331
diff
changeset
|
613 | |
|
22083
d562c88d8327
Patch from QuLogic to correctly set the length. Closes #4515.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
22061
diff
changeset
|
614 | if (len) |
|
d562c88d8327
Patch from QuLogic to correctly set the length. Closes #4515.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
22061
diff
changeset
|
615 | *len += sizeof("<?xml version='1.0' encoding='UTF-8' ?>" NEWLINE_S NEWLINE_S) - 1; |
|
d562c88d8327
Patch from QuLogic to correctly set the length. Closes #4515.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
22061
diff
changeset
|
616 | |
|
10415
faceb835eb87
[gaim-migrate @ 11665]
Mark Doliner <markdoliner@pidgin.im>
parents:
10331
diff
changeset
|
617 | return xml_with_declaration; |
| 9837 | 618 | } |
| 619 | ||
| 7131 | 620 | struct _xmlnode_parser_data { |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
621 | PurpleXmlNode *current; |
| 15412 | 622 | gboolean error; |
| 7131 | 623 | }; |
| 624 | ||
| 13808 | 625 | static void |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
626 | purple_xmlnode_parser_element_start_libxml(void *user_data, |
|
15238
e52522b871ee
[gaim-migrate @ 17963]
Mark Doliner <markdoliner@pidgin.im>
parents:
15184
diff
changeset
|
627 | const xmlChar *element_name, const xmlChar *prefix, const xmlChar *xmlns, |
| 13808 | 628 | int nb_namespaces, const xmlChar **namespaces, |
| 629 | int nb_attributes, int nb_defaulted, const xmlChar **attributes) | |
| 630 | { | |
| 631 | struct _xmlnode_parser_data *xpd = user_data; | |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
632 | PurpleXmlNode *node; |
|
21454
2ca06ee152ac
make our xmlnode preserve prefixes
Ka-Hing Cheung <khc@pidgin.im>
parents:
20228
diff
changeset
|
633 | int i, j; |
| 13808 | 634 | |
| 15412 | 635 | if(!element_name || xpd->error) { |
| 13808 | 636 | return; |
| 637 | } else { | |
| 638 | if(xpd->current) | |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
639 | node = purple_xmlnode_new_child(xpd->current, (const char*) element_name); |
| 13808 | 640 | else |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
641 | node = purple_xmlnode_new((const char *) element_name); |
| 13808 | 642 | |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
643 | purple_xmlnode_set_namespace(node, (const char *) xmlns); |
|
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
644 | purple_xmlnode_set_prefix(node, (const char *)prefix); |
|
21454
2ca06ee152ac
make our xmlnode preserve prefixes
Ka-Hing Cheung <khc@pidgin.im>
parents:
20228
diff
changeset
|
645 | |
|
2ca06ee152ac
make our xmlnode preserve prefixes
Ka-Hing Cheung <khc@pidgin.im>
parents:
20228
diff
changeset
|
646 | if (nb_namespaces != 0) { |
|
2ca06ee152ac
make our xmlnode preserve prefixes
Ka-Hing Cheung <khc@pidgin.im>
parents:
20228
diff
changeset
|
647 | node->namespace_map = g_hash_table_new_full( |
|
2ca06ee152ac
make our xmlnode preserve prefixes
Ka-Hing Cheung <khc@pidgin.im>
parents:
20228
diff
changeset
|
648 | g_str_hash, g_str_equal, g_free, g_free); |
|
2ca06ee152ac
make our xmlnode preserve prefixes
Ka-Hing Cheung <khc@pidgin.im>
parents:
20228
diff
changeset
|
649 | |
|
2ca06ee152ac
make our xmlnode preserve prefixes
Ka-Hing Cheung <khc@pidgin.im>
parents:
20228
diff
changeset
|
650 | for (i = 0, j = 0; i < nb_namespaces; i++, j += 2) { |
|
2ca06ee152ac
make our xmlnode preserve prefixes
Ka-Hing Cheung <khc@pidgin.im>
parents:
20228
diff
changeset
|
651 | const char *key = (const char *)namespaces[j]; |
|
2ca06ee152ac
make our xmlnode preserve prefixes
Ka-Hing Cheung <khc@pidgin.im>
parents:
20228
diff
changeset
|
652 | const char *val = (const char *)namespaces[j + 1]; |
|
2ca06ee152ac
make our xmlnode preserve prefixes
Ka-Hing Cheung <khc@pidgin.im>
parents:
20228
diff
changeset
|
653 | g_hash_table_insert(node->namespace_map, |
|
2ca06ee152ac
make our xmlnode preserve prefixes
Ka-Hing Cheung <khc@pidgin.im>
parents:
20228
diff
changeset
|
654 | g_strdup(key ? key : ""), g_strdup(val ? val : "")); |
|
2ca06ee152ac
make our xmlnode preserve prefixes
Ka-Hing Cheung <khc@pidgin.im>
parents:
20228
diff
changeset
|
655 | } |
|
2ca06ee152ac
make our xmlnode preserve prefixes
Ka-Hing Cheung <khc@pidgin.im>
parents:
20228
diff
changeset
|
656 | } |
| 13808 | 657 | |
| 658 | for(i=0; i < nb_attributes * 5; i+=5) { | |
|
26393
7420fd99903a
Add xmlnode_set_attrib_full that enables you to set an attribute with both
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25911
diff
changeset
|
659 | const char *name = (const char *)attributes[i]; |
|
7420fd99903a
Add xmlnode_set_attrib_full that enables you to set an attribute with both
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25911
diff
changeset
|
660 | const char *prefix = (const char *)attributes[i+1]; |
|
14290
f20819ff8d86
[gaim-migrate @ 16910]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
14254
diff
changeset
|
661 | char *txt; |
| 13808 | 662 | int attrib_len = attributes[i+4] - attributes[i+3]; |
| 29069 | 663 | char *attrib = g_strndup((const char *)attributes[i+3], attrib_len); |
|
14290
f20819ff8d86
[gaim-migrate @ 16910]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
14254
diff
changeset
|
664 | txt = attrib; |
|
29328
cf4435714f5f
Correctly parse "<br>" in an XML attribute. Closes #11318.
Paul Aurich <darkrain42@pidgin.im>
parents:
29069
diff
changeset
|
665 | attrib = purple_unescape_text(txt); |
|
14233
4f5fe687b21d
[gaim-migrate @ 16821]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
14097
diff
changeset
|
666 | g_free(txt); |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
667 | purple_xmlnode_set_attrib_full(node, name, NULL, prefix, attrib); |
| 13808 | 668 | g_free(attrib); |
| 669 | } | |
| 670 | ||
| 671 | xpd->current = node; | |
| 672 | } | |
| 673 | } | |
| 674 | ||
| 675 | static void | |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
676 | purple_xmlnode_parser_element_end_libxml(void *user_data, const xmlChar *element_name, |
|
15238
e52522b871ee
[gaim-migrate @ 17963]
Mark Doliner <markdoliner@pidgin.im>
parents:
15184
diff
changeset
|
677 | const xmlChar *prefix, const xmlChar *xmlns) |
| 13808 | 678 | { |
| 679 | struct _xmlnode_parser_data *xpd = user_data; | |
| 680 | ||
|
31549
96622b0be540
Change space indentation to tab indentation on a line
Mark Doliner <markdoliner@pidgin.im>
parents:
30510
diff
changeset
|
681 | if(!element_name || !xpd->current || xpd->error) |
| 13808 | 682 | return; |
| 683 | ||
| 684 | if(xpd->current->parent) { | |
|
14690
9287ecc4adb1
[gaim-migrate @ 17369]
Daniel Atallah <datallah@pidgin.im>
parents:
14498
diff
changeset
|
685 | if(!xmlStrcmp((xmlChar*) xpd->current->name, element_name)) |
| 13808 | 686 | xpd->current = xpd->current->parent; |
| 687 | } | |
| 688 | } | |
| 689 | ||
| 690 | static void | |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
691 | purple_xmlnode_parser_element_text_libxml(void *user_data, const xmlChar *text, int text_len) |
| 13808 | 692 | { |
| 693 | struct _xmlnode_parser_data *xpd = user_data; | |
| 694 | ||
| 15412 | 695 | if(!xpd->current || xpd->error) |
| 13808 | 696 | return; |
|
25888
d0fdd378a635
Remove trailing whitespace
Mark Doliner <markdoliner@pidgin.im>
parents:
25859
diff
changeset
|
697 | |
| 13808 | 698 | if(!text || !text_len) |
| 699 | return; | |
| 700 | ||
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
701 | purple_xmlnode_insert_data(xpd->current, (const char*) text, text_len); |
| 13808 | 702 | } |
| 703 | ||
| 15412 | 704 | static void |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
705 | purple_xmlnode_parser_error_libxml(void *user_data, const char *msg, ...) |
| 15412 | 706 | { |
| 707 | struct _xmlnode_parser_data *xpd = user_data; | |
|
19821
c044ef20e299
Print an error when there was a problem parsing some XML
Mark Doliner <markdoliner@pidgin.im>
parents:
19568
diff
changeset
|
708 | char errmsg[2048]; |
|
c044ef20e299
Print an error when there was a problem parsing some XML
Mark Doliner <markdoliner@pidgin.im>
parents:
19568
diff
changeset
|
709 | va_list args; |
|
c044ef20e299
Print an error when there was a problem parsing some XML
Mark Doliner <markdoliner@pidgin.im>
parents:
19568
diff
changeset
|
710 | |
| 15412 | 711 | xpd->error = TRUE; |
|
19821
c044ef20e299
Print an error when there was a problem parsing some XML
Mark Doliner <markdoliner@pidgin.im>
parents:
19568
diff
changeset
|
712 | |
|
c044ef20e299
Print an error when there was a problem parsing some XML
Mark Doliner <markdoliner@pidgin.im>
parents:
19568
diff
changeset
|
713 | va_start(args, msg); |
|
40094
8e6d91e4dd8f
Use g_(v)snprintf so we need less wrappers.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
39918
diff
changeset
|
714 | g_vsnprintf(errmsg, sizeof(errmsg), msg, args); |
|
19821
c044ef20e299
Print an error when there was a problem parsing some XML
Mark Doliner <markdoliner@pidgin.im>
parents:
19568
diff
changeset
|
715 | va_end(args); |
|
c044ef20e299
Print an error when there was a problem parsing some XML
Mark Doliner <markdoliner@pidgin.im>
parents:
19568
diff
changeset
|
716 | |
|
25301
d81daadd1bee
Error messages from libxml contain their own newlines
Mark Doliner <markdoliner@pidgin.im>
parents:
24639
diff
changeset
|
717 | purple_debug_error("xmlnode", "Error parsing xml file: %s", errmsg); |
| 15412 | 718 | } |
| 719 | ||
|
25726
19e0c9302a43
*** Plucked rev d34a1589 (darkrain42@pidgin.im):
Paul Aurich <darkrain42@pidgin.im>
parents:
25559
diff
changeset
|
720 | static void |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
721 | purple_xmlnode_parser_structural_error_libxml(void *user_data, xmlErrorPtr error) |
|
25726
19e0c9302a43
*** Plucked rev d34a1589 (darkrain42@pidgin.im):
Paul Aurich <darkrain42@pidgin.im>
parents:
25559
diff
changeset
|
722 | { |
|
19e0c9302a43
*** Plucked rev d34a1589 (darkrain42@pidgin.im):
Paul Aurich <darkrain42@pidgin.im>
parents:
25559
diff
changeset
|
723 | struct _xmlnode_parser_data *xpd = user_data; |
|
19e0c9302a43
*** Plucked rev d34a1589 (darkrain42@pidgin.im):
Paul Aurich <darkrain42@pidgin.im>
parents:
25559
diff
changeset
|
724 | |
|
19e0c9302a43
*** Plucked rev d34a1589 (darkrain42@pidgin.im):
Paul Aurich <darkrain42@pidgin.im>
parents:
25559
diff
changeset
|
725 | if (error && (error->level == XML_ERR_ERROR || |
|
19e0c9302a43
*** Plucked rev d34a1589 (darkrain42@pidgin.im):
Paul Aurich <darkrain42@pidgin.im>
parents:
25559
diff
changeset
|
726 | error->level == XML_ERR_FATAL)) { |
|
19e0c9302a43
*** Plucked rev d34a1589 (darkrain42@pidgin.im):
Paul Aurich <darkrain42@pidgin.im>
parents:
25559
diff
changeset
|
727 | xpd->error = TRUE; |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
728 | purple_debug_error("xmlnode", "XML parser error for PurpleXmlNode %p: " |
|
25726
19e0c9302a43
*** Plucked rev d34a1589 (darkrain42@pidgin.im):
Paul Aurich <darkrain42@pidgin.im>
parents:
25559
diff
changeset
|
729 | "Domain %i, code %i, level %i: %s", |
|
19e0c9302a43
*** Plucked rev d34a1589 (darkrain42@pidgin.im):
Paul Aurich <darkrain42@pidgin.im>
parents:
25559
diff
changeset
|
730 | user_data, error->domain, error->code, error->level, |
|
19e0c9302a43
*** Plucked rev d34a1589 (darkrain42@pidgin.im):
Paul Aurich <darkrain42@pidgin.im>
parents:
25559
diff
changeset
|
731 | error->message ? error->message : "(null)\n"); |
|
19e0c9302a43
*** Plucked rev d34a1589 (darkrain42@pidgin.im):
Paul Aurich <darkrain42@pidgin.im>
parents:
25559
diff
changeset
|
732 | } else if (error) |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
733 | purple_debug_warning("xmlnode", "XML parser error for PurpleXmlNode %p: " |
|
25726
19e0c9302a43
*** Plucked rev d34a1589 (darkrain42@pidgin.im):
Paul Aurich <darkrain42@pidgin.im>
parents:
25559
diff
changeset
|
734 | "Domain %i, code %i, level %i: %s", |
|
19e0c9302a43
*** Plucked rev d34a1589 (darkrain42@pidgin.im):
Paul Aurich <darkrain42@pidgin.im>
parents:
25559
diff
changeset
|
735 | user_data, error->domain, error->code, error->level, |
|
19e0c9302a43
*** Plucked rev d34a1589 (darkrain42@pidgin.im):
Paul Aurich <darkrain42@pidgin.im>
parents:
25559
diff
changeset
|
736 | error->message ? error->message : "(null)\n"); |
|
19e0c9302a43
*** Plucked rev d34a1589 (darkrain42@pidgin.im):
Paul Aurich <darkrain42@pidgin.im>
parents:
25559
diff
changeset
|
737 | else |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
738 | purple_debug_warning("xmlnode", "XML parser error for PurpleXmlNode %p\n", |
|
25726
19e0c9302a43
*** Plucked rev d34a1589 (darkrain42@pidgin.im):
Paul Aurich <darkrain42@pidgin.im>
parents:
25559
diff
changeset
|
739 | user_data); |
|
19e0c9302a43
*** Plucked rev d34a1589 (darkrain42@pidgin.im):
Paul Aurich <darkrain42@pidgin.im>
parents:
25559
diff
changeset
|
740 | } |
|
19e0c9302a43
*** Plucked rev d34a1589 (darkrain42@pidgin.im):
Paul Aurich <darkrain42@pidgin.im>
parents:
25559
diff
changeset
|
741 | |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
742 | static xmlSAXHandler purple_xmlnode_parser_libxml = { |
|
17550
d67724d3a606
Kill a C99 struct initialization.
Richard Laager <rlaager@pidgin.im>
parents:
15979
diff
changeset
|
743 | NULL, /* internalSubset */ |
|
d67724d3a606
Kill a C99 struct initialization.
Richard Laager <rlaager@pidgin.im>
parents:
15979
diff
changeset
|
744 | NULL, /* isStandalone */ |
|
d67724d3a606
Kill a C99 struct initialization.
Richard Laager <rlaager@pidgin.im>
parents:
15979
diff
changeset
|
745 | NULL, /* hasInternalSubset */ |
|
d67724d3a606
Kill a C99 struct initialization.
Richard Laager <rlaager@pidgin.im>
parents:
15979
diff
changeset
|
746 | NULL, /* hasExternalSubset */ |
|
d67724d3a606
Kill a C99 struct initialization.
Richard Laager <rlaager@pidgin.im>
parents:
15979
diff
changeset
|
747 | NULL, /* resolveEntity */ |
|
d67724d3a606
Kill a C99 struct initialization.
Richard Laager <rlaager@pidgin.im>
parents:
15979
diff
changeset
|
748 | NULL, /* getEntity */ |
|
d67724d3a606
Kill a C99 struct initialization.
Richard Laager <rlaager@pidgin.im>
parents:
15979
diff
changeset
|
749 | NULL, /* entityDecl */ |
|
d67724d3a606
Kill a C99 struct initialization.
Richard Laager <rlaager@pidgin.im>
parents:
15979
diff
changeset
|
750 | NULL, /* notationDecl */ |
|
d67724d3a606
Kill a C99 struct initialization.
Richard Laager <rlaager@pidgin.im>
parents:
15979
diff
changeset
|
751 | NULL, /* attributeDecl */ |
|
d67724d3a606
Kill a C99 struct initialization.
Richard Laager <rlaager@pidgin.im>
parents:
15979
diff
changeset
|
752 | NULL, /* elementDecl */ |
|
d67724d3a606
Kill a C99 struct initialization.
Richard Laager <rlaager@pidgin.im>
parents:
15979
diff
changeset
|
753 | NULL, /* unparsedEntityDecl */ |
|
d67724d3a606
Kill a C99 struct initialization.
Richard Laager <rlaager@pidgin.im>
parents:
15979
diff
changeset
|
754 | NULL, /* setDocumentLocator */ |
|
d67724d3a606
Kill a C99 struct initialization.
Richard Laager <rlaager@pidgin.im>
parents:
15979
diff
changeset
|
755 | NULL, /* startDocument */ |
|
d67724d3a606
Kill a C99 struct initialization.
Richard Laager <rlaager@pidgin.im>
parents:
15979
diff
changeset
|
756 | NULL, /* endDocument */ |
|
d67724d3a606
Kill a C99 struct initialization.
Richard Laager <rlaager@pidgin.im>
parents:
15979
diff
changeset
|
757 | NULL, /* startElement */ |
|
d67724d3a606
Kill a C99 struct initialization.
Richard Laager <rlaager@pidgin.im>
parents:
15979
diff
changeset
|
758 | NULL, /* endElement */ |
|
d67724d3a606
Kill a C99 struct initialization.
Richard Laager <rlaager@pidgin.im>
parents:
15979
diff
changeset
|
759 | NULL, /* reference */ |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
760 | purple_xmlnode_parser_element_text_libxml, /* characters */ |
|
17550
d67724d3a606
Kill a C99 struct initialization.
Richard Laager <rlaager@pidgin.im>
parents:
15979
diff
changeset
|
761 | NULL, /* ignorableWhitespace */ |
|
d67724d3a606
Kill a C99 struct initialization.
Richard Laager <rlaager@pidgin.im>
parents:
15979
diff
changeset
|
762 | NULL, /* processingInstruction */ |
|
d67724d3a606
Kill a C99 struct initialization.
Richard Laager <rlaager@pidgin.im>
parents:
15979
diff
changeset
|
763 | NULL, /* comment */ |
|
d67724d3a606
Kill a C99 struct initialization.
Richard Laager <rlaager@pidgin.im>
parents:
15979
diff
changeset
|
764 | NULL, /* warning */ |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
765 | purple_xmlnode_parser_error_libxml, /* error */ |
|
17550
d67724d3a606
Kill a C99 struct initialization.
Richard Laager <rlaager@pidgin.im>
parents:
15979
diff
changeset
|
766 | NULL, /* fatalError */ |
|
d67724d3a606
Kill a C99 struct initialization.
Richard Laager <rlaager@pidgin.im>
parents:
15979
diff
changeset
|
767 | NULL, /* getParameterEntity */ |
|
d67724d3a606
Kill a C99 struct initialization.
Richard Laager <rlaager@pidgin.im>
parents:
15979
diff
changeset
|
768 | NULL, /* cdataBlock */ |
|
d67724d3a606
Kill a C99 struct initialization.
Richard Laager <rlaager@pidgin.im>
parents:
15979
diff
changeset
|
769 | NULL, /* externalSubset */ |
|
d67724d3a606
Kill a C99 struct initialization.
Richard Laager <rlaager@pidgin.im>
parents:
15979
diff
changeset
|
770 | XML_SAX2_MAGIC, /* initialized */ |
|
d67724d3a606
Kill a C99 struct initialization.
Richard Laager <rlaager@pidgin.im>
parents:
15979
diff
changeset
|
771 | NULL, /* _private */ |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
772 | purple_xmlnode_parser_element_start_libxml, /* startElementNs */ |
|
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
773 | purple_xmlnode_parser_element_end_libxml, /* endElementNs */ |
|
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
774 | purple_xmlnode_parser_structural_error_libxml, /* serror */ |
| 13808 | 775 | }; |
| 7131 | 776 | |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
777 | PurpleXmlNode * |
|
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
778 | purple_xmlnode_from_str(const char *str, gssize size) |
| 7131 | 779 | { |
| 11390 | 780 | struct _xmlnode_parser_data *xpd; |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
781 | PurpleXmlNode *ret; |
| 11390 | 782 | gsize real_size; |
| 7131 | 783 | |
| 11390 | 784 | g_return_val_if_fail(str != NULL, NULL); |
| 785 | ||
|
36256
a437550a9308
Remove -Wno-sign-compare and backport fixes from default.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
36025
diff
changeset
|
786 | real_size = size < 0 ? strlen(str) : (gsize)size; |
| 11390 | 787 | xpd = g_new0(struct _xmlnode_parser_data, 1); |
| 13808 | 788 | |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
789 | if (xmlSAXUserParseMemory(&purple_xmlnode_parser_libxml, xpd, str, real_size) < 0) { |
| 13808 | 790 | while(xpd->current && xpd->current->parent) |
| 791 | xpd->current = xpd->current->parent; | |
| 792 | if(xpd->current) | |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
793 | purple_xmlnode_free(xpd->current); |
| 13808 | 794 | xpd->current = NULL; |
| 795 | } | |
| 7131 | 796 | ret = xpd->current; |
| 15412 | 797 | if (xpd->error) { |
| 798 | ret = NULL; | |
| 799 | if (xpd->current) | |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
800 | purple_xmlnode_free(xpd->current); |
| 15412 | 801 | } |
| 802 | ||
| 7131 | 803 | g_free(xpd); |
| 804 | return ret; | |
| 805 | } | |
| 8135 | 806 | |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
807 | PurpleXmlNode * |
|
38870
575e41bfc15e
Migrate certificates, icons, logs to XDG dirs
qarkai <qarkai@gmail.com>
parents:
37603
diff
changeset
|
808 | purple_xmlnode_from_file(const char *dir, const char *filename, const char *description, const char *process) |
|
23964
342e3f5bedd9
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23962
diff
changeset
|
809 | { |
|
342e3f5bedd9
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23962
diff
changeset
|
810 | gchar *filename_full; |
|
342e3f5bedd9
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23962
diff
changeset
|
811 | GError *error = NULL; |
|
342e3f5bedd9
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23962
diff
changeset
|
812 | gchar *contents = NULL; |
|
342e3f5bedd9
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23962
diff
changeset
|
813 | gsize length; |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
814 | PurpleXmlNode *node = NULL; |
|
23964
342e3f5bedd9
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23962
diff
changeset
|
815 | |
|
342e3f5bedd9
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23962
diff
changeset
|
816 | g_return_val_if_fail(dir != NULL, NULL); |
|
342e3f5bedd9
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23962
diff
changeset
|
817 | |
|
34297
0f1f0b8c84f8
Fix some debug log warnings, adjust verbosity level
Tomasz Wasilczyk <tomkiewicz@cpw.pidgin.im>
parents:
32322
diff
changeset
|
818 | purple_debug_misc(process, "Reading file %s from directory %s\n", |
|
23964
342e3f5bedd9
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23962
diff
changeset
|
819 | filename, dir); |
|
342e3f5bedd9
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23962
diff
changeset
|
820 | |
|
342e3f5bedd9
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23962
diff
changeset
|
821 | filename_full = g_build_filename(dir, filename, NULL); |
|
342e3f5bedd9
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23962
diff
changeset
|
822 | |
|
342e3f5bedd9
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23962
diff
changeset
|
823 | if (!g_file_test(filename_full, G_FILE_TEST_EXISTS)) |
|
342e3f5bedd9
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23962
diff
changeset
|
824 | { |
|
342e3f5bedd9
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23962
diff
changeset
|
825 | purple_debug_info(process, "File %s does not exist (this is not " |
|
342e3f5bedd9
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23962
diff
changeset
|
826 | "necessarily an error)\n", filename_full); |
|
342e3f5bedd9
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23962
diff
changeset
|
827 | g_free(filename_full); |
|
342e3f5bedd9
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23962
diff
changeset
|
828 | return NULL; |
|
342e3f5bedd9
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23962
diff
changeset
|
829 | } |
|
342e3f5bedd9
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23962
diff
changeset
|
830 | |
|
342e3f5bedd9
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23962
diff
changeset
|
831 | if (!g_file_get_contents(filename_full, &contents, &length, &error)) |
|
342e3f5bedd9
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23962
diff
changeset
|
832 | { |
|
342e3f5bedd9
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23962
diff
changeset
|
833 | purple_debug_error(process, "Error reading file %s: %s\n", |
|
342e3f5bedd9
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23962
diff
changeset
|
834 | filename_full, error->message); |
|
342e3f5bedd9
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23962
diff
changeset
|
835 | g_error_free(error); |
|
342e3f5bedd9
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23962
diff
changeset
|
836 | } |
|
342e3f5bedd9
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23962
diff
changeset
|
837 | |
|
342e3f5bedd9
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23962
diff
changeset
|
838 | if ((contents != NULL) && (length > 0)) |
|
342e3f5bedd9
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23962
diff
changeset
|
839 | { |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
840 | node = purple_xmlnode_from_str(contents, length); |
|
23964
342e3f5bedd9
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23962
diff
changeset
|
841 | |
|
342e3f5bedd9
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23962
diff
changeset
|
842 | /* If we were unable to parse the file then save its contents to a backup file */ |
|
342e3f5bedd9
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23962
diff
changeset
|
843 | if (node == NULL) |
|
342e3f5bedd9
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23962
diff
changeset
|
844 | { |
|
342e3f5bedd9
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23962
diff
changeset
|
845 | gchar *filename_temp, *filename_temp_full; |
|
342e3f5bedd9
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23962
diff
changeset
|
846 | |
|
342e3f5bedd9
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23962
diff
changeset
|
847 | filename_temp = g_strdup_printf("%s~", filename); |
|
342e3f5bedd9
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23962
diff
changeset
|
848 | filename_temp_full = g_build_filename(dir, filename_temp, NULL); |
|
342e3f5bedd9
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23962
diff
changeset
|
849 | |
|
342e3f5bedd9
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23962
diff
changeset
|
850 | purple_debug_error("util", "Error parsing file %s. Renaming old " |
|
342e3f5bedd9
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23962
diff
changeset
|
851 | "file to %s\n", filename_full, filename_temp); |
|
342e3f5bedd9
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23962
diff
changeset
|
852 | purple_util_write_data_to_file_absolute(filename_temp_full, contents, length); |
|
342e3f5bedd9
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23962
diff
changeset
|
853 | |
|
342e3f5bedd9
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23962
diff
changeset
|
854 | g_free(filename_temp_full); |
|
342e3f5bedd9
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23962
diff
changeset
|
855 | g_free(filename_temp); |
|
342e3f5bedd9
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23962
diff
changeset
|
856 | } |
|
342e3f5bedd9
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23962
diff
changeset
|
857 | |
|
342e3f5bedd9
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23962
diff
changeset
|
858 | g_free(contents); |
|
342e3f5bedd9
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23962
diff
changeset
|
859 | } |
|
342e3f5bedd9
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23962
diff
changeset
|
860 | |
|
342e3f5bedd9
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23962
diff
changeset
|
861 | /* If we could not parse the file then show the user an error message */ |
|
342e3f5bedd9
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23962
diff
changeset
|
862 | if (node == NULL) |
|
342e3f5bedd9
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23962
diff
changeset
|
863 | { |
|
342e3f5bedd9
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23962
diff
changeset
|
864 | gchar *title, *msg; |
|
342e3f5bedd9
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23962
diff
changeset
|
865 | title = g_strdup_printf(_("Error Reading %s"), filename); |
|
342e3f5bedd9
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23962
diff
changeset
|
866 | msg = g_strdup_printf(_("An error was encountered reading your " |
|
342e3f5bedd9
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23962
diff
changeset
|
867 | "%s. The file has not been loaded, and the old file " |
|
342e3f5bedd9
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23962
diff
changeset
|
868 | "has been renamed to %s~."), description, filename_full); |
|
34449
bbcb198650b7
Notify API: extend purple_notify_message with PurpleRequestCommonParameters
Tomasz Wasilczyk <twasilczyk@pidgin.im>
parents:
34304
diff
changeset
|
869 | purple_notify_error(NULL, NULL, title, msg, NULL); |
|
23964
342e3f5bedd9
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23962
diff
changeset
|
870 | g_free(title); |
|
342e3f5bedd9
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23962
diff
changeset
|
871 | g_free(msg); |
|
342e3f5bedd9
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23962
diff
changeset
|
872 | } |
|
342e3f5bedd9
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23962
diff
changeset
|
873 | |
|
342e3f5bedd9
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23962
diff
changeset
|
874 | g_free(filename_full); |
|
342e3f5bedd9
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23962
diff
changeset
|
875 | |
|
342e3f5bedd9
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23962
diff
changeset
|
876 | return node; |
|
342e3f5bedd9
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23962
diff
changeset
|
877 | } |
|
342e3f5bedd9
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
23962
diff
changeset
|
878 | |
|
23821
283d616f7f29
Make sure xmlnode_copy also copies the prefix and namespace_map from
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
22083
diff
changeset
|
879 | static void |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
880 | purple_xmlnode_copy_foreach_ns(gpointer key, gpointer value, gpointer user_data) |
|
23821
283d616f7f29
Make sure xmlnode_copy also copies the prefix and namespace_map from
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
22083
diff
changeset
|
881 | { |
|
283d616f7f29
Make sure xmlnode_copy also copies the prefix and namespace_map from
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
22083
diff
changeset
|
882 | GHashTable *ret = (GHashTable *)user_data; |
|
283d616f7f29
Make sure xmlnode_copy also copies the prefix and namespace_map from
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
22083
diff
changeset
|
883 | g_hash_table_insert(ret, g_strdup(key), g_strdup(value)); |
|
283d616f7f29
Make sure xmlnode_copy also copies the prefix and namespace_map from
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
22083
diff
changeset
|
884 | } |
|
283d616f7f29
Make sure xmlnode_copy also copies the prefix and namespace_map from
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
22083
diff
changeset
|
885 | |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
886 | PurpleXmlNode * |
|
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
887 | purple_xmlnode_copy(const PurpleXmlNode *src) |
| 8135 | 888 | { |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
889 | PurpleXmlNode *ret; |
|
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
890 | PurpleXmlNode *child; |
|
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
891 | PurpleXmlNode *sibling = NULL; |
| 8135 | 892 | |
|
12233
0570720fee6c
[gaim-migrate @ 14535]
Michael Carlson <corfe83@users.sourceforge.net>
parents:
12198
diff
changeset
|
893 | g_return_val_if_fail(src != NULL, NULL); |
| 8135 | 894 | |
| 895 | ret = new_node(src->name, src->type); | |
|
17825
ced38a45f560
Fixed a bug in xmlnode_copy, it didn't preserve the namespace in the copy.
Andreas Monitzer <am@adiumx.com>
parents:
15979
diff
changeset
|
896 | ret->xmlns = g_strdup(src->xmlns); |
|
23821
283d616f7f29
Make sure xmlnode_copy also copies the prefix and namespace_map from
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
22083
diff
changeset
|
897 | if (src->data) { |
|
283d616f7f29
Make sure xmlnode_copy also copies the prefix and namespace_map from
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
22083
diff
changeset
|
898 | if (src->data_sz) { |
| 8167 | 899 | ret->data = g_memdup(src->data, src->data_sz); |
| 900 | ret->data_sz = src->data_sz; | |
| 901 | } else { | |
| 902 | ret->data = g_strdup(src->data); | |
| 903 | } | |
| 8135 | 904 | } |
|
23821
283d616f7f29
Make sure xmlnode_copy also copies the prefix and namespace_map from
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
22083
diff
changeset
|
905 | ret->prefix = g_strdup(src->prefix); |
|
283d616f7f29
Make sure xmlnode_copy also copies the prefix and namespace_map from
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
22083
diff
changeset
|
906 | if (src->namespace_map) { |
|
283d616f7f29
Make sure xmlnode_copy also copies the prefix and namespace_map from
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
22083
diff
changeset
|
907 | ret->namespace_map = g_hash_table_new_full(g_str_hash, g_str_equal, |
|
283d616f7f29
Make sure xmlnode_copy also copies the prefix and namespace_map from
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
22083
diff
changeset
|
908 | g_free, g_free); |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
909 | g_hash_table_foreach(src->namespace_map, purple_xmlnode_copy_foreach_ns, ret->namespace_map); |
|
23821
283d616f7f29
Make sure xmlnode_copy also copies the prefix and namespace_map from
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
22083
diff
changeset
|
910 | } |
| 8135 | 911 | |
|
23821
283d616f7f29
Make sure xmlnode_copy also copies the prefix and namespace_map from
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
22083
diff
changeset
|
912 | for (child = src->child; child; child = child->next) { |
|
283d616f7f29
Make sure xmlnode_copy also copies the prefix and namespace_map from
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
22083
diff
changeset
|
913 | if (sibling) { |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
914 | sibling->next = purple_xmlnode_copy(child); |
| 8135 | 915 | sibling = sibling->next; |
| 916 | } else { | |
| 36031 | 917 | ret->child = sibling = purple_xmlnode_copy(child); |
| 8135 | 918 | } |
| 919 | sibling->parent = ret; | |
| 920 | } | |
| 921 | ||
|
12233
0570720fee6c
[gaim-migrate @ 14535]
Michael Carlson <corfe83@users.sourceforge.net>
parents:
12198
diff
changeset
|
922 | ret->lastchild = sibling; |
|
0570720fee6c
[gaim-migrate @ 14535]
Michael Carlson <corfe83@users.sourceforge.net>
parents:
12198
diff
changeset
|
923 | |
| 8135 | 924 | return ret; |
| 925 | } | |
| 926 | ||
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
927 | PurpleXmlNode * |
|
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
928 | purple_xmlnode_get_next_twin(PurpleXmlNode *node) |
|
10423
4663a8238def
[gaim-migrate @ 11675]
Mark Doliner <markdoliner@pidgin.im>
parents:
10415
diff
changeset
|
929 | { |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
930 | PurpleXmlNode *sibling; |
|
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
931 | const char *ns = purple_xmlnode_get_namespace(node); |
| 8135 | 932 | |
| 933 | g_return_val_if_fail(node != NULL, NULL); | |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
934 | g_return_val_if_fail(node->type == PURPLE_XMLNODE_TYPE_TAG, NULL); |
| 8135 | 935 | |
| 936 | for(sibling = node->next; sibling; sibling = sibling->next) { | |
|
20224
d4b827c606db
applied changes from 4d50bf3b08569aa2108a9f5da47fb1548d0c7dd9
Luke Schierer <lschiere@pidgin.im>
parents:
20147
diff
changeset
|
937 | /* XXX: Is it correct to ignore the namespace for the match if none was specified? */ |
| 8283 | 938 | const char *xmlns = NULL; |
| 8262 | 939 | if(ns) |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
940 | xmlns = purple_xmlnode_get_namespace(sibling); |
| 8262 | 941 | |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
942 | if(sibling->type == PURPLE_XMLNODE_TYPE_TAG && purple_strequal(node->name, sibling->name) && |
|
25859
b42be7bb9dac
Patch from Paul Aurich to add purple_strequal to help readability and simplicity of code. Ie, don't need to negate the value of strcmp, since this does a strcmp and does the negation for us
Paul Aurich <darkrain42@pidgin.im>
parents:
25854
diff
changeset
|
943 | purple_strequal(ns, xmlns)) |
| 8135 | 944 | return sibling; |
| 945 | } | |
| 946 | ||
| 947 | return NULL; | |
| 948 | } | |
|
34791
df49377a0778
Added GBoxed wrapping to xmlnode
Ankit Vani <a@nevitus.org>
parents:
32322
diff
changeset
|
949 | |
|
df49377a0778
Added GBoxed wrapping to xmlnode
Ankit Vani <a@nevitus.org>
parents:
32322
diff
changeset
|
950 | GType |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
951 | purple_xmlnode_get_type(void) |
|
34791
df49377a0778
Added GBoxed wrapping to xmlnode
Ankit Vani <a@nevitus.org>
parents:
32322
diff
changeset
|
952 | { |
|
df49377a0778
Added GBoxed wrapping to xmlnode
Ankit Vani <a@nevitus.org>
parents:
32322
diff
changeset
|
953 | static GType type = 0; |
|
df49377a0778
Added GBoxed wrapping to xmlnode
Ankit Vani <a@nevitus.org>
parents:
32322
diff
changeset
|
954 | |
|
df49377a0778
Added GBoxed wrapping to xmlnode
Ankit Vani <a@nevitus.org>
parents:
32322
diff
changeset
|
955 | if (type == 0) { |
|
34970
e3b24d73b775
Fixed type name for PurpleXmlNode
Ankit Vani <a@nevitus.org>
parents:
34955
diff
changeset
|
956 | type = g_boxed_type_register_static("PurpleXmlNode", |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
957 | (GBoxedCopyFunc)purple_xmlnode_copy, |
|
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
34889
diff
changeset
|
958 | (GBoxedFreeFunc)purple_xmlnode_free); |
|
34791
df49377a0778
Added GBoxed wrapping to xmlnode
Ankit Vani <a@nevitus.org>
parents:
32322
diff
changeset
|
959 | } |
|
df49377a0778
Added GBoxed wrapping to xmlnode
Ankit Vani <a@nevitus.org>
parents:
32322
diff
changeset
|
960 | |
|
df49377a0778
Added GBoxed wrapping to xmlnode
Ankit Vani <a@nevitus.org>
parents:
32322
diff
changeset
|
961 | return type; |
|
df49377a0778
Added GBoxed wrapping to xmlnode
Ankit Vani <a@nevitus.org>
parents:
32322
diff
changeset
|
962 | } |