Thu, 20 Aug 2009 01:51:37 +0000
Use a GSList here instead of a GQueue. Yay for simplification.
| 6513 | 1 | /* |
| 15884 | 2 | * purple |
| 6513 | 3 | * |
| 4 | * Some code copyright 2003 Tim Ringenbach <omarvo@hotmail.com> | |
| 5 | * (marv on irc.freenode.net) | |
| 6 | * | |
| 7 | * This program is free software; you can redistribute it and/or modify | |
| 8 | * it under the terms of the GNU General Public License as published by | |
| 9 | * the Free Software Foundation; either version 2 of the License, or | |
| 10 | * (at your option) any later version. | |
| 11 | * | |
| 12 | * This program is distributed in the hope that it will be useful, | |
| 13 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 14 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
| 15 | * GNU General Public License for more details. | |
| 16 | * | |
| 17 | * You should have received a copy of the GNU General Public License | |
| 18 | * along with this program; if not, write to the Free Software | |
|
19859
71d37b57eff2
The FSF changed its address a while ago; our files were out of date.
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
19337
diff
changeset
|
19 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA |
| 6513 | 20 | * |
| 21 | */ | |
| 22 | ||
| 23 | #ifdef HAVE_CONFIG_H | |
| 24 | #include "config.h" | |
|
27335
06a805d4e690
Strip trailing whitespace and comment #endif marcos that close #ifdef macros
Mark Doliner <markdoliner@pidgin.im>
parents:
24181
diff
changeset
|
25 | #endif /* HAVE_CONFIG_H */ |
| 6513 | 26 | |
|
10023
6b0014040323
[gaim-migrate @ 10955]
Mark Doliner <markdoliner@pidgin.im>
parents:
9164
diff
changeset
|
27 | #include "debug.h" |
|
6b0014040323
[gaim-migrate @ 10955]
Mark Doliner <markdoliner@pidgin.im>
parents:
9164
diff
changeset
|
28 | #include "internal.h" |
| 6513 | 29 | #include "prpl.h" |
|
10023
6b0014040323
[gaim-migrate @ 10955]
Mark Doliner <markdoliner@pidgin.im>
parents:
9164
diff
changeset
|
30 | |
|
27555
afb7cb5c350c
Update for file renames.
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
27547
diff
changeset
|
31 | #include "libymsg.h" |
| 6513 | 32 | |
|
6546
6a14dfe43d5c
[gaim-migrate @ 7068]
Mark Doliner <markdoliner@pidgin.im>
parents:
6513
diff
changeset
|
33 | #include <string.h> |
|
24181
e028e31dcc67
Do a better job of detecting if the yahoo account is connecting through a HTTP
Daniel Atallah <datallah@pidgin.im>
parents:
23173
diff
changeset
|
34 | |
|
e028e31dcc67
Do a better job of detecting if the yahoo account is connecting through a HTTP
Daniel Atallah <datallah@pidgin.im>
parents:
23173
diff
changeset
|
35 | gboolean |
|
e028e31dcc67
Do a better job of detecting if the yahoo account is connecting through a HTTP
Daniel Atallah <datallah@pidgin.im>
parents:
23173
diff
changeset
|
36 | yahoo_account_use_http_proxy(PurpleConnection *conn) |
|
e028e31dcc67
Do a better job of detecting if the yahoo account is connecting through a HTTP
Daniel Atallah <datallah@pidgin.im>
parents:
23173
diff
changeset
|
37 | { |
|
e028e31dcc67
Do a better job of detecting if the yahoo account is connecting through a HTTP
Daniel Atallah <datallah@pidgin.im>
parents:
23173
diff
changeset
|
38 | PurpleProxyInfo *ppi = purple_proxy_get_setup(conn->account); |
|
e028e31dcc67
Do a better job of detecting if the yahoo account is connecting through a HTTP
Daniel Atallah <datallah@pidgin.im>
parents:
23173
diff
changeset
|
39 | return (ppi->type == PURPLE_PROXY_HTTP || ppi->type == PURPLE_PROXY_USE_ENVVAR); |
|
e028e31dcc67
Do a better job of detecting if the yahoo account is connecting through a HTTP
Daniel Atallah <datallah@pidgin.im>
parents:
23173
diff
changeset
|
40 | } |
|
e028e31dcc67
Do a better job of detecting if the yahoo account is connecting through a HTTP
Daniel Atallah <datallah@pidgin.im>
parents:
23173
diff
changeset
|
41 | |
|
22202
e42ab2e3eba1
This patch from Thanumalayan S. implements Yahoo protocol version 15 file
Thanumalayan Sankaranarayanan <madthanu@gmail.com>
parents:
21946
diff
changeset
|
42 | /* |
|
e42ab2e3eba1
This patch from Thanumalayan S. implements Yahoo protocol version 15 file
Thanumalayan Sankaranarayanan <madthanu@gmail.com>
parents:
21946
diff
changeset
|
43 | * Returns cookies formatted as a null terminated string for the given connection. |
|
e42ab2e3eba1
This patch from Thanumalayan S. implements Yahoo protocol version 15 file
Thanumalayan Sankaranarayanan <madthanu@gmail.com>
parents:
21946
diff
changeset
|
44 | * Must g_free return value. |
|
27335
06a805d4e690
Strip trailing whitespace and comment #endif marcos that close #ifdef macros
Mark Doliner <markdoliner@pidgin.im>
parents:
24181
diff
changeset
|
45 | * |
|
22202
e42ab2e3eba1
This patch from Thanumalayan S. implements Yahoo protocol version 15 file
Thanumalayan Sankaranarayanan <madthanu@gmail.com>
parents:
21946
diff
changeset
|
46 | * TODO:will work, but must test for strict correctness |
|
e42ab2e3eba1
This patch from Thanumalayan S. implements Yahoo protocol version 15 file
Thanumalayan Sankaranarayanan <madthanu@gmail.com>
parents:
21946
diff
changeset
|
47 | */ |
|
e42ab2e3eba1
This patch from Thanumalayan S. implements Yahoo protocol version 15 file
Thanumalayan Sankaranarayanan <madthanu@gmail.com>
parents:
21946
diff
changeset
|
48 | gchar* yahoo_get_cookies(PurpleConnection *gc) |
|
e42ab2e3eba1
This patch from Thanumalayan S. implements Yahoo protocol version 15 file
Thanumalayan Sankaranarayanan <madthanu@gmail.com>
parents:
21946
diff
changeset
|
49 | { |
|
e42ab2e3eba1
This patch from Thanumalayan S. implements Yahoo protocol version 15 file
Thanumalayan Sankaranarayanan <madthanu@gmail.com>
parents:
21946
diff
changeset
|
50 | gchar *ans = NULL; |
|
e42ab2e3eba1
This patch from Thanumalayan S. implements Yahoo protocol version 15 file
Thanumalayan Sankaranarayanan <madthanu@gmail.com>
parents:
21946
diff
changeset
|
51 | gchar *cur; |
|
e42ab2e3eba1
This patch from Thanumalayan S. implements Yahoo protocol version 15 file
Thanumalayan Sankaranarayanan <madthanu@gmail.com>
parents:
21946
diff
changeset
|
52 | char firstflag = 1; |
|
e42ab2e3eba1
This patch from Thanumalayan S. implements Yahoo protocol version 15 file
Thanumalayan Sankaranarayanan <madthanu@gmail.com>
parents:
21946
diff
changeset
|
53 | gchar *t1,*t2,*t3; |
|
e42ab2e3eba1
This patch from Thanumalayan S. implements Yahoo protocol version 15 file
Thanumalayan Sankaranarayanan <madthanu@gmail.com>
parents:
21946
diff
changeset
|
54 | GSList *tmp; |
|
e42ab2e3eba1
This patch from Thanumalayan S. implements Yahoo protocol version 15 file
Thanumalayan Sankaranarayanan <madthanu@gmail.com>
parents:
21946
diff
changeset
|
55 | GSList *cookies; |
|
27959
f842ae57da4e
Move from "struct yahoo_data" to "YahooData" to be consistent with other structs
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
27683
diff
changeset
|
56 | cookies = ((YahooData*)(gc->proto_data))->cookies; |
|
22202
e42ab2e3eba1
This patch from Thanumalayan S. implements Yahoo protocol version 15 file
Thanumalayan Sankaranarayanan <madthanu@gmail.com>
parents:
21946
diff
changeset
|
57 | tmp = cookies; |
|
e42ab2e3eba1
This patch from Thanumalayan S. implements Yahoo protocol version 15 file
Thanumalayan Sankaranarayanan <madthanu@gmail.com>
parents:
21946
diff
changeset
|
58 | while(tmp) |
|
e42ab2e3eba1
This patch from Thanumalayan S. implements Yahoo protocol version 15 file
Thanumalayan Sankaranarayanan <madthanu@gmail.com>
parents:
21946
diff
changeset
|
59 | { |
|
e42ab2e3eba1
This patch from Thanumalayan S. implements Yahoo protocol version 15 file
Thanumalayan Sankaranarayanan <madthanu@gmail.com>
parents:
21946
diff
changeset
|
60 | cur = tmp->data; |
|
e42ab2e3eba1
This patch from Thanumalayan S. implements Yahoo protocol version 15 file
Thanumalayan Sankaranarayanan <madthanu@gmail.com>
parents:
21946
diff
changeset
|
61 | t1 = ans; |
|
e42ab2e3eba1
This patch from Thanumalayan S. implements Yahoo protocol version 15 file
Thanumalayan Sankaranarayanan <madthanu@gmail.com>
parents:
21946
diff
changeset
|
62 | t2 = g_strrstr(cur, ";expires="); |
|
e42ab2e3eba1
This patch from Thanumalayan S. implements Yahoo protocol version 15 file
Thanumalayan Sankaranarayanan <madthanu@gmail.com>
parents:
21946
diff
changeset
|
63 | if(t2 == NULL) |
|
e42ab2e3eba1
This patch from Thanumalayan S. implements Yahoo protocol version 15 file
Thanumalayan Sankaranarayanan <madthanu@gmail.com>
parents:
21946
diff
changeset
|
64 | t2 = g_strrstr(cur, "; expires="); |
|
e42ab2e3eba1
This patch from Thanumalayan S. implements Yahoo protocol version 15 file
Thanumalayan Sankaranarayanan <madthanu@gmail.com>
parents:
21946
diff
changeset
|
65 | if(t2 == NULL) |
|
e42ab2e3eba1
This patch from Thanumalayan S. implements Yahoo protocol version 15 file
Thanumalayan Sankaranarayanan <madthanu@gmail.com>
parents:
21946
diff
changeset
|
66 | { |
|
e42ab2e3eba1
This patch from Thanumalayan S. implements Yahoo protocol version 15 file
Thanumalayan Sankaranarayanan <madthanu@gmail.com>
parents:
21946
diff
changeset
|
67 | if(firstflag) |
|
e42ab2e3eba1
This patch from Thanumalayan S. implements Yahoo protocol version 15 file
Thanumalayan Sankaranarayanan <madthanu@gmail.com>
parents:
21946
diff
changeset
|
68 | ans = g_strdup_printf("%c=%s", cur[0], cur+2); |
|
e42ab2e3eba1
This patch from Thanumalayan S. implements Yahoo protocol version 15 file
Thanumalayan Sankaranarayanan <madthanu@gmail.com>
parents:
21946
diff
changeset
|
69 | else |
|
e42ab2e3eba1
This patch from Thanumalayan S. implements Yahoo protocol version 15 file
Thanumalayan Sankaranarayanan <madthanu@gmail.com>
parents:
21946
diff
changeset
|
70 | ans = g_strdup_printf("%s; %c=%s", t1, cur[0], cur+2); |
|
e42ab2e3eba1
This patch from Thanumalayan S. implements Yahoo protocol version 15 file
Thanumalayan Sankaranarayanan <madthanu@gmail.com>
parents:
21946
diff
changeset
|
71 | } |
|
e42ab2e3eba1
This patch from Thanumalayan S. implements Yahoo protocol version 15 file
Thanumalayan Sankaranarayanan <madthanu@gmail.com>
parents:
21946
diff
changeset
|
72 | else |
|
e42ab2e3eba1
This patch from Thanumalayan S. implements Yahoo protocol version 15 file
Thanumalayan Sankaranarayanan <madthanu@gmail.com>
parents:
21946
diff
changeset
|
73 | { |
|
e42ab2e3eba1
This patch from Thanumalayan S. implements Yahoo protocol version 15 file
Thanumalayan Sankaranarayanan <madthanu@gmail.com>
parents:
21946
diff
changeset
|
74 | t3 = strstr(t2+1, ";"); |
|
e42ab2e3eba1
This patch from Thanumalayan S. implements Yahoo protocol version 15 file
Thanumalayan Sankaranarayanan <madthanu@gmail.com>
parents:
21946
diff
changeset
|
75 | if(t3 != NULL) |
|
e42ab2e3eba1
This patch from Thanumalayan S. implements Yahoo protocol version 15 file
Thanumalayan Sankaranarayanan <madthanu@gmail.com>
parents:
21946
diff
changeset
|
76 | { |
|
e42ab2e3eba1
This patch from Thanumalayan S. implements Yahoo protocol version 15 file
Thanumalayan Sankaranarayanan <madthanu@gmail.com>
parents:
21946
diff
changeset
|
77 | t2[0] = '\0'; |
|
e42ab2e3eba1
This patch from Thanumalayan S. implements Yahoo protocol version 15 file
Thanumalayan Sankaranarayanan <madthanu@gmail.com>
parents:
21946
diff
changeset
|
78 | |
|
e42ab2e3eba1
This patch from Thanumalayan S. implements Yahoo protocol version 15 file
Thanumalayan Sankaranarayanan <madthanu@gmail.com>
parents:
21946
diff
changeset
|
79 | if(firstflag) |
|
e42ab2e3eba1
This patch from Thanumalayan S. implements Yahoo protocol version 15 file
Thanumalayan Sankaranarayanan <madthanu@gmail.com>
parents:
21946
diff
changeset
|
80 | ans = g_strdup_printf("%c=%s%s", cur[0], cur+2, t3); |
|
e42ab2e3eba1
This patch from Thanumalayan S. implements Yahoo protocol version 15 file
Thanumalayan Sankaranarayanan <madthanu@gmail.com>
parents:
21946
diff
changeset
|
81 | else |
|
e42ab2e3eba1
This patch from Thanumalayan S. implements Yahoo protocol version 15 file
Thanumalayan Sankaranarayanan <madthanu@gmail.com>
parents:
21946
diff
changeset
|
82 | ans = g_strdup_printf("%s; %c=%s%s", t1, cur[0], cur+2, t3); |
|
e42ab2e3eba1
This patch from Thanumalayan S. implements Yahoo protocol version 15 file
Thanumalayan Sankaranarayanan <madthanu@gmail.com>
parents:
21946
diff
changeset
|
83 | |
|
e42ab2e3eba1
This patch from Thanumalayan S. implements Yahoo protocol version 15 file
Thanumalayan Sankaranarayanan <madthanu@gmail.com>
parents:
21946
diff
changeset
|
84 | t2[0] = ';'; |
|
e42ab2e3eba1
This patch from Thanumalayan S. implements Yahoo protocol version 15 file
Thanumalayan Sankaranarayanan <madthanu@gmail.com>
parents:
21946
diff
changeset
|
85 | } |
|
e42ab2e3eba1
This patch from Thanumalayan S. implements Yahoo protocol version 15 file
Thanumalayan Sankaranarayanan <madthanu@gmail.com>
parents:
21946
diff
changeset
|
86 | else |
|
e42ab2e3eba1
This patch from Thanumalayan S. implements Yahoo protocol version 15 file
Thanumalayan Sankaranarayanan <madthanu@gmail.com>
parents:
21946
diff
changeset
|
87 | { |
|
e42ab2e3eba1
This patch from Thanumalayan S. implements Yahoo protocol version 15 file
Thanumalayan Sankaranarayanan <madthanu@gmail.com>
parents:
21946
diff
changeset
|
88 | t2[0] = '\0'; |
|
e42ab2e3eba1
This patch from Thanumalayan S. implements Yahoo protocol version 15 file
Thanumalayan Sankaranarayanan <madthanu@gmail.com>
parents:
21946
diff
changeset
|
89 | |
|
e42ab2e3eba1
This patch from Thanumalayan S. implements Yahoo protocol version 15 file
Thanumalayan Sankaranarayanan <madthanu@gmail.com>
parents:
21946
diff
changeset
|
90 | if(firstflag) |
|
e42ab2e3eba1
This patch from Thanumalayan S. implements Yahoo protocol version 15 file
Thanumalayan Sankaranarayanan <madthanu@gmail.com>
parents:
21946
diff
changeset
|
91 | ans = g_strdup_printf("%c=%s", cur[0], cur+2); |
|
e42ab2e3eba1
This patch from Thanumalayan S. implements Yahoo protocol version 15 file
Thanumalayan Sankaranarayanan <madthanu@gmail.com>
parents:
21946
diff
changeset
|
92 | else |
|
e42ab2e3eba1
This patch from Thanumalayan S. implements Yahoo protocol version 15 file
Thanumalayan Sankaranarayanan <madthanu@gmail.com>
parents:
21946
diff
changeset
|
93 | ans = g_strdup_printf("%s; %c=%s", t1, cur[0], cur+2); |
|
e42ab2e3eba1
This patch from Thanumalayan S. implements Yahoo protocol version 15 file
Thanumalayan Sankaranarayanan <madthanu@gmail.com>
parents:
21946
diff
changeset
|
94 | |
|
e42ab2e3eba1
This patch from Thanumalayan S. implements Yahoo protocol version 15 file
Thanumalayan Sankaranarayanan <madthanu@gmail.com>
parents:
21946
diff
changeset
|
95 | t2[0] = ';'; |
|
e42ab2e3eba1
This patch from Thanumalayan S. implements Yahoo protocol version 15 file
Thanumalayan Sankaranarayanan <madthanu@gmail.com>
parents:
21946
diff
changeset
|
96 | } |
|
e42ab2e3eba1
This patch from Thanumalayan S. implements Yahoo protocol version 15 file
Thanumalayan Sankaranarayanan <madthanu@gmail.com>
parents:
21946
diff
changeset
|
97 | } |
|
e42ab2e3eba1
This patch from Thanumalayan S. implements Yahoo protocol version 15 file
Thanumalayan Sankaranarayanan <madthanu@gmail.com>
parents:
21946
diff
changeset
|
98 | if(firstflag) |
|
e42ab2e3eba1
This patch from Thanumalayan S. implements Yahoo protocol version 15 file
Thanumalayan Sankaranarayanan <madthanu@gmail.com>
parents:
21946
diff
changeset
|
99 | firstflag = 0; |
|
e42ab2e3eba1
This patch from Thanumalayan S. implements Yahoo protocol version 15 file
Thanumalayan Sankaranarayanan <madthanu@gmail.com>
parents:
21946
diff
changeset
|
100 | else |
|
e42ab2e3eba1
This patch from Thanumalayan S. implements Yahoo protocol version 15 file
Thanumalayan Sankaranarayanan <madthanu@gmail.com>
parents:
21946
diff
changeset
|
101 | g_free(t1); |
|
e42ab2e3eba1
This patch from Thanumalayan S. implements Yahoo protocol version 15 file
Thanumalayan Sankaranarayanan <madthanu@gmail.com>
parents:
21946
diff
changeset
|
102 | tmp = g_slist_next(tmp); |
|
e42ab2e3eba1
This patch from Thanumalayan S. implements Yahoo protocol version 15 file
Thanumalayan Sankaranarayanan <madthanu@gmail.com>
parents:
21946
diff
changeset
|
103 | } |
|
e42ab2e3eba1
This patch from Thanumalayan S. implements Yahoo protocol version 15 file
Thanumalayan Sankaranarayanan <madthanu@gmail.com>
parents:
21946
diff
changeset
|
104 | return ans; |
|
e42ab2e3eba1
This patch from Thanumalayan S. implements Yahoo protocol version 15 file
Thanumalayan Sankaranarayanan <madthanu@gmail.com>
parents:
21946
diff
changeset
|
105 | } |
|
6546
6a14dfe43d5c
[gaim-migrate @ 7068]
Mark Doliner <markdoliner@pidgin.im>
parents:
6513
diff
changeset
|
106 | |
| 7827 | 107 | /** |
| 108 | * Encode some text to send to the yahoo server. | |
| 109 | * | |
| 110 | * @param gc The connection handle. | |
| 111 | * @param str The null terminated utf8 string to encode. | |
| 112 | * @param utf8 If not @c NULL, whether utf8 is okay or not. | |
| 113 | * Even if it is okay, we may not use it. If we | |
| 114 | * used it, we set this to @c TRUE, else to | |
| 115 | * @c FALSE. If @c NULL, false is assumed, and | |
| 116 | * it is not dereferenced. | |
| 117 | * @return The g_malloced string in the appropriate encoding. | |
| 118 | */ | |
| 15884 | 119 | char *yahoo_string_encode(PurpleConnection *gc, const char *str, gboolean *utf8) |
| 7827 | 120 | { |
|
27959
f842ae57da4e
Move from "struct yahoo_data" to "YahooData" to be consistent with other structs
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
27683
diff
changeset
|
121 | YahooData *yd = gc->proto_data; |
| 7827 | 122 | char *ret; |
|
10504
eae130eefbfe
[gaim-migrate @ 11796]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10380
diff
changeset
|
123 | const char *to_codeset; |
| 7827 | 124 | |
|
23173
c6dde2d2e30e
applied changes from a5e7a62db1d43009f4ff463b7fe67ff3a7275a78
Daniel Atallah <datallah@pidgin.im>
parents:
22289
diff
changeset
|
125 | if (yd->jp) |
|
c6dde2d2e30e
applied changes from a5e7a62db1d43009f4ff463b7fe67ff3a7275a78
Daniel Atallah <datallah@pidgin.im>
parents:
22289
diff
changeset
|
126 | return g_strdup(str); |
| 9164 | 127 | |
| 7827 | 128 | if (utf8 && *utf8) /* FIXME: maybe don't use utf8 if it'll fit in latin1 */ |
| 129 | return g_strdup(str); | |
| 130 | ||
|
23173
c6dde2d2e30e
applied changes from a5e7a62db1d43009f4ff463b7fe67ff3a7275a78
Daniel Atallah <datallah@pidgin.im>
parents:
22289
diff
changeset
|
131 | to_codeset = purple_account_get_string(purple_connection_get_account(gc), "local_charset", "ISO-8859-1"); |
|
c6dde2d2e30e
applied changes from a5e7a62db1d43009f4ff463b7fe67ff3a7275a78
Daniel Atallah <datallah@pidgin.im>
parents:
22289
diff
changeset
|
132 | ret = g_convert_with_fallback(str, -1, to_codeset, "UTF-8", "?", NULL, NULL, NULL); |
| 7827 | 133 | |
| 134 | if (ret) | |
| 135 | return ret; | |
| 136 | else | |
| 137 | return g_strdup(""); | |
| 138 | } | |
| 139 | ||
| 140 | /** | |
| 141 | * Decode some text received from the server. | |
| 142 | * | |
| 143 | * @param gc The gc handle. | |
| 144 | * @param str The null terminated string to decode. | |
| 145 | * @param utf8 Did the server tell us it was supposed to be utf8? | |
| 146 | * @return The decoded, utf-8 string, which must be g_free()'d. | |
| 147 | */ | |
| 15884 | 148 | char *yahoo_string_decode(PurpleConnection *gc, const char *str, gboolean utf8) |
| 7827 | 149 | { |
|
27959
f842ae57da4e
Move from "struct yahoo_data" to "YahooData" to be consistent with other structs
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
27683
diff
changeset
|
150 | YahooData *yd = gc->proto_data; |
| 7827 | 151 | char *ret; |
| 14347 | 152 | const char *from_codeset; |
| 7827 | 153 | |
| 154 | if (utf8) { | |
| 155 | if (g_utf8_validate(str, -1, NULL)) | |
| 156 | return g_strdup(str); | |
| 157 | } | |
| 158 | ||
| 9164 | 159 | if (yd->jp) |
| 160 | from_codeset = "SHIFT_JIS"; | |
| 161 | else | |
| 15884 | 162 | from_codeset = purple_account_get_string(purple_connection_get_account(gc), "local_charset", "ISO-8859-1"); |
| 7827 | 163 | |
|
19337
68471e68386a
Use -1 as length with g_convert() functions instead of strlen()
Daniel Atallah <datallah@pidgin.im>
parents:
16169
diff
changeset
|
164 | ret = g_convert_with_fallback(str, -1, "UTF-8", from_codeset, NULL, NULL, NULL, NULL); |
| 7827 | 165 | |
| 166 | if (ret) | |
| 167 | return ret; | |
| 168 | else | |
| 169 | return g_strdup(""); | |
| 170 | } | |
| 171 | ||
|
22259
bc9fcfd10196
disapproval of revision 'db9b3bc9d4427a6a03d1c25aac5215bf0f8e05ec'
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
22248
diff
changeset
|
172 | char *yahoo_convert_to_numeric(const char *str) |
|
bc9fcfd10196
disapproval of revision 'db9b3bc9d4427a6a03d1c25aac5215bf0f8e05ec'
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
22248
diff
changeset
|
173 | { |
|
22261
e80d3a79f3b8
Since I needed to bring back yahoo_convert_to_numeric, I figured I could at
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
22259
diff
changeset
|
174 | GString *gstr = NULL; |
|
22289
a1f40ee48fa8
Fix (hopefully) the last problem in this function. Refs #3295.
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
22261
diff
changeset
|
175 | const unsigned char *p; |
|
22259
bc9fcfd10196
disapproval of revision 'db9b3bc9d4427a6a03d1c25aac5215bf0f8e05ec'
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
22248
diff
changeset
|
176 | |
|
22261
e80d3a79f3b8
Since I needed to bring back yahoo_convert_to_numeric, I figured I could at
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
22259
diff
changeset
|
177 | gstr = g_string_sized_new(strlen(str) * 6 + 1); |
|
e80d3a79f3b8
Since I needed to bring back yahoo_convert_to_numeric, I figured I could at
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
22259
diff
changeset
|
178 | |
|
22289
a1f40ee48fa8
Fix (hopefully) the last problem in this function. Refs #3295.
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
22261
diff
changeset
|
179 | for (p = (unsigned char *)str; *p; p++) { |
|
22261
e80d3a79f3b8
Since I needed to bring back yahoo_convert_to_numeric, I figured I could at
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
22259
diff
changeset
|
180 | g_string_append_printf(gstr, "&#%u;", *p); |
|
22259
bc9fcfd10196
disapproval of revision 'db9b3bc9d4427a6a03d1c25aac5215bf0f8e05ec'
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
22248
diff
changeset
|
181 | } |
|
22261
e80d3a79f3b8
Since I needed to bring back yahoo_convert_to_numeric, I figured I could at
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
22259
diff
changeset
|
182 | |
| 28009 | 183 | return g_string_free(gstr, FALSE); |
|
22259
bc9fcfd10196
disapproval of revision 'db9b3bc9d4427a6a03d1c25aac5215bf0f8e05ec'
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
22248
diff
changeset
|
184 | } |
|
bc9fcfd10196
disapproval of revision 'db9b3bc9d4427a6a03d1c25aac5215bf0f8e05ec'
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
22248
diff
changeset
|
185 | |
| 6513 | 186 | /* |
|
28093
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
187 | * The values in this hash table should probably be lowercase, since that's |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
188 | * what xhtml expects. Also because yahoo_codes_to_html() does |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
189 | * case-sensitive comparisons. |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
190 | * |
| 6513 | 191 | * I found these on some website but i don't know that they actually |
|
8735
01248ea222d3
[gaim-migrate @ 9490]
Jonathan Champ <royanee@users.sourceforge.net>
parents:
8533
diff
changeset
|
192 | * work (or are supposed to work). I didn't implement them yet. |
|
27335
06a805d4e690
Strip trailing whitespace and comment #endif marcos that close #ifdef macros
Mark Doliner <markdoliner@pidgin.im>
parents:
24181
diff
changeset
|
193 | * |
|
28093
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
194 | * [0;30m ---black |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
195 | * [1;37m ---white |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
196 | * [0;37m ---tan |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
197 | * [0;38m ---light black |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
198 | * [1;39m ---dark blue |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
199 | * [0;32m ---green |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
200 | * [0;33m ---yellow |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
201 | * [0;35m ---pink |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
202 | * [1;35m ---purple |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
203 | * [1;30m ---light blue |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
204 | * [0;31m ---red |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
205 | * [0;34m ---blue |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
206 | * [0;36m ---aqua |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
207 | * (shift+comma)lyellow(shift+period) ---light yellow |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
208 | * (shift+comma)lgreen(shift+period) ---light green |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
209 | * [2;30m <--white out |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
210 | */ |
| 6513 | 211 | |
|
28093
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
212 | static GHashTable *esc_codes_ht = NULL; |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
213 | static GHashTable *tags_ht = NULL; |
| 6513 | 214 | |
| 215 | void yahoo_init_colorht() | |
| 216 | { | |
|
28093
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
217 | if (esc_codes_ht != NULL) |
|
27683
9ee099fab4ee
Don't double-free the color hash table when deinitializing both prpl-yahoo
Mark Doliner <markdoliner@pidgin.im>
parents:
27555
diff
changeset
|
218 | /* Hash table has already been initialized */ |
|
9ee099fab4ee
Don't double-free the color hash table when deinitializing both prpl-yahoo
Mark Doliner <markdoliner@pidgin.im>
parents:
27555
diff
changeset
|
219 | return; |
|
9ee099fab4ee
Don't double-free the color hash table when deinitializing both prpl-yahoo
Mark Doliner <markdoliner@pidgin.im>
parents:
27555
diff
changeset
|
220 | |
|
28093
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
221 | /* Key is the escape code string. Value is the HTML that should be |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
222 | * inserted in place of the escape code. */ |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
223 | esc_codes_ht = g_hash_table_new(g_str_hash, g_str_equal); |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
224 | |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
225 | /* Key is the name of the HTML tag, for example "font" or "/font" |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
226 | * value is the HTML that should be inserted in place of the old tag */ |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
227 | tags_ht = g_hash_table_new(g_str_hash, g_str_equal); |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
228 | |
|
27683
9ee099fab4ee
Don't double-free the color hash table when deinitializing both prpl-yahoo
Mark Doliner <markdoliner@pidgin.im>
parents:
27555
diff
changeset
|
229 | /* the numbers in comments are what gyach uses, but i think they're incorrect */ |
|
28045
dca626985d99
Change yahoo_codes_to_html() to use the same USE_CSS_FORMATTING #define
Mark Doliner <markdoliner@pidgin.im>
parents:
28041
diff
changeset
|
230 | #ifdef USE_CSS_FORMATTING |
|
28093
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
231 | g_hash_table_insert(esc_codes_ht, "30", "<span style=\"color: #000000\">"); /* black */ |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
232 | g_hash_table_insert(esc_codes_ht, "31", "<span style=\"color: #0000FF\">"); /* blue */ |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
233 | g_hash_table_insert(esc_codes_ht, "32", "<span style=\"color: #008080\">"); /* cyan */ /* 00b2b2 */ |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
234 | g_hash_table_insert(esc_codes_ht, "33", "<span style=\"color: #808080\">"); /* gray */ /* 808080 */ |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
235 | g_hash_table_insert(esc_codes_ht, "34", "<span style=\"color: #008000\">"); /* green */ /* 00c200 */ |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
236 | g_hash_table_insert(esc_codes_ht, "35", "<span style=\"color: #FF0080\">"); /* pink */ /* ffafaf */ |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
237 | g_hash_table_insert(esc_codes_ht, "36", "<span style=\"color: #800080\">"); /* purple */ /* b200b2 */ |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
238 | g_hash_table_insert(esc_codes_ht, "37", "<span style=\"color: #FF8000\">"); /* orange */ /* ffff00 */ |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
239 | g_hash_table_insert(esc_codes_ht, "38", "<span style=\"color: #FF0000\">"); /* red */ |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
240 | g_hash_table_insert(esc_codes_ht, "39", "<span style=\"color: #808000\">"); /* olive */ /* 546b50 */ |
|
28045
dca626985d99
Change yahoo_codes_to_html() to use the same USE_CSS_FORMATTING #define
Mark Doliner <markdoliner@pidgin.im>
parents:
28041
diff
changeset
|
241 | #else |
|
28093
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
242 | g_hash_table_insert(esc_codes_ht, "30", "<font color=\"#000000\">"); /* black */ |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
243 | g_hash_table_insert(esc_codes_ht, "31", "<font color=\"#0000FF\">"); /* blue */ |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
244 | g_hash_table_insert(esc_codes_ht, "32", "<font color=\"#008080\">"); /* cyan */ /* 00b2b2 */ |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
245 | g_hash_table_insert(esc_codes_ht, "33", "<font color=\"#808080\">"); /* gray */ /* 808080 */ |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
246 | g_hash_table_insert(esc_codes_ht, "34", "<font color=\"#008000\">"); /* green */ /* 00c200 */ |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
247 | g_hash_table_insert(esc_codes_ht, "35", "<font color=\"#FF0080\">"); /* pink */ /* ffafaf */ |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
248 | g_hash_table_insert(esc_codes_ht, "36", "<font color=\"#800080\">"); /* purple */ /* b200b2 */ |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
249 | g_hash_table_insert(esc_codes_ht, "37", "<font color=\"#FF8000\">"); /* orange */ /* ffff00 */ |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
250 | g_hash_table_insert(esc_codes_ht, "38", "<font color=\"#FF0000\">"); /* red */ |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
251 | g_hash_table_insert(esc_codes_ht, "39", "<font color=\"#808000\">"); /* olive */ /* 546b50 */ |
|
28045
dca626985d99
Change yahoo_codes_to_html() to use the same USE_CSS_FORMATTING #define
Mark Doliner <markdoliner@pidgin.im>
parents:
28041
diff
changeset
|
252 | #endif /* !USE_CSS_FORMATTING */ |
| 6513 | 253 | |
|
28093
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
254 | g_hash_table_insert(esc_codes_ht, "1", "<b>"); |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
255 | g_hash_table_insert(esc_codes_ht, "x1", "</b>"); |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
256 | g_hash_table_insert(esc_codes_ht, "2", "<i>"); |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
257 | g_hash_table_insert(esc_codes_ht, "x2", "</i>"); |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
258 | g_hash_table_insert(esc_codes_ht, "4", "<u>"); |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
259 | g_hash_table_insert(esc_codes_ht, "x4", "</u>"); |
| 6513 | 260 | |
| 6629 | 261 | /* these just tell us the text they surround is supposed |
| 15884 | 262 | * to be a link. purple figures that out on its own so we |
| 6629 | 263 | * just ignore it. |
| 264 | */ | |
|
28093
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
265 | g_hash_table_insert(esc_codes_ht, "l", ""); /* link start */ |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
266 | g_hash_table_insert(esc_codes_ht, "xl", ""); /* link end */ |
| 6629 | 267 | |
|
28045
dca626985d99
Change yahoo_codes_to_html() to use the same USE_CSS_FORMATTING #define
Mark Doliner <markdoliner@pidgin.im>
parents:
28041
diff
changeset
|
268 | #ifdef USE_CSS_FORMATTING |
|
28093
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
269 | g_hash_table_insert(tags_ht, "black", "<span style=\"color: #000000\">"); |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
270 | g_hash_table_insert(tags_ht, "blue", "<span style=\"color: #0000FF\">"); |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
271 | g_hash_table_insert(tags_ht, "cyan", "<span style=\"color: #008284\">"); |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
272 | g_hash_table_insert(tags_ht, "gray", "<span style=\"color: #848284\">"); |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
273 | g_hash_table_insert(tags_ht, "green", "<span style=\"color: #008200\">"); |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
274 | g_hash_table_insert(tags_ht, "pink", "<span style=\"color: #FF0084\">"); |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
275 | g_hash_table_insert(tags_ht, "purple", "<span style=\"color: #840084\">"); |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
276 | g_hash_table_insert(tags_ht, "orange", "<span style=\"color: #FF8000\">"); |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
277 | g_hash_table_insert(tags_ht, "red", "<span style=\"color: #FF0000\">"); |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
278 | g_hash_table_insert(tags_ht, "yellow", "<span style=\"color: #848200\">"); |
| 6513 | 279 | |
|
28093
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
280 | g_hash_table_insert(tags_ht, "/black", "</span>"); |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
281 | g_hash_table_insert(tags_ht, "/blue", "</span>"); |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
282 | g_hash_table_insert(tags_ht, "/cyan", "</span>"); |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
283 | g_hash_table_insert(tags_ht, "/gray", "</span>"); |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
284 | g_hash_table_insert(tags_ht, "/green", "</span>"); |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
285 | g_hash_table_insert(tags_ht, "/pink", "</span>"); |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
286 | g_hash_table_insert(tags_ht, "/purple", "</span>"); |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
287 | g_hash_table_insert(tags_ht, "/orange", "</span>"); |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
288 | g_hash_table_insert(tags_ht, "/red", "</span>"); |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
289 | g_hash_table_insert(tags_ht, "/yellow", "</span>"); |
|
28045
dca626985d99
Change yahoo_codes_to_html() to use the same USE_CSS_FORMATTING #define
Mark Doliner <markdoliner@pidgin.im>
parents:
28041
diff
changeset
|
290 | #else |
|
28093
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
291 | g_hash_table_insert(tags_ht, "black", "<font color=\"#000000\">"); |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
292 | g_hash_table_insert(tags_ht, "blue", "<font color=\"#0000FF\">"); |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
293 | g_hash_table_insert(tags_ht, "cyan", "<font color=\"#008284\">"); |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
294 | g_hash_table_insert(tags_ht, "gray", "<font color=\"#848284\">"); |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
295 | g_hash_table_insert(tags_ht, "green", "<font color=\"#008200\">"); |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
296 | g_hash_table_insert(tags_ht, "pink", "<font color=\"#FF0084\">"); |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
297 | g_hash_table_insert(tags_ht, "purple", "<font color=\"#840084\">"); |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
298 | g_hash_table_insert(tags_ht, "orange", "<font color=\"#FF8000\">"); |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
299 | g_hash_table_insert(tags_ht, "red", "<font color=\"#FF0000\">"); |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
300 | g_hash_table_insert(tags_ht, "yellow", "<font color=\"#848200\">"); |
|
28045
dca626985d99
Change yahoo_codes_to_html() to use the same USE_CSS_FORMATTING #define
Mark Doliner <markdoliner@pidgin.im>
parents:
28041
diff
changeset
|
301 | |
|
28093
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
302 | g_hash_table_insert(tags_ht, "/black", "</font>"); |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
303 | g_hash_table_insert(tags_ht, "/blue", "</font>"); |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
304 | g_hash_table_insert(tags_ht, "/cyan", "</font>"); |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
305 | g_hash_table_insert(tags_ht, "/gray", "</font>"); |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
306 | g_hash_table_insert(tags_ht, "/green", "</font>"); |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
307 | g_hash_table_insert(tags_ht, "/pink", "</font>"); |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
308 | g_hash_table_insert(tags_ht, "/purple", "</font>"); |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
309 | g_hash_table_insert(tags_ht, "/orange", "</font>"); |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
310 | g_hash_table_insert(tags_ht, "/red", "</font>"); |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
311 | g_hash_table_insert(tags_ht, "/yellow", "</font>"); |
|
28045
dca626985d99
Change yahoo_codes_to_html() to use the same USE_CSS_FORMATTING #define
Mark Doliner <markdoliner@pidgin.im>
parents:
28041
diff
changeset
|
312 | #endif /* !USE_CSS_FORMATTING */ |
| 6513 | 313 | |
|
28093
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
314 | /* We don't support these tags, so discard them */ |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
315 | g_hash_table_insert(tags_ht, "alt", ""); |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
316 | g_hash_table_insert(tags_ht, "fade", ""); |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
317 | g_hash_table_insert(tags_ht, "snd", ""); |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
318 | g_hash_table_insert(tags_ht, "/alt", ""); |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
319 | g_hash_table_insert(tags_ht, "/fade", ""); |
| 8375 | 320 | |
|
28093
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
321 | /* Official clients don't seem to send b, i or u tags. They use |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
322 | * the escape codes listed above. Official clients definitely send |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
323 | * font tags, though. I wonder if we can remove the opening and |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
324 | * closing b, i and u tags from here? */ |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
325 | g_hash_table_insert(tags_ht, "b", "<b>"); |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
326 | g_hash_table_insert(tags_ht, "i", "<i>"); |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
327 | g_hash_table_insert(tags_ht, "u", "<u>"); |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
328 | g_hash_table_insert(tags_ht, "font", "<font>"); |
| 8375 | 329 | |
|
28093
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
330 | g_hash_table_insert(tags_ht, "/b", "</b>"); |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
331 | g_hash_table_insert(tags_ht, "/i", "</i>"); |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
332 | g_hash_table_insert(tags_ht, "/u", "</u>"); |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
333 | g_hash_table_insert(tags_ht, "/font", "</font>"); |
| 6513 | 334 | } |
| 335 | ||
| 336 | void yahoo_dest_colorht() | |
| 337 | { | |
|
28093
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
338 | if (esc_codes_ht == NULL) |
|
27683
9ee099fab4ee
Don't double-free the color hash table when deinitializing both prpl-yahoo
Mark Doliner <markdoliner@pidgin.im>
parents:
27555
diff
changeset
|
339 | /* Hash table has already been destroyed */ |
|
9ee099fab4ee
Don't double-free the color hash table when deinitializing both prpl-yahoo
Mark Doliner <markdoliner@pidgin.im>
parents:
27555
diff
changeset
|
340 | return; |
|
9ee099fab4ee
Don't double-free the color hash table when deinitializing both prpl-yahoo
Mark Doliner <markdoliner@pidgin.im>
parents:
27555
diff
changeset
|
341 | |
|
28093
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
342 | g_hash_table_destroy(esc_codes_ht); |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
343 | esc_codes_ht = NULL; |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
344 | g_hash_table_destroy(tags_ht); |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
345 | tags_ht = NULL; |
| 6513 | 346 | } |
| 347 | ||
|
28045
dca626985d99
Change yahoo_codes_to_html() to use the same USE_CSS_FORMATTING #define
Mark Doliner <markdoliner@pidgin.im>
parents:
28041
diff
changeset
|
348 | #ifndef USE_CSS_FORMATTING |
| 6629 | 349 | static int point_to_html(int x) |
| 350 | { | |
| 351 | if (x < 9) | |
| 352 | return 1; | |
| 353 | if (x < 11) | |
| 354 | return 2; | |
| 355 | if (x < 13) | |
| 356 | return 3; | |
| 357 | if (x < 17) | |
| 358 | return 4; | |
| 359 | if (x < 25) | |
| 360 | return 5; | |
| 361 | if (x < 35) | |
| 362 | return 6; | |
| 363 | return 7; | |
| 364 | } | |
|
28045
dca626985d99
Change yahoo_codes_to_html() to use the same USE_CSS_FORMATTING #define
Mark Doliner <markdoliner@pidgin.im>
parents:
28041
diff
changeset
|
365 | #endif /* !USE_CSS_FORMATTING */ |
|
10380
8608e553808f
[gaim-migrate @ 11605]
Evan Schoenberg <evands@pidgin.im>
parents:
10023
diff
changeset
|
366 | |
|
28093
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
367 | static void append_attrs_datalist_foreach_cb(GQuark key_id, gpointer data, gpointer user_data) |
| 6629 | 368 | { |
|
28093
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
369 | const char *key; |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
370 | const char *value; |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
371 | xmlnode *cur; |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
372 | |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
373 | key = g_quark_to_string(key_id); |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
374 | value = data; |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
375 | cur = user_data; |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
376 | |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
377 | xmlnode_set_attrib(cur, key, value); |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
378 | } |
| 6629 | 379 | |
|
28093
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
380 | /** |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
381 | * @param cur A pointer to the position in the XML tree that we're |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
382 | * currently building. This will be modified when opening a tag |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
383 | * or closing an existing tag. |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
384 | */ |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
385 | static void yahoo_codes_to_html_add_tag(xmlnode **cur, const char *tag, gboolean is_closing_tag, const gchar *tag_name, gboolean is_font_tag) |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
386 | { |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
387 | if (is_closing_tag) { |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
388 | xmlnode *tmp; |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
389 | GSList *dangling_tags = NULL; |
|
28045
dca626985d99
Change yahoo_codes_to_html() to use the same USE_CSS_FORMATTING #define
Mark Doliner <markdoliner@pidgin.im>
parents:
28041
diff
changeset
|
390 | |
|
28093
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
391 | /* Move up the DOM until we find the opening tag */ |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
392 | for (tmp = *cur; tmp != NULL; tmp = xmlnode_get_parent(tmp)) { |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
393 | /* Add one to tag_name when doing this comparison because it starts with a / */ |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
394 | if (g_str_equal(tmp->name, tag_name + 1)) |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
395 | /* Found */ |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
396 | break; |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
397 | dangling_tags = g_slist_prepend(dangling_tags, tmp); |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
398 | } |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
399 | if (tmp == NULL) { |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
400 | /* This is a closing tag with no opening tag. Useless. */ |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
401 | purple_debug_error("yahoo", "Ignoring unmatched tag %s", tag); |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
402 | g_slist_free(dangling_tags); |
| 6629 | 403 | return; |
| 404 | } | |
|
28093
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
405 | |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
406 | /* Move our current position up, now that we've closed a tag */ |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
407 | *cur = xmlnode_get_parent(tmp); |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
408 | |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
409 | /* Re-open any tags that were nested below the tag we just closed */ |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
410 | while (dangling_tags != NULL) { |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
411 | tmp = dangling_tags->data; |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
412 | dangling_tags = g_slist_delete_link(dangling_tags, dangling_tags); |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
413 | |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
414 | /* Create a copy of this tag+attributes (but not child tags or |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
415 | * data) at our new location */ |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
416 | *cur = xmlnode_new_child(*cur, tmp->name); |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
417 | for (tmp = tmp->child; tmp != NULL; tmp = tmp->next) |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
418 | if (tmp->type == XMLNODE_TYPE_ATTRIB) |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
419 | xmlnode_set_attrib_full(*cur, tmp->name, |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
420 | tmp->xmlns, tmp->prefix, tmp->data); |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
421 | } |
| 6629 | 422 | } else { |
|
28093
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
423 | const char *start; |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
424 | const char *end; |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
425 | GData *attributes; |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
426 | char *fontsize = NULL; |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
427 | |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
428 | purple_markup_find_tag(tag_name, tag, &start, &end, &attributes); |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
429 | *cur = xmlnode_new_child(*cur, tag_name); |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
430 | |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
431 | if (is_font_tag) { |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
432 | /* Special case for the font size attribute */ |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
433 | fontsize = g_strdup(g_datalist_get_data(&attributes, "size")); |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
434 | if (fontsize != NULL) |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
435 | g_datalist_remove_data(&attributes, "size"); |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
436 | } |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
437 | |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
438 | /* Add all font tag attributes */ |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
439 | g_datalist_foreach(&attributes, append_attrs_datalist_foreach_cb, *cur); |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
440 | g_datalist_clear(&attributes); |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
441 | |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
442 | if (fontsize != NULL) { |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
443 | #ifdef USE_CSS_FORMATTING |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
444 | /* |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
445 | * The Yahoo font size value is given in pt, even though the HTML |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
446 | * standard for <font size="x"> treats the size as a number on a |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
447 | * scale between 1 and 7. So we insert the font size as a CSS |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
448 | * style on a span tag. |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
449 | */ |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
450 | gchar *tmp = g_strdup_printf("font-size: %spt", fontsize); |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
451 | *cur = xmlnode_new_child(*cur, "span"); |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
452 | xmlnode_set_attrib(*cur, "style", tmp); |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
453 | g_free(tmp); |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
454 | #else |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
455 | /* |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
456 | * The Yahoo font size value is given in pt, even though the HTML |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
457 | * standard for <font size="x"> treats the size as a number on a |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
458 | * scale between 1 and 7. So we convert it to an appropriate |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
459 | * value. This loses precision, which is why CSS formatting is |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
460 | * preferred. The "absz" attribute remains here for backward |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
461 | * compatibility with UIs that might use it, but it is totally |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
462 | * not standard at all. |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
463 | */ |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
464 | int size, htmlsize; |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
465 | gchar tmp[11]; |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
466 | size = strtol(fontsize, NULL, 10); |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
467 | htmlsize = point_to_html(size); |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
468 | sprintf(tmp, "%u", htmlsize); |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
469 | xmlnode_set_attrib(*cur, "size", tmp); |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
470 | xmlnode_set_attrib(*cur, "absz", fontsize); |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
471 | #endif /* !USE_CSS_FORMATTING */ |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
472 | g_free(fontsize); |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
473 | } |
| 6629 | 474 | } |
| 475 | } | |
| 476 | ||
|
28093
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
477 | /** |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
478 | * Similar to purple_markup_get_tag_name(), but works with closing tags. |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
479 | * |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
480 | * @return The lowercase name of the tag. If this is a closing tag then |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
481 | * this value starts with a forward slash. The caller must free |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
482 | * this string with g_free. |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
483 | */ |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
484 | static gchar *yahoo_markup_get_tag_name(const char *tag, gboolean *is_closing_tag) |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
485 | { |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
486 | size_t len; |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
487 | |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
488 | *is_closing_tag = (tag[1] == '/'); |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
489 | if (*is_closing_tag) |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
490 | len = strcspn(tag + 1, "> "); |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
491 | else |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
492 | len = strcspn(tag + 1, "> /"); |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
493 | |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
494 | return g_utf8_strdown(tag + 1, len); |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
495 | } |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
496 | |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
497 | /* |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
498 | * Yahoo! messages generally aren't well-formed. Their markup is |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
499 | * more of a flow from start to finish rather than a hierarchy from |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
500 | * outer to inner. They tend to open tags and close them only when |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
501 | * necessary. |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
502 | * |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
503 | * Example: <font size="8">size 8 <font size="16">size 16 <font size="8">size 8 again |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
504 | * |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
505 | * But we want to send well-formed HTML to the core, so we step through |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
506 | * the input string and build an xmlnode tree containing sanitized HTML. |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
507 | */ |
| 6629 | 508 | char *yahoo_codes_to_html(const char *x) |
| 6513 | 509 | { |
|
28036
b9c7f979cd4f
Minor optimization when sending and receiving messages on Yahoo: only
Mark Doliner <markdoliner@pidgin.im>
parents:
28035
diff
changeset
|
510 | size_t x_len; |
|
28093
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
511 | xmlnode *html, *cur; |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
512 | GString *cdata = g_string_new(NULL); |
|
28036
b9c7f979cd4f
Minor optimization when sending and receiving messages on Yahoo: only
Mark Doliner <markdoliner@pidgin.im>
parents:
28035
diff
changeset
|
513 | int i, j; |
|
28041
84fb2d6540ea
Of course I got it backwards
Mark Doliner <markdoliner@pidgin.im>
parents:
28040
diff
changeset
|
514 | gboolean no_more_gt_brackets = FALSE; |
|
28037
ec211dfd0937
Make match a const char *, and remove two unnecessary casts
Mark Doliner <markdoliner@pidgin.im>
parents:
28036
diff
changeset
|
515 | const char *match; |
|
28093
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
516 | gchar *xmlstr1, *xmlstr2; |
| 6513 | 517 | |
|
28036
b9c7f979cd4f
Minor optimization when sending and receiving messages on Yahoo: only
Mark Doliner <markdoliner@pidgin.im>
parents:
28035
diff
changeset
|
518 | x_len = strlen(x); |
|
28093
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
519 | html = xmlnode_new("html"); |
| 6513 | 520 | |
|
28093
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
521 | cur = html; |
|
28036
b9c7f979cd4f
Minor optimization when sending and receiving messages on Yahoo: only
Mark Doliner <markdoliner@pidgin.im>
parents:
28035
diff
changeset
|
522 | for (i = 0; i < x_len; i++) { |
| 6513 | 523 | if ((x[i] == 0x1b) && (x[i+1] == '[')) { |
|
28040
476db09dcc7a
Better variable name?
Mark Doliner <markdoliner@pidgin.im>
parents:
28038
diff
changeset
|
524 | /* This escape sequence signifies the beginning of some |
|
476db09dcc7a
Better variable name?
Mark Doliner <markdoliner@pidgin.im>
parents:
28038
diff
changeset
|
525 | * text formatting code */ |
| 6513 | 526 | j = i + 1; |
| 527 | ||
|
28036
b9c7f979cd4f
Minor optimization when sending and receiving messages on Yahoo: only
Mark Doliner <markdoliner@pidgin.im>
parents:
28035
diff
changeset
|
528 | while (j++ < x_len) { |
|
28093
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
529 | gchar *code; |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
530 | |
| 6513 | 531 | if (x[j] != 'm') |
|
28093
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
532 | /* Keep looking for the end of this sequence */ |
| 6513 | 533 | continue; |
|
28093
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
534 | |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
535 | /* We've reached the end of the formatting sequence, yay */ |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
536 | |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
537 | /* Append any character data that belongs in the current node */ |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
538 | if (cdata->len > 0) { |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
539 | xmlnode_insert_data(cur, cdata->str, cdata->len); |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
540 | g_string_truncate(cdata, 0); |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
541 | } |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
542 | |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
543 | code = g_strndup(x + i + 2, j - i - 2); |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
544 | if (code[0] == '#') { |
|
28045
dca626985d99
Change yahoo_codes_to_html() to use the same USE_CSS_FORMATTING #define
Mark Doliner <markdoliner@pidgin.im>
parents:
28041
diff
changeset
|
545 | #ifdef USE_CSS_FORMATTING |
|
28093
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
546 | gchar *tmp = g_strdup_printf("color: %s", code); |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
547 | cur = xmlnode_new_child(cur, "span"); |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
548 | xmlnode_set_attrib(cur, "style", tmp); |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
549 | g_free(tmp); |
|
28045
dca626985d99
Change yahoo_codes_to_html() to use the same USE_CSS_FORMATTING #define
Mark Doliner <markdoliner@pidgin.im>
parents:
28041
diff
changeset
|
550 | #else |
|
28093
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
551 | cur = xmlnode_new_child(cur, "font"); |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
552 | xmlnode_set_attrib(cur, "color", code); |
|
28045
dca626985d99
Change yahoo_codes_to_html() to use the same USE_CSS_FORMATTING #define
Mark Doliner <markdoliner@pidgin.im>
parents:
28041
diff
changeset
|
553 | #endif /* !USE_CSS_FORMATTING */ |
|
28093
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
554 | |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
555 | } else if ((match = g_hash_table_lookup(esc_codes_ht, code))) { |
|
28240
2022259114fc
Fix a possible crash when receiving URLs in yahoo. It doesn't crash for me
Mark Doliner <markdoliner@pidgin.im>
parents:
28107
diff
changeset
|
556 | /* Some tags are in the hash table only because we |
|
2022259114fc
Fix a possible crash when receiving URLs in yahoo. It doesn't crash for me
Mark Doliner <markdoliner@pidgin.im>
parents:
28107
diff
changeset
|
557 | * want to ignore them */ |
|
2022259114fc
Fix a possible crash when receiving URLs in yahoo. It doesn't crash for me
Mark Doliner <markdoliner@pidgin.im>
parents:
28107
diff
changeset
|
558 | if (match[0] != '\0') { |
|
2022259114fc
Fix a possible crash when receiving URLs in yahoo. It doesn't crash for me
Mark Doliner <markdoliner@pidgin.im>
parents:
28107
diff
changeset
|
559 | gboolean is_closing_tag; |
|
2022259114fc
Fix a possible crash when receiving URLs in yahoo. It doesn't crash for me
Mark Doliner <markdoliner@pidgin.im>
parents:
28107
diff
changeset
|
560 | gchar *tag_name; |
|
2022259114fc
Fix a possible crash when receiving URLs in yahoo. It doesn't crash for me
Mark Doliner <markdoliner@pidgin.im>
parents:
28107
diff
changeset
|
561 | tag_name = yahoo_markup_get_tag_name(match, &is_closing_tag); |
|
2022259114fc
Fix a possible crash when receiving URLs in yahoo. It doesn't crash for me
Mark Doliner <markdoliner@pidgin.im>
parents:
28107
diff
changeset
|
562 | yahoo_codes_to_html_add_tag(&cur, match, is_closing_tag, tag_name, FALSE); |
|
2022259114fc
Fix a possible crash when receiving URLs in yahoo. It doesn't crash for me
Mark Doliner <markdoliner@pidgin.im>
parents:
28107
diff
changeset
|
563 | g_free(tag_name); |
|
2022259114fc
Fix a possible crash when receiving URLs in yahoo. It doesn't crash for me
Mark Doliner <markdoliner@pidgin.im>
parents:
28107
diff
changeset
|
564 | } |
| 6513 | 565 | |
|
28093
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
566 | } else { |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
567 | purple_debug_error("yahoo", |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
568 | "Ignoring unknown ansi code 'ESC[%sm'.\n", code); |
| 6513 | 569 | } |
|
28093
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
570 | |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
571 | g_free(code); |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
572 | i = j; |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
573 | break; |
| 6513 | 574 | } |
| 575 | ||
|
28093
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
576 | } else if (x[i] == '<' && !no_more_gt_brackets) { |
|
28040
476db09dcc7a
Better variable name?
Mark Doliner <markdoliner@pidgin.im>
parents:
28038
diff
changeset
|
577 | /* The start of an HTML tag */ |
| 6629 | 578 | j = i; |
| 6513 | 579 | |
|
28036
b9c7f979cd4f
Minor optimization when sending and receiving messages on Yahoo: only
Mark Doliner <markdoliner@pidgin.im>
parents:
28035
diff
changeset
|
580 | while (j++ < x_len) { |
|
28093
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
581 | gchar *tag; |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
582 | gboolean is_closing_tag; |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
583 | gchar *tag_name; |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
584 | |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
585 | if (x[j] != '>') { |
|
28106
686088ceb2d1
Take care of a special case where we would incorrectly parse incoming IMs
Mark Doliner <markdoliner@pidgin.im>
parents:
28103
diff
changeset
|
586 | if (x[j] == '"') { |
|
686088ceb2d1
Take care of a special case where we would incorrectly parse incoming IMs
Mark Doliner <markdoliner@pidgin.im>
parents:
28103
diff
changeset
|
587 | /* We're inside a quoted attribute value. Skip to the end */ |
|
686088ceb2d1
Take care of a special case where we would incorrectly parse incoming IMs
Mark Doliner <markdoliner@pidgin.im>
parents:
28103
diff
changeset
|
588 | j++; |
|
686088ceb2d1
Take care of a special case where we would incorrectly parse incoming IMs
Mark Doliner <markdoliner@pidgin.im>
parents:
28103
diff
changeset
|
589 | while (j != x_len && x[j] != '"') |
|
686088ceb2d1
Take care of a special case where we would incorrectly parse incoming IMs
Mark Doliner <markdoliner@pidgin.im>
parents:
28103
diff
changeset
|
590 | j++; |
|
686088ceb2d1
Take care of a special case where we would incorrectly parse incoming IMs
Mark Doliner <markdoliner@pidgin.im>
parents:
28103
diff
changeset
|
591 | } else if (x[j] == '\'') { |
|
686088ceb2d1
Take care of a special case where we would incorrectly parse incoming IMs
Mark Doliner <markdoliner@pidgin.im>
parents:
28103
diff
changeset
|
592 | /* We're inside a quoted attribute value. Skip to the end */ |
|
686088ceb2d1
Take care of a special case where we would incorrectly parse incoming IMs
Mark Doliner <markdoliner@pidgin.im>
parents:
28103
diff
changeset
|
593 | j++; |
|
686088ceb2d1
Take care of a special case where we would incorrectly parse incoming IMs
Mark Doliner <markdoliner@pidgin.im>
parents:
28103
diff
changeset
|
594 | while (j != x_len && x[j] != '\'') |
|
686088ceb2d1
Take care of a special case where we would incorrectly parse incoming IMs
Mark Doliner <markdoliner@pidgin.im>
parents:
28103
diff
changeset
|
595 | j++; |
|
686088ceb2d1
Take care of a special case where we would incorrectly parse incoming IMs
Mark Doliner <markdoliner@pidgin.im>
parents:
28103
diff
changeset
|
596 | } |
|
28093
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
597 | if (j != x_len) |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
598 | /* Keep looking for the end of this tag */ |
| 6513 | 599 | continue; |
| 600 | ||
|
28093
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
601 | /* This < has no corresponding > */ |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
602 | g_string_append_c(cdata, x[i]); |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
603 | no_more_gt_brackets = TRUE; |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
604 | break; |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
605 | } |
| 6513 | 606 | |
|
28093
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
607 | tag = g_strndup(x + i, j - i + 1); |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
608 | tag_name = yahoo_markup_get_tag_name(tag, &is_closing_tag); |
| 6513 | 609 | |
|
28093
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
610 | match = g_hash_table_lookup(tags_ht, tag_name); |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
611 | if (match == NULL) { |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
612 | /* Unknown tag. The user probably typed a less-than sign */ |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
613 | g_string_append_c(cdata, x[i]); |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
614 | no_more_gt_brackets = TRUE; |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
615 | g_free(tag); |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
616 | g_free(tag_name); |
| 6513 | 617 | break; |
| 618 | } | |
| 619 | ||
|
28093
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
620 | /* Some tags are in the hash table only because we |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
621 | * want to ignore them */ |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
622 | if (match[0] != '\0') { |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
623 | /* Append any character data that belongs in the current node */ |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
624 | if (cdata->len > 0) { |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
625 | xmlnode_insert_data(cur, cdata->str, cdata->len); |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
626 | g_string_truncate(cdata, 0); |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
627 | } |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
628 | if (g_str_equal(tag_name, "font")) |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
629 | /* Font tags are a special case. We don't |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
630 | * necessarily want to replace the whole thing-- |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
631 | * we just want to fix the size attribute. */ |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
632 | yahoo_codes_to_html_add_tag(&cur, tag, is_closing_tag, tag_name, TRUE); |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
633 | else |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
634 | yahoo_codes_to_html_add_tag(&cur, match, is_closing_tag, tag_name, FALSE); |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
635 | } |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
636 | |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
637 | i = j; |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
638 | g_free(tag); |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
639 | g_free(tag_name); |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
640 | break; |
| 6513 | 641 | } |
| 642 | ||
| 643 | } else { | |
|
28093
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
644 | g_string_append_c(cdata, x[i]); |
| 6513 | 645 | } |
| 646 | } | |
| 647 | ||
|
28093
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
648 | /* Append any remaining character data */ |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
649 | if (cdata->len > 0) |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
650 | xmlnode_insert_data(cur, cdata->str, cdata->len); |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
651 | g_string_free(cdata, TRUE); |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
652 | |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
653 | /* Serialize our HTML */ |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
654 | xmlstr1 = xmlnode_to_str(html, NULL); |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
655 | xmlnode_free(html); |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
656 | |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
657 | /* Strip off the outter HTML node */ |
|
28100
53d948810829
Make this enum follow our naming conventions a little better
Mark Doliner <markdoliner@pidgin.im>
parents:
28093
diff
changeset
|
658 | /* This probably isn't necessary, especially if we made the outter HTML |
|
53d948810829
Make this enum follow our naming conventions a little better
Mark Doliner <markdoliner@pidgin.im>
parents:
28093
diff
changeset
|
659 | * node an empty span. But the HTML is simpler this way. */ |
|
28093
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
660 | xmlstr2 = g_strndup(xmlstr1 + 6, strlen(xmlstr1) - 13); |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
661 | g_free(xmlstr1); |
|
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
662 | |
|
28293
8f160f6f9980
Make outgoing yahoo messages with links, font color, font face or font size
Mark Doliner <markdoliner@pidgin.im>
parents:
28292
diff
changeset
|
663 | purple_debug_misc("yahoo", "yahoo_codes_to_html(%s)=%s\n", x, xmlstr2); |
|
28093
e21ce2c8991d
Changes to the way we translate raw yahoo messages to HTML. The HTML
Mark Doliner <markdoliner@pidgin.im>
parents:
28051
diff
changeset
|
664 | return xmlstr2; |
| 6513 | 665 | } |
| 6629 | 666 | |
| 667 | /* borrowed from gtkimhtml */ | |
| 668 | #define MAX_FONT_SIZE 7 | |
|
10899
87d9aec5b72d
[gaim-migrate @ 12619]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10504
diff
changeset
|
669 | #define POINT_SIZE(x) (_point_sizes [MIN ((x > 0 ? x : 1), MAX_FONT_SIZE) - 1]) |
|
14904
cab89db4854c
[gaim-migrate @ 17611]
Henning Norén <henning.noren@gmail.com>
parents:
14347
diff
changeset
|
670 | static const gint _point_sizes [] = { 8, 10, 12, 14, 20, 30, 40 }; |
| 6629 | 671 | |
|
28292
e1f21cbb9b4d
* Change yahoo_html_to_codes() a little to hopefully be more straight forward
Mark Doliner <markdoliner@pidgin.im>
parents:
28240
diff
changeset
|
672 | enum fontattr_type |
|
28100
53d948810829
Make this enum follow our naming conventions a little better
Mark Doliner <markdoliner@pidgin.im>
parents:
28093
diff
changeset
|
673 | { |
|
53d948810829
Make this enum follow our naming conventions a little better
Mark Doliner <markdoliner@pidgin.im>
parents:
28093
diff
changeset
|
674 | FATYPE_SIZE, |
|
53d948810829
Make this enum follow our naming conventions a little better
Mark Doliner <markdoliner@pidgin.im>
parents:
28093
diff
changeset
|
675 | FATYPE_COLOR, |
|
28293
8f160f6f9980
Make outgoing yahoo messages with links, font color, font face or font size
Mark Doliner <markdoliner@pidgin.im>
parents:
28292
diff
changeset
|
676 | FATYPE_FACE |
|
28100
53d948810829
Make this enum follow our naming conventions a little better
Mark Doliner <markdoliner@pidgin.im>
parents:
28093
diff
changeset
|
677 | }; |
|
53d948810829
Make this enum follow our naming conventions a little better
Mark Doliner <markdoliner@pidgin.im>
parents:
28093
diff
changeset
|
678 | |
|
53d948810829
Make this enum follow our naming conventions a little better
Mark Doliner <markdoliner@pidgin.im>
parents:
28093
diff
changeset
|
679 | typedef struct |
|
53d948810829
Make this enum follow our naming conventions a little better
Mark Doliner <markdoliner@pidgin.im>
parents:
28093
diff
changeset
|
680 | { |
|
28292
e1f21cbb9b4d
* Change yahoo_html_to_codes() a little to hopefully be more straight forward
Mark Doliner <markdoliner@pidgin.im>
parents:
28240
diff
changeset
|
681 | enum fontattr_type type; |
| 6629 | 682 | union { |
| 683 | int size; | |
| 684 | char *color; | |
| 685 | char *face; | |
| 686 | } u; | |
| 687 | } fontattr; | |
| 688 | ||
|
28292
e1f21cbb9b4d
* Change yahoo_html_to_codes() a little to hopefully be more straight forward
Mark Doliner <markdoliner@pidgin.im>
parents:
28240
diff
changeset
|
689 | typedef struct |
|
e1f21cbb9b4d
* Change yahoo_html_to_codes() a little to hopefully be more straight forward
Mark Doliner <markdoliner@pidgin.im>
parents:
28240
diff
changeset
|
690 | { |
|
e1f21cbb9b4d
* Change yahoo_html_to_codes() a little to hopefully be more straight forward
Mark Doliner <markdoliner@pidgin.im>
parents:
28240
diff
changeset
|
691 | gboolean bold; |
|
e1f21cbb9b4d
* Change yahoo_html_to_codes() a little to hopefully be more straight forward
Mark Doliner <markdoliner@pidgin.im>
parents:
28240
diff
changeset
|
692 | gboolean italic; |
|
e1f21cbb9b4d
* Change yahoo_html_to_codes() a little to hopefully be more straight forward
Mark Doliner <markdoliner@pidgin.im>
parents:
28240
diff
changeset
|
693 | gboolean underline; |
|
e1f21cbb9b4d
* Change yahoo_html_to_codes() a little to hopefully be more straight forward
Mark Doliner <markdoliner@pidgin.im>
parents:
28240
diff
changeset
|
694 | gboolean in_link; |
|
e1f21cbb9b4d
* Change yahoo_html_to_codes() a little to hopefully be more straight forward
Mark Doliner <markdoliner@pidgin.im>
parents:
28240
diff
changeset
|
695 | int font_size; |
|
e1f21cbb9b4d
* Change yahoo_html_to_codes() a little to hopefully be more straight forward
Mark Doliner <markdoliner@pidgin.im>
parents:
28240
diff
changeset
|
696 | char *font_face; |
|
e1f21cbb9b4d
* Change yahoo_html_to_codes() a little to hopefully be more straight forward
Mark Doliner <markdoliner@pidgin.im>
parents:
28240
diff
changeset
|
697 | char *font_color; |
|
e1f21cbb9b4d
* Change yahoo_html_to_codes() a little to hopefully be more straight forward
Mark Doliner <markdoliner@pidgin.im>
parents:
28240
diff
changeset
|
698 | } CurrentMsgState; |
|
e1f21cbb9b4d
* Change yahoo_html_to_codes() a little to hopefully be more straight forward
Mark Doliner <markdoliner@pidgin.im>
parents:
28240
diff
changeset
|
699 | |
| 6629 | 700 | static void fontattr_free(fontattr *f) |
| 701 | { | |
|
28100
53d948810829
Make this enum follow our naming conventions a little better
Mark Doliner <markdoliner@pidgin.im>
parents:
28093
diff
changeset
|
702 | if (f->type == FATYPE_COLOR) |
| 6629 | 703 | g_free(f->u.color); |
|
28100
53d948810829
Make this enum follow our naming conventions a little better
Mark Doliner <markdoliner@pidgin.im>
parents:
28093
diff
changeset
|
704 | else if (f->type == FATYPE_FACE) |
| 6629 | 705 | g_free(f->u.face); |
| 706 | g_free(f); | |
| 707 | } | |
| 708 | ||
|
28101
b82c1e37c9a0
This is actually a stack, not a queue, so we can use a simpler data
Mark Doliner <markdoliner@pidgin.im>
parents:
28100
diff
changeset
|
709 | static void yahoo_htc_list_cleanup(GSList *l) |
| 6629 | 710 | { |
|
28101
b82c1e37c9a0
This is actually a stack, not a queue, so we can use a simpler data
Mark Doliner <markdoliner@pidgin.im>
parents:
28100
diff
changeset
|
711 | while (l != NULL) { |
|
b82c1e37c9a0
This is actually a stack, not a queue, so we can use a simpler data
Mark Doliner <markdoliner@pidgin.im>
parents:
28100
diff
changeset
|
712 | g_free(l->data); |
|
b82c1e37c9a0
This is actually a stack, not a queue, so we can use a simpler data
Mark Doliner <markdoliner@pidgin.im>
parents:
28100
diff
changeset
|
713 | l = g_slist_delete_link(l, l); |
|
b82c1e37c9a0
This is actually a stack, not a queue, so we can use a simpler data
Mark Doliner <markdoliner@pidgin.im>
parents:
28100
diff
changeset
|
714 | } |
| 6629 | 715 | } |
| 716 | ||
|
28293
8f160f6f9980
Make outgoing yahoo messages with links, font color, font face or font size
Mark Doliner <markdoliner@pidgin.im>
parents:
28292
diff
changeset
|
717 | static void parse_font_tag(const char *src, GString *dest, const char *tag_name, const char *tag, |
|
28296
60b4de52913e
Move where the ftattr queue is defined
Mark Doliner <markdoliner@pidgin.im>
parents:
28293
diff
changeset
|
718 | int src_len, GSList **colors, GSList **tags) |
| 6629 | 719 | { |
|
28293
8f160f6f9980
Make outgoing yahoo messages with links, font color, font face or font size
Mark Doliner <markdoliner@pidgin.im>
parents:
28292
diff
changeset
|
720 | const char *start; |
|
8f160f6f9980
Make outgoing yahoo messages with links, font color, font face or font size
Mark Doliner <markdoliner@pidgin.im>
parents:
28292
diff
changeset
|
721 | const char *end; |
|
8f160f6f9980
Make outgoing yahoo messages with links, font color, font face or font size
Mark Doliner <markdoliner@pidgin.im>
parents:
28292
diff
changeset
|
722 | GData *attributes; |
|
8f160f6f9980
Make outgoing yahoo messages with links, font color, font face or font size
Mark Doliner <markdoliner@pidgin.im>
parents:
28292
diff
changeset
|
723 | const char *attribute; |
|
28297
230a550b96df
Use a GSList here instead of a GQueue. Yay for simplification.
Mark Doliner <markdoliner@pidgin.im>
parents:
28296
diff
changeset
|
724 | GSList *fontattrs = NULL; |
|
28293
8f160f6f9980
Make outgoing yahoo messages with links, font color, font face or font size
Mark Doliner <markdoliner@pidgin.im>
parents:
28292
diff
changeset
|
725 | gboolean needendtag; |
|
8f160f6f9980
Make outgoing yahoo messages with links, font color, font face or font size
Mark Doliner <markdoliner@pidgin.im>
parents:
28292
diff
changeset
|
726 | fontattr *f; |
|
8f160f6f9980
Make outgoing yahoo messages with links, font color, font face or font size
Mark Doliner <markdoliner@pidgin.im>
parents:
28292
diff
changeset
|
727 | GString *tmp; |
| 6629 | 728 | |
|
28293
8f160f6f9980
Make outgoing yahoo messages with links, font color, font face or font size
Mark Doliner <markdoliner@pidgin.im>
parents:
28292
diff
changeset
|
729 | purple_markup_find_tag(tag_name, tag, &start, &end, &attributes); |
| 6629 | 730 | |
|
28293
8f160f6f9980
Make outgoing yahoo messages with links, font color, font face or font size
Mark Doliner <markdoliner@pidgin.im>
parents:
28292
diff
changeset
|
731 | attribute = g_datalist_get_data(&attributes, "face"); |
|
8f160f6f9980
Make outgoing yahoo messages with links, font color, font face or font size
Mark Doliner <markdoliner@pidgin.im>
parents:
28292
diff
changeset
|
732 | if (attribute != NULL) { |
|
8f160f6f9980
Make outgoing yahoo messages with links, font color, font face or font size
Mark Doliner <markdoliner@pidgin.im>
parents:
28292
diff
changeset
|
733 | f = g_new(fontattr, 1); |
|
8f160f6f9980
Make outgoing yahoo messages with links, font color, font face or font size
Mark Doliner <markdoliner@pidgin.im>
parents:
28292
diff
changeset
|
734 | f->type = FATYPE_FACE; |
|
8f160f6f9980
Make outgoing yahoo messages with links, font color, font face or font size
Mark Doliner <markdoliner@pidgin.im>
parents:
28292
diff
changeset
|
735 | f->u.face = g_strdup(attribute); |
|
28297
230a550b96df
Use a GSList here instead of a GQueue. Yay for simplification.
Mark Doliner <markdoliner@pidgin.im>
parents:
28296
diff
changeset
|
736 | fontattrs = g_slist_prepend(fontattrs, f); |
|
28293
8f160f6f9980
Make outgoing yahoo messages with links, font color, font face or font size
Mark Doliner <markdoliner@pidgin.im>
parents:
28292
diff
changeset
|
737 | } |
| 6629 | 738 | |
|
28293
8f160f6f9980
Make outgoing yahoo messages with links, font color, font face or font size
Mark Doliner <markdoliner@pidgin.im>
parents:
28292
diff
changeset
|
739 | attribute = g_datalist_get_data(&attributes, "size"); |
|
8f160f6f9980
Make outgoing yahoo messages with links, font color, font face or font size
Mark Doliner <markdoliner@pidgin.im>
parents:
28292
diff
changeset
|
740 | if (attribute != NULL) { |
|
8f160f6f9980
Make outgoing yahoo messages with links, font color, font face or font size
Mark Doliner <markdoliner@pidgin.im>
parents:
28292
diff
changeset
|
741 | f = g_new(fontattr, 1); |
|
8f160f6f9980
Make outgoing yahoo messages with links, font color, font face or font size
Mark Doliner <markdoliner@pidgin.im>
parents:
28292
diff
changeset
|
742 | f->type = FATYPE_SIZE; |
|
8f160f6f9980
Make outgoing yahoo messages with links, font color, font face or font size
Mark Doliner <markdoliner@pidgin.im>
parents:
28292
diff
changeset
|
743 | f->u.size = POINT_SIZE(strtol(attribute, NULL, 10)); |
|
28297
230a550b96df
Use a GSList here instead of a GQueue. Yay for simplification.
Mark Doliner <markdoliner@pidgin.im>
parents:
28296
diff
changeset
|
744 | fontattrs = g_slist_prepend(fontattrs, f); |
|
230a550b96df
Use a GSList here instead of a GQueue. Yay for simplification.
Mark Doliner <markdoliner@pidgin.im>
parents:
28296
diff
changeset
|
745 | } |
|
230a550b96df
Use a GSList here instead of a GQueue. Yay for simplification.
Mark Doliner <markdoliner@pidgin.im>
parents:
28296
diff
changeset
|
746 | |
|
230a550b96df
Use a GSList here instead of a GQueue. Yay for simplification.
Mark Doliner <markdoliner@pidgin.im>
parents:
28296
diff
changeset
|
747 | attribute = g_datalist_get_data(&attributes, "color"); |
|
230a550b96df
Use a GSList here instead of a GQueue. Yay for simplification.
Mark Doliner <markdoliner@pidgin.im>
parents:
28296
diff
changeset
|
748 | if (attribute != NULL) { |
|
230a550b96df
Use a GSList here instead of a GQueue. Yay for simplification.
Mark Doliner <markdoliner@pidgin.im>
parents:
28296
diff
changeset
|
749 | f = g_new(fontattr, 1); |
|
230a550b96df
Use a GSList here instead of a GQueue. Yay for simplification.
Mark Doliner <markdoliner@pidgin.im>
parents:
28296
diff
changeset
|
750 | f->type = FATYPE_COLOR; |
|
230a550b96df
Use a GSList here instead of a GQueue. Yay for simplification.
Mark Doliner <markdoliner@pidgin.im>
parents:
28296
diff
changeset
|
751 | f->u.color = g_strdup(attribute); |
|
230a550b96df
Use a GSList here instead of a GQueue. Yay for simplification.
Mark Doliner <markdoliner@pidgin.im>
parents:
28296
diff
changeset
|
752 | fontattrs = g_slist_prepend(fontattrs, f); |
|
28293
8f160f6f9980
Make outgoing yahoo messages with links, font color, font face or font size
Mark Doliner <markdoliner@pidgin.im>
parents:
28292
diff
changeset
|
753 | } |
| 6629 | 754 | |
|
28293
8f160f6f9980
Make outgoing yahoo messages with links, font color, font face or font size
Mark Doliner <markdoliner@pidgin.im>
parents:
28292
diff
changeset
|
755 | g_datalist_clear(&attributes); |
|
8f160f6f9980
Make outgoing yahoo messages with links, font color, font face or font size
Mark Doliner <markdoliner@pidgin.im>
parents:
28292
diff
changeset
|
756 | |
|
28297
230a550b96df
Use a GSList here instead of a GQueue. Yay for simplification.
Mark Doliner <markdoliner@pidgin.im>
parents:
28296
diff
changeset
|
757 | if (fontattrs == NULL) |
|
230a550b96df
Use a GSList here instead of a GQueue. Yay for simplification.
Mark Doliner <markdoliner@pidgin.im>
parents:
28296
diff
changeset
|
758 | /* No recognized attributes in the font tag. Nothing to do. */ |
|
230a550b96df
Use a GSList here instead of a GQueue. Yay for simplification.
Mark Doliner <markdoliner@pidgin.im>
parents:
28296
diff
changeset
|
759 | return; |
|
230a550b96df
Use a GSList here instead of a GQueue. Yay for simplification.
Mark Doliner <markdoliner@pidgin.im>
parents:
28296
diff
changeset
|
760 | |
|
28293
8f160f6f9980
Make outgoing yahoo messages with links, font color, font face or font size
Mark Doliner <markdoliner@pidgin.im>
parents:
28292
diff
changeset
|
761 | needendtag = FALSE; |
|
8f160f6f9980
Make outgoing yahoo messages with links, font color, font face or font size
Mark Doliner <markdoliner@pidgin.im>
parents:
28292
diff
changeset
|
762 | tmp = g_string_new(NULL); |
|
8f160f6f9980
Make outgoing yahoo messages with links, font color, font face or font size
Mark Doliner <markdoliner@pidgin.im>
parents:
28292
diff
changeset
|
763 | |
|
28297
230a550b96df
Use a GSList here instead of a GQueue. Yay for simplification.
Mark Doliner <markdoliner@pidgin.im>
parents:
28296
diff
changeset
|
764 | while (fontattrs != NULL) { |
|
230a550b96df
Use a GSList here instead of a GQueue. Yay for simplification.
Mark Doliner <markdoliner@pidgin.im>
parents:
28296
diff
changeset
|
765 | f = fontattrs->data; |
|
230a550b96df
Use a GSList here instead of a GQueue. Yay for simplification.
Mark Doliner <markdoliner@pidgin.im>
parents:
28296
diff
changeset
|
766 | fontattrs = g_slist_delete_link(fontattrs, fontattrs); |
|
230a550b96df
Use a GSList here instead of a GQueue. Yay for simplification.
Mark Doliner <markdoliner@pidgin.im>
parents:
28296
diff
changeset
|
767 | |
|
230a550b96df
Use a GSList here instead of a GQueue. Yay for simplification.
Mark Doliner <markdoliner@pidgin.im>
parents:
28296
diff
changeset
|
768 | switch (f->type) { |
|
230a550b96df
Use a GSList here instead of a GQueue. Yay for simplification.
Mark Doliner <markdoliner@pidgin.im>
parents:
28296
diff
changeset
|
769 | case FATYPE_COLOR: |
|
230a550b96df
Use a GSList here instead of a GQueue. Yay for simplification.
Mark Doliner <markdoliner@pidgin.im>
parents:
28296
diff
changeset
|
770 | if (needendtag) { |
|
230a550b96df
Use a GSList here instead of a GQueue. Yay for simplification.
Mark Doliner <markdoliner@pidgin.im>
parents:
28296
diff
changeset
|
771 | g_string_append(tmp, "</font>"); |
|
230a550b96df
Use a GSList here instead of a GQueue. Yay for simplification.
Mark Doliner <markdoliner@pidgin.im>
parents:
28296
diff
changeset
|
772 | dest->str[dest->len-1] = '>'; |
|
230a550b96df
Use a GSList here instead of a GQueue. Yay for simplification.
Mark Doliner <markdoliner@pidgin.im>
parents:
28296
diff
changeset
|
773 | } |
| 6629 | 774 | |
|
28297
230a550b96df
Use a GSList here instead of a GQueue. Yay for simplification.
Mark Doliner <markdoliner@pidgin.im>
parents:
28296
diff
changeset
|
775 | g_string_append(tmp, *colors ? (*colors)->data : "\033[#000000m"); |
|
230a550b96df
Use a GSList here instead of a GQueue. Yay for simplification.
Mark Doliner <markdoliner@pidgin.im>
parents:
28296
diff
changeset
|
776 | g_string_append_printf(dest, "\033[%sm", f->u.color); |
|
230a550b96df
Use a GSList here instead of a GQueue. Yay for simplification.
Mark Doliner <markdoliner@pidgin.im>
parents:
28296
diff
changeset
|
777 | *colors = g_slist_prepend(*colors, |
|
230a550b96df
Use a GSList here instead of a GQueue. Yay for simplification.
Mark Doliner <markdoliner@pidgin.im>
parents:
28296
diff
changeset
|
778 | g_strdup_printf("\033[%sm", f->u.color)); |
|
230a550b96df
Use a GSList here instead of a GQueue. Yay for simplification.
Mark Doliner <markdoliner@pidgin.im>
parents:
28296
diff
changeset
|
779 | break; |
|
230a550b96df
Use a GSList here instead of a GQueue. Yay for simplification.
Mark Doliner <markdoliner@pidgin.im>
parents:
28296
diff
changeset
|
780 | case FATYPE_FACE: |
|
230a550b96df
Use a GSList here instead of a GQueue. Yay for simplification.
Mark Doliner <markdoliner@pidgin.im>
parents:
28296
diff
changeset
|
781 | if (!needendtag) { |
|
230a550b96df
Use a GSList here instead of a GQueue. Yay for simplification.
Mark Doliner <markdoliner@pidgin.im>
parents:
28296
diff
changeset
|
782 | needendtag = TRUE; |
|
230a550b96df
Use a GSList here instead of a GQueue. Yay for simplification.
Mark Doliner <markdoliner@pidgin.im>
parents:
28296
diff
changeset
|
783 | g_string_append(dest, "<font "); |
|
230a550b96df
Use a GSList here instead of a GQueue. Yay for simplification.
Mark Doliner <markdoliner@pidgin.im>
parents:
28296
diff
changeset
|
784 | } |
| 6629 | 785 | |
|
28297
230a550b96df
Use a GSList here instead of a GQueue. Yay for simplification.
Mark Doliner <markdoliner@pidgin.im>
parents:
28296
diff
changeset
|
786 | g_string_append_printf(dest, "face=\"%s\" ", f->u.face); |
|
230a550b96df
Use a GSList here instead of a GQueue. Yay for simplification.
Mark Doliner <markdoliner@pidgin.im>
parents:
28296
diff
changeset
|
787 | break; |
|
230a550b96df
Use a GSList here instead of a GQueue. Yay for simplification.
Mark Doliner <markdoliner@pidgin.im>
parents:
28296
diff
changeset
|
788 | case FATYPE_SIZE: |
|
230a550b96df
Use a GSList here instead of a GQueue. Yay for simplification.
Mark Doliner <markdoliner@pidgin.im>
parents:
28296
diff
changeset
|
789 | if (!needendtag) { |
|
230a550b96df
Use a GSList here instead of a GQueue. Yay for simplification.
Mark Doliner <markdoliner@pidgin.im>
parents:
28296
diff
changeset
|
790 | needendtag = TRUE; |
|
230a550b96df
Use a GSList here instead of a GQueue. Yay for simplification.
Mark Doliner <markdoliner@pidgin.im>
parents:
28296
diff
changeset
|
791 | g_string_append(dest, "<font "); |
| 6629 | 792 | } |
|
28297
230a550b96df
Use a GSList here instead of a GQueue. Yay for simplification.
Mark Doliner <markdoliner@pidgin.im>
parents:
28296
diff
changeset
|
793 | |
|
230a550b96df
Use a GSList here instead of a GQueue. Yay for simplification.
Mark Doliner <markdoliner@pidgin.im>
parents:
28296
diff
changeset
|
794 | g_string_append_printf(dest, "size=\"%d\" ", f->u.size); |
|
230a550b96df
Use a GSList here instead of a GQueue. Yay for simplification.
Mark Doliner <markdoliner@pidgin.im>
parents:
28296
diff
changeset
|
795 | break; |
| 6629 | 796 | } |
|
28297
230a550b96df
Use a GSList here instead of a GQueue. Yay for simplification.
Mark Doliner <markdoliner@pidgin.im>
parents:
28296
diff
changeset
|
797 | fontattr_free(f); |
|
230a550b96df
Use a GSList here instead of a GQueue. Yay for simplification.
Mark Doliner <markdoliner@pidgin.im>
parents:
28296
diff
changeset
|
798 | } |
| 6629 | 799 | |
|
28297
230a550b96df
Use a GSList here instead of a GQueue. Yay for simplification.
Mark Doliner <markdoliner@pidgin.im>
parents:
28296
diff
changeset
|
800 | if (needendtag) { |
|
230a550b96df
Use a GSList here instead of a GQueue. Yay for simplification.
Mark Doliner <markdoliner@pidgin.im>
parents:
28296
diff
changeset
|
801 | dest->str[dest->len-1] = '>'; |
|
230a550b96df
Use a GSList here instead of a GQueue. Yay for simplification.
Mark Doliner <markdoliner@pidgin.im>
parents:
28296
diff
changeset
|
802 | *tags = g_slist_prepend(*tags, g_strdup("</font>")); |
|
230a550b96df
Use a GSList here instead of a GQueue. Yay for simplification.
Mark Doliner <markdoliner@pidgin.im>
parents:
28296
diff
changeset
|
803 | g_string_free(tmp, TRUE); |
|
230a550b96df
Use a GSList here instead of a GQueue. Yay for simplification.
Mark Doliner <markdoliner@pidgin.im>
parents:
28296
diff
changeset
|
804 | } else { |
|
230a550b96df
Use a GSList here instead of a GQueue. Yay for simplification.
Mark Doliner <markdoliner@pidgin.im>
parents:
28296
diff
changeset
|
805 | *tags = g_slist_prepend(*tags, tmp->str); |
|
230a550b96df
Use a GSList here instead of a GQueue. Yay for simplification.
Mark Doliner <markdoliner@pidgin.im>
parents:
28296
diff
changeset
|
806 | g_string_free(tmp, FALSE); |
| 6629 | 807 | } |
| 808 | } | |
| 809 | ||
| 810 | char *yahoo_html_to_codes(const char *src) | |
| 811 | { | |
|
28101
b82c1e37c9a0
This is actually a stack, not a queue, so we can use a simpler data
Mark Doliner <markdoliner@pidgin.im>
parents:
28100
diff
changeset
|
812 | GSList *colors = NULL; |
|
b82c1e37c9a0
This is actually a stack, not a queue, so we can use a simpler data
Mark Doliner <markdoliner@pidgin.im>
parents:
28100
diff
changeset
|
813 | GSList *tags = NULL; |
|
28036
b9c7f979cd4f
Minor optimization when sending and receiving messages on Yahoo: only
Mark Doliner <markdoliner@pidgin.im>
parents:
28035
diff
changeset
|
814 | size_t src_len; |
|
b9c7f979cd4f
Minor optimization when sending and receiving messages on Yahoo: only
Mark Doliner <markdoliner@pidgin.im>
parents:
28035
diff
changeset
|
815 | int i, j; |
| 6629 | 816 | GString *dest; |
| 28009 | 817 | char *esc; |
|
28292
e1f21cbb9b4d
* Change yahoo_html_to_codes() a little to hopefully be more straight forward
Mark Doliner <markdoliner@pidgin.im>
parents:
28240
diff
changeset
|
818 | gboolean no_more_gt_brackets = FALSE; |
|
e1f21cbb9b4d
* Change yahoo_html_to_codes() a little to hopefully be more straight forward
Mark Doliner <markdoliner@pidgin.im>
parents:
28240
diff
changeset
|
819 | gchar *tag, *tag_name; |
|
e1f21cbb9b4d
* Change yahoo_html_to_codes() a little to hopefully be more straight forward
Mark Doliner <markdoliner@pidgin.im>
parents:
28240
diff
changeset
|
820 | gboolean is_closing_tag; |
|
e1f21cbb9b4d
* Change yahoo_html_to_codes() a little to hopefully be more straight forward
Mark Doliner <markdoliner@pidgin.im>
parents:
28240
diff
changeset
|
821 | CurrentMsgState current_state; |
|
e1f21cbb9b4d
* Change yahoo_html_to_codes() a little to hopefully be more straight forward
Mark Doliner <markdoliner@pidgin.im>
parents:
28240
diff
changeset
|
822 | |
|
e1f21cbb9b4d
* Change yahoo_html_to_codes() a little to hopefully be more straight forward
Mark Doliner <markdoliner@pidgin.im>
parents:
28240
diff
changeset
|
823 | bzero(¤t_state, sizeof(current_state)); |
| 6629 | 824 | |
|
28036
b9c7f979cd4f
Minor optimization when sending and receiving messages on Yahoo: only
Mark Doliner <markdoliner@pidgin.im>
parents:
28035
diff
changeset
|
825 | src_len = strlen(src); |
|
b9c7f979cd4f
Minor optimization when sending and receiving messages on Yahoo: only
Mark Doliner <markdoliner@pidgin.im>
parents:
28035
diff
changeset
|
826 | dest = g_string_sized_new(src_len); |
| 6629 | 827 | |
|
28036
b9c7f979cd4f
Minor optimization when sending and receiving messages on Yahoo: only
Mark Doliner <markdoliner@pidgin.im>
parents:
28035
diff
changeset
|
828 | for (i = 0; i < src_len; i++) { |
|
28292
e1f21cbb9b4d
* Change yahoo_html_to_codes() a little to hopefully be more straight forward
Mark Doliner <markdoliner@pidgin.im>
parents:
28240
diff
changeset
|
829 | if (src[i] == '<' && !no_more_gt_brackets) { |
|
e1f21cbb9b4d
* Change yahoo_html_to_codes() a little to hopefully be more straight forward
Mark Doliner <markdoliner@pidgin.im>
parents:
28240
diff
changeset
|
830 | /* The start of an HTML tag */ |
| 6629 | 831 | j = i; |
| 832 | ||
|
28292
e1f21cbb9b4d
* Change yahoo_html_to_codes() a little to hopefully be more straight forward
Mark Doliner <markdoliner@pidgin.im>
parents:
28240
diff
changeset
|
833 | while (j++ < src_len) { |
|
e1f21cbb9b4d
* Change yahoo_html_to_codes() a little to hopefully be more straight forward
Mark Doliner <markdoliner@pidgin.im>
parents:
28240
diff
changeset
|
834 | if (src[j] != '>') { |
|
e1f21cbb9b4d
* Change yahoo_html_to_codes() a little to hopefully be more straight forward
Mark Doliner <markdoliner@pidgin.im>
parents:
28240
diff
changeset
|
835 | if (src[j] == '"') { |
|
e1f21cbb9b4d
* Change yahoo_html_to_codes() a little to hopefully be more straight forward
Mark Doliner <markdoliner@pidgin.im>
parents:
28240
diff
changeset
|
836 | /* We're inside a quoted attribute value. Skip to the end */ |
|
e1f21cbb9b4d
* Change yahoo_html_to_codes() a little to hopefully be more straight forward
Mark Doliner <markdoliner@pidgin.im>
parents:
28240
diff
changeset
|
837 | j++; |
|
e1f21cbb9b4d
* Change yahoo_html_to_codes() a little to hopefully be more straight forward
Mark Doliner <markdoliner@pidgin.im>
parents:
28240
diff
changeset
|
838 | while (j != src_len && src[j] != '"') |
|
e1f21cbb9b4d
* Change yahoo_html_to_codes() a little to hopefully be more straight forward
Mark Doliner <markdoliner@pidgin.im>
parents:
28240
diff
changeset
|
839 | j++; |
|
e1f21cbb9b4d
* Change yahoo_html_to_codes() a little to hopefully be more straight forward
Mark Doliner <markdoliner@pidgin.im>
parents:
28240
diff
changeset
|
840 | } else if (src[j] == '\'') { |
|
e1f21cbb9b4d
* Change yahoo_html_to_codes() a little to hopefully be more straight forward
Mark Doliner <markdoliner@pidgin.im>
parents:
28240
diff
changeset
|
841 | /* We're inside a quoted attribute value. Skip to the end */ |
|
e1f21cbb9b4d
* Change yahoo_html_to_codes() a little to hopefully be more straight forward
Mark Doliner <markdoliner@pidgin.im>
parents:
28240
diff
changeset
|
842 | j++; |
|
e1f21cbb9b4d
* Change yahoo_html_to_codes() a little to hopefully be more straight forward
Mark Doliner <markdoliner@pidgin.im>
parents:
28240
diff
changeset
|
843 | while (j != src_len && src[j] != '\'') |
|
e1f21cbb9b4d
* Change yahoo_html_to_codes() a little to hopefully be more straight forward
Mark Doliner <markdoliner@pidgin.im>
parents:
28240
diff
changeset
|
844 | j++; |
|
e1f21cbb9b4d
* Change yahoo_html_to_codes() a little to hopefully be more straight forward
Mark Doliner <markdoliner@pidgin.im>
parents:
28240
diff
changeset
|
845 | } |
|
e1f21cbb9b4d
* Change yahoo_html_to_codes() a little to hopefully be more straight forward
Mark Doliner <markdoliner@pidgin.im>
parents:
28240
diff
changeset
|
846 | if (j != src_len) |
|
e1f21cbb9b4d
* Change yahoo_html_to_codes() a little to hopefully be more straight forward
Mark Doliner <markdoliner@pidgin.im>
parents:
28240
diff
changeset
|
847 | /* Keep looking for the end of this tag */ |
|
e1f21cbb9b4d
* Change yahoo_html_to_codes() a little to hopefully be more straight forward
Mark Doliner <markdoliner@pidgin.im>
parents:
28240
diff
changeset
|
848 | continue; |
| 6629 | 849 | |
|
28292
e1f21cbb9b4d
* Change yahoo_html_to_codes() a little to hopefully be more straight forward
Mark Doliner <markdoliner@pidgin.im>
parents:
28240
diff
changeset
|
850 | /* This < has no corresponding > */ |
|
e1f21cbb9b4d
* Change yahoo_html_to_codes() a little to hopefully be more straight forward
Mark Doliner <markdoliner@pidgin.im>
parents:
28240
diff
changeset
|
851 | g_string_append_c(dest, src[i]); |
|
e1f21cbb9b4d
* Change yahoo_html_to_codes() a little to hopefully be more straight forward
Mark Doliner <markdoliner@pidgin.im>
parents:
28240
diff
changeset
|
852 | no_more_gt_brackets = TRUE; |
| 6629 | 853 | break; |
| 854 | } | |
| 855 | ||
|
28292
e1f21cbb9b4d
* Change yahoo_html_to_codes() a little to hopefully be more straight forward
Mark Doliner <markdoliner@pidgin.im>
parents:
28240
diff
changeset
|
856 | tag = g_strndup(src + i, j - i + 1); |
|
e1f21cbb9b4d
* Change yahoo_html_to_codes() a little to hopefully be more straight forward
Mark Doliner <markdoliner@pidgin.im>
parents:
28240
diff
changeset
|
857 | tag_name = yahoo_markup_get_tag_name(tag, &is_closing_tag); |
|
e1f21cbb9b4d
* Change yahoo_html_to_codes() a little to hopefully be more straight forward
Mark Doliner <markdoliner@pidgin.im>
parents:
28240
diff
changeset
|
858 | |
|
e1f21cbb9b4d
* Change yahoo_html_to_codes() a little to hopefully be more straight forward
Mark Doliner <markdoliner@pidgin.im>
parents:
28240
diff
changeset
|
859 | if (g_str_equal(tag_name, "a")) { |
|
28293
8f160f6f9980
Make outgoing yahoo messages with links, font color, font face or font size
Mark Doliner <markdoliner@pidgin.im>
parents:
28292
diff
changeset
|
860 | const char *start; |
|
8f160f6f9980
Make outgoing yahoo messages with links, font color, font face or font size
Mark Doliner <markdoliner@pidgin.im>
parents:
28292
diff
changeset
|
861 | const char *end; |
|
8f160f6f9980
Make outgoing yahoo messages with links, font color, font face or font size
Mark Doliner <markdoliner@pidgin.im>
parents:
28292
diff
changeset
|
862 | GData *attributes; |
|
8f160f6f9980
Make outgoing yahoo messages with links, font color, font face or font size
Mark Doliner <markdoliner@pidgin.im>
parents:
28292
diff
changeset
|
863 | const char *attribute; |
|
8f160f6f9980
Make outgoing yahoo messages with links, font color, font face or font size
Mark Doliner <markdoliner@pidgin.im>
parents:
28292
diff
changeset
|
864 | |
|
8f160f6f9980
Make outgoing yahoo messages with links, font color, font face or font size
Mark Doliner <markdoliner@pidgin.im>
parents:
28292
diff
changeset
|
865 | /* |
|
8f160f6f9980
Make outgoing yahoo messages with links, font color, font face or font size
Mark Doliner <markdoliner@pidgin.im>
parents:
28292
diff
changeset
|
866 | * TODO: Ideally we would replace this: |
|
8f160f6f9980
Make outgoing yahoo messages with links, font color, font face or font size
Mark Doliner <markdoliner@pidgin.im>
parents:
28292
diff
changeset
|
867 | * <a href="http://pidgin.im/">Pidgin</a> |
|
8f160f6f9980
Make outgoing yahoo messages with links, font color, font face or font size
Mark Doliner <markdoliner@pidgin.im>
parents:
28292
diff
changeset
|
868 | * with this: |
|
8f160f6f9980
Make outgoing yahoo messages with links, font color, font face or font size
Mark Doliner <markdoliner@pidgin.im>
parents:
28292
diff
changeset
|
869 | * Pidgin (http://pidgin.im/) |
|
8f160f6f9980
Make outgoing yahoo messages with links, font color, font face or font size
Mark Doliner <markdoliner@pidgin.im>
parents:
28292
diff
changeset
|
870 | * |
|
8f160f6f9980
Make outgoing yahoo messages with links, font color, font face or font size
Mark Doliner <markdoliner@pidgin.im>
parents:
28292
diff
changeset
|
871 | * Currently we drop the text within the <a> tag and |
|
8f160f6f9980
Make outgoing yahoo messages with links, font color, font face or font size
Mark Doliner <markdoliner@pidgin.im>
parents:
28292
diff
changeset
|
872 | * just show the URL. Doing it the fancy way is |
|
8f160f6f9980
Make outgoing yahoo messages with links, font color, font face or font size
Mark Doliner <markdoliner@pidgin.im>
parents:
28292
diff
changeset
|
873 | * complicated when dealing with HTML tags within the |
|
8f160f6f9980
Make outgoing yahoo messages with links, font color, font face or font size
Mark Doliner <markdoliner@pidgin.im>
parents:
28292
diff
changeset
|
874 | * <a> tag. |
|
8f160f6f9980
Make outgoing yahoo messages with links, font color, font face or font size
Mark Doliner <markdoliner@pidgin.im>
parents:
28292
diff
changeset
|
875 | */ |
|
8f160f6f9980
Make outgoing yahoo messages with links, font color, font face or font size
Mark Doliner <markdoliner@pidgin.im>
parents:
28292
diff
changeset
|
876 | |
|
8f160f6f9980
Make outgoing yahoo messages with links, font color, font face or font size
Mark Doliner <markdoliner@pidgin.im>
parents:
28292
diff
changeset
|
877 | /* Append the URL */ |
|
8f160f6f9980
Make outgoing yahoo messages with links, font color, font face or font size
Mark Doliner <markdoliner@pidgin.im>
parents:
28292
diff
changeset
|
878 | purple_markup_find_tag(tag_name, tag, &start, &end, &attributes); |
|
8f160f6f9980
Make outgoing yahoo messages with links, font color, font face or font size
Mark Doliner <markdoliner@pidgin.im>
parents:
28292
diff
changeset
|
879 | attribute = g_datalist_get_data(&attributes, "href"); |
|
8f160f6f9980
Make outgoing yahoo messages with links, font color, font face or font size
Mark Doliner <markdoliner@pidgin.im>
parents:
28292
diff
changeset
|
880 | if (attribute != NULL) { |
|
8f160f6f9980
Make outgoing yahoo messages with links, font color, font face or font size
Mark Doliner <markdoliner@pidgin.im>
parents:
28292
diff
changeset
|
881 | if (purple_str_has_prefix(attribute, "mailto:")) |
|
8f160f6f9980
Make outgoing yahoo messages with links, font color, font face or font size
Mark Doliner <markdoliner@pidgin.im>
parents:
28292
diff
changeset
|
882 | attribute += 7; |
|
8f160f6f9980
Make outgoing yahoo messages with links, font color, font face or font size
Mark Doliner <markdoliner@pidgin.im>
parents:
28292
diff
changeset
|
883 | g_string_append(dest, attribute); |
|
28292
e1f21cbb9b4d
* Change yahoo_html_to_codes() a little to hopefully be more straight forward
Mark Doliner <markdoliner@pidgin.im>
parents:
28240
diff
changeset
|
884 | } |
|
28293
8f160f6f9980
Make outgoing yahoo messages with links, font color, font face or font size
Mark Doliner <markdoliner@pidgin.im>
parents:
28292
diff
changeset
|
885 | g_datalist_clear(&attributes); |
|
8f160f6f9980
Make outgoing yahoo messages with links, font color, font face or font size
Mark Doliner <markdoliner@pidgin.im>
parents:
28292
diff
changeset
|
886 | |
|
8f160f6f9980
Make outgoing yahoo messages with links, font color, font face or font size
Mark Doliner <markdoliner@pidgin.im>
parents:
28292
diff
changeset
|
887 | /* Skip past the closing </a> tag */ |
|
8f160f6f9980
Make outgoing yahoo messages with links, font color, font face or font size
Mark Doliner <markdoliner@pidgin.im>
parents:
28292
diff
changeset
|
888 | end = purple_strcasestr(src + j, "</a>"); |
|
8f160f6f9980
Make outgoing yahoo messages with links, font color, font face or font size
Mark Doliner <markdoliner@pidgin.im>
parents:
28292
diff
changeset
|
889 | if (end != NULL) |
|
8f160f6f9980
Make outgoing yahoo messages with links, font color, font face or font size
Mark Doliner <markdoliner@pidgin.im>
parents:
28292
diff
changeset
|
890 | j = end - src + 3; |
|
28292
e1f21cbb9b4d
* Change yahoo_html_to_codes() a little to hopefully be more straight forward
Mark Doliner <markdoliner@pidgin.im>
parents:
28240
diff
changeset
|
891 | |
|
e1f21cbb9b4d
* Change yahoo_html_to_codes() a little to hopefully be more straight forward
Mark Doliner <markdoliner@pidgin.im>
parents:
28240
diff
changeset
|
892 | } else if (g_str_equal(tag_name, "font")) { |
|
28296
60b4de52913e
Move where the ftattr queue is defined
Mark Doliner <markdoliner@pidgin.im>
parents:
28293
diff
changeset
|
893 | parse_font_tag(src, dest, tag_name, tag, src_len, &colors, &tags); |
|
28292
e1f21cbb9b4d
* Change yahoo_html_to_codes() a little to hopefully be more straight forward
Mark Doliner <markdoliner@pidgin.im>
parents:
28240
diff
changeset
|
894 | } else if (g_str_equal(tag_name, "b")) { |
|
e1f21cbb9b4d
* Change yahoo_html_to_codes() a little to hopefully be more straight forward
Mark Doliner <markdoliner@pidgin.im>
parents:
28240
diff
changeset
|
895 | g_string_append(dest, "\033[1m"); |
|
e1f21cbb9b4d
* Change yahoo_html_to_codes() a little to hopefully be more straight forward
Mark Doliner <markdoliner@pidgin.im>
parents:
28240
diff
changeset
|
896 | current_state.bold = TRUE; |
|
e1f21cbb9b4d
* Change yahoo_html_to_codes() a little to hopefully be more straight forward
Mark Doliner <markdoliner@pidgin.im>
parents:
28240
diff
changeset
|
897 | } else if (g_str_equal(tag_name, "/b")) { |
|
e1f21cbb9b4d
* Change yahoo_html_to_codes() a little to hopefully be more straight forward
Mark Doliner <markdoliner@pidgin.im>
parents:
28240
diff
changeset
|
898 | if (current_state.bold) { |
|
e1f21cbb9b4d
* Change yahoo_html_to_codes() a little to hopefully be more straight forward
Mark Doliner <markdoliner@pidgin.im>
parents:
28240
diff
changeset
|
899 | g_string_append(dest, "\033[x1m"); |
|
e1f21cbb9b4d
* Change yahoo_html_to_codes() a little to hopefully be more straight forward
Mark Doliner <markdoliner@pidgin.im>
parents:
28240
diff
changeset
|
900 | current_state.bold = FALSE; |
|
e1f21cbb9b4d
* Change yahoo_html_to_codes() a little to hopefully be more straight forward
Mark Doliner <markdoliner@pidgin.im>
parents:
28240
diff
changeset
|
901 | } |
|
e1f21cbb9b4d
* Change yahoo_html_to_codes() a little to hopefully be more straight forward
Mark Doliner <markdoliner@pidgin.im>
parents:
28240
diff
changeset
|
902 | } else if (g_str_equal(tag_name, "i")) { |
|
e1f21cbb9b4d
* Change yahoo_html_to_codes() a little to hopefully be more straight forward
Mark Doliner <markdoliner@pidgin.im>
parents:
28240
diff
changeset
|
903 | current_state.italic = TRUE; |
|
e1f21cbb9b4d
* Change yahoo_html_to_codes() a little to hopefully be more straight forward
Mark Doliner <markdoliner@pidgin.im>
parents:
28240
diff
changeset
|
904 | g_string_append(dest, "\033[2m"); |
|
e1f21cbb9b4d
* Change yahoo_html_to_codes() a little to hopefully be more straight forward
Mark Doliner <markdoliner@pidgin.im>
parents:
28240
diff
changeset
|
905 | } else if (g_str_equal(tag_name, "/i")) { |
|
e1f21cbb9b4d
* Change yahoo_html_to_codes() a little to hopefully be more straight forward
Mark Doliner <markdoliner@pidgin.im>
parents:
28240
diff
changeset
|
906 | if (current_state.italic) { |
|
e1f21cbb9b4d
* Change yahoo_html_to_codes() a little to hopefully be more straight forward
Mark Doliner <markdoliner@pidgin.im>
parents:
28240
diff
changeset
|
907 | g_string_append(dest, "\033[x2m"); |
|
e1f21cbb9b4d
* Change yahoo_html_to_codes() a little to hopefully be more straight forward
Mark Doliner <markdoliner@pidgin.im>
parents:
28240
diff
changeset
|
908 | current_state.italic = FALSE; |
|
e1f21cbb9b4d
* Change yahoo_html_to_codes() a little to hopefully be more straight forward
Mark Doliner <markdoliner@pidgin.im>
parents:
28240
diff
changeset
|
909 | } |
|
e1f21cbb9b4d
* Change yahoo_html_to_codes() a little to hopefully be more straight forward
Mark Doliner <markdoliner@pidgin.im>
parents:
28240
diff
changeset
|
910 | } else if (g_str_equal(tag_name, "u")) { |
|
e1f21cbb9b4d
* Change yahoo_html_to_codes() a little to hopefully be more straight forward
Mark Doliner <markdoliner@pidgin.im>
parents:
28240
diff
changeset
|
911 | current_state.underline = TRUE; |
|
e1f21cbb9b4d
* Change yahoo_html_to_codes() a little to hopefully be more straight forward
Mark Doliner <markdoliner@pidgin.im>
parents:
28240
diff
changeset
|
912 | g_string_append(dest, "\033[4m"); |
|
e1f21cbb9b4d
* Change yahoo_html_to_codes() a little to hopefully be more straight forward
Mark Doliner <markdoliner@pidgin.im>
parents:
28240
diff
changeset
|
913 | } else if (g_str_equal(tag_name, "/u")) { |
|
e1f21cbb9b4d
* Change yahoo_html_to_codes() a little to hopefully be more straight forward
Mark Doliner <markdoliner@pidgin.im>
parents:
28240
diff
changeset
|
914 | if (current_state.underline) { |
|
e1f21cbb9b4d
* Change yahoo_html_to_codes() a little to hopefully be more straight forward
Mark Doliner <markdoliner@pidgin.im>
parents:
28240
diff
changeset
|
915 | g_string_append(dest, "\033[x4m"); |
|
e1f21cbb9b4d
* Change yahoo_html_to_codes() a little to hopefully be more straight forward
Mark Doliner <markdoliner@pidgin.im>
parents:
28240
diff
changeset
|
916 | current_state.underline = FALSE; |
|
e1f21cbb9b4d
* Change yahoo_html_to_codes() a little to hopefully be more straight forward
Mark Doliner <markdoliner@pidgin.im>
parents:
28240
diff
changeset
|
917 | } |
|
e1f21cbb9b4d
* Change yahoo_html_to_codes() a little to hopefully be more straight forward
Mark Doliner <markdoliner@pidgin.im>
parents:
28240
diff
changeset
|
918 | } else if (g_str_equal(tag_name, "/a")) { |
|
28293
8f160f6f9980
Make outgoing yahoo messages with links, font color, font face or font size
Mark Doliner <markdoliner@pidgin.im>
parents:
28292
diff
changeset
|
919 | /* Do nothing */ |
|
28292
e1f21cbb9b4d
* Change yahoo_html_to_codes() a little to hopefully be more straight forward
Mark Doliner <markdoliner@pidgin.im>
parents:
28240
diff
changeset
|
920 | } else if (g_str_equal(tag_name, "br")) { |
|
e1f21cbb9b4d
* Change yahoo_html_to_codes() a little to hopefully be more straight forward
Mark Doliner <markdoliner@pidgin.im>
parents:
28240
diff
changeset
|
921 | g_string_append_c(dest, '\n'); |
|
e1f21cbb9b4d
* Change yahoo_html_to_codes() a little to hopefully be more straight forward
Mark Doliner <markdoliner@pidgin.im>
parents:
28240
diff
changeset
|
922 | } else if (g_str_equal(tag_name, "/font")) { |
|
e1f21cbb9b4d
* Change yahoo_html_to_codes() a little to hopefully be more straight forward
Mark Doliner <markdoliner@pidgin.im>
parents:
28240
diff
changeset
|
923 | if (tags != NULL) { |
|
e1f21cbb9b4d
* Change yahoo_html_to_codes() a little to hopefully be more straight forward
Mark Doliner <markdoliner@pidgin.im>
parents:
28240
diff
changeset
|
924 | char *etag = tags->data; |
|
e1f21cbb9b4d
* Change yahoo_html_to_codes() a little to hopefully be more straight forward
Mark Doliner <markdoliner@pidgin.im>
parents:
28240
diff
changeset
|
925 | tags = g_slist_delete_link(tags, tags); |
|
e1f21cbb9b4d
* Change yahoo_html_to_codes() a little to hopefully be more straight forward
Mark Doliner <markdoliner@pidgin.im>
parents:
28240
diff
changeset
|
926 | g_string_append(dest, etag); |
|
e1f21cbb9b4d
* Change yahoo_html_to_codes() a little to hopefully be more straight forward
Mark Doliner <markdoliner@pidgin.im>
parents:
28240
diff
changeset
|
927 | if (g_str_equal(etag, "</font>")) { |
|
e1f21cbb9b4d
* Change yahoo_html_to_codes() a little to hopefully be more straight forward
Mark Doliner <markdoliner@pidgin.im>
parents:
28240
diff
changeset
|
928 | if (colors != NULL) { |
|
e1f21cbb9b4d
* Change yahoo_html_to_codes() a little to hopefully be more straight forward
Mark Doliner <markdoliner@pidgin.im>
parents:
28240
diff
changeset
|
929 | g_free(colors->data); |
|
e1f21cbb9b4d
* Change yahoo_html_to_codes() a little to hopefully be more straight forward
Mark Doliner <markdoliner@pidgin.im>
parents:
28240
diff
changeset
|
930 | colors = g_slist_delete_link(colors, colors); |
|
16169
4aa4ec9afa9c
Stop Yahoo sending SPAN tags, fixes Yahoo part of ticket 78
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
15884
diff
changeset
|
931 | } |
|
4aa4ec9afa9c
Stop Yahoo sending SPAN tags, fixes Yahoo part of ticket 78
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
15884
diff
changeset
|
932 | } |
|
28292
e1f21cbb9b4d
* Change yahoo_html_to_codes() a little to hopefully be more straight forward
Mark Doliner <markdoliner@pidgin.im>
parents:
28240
diff
changeset
|
933 | g_free(etag); |
| 6629 | 934 | } |
| 935 | } | |
| 936 | ||
|
28292
e1f21cbb9b4d
* Change yahoo_html_to_codes() a little to hopefully be more straight forward
Mark Doliner <markdoliner@pidgin.im>
parents:
28240
diff
changeset
|
937 | i = j; |
|
e1f21cbb9b4d
* Change yahoo_html_to_codes() a little to hopefully be more straight forward
Mark Doliner <markdoliner@pidgin.im>
parents:
28240
diff
changeset
|
938 | g_free(tag); |
|
e1f21cbb9b4d
* Change yahoo_html_to_codes() a little to hopefully be more straight forward
Mark Doliner <markdoliner@pidgin.im>
parents:
28240
diff
changeset
|
939 | g_free(tag_name); |
|
e1f21cbb9b4d
* Change yahoo_html_to_codes() a little to hopefully be more straight forward
Mark Doliner <markdoliner@pidgin.im>
parents:
28240
diff
changeset
|
940 | break; |
| 6629 | 941 | } |
| 942 | ||
| 943 | } else { | |
|
28103
3d1f5d123294
Reuse our purple_markup_unescape_entity() function instead of
Mark Doliner <markdoliner@pidgin.im>
parents:
28102
diff
changeset
|
944 | const char *entity; |
|
3d1f5d123294
Reuse our purple_markup_unescape_entity() function instead of
Mark Doliner <markdoliner@pidgin.im>
parents:
28102
diff
changeset
|
945 | int length; |
|
3d1f5d123294
Reuse our purple_markup_unescape_entity() function instead of
Mark Doliner <markdoliner@pidgin.im>
parents:
28102
diff
changeset
|
946 | |
|
3d1f5d123294
Reuse our purple_markup_unescape_entity() function instead of
Mark Doliner <markdoliner@pidgin.im>
parents:
28102
diff
changeset
|
947 | entity = purple_markup_unescape_entity(src + i, &length); |
|
3d1f5d123294
Reuse our purple_markup_unescape_entity() function instead of
Mark Doliner <markdoliner@pidgin.im>
parents:
28102
diff
changeset
|
948 | if (entity != NULL) { |
|
3d1f5d123294
Reuse our purple_markup_unescape_entity() function instead of
Mark Doliner <markdoliner@pidgin.im>
parents:
28102
diff
changeset
|
949 | /* src[i] is the start of an HTML entity */ |
|
3d1f5d123294
Reuse our purple_markup_unescape_entity() function instead of
Mark Doliner <markdoliner@pidgin.im>
parents:
28102
diff
changeset
|
950 | g_string_append(dest, entity); |
|
3d1f5d123294
Reuse our purple_markup_unescape_entity() function instead of
Mark Doliner <markdoliner@pidgin.im>
parents:
28102
diff
changeset
|
951 | i += length - 1; |
|
3d1f5d123294
Reuse our purple_markup_unescape_entity() function instead of
Mark Doliner <markdoliner@pidgin.im>
parents:
28102
diff
changeset
|
952 | } else |
|
3d1f5d123294
Reuse our purple_markup_unescape_entity() function instead of
Mark Doliner <markdoliner@pidgin.im>
parents:
28102
diff
changeset
|
953 | /* src[i] is a normal character */ |
| 8440 | 954 | g_string_append_c(dest, src[i]); |
| 6629 | 955 | } |
| 956 | } | |
| 957 | ||
| 28009 | 958 | esc = g_strescape(dest->str, NULL); |
|
28293
8f160f6f9980
Make outgoing yahoo messages with links, font color, font face or font size
Mark Doliner <markdoliner@pidgin.im>
parents:
28292
diff
changeset
|
959 | purple_debug_misc("yahoo", "yahoo_html_to_codes(%s)=%s\n", src, esc); |
| 6629 | 960 | g_free(esc); |
| 961 | ||
|
28101
b82c1e37c9a0
This is actually a stack, not a queue, so we can use a simpler data
Mark Doliner <markdoliner@pidgin.im>
parents:
28100
diff
changeset
|
962 | yahoo_htc_list_cleanup(colors); |
|
b82c1e37c9a0
This is actually a stack, not a queue, so we can use a simpler data
Mark Doliner <markdoliner@pidgin.im>
parents:
28100
diff
changeset
|
963 | yahoo_htc_list_cleanup(tags); |
| 6629 | 964 | |
| 28009 | 965 | return g_string_free(dest, FALSE); |
| 6629 | 966 | } |