Mercurial > pidgin
annotate libpurple/xmlnode.c @ 30956:61d160a4689f
Move the call to flap_connection_schedule_destroy from oscar_chat_kill
to oscar_chat_leave. This avoids having flap_connection_schedule_destroy
called from purple_connerr, which itself is called by flap_connection_destroy_cb
I'm hoping this change fixes #5927, the oscar crash when a flap connection
is disconnected.
| author | Mark Doliner <mark@kingant.net> |
|---|---|
| date | Mon, 22 Nov 2010 10:45:46 +0000 |
| parents | 77cd42f08ba1 |
| children | 3cf95447b26c |
| rev | line source |
|---|---|
|
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
1 /** |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
2 * @file xmlnode.c XML DOM functions |
|
20074
6bf32c9e15a7
remove gpl boilerplate from doxygen docs
Sean Egan <seanegan@gmail.com>
parents:
19697
diff
changeset
|
3 */ |
|
6bf32c9e15a7
remove gpl boilerplate from doxygen docs
Sean Egan <seanegan@gmail.com>
parents:
19697
diff
changeset
|
4 |
|
6bf32c9e15a7
remove gpl boilerplate from doxygen docs
Sean Egan <seanegan@gmail.com>
parents:
19697
diff
changeset
|
5 /* purple |
|
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
6 * |
| 15822 | 7 * Purple is the legal property of its developers, whose names are too numerous |
|
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
8 * to list here. Please refer to the COPYRIGHT file distributed with this |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
9 * source distribution. |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
10 * |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
11 * This program is free software; you can redistribute it and/or modify |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
12 * it under the terms of the GNU General Public License as published by |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
13 * the Free Software Foundation; either version 2 of the License, or |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
14 * (at your option) any later version. |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
15 * |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
16 * This program is distributed in the hope that it will be useful, |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
17 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
18 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
19 * GNU General Public License for more details. |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
20 * |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
21 * You should have received a copy of the GNU General Public License |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
22 * along with this program; if not, write to the Free Software |
|
19681
44b4e8bd759b
The FSF changed its address a while ago; our files were out of date.
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
19643
diff
changeset
|
23 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA |
|
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
24 */ |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
25 |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
26 /* A lot of this code at least resembles the code in libxode, but since |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
27 * libxode uses memory pools that we simply have no need for, I decided to |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
28 * write my own stuff. Also, re-writing this lets me be as lightweight |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
29 * as I want to be. Thank you libxode for giving me a good starting point */ |
|
26180
b03430dae08e
Add xmlnode_set_attrib_full that enables you to set an attribute with both
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25947
diff
changeset
|
30 #define _PURPLE_XMLNODE_C_ |
|
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
31 |
|
28647
f1437342cc0e
Include 'internal.h' before all other headers to make some non-gcc compilers happy.
Paul Aurich <paul@darkrain42.org>
parents:
27137
diff
changeset
|
32 #include "internal.h" |
|
15914
8bcd5840fb12
Don't advertise that we support the adverts, invite and translate
Mark Doliner <mark@kingant.net>
parents:
15822
diff
changeset
|
33 #include "debug.h" |
|
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
34 |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
35 #include <libxml/parser.h> |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
36 #include <string.h> |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
37 #include <glib.h> |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
38 |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
39 #include "dbus-maybe.h" |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
40 #include "util.h" |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
41 #include "xmlnode.h" |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
42 |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
43 #ifdef _WIN32 |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
44 # define NEWLINE_S "\r\n" |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
45 #else |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
46 # define NEWLINE_S "\n" |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
47 #endif |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
48 |
|
30956
61d160a4689f
Move the call to flap_connection_schedule_destroy from oscar_chat_kill
Mark Doliner <mark@kingant.net>
parents:
30257
diff
changeset
|
49 #ifdef CHECKING_XML_STRINGS_FOR_VALID_CHARACTERS |
|
61d160a4689f
Move the call to flap_connection_schedule_destroy from oscar_chat_kill
Mark Doliner <mark@kingant.net>
parents:
30257
diff
changeset
|
50 /* |
|
61d160a4689f
Move the call to flap_connection_schedule_destroy from oscar_chat_kill
Mark Doliner <mark@kingant.net>
parents:
30257
diff
changeset
|
51 * The purpose of this function is to prevent us from creating XML documents |
|
61d160a4689f
Move the call to flap_connection_schedule_destroy from oscar_chat_kill
Mark Doliner <mark@kingant.net>
parents:
30257
diff
changeset
|
52 * that contain characters that are not allowed in XML 1.0. However, this |
|
61d160a4689f
Move the call to flap_connection_schedule_destroy from oscar_chat_kill
Mark Doliner <mark@kingant.net>
parents:
30257
diff
changeset
|
53 * change is unfortunately REALLY slow. |
|
61d160a4689f
Move the call to flap_connection_schedule_destroy from oscar_chat_kill
Mark Doliner <mark@kingant.net>
parents:
30257
diff
changeset
|
54 */ |
|
61d160a4689f
Move the call to flap_connection_schedule_destroy from oscar_chat_kill
Mark Doliner <mark@kingant.net>
parents:
30257
diff
changeset
|
55 static gboolean is_valid_xml10(const char *str) |
|
61d160a4689f
Move the call to flap_connection_schedule_destroy from oscar_chat_kill
Mark Doliner <mark@kingant.net>
parents:
30257
diff
changeset
|
56 { |
|
61d160a4689f
Move the call to flap_connection_schedule_destroy from oscar_chat_kill
Mark Doliner <mark@kingant.net>
parents:
30257
diff
changeset
|
57 gunichar ch; |
|
61d160a4689f
Move the call to flap_connection_schedule_destroy from oscar_chat_kill
Mark Doliner <mark@kingant.net>
parents:
30257
diff
changeset
|
58 |
|
61d160a4689f
Move the call to flap_connection_schedule_destroy from oscar_chat_kill
Mark Doliner <mark@kingant.net>
parents:
30257
diff
changeset
|
59 for (ch = g_utf8_get_char(str); str[0] != '\0'; str = g_utf8_next_char(str)) |
|
61d160a4689f
Move the call to flap_connection_schedule_destroy from oscar_chat_kill
Mark Doliner <mark@kingant.net>
parents:
30257
diff
changeset
|
60 { |
|
61d160a4689f
Move the call to flap_connection_schedule_destroy from oscar_chat_kill
Mark Doliner <mark@kingant.net>
parents:
30257
diff
changeset
|
61 /* |
|
61d160a4689f
Move the call to flap_connection_schedule_destroy from oscar_chat_kill
Mark Doliner <mark@kingant.net>
parents:
30257
diff
changeset
|
62 * Valid characters in XML 1.0 are: #x9 #xA #xD |
|
61d160a4689f
Move the call to flap_connection_schedule_destroy from oscar_chat_kill
Mark Doliner <mark@kingant.net>
parents:
30257
diff
changeset
|
63 * [#x20-#xD7FF] [#xE000-#xFFFD] [#x10000-#x10FFFF] |
|
61d160a4689f
Move the call to flap_connection_schedule_destroy from oscar_chat_kill
Mark Doliner <mark@kingant.net>
parents:
30257
diff
changeset
|
64 */ |
|
61d160a4689f
Move the call to flap_connection_schedule_destroy from oscar_chat_kill
Mark Doliner <mark@kingant.net>
parents:
30257
diff
changeset
|
65 if (ch < 0x09 || (ch > 0x0a && ch < 0x0d) || (ch > 0x0d && ch < 0x20)) |
|
61d160a4689f
Move the call to flap_connection_schedule_destroy from oscar_chat_kill
Mark Doliner <mark@kingant.net>
parents:
30257
diff
changeset
|
66 return FALSE; |
|
61d160a4689f
Move the call to flap_connection_schedule_destroy from oscar_chat_kill
Mark Doliner <mark@kingant.net>
parents:
30257
diff
changeset
|
67 } |
|
61d160a4689f
Move the call to flap_connection_schedule_destroy from oscar_chat_kill
Mark Doliner <mark@kingant.net>
parents:
30257
diff
changeset
|
68 |
|
61d160a4689f
Move the call to flap_connection_schedule_destroy from oscar_chat_kill
Mark Doliner <mark@kingant.net>
parents:
30257
diff
changeset
|
69 return TRUE; |
|
61d160a4689f
Move the call to flap_connection_schedule_destroy from oscar_chat_kill
Mark Doliner <mark@kingant.net>
parents:
30257
diff
changeset
|
70 } |
|
61d160a4689f
Move the call to flap_connection_schedule_destroy from oscar_chat_kill
Mark Doliner <mark@kingant.net>
parents:
30257
diff
changeset
|
71 #endif /* CHECKING_XML_STRINGS_FOR_VALID_CHARACTERS */ |
|
61d160a4689f
Move the call to flap_connection_schedule_destroy from oscar_chat_kill
Mark Doliner <mark@kingant.net>
parents:
30257
diff
changeset
|
72 |
|
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
73 static xmlnode* |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
74 new_node(const char *name, XMLNodeType type) |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
75 { |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
76 xmlnode *node = g_new0(xmlnode, 1); |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
77 |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
78 node->name = g_strdup(name); |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
79 node->type = type; |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
80 |
| 15822 | 81 PURPLE_DBUS_REGISTER_POINTER(node, xmlnode); |
|
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
82 |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
83 return node; |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
84 } |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
85 |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
86 xmlnode* |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
87 xmlnode_new(const char *name) |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
88 { |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
89 g_return_val_if_fail(name != NULL, NULL); |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
90 |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
91 return new_node(name, XMLNODE_TYPE_TAG); |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
92 } |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
93 |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
94 xmlnode * |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
95 xmlnode_new_child(xmlnode *parent, const char *name) |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
96 { |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
97 xmlnode *node; |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
98 |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
99 g_return_val_if_fail(parent != NULL, NULL); |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
100 g_return_val_if_fail(name != NULL, NULL); |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
101 |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
102 node = new_node(name, XMLNODE_TYPE_TAG); |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
103 |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
104 xmlnode_insert_child(parent, node); |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
105 |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
106 return node; |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
107 } |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
108 |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
109 void |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
110 xmlnode_insert_child(xmlnode *parent, xmlnode *child) |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
111 { |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
112 g_return_if_fail(parent != NULL); |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
113 g_return_if_fail(child != NULL); |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
114 |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
115 child->parent = parent; |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
116 |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
117 if(parent->lastchild) { |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
118 parent->lastchild->next = child; |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
119 } else { |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
120 parent->child = child; |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
121 } |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
122 |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
123 parent->lastchild = child; |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
124 } |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
125 |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
126 void |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
127 xmlnode_insert_data(xmlnode *node, const char *data, gssize size) |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
128 { |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
129 xmlnode *child; |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
130 gsize real_size; |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
131 |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
132 g_return_if_fail(node != NULL); |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
133 g_return_if_fail(data != NULL); |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
134 g_return_if_fail(size != 0); |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
135 |
|
30956
61d160a4689f
Move the call to flap_connection_schedule_destroy from oscar_chat_kill
Mark Doliner <mark@kingant.net>
parents:
30257
diff
changeset
|
136 #ifdef CHECKING_XML_STRINGS_FOR_VALID_CHARACTERS |
|
61d160a4689f
Move the call to flap_connection_schedule_destroy from oscar_chat_kill
Mark Doliner <mark@kingant.net>
parents:
30257
diff
changeset
|
137 g_return_if_fail(is_valid_xml10(data)); |
|
61d160a4689f
Move the call to flap_connection_schedule_destroy from oscar_chat_kill
Mark Doliner <mark@kingant.net>
parents:
30257
diff
changeset
|
138 #endif /* CHECKING_XML_STRINGS_FOR_VALID_CHARACTERS */ |
|
61d160a4689f
Move the call to flap_connection_schedule_destroy from oscar_chat_kill
Mark Doliner <mark@kingant.net>
parents:
30257
diff
changeset
|
139 |
|
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
140 real_size = size == -1 ? strlen(data) : size; |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
141 |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
142 child = new_node(NULL, XMLNODE_TYPE_DATA); |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
143 |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
144 child->data = g_memdup(data, real_size); |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
145 child->data_sz = real_size; |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
146 |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
147 xmlnode_insert_child(node, child); |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
148 } |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
149 |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
150 void |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
151 xmlnode_remove_attrib(xmlnode *node, const char *attr) |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
152 { |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
153 xmlnode *attr_node, *sibling = NULL; |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
154 |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
155 g_return_if_fail(node != NULL); |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
156 g_return_if_fail(attr != NULL); |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
157 |
|
26180
b03430dae08e
Add xmlnode_set_attrib_full that enables you to set an attribute with both
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25947
diff
changeset
|
158 attr_node = node->child; |
|
b03430dae08e
Add xmlnode_set_attrib_full that enables you to set an attribute with both
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25947
diff
changeset
|
159 while (attr_node) { |
|
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
160 if(attr_node->type == XMLNODE_TYPE_ATTRIB && |
|
25894
a6e3cb32cdd2
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 <paul@darkrain42.org>
parents:
25890
diff
changeset
|
161 purple_strequal(attr_node->name, attr)) |
|
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
162 { |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
163 if (node->lastchild == attr_node) { |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
164 node->lastchild = sibling; |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
165 } |
|
26180
b03430dae08e
Add xmlnode_set_attrib_full that enables you to set an attribute with both
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25947
diff
changeset
|
166 if (sibling == NULL) { |
|
b03430dae08e
Add xmlnode_set_attrib_full that enables you to set an attribute with both
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25947
diff
changeset
|
167 node->child = attr_node->next; |
|
b03430dae08e
Add xmlnode_set_attrib_full that enables you to set an attribute with both
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25947
diff
changeset
|
168 xmlnode_free(attr_node); |
|
b03430dae08e
Add xmlnode_set_attrib_full that enables you to set an attribute with both
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25947
diff
changeset
|
169 attr_node = node->child; |
|
b03430dae08e
Add xmlnode_set_attrib_full that enables you to set an attribute with both
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25947
diff
changeset
|
170 } else { |
|
b03430dae08e
Add xmlnode_set_attrib_full that enables you to set an attribute with both
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25947
diff
changeset
|
171 sibling->next = attr_node->next; |
|
b03430dae08e
Add xmlnode_set_attrib_full that enables you to set an attribute with both
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25947
diff
changeset
|
172 sibling = attr_node->next; |
|
b03430dae08e
Add xmlnode_set_attrib_full that enables you to set an attribute with both
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25947
diff
changeset
|
173 xmlnode_free(attr_node); |
|
b03430dae08e
Add xmlnode_set_attrib_full that enables you to set an attribute with both
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25947
diff
changeset
|
174 attr_node = sibling; |
|
b03430dae08e
Add xmlnode_set_attrib_full that enables you to set an attribute with both
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25947
diff
changeset
|
175 } |
|
b03430dae08e
Add xmlnode_set_attrib_full that enables you to set an attribute with both
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25947
diff
changeset
|
176 } |
|
b03430dae08e
Add xmlnode_set_attrib_full that enables you to set an attribute with both
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25947
diff
changeset
|
177 else |
|
b03430dae08e
Add xmlnode_set_attrib_full that enables you to set an attribute with both
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25947
diff
changeset
|
178 { |
|
b03430dae08e
Add xmlnode_set_attrib_full that enables you to set an attribute with both
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25947
diff
changeset
|
179 attr_node = attr_node->next; |
|
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
180 } |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
181 sibling = attr_node; |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
182 } |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
183 } |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
184 |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
185 void |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
186 xmlnode_remove_attrib_with_namespace(xmlnode *node, const char *attr, const char *xmlns) |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
187 { |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
188 xmlnode *attr_node, *sibling = NULL; |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
189 |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
190 g_return_if_fail(node != NULL); |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
191 g_return_if_fail(attr != NULL); |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
192 |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
193 for(attr_node = node->child; attr_node; attr_node = attr_node->next) |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
194 { |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
195 if(attr_node->type == XMLNODE_TYPE_ATTRIB && |
|
25894
a6e3cb32cdd2
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 <paul@darkrain42.org>
parents:
25890
diff
changeset
|
196 purple_strequal(attr, attr_node->name) && |
|
a6e3cb32cdd2
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 <paul@darkrain42.org>
parents:
25890
diff
changeset
|
197 purple_strequal(xmlns, attr_node->xmlns)) |
|
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
198 { |
|
20336
b93e7be3847b
applied changes from 9d35dde0c779cca73548172223ba557f27d61882
Luke Schierer <lschiere@pidgin.im>
parents:
20332
diff
changeset
|
199 if(sibling == NULL) { |
|
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
200 node->child = attr_node->next; |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
201 } else { |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
202 sibling->next = attr_node->next; |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
203 } |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
204 if (node->lastchild == attr_node) { |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
205 node->lastchild = sibling; |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
206 } |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
207 xmlnode_free(attr_node); |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
208 return; |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
209 } |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
210 sibling = attr_node; |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
211 } |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
212 } |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
213 |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
214 void |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
215 xmlnode_set_attrib(xmlnode *node, const char *attr, const char *value) |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
216 { |
|
30956
61d160a4689f
Move the call to flap_connection_schedule_destroy from oscar_chat_kill
Mark Doliner <mark@kingant.net>
parents:
30257
diff
changeset
|
217 #ifdef CHECKING_XML_STRINGS_FOR_VALID_CHARACTERS |
|
61d160a4689f
Move the call to flap_connection_schedule_destroy from oscar_chat_kill
Mark Doliner <mark@kingant.net>
parents:
30257
diff
changeset
|
218 g_return_if_fail(is_valid_xml10(attr)); |
|
61d160a4689f
Move the call to flap_connection_schedule_destroy from oscar_chat_kill
Mark Doliner <mark@kingant.net>
parents:
30257
diff
changeset
|
219 g_return_if_fail(is_valid_xml10(value)); |
|
61d160a4689f
Move the call to flap_connection_schedule_destroy from oscar_chat_kill
Mark Doliner <mark@kingant.net>
parents:
30257
diff
changeset
|
220 #endif /* CHECKING_XML_STRINGS_FOR_VALID_CHARACTERS */ |
|
61d160a4689f
Move the call to flap_connection_schedule_destroy from oscar_chat_kill
Mark Doliner <mark@kingant.net>
parents:
30257
diff
changeset
|
221 |
|
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
222 xmlnode_remove_attrib(node, attr); |
|
26180
b03430dae08e
Add xmlnode_set_attrib_full that enables you to set an attribute with both
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25947
diff
changeset
|
223 xmlnode_set_attrib_full(node, attr, NULL, NULL, value); |
|
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
224 } |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
225 |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
226 void |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
227 xmlnode_set_attrib_with_namespace(xmlnode *node, const char *attr, const char *xmlns, const char *value) |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
228 { |
|
26180
b03430dae08e
Add xmlnode_set_attrib_full that enables you to set an attribute with both
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25947
diff
changeset
|
229 xmlnode_set_attrib_full(node, attr, xmlns, NULL, value); |
|
b03430dae08e
Add xmlnode_set_attrib_full that enables you to set an attribute with both
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25947
diff
changeset
|
230 } |
|
b03430dae08e
Add xmlnode_set_attrib_full that enables you to set an attribute with both
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25947
diff
changeset
|
231 |
|
b03430dae08e
Add xmlnode_set_attrib_full that enables you to set an attribute with both
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25947
diff
changeset
|
232 void |
|
b03430dae08e
Add xmlnode_set_attrib_full that enables you to set an attribute with both
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25947
diff
changeset
|
233 xmlnode_set_attrib_with_prefix(xmlnode *node, const char *attr, const char *prefix, const char *value) |
|
b03430dae08e
Add xmlnode_set_attrib_full that enables you to set an attribute with both
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25947
diff
changeset
|
234 { |
|
b03430dae08e
Add xmlnode_set_attrib_full that enables you to set an attribute with both
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25947
diff
changeset
|
235 xmlnode_set_attrib_full(node, attr, NULL, prefix, value); |
|
b03430dae08e
Add xmlnode_set_attrib_full that enables you to set an attribute with both
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25947
diff
changeset
|
236 } |
|
b03430dae08e
Add xmlnode_set_attrib_full that enables you to set an attribute with both
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25947
diff
changeset
|
237 |
|
b03430dae08e
Add xmlnode_set_attrib_full that enables you to set an attribute with both
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25947
diff
changeset
|
238 void |
|
b03430dae08e
Add xmlnode_set_attrib_full that enables you to set an attribute with both
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25947
diff
changeset
|
239 xmlnode_set_attrib_full(xmlnode *node, const char *attr, const char *xmlns, const char *prefix, const char *value) |
|
b03430dae08e
Add xmlnode_set_attrib_full that enables you to set an attribute with both
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25947
diff
changeset
|
240 { |
|
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
241 xmlnode *attrib_node; |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
242 |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
243 g_return_if_fail(node != NULL); |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
244 g_return_if_fail(attr != NULL); |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
245 g_return_if_fail(value != NULL); |
|
30956
61d160a4689f
Move the call to flap_connection_schedule_destroy from oscar_chat_kill
Mark Doliner <mark@kingant.net>
parents:
30257
diff
changeset
|
246 #ifdef CHECKING_XML_STRINGS_FOR_VALID_CHARACTERS |
|
61d160a4689f
Move the call to flap_connection_schedule_destroy from oscar_chat_kill
Mark Doliner <mark@kingant.net>
parents:
30257
diff
changeset
|
247 g_return_if_fail(is_valid_xml10(attr)); |
|
61d160a4689f
Move the call to flap_connection_schedule_destroy from oscar_chat_kill
Mark Doliner <mark@kingant.net>
parents:
30257
diff
changeset
|
248 if (xmlns != NULL) |
|
61d160a4689f
Move the call to flap_connection_schedule_destroy from oscar_chat_kill
Mark Doliner <mark@kingant.net>
parents:
30257
diff
changeset
|
249 g_return_if_fail(is_valid_xml10(xmlns)); |
|
61d160a4689f
Move the call to flap_connection_schedule_destroy from oscar_chat_kill
Mark Doliner <mark@kingant.net>
parents:
30257
diff
changeset
|
250 if (prefix != NULL) |
|
61d160a4689f
Move the call to flap_connection_schedule_destroy from oscar_chat_kill
Mark Doliner <mark@kingant.net>
parents:
30257
diff
changeset
|
251 g_return_if_fail(is_valid_xml10(prefix)); |
|
61d160a4689f
Move the call to flap_connection_schedule_destroy from oscar_chat_kill
Mark Doliner <mark@kingant.net>
parents:
30257
diff
changeset
|
252 g_return_if_fail(is_valid_xml10(value)); |
|
61d160a4689f
Move the call to flap_connection_schedule_destroy from oscar_chat_kill
Mark Doliner <mark@kingant.net>
parents:
30257
diff
changeset
|
253 #endif /* CHECKING_XML_STRINGS_FOR_VALID_CHARACTERS */ |
|
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
254 |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
255 xmlnode_remove_attrib_with_namespace(node, attr, xmlns); |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
256 attrib_node = new_node(attr, XMLNODE_TYPE_ATTRIB); |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
257 |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
258 attrib_node->data = g_strdup(value); |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
259 attrib_node->xmlns = g_strdup(xmlns); |
|
21285
78f3361f5e62
make our xmlnode preserve prefixes
Ka-Hing Cheung <khc@hxbc.us>
parents:
20336
diff
changeset
|
260 attrib_node->prefix = g_strdup(prefix); |
|
78f3361f5e62
make our xmlnode preserve prefixes
Ka-Hing Cheung <khc@hxbc.us>
parents:
20336
diff
changeset
|
261 |
|
78f3361f5e62
make our xmlnode preserve prefixes
Ka-Hing Cheung <khc@hxbc.us>
parents:
20336
diff
changeset
|
262 xmlnode_insert_child(node, attrib_node); |
|
78f3361f5e62
make our xmlnode preserve prefixes
Ka-Hing Cheung <khc@hxbc.us>
parents:
20336
diff
changeset
|
263 } |
|
78f3361f5e62
make our xmlnode preserve prefixes
Ka-Hing Cheung <khc@hxbc.us>
parents:
20336
diff
changeset
|
264 |
|
78f3361f5e62
make our xmlnode preserve prefixes
Ka-Hing Cheung <khc@hxbc.us>
parents:
20336
diff
changeset
|
265 |
|
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
266 const char * |
|
30257
77cd42f08ba1
const-ify the xmlnode* parameter to xmlnode_get_attrib(_with_namespace)
Paul Aurich <paul@darkrain42.org>
parents:
29359
diff
changeset
|
267 xmlnode_get_attrib(const xmlnode *node, const char *attr) |
|
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
268 { |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
269 xmlnode *x; |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
270 |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
271 g_return_val_if_fail(node != NULL, NULL); |
| 24418 | 272 g_return_val_if_fail(attr != NULL, NULL); |
|
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
273 |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
274 for(x = node->child; x; x = x->next) { |
|
25894
a6e3cb32cdd2
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 <paul@darkrain42.org>
parents:
25890
diff
changeset
|
275 if(x->type == XMLNODE_TYPE_ATTRIB && purple_strequal(attr, x->name)) { |
|
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
276 return x->data; |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
277 } |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
278 } |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
279 |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
280 return NULL; |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
281 } |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
282 |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
283 const char * |
|
30257
77cd42f08ba1
const-ify the xmlnode* parameter to xmlnode_get_attrib(_with_namespace)
Paul Aurich <paul@darkrain42.org>
parents:
29359
diff
changeset
|
284 xmlnode_get_attrib_with_namespace(const xmlnode *node, const char *attr, const char *xmlns) |
|
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
285 { |
|
30257
77cd42f08ba1
const-ify the xmlnode* parameter to xmlnode_get_attrib(_with_namespace)
Paul Aurich <paul@darkrain42.org>
parents:
29359
diff
changeset
|
286 const xmlnode *x; |
|
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
287 |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
288 g_return_val_if_fail(node != NULL, NULL); |
| 24418 | 289 g_return_val_if_fail(attr != NULL, NULL); |
|
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
290 |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
291 for(x = node->child; x; x = x->next) { |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
292 if(x->type == XMLNODE_TYPE_ATTRIB && |
|
25894
a6e3cb32cdd2
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 <paul@darkrain42.org>
parents:
25890
diff
changeset
|
293 purple_strequal(attr, x->name) && |
|
a6e3cb32cdd2
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 <paul@darkrain42.org>
parents:
25890
diff
changeset
|
294 purple_strequal(xmlns, x->xmlns)) { |
|
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
295 return x->data; |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
296 } |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
297 } |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
298 |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
299 return NULL; |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
300 } |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
301 |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
302 |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
303 void xmlnode_set_namespace(xmlnode *node, const char *xmlns) |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
304 { |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
305 g_return_if_fail(node != NULL); |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
306 |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
307 g_free(node->xmlns); |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
308 node->xmlns = g_strdup(xmlns); |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
309 } |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
310 |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
311 const char *xmlnode_get_namespace(xmlnode *node) |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
312 { |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
313 g_return_val_if_fail(node != NULL, NULL); |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
314 |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
315 return node->xmlns; |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
316 } |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
317 |
|
21285
78f3361f5e62
make our xmlnode preserve prefixes
Ka-Hing Cheung <khc@hxbc.us>
parents:
20336
diff
changeset
|
318 void xmlnode_set_prefix(xmlnode *node, const char *prefix) |
|
78f3361f5e62
make our xmlnode preserve prefixes
Ka-Hing Cheung <khc@hxbc.us>
parents:
20336
diff
changeset
|
319 { |
|
78f3361f5e62
make our xmlnode preserve prefixes
Ka-Hing Cheung <khc@hxbc.us>
parents:
20336
diff
changeset
|
320 g_return_if_fail(node != NULL); |
|
78f3361f5e62
make our xmlnode preserve prefixes
Ka-Hing Cheung <khc@hxbc.us>
parents:
20336
diff
changeset
|
321 |
|
78f3361f5e62
make our xmlnode preserve prefixes
Ka-Hing Cheung <khc@hxbc.us>
parents:
20336
diff
changeset
|
322 g_free(node->prefix); |
|
78f3361f5e62
make our xmlnode preserve prefixes
Ka-Hing Cheung <khc@hxbc.us>
parents:
20336
diff
changeset
|
323 node->prefix = g_strdup(prefix); |
|
78f3361f5e62
make our xmlnode preserve prefixes
Ka-Hing Cheung <khc@hxbc.us>
parents:
20336
diff
changeset
|
324 } |
|
78f3361f5e62
make our xmlnode preserve prefixes
Ka-Hing Cheung <khc@hxbc.us>
parents:
20336
diff
changeset
|
325 |
|
25414
efde7e6ed5f2
There's no reason for these to not be const is there? This doesn't
Mark Doliner <mark@kingant.net>
parents:
24866
diff
changeset
|
326 const char *xmlnode_get_prefix(const xmlnode *node) |
|
21285
78f3361f5e62
make our xmlnode preserve prefixes
Ka-Hing Cheung <khc@hxbc.us>
parents:
20336
diff
changeset
|
327 { |
|
21642
372711300f57
Fix the namespace_map being leaked.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
21318
diff
changeset
|
328 g_return_val_if_fail(node != NULL, NULL); |
|
21285
78f3361f5e62
make our xmlnode preserve prefixes
Ka-Hing Cheung <khc@hxbc.us>
parents:
20336
diff
changeset
|
329 return node->prefix; |
|
78f3361f5e62
make our xmlnode preserve prefixes
Ka-Hing Cheung <khc@hxbc.us>
parents:
20336
diff
changeset
|
330 } |
|
78f3361f5e62
make our xmlnode preserve prefixes
Ka-Hing Cheung <khc@hxbc.us>
parents:
20336
diff
changeset
|
331 |
|
23850
84c7bb2ca41f
Added xmlnode_get_parent.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
21955
diff
changeset
|
332 xmlnode *xmlnode_get_parent(const xmlnode *child) |
|
84c7bb2ca41f
Added xmlnode_get_parent.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
21955
diff
changeset
|
333 { |
|
84c7bb2ca41f
Added xmlnode_get_parent.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
21955
diff
changeset
|
334 g_return_val_if_fail(child != NULL, NULL); |
|
84c7bb2ca41f
Added xmlnode_get_parent.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
21955
diff
changeset
|
335 return child->parent; |
|
84c7bb2ca41f
Added xmlnode_get_parent.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
21955
diff
changeset
|
336 } |
|
84c7bb2ca41f
Added xmlnode_get_parent.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
21955
diff
changeset
|
337 |
|
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
338 void |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
339 xmlnode_free(xmlnode *node) |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
340 { |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
341 xmlnode *x, *y; |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
342 |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
343 g_return_if_fail(node != NULL); |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
344 |
|
18257
6050348614ab
fix a buddy icon bug in jabber
Nathan Walp <nwalp@pidgin.im>
parents:
18072
diff
changeset
|
345 /* if we're part of a tree, remove ourselves from the tree first */ |
|
6050348614ab
fix a buddy icon bug in jabber
Nathan Walp <nwalp@pidgin.im>
parents:
18072
diff
changeset
|
346 if(NULL != node->parent) { |
|
6050348614ab
fix a buddy icon bug in jabber
Nathan Walp <nwalp@pidgin.im>
parents:
18072
diff
changeset
|
347 if(node->parent->child == node) { |
|
6050348614ab
fix a buddy icon bug in jabber
Nathan Walp <nwalp@pidgin.im>
parents:
18072
diff
changeset
|
348 node->parent->child = node->next; |
|
19388
1c97caf1ebbb
xmlnode bugfix patch from Mauro Brasil
Sean Egan <seanegan@gmail.com>
parents:
18257
diff
changeset
|
349 if (node->parent->lastchild == node) |
|
1c97caf1ebbb
xmlnode bugfix patch from Mauro Brasil
Sean Egan <seanegan@gmail.com>
parents:
18257
diff
changeset
|
350 node->parent->lastchild = node->next; |
|
18257
6050348614ab
fix a buddy icon bug in jabber
Nathan Walp <nwalp@pidgin.im>
parents:
18072
diff
changeset
|
351 } else { |
|
6050348614ab
fix a buddy icon bug in jabber
Nathan Walp <nwalp@pidgin.im>
parents:
18072
diff
changeset
|
352 xmlnode *prev = node->parent->child; |
|
6050348614ab
fix a buddy icon bug in jabber
Nathan Walp <nwalp@pidgin.im>
parents:
18072
diff
changeset
|
353 while(prev && prev->next != node) { |
|
6050348614ab
fix a buddy icon bug in jabber
Nathan Walp <nwalp@pidgin.im>
parents:
18072
diff
changeset
|
354 prev = prev->next; |
|
6050348614ab
fix a buddy icon bug in jabber
Nathan Walp <nwalp@pidgin.im>
parents:
18072
diff
changeset
|
355 } |
|
6050348614ab
fix a buddy icon bug in jabber
Nathan Walp <nwalp@pidgin.im>
parents:
18072
diff
changeset
|
356 if(prev) { |
|
6050348614ab
fix a buddy icon bug in jabber
Nathan Walp <nwalp@pidgin.im>
parents:
18072
diff
changeset
|
357 prev->next = node->next; |
|
19388
1c97caf1ebbb
xmlnode bugfix patch from Mauro Brasil
Sean Egan <seanegan@gmail.com>
parents:
18257
diff
changeset
|
358 if (node->parent->lastchild == node) |
|
1c97caf1ebbb
xmlnode bugfix patch from Mauro Brasil
Sean Egan <seanegan@gmail.com>
parents:
18257
diff
changeset
|
359 node->parent->lastchild = prev; |
|
18257
6050348614ab
fix a buddy icon bug in jabber
Nathan Walp <nwalp@pidgin.im>
parents:
18072
diff
changeset
|
360 } |
|
6050348614ab
fix a buddy icon bug in jabber
Nathan Walp <nwalp@pidgin.im>
parents:
18072
diff
changeset
|
361 } |
|
6050348614ab
fix a buddy icon bug in jabber
Nathan Walp <nwalp@pidgin.im>
parents:
18072
diff
changeset
|
362 } |
|
6050348614ab
fix a buddy icon bug in jabber
Nathan Walp <nwalp@pidgin.im>
parents:
18072
diff
changeset
|
363 |
|
6050348614ab
fix a buddy icon bug in jabber
Nathan Walp <nwalp@pidgin.im>
parents:
18072
diff
changeset
|
364 /* now free our children */ |
|
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
365 x = node->child; |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
366 while(x) { |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
367 y = x->next; |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
368 xmlnode_free(x); |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
369 x = y; |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
370 } |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
371 |
|
18257
6050348614ab
fix a buddy icon bug in jabber
Nathan Walp <nwalp@pidgin.im>
parents:
18072
diff
changeset
|
372 /* now dispose of ourselves */ |
|
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
373 g_free(node->name); |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
374 g_free(node->data); |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
375 g_free(node->xmlns); |
| 21942 | 376 g_free(node->prefix); |
|
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
377 |
|
21642
372711300f57
Fix the namespace_map being leaked.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
21318
diff
changeset
|
378 if(node->namespace_map) |
|
372711300f57
Fix the namespace_map being leaked.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
21318
diff
changeset
|
379 g_hash_table_destroy(node->namespace_map); |
|
372711300f57
Fix the namespace_map being leaked.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
21318
diff
changeset
|
380 |
| 15822 | 381 PURPLE_DBUS_UNREGISTER_POINTER(node); |
|
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
382 g_free(node); |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
383 } |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
384 |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
385 xmlnode* |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
386 xmlnode_get_child(const xmlnode *parent, const char *name) |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
387 { |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
388 return xmlnode_get_child_with_namespace(parent, name, NULL); |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
389 } |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
390 |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
391 xmlnode * |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
392 xmlnode_get_child_with_namespace(const xmlnode *parent, const char *name, const char *ns) |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
393 { |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
394 xmlnode *x, *ret = NULL; |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
395 char **names; |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
396 char *parent_name, *child_name; |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
397 |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
398 g_return_val_if_fail(parent != NULL, NULL); |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
399 g_return_val_if_fail(name != NULL, NULL); |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
400 |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
401 names = g_strsplit(name, "/", 2); |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
402 parent_name = names[0]; |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
403 child_name = names[1]; |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
404 |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
405 for(x = parent->child; x; x = x->next) { |
|
20332
3a9709bfde65
applied changes from 4d50bf3b08569aa2108a9f5da47fb1548d0c7dd9
Luke Schierer <lschiere@pidgin.im>
parents:
20074
diff
changeset
|
406 /* XXX: Is it correct to ignore the namespace for the match if none was specified? */ |
|
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
407 const char *xmlns = NULL; |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
408 if(ns) |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
409 xmlns = xmlnode_get_namespace(x); |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
410 |
|
25894
a6e3cb32cdd2
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 <paul@darkrain42.org>
parents:
25890
diff
changeset
|
411 if(x->type == XMLNODE_TYPE_TAG && purple_strequal(parent_name, x->name) |
|
a6e3cb32cdd2
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 <paul@darkrain42.org>
parents:
25890
diff
changeset
|
412 && purple_strequal(ns, xmlns)) { |
|
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
413 ret = x; |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
414 break; |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
415 } |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
416 } |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
417 |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
418 if(child_name && ret) |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
419 ret = xmlnode_get_child(ret, child_name); |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
420 |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
421 g_strfreev(names); |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
422 return ret; |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
423 } |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
424 |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
425 char * |
|
27121
350f097019eb
These parameters aren't modified
Mark Doliner <mark@kingant.net>
parents:
26686
diff
changeset
|
426 xmlnode_get_data(const xmlnode *node) |
|
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
427 { |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
428 GString *str = NULL; |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
429 xmlnode *c; |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
430 |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
431 g_return_val_if_fail(node != NULL, NULL); |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
432 |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
433 for(c = node->child; c; c = c->next) { |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
434 if(c->type == XMLNODE_TYPE_DATA) { |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
435 if(!str) |
|
18072
3fc94e7c7056
add xmlnode_get_data_unescaped(), and got rid of an unecessary realloc
Nathan Walp <nwalp@pidgin.im>
parents:
17457
diff
changeset
|
436 str = g_string_new_len(c->data, c->data_sz); |
|
3fc94e7c7056
add xmlnode_get_data_unescaped(), and got rid of an unecessary realloc
Nathan Walp <nwalp@pidgin.im>
parents:
17457
diff
changeset
|
437 else |
|
3fc94e7c7056
add xmlnode_get_data_unescaped(), and got rid of an unecessary realloc
Nathan Walp <nwalp@pidgin.im>
parents:
17457
diff
changeset
|
438 str = g_string_append_len(str, c->data, c->data_sz); |
|
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
439 } |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
440 } |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
441 |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
442 if (str == NULL) |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
443 return NULL; |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
444 |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
445 return g_string_free(str, FALSE); |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
446 } |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
447 |
|
18072
3fc94e7c7056
add xmlnode_get_data_unescaped(), and got rid of an unecessary realloc
Nathan Walp <nwalp@pidgin.im>
parents:
17457
diff
changeset
|
448 char * |
|
27121
350f097019eb
These parameters aren't modified
Mark Doliner <mark@kingant.net>
parents:
26686
diff
changeset
|
449 xmlnode_get_data_unescaped(const xmlnode *node) |
|
18072
3fc94e7c7056
add xmlnode_get_data_unescaped(), and got rid of an unecessary realloc
Nathan Walp <nwalp@pidgin.im>
parents:
17457
diff
changeset
|
450 { |
|
3fc94e7c7056
add xmlnode_get_data_unescaped(), and got rid of an unecessary realloc
Nathan Walp <nwalp@pidgin.im>
parents:
17457
diff
changeset
|
451 char *escaped = xmlnode_get_data(node); |
|
3fc94e7c7056
add xmlnode_get_data_unescaped(), and got rid of an unecessary realloc
Nathan Walp <nwalp@pidgin.im>
parents:
17457
diff
changeset
|
452 |
|
3fc94e7c7056
add xmlnode_get_data_unescaped(), and got rid of an unecessary realloc
Nathan Walp <nwalp@pidgin.im>
parents:
17457
diff
changeset
|
453 char *unescaped = escaped ? purple_unescape_html(escaped) : NULL; |
|
3fc94e7c7056
add xmlnode_get_data_unescaped(), and got rid of an unecessary realloc
Nathan Walp <nwalp@pidgin.im>
parents:
17457
diff
changeset
|
454 |
|
3fc94e7c7056
add xmlnode_get_data_unescaped(), and got rid of an unecessary realloc
Nathan Walp <nwalp@pidgin.im>
parents:
17457
diff
changeset
|
455 g_free(escaped); |
|
3fc94e7c7056
add xmlnode_get_data_unescaped(), and got rid of an unecessary realloc
Nathan Walp <nwalp@pidgin.im>
parents:
17457
diff
changeset
|
456 |
|
3fc94e7c7056
add xmlnode_get_data_unescaped(), and got rid of an unecessary realloc
Nathan Walp <nwalp@pidgin.im>
parents:
17457
diff
changeset
|
457 return unescaped; |
|
3fc94e7c7056
add xmlnode_get_data_unescaped(), and got rid of an unecessary realloc
Nathan Walp <nwalp@pidgin.im>
parents:
17457
diff
changeset
|
458 } |
|
3fc94e7c7056
add xmlnode_get_data_unescaped(), and got rid of an unecessary realloc
Nathan Walp <nwalp@pidgin.im>
parents:
17457
diff
changeset
|
459 |
|
21285
78f3361f5e62
make our xmlnode preserve prefixes
Ka-Hing Cheung <khc@hxbc.us>
parents:
20336
diff
changeset
|
460 static void |
|
78f3361f5e62
make our xmlnode preserve prefixes
Ka-Hing Cheung <khc@hxbc.us>
parents:
20336
diff
changeset
|
461 xmlnode_to_str_foreach_append_ns(const char *key, const char *value, |
|
78f3361f5e62
make our xmlnode preserve prefixes
Ka-Hing Cheung <khc@hxbc.us>
parents:
20336
diff
changeset
|
462 GString *buf) |
|
78f3361f5e62
make our xmlnode preserve prefixes
Ka-Hing Cheung <khc@hxbc.us>
parents:
20336
diff
changeset
|
463 { |
|
78f3361f5e62
make our xmlnode preserve prefixes
Ka-Hing Cheung <khc@hxbc.us>
parents:
20336
diff
changeset
|
464 if (*key) { |
|
78f3361f5e62
make our xmlnode preserve prefixes
Ka-Hing Cheung <khc@hxbc.us>
parents:
20336
diff
changeset
|
465 g_string_append_printf(buf, " xmlns:%s='%s'", key, value); |
|
78f3361f5e62
make our xmlnode preserve prefixes
Ka-Hing Cheung <khc@hxbc.us>
parents:
20336
diff
changeset
|
466 } else { |
|
78f3361f5e62
make our xmlnode preserve prefixes
Ka-Hing Cheung <khc@hxbc.us>
parents:
20336
diff
changeset
|
467 g_string_append_printf(buf, " xmlns='%s'", value); |
|
78f3361f5e62
make our xmlnode preserve prefixes
Ka-Hing Cheung <khc@hxbc.us>
parents:
20336
diff
changeset
|
468 } |
|
78f3361f5e62
make our xmlnode preserve prefixes
Ka-Hing Cheung <khc@hxbc.us>
parents:
20336
diff
changeset
|
469 } |
|
78f3361f5e62
make our xmlnode preserve prefixes
Ka-Hing Cheung <khc@hxbc.us>
parents:
20336
diff
changeset
|
470 |
|
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
471 static char * |
|
25414
efde7e6ed5f2
There's no reason for these to not be const is there? This doesn't
Mark Doliner <mark@kingant.net>
parents:
24866
diff
changeset
|
472 xmlnode_to_str_helper(const xmlnode *node, int *len, gboolean formatting, int depth) |
|
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
473 { |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
474 GString *text = g_string_new(""); |
|
21285
78f3361f5e62
make our xmlnode preserve prefixes
Ka-Hing Cheung <khc@hxbc.us>
parents:
20336
diff
changeset
|
475 const char *prefix; |
|
25414
efde7e6ed5f2
There's no reason for these to not be const is there? This doesn't
Mark Doliner <mark@kingant.net>
parents:
24866
diff
changeset
|
476 const xmlnode *c; |
|
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
477 char *node_name, *esc, *esc2, *tab = NULL; |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
478 gboolean need_end = FALSE, pretty = formatting; |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
479 |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
480 g_return_val_if_fail(node != NULL, NULL); |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
481 |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
482 if(pretty && depth) { |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
483 tab = g_strnfill(depth, '\t'); |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
484 text = g_string_append(text, tab); |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
485 } |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
486 |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
487 node_name = g_markup_escape_text(node->name, -1); |
|
21285
78f3361f5e62
make our xmlnode preserve prefixes
Ka-Hing Cheung <khc@hxbc.us>
parents:
20336
diff
changeset
|
488 prefix = xmlnode_get_prefix(node); |
|
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
489 |
|
21285
78f3361f5e62
make our xmlnode preserve prefixes
Ka-Hing Cheung <khc@hxbc.us>
parents:
20336
diff
changeset
|
490 if (prefix) { |
|
78f3361f5e62
make our xmlnode preserve prefixes
Ka-Hing Cheung <khc@hxbc.us>
parents:
20336
diff
changeset
|
491 g_string_append_printf(text, "<%s:%s", prefix, node_name); |
|
78f3361f5e62
make our xmlnode preserve prefixes
Ka-Hing Cheung <khc@hxbc.us>
parents:
20336
diff
changeset
|
492 } else { |
|
78f3361f5e62
make our xmlnode preserve prefixes
Ka-Hing Cheung <khc@hxbc.us>
parents:
20336
diff
changeset
|
493 g_string_append_printf(text, "<%s", node_name); |
|
78f3361f5e62
make our xmlnode preserve prefixes
Ka-Hing Cheung <khc@hxbc.us>
parents:
20336
diff
changeset
|
494 } |
|
78f3361f5e62
make our xmlnode preserve prefixes
Ka-Hing Cheung <khc@hxbc.us>
parents:
20336
diff
changeset
|
495 |
|
78f3361f5e62
make our xmlnode preserve prefixes
Ka-Hing Cheung <khc@hxbc.us>
parents:
20336
diff
changeset
|
496 if (node->namespace_map) { |
|
78f3361f5e62
make our xmlnode preserve prefixes
Ka-Hing Cheung <khc@hxbc.us>
parents:
20336
diff
changeset
|
497 g_hash_table_foreach(node->namespace_map, |
|
78f3361f5e62
make our xmlnode preserve prefixes
Ka-Hing Cheung <khc@hxbc.us>
parents:
20336
diff
changeset
|
498 (GHFunc)xmlnode_to_str_foreach_append_ns, text); |
|
78f3361f5e62
make our xmlnode preserve prefixes
Ka-Hing Cheung <khc@hxbc.us>
parents:
20336
diff
changeset
|
499 } else if (node->xmlns) { |
|
25894
a6e3cb32cdd2
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 <paul@darkrain42.org>
parents:
25890
diff
changeset
|
500 if(!node->parent || !purple_strequal(node->xmlns, node->parent->xmlns)) |
|
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
501 { |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
502 char *xmlns = g_markup_escape_text(node->xmlns, -1); |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
503 g_string_append_printf(text, " xmlns='%s'", xmlns); |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
504 g_free(xmlns); |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
505 } |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
506 } |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
507 for(c = node->child; c; c = c->next) |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
508 { |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
509 if(c->type == XMLNODE_TYPE_ATTRIB) { |
|
21285
78f3361f5e62
make our xmlnode preserve prefixes
Ka-Hing Cheung <khc@hxbc.us>
parents:
20336
diff
changeset
|
510 const char *aprefix = xmlnode_get_prefix(c); |
|
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
511 esc = g_markup_escape_text(c->name, -1); |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
512 esc2 = g_markup_escape_text(c->data, -1); |
|
21285
78f3361f5e62
make our xmlnode preserve prefixes
Ka-Hing Cheung <khc@hxbc.us>
parents:
20336
diff
changeset
|
513 if (aprefix) { |
|
78f3361f5e62
make our xmlnode preserve prefixes
Ka-Hing Cheung <khc@hxbc.us>
parents:
20336
diff
changeset
|
514 g_string_append_printf(text, " %s:%s='%s'", aprefix, esc, esc2); |
|
78f3361f5e62
make our xmlnode preserve prefixes
Ka-Hing Cheung <khc@hxbc.us>
parents:
20336
diff
changeset
|
515 } else { |
|
78f3361f5e62
make our xmlnode preserve prefixes
Ka-Hing Cheung <khc@hxbc.us>
parents:
20336
diff
changeset
|
516 g_string_append_printf(text, " %s='%s'", esc, esc2); |
|
78f3361f5e62
make our xmlnode preserve prefixes
Ka-Hing Cheung <khc@hxbc.us>
parents:
20336
diff
changeset
|
517 } |
|
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
518 g_free(esc); |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
519 g_free(esc2); |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
520 } else if(c->type == XMLNODE_TYPE_TAG || c->type == XMLNODE_TYPE_DATA) { |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
521 if(c->type == XMLNODE_TYPE_DATA) |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
522 pretty = FALSE; |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
523 need_end = TRUE; |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
524 } |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
525 } |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
526 |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
527 if(need_end) { |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
528 g_string_append_printf(text, ">%s", pretty ? NEWLINE_S : ""); |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
529 |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
530 for(c = node->child; c; c = c->next) |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
531 { |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
532 if(c->type == XMLNODE_TYPE_TAG) { |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
533 int esc_len; |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
534 esc = xmlnode_to_str_helper(c, &esc_len, pretty, depth+1); |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
535 text = g_string_append_len(text, esc, esc_len); |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
536 g_free(esc); |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
537 } else if(c->type == XMLNODE_TYPE_DATA && c->data_sz > 0) { |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
538 esc = g_markup_escape_text(c->data, c->data_sz); |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
539 text = g_string_append(text, esc); |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
540 g_free(esc); |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
541 } |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
542 } |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
543 |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
544 if(tab && pretty) |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
545 text = g_string_append(text, tab); |
|
21285
78f3361f5e62
make our xmlnode preserve prefixes
Ka-Hing Cheung <khc@hxbc.us>
parents:
20336
diff
changeset
|
546 if (prefix) { |
|
78f3361f5e62
make our xmlnode preserve prefixes
Ka-Hing Cheung <khc@hxbc.us>
parents:
20336
diff
changeset
|
547 g_string_append_printf(text, "</%s:%s>%s", prefix, node_name, formatting ? NEWLINE_S : ""); |
|
78f3361f5e62
make our xmlnode preserve prefixes
Ka-Hing Cheung <khc@hxbc.us>
parents:
20336
diff
changeset
|
548 } else { |
|
78f3361f5e62
make our xmlnode preserve prefixes
Ka-Hing Cheung <khc@hxbc.us>
parents:
20336
diff
changeset
|
549 g_string_append_printf(text, "</%s>%s", node_name, formatting ? NEWLINE_S : ""); |
|
78f3361f5e62
make our xmlnode preserve prefixes
Ka-Hing Cheung <khc@hxbc.us>
parents:
20336
diff
changeset
|
550 } |
|
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
551 } else { |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
552 g_string_append_printf(text, "/>%s", formatting ? NEWLINE_S : ""); |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
553 } |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
554 |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
555 g_free(node_name); |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
556 |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
557 g_free(tab); |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
558 |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
559 if(len) |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
560 *len = text->len; |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
561 |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
562 return g_string_free(text, FALSE); |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
563 } |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
564 |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
565 char * |
|
25414
efde7e6ed5f2
There's no reason for these to not be const is there? This doesn't
Mark Doliner <mark@kingant.net>
parents:
24866
diff
changeset
|
566 xmlnode_to_str(const xmlnode *node, int *len) |
|
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
567 { |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
568 return xmlnode_to_str_helper(node, len, FALSE, 0); |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
569 } |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
570 |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
571 char * |
|
25414
efde7e6ed5f2
There's no reason for these to not be const is there? This doesn't
Mark Doliner <mark@kingant.net>
parents:
24866
diff
changeset
|
572 xmlnode_to_formatted_str(const xmlnode *node, int *len) |
|
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
573 { |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
574 char *xml, *xml_with_declaration; |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
575 |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
576 g_return_val_if_fail(node != NULL, NULL); |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
577 |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
578 xml = xmlnode_to_str_helper(node, len, TRUE, 0); |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
579 xml_with_declaration = |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
580 g_strdup_printf("<?xml version='1.0' encoding='UTF-8' ?>" NEWLINE_S NEWLINE_S "%s", xml); |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
581 g_free(xml); |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
582 |
|
21955
feb92c44db87
Patch from QuLogic to correctly set the length. Closes #4515.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
21942
diff
changeset
|
583 if (len) |
|
feb92c44db87
Patch from QuLogic to correctly set the length. Closes #4515.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
21942
diff
changeset
|
584 *len += sizeof("<?xml version='1.0' encoding='UTF-8' ?>" NEWLINE_S NEWLINE_S) - 1; |
|
feb92c44db87
Patch from QuLogic to correctly set the length. Closes #4515.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
21942
diff
changeset
|
585 |
|
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
586 return xml_with_declaration; |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
587 } |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
588 |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
589 struct _xmlnode_parser_data { |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
590 xmlnode *current; |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
591 gboolean error; |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
592 }; |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
593 |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
594 static void |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
595 xmlnode_parser_element_start_libxml(void *user_data, |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
596 const xmlChar *element_name, const xmlChar *prefix, const xmlChar *xmlns, |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
597 int nb_namespaces, const xmlChar **namespaces, |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
598 int nb_attributes, int nb_defaulted, const xmlChar **attributes) |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
599 { |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
600 struct _xmlnode_parser_data *xpd = user_data; |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
601 xmlnode *node; |
|
21285
78f3361f5e62
make our xmlnode preserve prefixes
Ka-Hing Cheung <khc@hxbc.us>
parents:
20336
diff
changeset
|
602 int i, j; |
|
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
603 |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
604 if(!element_name || xpd->error) { |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
605 return; |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
606 } else { |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
607 if(xpd->current) |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
608 node = xmlnode_new_child(xpd->current, (const char*) element_name); |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
609 else |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
610 node = xmlnode_new((const char *) element_name); |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
611 |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
612 xmlnode_set_namespace(node, (const char *) xmlns); |
|
21285
78f3361f5e62
make our xmlnode preserve prefixes
Ka-Hing Cheung <khc@hxbc.us>
parents:
20336
diff
changeset
|
613 xmlnode_set_prefix(node, (const char *)prefix); |
|
78f3361f5e62
make our xmlnode preserve prefixes
Ka-Hing Cheung <khc@hxbc.us>
parents:
20336
diff
changeset
|
614 |
|
78f3361f5e62
make our xmlnode preserve prefixes
Ka-Hing Cheung <khc@hxbc.us>
parents:
20336
diff
changeset
|
615 if (nb_namespaces != 0) { |
|
78f3361f5e62
make our xmlnode preserve prefixes
Ka-Hing Cheung <khc@hxbc.us>
parents:
20336
diff
changeset
|
616 node->namespace_map = g_hash_table_new_full( |
|
78f3361f5e62
make our xmlnode preserve prefixes
Ka-Hing Cheung <khc@hxbc.us>
parents:
20336
diff
changeset
|
617 g_str_hash, g_str_equal, g_free, g_free); |
|
78f3361f5e62
make our xmlnode preserve prefixes
Ka-Hing Cheung <khc@hxbc.us>
parents:
20336
diff
changeset
|
618 |
|
78f3361f5e62
make our xmlnode preserve prefixes
Ka-Hing Cheung <khc@hxbc.us>
parents:
20336
diff
changeset
|
619 for (i = 0, j = 0; i < nb_namespaces; i++, j += 2) { |
|
78f3361f5e62
make our xmlnode preserve prefixes
Ka-Hing Cheung <khc@hxbc.us>
parents:
20336
diff
changeset
|
620 const char *key = (const char *)namespaces[j]; |
|
78f3361f5e62
make our xmlnode preserve prefixes
Ka-Hing Cheung <khc@hxbc.us>
parents:
20336
diff
changeset
|
621 const char *val = (const char *)namespaces[j + 1]; |
|
78f3361f5e62
make our xmlnode preserve prefixes
Ka-Hing Cheung <khc@hxbc.us>
parents:
20336
diff
changeset
|
622 g_hash_table_insert(node->namespace_map, |
|
78f3361f5e62
make our xmlnode preserve prefixes
Ka-Hing Cheung <khc@hxbc.us>
parents:
20336
diff
changeset
|
623 g_strdup(key ? key : ""), g_strdup(val ? val : "")); |
|
78f3361f5e62
make our xmlnode preserve prefixes
Ka-Hing Cheung <khc@hxbc.us>
parents:
20336
diff
changeset
|
624 } |
|
78f3361f5e62
make our xmlnode preserve prefixes
Ka-Hing Cheung <khc@hxbc.us>
parents:
20336
diff
changeset
|
625 } |
|
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
626 |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
627 for(i=0; i < nb_attributes * 5; i+=5) { |
|
26180
b03430dae08e
Add xmlnode_set_attrib_full that enables you to set an attribute with both
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25947
diff
changeset
|
628 const char *name = (const char *)attributes[i]; |
|
b03430dae08e
Add xmlnode_set_attrib_full that enables you to set an attribute with both
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25947
diff
changeset
|
629 const char *prefix = (const char *)attributes[i+1]; |
|
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
630 char *txt; |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
631 int attrib_len = attributes[i+4] - attributes[i+3]; |
| 28739 | 632 char *attrib = g_strndup((const char *)attributes[i+3], attrib_len); |
|
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
633 txt = attrib; |
|
29006
e1c01f236674
Correctly parse "<br>" in an XML attribute. Closes #11318.
Paul Aurich <paul@darkrain42.org>
parents:
28739
diff
changeset
|
634 attrib = purple_unescape_text(txt); |
|
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
635 g_free(txt); |
|
26180
b03430dae08e
Add xmlnode_set_attrib_full that enables you to set an attribute with both
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
25947
diff
changeset
|
636 xmlnode_set_attrib_full(node, name, NULL, prefix, attrib); |
|
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
637 g_free(attrib); |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
638 } |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
639 |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
640 xpd->current = node; |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
641 } |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
642 } |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
643 |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
644 static void |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
645 xmlnode_parser_element_end_libxml(void *user_data, const xmlChar *element_name, |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
646 const xmlChar *prefix, const xmlChar *xmlns) |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
647 { |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
648 struct _xmlnode_parser_data *xpd = user_data; |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
649 |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
650 if(!element_name || !xpd->current || xpd->error) |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
651 return; |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
652 |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
653 if(xpd->current->parent) { |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
654 if(!xmlStrcmp((xmlChar*) xpd->current->name, element_name)) |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
655 xpd->current = xpd->current->parent; |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
656 } |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
657 } |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
658 |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
659 static void |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
660 xmlnode_parser_element_text_libxml(void *user_data, const xmlChar *text, int text_len) |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
661 { |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
662 struct _xmlnode_parser_data *xpd = user_data; |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
663 |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
664 if(!xpd->current || xpd->error) |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
665 return; |
|
25924
584063555949
Remove trailing whitespace
Mark Doliner <mark@kingant.net>
parents:
25894
diff
changeset
|
666 |
|
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
667 if(!text || !text_len) |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
668 return; |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
669 |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
670 xmlnode_insert_data(xpd->current, (const char*) text, text_len); |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
671 } |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
672 |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
673 static void |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
674 xmlnode_parser_error_libxml(void *user_data, const char *msg, ...) |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
675 { |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
676 struct _xmlnode_parser_data *xpd = user_data; |
|
19643
077c2df60c38
Print an error when there was a problem parsing some XML
Mark Doliner <mark@kingant.net>
parents:
19388
diff
changeset
|
677 char errmsg[2048]; |
|
077c2df60c38
Print an error when there was a problem parsing some XML
Mark Doliner <mark@kingant.net>
parents:
19388
diff
changeset
|
678 va_list args; |
|
077c2df60c38
Print an error when there was a problem parsing some XML
Mark Doliner <mark@kingant.net>
parents:
19388
diff
changeset
|
679 |
|
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
680 xpd->error = TRUE; |
|
19643
077c2df60c38
Print an error when there was a problem parsing some XML
Mark Doliner <mark@kingant.net>
parents:
19388
diff
changeset
|
681 |
|
077c2df60c38
Print an error when there was a problem parsing some XML
Mark Doliner <mark@kingant.net>
parents:
19388
diff
changeset
|
682 va_start(args, msg); |
|
077c2df60c38
Print an error when there was a problem parsing some XML
Mark Doliner <mark@kingant.net>
parents:
19388
diff
changeset
|
683 vsnprintf(errmsg, sizeof(errmsg), msg, args); |
|
077c2df60c38
Print an error when there was a problem parsing some XML
Mark Doliner <mark@kingant.net>
parents:
19388
diff
changeset
|
684 va_end(args); |
|
077c2df60c38
Print an error when there was a problem parsing some XML
Mark Doliner <mark@kingant.net>
parents:
19388
diff
changeset
|
685 |
|
24866
667b8ae0fcee
Error messages from libxml contain their own newlines
Mark Doliner <mark@kingant.net>
parents:
24418
diff
changeset
|
686 purple_debug_error("xmlnode", "Error parsing xml file: %s", errmsg); |
|
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
687 } |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
688 |
|
25586
f424f26dd329
*** Plucked rev d34a1589 (darkrain42@pidgin.im):
Paul Aurich <paul@darkrain42.org>
parents:
25414
diff
changeset
|
689 static void |
|
f424f26dd329
*** Plucked rev d34a1589 (darkrain42@pidgin.im):
Paul Aurich <paul@darkrain42.org>
parents:
25414
diff
changeset
|
690 xmlnode_parser_structural_error_libxml(void *user_data, xmlErrorPtr error) |
|
f424f26dd329
*** Plucked rev d34a1589 (darkrain42@pidgin.im):
Paul Aurich <paul@darkrain42.org>
parents:
25414
diff
changeset
|
691 { |
|
f424f26dd329
*** Plucked rev d34a1589 (darkrain42@pidgin.im):
Paul Aurich <paul@darkrain42.org>
parents:
25414
diff
changeset
|
692 struct _xmlnode_parser_data *xpd = user_data; |
|
f424f26dd329
*** Plucked rev d34a1589 (darkrain42@pidgin.im):
Paul Aurich <paul@darkrain42.org>
parents:
25414
diff
changeset
|
693 |
|
f424f26dd329
*** Plucked rev d34a1589 (darkrain42@pidgin.im):
Paul Aurich <paul@darkrain42.org>
parents:
25414
diff
changeset
|
694 if (error && (error->level == XML_ERR_ERROR || |
|
f424f26dd329
*** Plucked rev d34a1589 (darkrain42@pidgin.im):
Paul Aurich <paul@darkrain42.org>
parents:
25414
diff
changeset
|
695 error->level == XML_ERR_FATAL)) { |
|
f424f26dd329
*** Plucked rev d34a1589 (darkrain42@pidgin.im):
Paul Aurich <paul@darkrain42.org>
parents:
25414
diff
changeset
|
696 xpd->error = TRUE; |
|
f424f26dd329
*** Plucked rev d34a1589 (darkrain42@pidgin.im):
Paul Aurich <paul@darkrain42.org>
parents:
25414
diff
changeset
|
697 purple_debug_error("xmlnode", "XML parser error for xmlnode %p: " |
|
f424f26dd329
*** Plucked rev d34a1589 (darkrain42@pidgin.im):
Paul Aurich <paul@darkrain42.org>
parents:
25414
diff
changeset
|
698 "Domain %i, code %i, level %i: %s", |
|
f424f26dd329
*** Plucked rev d34a1589 (darkrain42@pidgin.im):
Paul Aurich <paul@darkrain42.org>
parents:
25414
diff
changeset
|
699 user_data, error->domain, error->code, error->level, |
|
f424f26dd329
*** Plucked rev d34a1589 (darkrain42@pidgin.im):
Paul Aurich <paul@darkrain42.org>
parents:
25414
diff
changeset
|
700 error->message ? error->message : "(null)\n"); |
|
f424f26dd329
*** Plucked rev d34a1589 (darkrain42@pidgin.im):
Paul Aurich <paul@darkrain42.org>
parents:
25414
diff
changeset
|
701 } else if (error) |
|
f424f26dd329
*** Plucked rev d34a1589 (darkrain42@pidgin.im):
Paul Aurich <paul@darkrain42.org>
parents:
25414
diff
changeset
|
702 purple_debug_warning("xmlnode", "XML parser error for xmlnode %p: " |
|
f424f26dd329
*** Plucked rev d34a1589 (darkrain42@pidgin.im):
Paul Aurich <paul@darkrain42.org>
parents:
25414
diff
changeset
|
703 "Domain %i, code %i, level %i: %s", |
|
f424f26dd329
*** Plucked rev d34a1589 (darkrain42@pidgin.im):
Paul Aurich <paul@darkrain42.org>
parents:
25414
diff
changeset
|
704 user_data, error->domain, error->code, error->level, |
|
f424f26dd329
*** Plucked rev d34a1589 (darkrain42@pidgin.im):
Paul Aurich <paul@darkrain42.org>
parents:
25414
diff
changeset
|
705 error->message ? error->message : "(null)\n"); |
|
f424f26dd329
*** Plucked rev d34a1589 (darkrain42@pidgin.im):
Paul Aurich <paul@darkrain42.org>
parents:
25414
diff
changeset
|
706 else |
|
f424f26dd329
*** Plucked rev d34a1589 (darkrain42@pidgin.im):
Paul Aurich <paul@darkrain42.org>
parents:
25414
diff
changeset
|
707 purple_debug_warning("xmlnode", "XML parser error for xmlnode %p\n", |
|
f424f26dd329
*** Plucked rev d34a1589 (darkrain42@pidgin.im):
Paul Aurich <paul@darkrain42.org>
parents:
25414
diff
changeset
|
708 user_data); |
|
f424f26dd329
*** Plucked rev d34a1589 (darkrain42@pidgin.im):
Paul Aurich <paul@darkrain42.org>
parents:
25414
diff
changeset
|
709 } |
|
f424f26dd329
*** Plucked rev d34a1589 (darkrain42@pidgin.im):
Paul Aurich <paul@darkrain42.org>
parents:
25414
diff
changeset
|
710 |
|
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
711 static xmlSAXHandler xmlnode_parser_libxml = { |
|
17457
905d69a0ffd7
Kill a C99 struct initialization.
Richard Laager <rlaager@wiktel.com>
parents:
15916
diff
changeset
|
712 NULL, /* internalSubset */ |
|
905d69a0ffd7
Kill a C99 struct initialization.
Richard Laager <rlaager@wiktel.com>
parents:
15916
diff
changeset
|
713 NULL, /* isStandalone */ |
|
905d69a0ffd7
Kill a C99 struct initialization.
Richard Laager <rlaager@wiktel.com>
parents:
15916
diff
changeset
|
714 NULL, /* hasInternalSubset */ |
|
905d69a0ffd7
Kill a C99 struct initialization.
Richard Laager <rlaager@wiktel.com>
parents:
15916
diff
changeset
|
715 NULL, /* hasExternalSubset */ |
|
905d69a0ffd7
Kill a C99 struct initialization.
Richard Laager <rlaager@wiktel.com>
parents:
15916
diff
changeset
|
716 NULL, /* resolveEntity */ |
|
905d69a0ffd7
Kill a C99 struct initialization.
Richard Laager <rlaager@wiktel.com>
parents:
15916
diff
changeset
|
717 NULL, /* getEntity */ |
|
905d69a0ffd7
Kill a C99 struct initialization.
Richard Laager <rlaager@wiktel.com>
parents:
15916
diff
changeset
|
718 NULL, /* entityDecl */ |
|
905d69a0ffd7
Kill a C99 struct initialization.
Richard Laager <rlaager@wiktel.com>
parents:
15916
diff
changeset
|
719 NULL, /* notationDecl */ |
|
905d69a0ffd7
Kill a C99 struct initialization.
Richard Laager <rlaager@wiktel.com>
parents:
15916
diff
changeset
|
720 NULL, /* attributeDecl */ |
|
905d69a0ffd7
Kill a C99 struct initialization.
Richard Laager <rlaager@wiktel.com>
parents:
15916
diff
changeset
|
721 NULL, /* elementDecl */ |
|
905d69a0ffd7
Kill a C99 struct initialization.
Richard Laager <rlaager@wiktel.com>
parents:
15916
diff
changeset
|
722 NULL, /* unparsedEntityDecl */ |
|
905d69a0ffd7
Kill a C99 struct initialization.
Richard Laager <rlaager@wiktel.com>
parents:
15916
diff
changeset
|
723 NULL, /* setDocumentLocator */ |
|
905d69a0ffd7
Kill a C99 struct initialization.
Richard Laager <rlaager@wiktel.com>
parents:
15916
diff
changeset
|
724 NULL, /* startDocument */ |
|
905d69a0ffd7
Kill a C99 struct initialization.
Richard Laager <rlaager@wiktel.com>
parents:
15916
diff
changeset
|
725 NULL, /* endDocument */ |
|
905d69a0ffd7
Kill a C99 struct initialization.
Richard Laager <rlaager@wiktel.com>
parents:
15916
diff
changeset
|
726 NULL, /* startElement */ |
|
905d69a0ffd7
Kill a C99 struct initialization.
Richard Laager <rlaager@wiktel.com>
parents:
15916
diff
changeset
|
727 NULL, /* endElement */ |
|
905d69a0ffd7
Kill a C99 struct initialization.
Richard Laager <rlaager@wiktel.com>
parents:
15916
diff
changeset
|
728 NULL, /* reference */ |
|
905d69a0ffd7
Kill a C99 struct initialization.
Richard Laager <rlaager@wiktel.com>
parents:
15916
diff
changeset
|
729 xmlnode_parser_element_text_libxml, /* characters */ |
|
905d69a0ffd7
Kill a C99 struct initialization.
Richard Laager <rlaager@wiktel.com>
parents:
15916
diff
changeset
|
730 NULL, /* ignorableWhitespace */ |
|
905d69a0ffd7
Kill a C99 struct initialization.
Richard Laager <rlaager@wiktel.com>
parents:
15916
diff
changeset
|
731 NULL, /* processingInstruction */ |
|
905d69a0ffd7
Kill a C99 struct initialization.
Richard Laager <rlaager@wiktel.com>
parents:
15916
diff
changeset
|
732 NULL, /* comment */ |
|
905d69a0ffd7
Kill a C99 struct initialization.
Richard Laager <rlaager@wiktel.com>
parents:
15916
diff
changeset
|
733 NULL, /* warning */ |
|
905d69a0ffd7
Kill a C99 struct initialization.
Richard Laager <rlaager@wiktel.com>
parents:
15916
diff
changeset
|
734 xmlnode_parser_error_libxml, /* error */ |
|
905d69a0ffd7
Kill a C99 struct initialization.
Richard Laager <rlaager@wiktel.com>
parents:
15916
diff
changeset
|
735 NULL, /* fatalError */ |
|
905d69a0ffd7
Kill a C99 struct initialization.
Richard Laager <rlaager@wiktel.com>
parents:
15916
diff
changeset
|
736 NULL, /* getParameterEntity */ |
|
905d69a0ffd7
Kill a C99 struct initialization.
Richard Laager <rlaager@wiktel.com>
parents:
15916
diff
changeset
|
737 NULL, /* cdataBlock */ |
|
905d69a0ffd7
Kill a C99 struct initialization.
Richard Laager <rlaager@wiktel.com>
parents:
15916
diff
changeset
|
738 NULL, /* externalSubset */ |
|
905d69a0ffd7
Kill a C99 struct initialization.
Richard Laager <rlaager@wiktel.com>
parents:
15916
diff
changeset
|
739 XML_SAX2_MAGIC, /* initialized */ |
|
905d69a0ffd7
Kill a C99 struct initialization.
Richard Laager <rlaager@wiktel.com>
parents:
15916
diff
changeset
|
740 NULL, /* _private */ |
|
905d69a0ffd7
Kill a C99 struct initialization.
Richard Laager <rlaager@wiktel.com>
parents:
15916
diff
changeset
|
741 xmlnode_parser_element_start_libxml, /* startElementNs */ |
|
905d69a0ffd7
Kill a C99 struct initialization.
Richard Laager <rlaager@wiktel.com>
parents:
15916
diff
changeset
|
742 xmlnode_parser_element_end_libxml, /* endElementNs */ |
|
25586
f424f26dd329
*** Plucked rev d34a1589 (darkrain42@pidgin.im):
Paul Aurich <paul@darkrain42.org>
parents:
25414
diff
changeset
|
743 xmlnode_parser_structural_error_libxml, /* serror */ |
|
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
744 }; |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
745 |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
746 xmlnode * |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
747 xmlnode_from_str(const char *str, gssize size) |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
748 { |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
749 struct _xmlnode_parser_data *xpd; |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
750 xmlnode *ret; |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
751 gsize real_size; |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
752 |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
753 g_return_val_if_fail(str != NULL, NULL); |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
754 |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
755 real_size = size < 0 ? strlen(str) : size; |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
756 xpd = g_new0(struct _xmlnode_parser_data, 1); |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
757 |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
758 if (xmlSAXUserParseMemory(&xmlnode_parser_libxml, xpd, str, real_size) < 0) { |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
759 while(xpd->current && xpd->current->parent) |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
760 xpd->current = xpd->current->parent; |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
761 if(xpd->current) |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
762 xmlnode_free(xpd->current); |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
763 xpd->current = NULL; |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
764 } |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
765 ret = xpd->current; |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
766 if (xpd->error) { |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
767 ret = NULL; |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
768 if (xpd->current) |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
769 xmlnode_free(xpd->current); |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
770 } |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
771 |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
772 g_free(xpd); |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
773 return ret; |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
774 } |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
775 |
|
25114
2d419a0fc0e4
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
25112
diff
changeset
|
776 xmlnode * |
|
25122
9525fb966efb
theme loader cleanup, and remove a few warnings
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
25114
diff
changeset
|
777 xmlnode_from_file(const char *dir,const char *filename, const char *description, const char *process) |
|
25114
2d419a0fc0e4
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
25112
diff
changeset
|
778 { |
|
2d419a0fc0e4
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
25112
diff
changeset
|
779 gchar *filename_full; |
|
2d419a0fc0e4
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
25112
diff
changeset
|
780 GError *error = NULL; |
|
2d419a0fc0e4
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
25112
diff
changeset
|
781 gchar *contents = NULL; |
|
2d419a0fc0e4
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
25112
diff
changeset
|
782 gsize length; |
|
2d419a0fc0e4
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
25112
diff
changeset
|
783 xmlnode *node = NULL; |
|
2d419a0fc0e4
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
25112
diff
changeset
|
784 |
|
2d419a0fc0e4
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
25112
diff
changeset
|
785 g_return_val_if_fail(dir != NULL, NULL); |
|
2d419a0fc0e4
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
25112
diff
changeset
|
786 |
|
2d419a0fc0e4
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
25112
diff
changeset
|
787 purple_debug_info(process, "Reading file %s from directory %s\n", |
|
2d419a0fc0e4
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
25112
diff
changeset
|
788 filename, dir); |
|
2d419a0fc0e4
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
25112
diff
changeset
|
789 |
|
2d419a0fc0e4
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
25112
diff
changeset
|
790 filename_full = g_build_filename(dir, filename, NULL); |
|
2d419a0fc0e4
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
25112
diff
changeset
|
791 |
|
2d419a0fc0e4
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
25112
diff
changeset
|
792 if (!g_file_test(filename_full, G_FILE_TEST_EXISTS)) |
|
2d419a0fc0e4
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
25112
diff
changeset
|
793 { |
|
2d419a0fc0e4
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
25112
diff
changeset
|
794 purple_debug_info(process, "File %s does not exist (this is not " |
|
2d419a0fc0e4
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
25112
diff
changeset
|
795 "necessarily an error)\n", filename_full); |
|
2d419a0fc0e4
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
25112
diff
changeset
|
796 g_free(filename_full); |
|
2d419a0fc0e4
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
25112
diff
changeset
|
797 return NULL; |
|
2d419a0fc0e4
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
25112
diff
changeset
|
798 } |
|
2d419a0fc0e4
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
25112
diff
changeset
|
799 |
|
2d419a0fc0e4
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
25112
diff
changeset
|
800 if (!g_file_get_contents(filename_full, &contents, &length, &error)) |
|
2d419a0fc0e4
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
25112
diff
changeset
|
801 { |
|
2d419a0fc0e4
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
25112
diff
changeset
|
802 purple_debug_error(process, "Error reading file %s: %s\n", |
|
2d419a0fc0e4
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
25112
diff
changeset
|
803 filename_full, error->message); |
|
2d419a0fc0e4
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
25112
diff
changeset
|
804 g_error_free(error); |
|
2d419a0fc0e4
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
25112
diff
changeset
|
805 } |
|
2d419a0fc0e4
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
25112
diff
changeset
|
806 |
|
2d419a0fc0e4
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
25112
diff
changeset
|
807 if ((contents != NULL) && (length > 0)) |
|
2d419a0fc0e4
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
25112
diff
changeset
|
808 { |
|
2d419a0fc0e4
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
25112
diff
changeset
|
809 node = xmlnode_from_str(contents, length); |
|
2d419a0fc0e4
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
25112
diff
changeset
|
810 |
|
2d419a0fc0e4
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
25112
diff
changeset
|
811 /* If we were unable to parse the file then save its contents to a backup file */ |
|
2d419a0fc0e4
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
25112
diff
changeset
|
812 if (node == NULL) |
|
2d419a0fc0e4
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
25112
diff
changeset
|
813 { |
|
2d419a0fc0e4
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
25112
diff
changeset
|
814 gchar *filename_temp, *filename_temp_full; |
|
2d419a0fc0e4
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
25112
diff
changeset
|
815 |
|
2d419a0fc0e4
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
25112
diff
changeset
|
816 filename_temp = g_strdup_printf("%s~", filename); |
|
2d419a0fc0e4
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
25112
diff
changeset
|
817 filename_temp_full = g_build_filename(dir, filename_temp, NULL); |
|
2d419a0fc0e4
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
25112
diff
changeset
|
818 |
|
2d419a0fc0e4
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
25112
diff
changeset
|
819 purple_debug_error("util", "Error parsing file %s. Renaming old " |
|
2d419a0fc0e4
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
25112
diff
changeset
|
820 "file to %s\n", filename_full, filename_temp); |
|
2d419a0fc0e4
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
25112
diff
changeset
|
821 purple_util_write_data_to_file_absolute(filename_temp_full, contents, length); |
|
2d419a0fc0e4
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
25112
diff
changeset
|
822 |
|
2d419a0fc0e4
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
25112
diff
changeset
|
823 g_free(filename_temp_full); |
|
2d419a0fc0e4
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
25112
diff
changeset
|
824 g_free(filename_temp); |
|
2d419a0fc0e4
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
25112
diff
changeset
|
825 } |
|
2d419a0fc0e4
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
25112
diff
changeset
|
826 |
|
2d419a0fc0e4
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
25112
diff
changeset
|
827 g_free(contents); |
|
2d419a0fc0e4
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
25112
diff
changeset
|
828 } |
|
2d419a0fc0e4
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
25112
diff
changeset
|
829 |
|
2d419a0fc0e4
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
25112
diff
changeset
|
830 /* If we could not parse the file then show the user an error message */ |
|
2d419a0fc0e4
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
25112
diff
changeset
|
831 if (node == NULL) |
|
2d419a0fc0e4
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
25112
diff
changeset
|
832 { |
|
2d419a0fc0e4
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
25112
diff
changeset
|
833 gchar *title, *msg; |
|
2d419a0fc0e4
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
25112
diff
changeset
|
834 title = g_strdup_printf(_("Error Reading %s"), filename); |
|
2d419a0fc0e4
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
25112
diff
changeset
|
835 msg = g_strdup_printf(_("An error was encountered reading your " |
|
2d419a0fc0e4
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
25112
diff
changeset
|
836 "%s. The file has not been loaded, and the old file " |
|
2d419a0fc0e4
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
25112
diff
changeset
|
837 "has been renamed to %s~."), description, filename_full); |
|
2d419a0fc0e4
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
25112
diff
changeset
|
838 purple_notify_error(NULL, NULL, title, msg); |
|
2d419a0fc0e4
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
25112
diff
changeset
|
839 g_free(title); |
|
2d419a0fc0e4
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
25112
diff
changeset
|
840 g_free(msg); |
|
2d419a0fc0e4
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
25112
diff
changeset
|
841 } |
|
2d419a0fc0e4
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
25112
diff
changeset
|
842 |
|
2d419a0fc0e4
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
25112
diff
changeset
|
843 g_free(filename_full); |
|
2d419a0fc0e4
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
25112
diff
changeset
|
844 |
|
2d419a0fc0e4
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
25112
diff
changeset
|
845 return node; |
|
2d419a0fc0e4
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
25112
diff
changeset
|
846 } |
|
2d419a0fc0e4
partially working status icon theme stuff
Justin Rodriguez <ffdragon@soc.pidgin.im>
parents:
25112
diff
changeset
|
847 |
|
23509
c4ec724b3b53
Make sure xmlnode_copy also copies the prefix and namespace_map from
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
21955
diff
changeset
|
848 static void |
|
c4ec724b3b53
Make sure xmlnode_copy also copies the prefix and namespace_map from
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
21955
diff
changeset
|
849 xmlnode_copy_foreach_ns(gpointer key, gpointer value, gpointer user_data) |
|
c4ec724b3b53
Make sure xmlnode_copy also copies the prefix and namespace_map from
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
21955
diff
changeset
|
850 { |
|
c4ec724b3b53
Make sure xmlnode_copy also copies the prefix and namespace_map from
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
21955
diff
changeset
|
851 GHashTable *ret = (GHashTable *)user_data; |
|
c4ec724b3b53
Make sure xmlnode_copy also copies the prefix and namespace_map from
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
21955
diff
changeset
|
852 g_hash_table_insert(ret, g_strdup(key), g_strdup(value)); |
|
c4ec724b3b53
Make sure xmlnode_copy also copies the prefix and namespace_map from
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
21955
diff
changeset
|
853 } |
|
c4ec724b3b53
Make sure xmlnode_copy also copies the prefix and namespace_map from
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
21955
diff
changeset
|
854 |
|
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
855 xmlnode * |
|
15547
c2d75b47198d
sf patch #1647731, from Markus Elfring
Mark Doliner <mark@kingant.net>
parents:
15373
diff
changeset
|
856 xmlnode_copy(const xmlnode *src) |
|
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
857 { |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
858 xmlnode *ret; |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
859 xmlnode *child; |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
860 xmlnode *sibling = NULL; |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
861 |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
862 g_return_val_if_fail(src != NULL, NULL); |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
863 |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
864 ret = new_node(src->name, src->type); |
|
17891
9d02fefaa589
Fixed a bug in xmlnode_copy, it didn't preserve the namespace in the copy.
Andreas Monitzer <pidgin@monitzer.com>
parents:
15916
diff
changeset
|
865 ret->xmlns = g_strdup(src->xmlns); |
|
23509
c4ec724b3b53
Make sure xmlnode_copy also copies the prefix and namespace_map from
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
21955
diff
changeset
|
866 if (src->data) { |
|
c4ec724b3b53
Make sure xmlnode_copy also copies the prefix and namespace_map from
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
21955
diff
changeset
|
867 if (src->data_sz) { |
|
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
868 ret->data = g_memdup(src->data, src->data_sz); |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
869 ret->data_sz = src->data_sz; |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
870 } else { |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
871 ret->data = g_strdup(src->data); |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
872 } |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
873 } |
|
23509
c4ec724b3b53
Make sure xmlnode_copy also copies the prefix and namespace_map from
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
21955
diff
changeset
|
874 ret->prefix = g_strdup(src->prefix); |
|
c4ec724b3b53
Make sure xmlnode_copy also copies the prefix and namespace_map from
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
21955
diff
changeset
|
875 if (src->namespace_map) { |
|
c4ec724b3b53
Make sure xmlnode_copy also copies the prefix and namespace_map from
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
21955
diff
changeset
|
876 ret->namespace_map = g_hash_table_new_full(g_str_hash, g_str_equal, |
|
c4ec724b3b53
Make sure xmlnode_copy also copies the prefix and namespace_map from
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
21955
diff
changeset
|
877 g_free, g_free); |
|
c4ec724b3b53
Make sure xmlnode_copy also copies the prefix and namespace_map from
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
21955
diff
changeset
|
878 g_hash_table_foreach(src->namespace_map, xmlnode_copy_foreach_ns, ret->namespace_map); |
|
c4ec724b3b53
Make sure xmlnode_copy also copies the prefix and namespace_map from
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
21955
diff
changeset
|
879 } |
|
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
880 |
|
23509
c4ec724b3b53
Make sure xmlnode_copy also copies the prefix and namespace_map from
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
21955
diff
changeset
|
881 for (child = src->child; child; child = child->next) { |
|
c4ec724b3b53
Make sure xmlnode_copy also copies the prefix and namespace_map from
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
21955
diff
changeset
|
882 if (sibling) { |
|
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
883 sibling->next = xmlnode_copy(child); |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
884 sibling = sibling->next; |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
885 } else { |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
886 ret->child = xmlnode_copy(child); |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
887 sibling = ret->child; |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
888 } |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
889 sibling->parent = ret; |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
890 } |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
891 |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
892 ret->lastchild = sibling; |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
893 |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
894 return ret; |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
895 } |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
896 |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
897 xmlnode * |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
898 xmlnode_get_next_twin(xmlnode *node) |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
899 { |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
900 xmlnode *sibling; |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
901 const char *ns = xmlnode_get_namespace(node); |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
902 |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
903 g_return_val_if_fail(node != NULL, NULL); |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
904 g_return_val_if_fail(node->type == XMLNODE_TYPE_TAG, NULL); |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
905 |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
906 for(sibling = node->next; sibling; sibling = sibling->next) { |
|
20332
3a9709bfde65
applied changes from 4d50bf3b08569aa2108a9f5da47fb1548d0c7dd9
Luke Schierer <lschiere@pidgin.im>
parents:
20074
diff
changeset
|
907 /* XXX: Is it correct to ignore the namespace for the match if none was specified? */ |
|
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
908 const char *xmlns = NULL; |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
909 if(ns) |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
910 xmlns = xmlnode_get_namespace(sibling); |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
911 |
|
25894
a6e3cb32cdd2
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 <paul@darkrain42.org>
parents:
25890
diff
changeset
|
912 if(sibling->type == XMLNODE_TYPE_TAG && purple_strequal(node->name, sibling->name) && |
|
a6e3cb32cdd2
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 <paul@darkrain42.org>
parents:
25890
diff
changeset
|
913 purple_strequal(ns, xmlns)) |
|
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
914 return sibling; |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
915 } |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
916 |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
917 return NULL; |
|
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
918 } |
