Fri, 31 Jul 2009 08:39:03 +0000
nomoreendtags is used as a boolean, so set the variable type appropriately
And add some underscores for readability
| 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 | /* |
| 187 | * 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
|
188 | * 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
|
189 | * |
| 6513 | 190 | * [0;30m ---black |
| 191 | * [1;37m ---white | |
| 192 | * [0;37m ---tan | |
| 193 | * [0;38m ---light black | |
| 194 | * [1;39m ---dark blue | |
| 195 | * [0;32m ---green | |
| 196 | * [0;33m ---yellow | |
| 197 | * [0;35m ---pink | |
| 198 | * [1;35m ---purple | |
| 199 | * [1;30m ---light blue | |
| 200 | * [0;31m ---red | |
| 201 | * [0;34m ---blue | |
| 202 | * [0;36m ---aqua | |
| 203 | * (shift+comma)lyellow(shift+period) ---light yellow | |
| 204 | * (shift+comma)lgreen(shift+period) ---light green | |
| 205 | [2;30m <--white out | |
| 206 | */ | |
| 207 | ||
| 208 | static GHashTable *ht = NULL; | |
| 209 | ||
| 210 | void yahoo_init_colorht() | |
| 211 | { | |
|
27683
9ee099fab4ee
Don't double-free the color hash table when deinitializing both prpl-yahoo
Mark Doliner <markdoliner@pidgin.im>
parents:
27555
diff
changeset
|
212 | if (ht != NULL) |
|
9ee099fab4ee
Don't double-free the color hash table when deinitializing both prpl-yahoo
Mark Doliner <markdoliner@pidgin.im>
parents:
27555
diff
changeset
|
213 | /* 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
|
214 | return; |
|
9ee099fab4ee
Don't double-free the color hash table when deinitializing both prpl-yahoo
Mark Doliner <markdoliner@pidgin.im>
parents:
27555
diff
changeset
|
215 | |
| 6513 | 216 | ht = g_hash_table_new(g_str_hash, g_str_equal); |
|
27683
9ee099fab4ee
Don't double-free the color hash table when deinitializing both prpl-yahoo
Mark Doliner <markdoliner@pidgin.im>
parents:
27555
diff
changeset
|
217 | /* the numbers in comments are what gyach uses, but i think they're incorrect */ |
|
28016
b29a702b1176
Change Yahoo to send <span> tags with a color style attribute instead of <font>
Mark Doliner <markdoliner@pidgin.im>
parents:
28015
diff
changeset
|
218 | g_hash_table_insert(ht, "30", "<span style=\"color: #000000\">"); /* black */ |
|
b29a702b1176
Change Yahoo to send <span> tags with a color style attribute instead of <font>
Mark Doliner <markdoliner@pidgin.im>
parents:
28015
diff
changeset
|
219 | g_hash_table_insert(ht, "31", "<span style=\"color: #0000FF\">"); /* blue */ |
|
b29a702b1176
Change Yahoo to send <span> tags with a color style attribute instead of <font>
Mark Doliner <markdoliner@pidgin.im>
parents:
28015
diff
changeset
|
220 | g_hash_table_insert(ht, "32", "<span style=\"color: #008080\">"); /* cyan */ /* 00b2b2 */ |
|
b29a702b1176
Change Yahoo to send <span> tags with a color style attribute instead of <font>
Mark Doliner <markdoliner@pidgin.im>
parents:
28015
diff
changeset
|
221 | g_hash_table_insert(ht, "33", "<span style=\"color: #808080\">"); /* gray */ /* 808080 */ |
|
b29a702b1176
Change Yahoo to send <span> tags with a color style attribute instead of <font>
Mark Doliner <markdoliner@pidgin.im>
parents:
28015
diff
changeset
|
222 | g_hash_table_insert(ht, "34", "<span style=\"color: #008000\">"); /* green */ /* 00c200 */ |
|
b29a702b1176
Change Yahoo to send <span> tags with a color style attribute instead of <font>
Mark Doliner <markdoliner@pidgin.im>
parents:
28015
diff
changeset
|
223 | g_hash_table_insert(ht, "35", "<span style=\"color: #FF0080\">"); /* pink */ /* ffafaf */ |
|
b29a702b1176
Change Yahoo to send <span> tags with a color style attribute instead of <font>
Mark Doliner <markdoliner@pidgin.im>
parents:
28015
diff
changeset
|
224 | g_hash_table_insert(ht, "36", "<span style=\"color: #800080\">"); /* purple */ /* b200b2 */ |
|
b29a702b1176
Change Yahoo to send <span> tags with a color style attribute instead of <font>
Mark Doliner <markdoliner@pidgin.im>
parents:
28015
diff
changeset
|
225 | g_hash_table_insert(ht, "37", "<span style=\"color: #FF8000\">"); /* orange */ /* ffff00 */ |
|
b29a702b1176
Change Yahoo to send <span> tags with a color style attribute instead of <font>
Mark Doliner <markdoliner@pidgin.im>
parents:
28015
diff
changeset
|
226 | g_hash_table_insert(ht, "38", "<span style=\"color: #FF0000\">"); /* red */ |
|
b29a702b1176
Change Yahoo to send <span> tags with a color style attribute instead of <font>
Mark Doliner <markdoliner@pidgin.im>
parents:
28015
diff
changeset
|
227 | g_hash_table_insert(ht, "39", "<span style=\"color: #808000\">"); /* olive */ /* 546b50 */ |
| 6513 | 228 | |
|
28015
c09be470c8ec
Whoops, I forgot to add the test!
Mark Doliner <markdoliner@pidgin.im>
parents:
28011
diff
changeset
|
229 | g_hash_table_insert(ht, "1", "<b>"); |
|
c09be470c8ec
Whoops, I forgot to add the test!
Mark Doliner <markdoliner@pidgin.im>
parents:
28011
diff
changeset
|
230 | g_hash_table_insert(ht, "x1", "</b>"); |
|
c09be470c8ec
Whoops, I forgot to add the test!
Mark Doliner <markdoliner@pidgin.im>
parents:
28011
diff
changeset
|
231 | g_hash_table_insert(ht, "2", "<i>"); |
|
c09be470c8ec
Whoops, I forgot to add the test!
Mark Doliner <markdoliner@pidgin.im>
parents:
28011
diff
changeset
|
232 | g_hash_table_insert(ht, "x2", "</i>"); |
|
c09be470c8ec
Whoops, I forgot to add the test!
Mark Doliner <markdoliner@pidgin.im>
parents:
28011
diff
changeset
|
233 | g_hash_table_insert(ht, "4", "<u>"); |
|
c09be470c8ec
Whoops, I forgot to add the test!
Mark Doliner <markdoliner@pidgin.im>
parents:
28011
diff
changeset
|
234 | g_hash_table_insert(ht, "x4", "</u>"); |
| 6513 | 235 | |
| 6629 | 236 | /* these just tell us the text they surround is supposed |
| 15884 | 237 | * to be a link. purple figures that out on its own so we |
| 6629 | 238 | * just ignore it. |
| 239 | */ | |
| 240 | g_hash_table_insert(ht, "l", ""); /* link start */ | |
| 241 | g_hash_table_insert(ht, "xl", ""); /* link end */ | |
| 242 | ||
|
28016
b29a702b1176
Change Yahoo to send <span> tags with a color style attribute instead of <font>
Mark Doliner <markdoliner@pidgin.im>
parents:
28015
diff
changeset
|
243 | g_hash_table_insert(ht, "<black>", "<span style=\"color: #000000\">"); |
|
b29a702b1176
Change Yahoo to send <span> tags with a color style attribute instead of <font>
Mark Doliner <markdoliner@pidgin.im>
parents:
28015
diff
changeset
|
244 | g_hash_table_insert(ht, "<blue>", "<span style=\"color: #0000FF\">"); |
|
b29a702b1176
Change Yahoo to send <span> tags with a color style attribute instead of <font>
Mark Doliner <markdoliner@pidgin.im>
parents:
28015
diff
changeset
|
245 | g_hash_table_insert(ht, "<cyan>", "<span style=\"color: #008284\">"); |
|
b29a702b1176
Change Yahoo to send <span> tags with a color style attribute instead of <font>
Mark Doliner <markdoliner@pidgin.im>
parents:
28015
diff
changeset
|
246 | g_hash_table_insert(ht, "<gray>", "<span style=\"color: #848284\">"); |
|
b29a702b1176
Change Yahoo to send <span> tags with a color style attribute instead of <font>
Mark Doliner <markdoliner@pidgin.im>
parents:
28015
diff
changeset
|
247 | g_hash_table_insert(ht, "<green>", "<span style=\"color: #008200\">"); |
|
b29a702b1176
Change Yahoo to send <span> tags with a color style attribute instead of <font>
Mark Doliner <markdoliner@pidgin.im>
parents:
28015
diff
changeset
|
248 | g_hash_table_insert(ht, "<pink>", "<span style=\"color: #FF0084\">"); |
|
b29a702b1176
Change Yahoo to send <span> tags with a color style attribute instead of <font>
Mark Doliner <markdoliner@pidgin.im>
parents:
28015
diff
changeset
|
249 | g_hash_table_insert(ht, "<purple>", "<span style=\"color: #840084\">"); |
|
b29a702b1176
Change Yahoo to send <span> tags with a color style attribute instead of <font>
Mark Doliner <markdoliner@pidgin.im>
parents:
28015
diff
changeset
|
250 | g_hash_table_insert(ht, "<orange>", "<span style=\"color: #FF8000\">"); |
|
b29a702b1176
Change Yahoo to send <span> tags with a color style attribute instead of <font>
Mark Doliner <markdoliner@pidgin.im>
parents:
28015
diff
changeset
|
251 | g_hash_table_insert(ht, "<red>", "<span style=\"color: #FF0000\">"); |
|
b29a702b1176
Change Yahoo to send <span> tags with a color style attribute instead of <font>
Mark Doliner <markdoliner@pidgin.im>
parents:
28015
diff
changeset
|
252 | g_hash_table_insert(ht, "<yellow>", "<span style=\"color: #848200\">"); |
| 6513 | 253 | |
|
28016
b29a702b1176
Change Yahoo to send <span> tags with a color style attribute instead of <font>
Mark Doliner <markdoliner@pidgin.im>
parents:
28015
diff
changeset
|
254 | g_hash_table_insert(ht, "</black>", "</span>"); |
|
b29a702b1176
Change Yahoo to send <span> tags with a color style attribute instead of <font>
Mark Doliner <markdoliner@pidgin.im>
parents:
28015
diff
changeset
|
255 | g_hash_table_insert(ht, "</blue>", "</span>"); |
|
b29a702b1176
Change Yahoo to send <span> tags with a color style attribute instead of <font>
Mark Doliner <markdoliner@pidgin.im>
parents:
28015
diff
changeset
|
256 | g_hash_table_insert(ht, "</cyan>", "</span>"); |
|
b29a702b1176
Change Yahoo to send <span> tags with a color style attribute instead of <font>
Mark Doliner <markdoliner@pidgin.im>
parents:
28015
diff
changeset
|
257 | g_hash_table_insert(ht, "</gray>", "</span>"); |
|
b29a702b1176
Change Yahoo to send <span> tags with a color style attribute instead of <font>
Mark Doliner <markdoliner@pidgin.im>
parents:
28015
diff
changeset
|
258 | g_hash_table_insert(ht, "</green>", "</span>"); |
|
b29a702b1176
Change Yahoo to send <span> tags with a color style attribute instead of <font>
Mark Doliner <markdoliner@pidgin.im>
parents:
28015
diff
changeset
|
259 | g_hash_table_insert(ht, "</pink>", "</span>"); |
|
b29a702b1176
Change Yahoo to send <span> tags with a color style attribute instead of <font>
Mark Doliner <markdoliner@pidgin.im>
parents:
28015
diff
changeset
|
260 | g_hash_table_insert(ht, "</purple>", "</span>"); |
|
b29a702b1176
Change Yahoo to send <span> tags with a color style attribute instead of <font>
Mark Doliner <markdoliner@pidgin.im>
parents:
28015
diff
changeset
|
261 | g_hash_table_insert(ht, "</orange>", "</span>"); |
|
b29a702b1176
Change Yahoo to send <span> tags with a color style attribute instead of <font>
Mark Doliner <markdoliner@pidgin.im>
parents:
28015
diff
changeset
|
262 | g_hash_table_insert(ht, "</red>", "</span>"); |
|
b29a702b1176
Change Yahoo to send <span> tags with a color style attribute instead of <font>
Mark Doliner <markdoliner@pidgin.im>
parents:
28015
diff
changeset
|
263 | g_hash_table_insert(ht, "</yellow>", "</span>"); |
| 6513 | 264 | |
| 265 | /* remove these once we have proper support for <FADE> and <ALT> */ | |
| 266 | g_hash_table_insert(ht, "</fade>", ""); | |
| 267 | g_hash_table_insert(ht, "</alt>", ""); | |
| 8375 | 268 | |
| 269 | /* these are the normal html yahoo sends (besides <font>). | |
| 270 | * anything else will get turned into <tag>, so if I forgot | |
| 271 | * about something, please add it. Why Yahoo! has to send unescaped | |
| 272 | * <'s and >'s that aren't supposed to be html is beyond me. | |
| 273 | */ | |
| 274 | g_hash_table_insert(ht, "<b>", "<b>"); | |
| 275 | g_hash_table_insert(ht, "<i>", "<i>"); | |
| 276 | g_hash_table_insert(ht, "<u>", "<u>"); | |
| 277 | ||
| 278 | g_hash_table_insert(ht, "</b>", "</b>"); | |
| 279 | g_hash_table_insert(ht, "</i>", "</i>"); | |
| 280 | g_hash_table_insert(ht, "</u>", "</u>"); | |
| 8440 | 281 | g_hash_table_insert(ht, "</font>", "</font>"); |
| 6513 | 282 | } |
| 283 | ||
| 284 | void yahoo_dest_colorht() | |
| 285 | { | |
|
27683
9ee099fab4ee
Don't double-free the color hash table when deinitializing both prpl-yahoo
Mark Doliner <markdoliner@pidgin.im>
parents:
27555
diff
changeset
|
286 | if (ht == NULL) |
|
9ee099fab4ee
Don't double-free the color hash table when deinitializing both prpl-yahoo
Mark Doliner <markdoliner@pidgin.im>
parents:
27555
diff
changeset
|
287 | /* 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
|
288 | return; |
|
9ee099fab4ee
Don't double-free the color hash table when deinitializing both prpl-yahoo
Mark Doliner <markdoliner@pidgin.im>
parents:
27555
diff
changeset
|
289 | |
| 6513 | 290 | g_hash_table_destroy(ht); |
|
27683
9ee099fab4ee
Don't double-free the color hash table when deinitializing both prpl-yahoo
Mark Doliner <markdoliner@pidgin.im>
parents:
27555
diff
changeset
|
291 | ht = NULL; |
| 6513 | 292 | } |
| 293 | ||
| 6629 | 294 | static int point_to_html(int x) |
| 295 | { | |
| 296 | if (x < 9) | |
| 297 | return 1; | |
| 298 | if (x < 11) | |
| 299 | return 2; | |
| 300 | if (x < 13) | |
| 301 | return 3; | |
| 302 | if (x < 17) | |
| 303 | return 4; | |
| 304 | if (x < 25) | |
| 305 | return 5; | |
| 306 | if (x < 35) | |
| 307 | return 6; | |
| 308 | return 7; | |
| 309 | } | |
|
10380
8608e553808f
[gaim-migrate @ 11605]
Evan Schoenberg <evands@pidgin.im>
parents:
10023
diff
changeset
|
310 | |
|
8608e553808f
[gaim-migrate @ 11605]
Evan Schoenberg <evands@pidgin.im>
parents:
10023
diff
changeset
|
311 | /* The Yahoo size tag is actually an absz tag; convert it to an HTML size, and include both tags */ |
| 6629 | 312 | static void _font_tags_fix_size(GString *tag, GString *dest) |
| 313 | { | |
| 314 | char *x, *end; | |
| 315 | int size; | |
| 316 | ||
|
13710
c8376b63ca31
[gaim-migrate @ 16112]
Richard Laager <rlaager@pidgin.im>
parents:
11644
diff
changeset
|
317 | if (((x = strstr(tag->str, "size"))) && ((x = strchr(x, '=')))) { |
| 6629 | 318 | while (*x && !g_ascii_isdigit(*x)) |
| 319 | x++; | |
| 320 | if (*x) { | |
|
10380
8608e553808f
[gaim-migrate @ 11605]
Evan Schoenberg <evands@pidgin.im>
parents:
10023
diff
changeset
|
321 | int htmlsize; |
|
8608e553808f
[gaim-migrate @ 11605]
Evan Schoenberg <evands@pidgin.im>
parents:
10023
diff
changeset
|
322 | |
| 6629 | 323 | size = strtol(x, &end, 10); |
|
10380
8608e553808f
[gaim-migrate @ 11605]
Evan Schoenberg <evands@pidgin.im>
parents:
10023
diff
changeset
|
324 | htmlsize = point_to_html(size); |
| 6629 | 325 | g_string_append_len(dest, tag->str, x - tag->str); |
|
10380
8608e553808f
[gaim-migrate @ 11605]
Evan Schoenberg <evands@pidgin.im>
parents:
10023
diff
changeset
|
326 | g_string_append_printf(dest, "%d", htmlsize); |
|
8608e553808f
[gaim-migrate @ 11605]
Evan Schoenberg <evands@pidgin.im>
parents:
10023
diff
changeset
|
327 | g_string_append_printf(dest, "\" absz=\"%d", size); |
| 6629 | 328 | g_string_append(dest, end); |
| 329 | } else { | |
| 330 | g_string_append(dest, tag->str); | |
| 331 | return; | |
| 332 | } | |
| 333 | } else { | |
| 334 | g_string_append(dest, tag->str); | |
| 335 | return; | |
| 336 | } | |
| 337 | } | |
| 338 | ||
| 339 | char *yahoo_codes_to_html(const char *x) | |
| 6513 | 340 | { |
| 341 | GString *s, *tmp; | |
|
28035
710e345f1edd
nomoreendtags is used as a boolean, so set the variable type appropriately
Mark Doliner <markdoliner@pidgin.im>
parents:
28016
diff
changeset
|
342 | int i, j, xs; |
|
710e345f1edd
nomoreendtags is used as a boolean, so set the variable type appropriately
Mark Doliner <markdoliner@pidgin.im>
parents:
28016
diff
changeset
|
343 | gboolean no_more_end_tags = FALSE; /* s/endtags/closinganglebrackets */ |
| 28009 | 344 | char *match; |
| 6513 | 345 | |
| 346 | s = g_string_sized_new(strlen(x)); | |
| 347 | ||
| 348 | for (i = 0, xs = strlen(x); i < xs; i++) { | |
| 349 | if ((x[i] == 0x1b) && (x[i+1] == '[')) { | |
| 350 | j = i + 1; | |
| 351 | ||
| 352 | while (j++ < xs) { | |
| 353 | if (x[j] != 'm') | |
| 354 | continue; | |
| 355 | else { | |
| 356 | tmp = g_string_new_len(x + i + 2, j - i - 2); | |
|
6621
2a18ef3e5224
[gaim-migrate @ 7145]
Robert McQueen <robot101@debian.org>
parents:
6546
diff
changeset
|
357 | if (tmp->str[0] == '#') |
|
28016
b29a702b1176
Change Yahoo to send <span> tags with a color style attribute instead of <font>
Mark Doliner <markdoliner@pidgin.im>
parents:
28015
diff
changeset
|
358 | g_string_append_printf(s, "<span style=\"color: %s\">", tmp->str); |
|
6546
6a14dfe43d5c
[gaim-migrate @ 7068]
Mark Doliner <markdoliner@pidgin.im>
parents:
6513
diff
changeset
|
359 | else if ((match = (char *) g_hash_table_lookup(ht, tmp->str))) |
| 6513 | 360 | g_string_append(s, match); |
| 361 | else { | |
|
27547
c136491361eb
Convert the yahoo prpl to using the debug convenience functions instead of
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
27361
diff
changeset
|
362 | purple_debug_error("yahoo", |
| 6513 | 363 | "Unknown ansi code 'ESC[%sm'.\n", tmp->str); |
| 364 | g_string_free(tmp, TRUE); | |
| 365 | break; | |
| 366 | } | |
| 367 | ||
| 368 | i = j; | |
| 369 | g_string_free(tmp, TRUE); | |
| 370 | break; | |
| 371 | } | |
| 372 | } | |
| 373 | ||
|
28035
710e345f1edd
nomoreendtags is used as a boolean, so set the variable type appropriately
Mark Doliner <markdoliner@pidgin.im>
parents:
28016
diff
changeset
|
374 | } else if (!no_more_end_tags && (x[i] == '<')) { |
| 6629 | 375 | j = i; |
| 6513 | 376 | |
| 377 | while (j++ < xs) { | |
| 378 | if (x[j] != '>') | |
| 379 | if (j == xs) { | |
| 8375 | 380 | g_string_append(s, "<"); |
|
28035
710e345f1edd
nomoreendtags is used as a boolean, so set the variable type appropriately
Mark Doliner <markdoliner@pidgin.im>
parents:
28016
diff
changeset
|
381 | no_more_end_tags = TRUE; |
| 6513 | 382 | } |
| 383 | else | |
| 384 | continue; | |
| 385 | else { | |
| 386 | tmp = g_string_new_len(x + i, j - i + 1); | |
| 387 | g_string_ascii_down(tmp); | |
| 388 | ||
|
6546
6a14dfe43d5c
[gaim-migrate @ 7068]
Mark Doliner <markdoliner@pidgin.im>
parents:
6513
diff
changeset
|
389 | if ((match = (char *) g_hash_table_lookup(ht, tmp->str))) |
| 6513 | 390 | g_string_append(s, match); |
| 6629 | 391 | else if (!strncmp(tmp->str, "<fade ", 6) || |
| 392 | !strncmp(tmp->str, "<alt ", 5) || | |
| 393 | !strncmp(tmp->str, "<snd ", 5)) { | |
| 6513 | 394 | |
| 6629 | 395 | /* remove this if gtkimhtml ever supports any of these */ |
| 6513 | 396 | i = j; |
| 397 | g_string_free(tmp, TRUE); | |
| 398 | break; | |
| 399 | ||
| 6629 | 400 | } else if (!strncmp(tmp->str, "<font ", 6)) { |
| 401 | _font_tags_fix_size(tmp, s); | |
| 6513 | 402 | } else { |
| 8375 | 403 | g_string_append(s, "<"); |
| 6513 | 404 | g_string_free(tmp, TRUE); |
| 405 | break; | |
| 406 | } | |
| 407 | ||
| 408 | i = j; | |
| 409 | g_string_free(tmp, TRUE); | |
| 410 | break; | |
| 411 | } | |
| 412 | ||
| 413 | } | |
| 414 | ||
| 415 | } else { | |
| 8375 | 416 | if (x[i] == '<') |
| 417 | g_string_append(s, "<"); | |
| 418 | else if (x[i] == '>') | |
| 419 | g_string_append(s, ">"); | |
| 8440 | 420 | else if (x[i] == '&') |
| 421 | g_string_append(s, "&"); | |
| 422 | else if (x[i] == '"') | |
| 423 | g_string_append(s, """); | |
| 8375 | 424 | else |
| 425 | g_string_append_c(s, x[i]); | |
| 6513 | 426 | } |
| 427 | } | |
| 428 | ||
| 28009 | 429 | purple_debug_misc("yahoo", "yahoo_codes_to_html: Returning string: '%s'.\n", s->str); |
| 430 | return g_string_free(s, FALSE); | |
| 6513 | 431 | } |
| 6629 | 432 | |
| 433 | /* borrowed from gtkimhtml */ | |
| 434 | #define MAX_FONT_SIZE 7 | |
|
10899
87d9aec5b72d
[gaim-migrate @ 12619]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10504
diff
changeset
|
435 | #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
|
436 | static const gint _point_sizes [] = { 8, 10, 12, 14, 20, 30, 40 }; |
| 6629 | 437 | |
| 438 | enum fatype { size, color, face, junk }; | |
| 439 | typedef struct { | |
| 440 | enum fatype type; | |
| 441 | union { | |
| 442 | int size; | |
| 443 | char *color; | |
| 444 | char *face; | |
| 445 | char *junk; | |
| 446 | } u; | |
| 447 | } fontattr; | |
| 448 | ||
| 449 | static void fontattr_free(fontattr *f) | |
| 450 | { | |
| 451 | if (f->type == color) | |
| 452 | g_free(f->u.color); | |
| 453 | else if (f->type == face) | |
| 454 | g_free(f->u.face); | |
| 455 | g_free(f); | |
| 456 | } | |
| 457 | ||
| 458 | static void yahoo_htc_queue_cleanup(GQueue *q) | |
| 459 | { | |
| 460 | char *tmp; | |
| 461 | ||
| 462 | while ((tmp = g_queue_pop_tail(q))) | |
| 463 | g_free(tmp); | |
| 464 | g_queue_free(q); | |
| 465 | } | |
| 466 | ||
| 467 | static void _parse_font_tag(const char *src, GString *dest, int *i, int *j, | |
| 468 | int len, GQueue *colors, GQueue *tags, GQueue *ftattr) | |
| 469 | { | |
| 470 | ||
| 471 | int m, n, vstart; | |
| 472 | gboolean quote = 0, done = 0; | |
| 473 | ||
| 474 | m = *j; | |
| 475 | ||
| 476 | while (1) { | |
| 477 | m++; | |
| 478 | ||
| 479 | if (m >= len) { | |
| 480 | g_string_append(dest, &src[*i]); | |
| 481 | *i = len; | |
| 482 | break; | |
| 483 | } | |
| 484 | ||
| 485 | if (src[m] == '=') { | |
| 486 | n = vstart = m; | |
| 487 | while (1) { | |
| 488 | n++; | |
| 489 | ||
| 490 | if (n >= len) { | |
| 491 | m = n; | |
| 492 | break; | |
| 493 | } | |
| 494 | ||
|
6631
a2608d595a32
[gaim-migrate @ 7155]
Björn Voigt <bjoern@cs.tu-berlin.de>
parents:
6629
diff
changeset
|
495 | if (src[n] == '"') { |
| 6629 | 496 | if (!quote) { |
| 497 | quote = 1; | |
| 498 | vstart = n; | |
| 499 | continue; | |
| 500 | } else { | |
| 501 | done = 1; | |
| 502 | } | |
|
6631
a2608d595a32
[gaim-migrate @ 7155]
Björn Voigt <bjoern@cs.tu-berlin.de>
parents:
6629
diff
changeset
|
503 | } |
| 6629 | 504 | |
| 505 | if (!quote && ((src[n] == ' ') || (src[n] == '>'))) | |
| 506 | done = 1; | |
| 507 | ||
| 508 | if (done) { | |
| 509 | if (!g_ascii_strncasecmp(&src[*j+1], "FACE", m - *j - 1)) { | |
| 510 | fontattr *f; | |
| 511 | ||
| 512 | f = g_new(fontattr, 1); | |
| 513 | f->type = face; | |
| 514 | f->u.face = g_strndup(&src[vstart+1], n-vstart-1); | |
| 515 | if (!ftattr) | |
| 516 | ftattr = g_queue_new(); | |
| 517 | g_queue_push_tail(ftattr, f); | |
| 518 | m = n; | |
| 519 | break; | |
| 520 | } else if (!g_ascii_strncasecmp(&src[*j+1], "SIZE", m - *j - 1)) { | |
| 521 | fontattr *f; | |
| 522 | ||
| 523 | f = g_new(fontattr, 1); | |
| 524 | f->type = size; | |
| 525 | f->u.size = POINT_SIZE(strtol(&src[vstart+1], NULL, 10)); | |
| 526 | if (!ftattr) | |
| 527 | ftattr = g_queue_new(); | |
| 528 | g_queue_push_tail(ftattr, f); | |
| 529 | m = n; | |
| 530 | break; | |
| 531 | } else if (!g_ascii_strncasecmp(&src[*j+1], "COLOR", m - *j - 1)) { | |
| 532 | fontattr *f; | |
| 533 | ||
| 534 | f = g_new(fontattr, 1); | |
| 535 | f->type = color; | |
| 536 | f->u.color = g_strndup(&src[vstart+1], n-vstart-1); | |
| 537 | if (!ftattr) | |
| 538 | ftattr = g_queue_new(); | |
| 539 | g_queue_push_head(ftattr, f); | |
| 540 | m = n; | |
| 541 | break; | |
| 542 | } else { | |
| 543 | fontattr *f; | |
| 544 | ||
| 545 | f = g_new(fontattr, 1); | |
| 546 | f->type = junk; | |
| 547 | f->u.junk = g_strndup(&src[*j+1], n-*j); | |
| 548 | if (!ftattr) | |
| 549 | ftattr = g_queue_new(); | |
| 550 | g_queue_push_tail(ftattr, f); | |
| 551 | m = n; | |
| 552 | break; | |
| 553 | } | |
| 554 | ||
| 555 | } | |
| 556 | } | |
| 557 | } | |
| 558 | ||
| 559 | if (src[m] == ' ') | |
| 560 | *j = m; | |
| 561 | ||
| 562 | if (src[m] == '>') { | |
| 563 | gboolean needendtag = 0; | |
| 564 | fontattr *f; | |
| 565 | GString *tmp = g_string_new(NULL); | |
| 566 | char *colorstr; | |
| 567 | ||
| 568 | if (!g_queue_is_empty(ftattr)) { | |
| 569 | while ((f = g_queue_pop_tail(ftattr))) { | |
| 570 | switch (f->type) { | |
| 571 | case size: | |
| 572 | if (!needendtag) { | |
| 573 | needendtag = 1; | |
| 574 | g_string_append(dest, "<font "); | |
| 575 | } | |
| 576 | ||
| 577 | g_string_append_printf(dest, "size=\"%d\" ", f->u.size); | |
| 578 | fontattr_free(f); | |
| 579 | break; | |
| 580 | case face: | |
| 581 | if (!needendtag) { | |
| 582 | needendtag = 1; | |
| 583 | g_string_append(dest, "<font "); | |
| 584 | } | |
| 585 | ||
| 586 | g_string_append_printf(dest, "face=\"%s\" ", f->u.face); | |
| 587 | fontattr_free(f); | |
| 588 | break; | |
| 589 | case junk: | |
| 590 | if (!needendtag) { | |
| 591 | needendtag = 1; | |
| 592 | g_string_append(dest, "<font "); | |
| 593 | } | |
| 594 | ||
| 595 | g_string_append(dest, f->u.junk); | |
| 596 | fontattr_free(f); | |
| 597 | break; | |
| 598 | ||
| 599 | case color: | |
| 600 | if (needendtag) { | |
| 601 | g_string_append(tmp, "</font>"); | |
| 602 | dest->str[dest->len-1] = '>'; | |
| 603 | needendtag = 0; | |
| 604 | } | |
| 605 | ||
| 606 | colorstr = g_queue_peek_tail(colors); | |
| 607 | g_string_append(tmp, colorstr ? colorstr : "\033[#000000m"); | |
| 608 | g_string_append_printf(dest, "\033[%sm", f->u.color); | |
| 609 | g_queue_push_tail(colors, g_strdup_printf("\033[%sm", f->u.color)); | |
| 610 | fontattr_free(f); | |
| 611 | break; | |
| 612 | } | |
| 613 | } | |
| 614 | ||
| 615 | g_queue_free(ftattr); | |
| 616 | ftattr = NULL; | |
| 617 | ||
| 618 | if (needendtag) { | |
| 619 | dest->str[dest->len-1] = '>'; | |
| 620 | g_queue_push_tail(tags, g_strdup("</font>")); | |
| 621 | g_string_free(tmp, TRUE); | |
| 622 | } else { | |
| 623 | g_queue_push_tail(tags, tmp->str); | |
|
28011
f2c4d9b5e41f
Oh shit no it wasn't. I have no one to blame but fear itself.
Mark Doliner <markdoliner@pidgin.im>
parents:
28010
diff
changeset
|
624 | g_string_free(tmp, FALSE); |
| 6629 | 625 | } |
| 626 | } | |
| 627 | ||
| 628 | *i = *j = m; | |
| 629 | break; | |
| 630 | } | |
| 631 | } | |
| 632 | ||
| 633 | } | |
| 634 | ||
| 635 | char *yahoo_html_to_codes(const char *src) | |
| 636 | { | |
|
6631
a2608d595a32
[gaim-migrate @ 7155]
Björn Voigt <bjoern@cs.tu-berlin.de>
parents:
6629
diff
changeset
|
637 | int i, j, len; |
| 6629 | 638 | GString *dest; |
| 28009 | 639 | char *esc; |
| 6629 | 640 | GQueue *colors, *tags; |
| 641 | GQueue *ftattr = NULL; | |
| 8440 | 642 | gboolean no_more_specials = FALSE; |
| 6629 | 643 | |
| 644 | colors = g_queue_new(); | |
| 645 | tags = g_queue_new(); | |
| 646 | dest = g_string_sized_new(strlen(src)); | |
| 647 | ||
| 648 | for (i = 0, len = strlen(src); i < len; i++) { | |
| 649 | ||
| 8440 | 650 | if (!no_more_specials && src[i] == '<') { |
| 6629 | 651 | j = i; |
| 652 | ||
| 653 | while (1) { | |
| 654 | j++; | |
| 655 | ||
| 656 | if (j >= len) { /* no '>' */ | |
| 8440 | 657 | g_string_append_c(dest, src[i]); |
| 658 | no_more_specials = TRUE; | |
| 6629 | 659 | break; |
| 660 | } | |
| 661 | ||
| 662 | if (src[j] == '<') { | |
| 8440 | 663 | /* FIXME: This doesn't convert outgoing entities. |
| 664 | * However, I suspect this case may never | |
| 665 | * happen anymore because of the entities. | |
| 666 | */ | |
| 6629 | 667 | g_string_append_len(dest, &src[i], j - i); |
| 668 | i = j - 1; | |
| 669 | if (ftattr) { | |
| 670 | fontattr *f; | |
| 671 | ||
| 672 | while ((f = g_queue_pop_head(ftattr))) | |
| 673 | fontattr_free(f); | |
| 674 | g_queue_free(ftattr); | |
| 675 | ftattr = NULL; | |
| 676 | } | |
| 677 | break; | |
| 678 | } | |
| 679 | ||
| 680 | if (src[j] == ' ') { | |
| 681 | if (!g_ascii_strncasecmp(&src[i+1], "BODY", j - i - 1)) { | |
| 682 | char *t = strchr(&src[j], '>'); | |
| 683 | if (!t) { | |
| 684 | g_string_append(dest, &src[i]); | |
| 685 | i = len; | |
| 686 | break; | |
| 687 | } else { | |
| 688 | i = t - src; | |
| 689 | break; | |
| 690 | } | |
| 8533 | 691 | } else if (!g_ascii_strncasecmp(&src[i+1], "A HREF=\"", j - i - 1)) { |
| 692 | j += 7; | |
| 693 | g_string_append(dest, "\033[lm"); | |
| 694 | while (1) { | |
| 695 | g_string_append_c(dest, src[j]); | |
| 696 | if (++j >= len) { | |
| 8480 | 697 | i = len; |
| 698 | break; | |
| 699 | } | |
| 8533 | 700 | if (src[j] == '"') { |
| 701 | g_string_append(dest, "\033[xlm"); | |
| 702 | while (1) { | |
| 703 | if (++j >= len) { | |
| 704 | i = len; | |
| 705 | break; | |
| 706 | } | |
| 707 | if (!g_ascii_strncasecmp(&src[j], "</A>", 4)) { | |
| 708 | j += 3; | |
| 709 | break; | |
| 710 | } | |
| 711 | } | |
| 712 | i = j; | |
| 8480 | 713 | break; |
| 714 | } | |
| 715 | } | |
|
16169
4aa4ec9afa9c
Stop Yahoo sending SPAN tags, fixes Yahoo part of ticket 78
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
15884
diff
changeset
|
716 | } else if (!g_ascii_strncasecmp(&src[i+1], "SPAN", j - i - 1)) { /* drop span tags */ |
|
4aa4ec9afa9c
Stop Yahoo sending SPAN tags, fixes Yahoo part of ticket 78
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
15884
diff
changeset
|
717 | while (1) { |
|
4aa4ec9afa9c
Stop Yahoo sending SPAN tags, fixes Yahoo part of ticket 78
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
15884
diff
changeset
|
718 | if (++j >= len) { |
|
4aa4ec9afa9c
Stop Yahoo sending SPAN tags, fixes Yahoo part of ticket 78
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
15884
diff
changeset
|
719 | g_string_append(dest, &src[i]); |
|
4aa4ec9afa9c
Stop Yahoo sending SPAN tags, fixes Yahoo part of ticket 78
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
15884
diff
changeset
|
720 | i = len; |
|
4aa4ec9afa9c
Stop Yahoo sending SPAN tags, fixes Yahoo part of ticket 78
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
15884
diff
changeset
|
721 | break; |
|
4aa4ec9afa9c
Stop Yahoo sending SPAN tags, fixes Yahoo part of ticket 78
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
15884
diff
changeset
|
722 | } |
|
4aa4ec9afa9c
Stop Yahoo sending SPAN tags, fixes Yahoo part of ticket 78
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
15884
diff
changeset
|
723 | if (src[j] == '>') { |
|
4aa4ec9afa9c
Stop Yahoo sending SPAN tags, fixes Yahoo part of ticket 78
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
15884
diff
changeset
|
724 | i = j; |
|
4aa4ec9afa9c
Stop Yahoo sending SPAN tags, fixes Yahoo part of ticket 78
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
15884
diff
changeset
|
725 | break; |
|
4aa4ec9afa9c
Stop Yahoo sending SPAN tags, fixes Yahoo part of ticket 78
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
15884
diff
changeset
|
726 | } |
|
4aa4ec9afa9c
Stop Yahoo sending SPAN tags, fixes Yahoo part of ticket 78
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
15884
diff
changeset
|
727 | } |
| 6629 | 728 | } else if (g_ascii_strncasecmp(&src[i+1], "FONT", j - i - 1)) { /* not interested! */ |
| 729 | while (1) { | |
| 730 | if (++j >= len) { | |
| 731 | g_string_append(dest, &src[i]); | |
| 732 | i = len; | |
| 733 | break; | |
| 734 | } | |
| 735 | if (src[j] == '>') { | |
| 736 | g_string_append_len(dest, &src[i], j - i + 1); | |
| 737 | i = j; | |
| 738 | break; | |
| 739 | } | |
| 740 | } | |
| 741 | } else { /* yay we have a font tag */ | |
| 742 | _parse_font_tag(src, dest, &i, &j, len, colors, tags, ftattr); | |
| 743 | } | |
| 744 | ||
| 745 | break; | |
| 746 | } | |
| 747 | ||
| 748 | if (src[j] == '>') { | |
| 8440 | 749 | /* This has some problems like the FIXME for the |
| 750 | * '<' case. and like that case, I suspect the case | |
| 751 | * that this has problems is won't happen anymore anyway. | |
| 752 | */ | |
| 6629 | 753 | int sublen = j - i - 1; |
| 754 | ||
| 755 | if (sublen) { | |
| 756 | if (!g_ascii_strncasecmp(&src[i+1], "B", sublen)) { | |
| 757 | g_string_append(dest, "\033[1m"); | |
| 758 | } else if (!g_ascii_strncasecmp(&src[i+1], "/B", sublen)) { | |
| 759 | g_string_append(dest, "\033[x1m"); | |
| 760 | } else if (!g_ascii_strncasecmp(&src[i+1], "I", sublen)) { | |
| 761 | g_string_append(dest, "\033[2m"); | |
| 762 | } else if (!g_ascii_strncasecmp(&src[i+1], "/I", sublen)) { | |
| 763 | g_string_append(dest, "\033[x2m"); | |
| 764 | } else if (!g_ascii_strncasecmp(&src[i+1], "U", sublen)) { | |
| 765 | g_string_append(dest, "\033[4m"); | |
| 766 | } else if (!g_ascii_strncasecmp(&src[i+1], "/U", sublen)) { | |
| 767 | g_string_append(dest, "\033[x4m"); | |
| 8480 | 768 | } else if (!g_ascii_strncasecmp(&src[i+1], "/A", sublen)) { |
| 769 | g_string_append(dest, "\033[xlm"); | |
| 8455 | 770 | } else if (!g_ascii_strncasecmp(&src[i+1], "BR", sublen)) { |
| 771 | g_string_append_c(dest, '\n'); | |
| 6629 | 772 | } else if (!g_ascii_strncasecmp(&src[i+1], "/BODY", sublen)) { |
| 773 | /* mmm, </body> tags. *BURP* */ | |
|
16169
4aa4ec9afa9c
Stop Yahoo sending SPAN tags, fixes Yahoo part of ticket 78
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
15884
diff
changeset
|
774 | } else if (!g_ascii_strncasecmp(&src[i+1], "/SPAN", sublen)) { |
|
4aa4ec9afa9c
Stop Yahoo sending SPAN tags, fixes Yahoo part of ticket 78
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
15884
diff
changeset
|
775 | /* </span> tags. dangerously close to </spam> */ |
| 6629 | 776 | } else if (!g_ascii_strncasecmp(&src[i+1], "/FONT", sublen) && g_queue_peek_tail(tags)) { |
| 777 | char *etag, *cl; | |
| 778 | ||
| 779 | etag = g_queue_pop_tail(tags); | |
| 780 | if (etag) { | |
| 781 | g_string_append(dest, etag); | |
| 782 | if (!strcmp(etag, "</font>")) { | |
| 783 | cl = g_queue_pop_tail(colors); | |
| 784 | if (cl) | |
| 785 | g_free(cl); | |
| 786 | } | |
| 787 | g_free(etag); | |
| 788 | } | |
| 789 | } else { | |
| 790 | g_string_append_len(dest, &src[i], j - i + 1); | |
| 791 | } | |
| 792 | } else { | |
| 793 | g_string_append_len(dest, &src[i], j - i + 1); | |
| 794 | } | |
| 795 | ||
| 796 | i = j; | |
| 797 | break; | |
| 798 | } | |
| 799 | ||
| 800 | } | |
| 801 | ||
| 802 | } else { | |
| 8440 | 803 | if (((len - i) >= 4) && !strncmp(&src[i], "<", 4)) { |
| 804 | g_string_append_c(dest, '<'); | |
| 805 | i += 3; | |
| 806 | } else if (((len - i) >= 4) && !strncmp(&src[i], ">", 4)) { | |
| 807 | g_string_append_c(dest, '>'); | |
| 808 | i += 3; | |
|
21946
f444fc9e2d18
Make yahoo_html_to_codes deal with ' in messages being sent. Also correct
Will Thompson <resiak@pidgin.im>
parents:
19859
diff
changeset
|
809 | } else if (((len - i) >= 5) && !strncmp(&src[i], "&", 5)) { |
| 8440 | 810 | g_string_append_c(dest, '&'); |
| 811 | i += 4; | |
|
21946
f444fc9e2d18
Make yahoo_html_to_codes deal with ' in messages being sent. Also correct
Will Thompson <resiak@pidgin.im>
parents:
19859
diff
changeset
|
812 | } else if (((len - i) >= 6) && !strncmp(&src[i], """, 6)) { |
| 8440 | 813 | g_string_append_c(dest, '"'); |
| 814 | i += 5; | |
|
21946
f444fc9e2d18
Make yahoo_html_to_codes deal with ' in messages being sent. Also correct
Will Thompson <resiak@pidgin.im>
parents:
19859
diff
changeset
|
815 | } else if (((len - i) >= 6) && !strncmp(&src[i], "'", 6)) { |
|
f444fc9e2d18
Make yahoo_html_to_codes deal with ' in messages being sent. Also correct
Will Thompson <resiak@pidgin.im>
parents:
19859
diff
changeset
|
816 | g_string_append_c(dest, '\''); |
|
f444fc9e2d18
Make yahoo_html_to_codes deal with ' in messages being sent. Also correct
Will Thompson <resiak@pidgin.im>
parents:
19859
diff
changeset
|
817 | i += 5; |
| 8440 | 818 | } else { |
| 819 | g_string_append_c(dest, src[i]); | |
| 820 | } | |
| 6629 | 821 | } |
| 822 | } | |
| 823 | ||
| 28009 | 824 | esc = g_strescape(dest->str, NULL); |
|
27547
c136491361eb
Convert the yahoo prpl to using the debug convenience functions instead of
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
27361
diff
changeset
|
825 | purple_debug_misc("yahoo", "yahoo_html_to_codes: Returning string: '%s'.\n", esc); |
| 6629 | 826 | g_free(esc); |
| 827 | ||
| 828 | yahoo_htc_queue_cleanup(colors); | |
| 829 | yahoo_htc_queue_cleanup(tags); | |
| 830 | ||
| 28009 | 831 | return g_string_free(dest, FALSE); |
| 6629 | 832 | } |