Mercurial > pidgin
annotate libpurple/protocols/myspace/myspace.c @ 17681:5e8c02259c81
Add option to sign on as hidden, or as not (previously, always signed on
as hidden, which was confusing).
Split part of msim_process into msim_we_are_logged_on()
author | Jeffrey Connelly <jaconnel@calpoly.edu> |
---|---|
date | Tue, 03 Jul 2007 05:14:56 +0000 |
parents | d87916bd1d73 |
children | dbf7fe20799d |
rev | line source |
---|---|
16394 | 1 /* MySpaceIM Protocol Plugin |
2 * | |
3 * \author Jeff Connelly | |
4 * | |
17680
d87916bd1d73
Fix email address.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17679
diff
changeset
|
5 * Copyright (C) 2007, Jeff Connelly <jeff2@soc.pidgin.im> |
16394 | 6 * |
16396 | 7 * Based on Purple's "C Plugin HOWTO" hello world example. |
16394 | 8 * |
16736
496855295bd7
Use MsimMessage via msim_send(), instead of msim_send_raw(). This is a more
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16735
diff
changeset
|
9 * Code also drawn from mockprpl: |
16396 | 10 * http://snarfed.org/space/purple+mock+protocol+plugin |
16394 | 11 * Copyright (C) 2004-2007, Ryan Barrett <mockprpl@ryanb.org> |
12 * | |
16396 | 13 * and some constructs also based on existing Purple plugins, which are: |
14 * Copyright (C) 2003, Robbert Haarman <purple@inglorion.net> | |
16394 | 15 * Copyright (C) 2003, Ethan Blanton <eblanton@cs.purdue.edu> |
16 * Copyright (C) 2000-2003, Rob Flynn <rob@tgflinux.com> | |
17 * Copyright (C) 1998-1999, Mark Spencer <markster@marko.net> | |
18 * | |
19 * This program is free software; you can redistribute it and/or modify | |
20 * it under the terms of the GNU General Public License as published by | |
21 * the Free Software Foundation; either version 2 of the License, or | |
22 * (at your option) any later version. | |
23 * | |
24 * This program is distributed in the hope that it will be useful, | |
25 * but WITHOUT ANY WARRANTY; without even the implied warranty of | |
26 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
27 * GNU General Public License for more details. | |
28 * | |
29 * You should have received a copy of the GNU General Public License | |
30 * along with this program; if not, write to the Free Software | |
31 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | |
32 */ | |
33 | |
16396 | 34 #define PURPLE_PLUGIN |
16394 | 35 |
17266
793301c04e3a
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16738
diff
changeset
|
36 #include "message.h" |
17286
58b4d103a5b8
Use symbolic constants for persist messages.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17285
diff
changeset
|
37 #include "persist.h" |
16405
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
38 #include "myspace.h" |
16394 | 39 |
16726
fc80e7b2540d
Check for RC4 in libpurple on plugin initialization.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16725
diff
changeset
|
40 /** |
fc80e7b2540d
Check for RC4 in libpurple on plugin initialization.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16725
diff
changeset
|
41 * Load the plugin. |
fc80e7b2540d
Check for RC4 in libpurple on plugin initialization.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16725
diff
changeset
|
42 */ |
17661
38030f1a2e56
Split return type and function name + arguments on to separate lines, to
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17660
diff
changeset
|
43 gboolean |
38030f1a2e56
Split return type and function name + arguments on to separate lines, to
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17660
diff
changeset
|
44 msim_load(PurplePlugin *plugin) |
16726
fc80e7b2540d
Check for RC4 in libpurple on plugin initialization.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16725
diff
changeset
|
45 { |
fc80e7b2540d
Check for RC4 in libpurple on plugin initialization.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16725
diff
changeset
|
46 #ifdef MSIM_USE_PURPLE_RC4 |
fc80e7b2540d
Check for RC4 in libpurple on plugin initialization.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16725
diff
changeset
|
47 /* If compiled to use RC4 from libpurple, check if it is really there. */ |
fc80e7b2540d
Check for RC4 in libpurple on plugin initialization.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16725
diff
changeset
|
48 if (!purple_ciphers_find_cipher("rc4")) |
fc80e7b2540d
Check for RC4 in libpurple on plugin initialization.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16725
diff
changeset
|
49 { |
fc80e7b2540d
Check for RC4 in libpurple on plugin initialization.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16725
diff
changeset
|
50 purple_debug_error("msim", "compiled with MSIM_USE_PURPLE_RC4 but rc4 not in libpurple - not loading MySpaceIM plugin!\n"); |
16728
8f6dcd5e9298
Use _ for translations in msimprpl. See #648.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16727
diff
changeset
|
51 purple_notify_error(plugin, _("Missing Cipher"), |
8f6dcd5e9298
Use _ for translations in msimprpl. See #648.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16727
diff
changeset
|
52 _("The RC4 cipher could not be found"), |
8f6dcd5e9298
Use _ for translations in msimprpl. See #648.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16727
diff
changeset
|
53 _("Recompile without MSIM_USE_PURPLE_RC4, or upgrade " |
8f6dcd5e9298
Use _ for translations in msimprpl. See #648.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16727
diff
changeset
|
54 "to a libpurple with RC4 support (>= 2.0.1). MySpaceIM " |
16736
496855295bd7
Use MsimMessage via msim_send(), instead of msim_send_raw(). This is a more
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16735
diff
changeset
|
55 "plugin will not be loaded.")); |
16726
fc80e7b2540d
Check for RC4 in libpurple on plugin initialization.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16725
diff
changeset
|
56 return FALSE; |
fc80e7b2540d
Check for RC4 in libpurple on plugin initialization.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16725
diff
changeset
|
57 } |
fc80e7b2540d
Check for RC4 in libpurple on plugin initialization.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16725
diff
changeset
|
58 #endif |
fc80e7b2540d
Check for RC4 in libpurple on plugin initialization.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16725
diff
changeset
|
59 return TRUE; |
16394 | 60 } |
61 | |
62 /** | |
63 * Get possible user status types. Based on mockprpl. | |
64 * | |
65 * @return GList of status types. | |
66 */ | |
17661
38030f1a2e56
Split return type and function name + arguments on to separate lines, to
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17660
diff
changeset
|
67 GList * |
38030f1a2e56
Split return type and function name + arguments on to separate lines, to
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17660
diff
changeset
|
68 msim_status_types(PurpleAccount *acct) |
16394 | 69 { |
70 GList *types; | |
17266
793301c04e3a
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16738
diff
changeset
|
71 PurpleStatusType *status; |
16394 | 72 |
17266
793301c04e3a
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16738
diff
changeset
|
73 purple_debug_info("myspace", "returning status types\n"); |
16394 | 74 |
75 types = NULL; | |
76 | |
17266
793301c04e3a
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16738
diff
changeset
|
77 status = purple_status_type_new_full(PURPLE_STATUS_AVAILABLE, NULL, NULL, FALSE, TRUE, FALSE); |
793301c04e3a
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16738
diff
changeset
|
78 types = g_list_append(types, status); |
16394 | 79 |
17266
793301c04e3a
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16738
diff
changeset
|
80 status = purple_status_type_new_full(PURPLE_STATUS_AWAY, NULL, NULL, FALSE, TRUE, FALSE); |
793301c04e3a
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16738
diff
changeset
|
81 types = g_list_append(types, status); |
16394 | 82 |
17266
793301c04e3a
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16738
diff
changeset
|
83 status = purple_status_type_new_full(PURPLE_STATUS_OFFLINE, NULL, NULL, FALSE, TRUE, FALSE); |
793301c04e3a
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16738
diff
changeset
|
84 types = g_list_append(types, status); |
16394 | 85 |
17266
793301c04e3a
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16738
diff
changeset
|
86 status = purple_status_type_new_full(PURPLE_STATUS_INVISIBLE, NULL, NULL, FALSE, TRUE, FALSE); |
793301c04e3a
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16738
diff
changeset
|
87 types = g_list_append(types, status); |
16394 | 88 |
89 return types; | |
90 } | |
91 | |
16405
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
92 /** |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
93 * Return the icon name for a buddy and account. |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
94 * |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
95 * @param acct The account to find the icon for, or NULL for protocol icon. |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
96 * @param buddy The buddy to find the icon for, or NULL for the account icon. |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
97 * |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
98 * @return The base icon name string. |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
99 */ |
17661
38030f1a2e56
Split return type and function name + arguments on to separate lines, to
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17660
diff
changeset
|
100 const gchar * |
38030f1a2e56
Split return type and function name + arguments on to separate lines, to
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17660
diff
changeset
|
101 msim_list_icon(PurpleAccount *acct, PurpleBuddy *buddy) |
16405
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
102 { |
17326
f057837085b0
Change to use const gchar * where appropriate.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17325
diff
changeset
|
103 /* Use a MySpace icon submitted by hbons at |
16733
a8e8482a2dc6
Clean up a few TODO's.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16731
diff
changeset
|
104 * http://developer.pidgin.im/wiki/MySpaceIM. */ |
16406
f62023eddfc6
Add and use MySpaceIM icon uploaded by hbons (48x48 original and resized 22x22 and 16x16 versions).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16405
diff
changeset
|
105 return "myspace"; |
16405
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
106 } |
16409
1aa62f7368ca
Add escaping and unescaping functions (for /1 and /2).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16407
diff
changeset
|
107 |
17649
9cb771adbdea
Refactor msim_escape() & msim_unescape().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17648
diff
changeset
|
108 /* Replacement codes to be replaced with associated replacement text, |
9cb771adbdea
Refactor msim_escape() & msim_unescape().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17648
diff
changeset
|
109 * used for protocol message escaping / unescaping. */ |
17648
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
110 static gchar* msim_replacement_code[] = { "/1", "/2", NULL }; |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
111 static gchar* msim_replacement_text[] = { "/", "\\", NULL }; |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
112 |
16409
1aa62f7368ca
Add escaping and unescaping functions (for /1 and /2).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16407
diff
changeset
|
113 /** |
17649
9cb771adbdea
Refactor msim_escape() & msim_unescape().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17648
diff
changeset
|
114 * Unescape or escape a protocol message. |
16409
1aa62f7368ca
Add escaping and unescaping functions (for /1 and /2).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16407
diff
changeset
|
115 * |
17649
9cb771adbdea
Refactor msim_escape() & msim_unescape().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17648
diff
changeset
|
116 * @param msg The message to be unescaped or escaped. WILL BE FREED. |
9cb771adbdea
Refactor msim_escape() & msim_unescape().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17648
diff
changeset
|
117 * @param escape TRUE to escape, FALSE to unescape. |
9cb771adbdea
Refactor msim_escape() & msim_unescape().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17648
diff
changeset
|
118 * |
9cb771adbdea
Refactor msim_escape() & msim_unescape().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17648
diff
changeset
|
119 * @return The unescaped or escaped message. Caller must g_free(). |
16409
1aa62f7368ca
Add escaping and unescaping functions (for /1 and /2).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16407
diff
changeset
|
120 */ |
17661
38030f1a2e56
Split return type and function name + arguments on to separate lines, to
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17660
diff
changeset
|
121 gchar * |
38030f1a2e56
Split return type and function name + arguments on to separate lines, to
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17660
diff
changeset
|
122 msim_unescape_or_escape(gchar *msg, gboolean escape) |
16409
1aa62f7368ca
Add escaping and unescaping functions (for /1 and /2).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16407
diff
changeset
|
123 { |
17649
9cb771adbdea
Refactor msim_escape() & msim_unescape().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17648
diff
changeset
|
124 gchar *tmp, *code, *text; |
9cb771adbdea
Refactor msim_escape() & msim_unescape().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17648
diff
changeset
|
125 guint i; |
9cb771adbdea
Refactor msim_escape() & msim_unescape().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17648
diff
changeset
|
126 |
9cb771adbdea
Refactor msim_escape() & msim_unescape().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17648
diff
changeset
|
127 /* Replace each code in msim_replacement_code with |
9cb771adbdea
Refactor msim_escape() & msim_unescape().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17648
diff
changeset
|
128 * corresponding entry in msim_replacement_text. */ |
9cb771adbdea
Refactor msim_escape() & msim_unescape().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17648
diff
changeset
|
129 for (i = 0; (code = msim_replacement_code[i]) |
9cb771adbdea
Refactor msim_escape() & msim_unescape().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17648
diff
changeset
|
130 && (text = msim_replacement_text[i]); ++i) |
9cb771adbdea
Refactor msim_escape() & msim_unescape().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17648
diff
changeset
|
131 { |
9cb771adbdea
Refactor msim_escape() & msim_unescape().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17648
diff
changeset
|
132 if (escape) |
9cb771adbdea
Refactor msim_escape() & msim_unescape().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17648
diff
changeset
|
133 { |
9cb771adbdea
Refactor msim_escape() & msim_unescape().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17648
diff
changeset
|
134 tmp = str_replace(msg, text, code); |
9cb771adbdea
Refactor msim_escape() & msim_unescape().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17648
diff
changeset
|
135 } |
9cb771adbdea
Refactor msim_escape() & msim_unescape().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17648
diff
changeset
|
136 else |
9cb771adbdea
Refactor msim_escape() & msim_unescape().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17648
diff
changeset
|
137 { |
9cb771adbdea
Refactor msim_escape() & msim_unescape().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17648
diff
changeset
|
138 tmp = str_replace(msg, code, text); |
9cb771adbdea
Refactor msim_escape() & msim_unescape().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17648
diff
changeset
|
139 } |
9cb771adbdea
Refactor msim_escape() & msim_unescape().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17648
diff
changeset
|
140 g_free(msg); |
9cb771adbdea
Refactor msim_escape() & msim_unescape().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17648
diff
changeset
|
141 msg = tmp; |
9cb771adbdea
Refactor msim_escape() & msim_unescape().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17648
diff
changeset
|
142 } |
16409
1aa62f7368ca
Add escaping and unescaping functions (for /1 and /2).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16407
diff
changeset
|
143 |
17649
9cb771adbdea
Refactor msim_escape() & msim_unescape().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17648
diff
changeset
|
144 return msg; |
16409
1aa62f7368ca
Add escaping and unescaping functions (for /1 and /2).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16407
diff
changeset
|
145 } |
1aa62f7368ca
Add escaping and unescaping functions (for /1 and /2).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16407
diff
changeset
|
146 |
1aa62f7368ca
Add escaping and unescaping functions (for /1 and /2).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16407
diff
changeset
|
147 /** |
1aa62f7368ca
Add escaping and unescaping functions (for /1 and /2).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16407
diff
changeset
|
148 * Escape a protocol message. |
1aa62f7368ca
Add escaping and unescaping functions (for /1 and /2).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16407
diff
changeset
|
149 * |
1aa62f7368ca
Add escaping and unescaping functions (for /1 and /2).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16407
diff
changeset
|
150 * @return The escaped message. Caller must g_free(). |
1aa62f7368ca
Add escaping and unescaping functions (for /1 and /2).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16407
diff
changeset
|
151 */ |
17661
38030f1a2e56
Split return type and function name + arguments on to separate lines, to
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17660
diff
changeset
|
152 gchar * |
38030f1a2e56
Split return type and function name + arguments on to separate lines, to
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17660
diff
changeset
|
153 msim_escape(const gchar *msg) |
16409
1aa62f7368ca
Add escaping and unescaping functions (for /1 and /2).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16407
diff
changeset
|
154 { |
17649
9cb771adbdea
Refactor msim_escape() & msim_unescape().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17648
diff
changeset
|
155 return msim_unescape_or_escape(g_strdup(msg), TRUE); |
9cb771adbdea
Refactor msim_escape() & msim_unescape().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17648
diff
changeset
|
156 } |
16409
1aa62f7368ca
Add escaping and unescaping functions (for /1 and /2).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16407
diff
changeset
|
157 |
17661
38030f1a2e56
Split return type and function name + arguments on to separate lines, to
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17660
diff
changeset
|
158 gchar * |
38030f1a2e56
Split return type and function name + arguments on to separate lines, to
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17660
diff
changeset
|
159 msim_unescape(const gchar *msg) |
17649
9cb771adbdea
Refactor msim_escape() & msim_unescape().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17648
diff
changeset
|
160 { |
9cb771adbdea
Refactor msim_escape() & msim_unescape().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17648
diff
changeset
|
161 return msim_unescape_or_escape(g_strdup(msg), FALSE); |
16409
1aa62f7368ca
Add escaping and unescaping functions (for /1 and /2).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16407
diff
changeset
|
162 } |
1aa62f7368ca
Add escaping and unescaping functions (for /1 and /2).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16407
diff
changeset
|
163 |
1aa62f7368ca
Add escaping and unescaping functions (for /1 and /2).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16407
diff
changeset
|
164 /** |
1aa62f7368ca
Add escaping and unescaping functions (for /1 and /2).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16407
diff
changeset
|
165 * Replace 'old' with 'new' in 'str'. |
1aa62f7368ca
Add escaping and unescaping functions (for /1 and /2).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16407
diff
changeset
|
166 * |
1aa62f7368ca
Add escaping and unescaping functions (for /1 and /2).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16407
diff
changeset
|
167 * @param str The original string. |
1aa62f7368ca
Add escaping and unescaping functions (for /1 and /2).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16407
diff
changeset
|
168 * @param old The substring of 'str' to replace. |
1aa62f7368ca
Add escaping and unescaping functions (for /1 and /2).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16407
diff
changeset
|
169 * @param new The replacement for 'old' within 'str'. |
1aa62f7368ca
Add escaping and unescaping functions (for /1 and /2).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16407
diff
changeset
|
170 * |
1aa62f7368ca
Add escaping and unescaping functions (for /1 and /2).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16407
diff
changeset
|
171 * @return A _new_ string, based on 'str', with 'old' replaced |
1aa62f7368ca
Add escaping and unescaping functions (for /1 and /2).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16407
diff
changeset
|
172 * by 'new'. Must be g_free()'d by caller. |
1aa62f7368ca
Add escaping and unescaping functions (for /1 and /2).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16407
diff
changeset
|
173 * |
1aa62f7368ca
Add escaping and unescaping functions (for /1 and /2).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16407
diff
changeset
|
174 * This string replace method is based on |
1aa62f7368ca
Add escaping and unescaping functions (for /1 and /2).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16407
diff
changeset
|
175 * http://mail.gnome.org/archives/gtk-app-devel-list/2000-July/msg00201.html |
1aa62f7368ca
Add escaping and unescaping functions (for /1 and /2).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16407
diff
changeset
|
176 * |
1aa62f7368ca
Add escaping and unescaping functions (for /1 and /2).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16407
diff
changeset
|
177 */ |
17661
38030f1a2e56
Split return type and function name + arguments on to separate lines, to
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17660
diff
changeset
|
178 gchar * |
38030f1a2e56
Split return type and function name + arguments on to separate lines, to
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17660
diff
changeset
|
179 str_replace(const gchar *str, const gchar *old, const gchar *new) |
16409
1aa62f7368ca
Add escaping and unescaping functions (for /1 and /2).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16407
diff
changeset
|
180 { |
17326
f057837085b0
Change to use const gchar * where appropriate.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17325
diff
changeset
|
181 gchar **items; |
f057837085b0
Change to use const gchar * where appropriate.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17325
diff
changeset
|
182 gchar *ret; |
16409
1aa62f7368ca
Add escaping and unescaping functions (for /1 and /2).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16407
diff
changeset
|
183 |
1aa62f7368ca
Add escaping and unescaping functions (for /1 and /2).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16407
diff
changeset
|
184 items = g_strsplit(str, old, -1); |
1aa62f7368ca
Add escaping and unescaping functions (for /1 and /2).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16407
diff
changeset
|
185 ret = g_strjoinv(new, items); |
1aa62f7368ca
Add escaping and unescaping functions (for /1 and /2).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16407
diff
changeset
|
186 g_free(items); |
1aa62f7368ca
Add escaping and unescaping functions (for /1 and /2).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16407
diff
changeset
|
187 return ret; |
1aa62f7368ca
Add escaping and unescaping functions (for /1 and /2).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16407
diff
changeset
|
188 } |
1aa62f7368ca
Add escaping and unescaping functions (for /1 and /2).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16407
diff
changeset
|
189 |
16725
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
190 #ifdef MSIM_DEBUG_MSG |
17661
38030f1a2e56
Split return type and function name + arguments on to separate lines, to
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17660
diff
changeset
|
191 void |
38030f1a2e56
Split return type and function name + arguments on to separate lines, to
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17660
diff
changeset
|
192 print_hash_item(gpointer key, gpointer value, gpointer user_data) |
16394 | 193 { |
17326
f057837085b0
Change to use const gchar * where appropriate.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17325
diff
changeset
|
194 purple_debug_info("msim", "%s=%s\n", (gchar *)key, (gchar *)value); |
16394 | 195 } |
16407
bb649c52fc19
Replace printf() in MySpaceIM prpl with purple_debug_info().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16406
diff
changeset
|
196 #endif |
16394 | 197 |
198 /** | |
17660
cbda7f26d27d
Add a send_raw function, msim_send_really_raw, into the prpl_info struct,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17659
diff
changeset
|
199 * Send raw data (given as a NUL-terminated string) to the server. |
16394 | 200 * |
201 * @param session | |
17660
cbda7f26d27d
Add a send_raw function, msim_send_really_raw, into the prpl_info struct,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17659
diff
changeset
|
202 * @param msg The raw data to send, in a NUL-terminated string. |
16409
1aa62f7368ca
Add escaping and unescaping functions (for /1 and /2).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16407
diff
changeset
|
203 * |
1aa62f7368ca
Add escaping and unescaping functions (for /1 and /2).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16407
diff
changeset
|
204 * @return TRUE if succeeded, FALSE if not. |
16394 | 205 * |
206 */ | |
17661
38030f1a2e56
Split return type and function name + arguments on to separate lines, to
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17660
diff
changeset
|
207 gboolean |
38030f1a2e56
Split return type and function name + arguments on to separate lines, to
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17660
diff
changeset
|
208 msim_send_raw(MsimSession *session, const gchar *msg) |
16394 | 209 { |
16736
496855295bd7
Use MsimMessage via msim_send(), instead of msim_send_raw(). This is a more
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16735
diff
changeset
|
210 purple_debug_info("msim", "msim_send_raw: writing <%s>\n", msg); |
16394 | 211 |
16409
1aa62f7368ca
Add escaping and unescaping functions (for /1 and /2).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16407
diff
changeset
|
212 g_return_val_if_fail(MSIM_SESSION_VALID(session), FALSE); |
1aa62f7368ca
Add escaping and unescaping functions (for /1 and /2).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16407
diff
changeset
|
213 g_return_val_if_fail(msg != NULL, FALSE); |
1aa62f7368ca
Add escaping and unescaping functions (for /1 and /2).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16407
diff
changeset
|
214 |
17660
cbda7f26d27d
Add a send_raw function, msim_send_really_raw, into the prpl_info struct,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17659
diff
changeset
|
215 return msim_send_really_raw(session->gc, msg, strlen(msg)) == |
cbda7f26d27d
Add a send_raw function, msim_send_really_raw, into the prpl_info struct,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17659
diff
changeset
|
216 strlen(msg); |
cbda7f26d27d
Add a send_raw function, msim_send_really_raw, into the prpl_info struct,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17659
diff
changeset
|
217 } |
16394 | 218 |
17660
cbda7f26d27d
Add a send_raw function, msim_send_really_raw, into the prpl_info struct,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17659
diff
changeset
|
219 /** Send raw data to the server, possibly with embedded NULs. |
cbda7f26d27d
Add a send_raw function, msim_send_really_raw, into the prpl_info struct,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17659
diff
changeset
|
220 * |
cbda7f26d27d
Add a send_raw function, msim_send_really_raw, into the prpl_info struct,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17659
diff
changeset
|
221 * Used in prpl_info struct, so that plugins can have the most possible |
cbda7f26d27d
Add a send_raw function, msim_send_really_raw, into the prpl_info struct,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17659
diff
changeset
|
222 * control of what is sent over the connection. Inside this prpl, |
cbda7f26d27d
Add a send_raw function, msim_send_really_raw, into the prpl_info struct,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17659
diff
changeset
|
223 * msim_send_raw() is used, since it sends NUL-terminated strings (easier). |
cbda7f26d27d
Add a send_raw function, msim_send_really_raw, into the prpl_info struct,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17659
diff
changeset
|
224 * |
cbda7f26d27d
Add a send_raw function, msim_send_really_raw, into the prpl_info struct,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17659
diff
changeset
|
225 * @param gc PurpleConnection |
cbda7f26d27d
Add a send_raw function, msim_send_really_raw, into the prpl_info struct,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17659
diff
changeset
|
226 * @param buf Buffer to send |
cbda7f26d27d
Add a send_raw function, msim_send_really_raw, into the prpl_info struct,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17659
diff
changeset
|
227 * @param total_bytes Size of buffer to send |
cbda7f26d27d
Add a send_raw function, msim_send_really_raw, into the prpl_info struct,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17659
diff
changeset
|
228 * |
cbda7f26d27d
Add a send_raw function, msim_send_really_raw, into the prpl_info struct,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17659
diff
changeset
|
229 * @return Bytes successfully sent. |
cbda7f26d27d
Add a send_raw function, msim_send_really_raw, into the prpl_info struct,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17659
diff
changeset
|
230 */ |
17661
38030f1a2e56
Split return type and function name + arguments on to separate lines, to
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17660
diff
changeset
|
231 int |
38030f1a2e56
Split return type and function name + arguments on to separate lines, to
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17660
diff
changeset
|
232 msim_send_really_raw(PurpleConnection *gc, const char *buf, int total_bytes) |
17660
cbda7f26d27d
Add a send_raw function, msim_send_really_raw, into the prpl_info struct,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17659
diff
changeset
|
233 { |
cbda7f26d27d
Add a send_raw function, msim_send_really_raw, into the prpl_info struct,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17659
diff
changeset
|
234 int total_bytes_sent; |
cbda7f26d27d
Add a send_raw function, msim_send_really_raw, into the prpl_info struct,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17659
diff
changeset
|
235 |
16409
1aa62f7368ca
Add escaping and unescaping functions (for /1 and /2).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16407
diff
changeset
|
236 /* Loop until all data is sent, or a failure occurs. */ |
1aa62f7368ca
Add escaping and unescaping functions (for /1 and /2).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16407
diff
changeset
|
237 total_bytes_sent = 0; |
1aa62f7368ca
Add escaping and unescaping functions (for /1 and /2).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16407
diff
changeset
|
238 do |
1aa62f7368ca
Add escaping and unescaping functions (for /1 and /2).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16407
diff
changeset
|
239 { |
1aa62f7368ca
Add escaping and unescaping functions (for /1 and /2).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16407
diff
changeset
|
240 int bytes_sent; |
1aa62f7368ca
Add escaping and unescaping functions (for /1 and /2).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16407
diff
changeset
|
241 |
17660
cbda7f26d27d
Add a send_raw function, msim_send_really_raw, into the prpl_info struct,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17659
diff
changeset
|
242 bytes_sent = send(((MsimSession*)(gc->proto_data))->fd, |
cbda7f26d27d
Add a send_raw function, msim_send_really_raw, into the prpl_info struct,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17659
diff
changeset
|
243 buf + total_bytes_sent, total_bytes - total_bytes_sent, 0); |
16394 | 244 |
16409
1aa62f7368ca
Add escaping and unescaping functions (for /1 and /2).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16407
diff
changeset
|
245 if (bytes_sent < 0) |
1aa62f7368ca
Add escaping and unescaping functions (for /1 and /2).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16407
diff
changeset
|
246 { |
16723
3b5037a93807
Add initializers for reserved fields in plugin and prpl structures.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16409
diff
changeset
|
247 purple_debug_info("msim", "msim_send_raw(%s): send() failed: %s\n", |
17660
cbda7f26d27d
Add a send_raw function, msim_send_really_raw, into the prpl_info struct,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17659
diff
changeset
|
248 buf, g_strerror(errno)); |
cbda7f26d27d
Add a send_raw function, msim_send_really_raw, into the prpl_info struct,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17659
diff
changeset
|
249 return total_bytes_sent; |
16409
1aa62f7368ca
Add escaping and unescaping functions (for /1 and /2).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16407
diff
changeset
|
250 } |
1aa62f7368ca
Add escaping and unescaping functions (for /1 and /2).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16407
diff
changeset
|
251 total_bytes_sent += bytes_sent; |
1aa62f7368ca
Add escaping and unescaping functions (for /1 and /2).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16407
diff
changeset
|
252 |
1aa62f7368ca
Add escaping and unescaping functions (for /1 and /2).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16407
diff
changeset
|
253 } while(total_bytes_sent < total_bytes); |
17660
cbda7f26d27d
Add a send_raw function, msim_send_really_raw, into the prpl_info struct,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17659
diff
changeset
|
254 |
cbda7f26d27d
Add a send_raw function, msim_send_really_raw, into the prpl_info struct,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17659
diff
changeset
|
255 return total_bytes_sent; |
16394 | 256 } |
257 | |
17660
cbda7f26d27d
Add a send_raw function, msim_send_really_raw, into the prpl_info struct,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17659
diff
changeset
|
258 |
16405
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
259 /** |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
260 * Start logging in to the MSIM servers. |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
261 * |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
262 * @param acct Account information to use to login. |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
263 */ |
17661
38030f1a2e56
Split return type and function name + arguments on to separate lines, to
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17660
diff
changeset
|
264 void |
38030f1a2e56
Split return type and function name + arguments on to separate lines, to
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17660
diff
changeset
|
265 msim_login(PurpleAccount *acct) |
16405
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
266 { |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
267 PurpleConnection *gc; |
17326
f057837085b0
Change to use const gchar * where appropriate.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17325
diff
changeset
|
268 const gchar *host; |
16405
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
269 int port; |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
270 |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
271 g_return_if_fail(acct != NULL); |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
272 |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
273 purple_debug_info("myspace", "logging in %s\n", acct->username); |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
274 |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
275 gc = purple_account_get_connection(acct); |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
276 gc->proto_data = msim_session_new(acct); |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
277 |
17665
5c2720824798
Fail with our own error message if an entered password is greater than 8
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17664
diff
changeset
|
278 if (strlen(acct->password) > MSIM_MAX_PASSWORD_LENGTH) |
5c2720824798
Fail with our own error message if an entered password is greater than 8
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17664
diff
changeset
|
279 { |
5c2720824798
Fail with our own error message if an entered password is greater than 8
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17664
diff
changeset
|
280 gchar *str; |
5c2720824798
Fail with our own error message if an entered password is greater than 8
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17664
diff
changeset
|
281 |
5c2720824798
Fail with our own error message if an entered password is greater than 8
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17664
diff
changeset
|
282 |
5c2720824798
Fail with our own error message if an entered password is greater than 8
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17664
diff
changeset
|
283 /* TODO: Find out why >8 is problematic. The web site lets you have |
5c2720824798
Fail with our own error message if an entered password is greater than 8
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17664
diff
changeset
|
284 * long passwords, but reportedly the official IM client does not |
5c2720824798
Fail with our own error message if an entered password is greater than 8
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17664
diff
changeset
|
285 * allow more than 8 characters to be entered. Just entering the first |
5c2720824798
Fail with our own error message if an entered password is greater than 8
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17664
diff
changeset
|
286 * 8 does not, on first try, appear to work. */ |
17676
e7612bd6835b
Be more defensive about null pointers, especially null strings in %s format
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17674
diff
changeset
|
287 /* Note: official client lets you have 10 characters in password. */ |
e7612bd6835b
Be more defensive about null pointers, especially null strings in %s format
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17674
diff
changeset
|
288 str = g_strdup_printf( |
e7612bd6835b
Be more defensive about null pointers, especially null strings in %s format
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17674
diff
changeset
|
289 _("Sorry, passwords over %d characters in length (yours is " |
e7612bd6835b
Be more defensive about null pointers, especially null strings in %s format
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17674
diff
changeset
|
290 "%d) are currently not supported by the MySpaceIM plugin."), |
e7612bd6835b
Be more defensive about null pointers, especially null strings in %s format
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17674
diff
changeset
|
291 MSIM_MAX_PASSWORD_LENGTH, |
17665
5c2720824798
Fail with our own error message if an entered password is greater than 8
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17664
diff
changeset
|
292 (int)strlen(acct->password)); |
5c2720824798
Fail with our own error message if an entered password is greater than 8
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17664
diff
changeset
|
293 |
5c2720824798
Fail with our own error message if an entered password is greater than 8
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17664
diff
changeset
|
294 /* Notify an error message also, because this is important! */ |
5c2720824798
Fail with our own error message if an entered password is greater than 8
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17664
diff
changeset
|
295 purple_notify_error(acct, g_strdup(_("MySpaceIM Error")), str, NULL); |
5c2720824798
Fail with our own error message if an entered password is greater than 8
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17664
diff
changeset
|
296 |
5c2720824798
Fail with our own error message if an entered password is greater than 8
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17664
diff
changeset
|
297 purple_connection_error(gc, str); |
5c2720824798
Fail with our own error message if an entered password is greater than 8
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17664
diff
changeset
|
298 |
5c2720824798
Fail with our own error message if an entered password is greater than 8
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17664
diff
changeset
|
299 g_free(str); |
5c2720824798
Fail with our own error message if an entered password is greater than 8
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17664
diff
changeset
|
300 } |
5c2720824798
Fail with our own error message if an entered password is greater than 8
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17664
diff
changeset
|
301 |
5c2720824798
Fail with our own error message if an entered password is greater than 8
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17664
diff
changeset
|
302 |
16405
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
303 /* 1. connect to server */ |
16728
8f6dcd5e9298
Use _ for translations in msimprpl. See #648.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16727
diff
changeset
|
304 purple_connection_update_progress(gc, _("Connecting"), |
16405
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
305 0, /* which connection step this is */ |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
306 4); /* total number of steps */ |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
307 |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
308 host = purple_account_get_string(acct, "server", MSIM_SERVER); |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
309 port = purple_account_get_int(acct, "port", MSIM_PORT); |
16733
a8e8482a2dc6
Clean up a few TODO's.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16731
diff
changeset
|
310 |
16405
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
311 /* From purple.sf.net/api: |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
312 * """Note that this function name can be misleading--although it is called |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
313 * "proxy connect," it is used for establishing any outgoing TCP connection, |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
314 * whether through a proxy or not.""" */ |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
315 |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
316 /* Calls msim_connect_cb when connected. */ |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
317 if (purple_proxy_connect(gc, acct, host, port, msim_connect_cb, gc) == NULL) |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
318 { |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
319 /* TODO: try other ports if in auto mode, then save |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
320 * working port and try that first next time. */ |
16728
8f6dcd5e9298
Use _ for translations in msimprpl. See #648.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16727
diff
changeset
|
321 purple_connection_error(gc, _("Couldn't create socket")); |
16405
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
322 return; |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
323 } |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
324 } |
17660
cbda7f26d27d
Add a send_raw function, msim_send_really_raw, into the prpl_info struct,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17659
diff
changeset
|
325 |
16394 | 326 /** |
327 * Process a login challenge, sending a response. | |
328 * | |
329 * @param session | |
17280
d3e17c9d16e9
Use MsimMessage for receiving messages everywhere, instead of GHashTable.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17266
diff
changeset
|
330 * @param msg Login challenge message. |
16394 | 331 * |
17291
d8903e1320a9
Previously, the return value of the processing function and msim_process() told
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17290
diff
changeset
|
332 * @return TRUE if successful, FALSE if not |
16394 | 333 */ |
17661
38030f1a2e56
Split return type and function name + arguments on to separate lines, to
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17660
diff
changeset
|
334 gboolean |
38030f1a2e56
Split return type and function name + arguments on to separate lines, to
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17660
diff
changeset
|
335 msim_login_challenge(MsimSession *session, MsimMessage *msg) |
16394 | 336 { |
16396 | 337 PurpleAccount *account; |
17326
f057837085b0
Change to use const gchar * where appropriate.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17325
diff
changeset
|
338 const gchar *response; |
16736
496855295bd7
Use MsimMessage via msim_send(), instead of msim_send_raw(). This is a more
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16735
diff
changeset
|
339 guint response_len; |
17280
d3e17c9d16e9
Use MsimMessage for receiving messages everywhere, instead of GHashTable.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17266
diff
changeset
|
340 gchar *nc; |
d3e17c9d16e9
Use MsimMessage for receiving messages everywhere, instead of GHashTable.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17266
diff
changeset
|
341 gsize nc_len; |
16394 | 342 |
17291
d8903e1320a9
Previously, the return value of the processing function and msim_process() told
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17290
diff
changeset
|
343 g_return_val_if_fail(MSIM_SESSION_VALID(session), FALSE); |
d8903e1320a9
Previously, the return value of the processing function and msim_process() told
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17290
diff
changeset
|
344 g_return_val_if_fail(msg != NULL, FALSE); |
16394 | 345 |
17291
d8903e1320a9
Previously, the return value of the processing function and msim_process() told
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17290
diff
changeset
|
346 g_return_val_if_fail(msim_msg_get_binary(msg, "nc", &nc, &nc_len), FALSE); |
16394 | 347 |
348 account = session->account; | |
17291
d8903e1320a9
Previously, the return value of the processing function and msim_process() told
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17290
diff
changeset
|
349 |
d8903e1320a9
Previously, the return value of the processing function and msim_process() told
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17290
diff
changeset
|
350 g_return_val_if_fail(account != NULL, FALSE); |
16394 | 351 |
16728
8f6dcd5e9298
Use _ for translations in msimprpl. See #648.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16727
diff
changeset
|
352 purple_connection_update_progress(session->gc, _("Reading challenge"), 1, 4); |
16394 | 353 |
17280
d3e17c9d16e9
Use MsimMessage for receiving messages everywhere, instead of GHashTable.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17266
diff
changeset
|
354 purple_debug_info("msim", "nc is %d bytes, decoded\n", nc_len); |
16394 | 355 |
356 if (nc_len != 0x40) | |
357 { | |
16396 | 358 purple_debug_info("msim", "bad nc length: %x != 0x40\n", nc_len); |
16728
8f6dcd5e9298
Use _ for translations in msimprpl. See #648.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16727
diff
changeset
|
359 purple_connection_error(session->gc, _("Unexpected challenge length from server")); |
17291
d8903e1320a9
Previously, the return value of the processing function and msim_process() told
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17290
diff
changeset
|
360 return FALSE; |
16394 | 361 } |
362 | |
16728
8f6dcd5e9298
Use _ for translations in msimprpl. See #648.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16727
diff
changeset
|
363 purple_connection_update_progress(session->gc, _("Logging in"), 2, 4); |
16394 | 364 |
16736
496855295bd7
Use MsimMessage via msim_send(), instead of msim_send_raw(). This is a more
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16735
diff
changeset
|
365 response = msim_compute_login_response(nc, account->username, account->password, &response_len); |
16394 | 366 |
367 g_free(nc); | |
368 | |
17291
d8903e1320a9
Previously, the return value of the processing function and msim_process() told
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17290
diff
changeset
|
369 return msim_send(session, |
16736
496855295bd7
Use MsimMessage via msim_send(), instead of msim_send_raw(). This is a more
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16735
diff
changeset
|
370 "login2", MSIM_TYPE_INTEGER, MSIM_AUTH_ALGORITHM, |
17309
25a55b52855a
Add, but do not use, two new functions to postprocess outgoing messages
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17308
diff
changeset
|
371 /* This is actually user's email address. */ |
16736
496855295bd7
Use MsimMessage via msim_send(), instead of msim_send_raw(). This is a more
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16735
diff
changeset
|
372 "username", MSIM_TYPE_STRING, g_strdup(account->username), |
496855295bd7
Use MsimMessage via msim_send(), instead of msim_send_raw(). This is a more
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16735
diff
changeset
|
373 /* GString and gchar * response will be freed in msim_msg_free() in msim_send(). */ |
496855295bd7
Use MsimMessage via msim_send(), instead of msim_send_raw(). This is a more
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16735
diff
changeset
|
374 "response", MSIM_TYPE_BINARY, g_string_new_len(response, response_len), |
496855295bd7
Use MsimMessage via msim_send(), instead of msim_send_raw(). This is a more
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16735
diff
changeset
|
375 "clientver", MSIM_TYPE_INTEGER, MSIM_CLIENT_VERSION, |
496855295bd7
Use MsimMessage via msim_send(), instead of msim_send_raw(). This is a more
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16735
diff
changeset
|
376 "reconn", MSIM_TYPE_INTEGER, 0, |
496855295bd7
Use MsimMessage via msim_send(), instead of msim_send_raw(). This is a more
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16735
diff
changeset
|
377 "status", MSIM_TYPE_INTEGER, 100, |
496855295bd7
Use MsimMessage via msim_send(), instead of msim_send_raw(). This is a more
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16735
diff
changeset
|
378 "id", MSIM_TYPE_INTEGER, 1, |
16731
2e0bd3e6f2c7
Incomplete attempt at using msim_send() instead of msim_send_raw().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16730
diff
changeset
|
379 NULL); |
16394 | 380 } |
381 | |
16725
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
382 #ifndef MSIM_USE_PURPLE_RC4 |
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
383 /* No RC4 in this version of libpurple, so bring our own. */ |
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
384 |
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
385 /* |
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
386 Unix SMB/CIFS implementation. |
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
387 |
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
388 a partial implementation of RC4 designed for use in the |
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
389 SMB authentication protocol |
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
390 |
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
391 Copyright (C) Andrew Tridgell 1998 |
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
392 |
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
393 $Id: crypt-rc4.c 12116 2004-09-27 23:29:22Z guy $ |
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
394 |
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
395 This program is free software; you can redistribute it and/or modify |
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
396 it under the terms of the GNU General Public License as published by |
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
397 the Free Software Foundation; either version 2 of the License, or |
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
398 (at your option) any later version. |
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
399 |
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
400 This program is distributed in the hope that it will be useful, |
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
401 but WITHOUT ANY WARRANTY; without even the implied warranty of |
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
402 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
403 GNU General Public License for more details. |
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
404 |
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
405 You should have received a copy of the GNU General Public License |
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
406 along with this program; if not, write to the Free Software |
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
407 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
408 |
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
409 |
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
410 Modified by Jeff Connelly for MySpaceIM Gaim plugin. |
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
411 */ |
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
412 |
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
413 #include <glib.h> |
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
414 #include <string.h> |
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
415 |
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
416 /* Perform RC4 on a block of data using specified key. "data" is a pointer |
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
417 to the block to be processed. Output is written to same memory as input, |
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
418 so caller may need to make a copy before calling this function, since |
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
419 the input will be overwritten. |
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
420 |
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
421 Taken from Samba source code. Modified to allow us to maintain state |
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
422 between calls to crypt_rc4. |
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
423 */ |
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
424 |
17661
38030f1a2e56
Split return type and function name + arguments on to separate lines, to
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17660
diff
changeset
|
425 void |
38030f1a2e56
Split return type and function name + arguments on to separate lines, to
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17660
diff
changeset
|
426 crypt_rc4_init(rc4_state_struct *rc4_state, |
17326
f057837085b0
Change to use const gchar * where appropriate.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17325
diff
changeset
|
427 const guchar *key, int key_len) |
16725
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
428 { |
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
429 int ind; |
17326
f057837085b0
Change to use const gchar * where appropriate.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17325
diff
changeset
|
430 unsigned gchar j = 0; |
f057837085b0
Change to use const gchar * where appropriate.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17325
diff
changeset
|
431 unsigned gchar *s_box; |
16725
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
432 |
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
433 memset(rc4_state, 0, sizeof(rc4_state_struct)); |
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
434 s_box = rc4_state->s_box; |
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
435 |
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
436 for (ind = 0; ind < 256; ind++) |
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
437 { |
17326
f057837085b0
Change to use const gchar * where appropriate.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17325
diff
changeset
|
438 s_box[ind] = (guchar)ind; |
16725
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
439 } |
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
440 |
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
441 for( ind = 0; ind < 256; ind++) |
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
442 { |
17326
f057837085b0
Change to use const gchar * where appropriate.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17325
diff
changeset
|
443 guchar tc; |
16725
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
444 |
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
445 j += (s_box[ind] + key[ind%key_len]); |
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
446 |
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
447 tc = s_box[ind]; |
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
448 s_box[ind] = s_box[j]; |
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
449 s_box[j] = tc; |
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
450 } |
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
451 |
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
452 } |
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
453 |
17661
38030f1a2e56
Split return type and function name + arguments on to separate lines, to
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17660
diff
changeset
|
454 void |
38030f1a2e56
Split return type and function name + arguments on to separate lines, to
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17660
diff
changeset
|
455 crypt_rc4(rc4_state_struct *rc4_state, guchar *data, int data_len) |
16725
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
456 { |
17326
f057837085b0
Change to use const gchar * where appropriate.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17325
diff
changeset
|
457 guchar *s_box; |
f057837085b0
Change to use const gchar * where appropriate.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17325
diff
changeset
|
458 guchar index_i; |
f057837085b0
Change to use const gchar * where appropriate.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17325
diff
changeset
|
459 guchar index_j; |
16725
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
460 int ind; |
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
461 |
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
462 /* retrieve current state from the state struct (so we can resume where |
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
463 we left off) */ |
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
464 index_i = rc4_state->index_i; |
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
465 index_j = rc4_state->index_j; |
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
466 s_box = rc4_state->s_box; |
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
467 |
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
468 for( ind = 0; ind < data_len; ind++) |
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
469 { |
17326
f057837085b0
Change to use const gchar * where appropriate.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17325
diff
changeset
|
470 guchar tc; |
f057837085b0
Change to use const gchar * where appropriate.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17325
diff
changeset
|
471 guchar t; |
16725
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
472 |
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
473 index_i++; |
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
474 index_j += s_box[index_i]; |
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
475 |
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
476 tc = s_box[index_i]; |
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
477 s_box[index_i] = s_box[index_j]; |
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
478 s_box[index_j] = tc; |
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
479 |
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
480 t = s_box[index_i] + s_box[index_j]; |
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
481 data[ind] = data[ind] ^ s_box[t]; |
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
482 } |
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
483 |
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
484 /* Store the updated state */ |
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
485 rc4_state->index_i = index_i; |
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
486 rc4_state->index_j = index_j; |
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
487 } |
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
488 |
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
489 #endif /* !MSIM_USE_PURPLE_RC4 */ |
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
490 |
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
491 |
16394 | 492 /** |
16405
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
493 * Compute the base64'd login challenge response based on username, password, nonce, and IPs. |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
494 * |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
495 * @param nonce The base64 encoded nonce ('nc') field from the server. |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
496 * @param email User's email address (used as login name). |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
497 * @param password User's cleartext password. |
16736
496855295bd7
Use MsimMessage via msim_send(), instead of msim_send_raw(). This is a more
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16735
diff
changeset
|
498 * @param response_len Will be written with response length. |
16394 | 499 * |
16736
496855295bd7
Use MsimMessage via msim_send(), instead of msim_send_raw(). This is a more
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16735
diff
changeset
|
500 * @return Binary login challenge response, ready to send to the server. Must be g_free()'d |
16405
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
501 * when finished. |
16394 | 502 */ |
17661
38030f1a2e56
Split return type and function name + arguments on to separate lines, to
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17660
diff
changeset
|
503 const gchar * |
38030f1a2e56
Split return type and function name + arguments on to separate lines, to
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17660
diff
changeset
|
504 msim_compute_login_response(const gchar nonce[2 * NONCE_SIZE], |
17326
f057837085b0
Change to use const gchar * where appropriate.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17325
diff
changeset
|
505 const gchar *email, const gchar *password, guint *response_len) |
16394 | 506 { |
16405
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
507 PurpleCipherContext *key_context; |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
508 PurpleCipher *sha1; |
16725
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
509 #ifdef MSIM_USE_PURPLE_RC4 |
16405
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
510 PurpleCipherContext *rc4; |
16725
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
511 #else |
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
512 rc4_state_struct rc4; |
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
513 #endif |
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
514 |
16405
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
515 guchar hash_pw[HASH_SIZE]; |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
516 guchar key[HASH_SIZE]; |
16738
0fa4a3e9b318
Stylistic improvements - use type *name instead of type* name for pointers
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16736
diff
changeset
|
517 gchar *password_utf16le; |
0fa4a3e9b318
Stylistic improvements - use type *name instead of type* name for pointers
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16736
diff
changeset
|
518 guchar *data; |
0fa4a3e9b318
Stylistic improvements - use type *name instead of type* name for pointers
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16736
diff
changeset
|
519 guchar *data_out; |
16405
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
520 size_t data_len, data_out_len; |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
521 gsize conv_bytes_read, conv_bytes_written; |
16738
0fa4a3e9b318
Stylistic improvements - use type *name instead of type* name for pointers
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16736
diff
changeset
|
522 GError *conv_error; |
16725
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
523 #ifdef MSIM_DEBUG_LOGIN_CHALLENGE |
16407
bb649c52fc19
Replace printf() in MySpaceIM prpl with purple_debug_info().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16406
diff
changeset
|
524 int i; |
bb649c52fc19
Replace printf() in MySpaceIM prpl with purple_debug_info().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16406
diff
changeset
|
525 #endif |
16394 | 526 |
16405
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
527 /* Convert ASCII password to UTF16 little endian */ |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
528 purple_debug_info("msim", "converting password to UTF-16LE\n"); |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
529 conv_error = NULL; |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
530 password_utf16le = g_convert(password, -1, "UTF-16LE", "UTF-8", |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
531 &conv_bytes_read, &conv_bytes_written, &conv_error); |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
532 g_assert(conv_bytes_read == strlen(password)); |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
533 if (conv_error != NULL) |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
534 { |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
535 purple_debug_error("msim", |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
536 "g_convert password UTF8->UTF16LE failed: %s", |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
537 conv_error->message); |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
538 g_error_free(conv_error); |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
539 } |
16394 | 540 |
16405
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
541 /* Compute password hash */ |
16738
0fa4a3e9b318
Stylistic improvements - use type *name instead of type* name for pointers
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16736
diff
changeset
|
542 purple_cipher_digest_region("sha1", (guchar *)password_utf16le, |
16405
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
543 conv_bytes_written, sizeof(hash_pw), hash_pw, NULL); |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
544 g_free(password_utf16le); |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
545 |
16725
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
546 #ifdef MSIM_DEBUG_LOGIN_CHALLENGE |
16407
bb649c52fc19
Replace printf() in MySpaceIM prpl with purple_debug_info().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16406
diff
changeset
|
547 purple_debug_info("msim", "pwhash = "); |
16405
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
548 for (i = 0; i < sizeof(hash_pw); i++) |
16407
bb649c52fc19
Replace printf() in MySpaceIM prpl with purple_debug_info().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16406
diff
changeset
|
549 purple_debug_info("msim", "%.2x ", hash_pw[i]); |
bb649c52fc19
Replace printf() in MySpaceIM prpl with purple_debug_info().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16406
diff
changeset
|
550 purple_debug_info("msim", "\n"); |
16405
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
551 #endif |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
552 |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
553 /* key = sha1(sha1(pw) + nonce2) */ |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
554 sha1 = purple_ciphers_find_cipher("sha1"); |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
555 key_context = purple_cipher_context_new(sha1, NULL); |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
556 purple_cipher_context_append(key_context, hash_pw, HASH_SIZE); |
17280
d3e17c9d16e9
Use MsimMessage for receiving messages everywhere, instead of GHashTable.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17266
diff
changeset
|
557 purple_cipher_context_append(key_context, (guchar *)(nonce + NONCE_SIZE), NONCE_SIZE); |
16405
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
558 purple_cipher_context_digest(key_context, sizeof(key), key, NULL); |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
559 |
16725
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
560 #ifdef MSIM_DEBUG_LOGIN_CHALLENGE |
16407
bb649c52fc19
Replace printf() in MySpaceIM prpl with purple_debug_info().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16406
diff
changeset
|
561 purple_debug_info("msim", "key = "); |
16405
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
562 for (i = 0; i < sizeof(key); i++) |
16394 | 563 { |
16407
bb649c52fc19
Replace printf() in MySpaceIM prpl with purple_debug_info().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16406
diff
changeset
|
564 purple_debug_info("msim", "%.2x ", key[i]); |
16405
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
565 } |
16407
bb649c52fc19
Replace printf() in MySpaceIM prpl with purple_debug_info().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16406
diff
changeset
|
566 purple_debug_info("msim", "\n"); |
16405
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
567 #endif |
16394 | 568 |
16725
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
569 #ifdef MSIM_USE_PURPLE_RC4 |
16405
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
570 rc4 = purple_cipher_context_new_by_name("rc4", NULL); |
16394 | 571 |
16405
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
572 /* Note: 'key' variable is 0x14 bytes (from SHA-1 hash), |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
573 * but only first 0x10 used for the RC4 key. */ |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
574 purple_cipher_context_set_option(rc4, "key_len", (gpointer)0x10); |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
575 purple_cipher_context_set_key(rc4, key); |
16725
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
576 #endif |
16405
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
577 |
17652
06d60201e371
Use constants for IP address list, defined in myspace.h.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17651
diff
changeset
|
578 /* TODO: obtain IPs of network interfaces */ |
06d60201e371
Use constants for IP address list, defined in myspace.h.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17651
diff
changeset
|
579 |
16405
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
580 /* rc4 encrypt: |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
581 * nonce1+email+IP list */ |
17652
06d60201e371
Use constants for IP address list, defined in myspace.h.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17651
diff
changeset
|
582 |
06d60201e371
Use constants for IP address list, defined in myspace.h.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17651
diff
changeset
|
583 data_len = NONCE_SIZE + strlen(email) + MSIM_LOGIN_IP_LIST_LEN; |
16405
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
584 data = g_new0(guchar, data_len); |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
585 memcpy(data, nonce, NONCE_SIZE); |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
586 memcpy(data + NONCE_SIZE, email, strlen(email)); |
17652
06d60201e371
Use constants for IP address list, defined in myspace.h.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17651
diff
changeset
|
587 memcpy(data + NONCE_SIZE + strlen(email), MSIM_LOGIN_IP_LIST, MSIM_LOGIN_IP_LIST_LEN); |
16405
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
588 |
16725
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
589 #ifdef MSIM_USE_PURPLE_RC4 |
16405
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
590 data_out = g_new0(guchar, data_len); |
16725
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
591 |
16738
0fa4a3e9b318
Stylistic improvements - use type *name instead of type* name for pointers
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16736
diff
changeset
|
592 purple_cipher_context_encrypt(rc4, (const guchar *)data, |
16405
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
593 data_len, data_out, &data_out_len); |
16725
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
594 purple_cipher_context_destroy(rc4); |
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
595 #else |
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
596 /* Use our own RC4 code */ |
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
597 purple_debug_info("msim", "Using non-purple RC4 cipher code in this version\n"); |
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
598 crypt_rc4_init(&rc4, key, 0x10); |
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
599 crypt_rc4(&rc4, data, data_len); |
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
600 data_out_len = data_len; |
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
601 data_out = data; |
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
602 #endif |
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
603 |
16405
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
604 g_assert(data_out_len == data_len); |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
605 |
16736
496855295bd7
Use MsimMessage via msim_send(), instead of msim_send_raw(). This is a more
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16735
diff
changeset
|
606 #ifdef MSIM_DEBUG_LOGIN_CHALLENGE |
496855295bd7
Use MsimMessage via msim_send(), instead of msim_send_raw(). This is a more
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16735
diff
changeset
|
607 purple_debug_info("msim", "response=<%s>\n", data_out); |
16725
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
608 #endif |
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
609 |
16736
496855295bd7
Use MsimMessage via msim_send(), instead of msim_send_raw(). This is a more
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16735
diff
changeset
|
610 *response_len = data_out_len; |
16405
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
611 |
17326
f057837085b0
Change to use const gchar * where appropriate.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17325
diff
changeset
|
612 return (const gchar *)data_out; |
16405
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
613 } |
16394 | 614 |
16405
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
615 /** |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
616 * Schedule an IM to be sent once the user ID is looked up. |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
617 * |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
618 * @param gc Connection. |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
619 * @param who A user id, email, or username to send the message to. |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
620 * @param message Instant message text to send. |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
621 * @param flags Flags. |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
622 * |
17310
05723949f75d
Change msim_send_im() to use msim_postprocess_outgoing(), eliminating the
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17309
diff
changeset
|
623 * @return 1 if successful or postponed, -1 if failed |
16405
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
624 * |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
625 * Allows sending to a user by username, email address, or userid. If |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
626 * a username or email address is given, the userid must be looked up. |
17310
05723949f75d
Change msim_send_im() to use msim_postprocess_outgoing(), eliminating the
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17309
diff
changeset
|
627 * This function does that by calling msim_postprocess_outgoing(). |
16405
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
628 */ |
17661
38030f1a2e56
Split return type and function name + arguments on to separate lines, to
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17660
diff
changeset
|
629 int |
38030f1a2e56
Split return type and function name + arguments on to separate lines, to
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17660
diff
changeset
|
630 msim_send_im(PurpleConnection *gc, const gchar *who, const gchar *message, |
38030f1a2e56
Split return type and function name + arguments on to separate lines, to
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17660
diff
changeset
|
631 PurpleMessageFlags flags) |
16405
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
632 { |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
633 MsimSession *session; |
17315
d9aaccef8721
Send typing notifications (tested).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17314
diff
changeset
|
634 |
16405
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
635 g_return_val_if_fail(gc != NULL, 0); |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
636 g_return_val_if_fail(who != NULL, 0); |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
637 g_return_val_if_fail(message != NULL, 0); |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
638 |
17300
176b1ba4bafe
Remove 'flags' from send_im_cb_struct - it was never needed.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17299
diff
changeset
|
639 /* 'flags' has many options, not used here. */ |
176b1ba4bafe
Remove 'flags' from send_im_cb_struct - it was never needed.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17299
diff
changeset
|
640 |
17315
d9aaccef8721
Send typing notifications (tested).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17314
diff
changeset
|
641 session = gc->proto_data; |
16405
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
642 |
17326
f057837085b0
Change to use const gchar * where appropriate.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17325
diff
changeset
|
643 if (msim_send_bm(session, who, message, MSIM_BM_INSTANT)) |
17310
05723949f75d
Change msim_send_im() to use msim_postprocess_outgoing(), eliminating the
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17309
diff
changeset
|
644 { |
05723949f75d
Change msim_send_im() to use msim_postprocess_outgoing(), eliminating the
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17309
diff
changeset
|
645 /* Return 1 to have Purple show this IM as being sent, 0 to not. I always |
05723949f75d
Change msim_send_im() to use msim_postprocess_outgoing(), eliminating the
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17309
diff
changeset
|
646 * return 1 even if the message could not be sent, since I don't know if |
05723949f75d
Change msim_send_im() to use msim_postprocess_outgoing(), eliminating the
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17309
diff
changeset
|
647 * it has failed yet--because the IM is only sent after the userid is |
05723949f75d
Change msim_send_im() to use msim_postprocess_outgoing(), eliminating the
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17309
diff
changeset
|
648 * retrieved from the server (which happens after this function returns). |
05723949f75d
Change msim_send_im() to use msim_postprocess_outgoing(), eliminating the
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17309
diff
changeset
|
649 */ |
17315
d9aaccef8721
Send typing notifications (tested).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17314
diff
changeset
|
650 return 1; |
17310
05723949f75d
Change msim_send_im() to use msim_postprocess_outgoing(), eliminating the
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17309
diff
changeset
|
651 } else { |
17315
d9aaccef8721
Send typing notifications (tested).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17314
diff
changeset
|
652 return -1; |
17310
05723949f75d
Change msim_send_im() to use msim_postprocess_outgoing(), eliminating the
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17309
diff
changeset
|
653 } |
05723949f75d
Change msim_send_im() to use msim_postprocess_outgoing(), eliminating the
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17309
diff
changeset
|
654 /* |
17651
333fe6ac1046
Add msim_unrecognized() to handle unhandled messages.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17650
diff
changeset
|
655 * In MySpace, you login with your email address, but don't talk to other |
16405
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
656 * users using their email address. So there is currently an asymmetry in the |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
657 * IM windows when using this plugin: |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
658 * |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
659 * you@example.com: hello |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
660 * some_other_user: what's going on? |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
661 * you@example.com: just coding a prpl |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
662 * |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
663 * TODO: Make the sent IM's appear as from the user's username, instead of |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
664 * their email address. Purple uses the login (in MSIM, the email)--change this. |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
665 */ |
16394 | 666 } |
667 | |
17315
d9aaccef8721
Send typing notifications (tested).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17314
diff
changeset
|
668 /** Send a buddy message of a given type. |
d9aaccef8721
Send typing notifications (tested).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17314
diff
changeset
|
669 * |
d9aaccef8721
Send typing notifications (tested).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17314
diff
changeset
|
670 * @param session |
d9aaccef8721
Send typing notifications (tested).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17314
diff
changeset
|
671 * @param who Username to send message to. |
d9aaccef8721
Send typing notifications (tested).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17314
diff
changeset
|
672 * @param text Message text to send. Not freed; will be copied. |
d9aaccef8721
Send typing notifications (tested).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17314
diff
changeset
|
673 * @param type A MSIM_BM_* constant. |
d9aaccef8721
Send typing notifications (tested).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17314
diff
changeset
|
674 * |
d9aaccef8721
Send typing notifications (tested).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17314
diff
changeset
|
675 * Buddy messages ('bm') include instant messages, action messages, status messages, etc. |
d9aaccef8721
Send typing notifications (tested).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17314
diff
changeset
|
676 */ |
17661
38030f1a2e56
Split return type and function name + arguments on to separate lines, to
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17660
diff
changeset
|
677 gboolean |
38030f1a2e56
Split return type and function name + arguments on to separate lines, to
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17660
diff
changeset
|
678 msim_send_bm(MsimSession *session, const gchar *who, const gchar *text, |
38030f1a2e56
Split return type and function name + arguments on to separate lines, to
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17660
diff
changeset
|
679 int type) |
17315
d9aaccef8721
Send typing notifications (tested).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17314
diff
changeset
|
680 { |
d9aaccef8721
Send typing notifications (tested).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17314
diff
changeset
|
681 gboolean rc; |
d9aaccef8721
Send typing notifications (tested).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17314
diff
changeset
|
682 MsimMessage *msg; |
17326
f057837085b0
Change to use const gchar * where appropriate.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17325
diff
changeset
|
683 const gchar *from_username; |
f057837085b0
Change to use const gchar * where appropriate.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17325
diff
changeset
|
684 |
f057837085b0
Change to use const gchar * where appropriate.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17325
diff
changeset
|
685 from_username = session->account->username; |
17315
d9aaccef8721
Send typing notifications (tested).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17314
diff
changeset
|
686 |
d9aaccef8721
Send typing notifications (tested).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17314
diff
changeset
|
687 purple_debug_info("msim", "sending %d message from %s to %s: %s\n", |
d9aaccef8721
Send typing notifications (tested).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17314
diff
changeset
|
688 type, from_username, who, text); |
d9aaccef8721
Send typing notifications (tested).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17314
diff
changeset
|
689 |
d9aaccef8721
Send typing notifications (tested).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17314
diff
changeset
|
690 msg = msim_msg_new(TRUE, |
d9aaccef8721
Send typing notifications (tested).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17314
diff
changeset
|
691 "bm", MSIM_TYPE_INTEGER, GUINT_TO_POINTER(type), |
d9aaccef8721
Send typing notifications (tested).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17314
diff
changeset
|
692 "sesskey", MSIM_TYPE_INTEGER, GUINT_TO_POINTER(session->sesskey), |
d9aaccef8721
Send typing notifications (tested).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17314
diff
changeset
|
693 /* 't' will be inserted here */ |
d9aaccef8721
Send typing notifications (tested).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17314
diff
changeset
|
694 "cv", MSIM_TYPE_INTEGER, GUINT_TO_POINTER(MSIM_CLIENT_VERSION), |
d9aaccef8721
Send typing notifications (tested).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17314
diff
changeset
|
695 "msg", MSIM_TYPE_STRING, g_strdup(text), |
d9aaccef8721
Send typing notifications (tested).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17314
diff
changeset
|
696 NULL); |
d9aaccef8721
Send typing notifications (tested).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17314
diff
changeset
|
697 |
17326
f057837085b0
Change to use const gchar * where appropriate.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17325
diff
changeset
|
698 rc = msim_postprocess_outgoing(session, msg, who, "t", "cv"); |
17315
d9aaccef8721
Send typing notifications (tested).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17314
diff
changeset
|
699 |
d9aaccef8721
Send typing notifications (tested).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17314
diff
changeset
|
700 msim_msg_free(msg); |
d9aaccef8721
Send typing notifications (tested).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17314
diff
changeset
|
701 |
d9aaccef8721
Send typing notifications (tested).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17314
diff
changeset
|
702 return rc; |
d9aaccef8721
Send typing notifications (tested).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17314
diff
changeset
|
703 } |
d9aaccef8721
Send typing notifications (tested).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17314
diff
changeset
|
704 |
17681
5e8c02259c81
Add option to sign on as hidden, or as not (previously, always signed on
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17680
diff
changeset
|
705 |
5e8c02259c81
Add option to sign on as hidden, or as not (previously, always signed on
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17680
diff
changeset
|
706 #ifdef MSIM_FONT_SIZE_WORKS |
17662
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
707 /** Convert a msim markup font height to points. */ |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
708 static guint |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
709 msim_font_height_to_point(guint height) |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
710 { |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
711 /* See also: libpurple/protocols/bonjour/jabber.c |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
712 * _font_size_ichat_to_purple */ |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
713 switch (height) |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
714 { |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
715 case 11: return 8; |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
716 case 12: return 9; |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
717 case 13: return 10; |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
718 case 14: |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
719 case 15: return 11; |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
720 case 16: return 12; |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
721 case 17: |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
722 case 18: return 13; |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
723 case 19: return 14; |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
724 case 20: return 15; |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
725 case 21: return 16; |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
726 default: return 12; |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
727 } |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
728 } |
17681
5e8c02259c81
Add option to sign on as hidden, or as not (previously, always signed on
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17680
diff
changeset
|
729 #endif |
17662
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
730 |
17668
a014bcce5a5d
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17665
diff
changeset
|
731 /** Convert the msim markup <f> (font) tag into HTML. */ |
a014bcce5a5d
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17665
diff
changeset
|
732 static void msim_markup_f_to_html(xmlnode *root, gchar **begin, gchar **end) |
a014bcce5a5d
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17665
diff
changeset
|
733 { |
a014bcce5a5d
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17665
diff
changeset
|
734 const gchar *face, *height_str, *decor_str; |
a014bcce5a5d
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17665
diff
changeset
|
735 GString *gs_end, *gs_begin; |
a014bcce5a5d
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17665
diff
changeset
|
736 guint decor, height; |
a014bcce5a5d
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17665
diff
changeset
|
737 |
17678
51f54868bbad
Fix typo to allow font face to be displayed correctly on incoming messages.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17677
diff
changeset
|
738 face = xmlnode_get_attrib(root, "f"); |
17668
a014bcce5a5d
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17665
diff
changeset
|
739 height_str = xmlnode_get_attrib(root, "h"); |
a014bcce5a5d
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17665
diff
changeset
|
740 decor_str = xmlnode_get_attrib(root, "s"); |
a014bcce5a5d
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17665
diff
changeset
|
741 |
a014bcce5a5d
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17665
diff
changeset
|
742 if (height_str) |
a014bcce5a5d
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17665
diff
changeset
|
743 height = atol(height_str); |
a014bcce5a5d
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17665
diff
changeset
|
744 else |
a014bcce5a5d
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17665
diff
changeset
|
745 height = 12; |
a014bcce5a5d
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17665
diff
changeset
|
746 |
a014bcce5a5d
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17665
diff
changeset
|
747 if (decor_str) |
a014bcce5a5d
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17665
diff
changeset
|
748 decor = atol(decor_str); |
a014bcce5a5d
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17665
diff
changeset
|
749 else |
a014bcce5a5d
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17665
diff
changeset
|
750 decor = 0; |
a014bcce5a5d
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17665
diff
changeset
|
751 |
a014bcce5a5d
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17665
diff
changeset
|
752 gs_begin = g_string_new(""); |
17678
51f54868bbad
Fix typo to allow font face to be displayed correctly on incoming messages.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17677
diff
changeset
|
753 #ifdef MSIM_FONT_SIZE_WORKS |
51f54868bbad
Fix typo to allow font face to be displayed correctly on incoming messages.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17677
diff
changeset
|
754 /* TODO: get font size working */ |
17676
e7612bd6835b
Be more defensive about null pointers, especially null strings in %s format
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17674
diff
changeset
|
755 if (!face) |
e7612bd6835b
Be more defensive about null pointers, especially null strings in %s format
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17674
diff
changeset
|
756 g_string_printf(gs_begin, "<font size='%d'>", |
17678
51f54868bbad
Fix typo to allow font face to be displayed correctly on incoming messages.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17677
diff
changeset
|
757 msim_font_height_to_point(height)); |
17676
e7612bd6835b
Be more defensive about null pointers, especially null strings in %s format
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17674
diff
changeset
|
758 else |
e7612bd6835b
Be more defensive about null pointers, especially null strings in %s format
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17674
diff
changeset
|
759 g_string_printf(gs_begin, "<font face='%s' size='%d'>", face, |
17678
51f54868bbad
Fix typo to allow font face to be displayed correctly on incoming messages.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17677
diff
changeset
|
760 msim_font_height_to_point(height)); |
51f54868bbad
Fix typo to allow font face to be displayed correctly on incoming messages.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17677
diff
changeset
|
761 #else |
51f54868bbad
Fix typo to allow font face to be displayed correctly on incoming messages.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17677
diff
changeset
|
762 if (face) |
51f54868bbad
Fix typo to allow font face to be displayed correctly on incoming messages.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17677
diff
changeset
|
763 { |
51f54868bbad
Fix typo to allow font face to be displayed correctly on incoming messages.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17677
diff
changeset
|
764 g_string_printf(gs_begin, "<font face='%s'>", face); |
51f54868bbad
Fix typo to allow font face to be displayed correctly on incoming messages.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17677
diff
changeset
|
765 } else { |
51f54868bbad
Fix typo to allow font face to be displayed correctly on incoming messages.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17677
diff
changeset
|
766 g_string_printf(gs_begin, "<font>"); |
51f54868bbad
Fix typo to allow font face to be displayed correctly on incoming messages.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17677
diff
changeset
|
767 } |
51f54868bbad
Fix typo to allow font face to be displayed correctly on incoming messages.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17677
diff
changeset
|
768 #endif |
51f54868bbad
Fix typo to allow font face to be displayed correctly on incoming messages.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17677
diff
changeset
|
769 |
17676
e7612bd6835b
Be more defensive about null pointers, especially null strings in %s format
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17674
diff
changeset
|
770 |
17668
a014bcce5a5d
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17665
diff
changeset
|
771 /* No support for font-size CSS? */ |
a014bcce5a5d
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17665
diff
changeset
|
772 /* g_string_printf(gs_begin, "<span style='font-family: %s; font-size: %dpt'>", face, |
a014bcce5a5d
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17665
diff
changeset
|
773 msim_font_height_to_point(height)); */ |
a014bcce5a5d
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17665
diff
changeset
|
774 |
a014bcce5a5d
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17665
diff
changeset
|
775 gs_end = g_string_new("</font>"); |
a014bcce5a5d
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17665
diff
changeset
|
776 |
a014bcce5a5d
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17665
diff
changeset
|
777 if (decor & 1) |
a014bcce5a5d
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17665
diff
changeset
|
778 { |
a014bcce5a5d
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17665
diff
changeset
|
779 g_string_append(gs_begin, "<b>"); |
a014bcce5a5d
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17665
diff
changeset
|
780 g_string_prepend(gs_end, "</b>"); |
a014bcce5a5d
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17665
diff
changeset
|
781 } |
a014bcce5a5d
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17665
diff
changeset
|
782 |
a014bcce5a5d
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17665
diff
changeset
|
783 if (decor & 2) |
a014bcce5a5d
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17665
diff
changeset
|
784 { |
a014bcce5a5d
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17665
diff
changeset
|
785 g_string_append(gs_begin, "<i>"); |
a014bcce5a5d
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17665
diff
changeset
|
786 g_string_append(gs_end, "</i>"); |
a014bcce5a5d
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17665
diff
changeset
|
787 } |
a014bcce5a5d
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17665
diff
changeset
|
788 |
a014bcce5a5d
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17665
diff
changeset
|
789 if (decor & 4) |
a014bcce5a5d
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17665
diff
changeset
|
790 { |
a014bcce5a5d
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17665
diff
changeset
|
791 g_string_append(gs_begin, "<u>"); |
a014bcce5a5d
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17665
diff
changeset
|
792 g_string_append(gs_end, "</u>"); |
a014bcce5a5d
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17665
diff
changeset
|
793 } |
a014bcce5a5d
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17665
diff
changeset
|
794 |
a014bcce5a5d
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17665
diff
changeset
|
795 |
a014bcce5a5d
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17665
diff
changeset
|
796 *begin = gs_begin->str; |
a014bcce5a5d
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17665
diff
changeset
|
797 *end = gs_end->str; |
a014bcce5a5d
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17665
diff
changeset
|
798 } |
a014bcce5a5d
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17665
diff
changeset
|
799 |
17677
11988aee28f2
Add msim_color_to_purple() to convert msim markup color to a color for
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17676
diff
changeset
|
800 /** Convert a msim markup color to a color suitable for libpurple. |
11988aee28f2
Add msim_color_to_purple() to convert msim markup color to a color for
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17676
diff
changeset
|
801 * |
11988aee28f2
Add msim_color_to_purple() to convert msim markup color to a color for
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17676
diff
changeset
|
802 * @param msim Either a color name, or an rgb(x,y,z) code. |
11988aee28f2
Add msim_color_to_purple() to convert msim markup color to a color for
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17676
diff
changeset
|
803 * |
11988aee28f2
Add msim_color_to_purple() to convert msim markup color to a color for
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17676
diff
changeset
|
804 * @return A new string, either a color name or #rrggbb code. Must g_free(). |
11988aee28f2
Add msim_color_to_purple() to convert msim markup color to a color for
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17676
diff
changeset
|
805 */ |
11988aee28f2
Add msim_color_to_purple() to convert msim markup color to a color for
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17676
diff
changeset
|
806 static char *msim_color_to_purple(const char *msim) |
11988aee28f2
Add msim_color_to_purple() to convert msim markup color to a color for
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17676
diff
changeset
|
807 { |
11988aee28f2
Add msim_color_to_purple() to convert msim markup color to a color for
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17676
diff
changeset
|
808 guint red, green, blue; |
11988aee28f2
Add msim_color_to_purple() to convert msim markup color to a color for
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17676
diff
changeset
|
809 |
11988aee28f2
Add msim_color_to_purple() to convert msim markup color to a color for
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17676
diff
changeset
|
810 if (!msim) |
11988aee28f2
Add msim_color_to_purple() to convert msim markup color to a color for
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17676
diff
changeset
|
811 return g_strdup("black"); |
11988aee28f2
Add msim_color_to_purple() to convert msim markup color to a color for
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17676
diff
changeset
|
812 |
11988aee28f2
Add msim_color_to_purple() to convert msim markup color to a color for
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17676
diff
changeset
|
813 if (sscanf(msim, "rgb(%d,%d,%d)", &red, &green, &blue) != 3) |
11988aee28f2
Add msim_color_to_purple() to convert msim markup color to a color for
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17676
diff
changeset
|
814 { |
11988aee28f2
Add msim_color_to_purple() to convert msim markup color to a color for
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17676
diff
changeset
|
815 /* Color name. */ |
11988aee28f2
Add msim_color_to_purple() to convert msim markup color to a color for
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17676
diff
changeset
|
816 return g_strdup(msim); |
11988aee28f2
Add msim_color_to_purple() to convert msim markup color to a color for
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17676
diff
changeset
|
817 } |
11988aee28f2
Add msim_color_to_purple() to convert msim markup color to a color for
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17676
diff
changeset
|
818 /* TODO: rgba (alpha). */ |
11988aee28f2
Add msim_color_to_purple() to convert msim markup color to a color for
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17676
diff
changeset
|
819 |
11988aee28f2
Add msim_color_to_purple() to convert msim markup color to a color for
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17676
diff
changeset
|
820 return g_strdup_printf("#%.2x%.2x%.2x", red, green, blue); |
11988aee28f2
Add msim_color_to_purple() to convert msim markup color to a color for
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17676
diff
changeset
|
821 } |
11988aee28f2
Add msim_color_to_purple() to convert msim markup color to a color for
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17676
diff
changeset
|
822 |
17668
a014bcce5a5d
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17665
diff
changeset
|
823 /** Convert the msim markup <p> (paragraph) tag into HTML. */ |
a014bcce5a5d
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17665
diff
changeset
|
824 static void msim_markup_p_to_html(xmlnode *root, gchar **begin, gchar **end) |
a014bcce5a5d
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17665
diff
changeset
|
825 { |
a014bcce5a5d
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17665
diff
changeset
|
826 /* Just pass through unchanged. |
a014bcce5a5d
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17665
diff
changeset
|
827 * |
a014bcce5a5d
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17665
diff
changeset
|
828 * Note: attributes currently aren't passed, if there are any. */ |
a014bcce5a5d
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17665
diff
changeset
|
829 *begin = g_strdup("<p>"); |
a014bcce5a5d
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17665
diff
changeset
|
830 *end = g_strdup("</p>"); |
a014bcce5a5d
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17665
diff
changeset
|
831 } |
a014bcce5a5d
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17665
diff
changeset
|
832 |
a014bcce5a5d
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17665
diff
changeset
|
833 /** Convert the msim markup <c> tag (text color) into HTML. TODO: Test */ |
a014bcce5a5d
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17665
diff
changeset
|
834 static void msim_markup_c_to_html(xmlnode *root, gchar **begin, gchar **end) |
a014bcce5a5d
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17665
diff
changeset
|
835 { |
a014bcce5a5d
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17665
diff
changeset
|
836 const gchar *color; |
17677
11988aee28f2
Add msim_color_to_purple() to convert msim markup color to a color for
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17676
diff
changeset
|
837 gchar *purple_color; |
17668
a014bcce5a5d
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17665
diff
changeset
|
838 |
a014bcce5a5d
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17665
diff
changeset
|
839 color = xmlnode_get_attrib(root, "v"); |
17676
e7612bd6835b
Be more defensive about null pointers, especially null strings in %s format
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17674
diff
changeset
|
840 if (!color) |
e7612bd6835b
Be more defensive about null pointers, especially null strings in %s format
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17674
diff
changeset
|
841 { |
e7612bd6835b
Be more defensive about null pointers, especially null strings in %s format
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17674
diff
changeset
|
842 purple_debug_info("msim", "msim_markup_c_to_html: <c> tag w/o v attr"); |
e7612bd6835b
Be more defensive about null pointers, especially null strings in %s format
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17674
diff
changeset
|
843 *begin = g_strdup(""); |
e7612bd6835b
Be more defensive about null pointers, especially null strings in %s format
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17674
diff
changeset
|
844 *end = g_strdup(""); |
e7612bd6835b
Be more defensive about null pointers, especially null strings in %s format
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17674
diff
changeset
|
845 /* TODO: log as unrecognized */ |
e7612bd6835b
Be more defensive about null pointers, especially null strings in %s format
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17674
diff
changeset
|
846 return; |
e7612bd6835b
Be more defensive about null pointers, especially null strings in %s format
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17674
diff
changeset
|
847 } |
17668
a014bcce5a5d
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17665
diff
changeset
|
848 |
17677
11988aee28f2
Add msim_color_to_purple() to convert msim markup color to a color for
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17676
diff
changeset
|
849 purple_color = msim_color_to_purple(color); |
11988aee28f2
Add msim_color_to_purple() to convert msim markup color to a color for
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17676
diff
changeset
|
850 |
11988aee28f2
Add msim_color_to_purple() to convert msim markup color to a color for
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17676
diff
changeset
|
851 *begin = g_strdup_printf("<font color='%s'>", purple_color); |
11988aee28f2
Add msim_color_to_purple() to convert msim markup color to a color for
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17676
diff
changeset
|
852 |
11988aee28f2
Add msim_color_to_purple() to convert msim markup color to a color for
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17676
diff
changeset
|
853 g_free(purple_color); |
11988aee28f2
Add msim_color_to_purple() to convert msim markup color to a color for
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17676
diff
changeset
|
854 |
17676
e7612bd6835b
Be more defensive about null pointers, especially null strings in %s format
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17674
diff
changeset
|
855 /* *begin = g_strdup_printf("<span style='color: %s'>", color); */ |
e7612bd6835b
Be more defensive about null pointers, especially null strings in %s format
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17674
diff
changeset
|
856 *end = g_strdup("</font>"); |
17668
a014bcce5a5d
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17665
diff
changeset
|
857 } |
a014bcce5a5d
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17665
diff
changeset
|
858 |
a014bcce5a5d
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17665
diff
changeset
|
859 /** Convert the msim markup <b> tag (background color) into HTML. TODO: Test */ |
a014bcce5a5d
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17665
diff
changeset
|
860 static void msim_markup_b_to_html(xmlnode *root, gchar **begin, gchar **end) |
a014bcce5a5d
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17665
diff
changeset
|
861 { |
a014bcce5a5d
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17665
diff
changeset
|
862 const gchar *color; |
17677
11988aee28f2
Add msim_color_to_purple() to convert msim markup color to a color for
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17676
diff
changeset
|
863 gchar *purple_color; |
17668
a014bcce5a5d
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17665
diff
changeset
|
864 |
a014bcce5a5d
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17665
diff
changeset
|
865 color = xmlnode_get_attrib(root, "v"); |
17676
e7612bd6835b
Be more defensive about null pointers, especially null strings in %s format
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17674
diff
changeset
|
866 if (!color) |
e7612bd6835b
Be more defensive about null pointers, especially null strings in %s format
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17674
diff
changeset
|
867 { |
e7612bd6835b
Be more defensive about null pointers, especially null strings in %s format
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17674
diff
changeset
|
868 *begin = g_strdup(""); |
e7612bd6835b
Be more defensive about null pointers, especially null strings in %s format
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17674
diff
changeset
|
869 *end = g_strdup(""); |
e7612bd6835b
Be more defensive about null pointers, especially null strings in %s format
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17674
diff
changeset
|
870 purple_debug_info("msim", "msim_markup_b_to_html: <b> w/o v attr"); |
e7612bd6835b
Be more defensive about null pointers, especially null strings in %s format
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17674
diff
changeset
|
871 /* TODO: log as unrecognized. */ |
e7612bd6835b
Be more defensive about null pointers, especially null strings in %s format
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17674
diff
changeset
|
872 return; |
e7612bd6835b
Be more defensive about null pointers, especially null strings in %s format
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17674
diff
changeset
|
873 } |
17668
a014bcce5a5d
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17665
diff
changeset
|
874 |
17677
11988aee28f2
Add msim_color_to_purple() to convert msim markup color to a color for
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17676
diff
changeset
|
875 purple_color = msim_color_to_purple(color); |
11988aee28f2
Add msim_color_to_purple() to convert msim markup color to a color for
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17676
diff
changeset
|
876 |
17676
e7612bd6835b
Be more defensive about null pointers, especially null strings in %s format
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17674
diff
changeset
|
877 /* TODO: find out how to set background color. */ |
17677
11988aee28f2
Add msim_color_to_purple() to convert msim markup color to a color for
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17676
diff
changeset
|
878 *begin = g_strdup_printf("<span style='background-color: %s'>", |
11988aee28f2
Add msim_color_to_purple() to convert msim markup color to a color for
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17676
diff
changeset
|
879 purple_color); |
11988aee28f2
Add msim_color_to_purple() to convert msim markup color to a color for
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17676
diff
changeset
|
880 g_free(purple_color); |
11988aee28f2
Add msim_color_to_purple() to convert msim markup color to a color for
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17676
diff
changeset
|
881 |
17668
a014bcce5a5d
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17665
diff
changeset
|
882 *end = g_strdup("</p>"); |
a014bcce5a5d
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17665
diff
changeset
|
883 } |
a014bcce5a5d
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17665
diff
changeset
|
884 |
a014bcce5a5d
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17665
diff
changeset
|
885 /** Convert the msim markup <i> tag (emoticon image) into HTML. TODO: Test */ |
a014bcce5a5d
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17665
diff
changeset
|
886 static void msim_markup_i_to_html(xmlnode *root, gchar **begin, gchar **end) |
a014bcce5a5d
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17665
diff
changeset
|
887 { |
a014bcce5a5d
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17665
diff
changeset
|
888 const gchar *name; |
a014bcce5a5d
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17665
diff
changeset
|
889 |
a014bcce5a5d
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17665
diff
changeset
|
890 name = xmlnode_get_attrib(root, "n"); |
17676
e7612bd6835b
Be more defensive about null pointers, especially null strings in %s format
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17674
diff
changeset
|
891 if (!name) |
e7612bd6835b
Be more defensive about null pointers, especially null strings in %s format
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17674
diff
changeset
|
892 { |
e7612bd6835b
Be more defensive about null pointers, especially null strings in %s format
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17674
diff
changeset
|
893 purple_debug_info("msim", "msim_markup_i_to_html: <i> w/o n"); |
e7612bd6835b
Be more defensive about null pointers, especially null strings in %s format
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17674
diff
changeset
|
894 *begin = g_strdup(""); |
e7612bd6835b
Be more defensive about null pointers, especially null strings in %s format
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17674
diff
changeset
|
895 *end = g_strdup(""); |
e7612bd6835b
Be more defensive about null pointers, especially null strings in %s format
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17674
diff
changeset
|
896 /* TODO: log as unrecognized */ |
e7612bd6835b
Be more defensive about null pointers, especially null strings in %s format
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17674
diff
changeset
|
897 return; |
e7612bd6835b
Be more defensive about null pointers, especially null strings in %s format
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17674
diff
changeset
|
898 } |
17668
a014bcce5a5d
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17665
diff
changeset
|
899 |
a014bcce5a5d
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17665
diff
changeset
|
900 /* TODO: Support these emoticons: |
a014bcce5a5d
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17665
diff
changeset
|
901 * |
a014bcce5a5d
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17665
diff
changeset
|
902 * bigsmile growl mad scared tongue devil happy messed sidefrown upset |
a014bcce5a5d
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17665
diff
changeset
|
903 * frazzled heart nerd sinister wink geek laugh oops smirk worried |
a014bcce5a5d
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17665
diff
changeset
|
904 * googles mohawk pirate straight kiss |
a014bcce5a5d
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17665
diff
changeset
|
905 */ |
a014bcce5a5d
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17665
diff
changeset
|
906 |
a014bcce5a5d
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17665
diff
changeset
|
907 *begin = g_strdup_printf("<img id='%s'>", name); |
a014bcce5a5d
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17665
diff
changeset
|
908 *end = g_strdup("</p>"); |
a014bcce5a5d
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17665
diff
changeset
|
909 } |
a014bcce5a5d
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17665
diff
changeset
|
910 |
a014bcce5a5d
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17665
diff
changeset
|
911 |
17662
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
912 /** Convert an xmlnode of msim markup to an HTML string. |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
913 * @return An HTML string. Caller frees. |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
914 */ |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
915 static gchar *msim_markup_xmlnode_to_html(xmlnode *root) |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
916 { |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
917 xmlnode *node; |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
918 gchar *begin, *inner, *end; |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
919 gchar *final; |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
920 |
17676
e7612bd6835b
Be more defensive about null pointers, especially null strings in %s format
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17674
diff
changeset
|
921 if (!root || !root->name) |
17662
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
922 return g_strdup(""); |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
923 |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
924 purple_debug_info("msim", "msim_markup_xmlnode_to_html: got root=%s\n", |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
925 root->name); |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
926 |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
927 begin = inner = end = NULL; |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
928 |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
929 if (!strcmp(root->name, "f")) |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
930 { |
17668
a014bcce5a5d
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17665
diff
changeset
|
931 msim_markup_f_to_html(root, &begin, &end); |
a014bcce5a5d
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17665
diff
changeset
|
932 } else if (!strcmp(root->name, "p")) { |
a014bcce5a5d
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17665
diff
changeset
|
933 msim_markup_p_to_html(root, &begin, &end); |
a014bcce5a5d
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17665
diff
changeset
|
934 } else if (!strcmp(root->name, "c")) { |
a014bcce5a5d
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17665
diff
changeset
|
935 msim_markup_c_to_html(root, &begin, &end); |
a014bcce5a5d
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17665
diff
changeset
|
936 } else if (!strcmp(root->name, "b")) { |
a014bcce5a5d
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17665
diff
changeset
|
937 msim_markup_b_to_html(root, &begin, &end); |
a014bcce5a5d
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17665
diff
changeset
|
938 } else if (!strcmp(root->name, "i")) { |
a014bcce5a5d
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17665
diff
changeset
|
939 msim_markup_i_to_html(root, &begin, &end); |
17662
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
940 } else { |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
941 purple_debug_info("msim", "msim_markup_xmlnode_to_html: " |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
942 "unknown tag name=%s, ignoring", root->name); |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
943 begin = g_strdup(""); |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
944 end = g_strdup(""); |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
945 } |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
946 |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
947 /* Loop over all child nodes. */ |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
948 for (node = root->child; node != NULL; node = node->next) |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
949 { |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
950 switch (node->type) |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
951 { |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
952 case XMLNODE_TYPE_ATTRIB: |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
953 /* Attributes handled above. */ |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
954 break; |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
955 |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
956 case XMLNODE_TYPE_TAG: |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
957 /* A tag or tag with attributes. Recursively descend. */ |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
958 inner = msim_markup_xmlnode_to_html(node); |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
959 |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
960 purple_debug_info("msim", " ** node name=%s\n", node->name); |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
961 break; |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
962 |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
963 |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
964 case XMLNODE_TYPE_DATA: |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
965 /* Literal text. */ |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
966 inner = g_new0(char, node->data_sz + 1); |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
967 strncpy(inner, node->data, node->data_sz); |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
968 inner[node->data_sz + 1] = 0; |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
969 |
17678
51f54868bbad
Fix typo to allow font face to be displayed correctly on incoming messages.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17677
diff
changeset
|
970 purple_debug_info("msim", " ** node data=%s\n", inner); |
17662
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
971 break; |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
972 |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
973 default: |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
974 purple_debug_info("msim", |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
975 "msim_markup_xmlnode_to_html: strange node\n"); |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
976 inner = g_strdup(""); |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
977 } |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
978 } |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
979 |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
980 final = g_strconcat(begin, inner, end, NULL); |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
981 g_free(begin); |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
982 g_free(inner); |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
983 g_free(end); |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
984 |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
985 purple_debug_info("msim", "msim_markup_xmlnode_to_gtkhtml: RETURNING %s\n", |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
986 final); |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
987 |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
988 return final; |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
989 } |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
990 |
17668
a014bcce5a5d
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17665
diff
changeset
|
991 /** Convert MySpaceIM markup to Purple (HTML) markup. |
17662
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
992 * |
17668
a014bcce5a5d
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17665
diff
changeset
|
993 * @return Purple markup string, must be g_free()'d. */ |
17662
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
994 gchar * |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
995 msim_markup_to_html(const gchar *raw) |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
996 { |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
997 xmlnode *root; |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
998 gchar *str; |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
999 |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
1000 root = xmlnode_from_str(raw, -1); |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
1001 if (!root) |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
1002 { |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
1003 purple_debug_info("msim", "msim_markup_to_html: couldn't parse " |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
1004 "%s as XML, returning raw\n", raw); |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
1005 return g_strdup(raw); |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
1006 } |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
1007 |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
1008 str = msim_markup_xmlnode_to_html(root); |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
1009 purple_debug_info("msim", "msim_markup_to_html: returning %s\n", str); |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
1010 |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
1011 xmlnode_free(root); |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
1012 |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
1013 return g_strdup(str); |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
1014 } |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
1015 |
16394 | 1016 /** |
17290
aa8e70fa1edc
Add, but do not use, incomplete functions for using typing notifications.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17289
diff
changeset
|
1017 * Handle an incoming instant message. |
16405
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
1018 * |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
1019 * @param session The session |
17307
e64bcff3b674
Transition msim_incoming_im() to the callbackless infrastructure. Remove
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17306
diff
changeset
|
1020 * @param msg Message from the server, containing 'f' (userid from) and 'msg'. |
e64bcff3b674
Transition msim_incoming_im() to the callbackless infrastructure. Remove
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17306
diff
changeset
|
1021 * Should also contain username in _username from preprocessing. |
16405
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
1022 * |
17291
d8903e1320a9
Previously, the return value of the processing function and msim_process() told
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17290
diff
changeset
|
1023 * @return TRUE if successful. |
16405
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
1024 */ |
17661
38030f1a2e56
Split return type and function name + arguments on to separate lines, to
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17660
diff
changeset
|
1025 gboolean |
38030f1a2e56
Split return type and function name + arguments on to separate lines, to
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17660
diff
changeset
|
1026 msim_incoming_im(MsimSession *session, MsimMessage *msg) |
16405
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
1027 { |
17662
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
1028 gchar *username, *msg_msim_markup, *msg_purple_markup; |
16405
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
1029 |
17307
e64bcff3b674
Transition msim_incoming_im() to the callbackless infrastructure. Remove
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17306
diff
changeset
|
1030 username = msim_msg_get_string(msg, "_username"); |
17662
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
1031 msg_msim_markup = msim_msg_get_string(msg, "msg"); |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
1032 |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
1033 msg_purple_markup = msim_markup_to_html(msg_msim_markup); |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
1034 g_free(msg_msim_markup); |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
1035 |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
1036 serv_got_im(session->gc, username, msg_purple_markup, |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
1037 PURPLE_MESSAGE_RECV, time(NULL)); |
16405
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
1038 |
17307
e64bcff3b674
Transition msim_incoming_im() to the callbackless infrastructure. Remove
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17306
diff
changeset
|
1039 g_free(username); |
17662
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
1040 g_free(msg_purple_markup); |
16405
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
1041 |
17307
e64bcff3b674
Transition msim_incoming_im() to the callbackless infrastructure. Remove
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17306
diff
changeset
|
1042 return TRUE; |
16405
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
1043 } |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
1044 |
17290
aa8e70fa1edc
Add, but do not use, incomplete functions for using typing notifications.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17289
diff
changeset
|
1045 /** |
17651
333fe6ac1046
Add msim_unrecognized() to handle unhandled messages.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17650
diff
changeset
|
1046 * Handle an unrecognized message. |
333fe6ac1046
Add msim_unrecognized() to handle unhandled messages.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17650
diff
changeset
|
1047 */ |
17661
38030f1a2e56
Split return type and function name + arguments on to separate lines, to
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17660
diff
changeset
|
1048 void |
38030f1a2e56
Split return type and function name + arguments on to separate lines, to
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17660
diff
changeset
|
1049 msim_unrecognized(MsimSession *session, MsimMessage *msg, gchar *note) |
17651
333fe6ac1046
Add msim_unrecognized() to handle unhandled messages.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17650
diff
changeset
|
1050 { |
333fe6ac1046
Add msim_unrecognized() to handle unhandled messages.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17650
diff
changeset
|
1051 /* TODO: Some more context, outwardly equivalent to a backtrace, for helping figure |
333fe6ac1046
Add msim_unrecognized() to handle unhandled messages.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17650
diff
changeset
|
1052 * out what this msg is for. But not too much information so that a user |
333fe6ac1046
Add msim_unrecognized() to handle unhandled messages.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17650
diff
changeset
|
1053 * posting this dump reveals confidential information. |
333fe6ac1046
Add msim_unrecognized() to handle unhandled messages.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17650
diff
changeset
|
1054 */ |
333fe6ac1046
Add msim_unrecognized() to handle unhandled messages.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17650
diff
changeset
|
1055 /* TODO: dump unknown msgs to file, so user can send them to me |
333fe6ac1046
Add msim_unrecognized() to handle unhandled messages.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17650
diff
changeset
|
1056 * if they wish, to help add support for new messages (inspired |
333fe6ac1046
Add msim_unrecognized() to handle unhandled messages.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17650
diff
changeset
|
1057 * by Alexandr Shutko, who maintains OSCAR protocol documentation). */ |
333fe6ac1046
Add msim_unrecognized() to handle unhandled messages.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17650
diff
changeset
|
1058 |
333fe6ac1046
Add msim_unrecognized() to handle unhandled messages.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17650
diff
changeset
|
1059 purple_debug_info("msim", "Unrecognized message on account for %s\n", session->account->username); |
333fe6ac1046
Add msim_unrecognized() to handle unhandled messages.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17650
diff
changeset
|
1060 if (note) |
333fe6ac1046
Add msim_unrecognized() to handle unhandled messages.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17650
diff
changeset
|
1061 { |
333fe6ac1046
Add msim_unrecognized() to handle unhandled messages.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17650
diff
changeset
|
1062 purple_debug_info("msim", "(Note: %s)\n", note); |
333fe6ac1046
Add msim_unrecognized() to handle unhandled messages.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17650
diff
changeset
|
1063 } |
333fe6ac1046
Add msim_unrecognized() to handle unhandled messages.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17650
diff
changeset
|
1064 |
333fe6ac1046
Add msim_unrecognized() to handle unhandled messages.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17650
diff
changeset
|
1065 msim_msg_dump("Unrecognized message dump: %s\n", msg); |
333fe6ac1046
Add msim_unrecognized() to handle unhandled messages.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17650
diff
changeset
|
1066 } |
333fe6ac1046
Add msim_unrecognized() to handle unhandled messages.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17650
diff
changeset
|
1067 |
333fe6ac1046
Add msim_unrecognized() to handle unhandled messages.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17650
diff
changeset
|
1068 /** |
17290
aa8e70fa1edc
Add, but do not use, incomplete functions for using typing notifications.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17289
diff
changeset
|
1069 * Handle an incoming action message. |
aa8e70fa1edc
Add, but do not use, incomplete functions for using typing notifications.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17289
diff
changeset
|
1070 * |
aa8e70fa1edc
Add, but do not use, incomplete functions for using typing notifications.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17289
diff
changeset
|
1071 * @param session |
aa8e70fa1edc
Add, but do not use, incomplete functions for using typing notifications.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17289
diff
changeset
|
1072 * @param msg |
aa8e70fa1edc
Add, but do not use, incomplete functions for using typing notifications.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17289
diff
changeset
|
1073 * |
17291
d8903e1320a9
Previously, the return value of the processing function and msim_process() told
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17290
diff
changeset
|
1074 * @return TRUE if successful. |
17290
aa8e70fa1edc
Add, but do not use, incomplete functions for using typing notifications.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17289
diff
changeset
|
1075 * |
17308
1277a0f82304
Add untested implementation of msim_incoming_action().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17307
diff
changeset
|
1076 * UNTESTED |
17290
aa8e70fa1edc
Add, but do not use, incomplete functions for using typing notifications.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17289
diff
changeset
|
1077 */ |
17661
38030f1a2e56
Split return type and function name + arguments on to separate lines, to
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17660
diff
changeset
|
1078 gboolean |
38030f1a2e56
Split return type and function name + arguments on to separate lines, to
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17660
diff
changeset
|
1079 msim_incoming_action(MsimSession *session, MsimMessage *msg) |
17290
aa8e70fa1edc
Add, but do not use, incomplete functions for using typing notifications.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17289
diff
changeset
|
1080 { |
17308
1277a0f82304
Add untested implementation of msim_incoming_action().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17307
diff
changeset
|
1081 gchar *msg_text, *username; |
1277a0f82304
Add untested implementation of msim_incoming_action().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17307
diff
changeset
|
1082 gboolean rc; |
1277a0f82304
Add untested implementation of msim_incoming_action().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17307
diff
changeset
|
1083 |
1277a0f82304
Add untested implementation of msim_incoming_action().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17307
diff
changeset
|
1084 msg_text = msim_msg_get_string(msg, "msg"); |
1277a0f82304
Add untested implementation of msim_incoming_action().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17307
diff
changeset
|
1085 username = msim_msg_get_string(msg, "_username"); |
1277a0f82304
Add untested implementation of msim_incoming_action().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17307
diff
changeset
|
1086 |
1277a0f82304
Add untested implementation of msim_incoming_action().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17307
diff
changeset
|
1087 purple_debug_info("msim", "msim_incoming_action: action <%s> from <%d>\n", msg_text, username); |
17291
d8903e1320a9
Previously, the return value of the processing function and msim_process() told
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17290
diff
changeset
|
1088 |
17308
1277a0f82304
Add untested implementation of msim_incoming_action().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17307
diff
changeset
|
1089 if (strcmp(msg_text, "%typing%") == 0) |
1277a0f82304
Add untested implementation of msim_incoming_action().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17307
diff
changeset
|
1090 { |
17651
333fe6ac1046
Add msim_unrecognized() to handle unhandled messages.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17650
diff
changeset
|
1091 /* TODO: find out if msim repeatedly sends typing messages, so we can give it a timeout. |
333fe6ac1046
Add msim_unrecognized() to handle unhandled messages.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17650
diff
changeset
|
1092 * Right now, there does seem to be an inordinately amount of time between typing/ |
333fe6ac1046
Add msim_unrecognized() to handle unhandled messages.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17650
diff
changeset
|
1093 * stopped-typing notifications. */ |
17308
1277a0f82304
Add untested implementation of msim_incoming_action().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17307
diff
changeset
|
1094 serv_got_typing(session->gc, username, 0, PURPLE_TYPING); |
1277a0f82304
Add untested implementation of msim_incoming_action().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17307
diff
changeset
|
1095 rc = TRUE; |
1277a0f82304
Add untested implementation of msim_incoming_action().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17307
diff
changeset
|
1096 } else if (strcmp(msg_text, "%stoptyping%") == 0) { |
1277a0f82304
Add untested implementation of msim_incoming_action().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17307
diff
changeset
|
1097 serv_got_typing_stopped(session->gc, username); |
1277a0f82304
Add untested implementation of msim_incoming_action().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17307
diff
changeset
|
1098 rc = TRUE; |
1277a0f82304
Add untested implementation of msim_incoming_action().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17307
diff
changeset
|
1099 } else { |
17651
333fe6ac1046
Add msim_unrecognized() to handle unhandled messages.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17650
diff
changeset
|
1100 msim_unrecognized(session, msg, "got to msim_incoming_action but unrecognized value for 'msg'"); |
17308
1277a0f82304
Add untested implementation of msim_incoming_action().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17307
diff
changeset
|
1101 rc = FALSE; |
1277a0f82304
Add untested implementation of msim_incoming_action().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17307
diff
changeset
|
1102 } |
1277a0f82304
Add untested implementation of msim_incoming_action().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17307
diff
changeset
|
1103 |
1277a0f82304
Add untested implementation of msim_incoming_action().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17307
diff
changeset
|
1104 |
1277a0f82304
Add untested implementation of msim_incoming_action().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17307
diff
changeset
|
1105 g_free(msg_text); |
1277a0f82304
Add untested implementation of msim_incoming_action().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17307
diff
changeset
|
1106 g_free(username); |
1277a0f82304
Add untested implementation of msim_incoming_action().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17307
diff
changeset
|
1107 |
1277a0f82304
Add untested implementation of msim_incoming_action().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17307
diff
changeset
|
1108 return rc; |
17290
aa8e70fa1edc
Add, but do not use, incomplete functions for using typing notifications.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17289
diff
changeset
|
1109 } |
aa8e70fa1edc
Add, but do not use, incomplete functions for using typing notifications.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17289
diff
changeset
|
1110 |
aa8e70fa1edc
Add, but do not use, incomplete functions for using typing notifications.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17289
diff
changeset
|
1111 /** |
aa8e70fa1edc
Add, but do not use, incomplete functions for using typing notifications.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17289
diff
changeset
|
1112 * Handle when our user starts or stops typing to another user. |
aa8e70fa1edc
Add, but do not use, incomplete functions for using typing notifications.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17289
diff
changeset
|
1113 * |
aa8e70fa1edc
Add, but do not use, incomplete functions for using typing notifications.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17289
diff
changeset
|
1114 * @param gc |
aa8e70fa1edc
Add, but do not use, incomplete functions for using typing notifications.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17289
diff
changeset
|
1115 * @param name The buddy name to which our user is typing to |
aa8e70fa1edc
Add, but do not use, incomplete functions for using typing notifications.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17289
diff
changeset
|
1116 * @param state PURPLE_TYPING, PURPLE_TYPED, PURPLE_NOT_TYPING |
aa8e70fa1edc
Add, but do not use, incomplete functions for using typing notifications.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17289
diff
changeset
|
1117 * |
aa8e70fa1edc
Add, but do not use, incomplete functions for using typing notifications.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17289
diff
changeset
|
1118 */ |
17661
38030f1a2e56
Split return type and function name + arguments on to separate lines, to
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17660
diff
changeset
|
1119 unsigned int |
38030f1a2e56
Split return type and function name + arguments on to separate lines, to
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17660
diff
changeset
|
1120 msim_send_typing(PurpleConnection *gc, const gchar *name, PurpleTypingState state) |
17290
aa8e70fa1edc
Add, but do not use, incomplete functions for using typing notifications.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17289
diff
changeset
|
1121 { |
17326
f057837085b0
Change to use const gchar * where appropriate.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17325
diff
changeset
|
1122 const gchar *typing_str; |
17315
d9aaccef8721
Send typing notifications (tested).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17314
diff
changeset
|
1123 MsimSession *session; |
d9aaccef8721
Send typing notifications (tested).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17314
diff
changeset
|
1124 |
d9aaccef8721
Send typing notifications (tested).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17314
diff
changeset
|
1125 session = (MsimSession *)gc->proto_data; |
17290
aa8e70fa1edc
Add, but do not use, incomplete functions for using typing notifications.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17289
diff
changeset
|
1126 |
aa8e70fa1edc
Add, but do not use, incomplete functions for using typing notifications.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17289
diff
changeset
|
1127 switch (state) |
aa8e70fa1edc
Add, but do not use, incomplete functions for using typing notifications.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17289
diff
changeset
|
1128 { |
aa8e70fa1edc
Add, but do not use, incomplete functions for using typing notifications.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17289
diff
changeset
|
1129 case PURPLE_TYPING: |
aa8e70fa1edc
Add, but do not use, incomplete functions for using typing notifications.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17289
diff
changeset
|
1130 typing_str = "%typing%"; |
aa8e70fa1edc
Add, but do not use, incomplete functions for using typing notifications.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17289
diff
changeset
|
1131 break; |
aa8e70fa1edc
Add, but do not use, incomplete functions for using typing notifications.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17289
diff
changeset
|
1132 |
aa8e70fa1edc
Add, but do not use, incomplete functions for using typing notifications.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17289
diff
changeset
|
1133 case PURPLE_TYPED: |
aa8e70fa1edc
Add, but do not use, incomplete functions for using typing notifications.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17289
diff
changeset
|
1134 case PURPLE_NOT_TYPING: |
aa8e70fa1edc
Add, but do not use, incomplete functions for using typing notifications.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17289
diff
changeset
|
1135 default: |
aa8e70fa1edc
Add, but do not use, incomplete functions for using typing notifications.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17289
diff
changeset
|
1136 typing_str = "%stoptyping%"; |
aa8e70fa1edc
Add, but do not use, incomplete functions for using typing notifications.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17289
diff
changeset
|
1137 break; |
aa8e70fa1edc
Add, but do not use, incomplete functions for using typing notifications.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17289
diff
changeset
|
1138 } |
aa8e70fa1edc
Add, but do not use, incomplete functions for using typing notifications.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17289
diff
changeset
|
1139 |
17309
25a55b52855a
Add, but do not use, two new functions to postprocess outgoing messages
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17308
diff
changeset
|
1140 purple_debug_info("msim", "msim_send_typing(%s): %d (%s)\n", name, state, typing_str); |
17326
f057837085b0
Change to use const gchar * where appropriate.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17325
diff
changeset
|
1141 msim_send_bm(session, name, typing_str, MSIM_BM_ACTION); |
17290
aa8e70fa1edc
Add, but do not use, incomplete functions for using typing notifications.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17289
diff
changeset
|
1142 return 0; |
aa8e70fa1edc
Add, but do not use, incomplete functions for using typing notifications.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17289
diff
changeset
|
1143 } |
16405
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
1144 |
17656
61f0b36b9891
Retrieve information for profile ("Get Info") from server, instead of from
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17655
diff
changeset
|
1145 /** Callback for msim_get_info(), for when user info is received. */ |
17661
38030f1a2e56
Split return type and function name + arguments on to separate lines, to
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17660
diff
changeset
|
1146 void |
38030f1a2e56
Split return type and function name + arguments on to separate lines, to
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17660
diff
changeset
|
1147 msim_get_info_cb(MsimSession *session, MsimMessage *user_info_msg, gpointer data) |
17325
1a26b36889dc
Implement msim_get_info() for users on the user's buddy list.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17324
diff
changeset
|
1148 { |
17656
61f0b36b9891
Retrieve information for profile ("Get Info") from server, instead of from
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17655
diff
changeset
|
1149 GHashTable *body; |
61f0b36b9891
Retrieve information for profile ("Get Info") from server, instead of from
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17655
diff
changeset
|
1150 gchar *body_str; |
61f0b36b9891
Retrieve information for profile ("Get Info") from server, instead of from
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17655
diff
changeset
|
1151 MsimMessage *msg; |
61f0b36b9891
Retrieve information for profile ("Get Info") from server, instead of from
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17655
diff
changeset
|
1152 gchar *user; |
17325
1a26b36889dc
Implement msim_get_info() for users on the user's buddy list.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17324
diff
changeset
|
1153 PurpleNotifyUserInfo *user_info; |
1a26b36889dc
Implement msim_get_info() for users on the user's buddy list.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17324
diff
changeset
|
1154 PurpleBuddy *buddy; |
17676
e7612bd6835b
Be more defensive about null pointers, especially null strings in %s format
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17674
diff
changeset
|
1155 const gchar *str, *str2; |
e7612bd6835b
Be more defensive about null pointers, especially null strings in %s format
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17674
diff
changeset
|
1156 |
e7612bd6835b
Be more defensive about null pointers, especially null strings in %s format
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17674
diff
changeset
|
1157 |
e7612bd6835b
Be more defensive about null pointers, especially null strings in %s format
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17674
diff
changeset
|
1158 /* Get user{name,id} from msim_get_info, passed as an MsimMessage for |
e7612bd6835b
Be more defensive about null pointers, especially null strings in %s format
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17674
diff
changeset
|
1159 orthogonality. */ |
17656
61f0b36b9891
Retrieve information for profile ("Get Info") from server, instead of from
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17655
diff
changeset
|
1160 msg = (MsimMessage *)data; |
17676
e7612bd6835b
Be more defensive about null pointers, especially null strings in %s format
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17674
diff
changeset
|
1161 user = msim_msg_get_string(msg, "user"); |
e7612bd6835b
Be more defensive about null pointers, especially null strings in %s format
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17674
diff
changeset
|
1162 if (!user) |
e7612bd6835b
Be more defensive about null pointers, especially null strings in %s format
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17674
diff
changeset
|
1163 { |
e7612bd6835b
Be more defensive about null pointers, especially null strings in %s format
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17674
diff
changeset
|
1164 purple_debug_info("msim", "msim_get_info_cb: no 'user' in msg"); |
e7612bd6835b
Be more defensive about null pointers, especially null strings in %s format
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17674
diff
changeset
|
1165 return; |
e7612bd6835b
Be more defensive about null pointers, especially null strings in %s format
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17674
diff
changeset
|
1166 } |
e7612bd6835b
Be more defensive about null pointers, especially null strings in %s format
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17674
diff
changeset
|
1167 |
17656
61f0b36b9891
Retrieve information for profile ("Get Info") from server, instead of from
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17655
diff
changeset
|
1168 purple_debug_info("msim", "msim_get_info_cb: got for user: %s\n", user); |
61f0b36b9891
Retrieve information for profile ("Get Info") from server, instead of from
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17655
diff
changeset
|
1169 msim_msg_free(msg); |
61f0b36b9891
Retrieve information for profile ("Get Info") from server, instead of from
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17655
diff
changeset
|
1170 |
61f0b36b9891
Retrieve information for profile ("Get Info") from server, instead of from
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17655
diff
changeset
|
1171 |
61f0b36b9891
Retrieve information for profile ("Get Info") from server, instead of from
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17655
diff
changeset
|
1172 body_str = msim_msg_get_string(user_info_msg, "body"); |
61f0b36b9891
Retrieve information for profile ("Get Info") from server, instead of from
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17655
diff
changeset
|
1173 body = msim_parse_body(body_str); |
61f0b36b9891
Retrieve information for profile ("Get Info") from server, instead of from
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17655
diff
changeset
|
1174 g_free(body_str); |
61f0b36b9891
Retrieve information for profile ("Get Info") from server, instead of from
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17655
diff
changeset
|
1175 |
61f0b36b9891
Retrieve information for profile ("Get Info") from server, instead of from
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17655
diff
changeset
|
1176 buddy = purple_find_buddy(session->account, user); |
61f0b36b9891
Retrieve information for profile ("Get Info") from server, instead of from
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17655
diff
changeset
|
1177 /* Note: don't assume buddy is non-NULL; will be if lookup random user not on blist. */ |
17325
1a26b36889dc
Implement msim_get_info() for users on the user's buddy list.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17324
diff
changeset
|
1178 |
1a26b36889dc
Implement msim_get_info() for users on the user's buddy list.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17324
diff
changeset
|
1179 user_info = purple_notify_user_info_new(); |
1a26b36889dc
Implement msim_get_info() for users on the user's buddy list.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17324
diff
changeset
|
1180 |
17656
61f0b36b9891
Retrieve information for profile ("Get Info") from server, instead of from
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17655
diff
changeset
|
1181 /* Identification */ |
17676
e7612bd6835b
Be more defensive about null pointers, especially null strings in %s format
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17674
diff
changeset
|
1182 purple_notify_user_info_add_pair(user_info, _("User"), g_strdup(user)); |
17325
1a26b36889dc
Implement msim_get_info() for users on the user's buddy list.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17324
diff
changeset
|
1183 |
17656
61f0b36b9891
Retrieve information for profile ("Get Info") from server, instead of from
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17655
diff
changeset
|
1184 /* note: g_hash_table_lookup does not create a new string! */ |
17676
e7612bd6835b
Be more defensive about null pointers, especially null strings in %s format
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17674
diff
changeset
|
1185 str = g_hash_table_lookup(body, "UserID"); |
e7612bd6835b
Be more defensive about null pointers, especially null strings in %s format
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17674
diff
changeset
|
1186 if (str) |
e7612bd6835b
Be more defensive about null pointers, especially null strings in %s format
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17674
diff
changeset
|
1187 purple_notify_user_info_add_pair(user_info, _("User ID"), |
e7612bd6835b
Be more defensive about null pointers, especially null strings in %s format
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17674
diff
changeset
|
1188 g_strdup(str)); |
17325
1a26b36889dc
Implement msim_get_info() for users on the user's buddy list.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17324
diff
changeset
|
1189 |
1a26b36889dc
Implement msim_get_info() for users on the user's buddy list.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17324
diff
changeset
|
1190 /* a/s/l...the vitals */ |
17676
e7612bd6835b
Be more defensive about null pointers, especially null strings in %s format
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17674
diff
changeset
|
1191 str = g_hash_table_lookup(body, "Age"); |
e7612bd6835b
Be more defensive about null pointers, especially null strings in %s format
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17674
diff
changeset
|
1192 if (str) |
e7612bd6835b
Be more defensive about null pointers, especially null strings in %s format
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17674
diff
changeset
|
1193 purple_notify_user_info_add_pair(user_info, _("Age"), g_strdup(str)); |
e7612bd6835b
Be more defensive about null pointers, especially null strings in %s format
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17674
diff
changeset
|
1194 |
e7612bd6835b
Be more defensive about null pointers, especially null strings in %s format
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17674
diff
changeset
|
1195 str = g_hash_table_lookup(body, "Gender"); |
e7612bd6835b
Be more defensive about null pointers, especially null strings in %s format
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17674
diff
changeset
|
1196 if (str) |
e7612bd6835b
Be more defensive about null pointers, especially null strings in %s format
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17674
diff
changeset
|
1197 purple_notify_user_info_add_pair(user_info, _("Gender"), g_strdup(str)); |
e7612bd6835b
Be more defensive about null pointers, especially null strings in %s format
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17674
diff
changeset
|
1198 |
e7612bd6835b
Be more defensive about null pointers, especially null strings in %s format
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17674
diff
changeset
|
1199 str = g_hash_table_lookup(body, "Location"); |
e7612bd6835b
Be more defensive about null pointers, especially null strings in %s format
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17674
diff
changeset
|
1200 if (str) |
e7612bd6835b
Be more defensive about null pointers, especially null strings in %s format
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17674
diff
changeset
|
1201 purple_notify_user_info_add_pair(user_info, _("Location"), |
e7612bd6835b
Be more defensive about null pointers, especially null strings in %s format
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17674
diff
changeset
|
1202 g_strdup(str)); |
17325
1a26b36889dc
Implement msim_get_info() for users on the user's buddy list.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17324
diff
changeset
|
1203 |
1a26b36889dc
Implement msim_get_info() for users on the user's buddy list.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17324
diff
changeset
|
1204 /* Other information */ |
17656
61f0b36b9891
Retrieve information for profile ("Get Info") from server, instead of from
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17655
diff
changeset
|
1205 |
61f0b36b9891
Retrieve information for profile ("Get Info") from server, instead of from
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17655
diff
changeset
|
1206 /* Headline comes from buddy status messages */ |
17676
e7612bd6835b
Be more defensive about null pointers, especially null strings in %s format
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17674
diff
changeset
|
1207 if (buddy) |
e7612bd6835b
Be more defensive about null pointers, especially null strings in %s format
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17674
diff
changeset
|
1208 { |
e7612bd6835b
Be more defensive about null pointers, especially null strings in %s format
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17674
diff
changeset
|
1209 str = purple_blist_node_get_string(&buddy->node, "Headline"); |
e7612bd6835b
Be more defensive about null pointers, especially null strings in %s format
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17674
diff
changeset
|
1210 if (str) |
e7612bd6835b
Be more defensive about null pointers, especially null strings in %s format
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17674
diff
changeset
|
1211 purple_notify_user_info_add_pair(user_info, "Headline", str); |
e7612bd6835b
Be more defensive about null pointers, especially null strings in %s format
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17674
diff
changeset
|
1212 } |
e7612bd6835b
Be more defensive about null pointers, especially null strings in %s format
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17674
diff
changeset
|
1213 |
e7612bd6835b
Be more defensive about null pointers, especially null strings in %s format
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17674
diff
changeset
|
1214 |
e7612bd6835b
Be more defensive about null pointers, especially null strings in %s format
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17674
diff
changeset
|
1215 str = g_hash_table_lookup(body, "BandName"); |
e7612bd6835b
Be more defensive about null pointers, especially null strings in %s format
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17674
diff
changeset
|
1216 str2 = g_hash_table_lookup(body, "SongName"); |
e7612bd6835b
Be more defensive about null pointers, especially null strings in %s format
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17674
diff
changeset
|
1217 if (str || str2) |
e7612bd6835b
Be more defensive about null pointers, especially null strings in %s format
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17674
diff
changeset
|
1218 { |
e7612bd6835b
Be more defensive about null pointers, especially null strings in %s format
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17674
diff
changeset
|
1219 purple_notify_user_info_add_pair(user_info, _("Song"), |
e7612bd6835b
Be more defensive about null pointers, especially null strings in %s format
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17674
diff
changeset
|
1220 g_strdup_printf("%s - %s", |
e7612bd6835b
Be more defensive about null pointers, especially null strings in %s format
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17674
diff
changeset
|
1221 str ? str : "Unknown Artist", |
e7612bd6835b
Be more defensive about null pointers, especially null strings in %s format
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17674
diff
changeset
|
1222 str2 ? str2 : "Unknown Song")); |
e7612bd6835b
Be more defensive about null pointers, especially null strings in %s format
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17674
diff
changeset
|
1223 } |
e7612bd6835b
Be more defensive about null pointers, especially null strings in %s format
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17674
diff
changeset
|
1224 |
17656
61f0b36b9891
Retrieve information for profile ("Get Info") from server, instead of from
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17655
diff
changeset
|
1225 |
61f0b36b9891
Retrieve information for profile ("Get Info") from server, instead of from
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17655
diff
changeset
|
1226 /* Total friends only available if looked up by uid, not username. */ |
17676
e7612bd6835b
Be more defensive about null pointers, especially null strings in %s format
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17674
diff
changeset
|
1227 str = g_hash_table_lookup(body, "TotalFriends"); |
e7612bd6835b
Be more defensive about null pointers, especially null strings in %s format
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17674
diff
changeset
|
1228 if (str) |
17656
61f0b36b9891
Retrieve information for profile ("Get Info") from server, instead of from
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17655
diff
changeset
|
1229 purple_notify_user_info_add_pair(user_info, _("Total Friends"), |
17676
e7612bd6835b
Be more defensive about null pointers, especially null strings in %s format
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17674
diff
changeset
|
1230 g_strdup(str)); |
17656
61f0b36b9891
Retrieve information for profile ("Get Info") from server, instead of from
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17655
diff
changeset
|
1231 |
61f0b36b9891
Retrieve information for profile ("Get Info") from server, instead of from
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17655
diff
changeset
|
1232 purple_notify_userinfo(session->gc, user, user_info, NULL, NULL); |
61f0b36b9891
Retrieve information for profile ("Get Info") from server, instead of from
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17655
diff
changeset
|
1233 purple_debug_info("msim", "msim_get_info_cb: username=%s\n", user); |
61f0b36b9891
Retrieve information for profile ("Get Info") from server, instead of from
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17655
diff
changeset
|
1234 //purple_notify_user_info_destroy(user_info); |
61f0b36b9891
Retrieve information for profile ("Get Info") from server, instead of from
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17655
diff
changeset
|
1235 /* Do not free username, since it will be used by user_info. */ |
61f0b36b9891
Retrieve information for profile ("Get Info") from server, instead of from
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17655
diff
changeset
|
1236 |
61f0b36b9891
Retrieve information for profile ("Get Info") from server, instead of from
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17655
diff
changeset
|
1237 //g_hash_table_destroy(body); |
61f0b36b9891
Retrieve information for profile ("Get Info") from server, instead of from
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17655
diff
changeset
|
1238 } |
61f0b36b9891
Retrieve information for profile ("Get Info") from server, instead of from
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17655
diff
changeset
|
1239 |
61f0b36b9891
Retrieve information for profile ("Get Info") from server, instead of from
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17655
diff
changeset
|
1240 /** Retrieve a user's profile. */ |
17661
38030f1a2e56
Split return type and function name + arguments on to separate lines, to
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17660
diff
changeset
|
1241 void |
38030f1a2e56
Split return type and function name + arguments on to separate lines, to
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17660
diff
changeset
|
1242 msim_get_info(PurpleConnection *gc, const gchar *user) |
17656
61f0b36b9891
Retrieve information for profile ("Get Info") from server, instead of from
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17655
diff
changeset
|
1243 { |
61f0b36b9891
Retrieve information for profile ("Get Info") from server, instead of from
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17655
diff
changeset
|
1244 PurpleBuddy *buddy; |
61f0b36b9891
Retrieve information for profile ("Get Info") from server, instead of from
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17655
diff
changeset
|
1245 MsimSession *session; |
61f0b36b9891
Retrieve information for profile ("Get Info") from server, instead of from
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17655
diff
changeset
|
1246 guint uid; |
61f0b36b9891
Retrieve information for profile ("Get Info") from server, instead of from
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17655
diff
changeset
|
1247 gchar *user_to_lookup; |
61f0b36b9891
Retrieve information for profile ("Get Info") from server, instead of from
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17655
diff
changeset
|
1248 MsimMessage *user_msg; |
61f0b36b9891
Retrieve information for profile ("Get Info") from server, instead of from
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17655
diff
changeset
|
1249 |
61f0b36b9891
Retrieve information for profile ("Get Info") from server, instead of from
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17655
diff
changeset
|
1250 session = (MsimSession *)gc->proto_data; |
61f0b36b9891
Retrieve information for profile ("Get Info") from server, instead of from
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17655
diff
changeset
|
1251 |
61f0b36b9891
Retrieve information for profile ("Get Info") from server, instead of from
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17655
diff
changeset
|
1252 /* Obtain uid of buddy. */ |
61f0b36b9891
Retrieve information for profile ("Get Info") from server, instead of from
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17655
diff
changeset
|
1253 buddy = purple_find_buddy(session->account, user); |
61f0b36b9891
Retrieve information for profile ("Get Info") from server, instead of from
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17655
diff
changeset
|
1254 if (buddy) |
61f0b36b9891
Retrieve information for profile ("Get Info") from server, instead of from
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17655
diff
changeset
|
1255 { |
61f0b36b9891
Retrieve information for profile ("Get Info") from server, instead of from
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17655
diff
changeset
|
1256 uid = purple_blist_node_get_int(&buddy->node, "UserID"); |
61f0b36b9891
Retrieve information for profile ("Get Info") from server, instead of from
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17655
diff
changeset
|
1257 if (!uid) |
61f0b36b9891
Retrieve information for profile ("Get Info") from server, instead of from
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17655
diff
changeset
|
1258 { |
61f0b36b9891
Retrieve information for profile ("Get Info") from server, instead of from
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17655
diff
changeset
|
1259 PurpleNotifyUserInfo *user_info; |
61f0b36b9891
Retrieve information for profile ("Get Info") from server, instead of from
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17655
diff
changeset
|
1260 |
61f0b36b9891
Retrieve information for profile ("Get Info") from server, instead of from
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17655
diff
changeset
|
1261 user_info = purple_notify_user_info_new(); |
61f0b36b9891
Retrieve information for profile ("Get Info") from server, instead of from
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17655
diff
changeset
|
1262 purple_notify_user_info_add_pair(user_info, NULL, |
61f0b36b9891
Retrieve information for profile ("Get Info") from server, instead of from
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17655
diff
changeset
|
1263 _("This buddy appears to not have a userid stored in the buddy list, can't look up. Is the user really on the buddy list?")); |
61f0b36b9891
Retrieve information for profile ("Get Info") from server, instead of from
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17655
diff
changeset
|
1264 |
61f0b36b9891
Retrieve information for profile ("Get Info") from server, instead of from
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17655
diff
changeset
|
1265 purple_notify_userinfo(session->gc, user, user_info, NULL, NULL); |
61f0b36b9891
Retrieve information for profile ("Get Info") from server, instead of from
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17655
diff
changeset
|
1266 purple_notify_user_info_destroy(user_info); |
61f0b36b9891
Retrieve information for profile ("Get Info") from server, instead of from
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17655
diff
changeset
|
1267 return; |
61f0b36b9891
Retrieve information for profile ("Get Info") from server, instead of from
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17655
diff
changeset
|
1268 } |
61f0b36b9891
Retrieve information for profile ("Get Info") from server, instead of from
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17655
diff
changeset
|
1269 |
61f0b36b9891
Retrieve information for profile ("Get Info") from server, instead of from
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17655
diff
changeset
|
1270 user_to_lookup = g_strdup_printf("%d", uid); |
61f0b36b9891
Retrieve information for profile ("Get Info") from server, instead of from
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17655
diff
changeset
|
1271 } else { |
61f0b36b9891
Retrieve information for profile ("Get Info") from server, instead of from
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17655
diff
changeset
|
1272 |
61f0b36b9891
Retrieve information for profile ("Get Info") from server, instead of from
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17655
diff
changeset
|
1273 /* Looking up buddy not on blist. Lookup by whatever user entered. */ |
61f0b36b9891
Retrieve information for profile ("Get Info") from server, instead of from
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17655
diff
changeset
|
1274 user_to_lookup = g_strdup(user); |
61f0b36b9891
Retrieve information for profile ("Get Info") from server, instead of from
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17655
diff
changeset
|
1275 } |
61f0b36b9891
Retrieve information for profile ("Get Info") from server, instead of from
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17655
diff
changeset
|
1276 |
61f0b36b9891
Retrieve information for profile ("Get Info") from server, instead of from
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17655
diff
changeset
|
1277 /* Pass the username to msim_get_info_cb(), because since we lookup |
61f0b36b9891
Retrieve information for profile ("Get Info") from server, instead of from
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17655
diff
changeset
|
1278 * by userid, the userinfo message will only contain the uid (not |
61f0b36b9891
Retrieve information for profile ("Get Info") from server, instead of from
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17655
diff
changeset
|
1279 * the username). |
61f0b36b9891
Retrieve information for profile ("Get Info") from server, instead of from
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17655
diff
changeset
|
1280 */ |
61f0b36b9891
Retrieve information for profile ("Get Info") from server, instead of from
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17655
diff
changeset
|
1281 user_msg = msim_msg_new(TRUE, |
61f0b36b9891
Retrieve information for profile ("Get Info") from server, instead of from
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17655
diff
changeset
|
1282 "user", MSIM_TYPE_STRING, g_strdup(user), |
61f0b36b9891
Retrieve information for profile ("Get Info") from server, instead of from
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17655
diff
changeset
|
1283 NULL); |
61f0b36b9891
Retrieve information for profile ("Get Info") from server, instead of from
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17655
diff
changeset
|
1284 purple_debug_info("msim", "msim_get_info, setting up lookup, user=%s\n", user); |
61f0b36b9891
Retrieve information for profile ("Get Info") from server, instead of from
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17655
diff
changeset
|
1285 |
61f0b36b9891
Retrieve information for profile ("Get Info") from server, instead of from
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17655
diff
changeset
|
1286 msim_lookup_user(session, user_to_lookup, msim_get_info_cb, user_msg); |
61f0b36b9891
Retrieve information for profile ("Get Info") from server, instead of from
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17655
diff
changeset
|
1287 |
61f0b36b9891
Retrieve information for profile ("Get Info") from server, instead of from
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17655
diff
changeset
|
1288 g_free(user_to_lookup); |
17325
1a26b36889dc
Implement msim_get_info() for users on the user's buddy list.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17324
diff
changeset
|
1289 } |
1a26b36889dc
Implement msim_get_info() for users on the user's buddy list.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17324
diff
changeset
|
1290 |
17681
5e8c02259c81
Add option to sign on as hidden, or as not (previously, always signed on
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17680
diff
changeset
|
1291 /** Set your status - callback for when user manually sets it. */ |
17679
608e4b47dfae
Allow setting status to away or online.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17678
diff
changeset
|
1292 void |
608e4b47dfae
Allow setting status to away or online.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17678
diff
changeset
|
1293 msim_set_status(PurpleAccount *account, PurpleStatus *status) |
608e4b47dfae
Allow setting status to away or online.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17678
diff
changeset
|
1294 { |
608e4b47dfae
Allow setting status to away or online.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17678
diff
changeset
|
1295 PurpleStatusType *type; |
608e4b47dfae
Allow setting status to away or online.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17678
diff
changeset
|
1296 MsimSession *session; |
608e4b47dfae
Allow setting status to away or online.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17678
diff
changeset
|
1297 |
608e4b47dfae
Allow setting status to away or online.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17678
diff
changeset
|
1298 session = (MsimSession *)account->gc->proto_data; |
608e4b47dfae
Allow setting status to away or online.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17678
diff
changeset
|
1299 |
608e4b47dfae
Allow setting status to away or online.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17678
diff
changeset
|
1300 type = purple_status_get_type(status); |
608e4b47dfae
Allow setting status to away or online.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17678
diff
changeset
|
1301 |
17681
5e8c02259c81
Add option to sign on as hidden, or as not (previously, always signed on
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17680
diff
changeset
|
1302 msim_set_status_primitive(session, purple_status_type_get_primitive(type)); |
5e8c02259c81
Add option to sign on as hidden, or as not (previously, always signed on
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17680
diff
changeset
|
1303 } |
5e8c02259c81
Add option to sign on as hidden, or as not (previously, always signed on
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17680
diff
changeset
|
1304 |
5e8c02259c81
Add option to sign on as hidden, or as not (previously, always signed on
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17680
diff
changeset
|
1305 /** Set status using a status primitive type. */ |
5e8c02259c81
Add option to sign on as hidden, or as not (previously, always signed on
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17680
diff
changeset
|
1306 void |
5e8c02259c81
Add option to sign on as hidden, or as not (previously, always signed on
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17680
diff
changeset
|
1307 msim_set_status_primitive(MsimSession *session, guint code) |
5e8c02259c81
Add option to sign on as hidden, or as not (previously, always signed on
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17680
diff
changeset
|
1308 { |
5e8c02259c81
Add option to sign on as hidden, or as not (previously, always signed on
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17680
diff
changeset
|
1309 guint status_code; |
5e8c02259c81
Add option to sign on as hidden, or as not (previously, always signed on
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17680
diff
changeset
|
1310 |
5e8c02259c81
Add option to sign on as hidden, or as not (previously, always signed on
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17680
diff
changeset
|
1311 switch (code) |
17679
608e4b47dfae
Allow setting status to away or online.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17678
diff
changeset
|
1312 { |
608e4b47dfae
Allow setting status to away or online.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17678
diff
changeset
|
1313 case PURPLE_STATUS_AVAILABLE: |
608e4b47dfae
Allow setting status to away or online.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17678
diff
changeset
|
1314 status_code = MSIM_STATUS_CODE_ONLINE; |
608e4b47dfae
Allow setting status to away or online.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17678
diff
changeset
|
1315 break; |
608e4b47dfae
Allow setting status to away or online.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17678
diff
changeset
|
1316 |
608e4b47dfae
Allow setting status to away or online.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17678
diff
changeset
|
1317 case PURPLE_STATUS_INVISIBLE: |
17680
d87916bd1d73
Fix email address.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17679
diff
changeset
|
1318 status_code = MSIM_STATUS_CODE_OFFLINE_OR_HIDDEN; |
17679
608e4b47dfae
Allow setting status to away or online.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17678
diff
changeset
|
1319 break; |
608e4b47dfae
Allow setting status to away or online.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17678
diff
changeset
|
1320 |
608e4b47dfae
Allow setting status to away or online.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17678
diff
changeset
|
1321 case PURPLE_STATUS_AWAY: |
608e4b47dfae
Allow setting status to away or online.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17678
diff
changeset
|
1322 status_code = MSIM_STATUS_CODE_AWAY; |
608e4b47dfae
Allow setting status to away or online.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17678
diff
changeset
|
1323 break; |
608e4b47dfae
Allow setting status to away or online.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17678
diff
changeset
|
1324 |
608e4b47dfae
Allow setting status to away or online.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17678
diff
changeset
|
1325 default: |
608e4b47dfae
Allow setting status to away or online.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17678
diff
changeset
|
1326 purple_debug_info("msim", "msim_set_status: unknown " |
608e4b47dfae
Allow setting status to away or online.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17678
diff
changeset
|
1327 "status interpreting as online"); |
608e4b47dfae
Allow setting status to away or online.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17678
diff
changeset
|
1328 status_code = MSIM_STATUS_CODE_ONLINE; |
608e4b47dfae
Allow setting status to away or online.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17678
diff
changeset
|
1329 break; |
608e4b47dfae
Allow setting status to away or online.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17678
diff
changeset
|
1330 } |
608e4b47dfae
Allow setting status to away or online.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17678
diff
changeset
|
1331 |
608e4b47dfae
Allow setting status to away or online.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17678
diff
changeset
|
1332 if (!msim_send(session, |
608e4b47dfae
Allow setting status to away or online.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17678
diff
changeset
|
1333 "status", MSIM_TYPE_INTEGER, status_code, |
608e4b47dfae
Allow setting status to away or online.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17678
diff
changeset
|
1334 "sesskey", MSIM_TYPE_INTEGER, session->sesskey, |
608e4b47dfae
Allow setting status to away or online.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17678
diff
changeset
|
1335 "statstring", MSIM_TYPE_STRING, g_strdup(""), |
608e4b47dfae
Allow setting status to away or online.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17678
diff
changeset
|
1336 "locstring", MSIM_TYPE_STRING, g_strdup(""))) |
608e4b47dfae
Allow setting status to away or online.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17678
diff
changeset
|
1337 { |
608e4b47dfae
Allow setting status to away or online.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17678
diff
changeset
|
1338 purple_debug_info("msim", "msim_set_status: failed to set status"); |
608e4b47dfae
Allow setting status to away or online.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17678
diff
changeset
|
1339 } |
608e4b47dfae
Allow setting status to away or online.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17678
diff
changeset
|
1340 |
608e4b47dfae
Allow setting status to away or online.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17678
diff
changeset
|
1341 } |
608e4b47dfae
Allow setting status to away or online.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17678
diff
changeset
|
1342 |
17306
3a02e7db91c7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17305
diff
changeset
|
1343 /** After a uid is resolved to username, tag it with the username and submit for processing. |
3a02e7db91c7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17305
diff
changeset
|
1344 * |
3a02e7db91c7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17305
diff
changeset
|
1345 * @param session |
3a02e7db91c7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17305
diff
changeset
|
1346 * @param userinfo Response messsage to resolving request. |
3a02e7db91c7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17305
diff
changeset
|
1347 * @param data MsimMessage *, the message to attach information to. |
3a02e7db91c7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17305
diff
changeset
|
1348 */ |
17661
38030f1a2e56
Split return type and function name + arguments on to separate lines, to
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17660
diff
changeset
|
1349 static void |
38030f1a2e56
Split return type and function name + arguments on to separate lines, to
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17660
diff
changeset
|
1350 msim_incoming_resolved(MsimSession *session, MsimMessage *userinfo, |
38030f1a2e56
Split return type and function name + arguments on to separate lines, to
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17660
diff
changeset
|
1351 gpointer data) |
17306
3a02e7db91c7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17305
diff
changeset
|
1352 { |
3a02e7db91c7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17305
diff
changeset
|
1353 gchar *body_str; |
3a02e7db91c7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17305
diff
changeset
|
1354 GHashTable *body; |
3a02e7db91c7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17305
diff
changeset
|
1355 gchar *username; |
3a02e7db91c7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17305
diff
changeset
|
1356 MsimMessage *msg; |
3a02e7db91c7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17305
diff
changeset
|
1357 |
3a02e7db91c7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17305
diff
changeset
|
1358 body_str = msim_msg_get_string(userinfo, "body"); |
3a02e7db91c7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17305
diff
changeset
|
1359 g_return_if_fail(body_str != NULL); |
3a02e7db91c7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17305
diff
changeset
|
1360 body = msim_parse_body(body_str); |
3a02e7db91c7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17305
diff
changeset
|
1361 g_return_if_fail(body != NULL); |
3a02e7db91c7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17305
diff
changeset
|
1362 g_free(body_str); |
3a02e7db91c7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17305
diff
changeset
|
1363 |
3a02e7db91c7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17305
diff
changeset
|
1364 username = g_hash_table_lookup(body, "UserName"); |
3a02e7db91c7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17305
diff
changeset
|
1365 g_return_if_fail(username != NULL); |
3a02e7db91c7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17305
diff
changeset
|
1366 |
3a02e7db91c7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17305
diff
changeset
|
1367 msg = (MsimMessage *)data; |
3a02e7db91c7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17305
diff
changeset
|
1368 /* Special elements name beginning with '_', we'll use internally within the |
3a02e7db91c7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17305
diff
changeset
|
1369 * program (did not come from the wire). */ |
3a02e7db91c7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17305
diff
changeset
|
1370 msg = msim_msg_append(msg, "_username", MSIM_TYPE_STRING, g_strdup(username)); |
3a02e7db91c7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17305
diff
changeset
|
1371 |
3a02e7db91c7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17305
diff
changeset
|
1372 msim_process(session, msg); |
3a02e7db91c7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17305
diff
changeset
|
1373 |
17307
e64bcff3b674
Transition msim_incoming_im() to the callbackless infrastructure. Remove
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17306
diff
changeset
|
1374 /* TODO: Free copy cloned from msim_preprocess_incoming(). */ |
17306
3a02e7db91c7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17305
diff
changeset
|
1375 //XXX msim_msg_free(msg); |
3a02e7db91c7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17305
diff
changeset
|
1376 g_hash_table_destroy(body); |
3a02e7db91c7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17305
diff
changeset
|
1377 } |
3a02e7db91c7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17305
diff
changeset
|
1378 |
17669
d727fda5a8e1
Change around msim_uid2username_from_blist() to try to get it to work
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17668
diff
changeset
|
1379 #if 0 |
17313
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
1380 /* Lookup a username by userid, from buddy list. |
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
1381 * |
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
1382 * @param wanted_uid |
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
1383 * |
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
1384 * @return Username of wanted_uid, if on blist, or NULL. Static string. |
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
1385 * |
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
1386 * XXX WARNING: UNKNOWN MEMORY CORRUPTION HERE! |
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
1387 */ |
17661
38030f1a2e56
Split return type and function name + arguments on to separate lines, to
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17660
diff
changeset
|
1388 static const gchar * |
38030f1a2e56
Split return type and function name + arguments on to separate lines, to
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17660
diff
changeset
|
1389 msim_uid2username_from_blist(MsimSession *session, guint wanted_uid) |
17313
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
1390 { |
17669
d727fda5a8e1
Change around msim_uid2username_from_blist() to try to get it to work
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17668
diff
changeset
|
1391 GSList *buddies, *cur; |
d727fda5a8e1
Change around msim_uid2username_from_blist() to try to get it to work
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17668
diff
changeset
|
1392 |
d727fda5a8e1
Change around msim_uid2username_from_blist() to try to get it to work
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17668
diff
changeset
|
1393 buddies = purple_find_buddies(session->account, NULL); |
d727fda5a8e1
Change around msim_uid2username_from_blist() to try to get it to work
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17668
diff
changeset
|
1394 |
d727fda5a8e1
Change around msim_uid2username_from_blist() to try to get it to work
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17668
diff
changeset
|
1395 if (!buddies) |
d727fda5a8e1
Change around msim_uid2username_from_blist() to try to get it to work
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17668
diff
changeset
|
1396 { |
d727fda5a8e1
Change around msim_uid2username_from_blist() to try to get it to work
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17668
diff
changeset
|
1397 purple_debug_info("msim", "msim_uid2username_from_blist: no buddies?"); |
d727fda5a8e1
Change around msim_uid2username_from_blist() to try to get it to work
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17668
diff
changeset
|
1398 return NULL; |
d727fda5a8e1
Change around msim_uid2username_from_blist() to try to get it to work
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17668
diff
changeset
|
1399 } |
d727fda5a8e1
Change around msim_uid2username_from_blist() to try to get it to work
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17668
diff
changeset
|
1400 |
d727fda5a8e1
Change around msim_uid2username_from_blist() to try to get it to work
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17668
diff
changeset
|
1401 for (cur = buddies; cur != NULL; cur = g_slist_next(cur)) |
17313
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
1402 { |
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
1403 PurpleBuddy *buddy; |
17669
d727fda5a8e1
Change around msim_uid2username_from_blist() to try to get it to work
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17668
diff
changeset
|
1404 //PurpleBlistNode *node; |
17313
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
1405 guint uid; |
17669
d727fda5a8e1
Change around msim_uid2username_from_blist() to try to get it to work
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17668
diff
changeset
|
1406 const gchar *name; |
d727fda5a8e1
Change around msim_uid2username_from_blist() to try to get it to work
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17668
diff
changeset
|
1407 |
d727fda5a8e1
Change around msim_uid2username_from_blist() to try to get it to work
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17668
diff
changeset
|
1408 |
d727fda5a8e1
Change around msim_uid2username_from_blist() to try to get it to work
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17668
diff
changeset
|
1409 /* See finch/gnthistory.c */ |
d727fda5a8e1
Change around msim_uid2username_from_blist() to try to get it to work
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17668
diff
changeset
|
1410 buddy = cur->data; |
d727fda5a8e1
Change around msim_uid2username_from_blist() to try to get it to work
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17668
diff
changeset
|
1411 //node = cur->data; |
17313
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
1412 |
17322
6fa345a01dd8
Show buddy information in tooltip text, and the display name for status text.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17320
diff
changeset
|
1413 uid = purple_blist_node_get_int(&buddy->node, "UserID"); |
17669
d727fda5a8e1
Change around msim_uid2username_from_blist() to try to get it to work
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17668
diff
changeset
|
1414 //uid = purple_blist_node_get_int(node, "UserID"); |
17313
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
1415 |
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
1416 /* name = buddy->name; */ /* crash */ |
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
1417 /* name = PURPLE_BLIST_NODE_NAME(&buddy->node); */ /* crash */ |
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
1418 |
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
1419 /* XXX Is this right? Memory corruption here somehow. Happens only |
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
1420 * when return one of these values. */ |
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
1421 name = purple_buddy_get_name(buddy); /* crash */ |
17669
d727fda5a8e1
Change around msim_uid2username_from_blist() to try to get it to work
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17668
diff
changeset
|
1422 //name = purple_buddy_get_name((PurpleBuddy *)node); /* crash */ |
17313
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
1423 /* return name; */ /* crash (with above) */ |
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
1424 |
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
1425 /* name = NULL; */ /* no crash */ |
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
1426 /* return NULL; */ /* no crash (with anything) */ |
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
1427 |
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
1428 /* crash = |
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
1429 *** glibc detected *** pidgin: realloc(): invalid pointer: 0x0000000000d2aec0 *** |
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
1430 ======= Backtrace: ========= |
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
1431 /lib/libc.so.6(__libc_realloc+0x323)[0x2b7bfc012e03] |
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
1432 /usr/lib/libglib-2.0.so.0(g_realloc+0x31)[0x2b7bfba79a41] |
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
1433 /usr/lib/libgtk-x11-2.0.so.0(gtk_tree_path_append_index+0x3a)[0x2b7bfa110d5a] |
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
1434 /usr/lib/libgtk-x11-2.0.so.0[0x2b7bfa1287dc] |
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
1435 /usr/lib/libgtk-x11-2.0.so.0[0x2b7bfa128e56] |
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
1436 /usr/lib/libgtk-x11-2.0.so.0[0x2b7bfa128efd] |
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
1437 /usr/lib/libglib-2.0.so.0(g_main_context_dispatch+0x1b4)[0x2b7bfba72c84] |
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
1438 /usr/lib/libglib-2.0.so.0[0x2b7bfba75acd] |
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
1439 /usr/lib/libglib-2.0.so.0(g_main_loop_run+0x1ca)[0x2b7bfba75dda] |
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
1440 /usr/lib/libgtk-x11-2.0.so.0(gtk_main+0xa3)[0x2b7bfa0475f3] |
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
1441 pidgin(main+0x8be)[0x46b45e] |
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
1442 /lib/libc.so.6(__libc_start_main+0xf4)[0x2b7bfbfbf0c4] |
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
1443 pidgin(gtk_widget_grab_focus+0x39)[0x429ab9] |
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
1444 |
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
1445 or: |
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
1446 *** glibc detected *** /usr/local/bin/pidgin: malloc(): memory corruption (fast): 0x0000000000c10076 *** |
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
1447 (gdb) bt |
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
1448 #0 0x00002b4074ecd47b in raise () from /lib/libc.so.6 |
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
1449 #1 0x00002b4074eceda0 in abort () from /lib/libc.so.6 |
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
1450 #2 0x00002b4074f0453b in __fsetlocking () from /lib/libc.so.6 |
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
1451 #3 0x00002b4074f0c810 in free () from /lib/libc.so.6 |
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
1452 #4 0x00002b4074f0d6dd in malloc () from /lib/libc.so.6 |
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
1453 #5 0x00002b4074974b5b in g_malloc () from /usr/lib/libglib-2.0.so.0 |
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
1454 #6 0x00002b40749868bf in g_strdup () from /usr/lib/libglib-2.0.so.0 |
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
1455 #7 0x00002b407810969f in msim_parse ( |
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
1456 raw=0xd2a910 "\\bm\\100\\f\\3656574\\msg\\|s|0|ss|Offline") |
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
1457 at message.c:648 |
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
1458 #8 0x00002b407810889c in msim_input_cb (gc_uncasted=0xcf92c0, |
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
1459 source=<value optimized out>, cond=<value optimized out>) at myspace.c:1478 |
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
1460 |
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
1461 |
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
1462 Why is it crashing in msim_parse()'s g_strdup()? |
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
1463 */ |
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
1464 purple_debug_info("msim", "msim_uid2username_from_blist: %s's uid=%d (want %d)\n", |
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
1465 name, uid, wanted_uid); |
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
1466 |
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
1467 if (uid == wanted_uid) |
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
1468 { |
17669
d727fda5a8e1
Change around msim_uid2username_from_blist() to try to get it to work
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17668
diff
changeset
|
1469 gchar *ret; |
d727fda5a8e1
Change around msim_uid2username_from_blist() to try to get it to work
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17668
diff
changeset
|
1470 |
d727fda5a8e1
Change around msim_uid2username_from_blist() to try to get it to work
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17668
diff
changeset
|
1471 ret = g_strdup(name); |
d727fda5a8e1
Change around msim_uid2username_from_blist() to try to get it to work
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17668
diff
changeset
|
1472 |
d727fda5a8e1
Change around msim_uid2username_from_blist() to try to get it to work
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17668
diff
changeset
|
1473 g_slist_free(buddies); |
d727fda5a8e1
Change around msim_uid2username_from_blist() to try to get it to work
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17668
diff
changeset
|
1474 |
d727fda5a8e1
Change around msim_uid2username_from_blist() to try to get it to work
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17668
diff
changeset
|
1475 return ret; |
17313
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
1476 } |
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
1477 } |
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
1478 |
17669
d727fda5a8e1
Change around msim_uid2username_from_blist() to try to get it to work
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17668
diff
changeset
|
1479 g_slist_free(buddies); |
17313
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
1480 return NULL; |
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
1481 } |
17314
948373cbba1c
Add TODO in order to fix msim_tooltip_text.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17313
diff
changeset
|
1482 #endif |
948373cbba1c
Add TODO in order to fix msim_tooltip_text.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17313
diff
changeset
|
1483 |
17306
3a02e7db91c7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17305
diff
changeset
|
1484 /** Preprocess incoming messages, resolving as needed, calling msim_process() when ready to process. |
3a02e7db91c7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17305
diff
changeset
|
1485 * |
3a02e7db91c7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17305
diff
changeset
|
1486 * @param session |
3a02e7db91c7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17305
diff
changeset
|
1487 * @param msg MsimMessage *, freed by caller. |
3a02e7db91c7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17305
diff
changeset
|
1488 */ |
17661
38030f1a2e56
Split return type and function name + arguments on to separate lines, to
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17660
diff
changeset
|
1489 gboolean |
38030f1a2e56
Split return type and function name + arguments on to separate lines, to
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17660
diff
changeset
|
1490 msim_preprocess_incoming(MsimSession *session, MsimMessage *msg) |
17306
3a02e7db91c7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17305
diff
changeset
|
1491 { |
3a02e7db91c7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17305
diff
changeset
|
1492 if (msim_msg_get(msg, "bm") && msim_msg_get(msg, "f")) |
3a02e7db91c7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17305
diff
changeset
|
1493 { |
17313
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
1494 guint uid; |
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
1495 const gchar *username; |
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
1496 |
17306
3a02e7db91c7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17305
diff
changeset
|
1497 /* 'f' = userid message is from, in buddy messages */ |
17313
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
1498 uid = msim_msg_get_integer(msg, "f"); |
17306
3a02e7db91c7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17305
diff
changeset
|
1499 |
17313
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
1500 /* TODO: Make caching work. Currently it is commented out because |
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
1501 * it crashes for unknown reasons, memory realloc error. */ |
17669
d727fda5a8e1
Change around msim_uid2username_from_blist() to try to get it to work
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17668
diff
changeset
|
1502 #if 0 |
17313
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
1503 username = msim_uid2username_from_blist(session, uid); |
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
1504 #else |
17669
d727fda5a8e1
Change around msim_uid2username_from_blist() to try to get it to work
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17668
diff
changeset
|
1505 username = NULL; |
17313
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
1506 #endif |
17306
3a02e7db91c7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17305
diff
changeset
|
1507 |
17313
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
1508 if (username) |
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
1509 { |
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
1510 /* Know username already, use it. */ |
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
1511 purple_debug_info("msim", "msim_preprocess_incoming: tagging with _username=%s\n", |
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
1512 username); |
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
1513 msg = msim_msg_append(msg, "_username", MSIM_TYPE_STRING, g_strdup(username)); |
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
1514 return msim_process(session, msg); |
17306
3a02e7db91c7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17305
diff
changeset
|
1515 |
17313
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
1516 } else { |
17656
61f0b36b9891
Retrieve information for profile ("Get Info") from server, instead of from
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17655
diff
changeset
|
1517 gchar *from; |
61f0b36b9891
Retrieve information for profile ("Get Info") from server, instead of from
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17655
diff
changeset
|
1518 |
17313
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
1519 /* Send lookup request. */ |
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
1520 /* XXX: where is msim_msg_get_string() freed? make _strdup and _nonstrdup. */ |
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
1521 purple_debug_info("msim", "msim_incoming: sending lookup, setting up callback\n"); |
17656
61f0b36b9891
Retrieve information for profile ("Get Info") from server, instead of from
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17655
diff
changeset
|
1522 from = msim_msg_get_string(msg, "f"); |
61f0b36b9891
Retrieve information for profile ("Get Info") from server, instead of from
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17655
diff
changeset
|
1523 msim_lookup_user(session, from, msim_incoming_resolved, msim_msg_clone(msg)); |
61f0b36b9891
Retrieve information for profile ("Get Info") from server, instead of from
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17655
diff
changeset
|
1524 g_free(from); |
17313
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
1525 |
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
1526 /* indeterminate */ |
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
1527 return TRUE; |
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
1528 } |
17306
3a02e7db91c7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17305
diff
changeset
|
1529 } else { |
3a02e7db91c7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17305
diff
changeset
|
1530 /* Nothing to resolve - send directly to processing. */ |
3a02e7db91c7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17305
diff
changeset
|
1531 return msim_process(session, msg); |
3a02e7db91c7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17305
diff
changeset
|
1532 } |
3a02e7db91c7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17305
diff
changeset
|
1533 } |
3a02e7db91c7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17305
diff
changeset
|
1534 |
17681
5e8c02259c81
Add option to sign on as hidden, or as not (previously, always signed on
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17680
diff
changeset
|
1535 /** Called when the session key arrives. */ |
5e8c02259c81
Add option to sign on as hidden, or as not (previously, always signed on
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17680
diff
changeset
|
1536 gboolean |
5e8c02259c81
Add option to sign on as hidden, or as not (previously, always signed on
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17680
diff
changeset
|
1537 msim_we_are_logged_on(MsimSession *session, MsimMessage *msg) |
5e8c02259c81
Add option to sign on as hidden, or as not (previously, always signed on
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17680
diff
changeset
|
1538 { |
5e8c02259c81
Add option to sign on as hidden, or as not (previously, always signed on
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17680
diff
changeset
|
1539 purple_connection_update_progress(session->gc, _("Connected"), 3, 4); |
5e8c02259c81
Add option to sign on as hidden, or as not (previously, always signed on
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17680
diff
changeset
|
1540 |
5e8c02259c81
Add option to sign on as hidden, or as not (previously, always signed on
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17680
diff
changeset
|
1541 session->sesskey = msim_msg_get_integer(msg, "sesskey"); |
5e8c02259c81
Add option to sign on as hidden, or as not (previously, always signed on
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17680
diff
changeset
|
1542 purple_debug_info("msim", "SESSKEY=<%d>\n", session->sesskey); |
5e8c02259c81
Add option to sign on as hidden, or as not (previously, always signed on
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17680
diff
changeset
|
1543 |
5e8c02259c81
Add option to sign on as hidden, or as not (previously, always signed on
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17680
diff
changeset
|
1544 /* Comes with: proof,profileid,userid,uniquenick -- all same values |
5e8c02259c81
Add option to sign on as hidden, or as not (previously, always signed on
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17680
diff
changeset
|
1545 * some of the time, but can vary. This is our own user ID. */ |
5e8c02259c81
Add option to sign on as hidden, or as not (previously, always signed on
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17680
diff
changeset
|
1546 session->userid = msim_msg_get_integer(msg, "userid"); |
5e8c02259c81
Add option to sign on as hidden, or as not (previously, always signed on
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17680
diff
changeset
|
1547 |
5e8c02259c81
Add option to sign on as hidden, or as not (previously, always signed on
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17680
diff
changeset
|
1548 |
5e8c02259c81
Add option to sign on as hidden, or as not (previously, always signed on
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17680
diff
changeset
|
1549 purple_connection_set_state(session->gc, PURPLE_CONNECTED); |
5e8c02259c81
Add option to sign on as hidden, or as not (previously, always signed on
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17680
diff
changeset
|
1550 |
5e8c02259c81
Add option to sign on as hidden, or as not (previously, always signed on
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17680
diff
changeset
|
1551 |
5e8c02259c81
Add option to sign on as hidden, or as not (previously, always signed on
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17680
diff
changeset
|
1552 /* We now know are our own username, only after we're logged in.. |
5e8c02259c81
Add option to sign on as hidden, or as not (previously, always signed on
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17680
diff
changeset
|
1553 * which is weird, but happens because you login with your email |
5e8c02259c81
Add option to sign on as hidden, or as not (previously, always signed on
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17680
diff
changeset
|
1554 * address and not username. Will be freed in msim_session_destroy(). */ |
5e8c02259c81
Add option to sign on as hidden, or as not (previously, always signed on
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17680
diff
changeset
|
1555 session->username = msim_msg_get_string(msg, "uniquenick"); |
5e8c02259c81
Add option to sign on as hidden, or as not (previously, always signed on
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17680
diff
changeset
|
1556 |
5e8c02259c81
Add option to sign on as hidden, or as not (previously, always signed on
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17680
diff
changeset
|
1557 #ifdef MSIM_FAKE_SELF_ONLINE |
5e8c02259c81
Add option to sign on as hidden, or as not (previously, always signed on
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17680
diff
changeset
|
1558 /* Fake our self coming online. */ |
5e8c02259c81
Add option to sign on as hidden, or as not (previously, always signed on
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17680
diff
changeset
|
1559 purple_prpl_got_user_status(session->account, session->username, purple_primitive_get_id_from_type(PURPLE_STATUS_AVAILABLE), NULL); |
5e8c02259c81
Add option to sign on as hidden, or as not (previously, always signed on
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17680
diff
changeset
|
1560 #endif |
5e8c02259c81
Add option to sign on as hidden, or as not (previously, always signed on
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17680
diff
changeset
|
1561 |
5e8c02259c81
Add option to sign on as hidden, or as not (previously, always signed on
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17680
diff
changeset
|
1562 /* Set status depending on preference. */ |
5e8c02259c81
Add option to sign on as hidden, or as not (previously, always signed on
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17680
diff
changeset
|
1563 msim_set_status_primitive(session, |
5e8c02259c81
Add option to sign on as hidden, or as not (previously, always signed on
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17680
diff
changeset
|
1564 purple_account_get_bool(session->account, "hidden", FALSE) |
5e8c02259c81
Add option to sign on as hidden, or as not (previously, always signed on
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17680
diff
changeset
|
1565 ? PURPLE_STATUS_INVISIBLE |
5e8c02259c81
Add option to sign on as hidden, or as not (previously, always signed on
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17680
diff
changeset
|
1566 : PURPLE_STATUS_AVAILABLE); |
5e8c02259c81
Add option to sign on as hidden, or as not (previously, always signed on
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17680
diff
changeset
|
1567 |
5e8c02259c81
Add option to sign on as hidden, or as not (previously, always signed on
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17680
diff
changeset
|
1568 return TRUE; |
5e8c02259c81
Add option to sign on as hidden, or as not (previously, always signed on
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17680
diff
changeset
|
1569 } |
5e8c02259c81
Add option to sign on as hidden, or as not (previously, always signed on
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17680
diff
changeset
|
1570 |
16405
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
1571 /** |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
1572 * Process a message. |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
1573 * |
17306
3a02e7db91c7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17305
diff
changeset
|
1574 * @param session |
3a02e7db91c7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17305
diff
changeset
|
1575 * @param msg A message from the server, ready for processing (possibly with resolved username information attached). Caller frees. |
16405
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
1576 * |
17291
d8903e1320a9
Previously, the return value of the processing function and msim_process() told
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17290
diff
changeset
|
1577 * @return TRUE if successful. FALSE if processing failed. |
16405
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
1578 */ |
17661
38030f1a2e56
Split return type and function name + arguments on to separate lines, to
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17660
diff
changeset
|
1579 gboolean |
38030f1a2e56
Split return type and function name + arguments on to separate lines, to
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17660
diff
changeset
|
1580 msim_process(MsimSession *session, MsimMessage *msg) |
16405
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
1581 { |
17306
3a02e7db91c7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17305
diff
changeset
|
1582 g_return_val_if_fail(session != NULL, -1); |
17266
793301c04e3a
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16738
diff
changeset
|
1583 g_return_val_if_fail(msg != NULL, -1); |
16405
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
1584 |
16725
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
1585 #ifdef MSIM_DEBUG_MSG |
17266
793301c04e3a
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16738
diff
changeset
|
1586 { |
17298
9c5b1dc7404f
Change msim_msg_debug_string() to msim_msg_dump(), which prints the string
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17297
diff
changeset
|
1587 msim_msg_dump("ready to process: %s\n", msg); |
17266
793301c04e3a
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16738
diff
changeset
|
1588 } |
16407
bb649c52fc19
Replace printf() in MySpaceIM prpl with purple_debug_info().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16406
diff
changeset
|
1589 #endif |
16405
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
1590 |
17280
d3e17c9d16e9
Use MsimMessage for receiving messages everywhere, instead of GHashTable.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17266
diff
changeset
|
1591 if (msim_msg_get(msg, "nc")) |
16405
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
1592 { |
17280
d3e17c9d16e9
Use MsimMessage for receiving messages everywhere, instead of GHashTable.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17266
diff
changeset
|
1593 return msim_login_challenge(session, msg); |
d3e17c9d16e9
Use MsimMessage for receiving messages everywhere, instead of GHashTable.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17266
diff
changeset
|
1594 } else if (msim_msg_get(msg, "sesskey")) { |
17681
5e8c02259c81
Add option to sign on as hidden, or as not (previously, always signed on
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17680
diff
changeset
|
1595 return msim_we_are_logged_on(session, msg); |
17280
d3e17c9d16e9
Use MsimMessage for receiving messages everywhere, instead of GHashTable.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17266
diff
changeset
|
1596 } else if (msim_msg_get(msg, "bm")) { |
16405
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
1597 guint bm; |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
1598 |
17280
d3e17c9d16e9
Use MsimMessage for receiving messages everywhere, instead of GHashTable.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17266
diff
changeset
|
1599 bm = msim_msg_get_integer(msg, "bm"); |
16405
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
1600 switch (bm) |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
1601 { |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
1602 case MSIM_BM_STATUS: |
17280
d3e17c9d16e9
Use MsimMessage for receiving messages everywhere, instead of GHashTable.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17266
diff
changeset
|
1603 return msim_status(session, msg); |
16405
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
1604 case MSIM_BM_INSTANT: |
17280
d3e17c9d16e9
Use MsimMessage for receiving messages everywhere, instead of GHashTable.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17266
diff
changeset
|
1605 return msim_incoming_im(session, msg); |
17290
aa8e70fa1edc
Add, but do not use, incomplete functions for using typing notifications.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17289
diff
changeset
|
1606 case MSIM_BM_ACTION: |
aa8e70fa1edc
Add, but do not use, incomplete functions for using typing notifications.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17289
diff
changeset
|
1607 return msim_incoming_action(session, msg); |
16405
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
1608 default: |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
1609 /* Not really an IM, but show it for informational |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
1610 * purposes during development. */ |
17280
d3e17c9d16e9
Use MsimMessage for receiving messages everywhere, instead of GHashTable.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17266
diff
changeset
|
1611 return msim_incoming_im(session, msg); |
16405
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
1612 } |
17280
d3e17c9d16e9
Use MsimMessage for receiving messages everywhere, instead of GHashTable.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17266
diff
changeset
|
1613 } else if (msim_msg_get(msg, "rid")) { |
d3e17c9d16e9
Use MsimMessage for receiving messages everywhere, instead of GHashTable.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17266
diff
changeset
|
1614 return msim_process_reply(session, msg); |
d3e17c9d16e9
Use MsimMessage for receiving messages everywhere, instead of GHashTable.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17266
diff
changeset
|
1615 } else if (msim_msg_get(msg, "error")) { |
d3e17c9d16e9
Use MsimMessage for receiving messages everywhere, instead of GHashTable.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17266
diff
changeset
|
1616 return msim_error(session, msg); |
d3e17c9d16e9
Use MsimMessage for receiving messages everywhere, instead of GHashTable.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17266
diff
changeset
|
1617 } else if (msim_msg_get(msg, "ka")) { |
17650
0d799da3b893
Add TODO for msimprpl to timeout (handling keep-alives).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17649
diff
changeset
|
1618 /* TODO: Setup a timer, if keep-alive is not received within ~3 minutes, then |
0d799da3b893
Add TODO for msimprpl to timeout (handling keep-alives).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17649
diff
changeset
|
1619 * disconnect the user. As it stands, if Internet connection goes out (this |
0d799da3b893
Add TODO for msimprpl to timeout (handling keep-alives).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17649
diff
changeset
|
1620 * just happened here), msimprpl will appear to be connected forever, while |
0d799da3b893
Add TODO for msimprpl to timeout (handling keep-alives).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17649
diff
changeset
|
1621 * other plugins (oscar, etc.) will time out. Msimprpl should timeout too. */ |
16405
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
1622 purple_debug_info("msim", "msim_process: got keep alive\n"); |
17291
d8903e1320a9
Previously, the return value of the processing function and msim_process() told
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17290
diff
changeset
|
1623 return TRUE; |
16405
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
1624 } else { |
17651
333fe6ac1046
Add msim_unrecognized() to handle unhandled messages.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17650
diff
changeset
|
1625 msim_unrecognized(session, msg, "in msim_process"); |
17291
d8903e1320a9
Previously, the return value of the processing function and msim_process() told
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17290
diff
changeset
|
1626 return FALSE; |
16405
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
1627 } |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
1628 } |
17266
793301c04e3a
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16738
diff
changeset
|
1629 |
17322
6fa345a01dd8
Show buddy information in tooltip text, and the display name for status text.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17320
diff
changeset
|
1630 /** Store an field of information about a buddy. */ |
17661
38030f1a2e56
Split return type and function name + arguments on to separate lines, to
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17660
diff
changeset
|
1631 void |
38030f1a2e56
Split return type and function name + arguments on to separate lines, to
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17660
diff
changeset
|
1632 msim_store_buddy_info_each(gpointer key, gpointer value, gpointer user_data) |
17322
6fa345a01dd8
Show buddy information in tooltip text, and the display name for status text.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17320
diff
changeset
|
1633 { |
6fa345a01dd8
Show buddy information in tooltip text, and the display name for status text.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17320
diff
changeset
|
1634 PurpleBuddy *buddy; |
6fa345a01dd8
Show buddy information in tooltip text, and the display name for status text.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17320
diff
changeset
|
1635 gchar *key_str, *value_str; |
6fa345a01dd8
Show buddy information in tooltip text, and the display name for status text.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17320
diff
changeset
|
1636 |
6fa345a01dd8
Show buddy information in tooltip text, and the display name for status text.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17320
diff
changeset
|
1637 buddy = (PurpleBuddy *)user_data; |
6fa345a01dd8
Show buddy information in tooltip text, and the display name for status text.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17320
diff
changeset
|
1638 key_str = (gchar *)key; |
6fa345a01dd8
Show buddy information in tooltip text, and the display name for status text.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17320
diff
changeset
|
1639 value_str = (gchar *)value; |
6fa345a01dd8
Show buddy information in tooltip text, and the display name for status text.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17320
diff
changeset
|
1640 |
6fa345a01dd8
Show buddy information in tooltip text, and the display name for status text.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17320
diff
changeset
|
1641 if (strcmp(key_str, "UserID") == 0 || |
6fa345a01dd8
Show buddy information in tooltip text, and the display name for status text.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17320
diff
changeset
|
1642 strcmp(key_str, "Age") == 0 || |
6fa345a01dd8
Show buddy information in tooltip text, and the display name for status text.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17320
diff
changeset
|
1643 strcmp(key_str, "TotalFriends") == 0) |
6fa345a01dd8
Show buddy information in tooltip text, and the display name for status text.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17320
diff
changeset
|
1644 { |
6fa345a01dd8
Show buddy information in tooltip text, and the display name for status text.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17320
diff
changeset
|
1645 /* Certain fields get set as integers, instead of strings, for |
6fa345a01dd8
Show buddy information in tooltip text, and the display name for status text.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17320
diff
changeset
|
1646 * convenience. May not be the best way to do it, but having at least |
6fa345a01dd8
Show buddy information in tooltip text, and the display name for status text.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17320
diff
changeset
|
1647 * UserID as an integer is convenient...until it overflows! */ |
6fa345a01dd8
Show buddy information in tooltip text, and the display name for status text.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17320
diff
changeset
|
1648 purple_blist_node_set_int(&buddy->node, key_str, atol(value_str)); |
6fa345a01dd8
Show buddy information in tooltip text, and the display name for status text.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17320
diff
changeset
|
1649 } else { |
6fa345a01dd8
Show buddy information in tooltip text, and the display name for status text.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17320
diff
changeset
|
1650 purple_blist_node_set_string(&buddy->node, key_str, value_str); |
6fa345a01dd8
Show buddy information in tooltip text, and the display name for status text.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17320
diff
changeset
|
1651 } |
6fa345a01dd8
Show buddy information in tooltip text, and the display name for status text.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17320
diff
changeset
|
1652 } |
6fa345a01dd8
Show buddy information in tooltip text, and the display name for status text.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17320
diff
changeset
|
1653 |
6fa345a01dd8
Show buddy information in tooltip text, and the display name for status text.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17320
diff
changeset
|
1654 /** Save buddy information to the buddy list from a user info reply message. |
6fa345a01dd8
Show buddy information in tooltip text, and the display name for status text.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17320
diff
changeset
|
1655 * |
6fa345a01dd8
Show buddy information in tooltip text, and the display name for status text.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17320
diff
changeset
|
1656 * @param session |
6fa345a01dd8
Show buddy information in tooltip text, and the display name for status text.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17320
diff
changeset
|
1657 * @param msg The user information reply, with any amount of information. |
6fa345a01dd8
Show buddy information in tooltip text, and the display name for status text.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17320
diff
changeset
|
1658 * |
6fa345a01dd8
Show buddy information in tooltip text, and the display name for status text.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17320
diff
changeset
|
1659 * The information is saved to the buddy's blist node, which ends up in blist.xml. |
6fa345a01dd8
Show buddy information in tooltip text, and the display name for status text.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17320
diff
changeset
|
1660 */ |
17661
38030f1a2e56
Split return type and function name + arguments on to separate lines, to
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17660
diff
changeset
|
1661 gboolean |
38030f1a2e56
Split return type and function name + arguments on to separate lines, to
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17660
diff
changeset
|
1662 msim_store_buddy_info(MsimSession *session, MsimMessage *msg) |
17322
6fa345a01dd8
Show buddy information in tooltip text, and the display name for status text.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17320
diff
changeset
|
1663 { |
6fa345a01dd8
Show buddy information in tooltip text, and the display name for status text.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17320
diff
changeset
|
1664 GHashTable *body; |
6fa345a01dd8
Show buddy information in tooltip text, and the display name for status text.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17320
diff
changeset
|
1665 gchar *username, *body_str, *uid; |
6fa345a01dd8
Show buddy information in tooltip text, and the display name for status text.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17320
diff
changeset
|
1666 PurpleBuddy *buddy; |
6fa345a01dd8
Show buddy information in tooltip text, and the display name for status text.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17320
diff
changeset
|
1667 guint rid; |
6fa345a01dd8
Show buddy information in tooltip text, and the display name for status text.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17320
diff
changeset
|
1668 |
6fa345a01dd8
Show buddy information in tooltip text, and the display name for status text.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17320
diff
changeset
|
1669 rid = msim_msg_get_integer(msg, "rid"); |
6fa345a01dd8
Show buddy information in tooltip text, and the display name for status text.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17320
diff
changeset
|
1670 |
6fa345a01dd8
Show buddy information in tooltip text, and the display name for status text.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17320
diff
changeset
|
1671 g_return_val_if_fail(rid != 0, FALSE); |
6fa345a01dd8
Show buddy information in tooltip text, and the display name for status text.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17320
diff
changeset
|
1672 |
6fa345a01dd8
Show buddy information in tooltip text, and the display name for status text.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17320
diff
changeset
|
1673 body_str = msim_msg_get_string(msg, "body"); |
6fa345a01dd8
Show buddy information in tooltip text, and the display name for status text.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17320
diff
changeset
|
1674 g_return_val_if_fail(body_str != NULL, FALSE); |
6fa345a01dd8
Show buddy information in tooltip text, and the display name for status text.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17320
diff
changeset
|
1675 body = msim_parse_body(body_str); |
6fa345a01dd8
Show buddy information in tooltip text, and the display name for status text.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17320
diff
changeset
|
1676 g_free(body_str); |
6fa345a01dd8
Show buddy information in tooltip text, and the display name for status text.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17320
diff
changeset
|
1677 |
6fa345a01dd8
Show buddy information in tooltip text, and the display name for status text.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17320
diff
changeset
|
1678 /* TODO: implement a better hash-like interface, and use it. */ |
6fa345a01dd8
Show buddy information in tooltip text, and the display name for status text.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17320
diff
changeset
|
1679 username = g_hash_table_lookup(body, "UserName"); |
6fa345a01dd8
Show buddy information in tooltip text, and the display name for status text.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17320
diff
changeset
|
1680 |
6fa345a01dd8
Show buddy information in tooltip text, and the display name for status text.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17320
diff
changeset
|
1681 if (!username) |
6fa345a01dd8
Show buddy information in tooltip text, and the display name for status text.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17320
diff
changeset
|
1682 { |
6fa345a01dd8
Show buddy information in tooltip text, and the display name for status text.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17320
diff
changeset
|
1683 purple_debug_info("msim", |
6fa345a01dd8
Show buddy information in tooltip text, and the display name for status text.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17320
diff
changeset
|
1684 "msim_process_reply: not caching body, no UserName\n"); |
6fa345a01dd8
Show buddy information in tooltip text, and the display name for status text.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17320
diff
changeset
|
1685 return FALSE; |
6fa345a01dd8
Show buddy information in tooltip text, and the display name for status text.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17320
diff
changeset
|
1686 } |
6fa345a01dd8
Show buddy information in tooltip text, and the display name for status text.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17320
diff
changeset
|
1687 |
6fa345a01dd8
Show buddy information in tooltip text, and the display name for status text.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17320
diff
changeset
|
1688 uid = g_hash_table_lookup(body, "UserID"); |
6fa345a01dd8
Show buddy information in tooltip text, and the display name for status text.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17320
diff
changeset
|
1689 g_return_val_if_fail(uid, FALSE); |
6fa345a01dd8
Show buddy information in tooltip text, and the display name for status text.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17320
diff
changeset
|
1690 |
6fa345a01dd8
Show buddy information in tooltip text, and the display name for status text.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17320
diff
changeset
|
1691 purple_debug_info("msim", "associating uid %d with username %s\n", uid, username); |
6fa345a01dd8
Show buddy information in tooltip text, and the display name for status text.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17320
diff
changeset
|
1692 |
6fa345a01dd8
Show buddy information in tooltip text, and the display name for status text.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17320
diff
changeset
|
1693 buddy = purple_find_buddy(session->account, username); |
6fa345a01dd8
Show buddy information in tooltip text, and the display name for status text.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17320
diff
changeset
|
1694 if (buddy) |
6fa345a01dd8
Show buddy information in tooltip text, and the display name for status text.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17320
diff
changeset
|
1695 { |
6fa345a01dd8
Show buddy information in tooltip text, and the display name for status text.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17320
diff
changeset
|
1696 g_hash_table_foreach(body, msim_store_buddy_info_each, buddy); |
6fa345a01dd8
Show buddy information in tooltip text, and the display name for status text.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17320
diff
changeset
|
1697 } |
6fa345a01dd8
Show buddy information in tooltip text, and the display name for status text.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17320
diff
changeset
|
1698 |
6fa345a01dd8
Show buddy information in tooltip text, and the display name for status text.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17320
diff
changeset
|
1699 return TRUE; |
6fa345a01dd8
Show buddy information in tooltip text, and the display name for status text.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17320
diff
changeset
|
1700 } |
6fa345a01dd8
Show buddy information in tooltip text, and the display name for status text.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17320
diff
changeset
|
1701 |
16405
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
1702 /** |
17290
aa8e70fa1edc
Add, but do not use, incomplete functions for using typing notifications.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17289
diff
changeset
|
1703 * Process a persistance message reply from the server. |
16394 | 1704 * |
1705 * @param session | |
17280
d3e17c9d16e9
Use MsimMessage for receiving messages everywhere, instead of GHashTable.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17266
diff
changeset
|
1706 * @param msg Message reply from server. |
16394 | 1707 * |
17291
d8903e1320a9
Previously, the return value of the processing function and msim_process() told
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17290
diff
changeset
|
1708 * @return TRUE if successful. |
16394 | 1709 */ |
17661
38030f1a2e56
Split return type and function name + arguments on to separate lines, to
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17660
diff
changeset
|
1710 gboolean |
38030f1a2e56
Split return type and function name + arguments on to separate lines, to
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17660
diff
changeset
|
1711 msim_process_reply(MsimSession *session, MsimMessage *msg) |
16394 | 1712 { |
17291
d8903e1320a9
Previously, the return value of the processing function and msim_process() told
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17290
diff
changeset
|
1713 g_return_val_if_fail(MSIM_SESSION_VALID(session), FALSE); |
d8903e1320a9
Previously, the return value of the processing function and msim_process() told
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17290
diff
changeset
|
1714 g_return_val_if_fail(msg != NULL, FALSE); |
16394 | 1715 |
17280
d3e17c9d16e9
Use MsimMessage for receiving messages everywhere, instead of GHashTable.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17266
diff
changeset
|
1716 if (msim_msg_get(msg, "rid")) /* msim_lookup_user sets callback for here */ |
16394 | 1717 { |
1718 MSIM_USER_LOOKUP_CB cb; | |
1719 gpointer data; | |
1720 guint rid; | |
17314
948373cbba1c
Add TODO in order to fix msim_tooltip_text.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17313
diff
changeset
|
1721 |
17322
6fa345a01dd8
Show buddy information in tooltip text, and the display name for status text.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17320
diff
changeset
|
1722 msim_store_buddy_info(session, msg); |
17313
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
1723 |
17322
6fa345a01dd8
Show buddy information in tooltip text, and the display name for status text.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17320
diff
changeset
|
1724 rid = msim_msg_get_integer(msg, "rid"); |
16394 | 1725 |
1726 /* If a callback is registered for this userid lookup, call it. */ | |
1727 cb = g_hash_table_lookup(session->user_lookup_cb, GUINT_TO_POINTER(rid)); | |
1728 data = g_hash_table_lookup(session->user_lookup_cb_data, GUINT_TO_POINTER(rid)); | |
1729 | |
1730 if (cb) | |
1731 { | |
16404
47e07438f01c
Use g_convert for UTF-16LE conversion instead of converting manually.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16402
diff
changeset
|
1732 purple_debug_info("msim", |
47e07438f01c
Use g_convert for UTF-16LE conversion instead of converting manually.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16402
diff
changeset
|
1733 "msim_process_body: calling callback now\n"); |
17291
d8903e1320a9
Previously, the return value of the processing function and msim_process() told
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17290
diff
changeset
|
1734 /* Clone message, so that the callback 'cb' can use it (needs to free it also). */ |
d8903e1320a9
Previously, the return value of the processing function and msim_process() told
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17290
diff
changeset
|
1735 cb(session, msim_msg_clone(msg), data); |
16394 | 1736 g_hash_table_remove(session->user_lookup_cb, GUINT_TO_POINTER(rid)); |
1737 g_hash_table_remove(session->user_lookup_cb_data, GUINT_TO_POINTER(rid)); | |
1738 } else { | |
16404
47e07438f01c
Use g_convert for UTF-16LE conversion instead of converting manually.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16402
diff
changeset
|
1739 purple_debug_info("msim", |
47e07438f01c
Use g_convert for UTF-16LE conversion instead of converting manually.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16402
diff
changeset
|
1740 "msim_process_body: no callback for rid %d\n", rid); |
16394 | 1741 } |
1742 } | |
17291
d8903e1320a9
Previously, the return value of the processing function and msim_process() told
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17290
diff
changeset
|
1743 |
d8903e1320a9
Previously, the return value of the processing function and msim_process() told
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17290
diff
changeset
|
1744 return TRUE; |
16394 | 1745 } |
1746 | |
1747 /** | |
1748 * Handle an error from the server. | |
1749 * | |
1750 * @param session | |
17280
d3e17c9d16e9
Use MsimMessage for receiving messages everywhere, instead of GHashTable.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17266
diff
changeset
|
1751 * @param msg The message. |
16394 | 1752 * |
17291
d8903e1320a9
Previously, the return value of the processing function and msim_process() told
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17290
diff
changeset
|
1753 * @return TRUE if successfully reported error. |
16394 | 1754 */ |
17661
38030f1a2e56
Split return type and function name + arguments on to separate lines, to
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17660
diff
changeset
|
1755 gboolean |
38030f1a2e56
Split return type and function name + arguments on to separate lines, to
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17660
diff
changeset
|
1756 msim_error(MsimSession *session, MsimMessage *msg) |
16394 | 1757 { |
17280
d3e17c9d16e9
Use MsimMessage for receiving messages everywhere, instead of GHashTable.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17266
diff
changeset
|
1758 gchar *errmsg, *full_errmsg; |
d3e17c9d16e9
Use MsimMessage for receiving messages everywhere, instead of GHashTable.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17266
diff
changeset
|
1759 guint err; |
16394 | 1760 |
17291
d8903e1320a9
Previously, the return value of the processing function and msim_process() told
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17290
diff
changeset
|
1761 g_return_val_if_fail(MSIM_SESSION_VALID(session), FALSE); |
d8903e1320a9
Previously, the return value of the processing function and msim_process() told
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17290
diff
changeset
|
1762 g_return_val_if_fail(msg != NULL, FALSE); |
16394 | 1763 |
17280
d3e17c9d16e9
Use MsimMessage for receiving messages everywhere, instead of GHashTable.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17266
diff
changeset
|
1764 err = msim_msg_get_integer(msg, "err"); |
d3e17c9d16e9
Use MsimMessage for receiving messages everywhere, instead of GHashTable.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17266
diff
changeset
|
1765 errmsg = msim_msg_get_string(msg, "errmsg"); |
16394 | 1766 |
17676
e7612bd6835b
Be more defensive about null pointers, especially null strings in %s format
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17674
diff
changeset
|
1767 full_errmsg = g_strdup_printf(_("Protocol error, code %d: %s"), err, |
e7612bd6835b
Be more defensive about null pointers, especially null strings in %s format
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17674
diff
changeset
|
1768 errmsg ? errmsg : "no 'errmsg' given"); |
17280
d3e17c9d16e9
Use MsimMessage for receiving messages everywhere, instead of GHashTable.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17266
diff
changeset
|
1769 |
d3e17c9d16e9
Use MsimMessage for receiving messages everywhere, instead of GHashTable.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17266
diff
changeset
|
1770 g_free(errmsg); |
16394 | 1771 |
16396 | 1772 purple_debug_info("msim", "msim_error: %s\n", full_errmsg); |
16394 | 1773 |
16728
8f6dcd5e9298
Use _ for translations in msimprpl. See #648.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16727
diff
changeset
|
1774 purple_notify_error(session->account, g_strdup(_("MySpaceIM Error")), |
16394 | 1775 full_errmsg, NULL); |
1776 | |
17291
d8903e1320a9
Previously, the return value of the processing function and msim_process() told
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17290
diff
changeset
|
1777 /* Destroy session if fatal. */ |
17280
d3e17c9d16e9
Use MsimMessage for receiving messages everywhere, instead of GHashTable.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17266
diff
changeset
|
1778 if (msim_msg_get(msg, "fatal")) |
16394 | 1779 { |
17296
1905859d7a3b
Add (incomplete) msim_remove_buddy().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17293
diff
changeset
|
1780 purple_debug_info("msim", "fatal error, closing\n"); |
16396 | 1781 purple_connection_error(session->gc, full_errmsg); |
16394 | 1782 } |
1783 | |
17291
d8903e1320a9
Previously, the return value of the processing function and msim_process() told
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17290
diff
changeset
|
1784 return TRUE; |
16394 | 1785 } |
1786 | |
17306
3a02e7db91c7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17305
diff
changeset
|
1787 /** |
3a02e7db91c7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17305
diff
changeset
|
1788 * Process incoming status messages. |
3a02e7db91c7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17305
diff
changeset
|
1789 * |
3a02e7db91c7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17305
diff
changeset
|
1790 * @param session |
3a02e7db91c7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17305
diff
changeset
|
1791 * @param msg Status update message. Caller frees. |
3a02e7db91c7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17305
diff
changeset
|
1792 * |
3a02e7db91c7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17305
diff
changeset
|
1793 * @return TRUE if successful. |
3a02e7db91c7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17305
diff
changeset
|
1794 */ |
17661
38030f1a2e56
Split return type and function name + arguments on to separate lines, to
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17660
diff
changeset
|
1795 gboolean |
38030f1a2e56
Split return type and function name + arguments on to separate lines, to
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17660
diff
changeset
|
1796 msim_status(MsimSession *session, MsimMessage *msg) |
16394 | 1797 { |
16396 | 1798 PurpleBuddyList *blist; |
1799 PurpleBuddy *buddy; | |
1800 //PurpleStatus *status; | |
16394 | 1801 gchar **status_array; |
1802 GList *list; | |
17289
73720427b132
Show online buddies on buddy list as online.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17287
diff
changeset
|
1803 gchar *status_headline; |
16394 | 1804 gchar *status_str; |
17289
73720427b132
Show online buddies on buddy list as online.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17287
diff
changeset
|
1805 gint i, status_code, purple_status_code; |
16394 | 1806 gchar *username; |
1807 | |
17306
3a02e7db91c7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17305
diff
changeset
|
1808 g_return_val_if_fail(MSIM_SESSION_VALID(session), FALSE); |
3a02e7db91c7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17305
diff
changeset
|
1809 g_return_val_if_fail(msg != NULL, FALSE); |
17305
6476a55a9542
msim_status_cb() now takes a MsimMessage *, just like msim_send_im_cb() and
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17304
diff
changeset
|
1810 |
6476a55a9542
msim_status_cb() now takes a MsimMessage *, just like msim_send_im_cb() and
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17304
diff
changeset
|
1811 status_str = msim_msg_get_string(msg, "msg"); |
17306
3a02e7db91c7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17305
diff
changeset
|
1812 g_return_val_if_fail(status_str != NULL, FALSE); |
16394 | 1813 |
17306
3a02e7db91c7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17305
diff
changeset
|
1814 msim_msg_dump("msim_status msg=%s\n", msg); |
16394 | 1815 |
17306
3a02e7db91c7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17305
diff
changeset
|
1816 /* Helpfully looked up by msim_incoming_resolve() for us. */ |
3a02e7db91c7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17305
diff
changeset
|
1817 username = msim_msg_get_string(msg, "_username"); |
16394 | 1818 /* Note: DisplayName doesn't seem to be resolvable. It could be displayed on |
1819 * the buddy list, if the UserID was stored along with it. */ | |
1820 | |
17306
3a02e7db91c7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17305
diff
changeset
|
1821 if (username == NULL) |
3a02e7db91c7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17305
diff
changeset
|
1822 { |
3a02e7db91c7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17305
diff
changeset
|
1823 g_free(status_str); |
3a02e7db91c7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17305
diff
changeset
|
1824 g_return_val_if_fail(NULL, FALSE); |
3a02e7db91c7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17305
diff
changeset
|
1825 } |
16394 | 1826 |
16404
47e07438f01c
Use g_convert for UTF-16LE conversion instead of converting manually.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16402
diff
changeset
|
1827 purple_debug_info("msim", |
47e07438f01c
Use g_convert for UTF-16LE conversion instead of converting manually.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16402
diff
changeset
|
1828 "msim_status_cb: updating status for <%s> to <%s>\n", |
47e07438f01c
Use g_convert for UTF-16LE conversion instead of converting manually.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16402
diff
changeset
|
1829 username, status_str); |
16394 | 1830 |
17289
73720427b132
Show online buddies on buddy list as online.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17287
diff
changeset
|
1831 /* TODO: generic functions to split into a GList, part of MsimMessage */ |
16394 | 1832 status_array = g_strsplit(status_str, "|", 0); |
1833 for (list = NULL, i = 0; | |
1834 status_array[i]; | |
1835 i++) | |
1836 { | |
17289
73720427b132
Show online buddies on buddy list as online.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17287
diff
changeset
|
1837 /* Note: this adds the 0th ordinal too, which might not be a value |
73720427b132
Show online buddies on buddy list as online.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17287
diff
changeset
|
1838 * at all (the 0 in the 0|1|2|3... status fields, but 0 always appears blank). |
73720427b132
Show online buddies on buddy list as online.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17287
diff
changeset
|
1839 */ |
16394 | 1840 list = g_list_append(list, status_array[i]); |
1841 } | |
1842 | |
17289
73720427b132
Show online buddies on buddy list as online.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17287
diff
changeset
|
1843 /* Example fields: |
73720427b132
Show online buddies on buddy list as online.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17287
diff
changeset
|
1844 * |s|0|ss|Offline |
73720427b132
Show online buddies on buddy list as online.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17287
diff
changeset
|
1845 * |s|1|ss|:-)|ls||ip|0|p|0 |
73720427b132
Show online buddies on buddy list as online.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17287
diff
changeset
|
1846 * |
73720427b132
Show online buddies on buddy list as online.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17287
diff
changeset
|
1847 * TODO: write list support in MsimMessage, and use it here. |
73720427b132
Show online buddies on buddy list as online.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17287
diff
changeset
|
1848 */ |
73720427b132
Show online buddies on buddy list as online.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17287
diff
changeset
|
1849 |
73720427b132
Show online buddies on buddy list as online.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17287
diff
changeset
|
1850 status_code = atoi(g_list_nth_data(list, MSIM_STATUS_ORDINAL_ONLINE)); |
73720427b132
Show online buddies on buddy list as online.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17287
diff
changeset
|
1851 purple_debug_info("msim", "msim_status_cb: %s's status code = %d\n", username, status_code); |
73720427b132
Show online buddies on buddy list as online.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17287
diff
changeset
|
1852 status_headline = g_list_nth_data(list, MSIM_STATUS_ORDINAL_HEADLINE); |
16394 | 1853 |
16396 | 1854 blist = purple_get_blist(); |
16394 | 1855 |
1856 /* Add buddy if not found */ | |
16396 | 1857 buddy = purple_find_buddy(session->account, username); |
16394 | 1858 if (!buddy) |
1859 { | |
16404
47e07438f01c
Use g_convert for UTF-16LE conversion instead of converting manually.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16402
diff
changeset
|
1860 purple_debug_info("msim", |
47e07438f01c
Use g_convert for UTF-16LE conversion instead of converting manually.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16402
diff
changeset
|
1861 "msim_status: making new buddy for %s\n", username); |
16396 | 1862 buddy = purple_buddy_new(session->account, username, NULL); |
16394 | 1863 |
16396 | 1864 purple_blist_add_buddy(buddy, NULL, NULL, NULL); |
17323
fc2ccac8d826
Reorganize the tooltip text, to show more useful information.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17322
diff
changeset
|
1865 |
17299
c6305f8845d8
Add TODOs about username/email->userid resolution, use g_return_if_fail() in a few places.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17298
diff
changeset
|
1866 /* All buddies on list should have 'uid' integer associated with them. */ |
17322
6fa345a01dd8
Show buddy information in tooltip text, and the display name for status text.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17320
diff
changeset
|
1867 purple_blist_node_set_int(&buddy->node, "UserID", msim_msg_get_integer(msg, "f")); |
17323
fc2ccac8d826
Reorganize the tooltip text, to show more useful information.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17322
diff
changeset
|
1868 |
fc2ccac8d826
Reorganize the tooltip text, to show more useful information.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17322
diff
changeset
|
1869 msim_store_buddy_info(session, msg); |
16394 | 1870 } else { |
16396 | 1871 purple_debug_info("msim", "msim_status: found buddy %s\n", username); |
16394 | 1872 } |
1873 | |
17323
fc2ccac8d826
Reorganize the tooltip text, to show more useful information.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17322
diff
changeset
|
1874 purple_blist_node_set_string(&buddy->node, "Headline", status_headline); |
17289
73720427b132
Show online buddies on buddy list as online.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17287
diff
changeset
|
1875 |
73720427b132
Show online buddies on buddy list as online.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17287
diff
changeset
|
1876 /* Set user status */ |
73720427b132
Show online buddies on buddy list as online.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17287
diff
changeset
|
1877 switch (status_code) |
73720427b132
Show online buddies on buddy list as online.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17287
diff
changeset
|
1878 { |
17680
d87916bd1d73
Fix email address.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17679
diff
changeset
|
1879 case MSIM_STATUS_CODE_OFFLINE_OR_HIDDEN: |
17674
e24d44e3b6d2
Recognize online/away status of buddies on buddy list.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17673
diff
changeset
|
1880 purple_status_code = PURPLE_STATUS_OFFLINE; |
e24d44e3b6d2
Recognize online/away status of buddies on buddy list.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17673
diff
changeset
|
1881 break; |
e24d44e3b6d2
Recognize online/away status of buddies on buddy list.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17673
diff
changeset
|
1882 |
e24d44e3b6d2
Recognize online/away status of buddies on buddy list.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17673
diff
changeset
|
1883 case MSIM_STATUS_CODE_ONLINE: |
e24d44e3b6d2
Recognize online/away status of buddies on buddy list.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17673
diff
changeset
|
1884 purple_status_code = PURPLE_STATUS_AVAILABLE; |
e24d44e3b6d2
Recognize online/away status of buddies on buddy list.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17673
diff
changeset
|
1885 break; |
e24d44e3b6d2
Recognize online/away status of buddies on buddy list.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17673
diff
changeset
|
1886 |
e24d44e3b6d2
Recognize online/away status of buddies on buddy list.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17673
diff
changeset
|
1887 case MSIM_STATUS_CODE_AWAY: |
e24d44e3b6d2
Recognize online/away status of buddies on buddy list.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17673
diff
changeset
|
1888 purple_status_code = PURPLE_STATUS_AWAY; |
e24d44e3b6d2
Recognize online/away status of buddies on buddy list.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17673
diff
changeset
|
1889 break; |
e24d44e3b6d2
Recognize online/away status of buddies on buddy list.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17673
diff
changeset
|
1890 |
17289
73720427b132
Show online buddies on buddy list as online.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17287
diff
changeset
|
1891 default: |
17674
e24d44e3b6d2
Recognize online/away status of buddies on buddy list.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17673
diff
changeset
|
1892 purple_debug_info("msim", "msim_status_cb for %s, unknown status code %d, treating as available\n", |
17289
73720427b132
Show online buddies on buddy list as online.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17287
diff
changeset
|
1893 username, status_code); |
73720427b132
Show online buddies on buddy list as online.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17287
diff
changeset
|
1894 purple_status_code = PURPLE_STATUS_AVAILABLE; |
73720427b132
Show online buddies on buddy list as online.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17287
diff
changeset
|
1895 } |
17670
7e4e3f6582d2
Add MSIM_FAKE_SELF_ONLINE preprocessor definition (which I define) to fake
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17669
diff
changeset
|
1896 |
7e4e3f6582d2
Add MSIM_FAKE_SELF_ONLINE preprocessor definition (which I define) to fake
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17669
diff
changeset
|
1897 #ifdef MSIM_FAKE_SELF_ONLINE |
7e4e3f6582d2
Add MSIM_FAKE_SELF_ONLINE preprocessor definition (which I define) to fake
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17669
diff
changeset
|
1898 if (!strcmp(username, session->username) && purple_status_code == PURPLE_STATUS_OFFLINE) |
7e4e3f6582d2
Add MSIM_FAKE_SELF_ONLINE preprocessor definition (which I define) to fake
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17669
diff
changeset
|
1899 { |
7e4e3f6582d2
Add MSIM_FAKE_SELF_ONLINE preprocessor definition (which I define) to fake
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17669
diff
changeset
|
1900 /* Hack to ignore offline status notices on self. */ |
7e4e3f6582d2
Add MSIM_FAKE_SELF_ONLINE preprocessor definition (which I define) to fake
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17669
diff
changeset
|
1901 } else { |
7e4e3f6582d2
Add MSIM_FAKE_SELF_ONLINE preprocessor definition (which I define) to fake
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17669
diff
changeset
|
1902 #endif |
7e4e3f6582d2
Add MSIM_FAKE_SELF_ONLINE preprocessor definition (which I define) to fake
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17669
diff
changeset
|
1903 purple_prpl_got_user_status(session->account, username, purple_primitive_get_id_from_type(purple_status_code), NULL); |
7e4e3f6582d2
Add MSIM_FAKE_SELF_ONLINE preprocessor definition (which I define) to fake
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17669
diff
changeset
|
1904 #ifdef MSIM_FAKE_SELF_ONLINE |
7e4e3f6582d2
Add MSIM_FAKE_SELF_ONLINE preprocessor definition (which I define) to fake
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17669
diff
changeset
|
1905 } |
7e4e3f6582d2
Add MSIM_FAKE_SELF_ONLINE preprocessor definition (which I define) to fake
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17669
diff
changeset
|
1906 #endif |
16394 | 1907 |
1908 g_strfreev(status_array); | |
17305
6476a55a9542
msim_status_cb() now takes a MsimMessage *, just like msim_send_im_cb() and
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17304
diff
changeset
|
1909 g_free(status_str); |
17306
3a02e7db91c7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17305
diff
changeset
|
1910 g_free(username); |
16394 | 1911 g_list_free(list); |
1912 | |
17291
d8903e1320a9
Previously, the return value of the processing function and msim_process() told
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17290
diff
changeset
|
1913 return TRUE; |
16394 | 1914 } |
1915 | |
17331
b33a6f16356a
Update several outdated TODO comments.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17330
diff
changeset
|
1916 /** Add a buddy to user's buddy list. */ |
17661
38030f1a2e56
Split return type and function name + arguments on to separate lines, to
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17660
diff
changeset
|
1917 void |
38030f1a2e56
Split return type and function name + arguments on to separate lines, to
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17660
diff
changeset
|
1918 msim_add_buddy(PurpleConnection *gc, PurpleBuddy *buddy, PurpleGroup *group) |
17293
bfda36bd957a
Add incomplete msim_add_buddy() implementation.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17291
diff
changeset
|
1919 { |
bfda36bd957a
Add incomplete msim_add_buddy() implementation.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17291
diff
changeset
|
1920 MsimSession *session; |
17312
962edb051146
Use msim_postprocess_outgoing() to resolve uid for adding and deleting buddies.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17311
diff
changeset
|
1921 MsimMessage *msg; |
17654
72f0a6fc6024
Rework addbuddy, but leave it commented-out (non-functional). Add TODO for
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17653
diff
changeset
|
1922 /* MsimMessage *msg_blocklist; */ |
17293
bfda36bd957a
Add incomplete msim_add_buddy() implementation.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17291
diff
changeset
|
1923 |
bfda36bd957a
Add incomplete msim_add_buddy() implementation.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17291
diff
changeset
|
1924 session = (MsimSession *)gc->proto_data; |
bfda36bd957a
Add incomplete msim_add_buddy() implementation.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17291
diff
changeset
|
1925 purple_debug_info("msim", "msim_add_buddy: want to add %s to %s\n", buddy->name, |
bfda36bd957a
Add incomplete msim_add_buddy() implementation.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17291
diff
changeset
|
1926 group ? group->name : "(no group)"); |
bfda36bd957a
Add incomplete msim_add_buddy() implementation.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17291
diff
changeset
|
1927 |
17312
962edb051146
Use msim_postprocess_outgoing() to resolve uid for adding and deleting buddies.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17311
diff
changeset
|
1928 msg = msim_msg_new(TRUE, |
17293
bfda36bd957a
Add incomplete msim_add_buddy() implementation.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17291
diff
changeset
|
1929 "addbuddy", MSIM_TYPE_BOOLEAN, TRUE, |
17297
c2208b64bffb
Change MsimSession.sesskey to an integer (used to be a string), now that
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17296
diff
changeset
|
1930 "sesskey", MSIM_TYPE_INTEGER, session->sesskey, |
17312
962edb051146
Use msim_postprocess_outgoing() to resolve uid for adding and deleting buddies.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17311
diff
changeset
|
1931 /* "newprofileid" will be inserted here with uid. */ |
17293
bfda36bd957a
Add incomplete msim_add_buddy() implementation.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17291
diff
changeset
|
1932 "reason", MSIM_TYPE_STRING, g_strdup(""), |
17312
962edb051146
Use msim_postprocess_outgoing() to resolve uid for adding and deleting buddies.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17311
diff
changeset
|
1933 NULL); |
962edb051146
Use msim_postprocess_outgoing() to resolve uid for adding and deleting buddies.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17311
diff
changeset
|
1934 |
962edb051146
Use msim_postprocess_outgoing() to resolve uid for adding and deleting buddies.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17311
diff
changeset
|
1935 if (!msim_postprocess_outgoing(session, msg, buddy->name, "newprofileid", "reason")) |
17293
bfda36bd957a
Add incomplete msim_add_buddy() implementation.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17291
diff
changeset
|
1936 { |
bfda36bd957a
Add incomplete msim_add_buddy() implementation.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17291
diff
changeset
|
1937 purple_notify_error(NULL, NULL, _("Failed to add buddy"), _("'addbuddy' command failed.")); |
17312
962edb051146
Use msim_postprocess_outgoing() to resolve uid for adding and deleting buddies.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17311
diff
changeset
|
1938 msim_msg_free(msg); |
17296
1905859d7a3b
Add (incomplete) msim_remove_buddy().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17293
diff
changeset
|
1939 return; |
17293
bfda36bd957a
Add incomplete msim_add_buddy() implementation.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17291
diff
changeset
|
1940 } |
17312
962edb051146
Use msim_postprocess_outgoing() to resolve uid for adding and deleting buddies.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17311
diff
changeset
|
1941 msim_msg_free(msg); |
17654
72f0a6fc6024
Rework addbuddy, but leave it commented-out (non-functional). Add TODO for
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17653
diff
changeset
|
1942 |
72f0a6fc6024
Rework addbuddy, but leave it commented-out (non-functional). Add TODO for
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17653
diff
changeset
|
1943 /* TODO: if addbuddy fails ('error' message is returned), delete added buddy from |
72f0a6fc6024
Rework addbuddy, but leave it commented-out (non-functional). Add TODO for
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17653
diff
changeset
|
1944 * buddy list since Purple adds it locally. */ |
17293
bfda36bd957a
Add incomplete msim_add_buddy() implementation.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17291
diff
changeset
|
1945 |
17654
72f0a6fc6024
Rework addbuddy, but leave it commented-out (non-functional). Add TODO for
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17653
diff
changeset
|
1946 /* TODO: Update blocklist. */ |
17312
962edb051146
Use msim_postprocess_outgoing() to resolve uid for adding and deleting buddies.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17311
diff
changeset
|
1947 #if 0 |
17654
72f0a6fc6024
Rework addbuddy, but leave it commented-out (non-functional). Add TODO for
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17653
diff
changeset
|
1948 msg_blocklist = msim_msg_new(TRUE, |
72f0a6fc6024
Rework addbuddy, but leave it commented-out (non-functional). Add TODO for
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17653
diff
changeset
|
1949 "persist", MSIM_TYPE_INTEGER, 1, |
72f0a6fc6024
Rework addbuddy, but leave it commented-out (non-functional). Add TODO for
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17653
diff
changeset
|
1950 "sesskey", MSIM_TYPE_INTEGER, session->sesskey, |
72f0a6fc6024
Rework addbuddy, but leave it commented-out (non-functional). Add TODO for
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17653
diff
changeset
|
1951 "cmd", MSIM_TYPE_INTEGER, MSIM_CMD_BIT_ACTION | MSIM_CMD_PUT, |
72f0a6fc6024
Rework addbuddy, but leave it commented-out (non-functional). Add TODO for
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17653
diff
changeset
|
1952 "dsn", MSIM_TYPE_INTEGER, MC_CONTACT_INFO_DSN, |
72f0a6fc6024
Rework addbuddy, but leave it commented-out (non-functional). Add TODO for
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17653
diff
changeset
|
1953 "lid", MSIM_TYPE_INTEGER, MC_CONTACT_INFO_LID, |
72f0a6fc6024
Rework addbuddy, but leave it commented-out (non-functional). Add TODO for
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17653
diff
changeset
|
1954 /* TODO: Use msim_new_reply_callback to get rid. */ |
72f0a6fc6024
Rework addbuddy, but leave it commented-out (non-functional). Add TODO for
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17653
diff
changeset
|
1955 "rid", MSIM_TYPE_INTEGER, session->next_rid++, |
72f0a6fc6024
Rework addbuddy, but leave it commented-out (non-functional). Add TODO for
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17653
diff
changeset
|
1956 "body", MSIM_TYPE_STRING, |
72f0a6fc6024
Rework addbuddy, but leave it commented-out (non-functional). Add TODO for
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17653
diff
changeset
|
1957 g_strdup_printf("ContactID=<uid>\034" |
72f0a6fc6024
Rework addbuddy, but leave it commented-out (non-functional). Add TODO for
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17653
diff
changeset
|
1958 "GroupName=%s\034" |
72f0a6fc6024
Rework addbuddy, but leave it commented-out (non-functional). Add TODO for
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17653
diff
changeset
|
1959 "Position=1000\034" |
72f0a6fc6024
Rework addbuddy, but leave it commented-out (non-functional). Add TODO for
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17653
diff
changeset
|
1960 "Visibility=1\034" |
72f0a6fc6024
Rework addbuddy, but leave it commented-out (non-functional). Add TODO for
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17653
diff
changeset
|
1961 "NickName=\034" |
72f0a6fc6024
Rework addbuddy, but leave it commented-out (non-functional). Add TODO for
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17653
diff
changeset
|
1962 "NameSelect=0", |
72f0a6fc6024
Rework addbuddy, but leave it commented-out (non-functional). Add TODO for
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17653
diff
changeset
|
1963 "Friends" /*group->name*/ )); |
72f0a6fc6024
Rework addbuddy, but leave it commented-out (non-functional). Add TODO for
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17653
diff
changeset
|
1964 |
72f0a6fc6024
Rework addbuddy, but leave it commented-out (non-functional). Add TODO for
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17653
diff
changeset
|
1965 if (!msim_postprocess_outgoing(session, msg, buddy->name, "body", NULL)) |
17293
bfda36bd957a
Add incomplete msim_add_buddy() implementation.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17291
diff
changeset
|
1966 { |
bfda36bd957a
Add incomplete msim_add_buddy() implementation.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17291
diff
changeset
|
1967 purple_notify_error(NULL, NULL, _("Failed to add buddy"), _("persist command failed")); |
17654
72f0a6fc6024
Rework addbuddy, but leave it commented-out (non-functional). Add TODO for
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17653
diff
changeset
|
1968 msim_msg_free(msg_blocklist); |
17296
1905859d7a3b
Add (incomplete) msim_remove_buddy().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17293
diff
changeset
|
1969 return; |
17293
bfda36bd957a
Add incomplete msim_add_buddy() implementation.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17291
diff
changeset
|
1970 } |
17654
72f0a6fc6024
Rework addbuddy, but leave it commented-out (non-functional). Add TODO for
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17653
diff
changeset
|
1971 msim_msg_free(msg_blocklist); |
17312
962edb051146
Use msim_postprocess_outgoing() to resolve uid for adding and deleting buddies.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17311
diff
changeset
|
1972 #endif |
17293
bfda36bd957a
Add incomplete msim_add_buddy() implementation.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17291
diff
changeset
|
1973 } |
bfda36bd957a
Add incomplete msim_add_buddy() implementation.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17291
diff
changeset
|
1974 |
17319
4cb842e0649c
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17317
diff
changeset
|
1975 /** Perform actual postprocessing on a message, adding userid as specified. |
4cb842e0649c
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17317
diff
changeset
|
1976 * |
4cb842e0649c
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17317
diff
changeset
|
1977 * @param msg The message to postprocess. |
4cb842e0649c
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17317
diff
changeset
|
1978 * @param uid_before Name of field where to insert new field before, or NULL for end. |
4cb842e0649c
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17317
diff
changeset
|
1979 * @param uid_field_name Name of field to add uid to. |
4cb842e0649c
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17317
diff
changeset
|
1980 * @param uid The userid to insert. |
4cb842e0649c
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17317
diff
changeset
|
1981 * |
4cb842e0649c
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17317
diff
changeset
|
1982 * If the field named by uid_field_name already exists, then its string contents will |
4cb842e0649c
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17317
diff
changeset
|
1983 * be used for the field, except "<uid>" will be replaced by the userid. |
4cb842e0649c
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17317
diff
changeset
|
1984 * |
4cb842e0649c
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17317
diff
changeset
|
1985 * If the field named by uid_field_name does not exist, it will be added before the |
4cb842e0649c
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17317
diff
changeset
|
1986 * field named by uid_before, as an integer, with the userid. |
4cb842e0649c
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17317
diff
changeset
|
1987 * |
4cb842e0649c
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17317
diff
changeset
|
1988 * Does not handle sending, or scheduling userid lookup. For that, see msim_postprocess_outgoing(). |
4cb842e0649c
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17317
diff
changeset
|
1989 */ |
17661
38030f1a2e56
Split return type and function name + arguments on to separate lines, to
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17660
diff
changeset
|
1990 MsimMessage * |
38030f1a2e56
Split return type and function name + arguments on to separate lines, to
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17660
diff
changeset
|
1991 msim_do_postprocessing(MsimMessage *msg, const gchar *uid_before, |
38030f1a2e56
Split return type and function name + arguments on to separate lines, to
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17660
diff
changeset
|
1992 const gchar *uid_field_name, guint uid) |
17319
4cb842e0649c
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17317
diff
changeset
|
1993 { |
4cb842e0649c
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17317
diff
changeset
|
1994 purple_debug_info("msim", "msim_do_postprocessing called with ufn=%s, ub=%s, uid=%d\n", |
4cb842e0649c
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17317
diff
changeset
|
1995 uid_field_name, uid_before, uid); |
4cb842e0649c
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17317
diff
changeset
|
1996 msim_msg_dump("msim_do_postprocessing msg: %s\n", msg); |
4cb842e0649c
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17317
diff
changeset
|
1997 |
4cb842e0649c
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17317
diff
changeset
|
1998 /* First, check - if the field already exists, treat it as a format string. */ |
4cb842e0649c
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17317
diff
changeset
|
1999 if (msim_msg_get(msg, uid_field_name)) |
4cb842e0649c
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17317
diff
changeset
|
2000 { |
4cb842e0649c
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17317
diff
changeset
|
2001 MsimMessageElement *elem; |
4cb842e0649c
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17317
diff
changeset
|
2002 gchar *fmt_string; |
4cb842e0649c
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17317
diff
changeset
|
2003 gchar *uid_str; |
4cb842e0649c
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17317
diff
changeset
|
2004 |
4cb842e0649c
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17317
diff
changeset
|
2005 /* Warning: this probably violates the encapsulation of MsimMessage */ |
4cb842e0649c
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17317
diff
changeset
|
2006 |
4cb842e0649c
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17317
diff
changeset
|
2007 elem = msim_msg_get(msg, uid_field_name); |
4cb842e0649c
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17317
diff
changeset
|
2008 g_return_val_if_fail(elem->type == MSIM_TYPE_STRING, NULL); |
4cb842e0649c
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17317
diff
changeset
|
2009 |
4cb842e0649c
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17317
diff
changeset
|
2010 /* Get the raw string, not with msim_msg_get_string() since that copies it. |
4cb842e0649c
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17317
diff
changeset
|
2011 * Want the original string so can free it. */ |
4cb842e0649c
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17317
diff
changeset
|
2012 fmt_string = (gchar *)(elem->data); |
4cb842e0649c
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17317
diff
changeset
|
2013 |
4cb842e0649c
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17317
diff
changeset
|
2014 uid_str = g_strdup_printf("%d", uid); |
4cb842e0649c
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17317
diff
changeset
|
2015 elem->data = str_replace(fmt_string, "<uid>", uid_str); |
4cb842e0649c
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17317
diff
changeset
|
2016 g_free(uid_str); |
4cb842e0649c
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17317
diff
changeset
|
2017 g_free(fmt_string); |
4cb842e0649c
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17317
diff
changeset
|
2018 |
4cb842e0649c
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17317
diff
changeset
|
2019 purple_debug_info("msim", "msim_postprocess_outgoing_cb: formatted new string, %s\n", |
4cb842e0649c
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17317
diff
changeset
|
2020 elem->data); |
4cb842e0649c
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17317
diff
changeset
|
2021 |
4cb842e0649c
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17317
diff
changeset
|
2022 } else { |
4cb842e0649c
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17317
diff
changeset
|
2023 /* Otherwise, insert new field into outgoing message. */ |
4cb842e0649c
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17317
diff
changeset
|
2024 msg = msim_msg_insert_before(msg, uid_before, uid_field_name, MSIM_TYPE_INTEGER, GUINT_TO_POINTER(uid)); |
4cb842e0649c
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17317
diff
changeset
|
2025 } |
4cb842e0649c
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17317
diff
changeset
|
2026 |
4cb842e0649c
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17317
diff
changeset
|
2027 return msg; |
4cb842e0649c
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17317
diff
changeset
|
2028 } |
4cb842e0649c
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17317
diff
changeset
|
2029 |
17316
2aff11bb5e72
Several small changes to work towards a working msim_remove_buddy():
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17315
diff
changeset
|
2030 /** Callback for msim_postprocess_outgoing() to add a userid to a message, and send it (once receiving userid). |
2aff11bb5e72
Several small changes to work towards a working msim_remove_buddy():
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17315
diff
changeset
|
2031 * |
2aff11bb5e72
Several small changes to work towards a working msim_remove_buddy():
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17315
diff
changeset
|
2032 * @param session |
2aff11bb5e72
Several small changes to work towards a working msim_remove_buddy():
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17315
diff
changeset
|
2033 * @param userinfo The user information reply message, containing the user ID |
2aff11bb5e72
Several small changes to work towards a working msim_remove_buddy():
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17315
diff
changeset
|
2034 * @param data The message to postprocess and send. |
2aff11bb5e72
Several small changes to work towards a working msim_remove_buddy():
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17315
diff
changeset
|
2035 * |
2aff11bb5e72
Several small changes to work towards a working msim_remove_buddy():
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17315
diff
changeset
|
2036 * The data message should contain these fields: |
2aff11bb5e72
Several small changes to work towards a working msim_remove_buddy():
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17315
diff
changeset
|
2037 * |
2aff11bb5e72
Several small changes to work towards a working msim_remove_buddy():
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17315
diff
changeset
|
2038 * _uid_field_name: string, name of field to add with userid from userinfo message |
2aff11bb5e72
Several small changes to work towards a working msim_remove_buddy():
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17315
diff
changeset
|
2039 * _uid_before: string, name of field before field to insert, or NULL for end |
2aff11bb5e72
Several small changes to work towards a working msim_remove_buddy():
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17315
diff
changeset
|
2040 * |
2aff11bb5e72
Several small changes to work towards a working msim_remove_buddy():
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17315
diff
changeset
|
2041 * |
17319
4cb842e0649c
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17317
diff
changeset
|
2042 */ |
17661
38030f1a2e56
Split return type and function name + arguments on to separate lines, to
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17660
diff
changeset
|
2043 void |
38030f1a2e56
Split return type and function name + arguments on to separate lines, to
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17660
diff
changeset
|
2044 msim_postprocess_outgoing_cb(MsimSession *session, MsimMessage *userinfo, gpointer data) |
17309
25a55b52855a
Add, but do not use, two new functions to postprocess outgoing messages
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17308
diff
changeset
|
2045 { |
25a55b52855a
Add, but do not use, two new functions to postprocess outgoing messages
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17308
diff
changeset
|
2046 gchar *body_str; |
25a55b52855a
Add, but do not use, two new functions to postprocess outgoing messages
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17308
diff
changeset
|
2047 GHashTable *body; |
17311
3720176bdac6
Pass postprocessing parameters inside MsimMessage * instead of in a new struct.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17310
diff
changeset
|
2048 gchar *uid, *uid_field_name, *uid_before; |
3720176bdac6
Pass postprocessing parameters inside MsimMessage * instead of in a new struct.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17310
diff
changeset
|
2049 MsimMessage *msg; |
17309
25a55b52855a
Add, but do not use, two new functions to postprocess outgoing messages
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17308
diff
changeset
|
2050 |
17311
3720176bdac6
Pass postprocessing parameters inside MsimMessage * instead of in a new struct.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17310
diff
changeset
|
2051 msg = (MsimMessage *)data; |
3720176bdac6
Pass postprocessing parameters inside MsimMessage * instead of in a new struct.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17310
diff
changeset
|
2052 |
3720176bdac6
Pass postprocessing parameters inside MsimMessage * instead of in a new struct.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17310
diff
changeset
|
2053 msim_msg_dump("msim_postprocess_outgoing_cb() got msg=%s\n", msg); |
17309
25a55b52855a
Add, but do not use, two new functions to postprocess outgoing messages
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17308
diff
changeset
|
2054 |
25a55b52855a
Add, but do not use, two new functions to postprocess outgoing messages
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17308
diff
changeset
|
2055 /* Obtain userid from userinfo message. */ |
17310
05723949f75d
Change msim_send_im() to use msim_postprocess_outgoing(), eliminating the
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17309
diff
changeset
|
2056 body_str = msim_msg_get_string(userinfo, "body"); |
05723949f75d
Change msim_send_im() to use msim_postprocess_outgoing(), eliminating the
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17309
diff
changeset
|
2057 g_return_if_fail(body_str != NULL); |
17309
25a55b52855a
Add, but do not use, two new functions to postprocess outgoing messages
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17308
diff
changeset
|
2058 body = msim_parse_body(body_str); |
25a55b52855a
Add, but do not use, two new functions to postprocess outgoing messages
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17308
diff
changeset
|
2059 g_free(body_str); |
25a55b52855a
Add, but do not use, two new functions to postprocess outgoing messages
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17308
diff
changeset
|
2060 |
25a55b52855a
Add, but do not use, two new functions to postprocess outgoing messages
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17308
diff
changeset
|
2061 uid = g_strdup(g_hash_table_lookup(body, "UserID")); |
25a55b52855a
Add, but do not use, two new functions to postprocess outgoing messages
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17308
diff
changeset
|
2062 g_hash_table_destroy(body); |
25a55b52855a
Add, but do not use, two new functions to postprocess outgoing messages
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17308
diff
changeset
|
2063 |
17311
3720176bdac6
Pass postprocessing parameters inside MsimMessage * instead of in a new struct.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17310
diff
changeset
|
2064 uid_field_name = msim_msg_get_string(msg, "_uid_field_name"); |
3720176bdac6
Pass postprocessing parameters inside MsimMessage * instead of in a new struct.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17310
diff
changeset
|
2065 uid_before = msim_msg_get_string(msg, "_uid_before"); |
3720176bdac6
Pass postprocessing parameters inside MsimMessage * instead of in a new struct.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17310
diff
changeset
|
2066 |
17319
4cb842e0649c
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17317
diff
changeset
|
2067 msg = msim_do_postprocessing(msg, uid_before, uid_field_name, atol(uid)); |
17316
2aff11bb5e72
Several small changes to work towards a working msim_remove_buddy():
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17315
diff
changeset
|
2068 |
17312
962edb051146
Use msim_postprocess_outgoing() to resolve uid for adding and deleting buddies.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17311
diff
changeset
|
2069 /* Send */ |
962edb051146
Use msim_postprocess_outgoing() to resolve uid for adding and deleting buddies.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17311
diff
changeset
|
2070 if (!msim_msg_send(session, msg)) |
962edb051146
Use msim_postprocess_outgoing() to resolve uid for adding and deleting buddies.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17311
diff
changeset
|
2071 { |
962edb051146
Use msim_postprocess_outgoing() to resolve uid for adding and deleting buddies.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17311
diff
changeset
|
2072 purple_debug_info("msim", "msim_postprocess_outgoing_cb: sending failed for message: %s\n", msg); |
962edb051146
Use msim_postprocess_outgoing() to resolve uid for adding and deleting buddies.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17311
diff
changeset
|
2073 } |
17311
3720176bdac6
Pass postprocessing parameters inside MsimMessage * instead of in a new struct.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17310
diff
changeset
|
2074 |
17319
4cb842e0649c
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17317
diff
changeset
|
2075 |
17312
962edb051146
Use msim_postprocess_outgoing() to resolve uid for adding and deleting buddies.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17311
diff
changeset
|
2076 /* Free field names AFTER sending message, because MsimMessage does NOT copy |
962edb051146
Use msim_postprocess_outgoing() to resolve uid for adding and deleting buddies.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17311
diff
changeset
|
2077 * field names - instead, treats them as static strings (which they usually are). |
962edb051146
Use msim_postprocess_outgoing() to resolve uid for adding and deleting buddies.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17311
diff
changeset
|
2078 */ |
17311
3720176bdac6
Pass postprocessing parameters inside MsimMessage * instead of in a new struct.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17310
diff
changeset
|
2079 g_free(uid_field_name); |
3720176bdac6
Pass postprocessing parameters inside MsimMessage * instead of in a new struct.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17310
diff
changeset
|
2080 g_free(uid_before); |
17309
25a55b52855a
Add, but do not use, two new functions to postprocess outgoing messages
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17308
diff
changeset
|
2081 |
17312
962edb051146
Use msim_postprocess_outgoing() to resolve uid for adding and deleting buddies.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17311
diff
changeset
|
2082 //msim_msg_free(msg); |
17309
25a55b52855a
Add, but do not use, two new functions to postprocess outgoing messages
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17308
diff
changeset
|
2083 } |
25a55b52855a
Add, but do not use, two new functions to postprocess outgoing messages
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17308
diff
changeset
|
2084 |
25a55b52855a
Add, but do not use, two new functions to postprocess outgoing messages
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17308
diff
changeset
|
2085 /** Postprocess and send a message. |
25a55b52855a
Add, but do not use, two new functions to postprocess outgoing messages
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17308
diff
changeset
|
2086 * |
25a55b52855a
Add, but do not use, two new functions to postprocess outgoing messages
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17308
diff
changeset
|
2087 * @param session |
17312
962edb051146
Use msim_postprocess_outgoing() to resolve uid for adding and deleting buddies.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17311
diff
changeset
|
2088 * @param msg Message to postprocess. Will NOT be freed. |
17311
3720176bdac6
Pass postprocessing parameters inside MsimMessage * instead of in a new struct.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17310
diff
changeset
|
2089 * @param username Username to resolve. Assumed to be a static string (will not be freed or copied). |
3720176bdac6
Pass postprocessing parameters inside MsimMessage * instead of in a new struct.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17310
diff
changeset
|
2090 * @param uid_field_name Name of new field to add, containing uid of username. Static string. |
3720176bdac6
Pass postprocessing parameters inside MsimMessage * instead of in a new struct.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17310
diff
changeset
|
2091 * @param uid_before Name of existing field to insert username field before. Static string. |
17309
25a55b52855a
Add, but do not use, two new functions to postprocess outgoing messages
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17308
diff
changeset
|
2092 * |
25a55b52855a
Add, but do not use, two new functions to postprocess outgoing messages
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17308
diff
changeset
|
2093 * @return Postprocessed message. |
25a55b52855a
Add, but do not use, two new functions to postprocess outgoing messages
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17308
diff
changeset
|
2094 */ |
17661
38030f1a2e56
Split return type and function name + arguments on to separate lines, to
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17660
diff
changeset
|
2095 gboolean |
38030f1a2e56
Split return type and function name + arguments on to separate lines, to
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17660
diff
changeset
|
2096 msim_postprocess_outgoing(MsimSession *session, MsimMessage *msg, |
38030f1a2e56
Split return type and function name + arguments on to separate lines, to
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17660
diff
changeset
|
2097 const gchar *username, const gchar *uid_field_name, |
38030f1a2e56
Split return type and function name + arguments on to separate lines, to
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17660
diff
changeset
|
2098 const gchar *uid_before) |
17309
25a55b52855a
Add, but do not use, two new functions to postprocess outgoing messages
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17308
diff
changeset
|
2099 { |
25a55b52855a
Add, but do not use, two new functions to postprocess outgoing messages
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17308
diff
changeset
|
2100 PurpleBuddy *buddy; |
25a55b52855a
Add, but do not use, two new functions to postprocess outgoing messages
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17308
diff
changeset
|
2101 guint uid; |
17312
962edb051146
Use msim_postprocess_outgoing() to resolve uid for adding and deleting buddies.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17311
diff
changeset
|
2102 gboolean rc; |
17309
25a55b52855a
Add, but do not use, two new functions to postprocess outgoing messages
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17308
diff
changeset
|
2103 |
17311
3720176bdac6
Pass postprocessing parameters inside MsimMessage * instead of in a new struct.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17310
diff
changeset
|
2104 /* Store information for msim_postprocess_outgoing_cb(). */ |
3720176bdac6
Pass postprocessing parameters inside MsimMessage * instead of in a new struct.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17310
diff
changeset
|
2105 purple_debug_info("msim", "msim_postprocess_outgoing(u=%s,ufn=%s,ub=%s)\n", |
3720176bdac6
Pass postprocessing parameters inside MsimMessage * instead of in a new struct.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17310
diff
changeset
|
2106 username, uid_field_name, uid_before); |
17319
4cb842e0649c
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17317
diff
changeset
|
2107 msim_msg_dump("msim_postprocess_outgoing: msg before=%s\n", msg); |
17311
3720176bdac6
Pass postprocessing parameters inside MsimMessage * instead of in a new struct.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17310
diff
changeset
|
2108 msg = msim_msg_append(msg, "_username", MSIM_TYPE_STRING, g_strdup(username)); |
3720176bdac6
Pass postprocessing parameters inside MsimMessage * instead of in a new struct.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17310
diff
changeset
|
2109 msg = msim_msg_append(msg, "_uid_field_name", MSIM_TYPE_STRING, g_strdup(uid_field_name)); |
3720176bdac6
Pass postprocessing parameters inside MsimMessage * instead of in a new struct.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17310
diff
changeset
|
2110 msg = msim_msg_append(msg, "_uid_before", MSIM_TYPE_STRING, g_strdup(uid_before)); |
17310
05723949f75d
Change msim_send_im() to use msim_postprocess_outgoing(), eliminating the
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17309
diff
changeset
|
2111 |
05723949f75d
Change msim_send_im() to use msim_postprocess_outgoing(), eliminating the
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17309
diff
changeset
|
2112 /* First, try the most obvious. If numeric userid is given, use that directly. */ |
05723949f75d
Change msim_send_im() to use msim_postprocess_outgoing(), eliminating the
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17309
diff
changeset
|
2113 if (msim_is_userid(username)) |
05723949f75d
Change msim_send_im() to use msim_postprocess_outgoing(), eliminating the
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17309
diff
changeset
|
2114 { |
05723949f75d
Change msim_send_im() to use msim_postprocess_outgoing(), eliminating the
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17309
diff
changeset
|
2115 uid = atol(username); |
05723949f75d
Change msim_send_im() to use msim_postprocess_outgoing(), eliminating the
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17309
diff
changeset
|
2116 } else { |
05723949f75d
Change msim_send_im() to use msim_postprocess_outgoing(), eliminating the
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17309
diff
changeset
|
2117 /* Next, see if on buddy list and know uid. */ |
05723949f75d
Change msim_send_im() to use msim_postprocess_outgoing(), eliminating the
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17309
diff
changeset
|
2118 buddy = purple_find_buddy(session->account, username); |
05723949f75d
Change msim_send_im() to use msim_postprocess_outgoing(), eliminating the
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17309
diff
changeset
|
2119 if (buddy) |
05723949f75d
Change msim_send_im() to use msim_postprocess_outgoing(), eliminating the
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17309
diff
changeset
|
2120 { |
17322
6fa345a01dd8
Show buddy information in tooltip text, and the display name for status text.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17320
diff
changeset
|
2121 uid = purple_blist_node_get_int(&buddy->node, "UserID"); |
17310
05723949f75d
Change msim_send_im() to use msim_postprocess_outgoing(), eliminating the
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17309
diff
changeset
|
2122 } else { |
05723949f75d
Change msim_send_im() to use msim_postprocess_outgoing(), eliminating the
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17309
diff
changeset
|
2123 uid = 0; |
05723949f75d
Change msim_send_im() to use msim_postprocess_outgoing(), eliminating the
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17309
diff
changeset
|
2124 } |
05723949f75d
Change msim_send_im() to use msim_postprocess_outgoing(), eliminating the
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17309
diff
changeset
|
2125 |
05723949f75d
Change msim_send_im() to use msim_postprocess_outgoing(), eliminating the
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17309
diff
changeset
|
2126 if (!buddy || !uid) |
05723949f75d
Change msim_send_im() to use msim_postprocess_outgoing(), eliminating the
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17309
diff
changeset
|
2127 { |
17319
4cb842e0649c
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17317
diff
changeset
|
2128 /* Don't have uid offhand - need to ask for it, and wait until hear back before sending. */ |
17310
05723949f75d
Change msim_send_im() to use msim_postprocess_outgoing(), eliminating the
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17309
diff
changeset
|
2129 purple_debug_info("msim", ">>> msim_postprocess_outgoing: couldn't find username %s in blist\n", |
05723949f75d
Change msim_send_im() to use msim_postprocess_outgoing(), eliminating the
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17309
diff
changeset
|
2130 username); |
17312
962edb051146
Use msim_postprocess_outgoing() to resolve uid for adding and deleting buddies.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17311
diff
changeset
|
2131 msim_msg_dump("msim_postprocess_outgoing - scheduling lookup, msg=%s\n", msg); |
962edb051146
Use msim_postprocess_outgoing() to resolve uid for adding and deleting buddies.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17311
diff
changeset
|
2132 /* TODO: where is cloned message freed? Should be in _cb. */ |
17311
3720176bdac6
Pass postprocessing parameters inside MsimMessage * instead of in a new struct.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17310
diff
changeset
|
2133 msim_lookup_user(session, username, msim_postprocess_outgoing_cb, msim_msg_clone(msg)); |
17310
05723949f75d
Change msim_send_im() to use msim_postprocess_outgoing(), eliminating the
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17309
diff
changeset
|
2134 return TRUE; /* not sure of status yet - haven't sent! */ |
05723949f75d
Change msim_send_im() to use msim_postprocess_outgoing(), eliminating the
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17309
diff
changeset
|
2135 } |
17309
25a55b52855a
Add, but do not use, two new functions to postprocess outgoing messages
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17308
diff
changeset
|
2136 } |
25a55b52855a
Add, but do not use, two new functions to postprocess outgoing messages
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17308
diff
changeset
|
2137 |
17319
4cb842e0649c
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17317
diff
changeset
|
2138 /* Already have uid, postprocess and send msg immediately. */ |
17309
25a55b52855a
Add, but do not use, two new functions to postprocess outgoing messages
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17308
diff
changeset
|
2139 purple_debug_info("msim", "msim_postprocess_outgoing: found username %s has uid %d\n", |
25a55b52855a
Add, but do not use, two new functions to postprocess outgoing messages
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17308
diff
changeset
|
2140 username, uid); |
25a55b52855a
Add, but do not use, two new functions to postprocess outgoing messages
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17308
diff
changeset
|
2141 |
17319
4cb842e0649c
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17317
diff
changeset
|
2142 msg = msim_do_postprocessing(msg, uid_before, uid_field_name, uid); |
17309
25a55b52855a
Add, but do not use, two new functions to postprocess outgoing messages
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17308
diff
changeset
|
2143 |
17319
4cb842e0649c
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17317
diff
changeset
|
2144 msim_msg_dump("msim_postprocess_outgoing: msg after (uid immediate)=%s\n", msg); |
4cb842e0649c
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17317
diff
changeset
|
2145 |
17312
962edb051146
Use msim_postprocess_outgoing() to resolve uid for adding and deleting buddies.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17311
diff
changeset
|
2146 rc = msim_msg_send(session, msg); |
962edb051146
Use msim_postprocess_outgoing() to resolve uid for adding and deleting buddies.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17311
diff
changeset
|
2147 |
962edb051146
Use msim_postprocess_outgoing() to resolve uid for adding and deleting buddies.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17311
diff
changeset
|
2148 //msim_msg_free(msg); |
962edb051146
Use msim_postprocess_outgoing() to resolve uid for adding and deleting buddies.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17311
diff
changeset
|
2149 |
962edb051146
Use msim_postprocess_outgoing() to resolve uid for adding and deleting buddies.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17311
diff
changeset
|
2150 return rc; |
17309
25a55b52855a
Add, but do not use, two new functions to postprocess outgoing messages
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17308
diff
changeset
|
2151 } |
25a55b52855a
Add, but do not use, two new functions to postprocess outgoing messages
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17308
diff
changeset
|
2152 |
17296
1905859d7a3b
Add (incomplete) msim_remove_buddy().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17293
diff
changeset
|
2153 /** Remove a buddy from the user's buddy list. */ |
17661
38030f1a2e56
Split return type and function name + arguments on to separate lines, to
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17660
diff
changeset
|
2154 void |
38030f1a2e56
Split return type and function name + arguments on to separate lines, to
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17660
diff
changeset
|
2155 msim_remove_buddy(PurpleConnection *gc, PurpleBuddy *buddy, PurpleGroup *group) |
17296
1905859d7a3b
Add (incomplete) msim_remove_buddy().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17293
diff
changeset
|
2156 { |
1905859d7a3b
Add (incomplete) msim_remove_buddy().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17293
diff
changeset
|
2157 MsimSession *session; |
17319
4cb842e0649c
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17317
diff
changeset
|
2158 MsimMessage *delbuddy_msg; |
17316
2aff11bb5e72
Several small changes to work towards a working msim_remove_buddy():
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17315
diff
changeset
|
2159 MsimMessage *persist_msg; |
17319
4cb842e0649c
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17317
diff
changeset
|
2160 MsimMessage *blocklist_msg; |
17296
1905859d7a3b
Add (incomplete) msim_remove_buddy().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17293
diff
changeset
|
2161 |
1905859d7a3b
Add (incomplete) msim_remove_buddy().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17293
diff
changeset
|
2162 session = (MsimSession *)gc->proto_data; |
1905859d7a3b
Add (incomplete) msim_remove_buddy().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17293
diff
changeset
|
2163 |
17319
4cb842e0649c
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17317
diff
changeset
|
2164 delbuddy_msg = msim_msg_new(TRUE, |
17296
1905859d7a3b
Add (incomplete) msim_remove_buddy().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17293
diff
changeset
|
2165 "delbuddy", MSIM_TYPE_BOOLEAN, TRUE, |
17297
c2208b64bffb
Change MsimSession.sesskey to an integer (used to be a string), now that
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17296
diff
changeset
|
2166 "sesskey", MSIM_TYPE_INTEGER, session->sesskey, |
17312
962edb051146
Use msim_postprocess_outgoing() to resolve uid for adding and deleting buddies.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17311
diff
changeset
|
2167 /* 'delprofileid' with uid will be inserted here. */ |
962edb051146
Use msim_postprocess_outgoing() to resolve uid for adding and deleting buddies.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17311
diff
changeset
|
2168 NULL); |
962edb051146
Use msim_postprocess_outgoing() to resolve uid for adding and deleting buddies.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17311
diff
changeset
|
2169 /* TODO: free msg */ |
17319
4cb842e0649c
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17317
diff
changeset
|
2170 if (!msim_postprocess_outgoing(session, delbuddy_msg, buddy->name, "delprofileid", NULL)) |
17296
1905859d7a3b
Add (incomplete) msim_remove_buddy().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17293
diff
changeset
|
2171 { |
1905859d7a3b
Add (incomplete) msim_remove_buddy().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17293
diff
changeset
|
2172 purple_notify_error(NULL, NULL, _("Failed to remove buddy"), _("'delbuddy' command failed")); |
1905859d7a3b
Add (incomplete) msim_remove_buddy().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17293
diff
changeset
|
2173 return; |
1905859d7a3b
Add (incomplete) msim_remove_buddy().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17293
diff
changeset
|
2174 } |
1905859d7a3b
Add (incomplete) msim_remove_buddy().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17293
diff
changeset
|
2175 |
17319
4cb842e0649c
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17317
diff
changeset
|
2176 persist_msg = msim_msg_new(TRUE, |
17296
1905859d7a3b
Add (incomplete) msim_remove_buddy().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17293
diff
changeset
|
2177 "persist", MSIM_TYPE_INTEGER, 1, |
17297
c2208b64bffb
Change MsimSession.sesskey to an integer (used to be a string), now that
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17296
diff
changeset
|
2178 "sesskey", MSIM_TYPE_INTEGER, session->sesskey, |
17296
1905859d7a3b
Add (incomplete) msim_remove_buddy().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17293
diff
changeset
|
2179 "cmd", MSIM_TYPE_INTEGER, MSIM_CMD_BIT_ACTION | MSIM_CMD_DELETE, |
1905859d7a3b
Add (incomplete) msim_remove_buddy().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17293
diff
changeset
|
2180 "dsn", MSIM_TYPE_INTEGER, MD_DELETE_BUDDY_DSN, |
1905859d7a3b
Add (incomplete) msim_remove_buddy().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17293
diff
changeset
|
2181 "lid", MSIM_TYPE_INTEGER, MD_DELETE_BUDDY_LID, |
17317
e9dfd3a5d4b6
Remove msim_get_own_uid{,_cb}() - it is not needed, since the login
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17316
diff
changeset
|
2182 "uid", MSIM_TYPE_INTEGER, session->userid, |
17296
1905859d7a3b
Add (incomplete) msim_remove_buddy().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17293
diff
changeset
|
2183 "rid", MSIM_TYPE_INTEGER, session->next_rid++, |
17319
4cb842e0649c
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17317
diff
changeset
|
2184 /* <uid> will be replaced by postprocessing */ |
4cb842e0649c
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17317
diff
changeset
|
2185 "body", MSIM_TYPE_STRING, g_strdup("ContactID=<uid>"), |
17316
2aff11bb5e72
Several small changes to work towards a working msim_remove_buddy():
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17315
diff
changeset
|
2186 NULL); |
2aff11bb5e72
Several small changes to work towards a working msim_remove_buddy():
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17315
diff
changeset
|
2187 |
2aff11bb5e72
Several small changes to work towards a working msim_remove_buddy():
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17315
diff
changeset
|
2188 /* TODO: free msg */ |
17319
4cb842e0649c
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17317
diff
changeset
|
2189 if (!msim_postprocess_outgoing(session, persist_msg, buddy->name, "body", NULL)) |
17296
1905859d7a3b
Add (incomplete) msim_remove_buddy().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17293
diff
changeset
|
2190 { |
1905859d7a3b
Add (incomplete) msim_remove_buddy().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17293
diff
changeset
|
2191 purple_notify_error(NULL, NULL, _("Failed to remove buddy"), _("persist command failed")); |
1905859d7a3b
Add (incomplete) msim_remove_buddy().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17293
diff
changeset
|
2192 return; |
1905859d7a3b
Add (incomplete) msim_remove_buddy().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17293
diff
changeset
|
2193 } |
1905859d7a3b
Add (incomplete) msim_remove_buddy().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17293
diff
changeset
|
2194 |
17319
4cb842e0649c
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17317
diff
changeset
|
2195 blocklist_msg = msim_msg_new(TRUE, |
4cb842e0649c
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17317
diff
changeset
|
2196 "blocklist", MSIM_TYPE_BOOLEAN, TRUE, |
4cb842e0649c
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17317
diff
changeset
|
2197 "sesskey", MSIM_TYPE_INTEGER, session->sesskey, |
4cb842e0649c
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17317
diff
changeset
|
2198 /* TODO: MsimMessage lists */ |
4cb842e0649c
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17317
diff
changeset
|
2199 "idlist", MSIM_TYPE_STRING, g_strdup("a-|<uid>|b-|<uid>"), |
4cb842e0649c
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17317
diff
changeset
|
2200 NULL); |
4cb842e0649c
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17317
diff
changeset
|
2201 |
4cb842e0649c
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17317
diff
changeset
|
2202 if (!msim_postprocess_outgoing(session, blocklist_msg, buddy->name, "idlist", NULL)) |
4cb842e0649c
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17317
diff
changeset
|
2203 { |
4cb842e0649c
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17317
diff
changeset
|
2204 purple_notify_error(NULL, NULL, _("Failed to remove buddy"), _("blocklist command failed")); |
4cb842e0649c
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17317
diff
changeset
|
2205 return; |
4cb842e0649c
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17317
diff
changeset
|
2206 } |
17296
1905859d7a3b
Add (incomplete) msim_remove_buddy().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17293
diff
changeset
|
2207 } |
1905859d7a3b
Add (incomplete) msim_remove_buddy().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17293
diff
changeset
|
2208 |
17324
df93e8773981
Add msim_offline_message() for offline message status. Always return TRUE,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17323
diff
changeset
|
2209 /** Return whether the buddy can be messaged while offline. |
df93e8773981
Add msim_offline_message() for offline message status. Always return TRUE,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17323
diff
changeset
|
2210 * |
17661
38030f1a2e56
Split return type and function name + arguments on to separate lines, to
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17660
diff
changeset
|
2211 * The protocol supports offline messages in just the same way as online |
38030f1a2e56
Split return type and function name + arguments on to separate lines, to
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17660
diff
changeset
|
2212 * messages. |
17324
df93e8773981
Add msim_offline_message() for offline message status. Always return TRUE,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17323
diff
changeset
|
2213 */ |
17661
38030f1a2e56
Split return type and function name + arguments on to separate lines, to
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17660
diff
changeset
|
2214 gboolean |
38030f1a2e56
Split return type and function name + arguments on to separate lines, to
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17660
diff
changeset
|
2215 msim_offline_message(const PurpleBuddy *buddy) |
17324
df93e8773981
Add msim_offline_message() for offline message status. Always return TRUE,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17323
diff
changeset
|
2216 { |
df93e8773981
Add msim_offline_message() for offline message status. Always return TRUE,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17323
diff
changeset
|
2217 return TRUE; |
df93e8773981
Add msim_offline_message() for offline message status. Always return TRUE,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17323
diff
changeset
|
2218 } |
16394 | 2219 |
2220 /** | |
2221 * Callback when input available. | |
2222 * | |
16396 | 2223 * @param gc_uncasted A PurpleConnection pointer. |
16394 | 2224 * @param source File descriptor. |
16396 | 2225 * @param cond PURPLE_INPUT_READ |
16394 | 2226 * |
17306
3a02e7db91c7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17305
diff
changeset
|
2227 * Reads the input, and calls msim_preprocess_incoming() to handle it. |
16394 | 2228 */ |
17661
38030f1a2e56
Split return type and function name + arguments on to separate lines, to
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17660
diff
changeset
|
2229 void |
38030f1a2e56
Split return type and function name + arguments on to separate lines, to
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17660
diff
changeset
|
2230 msim_input_cb(gpointer gc_uncasted, gint source, PurpleInputCondition cond) |
16394 | 2231 { |
16396 | 2232 PurpleConnection *gc; |
2233 PurpleAccount *account; | |
16394 | 2234 MsimSession *session; |
2235 gchar *end; | |
2236 int n; | |
2237 | |
2238 g_return_if_fail(gc_uncasted != NULL); | |
2239 g_return_if_fail(source >= 0); /* Note: 0 is a valid fd */ | |
2240 | |
16738
0fa4a3e9b318
Stylistic improvements - use type *name instead of type* name for pointers
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16736
diff
changeset
|
2241 gc = (PurpleConnection *)(gc_uncasted); |
16396 | 2242 account = purple_connection_get_account(gc); |
16394 | 2243 session = gc->proto_data; |
2244 | |
17266
793301c04e3a
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16738
diff
changeset
|
2245 g_return_if_fail(cond == PURPLE_INPUT_READ); |
17314
948373cbba1c
Add TODO in order to fix msim_tooltip_text.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17313
diff
changeset
|
2246 g_return_if_fail(MSIM_SESSION_VALID(session)); |
16394 | 2247 |
2248 /* Only can handle so much data at once... | |
2249 * If this happens, try recompiling with a higher MSIM_READ_BUF_SIZE. | |
2250 * Should be large enough to hold the largest protocol message. | |
2251 */ | |
2252 if (session->rxoff == MSIM_READ_BUF_SIZE) | |
2253 { | |
16396 | 2254 purple_debug_error("msim", "msim_input_cb: %d-byte read buffer full!\n", |
16394 | 2255 MSIM_READ_BUF_SIZE); |
16728
8f6dcd5e9298
Use _ for translations in msimprpl. See #648.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16727
diff
changeset
|
2256 purple_connection_error(gc, _("Read buffer full")); |
16394 | 2257 return; |
2258 } | |
2259 | |
16396 | 2260 purple_debug_info("msim", "buffer at %d (max %d), reading up to %d\n", |
16404
47e07438f01c
Use g_convert for UTF-16LE conversion instead of converting manually.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16402
diff
changeset
|
2261 session->rxoff, MSIM_READ_BUF_SIZE, |
47e07438f01c
Use g_convert for UTF-16LE conversion instead of converting manually.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16402
diff
changeset
|
2262 MSIM_READ_BUF_SIZE - session->rxoff); |
16394 | 2263 |
2264 /* Read into buffer. On Win32, need recv() not read(). session->fd also holds | |
2265 * the file descriptor, but it sometimes differs from the 'source' parameter. | |
2266 */ | |
2267 n = recv(session->fd, session->rxbuf + session->rxoff, MSIM_READ_BUF_SIZE - session->rxoff, 0); | |
2268 | |
2269 if (n < 0 && errno == EAGAIN) | |
2270 { | |
2271 return; | |
2272 } | |
2273 else if (n < 0) | |
2274 { | |
16396 | 2275 purple_debug_error("msim", "msim_input_cb: read error, ret=%d, " |
16394 | 2276 "error=%s, source=%d, fd=%d (%X))\n", |
2277 n, strerror(errno), source, session->fd, session->fd); | |
17663
814992cefc9c
Add a bunch of debugging to help fix #193.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17662
diff
changeset
|
2278 purple_connection_error(gc, _("Read error")); |
16394 | 2279 return; |
2280 } | |
2281 else if (n == 0) | |
2282 { | |
16396 | 2283 purple_debug_info("msim", "msim_input_cb: server disconnected\n"); |
16728
8f6dcd5e9298
Use _ for translations in msimprpl. See #648.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16727
diff
changeset
|
2284 purple_connection_error(gc, _("Server has disconnected")); |
16394 | 2285 return; |
2286 } | |
2287 | |
2288 /* Null terminate */ | |
2289 session->rxbuf[session->rxoff + n] = 0; | |
2290 | |
17672
d43314277ccc
Remove check in msim_input_cb() for embedded nulls. May be causing #1990.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17670
diff
changeset
|
2291 #ifdef MSIM_CHECK_EMBEDDED_NULLS |
16394 | 2292 /* Check for embedded NULs. I don't handle them, and they shouldn't occur. */ |
2293 if (strlen(session->rxbuf + session->rxoff) != n) | |
2294 { | |
2295 /* Occurs after login, but it is not a null byte. */ | |
16396 | 2296 purple_debug_info("msim", "msim_input_cb: strlen=%d, but read %d bytes" |
16404
47e07438f01c
Use g_convert for UTF-16LE conversion instead of converting manually.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16402
diff
changeset
|
2297 "--null byte encountered?\n", |
47e07438f01c
Use g_convert for UTF-16LE conversion instead of converting manually.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16402
diff
changeset
|
2298 strlen(session->rxbuf + session->rxoff), n); |
16396 | 2299 //purple_connection_error(gc, "Invalid message - null byte on input"); |
16394 | 2300 return; |
2301 } | |
17672
d43314277ccc
Remove check in msim_input_cb() for embedded nulls. May be causing #1990.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17670
diff
changeset
|
2302 #endif |
16394 | 2303 |
2304 session->rxoff += n; | |
16396 | 2305 purple_debug_info("msim", "msim_input_cb: read=%d\n", n); |
16394 | 2306 |
16725
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
2307 #ifdef MSIM_DEBUG_RXBUF |
16407
bb649c52fc19
Replace printf() in MySpaceIM prpl with purple_debug_info().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16406
diff
changeset
|
2308 purple_debug_info("msim", "buf=<%s>\n", session->rxbuf); |
bb649c52fc19
Replace printf() in MySpaceIM prpl with purple_debug_info().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16406
diff
changeset
|
2309 #endif |
16394 | 2310 |
2311 /* Look for \\final\\ end markers. If found, process message. */ | |
2312 while((end = strstr(session->rxbuf, MSIM_FINAL_STRING))) | |
2313 { | |
17266
793301c04e3a
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16738
diff
changeset
|
2314 MsimMessage *msg; |
16394 | 2315 |
16725
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
2316 #ifdef MSIM_DEBUG_RXBUF |
16407
bb649c52fc19
Replace printf() in MySpaceIM prpl with purple_debug_info().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16406
diff
changeset
|
2317 purple_debug_info("msim", "in loop: buf=<%s>\n", session->rxbuf); |
bb649c52fc19
Replace printf() in MySpaceIM prpl with purple_debug_info().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16406
diff
changeset
|
2318 #endif |
16394 | 2319 *end = 0; |
17266
793301c04e3a
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16738
diff
changeset
|
2320 msg = msim_parse(g_strdup(session->rxbuf)); |
793301c04e3a
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16738
diff
changeset
|
2321 if (!msg) |
16394 | 2322 { |
16404
47e07438f01c
Use g_convert for UTF-16LE conversion instead of converting manually.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16402
diff
changeset
|
2323 purple_debug_info("msim", "msim_input_cb: couldn't parse <%s>\n", |
47e07438f01c
Use g_convert for UTF-16LE conversion instead of converting manually.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16402
diff
changeset
|
2324 session->rxbuf); |
16728
8f6dcd5e9298
Use _ for translations in msimprpl. See #648.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16727
diff
changeset
|
2325 purple_connection_error(gc, _("Unparseable message")); |
16394 | 2326 } |
2327 else | |
2328 { | |
17291
d8903e1320a9
Previously, the return value of the processing function and msim_process() told
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17290
diff
changeset
|
2329 /* Process message and then free it (processing function should |
d8903e1320a9
Previously, the return value of the processing function and msim_process() told
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17290
diff
changeset
|
2330 * clone message if it wants to keep it afterwards.) */ |
17306
3a02e7db91c7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17305
diff
changeset
|
2331 if (!msim_preprocess_incoming(session, msg)) |
17291
d8903e1320a9
Previously, the return value of the processing function and msim_process() told
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17290
diff
changeset
|
2332 { |
17306
3a02e7db91c7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17305
diff
changeset
|
2333 msim_msg_dump("msim_input_cb: preprocessing message failed on msg: %s\n", msg); |
17291
d8903e1320a9
Previously, the return value of the processing function and msim_process() told
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17290
diff
changeset
|
2334 } |
d8903e1320a9
Previously, the return value of the processing function and msim_process() told
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17290
diff
changeset
|
2335 msim_msg_free(msg); |
16394 | 2336 } |
2337 | |
2338 /* Move remaining part of buffer to beginning. */ | |
2339 session->rxoff -= strlen(session->rxbuf) + strlen(MSIM_FINAL_STRING); | |
2340 memmove(session->rxbuf, end + strlen(MSIM_FINAL_STRING), | |
2341 MSIM_READ_BUF_SIZE - (end + strlen(MSIM_FINAL_STRING) - session->rxbuf)); | |
2342 | |
2343 /* Clear end of buffer */ | |
2344 //memset(end, 0, MSIM_READ_BUF_SIZE - (end - session->rxbuf)); | |
2345 } | |
2346 } | |
2347 | |
17316
2aff11bb5e72
Several small changes to work towards a working msim_remove_buddy():
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17315
diff
changeset
|
2348 /* Setup a callback, to be called when a reply is received with the returned rid. |
2aff11bb5e72
Several small changes to work towards a working msim_remove_buddy():
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17315
diff
changeset
|
2349 * |
2aff11bb5e72
Several small changes to work towards a working msim_remove_buddy():
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17315
diff
changeset
|
2350 * @param cb The callback, an MSIM_USER_LOOKUP_CB. |
2aff11bb5e72
Several small changes to work towards a working msim_remove_buddy():
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17315
diff
changeset
|
2351 * @param data Arbitrary user data to be passed to callback (probably an MsimMessage *). |
2aff11bb5e72
Several small changes to work towards a working msim_remove_buddy():
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17315
diff
changeset
|
2352 * |
2aff11bb5e72
Several small changes to work towards a working msim_remove_buddy():
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17315
diff
changeset
|
2353 * @return The request/reply ID, used to link replies with requests. Put the rid in your request. |
2aff11bb5e72
Several small changes to work towards a working msim_remove_buddy():
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17315
diff
changeset
|
2354 * |
2aff11bb5e72
Several small changes to work towards a working msim_remove_buddy():
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17315
diff
changeset
|
2355 * TODO: Make more generic and more specific: |
2aff11bb5e72
Several small changes to work towards a working msim_remove_buddy():
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17315
diff
changeset
|
2356 * 1) MSIM_USER_LOOKUP_CB - make it for PERSIST_REPLY, not just user lookup |
2aff11bb5e72
Several small changes to work towards a working msim_remove_buddy():
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17315
diff
changeset
|
2357 * 2) data - make it an MsimMessage? |
2aff11bb5e72
Several small changes to work towards a working msim_remove_buddy():
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17315
diff
changeset
|
2358 */ |
17661
38030f1a2e56
Split return type and function name + arguments on to separate lines, to
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17660
diff
changeset
|
2359 guint |
38030f1a2e56
Split return type and function name + arguments on to separate lines, to
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17660
diff
changeset
|
2360 msim_new_reply_callback(MsimSession *session, MSIM_USER_LOOKUP_CB cb, |
38030f1a2e56
Split return type and function name + arguments on to separate lines, to
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17660
diff
changeset
|
2361 gpointer data) |
17316
2aff11bb5e72
Several small changes to work towards a working msim_remove_buddy():
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17315
diff
changeset
|
2362 { |
2aff11bb5e72
Several small changes to work towards a working msim_remove_buddy():
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17315
diff
changeset
|
2363 guint rid; |
2aff11bb5e72
Several small changes to work towards a working msim_remove_buddy():
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17315
diff
changeset
|
2364 |
2aff11bb5e72
Several small changes to work towards a working msim_remove_buddy():
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17315
diff
changeset
|
2365 rid = session->next_rid++; |
2aff11bb5e72
Several small changes to work towards a working msim_remove_buddy():
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17315
diff
changeset
|
2366 |
2aff11bb5e72
Several small changes to work towards a working msim_remove_buddy():
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17315
diff
changeset
|
2367 g_hash_table_insert(session->user_lookup_cb, GUINT_TO_POINTER(rid), cb); |
2aff11bb5e72
Several small changes to work towards a working msim_remove_buddy():
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17315
diff
changeset
|
2368 g_hash_table_insert(session->user_lookup_cb_data, GUINT_TO_POINTER(rid), data); |
2aff11bb5e72
Several small changes to work towards a working msim_remove_buddy():
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17315
diff
changeset
|
2369 |
2aff11bb5e72
Several small changes to work towards a working msim_remove_buddy():
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17315
diff
changeset
|
2370 return rid; |
2aff11bb5e72
Several small changes to work towards a working msim_remove_buddy():
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17315
diff
changeset
|
2371 } |
2aff11bb5e72
Several small changes to work towards a working msim_remove_buddy():
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17315
diff
changeset
|
2372 |
16394 | 2373 /** |
2374 * Callback when connected. Sets up input handlers. | |
2375 * | |
16396 | 2376 * @param data A PurpleConnection pointer. |
16394 | 2377 * @param source File descriptor. |
2378 * @param error_message | |
2379 */ | |
17661
38030f1a2e56
Split return type and function name + arguments on to separate lines, to
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17660
diff
changeset
|
2380 void |
38030f1a2e56
Split return type and function name + arguments on to separate lines, to
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17660
diff
changeset
|
2381 msim_connect_cb(gpointer data, gint source, const gchar *error_message) |
16394 | 2382 { |
16396 | 2383 PurpleConnection *gc; |
16394 | 2384 MsimSession *session; |
2385 | |
2386 g_return_if_fail(data != NULL); | |
2387 | |
16738
0fa4a3e9b318
Stylistic improvements - use type *name instead of type* name for pointers
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16736
diff
changeset
|
2388 gc = (PurpleConnection *)data; |
17316
2aff11bb5e72
Several small changes to work towards a working msim_remove_buddy():
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17315
diff
changeset
|
2389 session = (MsimSession *)gc->proto_data; |
16394 | 2390 |
2391 if (source < 0) | |
2392 { | |
16728
8f6dcd5e9298
Use _ for translations in msimprpl. See #648.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16727
diff
changeset
|
2393 purple_connection_error(gc, _("Couldn't connect to host")); |
17676
e7612bd6835b
Be more defensive about null pointers, especially null strings in %s format
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17674
diff
changeset
|
2394 purple_connection_error(gc, g_strdup_printf( |
e7612bd6835b
Be more defensive about null pointers, especially null strings in %s format
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17674
diff
changeset
|
2395 _("Couldn't connect to host: %s (%d)"), |
e7612bd6835b
Be more defensive about null pointers, especially null strings in %s format
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17674
diff
changeset
|
2396 error_message ? error_message : "no message given", |
e7612bd6835b
Be more defensive about null pointers, especially null strings in %s format
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17674
diff
changeset
|
2397 source)); |
16394 | 2398 return; |
2399 } | |
2400 | |
2401 session->fd = source; | |
2402 | |
16396 | 2403 gc->inpa = purple_input_add(source, PURPLE_INPUT_READ, msim_input_cb, gc); |
17670
7e4e3f6582d2
Add MSIM_FAKE_SELF_ONLINE preprocessor definition (which I define) to fake
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17669
diff
changeset
|
2404 |
7e4e3f6582d2
Add MSIM_FAKE_SELF_ONLINE preprocessor definition (which I define) to fake
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17669
diff
changeset
|
2405 |
16394 | 2406 } |
2407 | |
2408 /* Session methods */ | |
2409 | |
2410 /** | |
2411 * Create a new MSIM session. | |
2412 * | |
2413 * @param acct The account to create the session from. | |
2414 * | |
2415 * @return Pointer to a new session. Free with msim_session_destroy. | |
2416 */ | |
17661
38030f1a2e56
Split return type and function name + arguments on to separate lines, to
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17660
diff
changeset
|
2417 MsimSession * |
38030f1a2e56
Split return type and function name + arguments on to separate lines, to
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17660
diff
changeset
|
2418 msim_session_new(PurpleAccount *acct) |
16394 | 2419 { |
2420 MsimSession *session; | |
2421 | |
2422 g_return_val_if_fail(acct != NULL, NULL); | |
2423 | |
2424 session = g_new0(MsimSession, 1); | |
2425 | |
2426 session->magic = MSIM_SESSION_STRUCT_MAGIC; | |
2427 session->account = acct; | |
16396 | 2428 session->gc = purple_account_get_connection(acct); |
17670
7e4e3f6582d2
Add MSIM_FAKE_SELF_ONLINE preprocessor definition (which I define) to fake
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17669
diff
changeset
|
2429 session->sesskey = 0; |
7e4e3f6582d2
Add MSIM_FAKE_SELF_ONLINE preprocessor definition (which I define) to fake
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17669
diff
changeset
|
2430 session->userid = 0; |
7e4e3f6582d2
Add MSIM_FAKE_SELF_ONLINE preprocessor definition (which I define) to fake
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17669
diff
changeset
|
2431 session->username = NULL; |
16394 | 2432 session->fd = -1; |
17313
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
2433 |
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
2434 /* TODO: Remove. */ |
16407
bb649c52fc19
Replace printf() in MySpaceIM prpl with purple_debug_info().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16406
diff
changeset
|
2435 session->user_lookup_cb = g_hash_table_new_full(g_direct_hash, |
17280
d3e17c9d16e9
Use MsimMessage for receiving messages everywhere, instead of GHashTable.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17266
diff
changeset
|
2436 g_direct_equal, NULL, NULL); /* do NOT free function pointers! (values) */ |
16407
bb649c52fc19
Replace printf() in MySpaceIM prpl with purple_debug_info().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16406
diff
changeset
|
2437 session->user_lookup_cb_data = g_hash_table_new_full(g_direct_hash, |
17303
ceba4fc06c41
Change msim_send_im_by_userid_cb() to msim_send_im_cb(), and remove
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17300
diff
changeset
|
2438 g_direct_equal, NULL, NULL);/* TODO: we don't know what the values are, |
17280
d3e17c9d16e9
Use MsimMessage for receiving messages everywhere, instead of GHashTable.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17266
diff
changeset
|
2439 they could be integers inside gpointers |
17303
ceba4fc06c41
Change msim_send_im_by_userid_cb() to msim_send_im_cb(), and remove
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17300
diff
changeset
|
2440 or strings, so I don't freed them. |
17280
d3e17c9d16e9
Use MsimMessage for receiving messages everywhere, instead of GHashTable.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17266
diff
changeset
|
2441 Figure this out, once free cache. */ |
16394 | 2442 session->rxoff = 0; |
2443 session->rxbuf = g_new0(gchar, MSIM_READ_BUF_SIZE); | |
16407
bb649c52fc19
Replace printf() in MySpaceIM prpl with purple_debug_info().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16406
diff
changeset
|
2444 session->next_rid = 1; |
16394 | 2445 |
2446 return session; | |
2447 } | |
2448 | |
2449 /** | |
2450 * Free a session. | |
2451 * | |
2452 * @param session The session to destroy. | |
2453 */ | |
17661
38030f1a2e56
Split return type and function name + arguments on to separate lines, to
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17660
diff
changeset
|
2454 void |
38030f1a2e56
Split return type and function name + arguments on to separate lines, to
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17660
diff
changeset
|
2455 msim_session_destroy(MsimSession *session) |
16394 | 2456 { |
2457 g_return_if_fail(MSIM_SESSION_VALID(session)); | |
17663
814992cefc9c
Add a bunch of debugging to help fix #193.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17662
diff
changeset
|
2458 |
16394 | 2459 session->magic = -1; |
2460 | |
2461 g_free(session->rxbuf); | |
17670
7e4e3f6582d2
Add MSIM_FAKE_SELF_ONLINE preprocessor definition (which I define) to fake
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17669
diff
changeset
|
2462 g_free(session->username); |
16394 | 2463 |
17313
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
2464 /* TODO: Remove. */ |
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
2465 g_hash_table_destroy(session->user_lookup_cb); |
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
2466 g_hash_table_destroy(session->user_lookup_cb_data); |
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
2467 |
16394 | 2468 g_free(session); |
2469 } | |
16405
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
2470 |
16394 | 2471 /** |
2472 * Close the connection. | |
2473 * | |
2474 * @param gc The connection. | |
2475 */ | |
17661
38030f1a2e56
Split return type and function name + arguments on to separate lines, to
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17660
diff
changeset
|
2476 void |
38030f1a2e56
Split return type and function name + arguments on to separate lines, to
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17660
diff
changeset
|
2477 msim_close(PurpleConnection *gc) |
16394 | 2478 { |
17314
948373cbba1c
Add TODO in order to fix msim_tooltip_text.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17313
diff
changeset
|
2479 MsimSession *session; |
17293
bfda36bd957a
Add incomplete msim_add_buddy() implementation.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17291
diff
changeset
|
2480 |
17663
814992cefc9c
Add a bunch of debugging to help fix #193.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17662
diff
changeset
|
2481 if (gc == NULL) |
814992cefc9c
Add a bunch of debugging to help fix #193.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17662
diff
changeset
|
2482 return; |
814992cefc9c
Add a bunch of debugging to help fix #193.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17662
diff
changeset
|
2483 |
17314
948373cbba1c
Add TODO in order to fix msim_tooltip_text.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17313
diff
changeset
|
2484 session = (MsimSession *)gc->proto_data; |
17663
814992cefc9c
Add a bunch of debugging to help fix #193.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17662
diff
changeset
|
2485 if (session == NULL) |
814992cefc9c
Add a bunch of debugging to help fix #193.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17662
diff
changeset
|
2486 return; |
814992cefc9c
Add a bunch of debugging to help fix #193.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17662
diff
changeset
|
2487 |
814992cefc9c
Add a bunch of debugging to help fix #193.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17662
diff
changeset
|
2488 gc->proto_data = NULL; |
814992cefc9c
Add a bunch of debugging to help fix #193.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17662
diff
changeset
|
2489 |
814992cefc9c
Add a bunch of debugging to help fix #193.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17662
diff
changeset
|
2490 if (!MSIM_SESSION_VALID(session)) |
814992cefc9c
Add a bunch of debugging to help fix #193.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17662
diff
changeset
|
2491 return; |
814992cefc9c
Add a bunch of debugging to help fix #193.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17662
diff
changeset
|
2492 |
814992cefc9c
Add a bunch of debugging to help fix #193.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17662
diff
changeset
|
2493 if (session->gc->inpa) |
814992cefc9c
Add a bunch of debugging to help fix #193.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17662
diff
changeset
|
2494 purple_input_remove(session->gc->inpa); |
814992cefc9c
Add a bunch of debugging to help fix #193.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17662
diff
changeset
|
2495 |
17314
948373cbba1c
Add TODO in order to fix msim_tooltip_text.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17313
diff
changeset
|
2496 msim_session_destroy(session); |
16394 | 2497 } |
2498 | |
2499 | |
2500 /** | |
2501 * Check if a string is a userid (all numeric). | |
2502 * | |
2503 * @param user The user id, email, or name. | |
2504 * | |
2505 * @return TRUE if is userid, FALSE if not. | |
2506 */ | |
17661
38030f1a2e56
Split return type and function name + arguments on to separate lines, to
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17660
diff
changeset
|
2507 gboolean |
38030f1a2e56
Split return type and function name + arguments on to separate lines, to
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17660
diff
changeset
|
2508 msim_is_userid(const gchar *user) |
16394 | 2509 { |
2510 g_return_val_if_fail(user != NULL, FALSE); | |
2511 | |
2512 return strspn(user, "0123456789") == strlen(user); | |
2513 } | |
2514 | |
2515 /** | |
2516 * Check if a string is an email address (contains an @). | |
2517 * | |
2518 * @param user The user id, email, or name. | |
2519 * | |
2520 * @return TRUE if is an email, FALSE if not. | |
2521 * | |
2522 * This function is not intended to be used as a generic | |
2523 * means of validating email addresses, but to distinguish | |
2524 * between a user represented by an email address from | |
2525 * other forms of identification. | |
2526 */ | |
17661
38030f1a2e56
Split return type and function name + arguments on to separate lines, to
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17660
diff
changeset
|
2527 gboolean |
38030f1a2e56
Split return type and function name + arguments on to separate lines, to
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17660
diff
changeset
|
2528 msim_is_email(const gchar *user) |
16394 | 2529 { |
2530 g_return_val_if_fail(user != NULL, FALSE); | |
2531 | |
2532 return strchr(user, '@') != NULL; | |
2533 } | |
2534 | |
2535 | |
2536 /** | |
2537 * Asynchronously lookup user information, calling callback when receive result. | |
2538 * | |
2539 * @param session | |
17656
61f0b36b9891
Retrieve information for profile ("Get Info") from server, instead of from
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17655
diff
changeset
|
2540 * @param user The user id, email address, or username. Not freed. |
16394 | 2541 * @param cb Callback, called with user information when available. |
2542 * @param data An arbitray data pointer passed to the callback. | |
2543 */ | |
17299
c6305f8845d8
Add TODOs about username/email->userid resolution, use g_return_if_fail() in a few places.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17298
diff
changeset
|
2544 /* TODO: change to not use callbacks */ |
17661
38030f1a2e56
Split return type and function name + arguments on to separate lines, to
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17660
diff
changeset
|
2545 void |
38030f1a2e56
Split return type and function name + arguments on to separate lines, to
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17660
diff
changeset
|
2546 msim_lookup_user(MsimSession *session, const gchar *user, |
38030f1a2e56
Split return type and function name + arguments on to separate lines, to
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17660
diff
changeset
|
2547 MSIM_USER_LOOKUP_CB cb, gpointer data) |
16394 | 2548 { |
2549 gchar *field_name; | |
2550 guint rid, cmd, dsn, lid; | |
2551 | |
2552 g_return_if_fail(MSIM_SESSION_VALID(session)); | |
2553 g_return_if_fail(user != NULL); | |
2554 g_return_if_fail(cb != NULL); | |
2555 | |
17266
793301c04e3a
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16738
diff
changeset
|
2556 purple_debug_info("msim", "msim_lookup_userid: " |
16404
47e07438f01c
Use g_convert for UTF-16LE conversion instead of converting manually.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16402
diff
changeset
|
2557 "asynchronously looking up <%s>\n", user); |
16394 | 2558 |
17312
962edb051146
Use msim_postprocess_outgoing() to resolve uid for adding and deleting buddies.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17311
diff
changeset
|
2559 msim_msg_dump("msim_lookup_user: data=%s\n", (MsimMessage *)data); |
962edb051146
Use msim_postprocess_outgoing() to resolve uid for adding and deleting buddies.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17311
diff
changeset
|
2560 |
16394 | 2561 /* Setup callback. Response will be associated with request using 'rid'. */ |
17316
2aff11bb5e72
Several small changes to work towards a working msim_remove_buddy():
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17315
diff
changeset
|
2562 rid = msim_new_reply_callback(session, cb, data); |
16394 | 2563 |
2564 /* Send request */ | |
2565 | |
17286
58b4d103a5b8
Use symbolic constants for persist messages.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17285
diff
changeset
|
2566 cmd = MSIM_CMD_GET; |
16394 | 2567 |
2568 if (msim_is_userid(user)) | |
2569 { | |
2570 field_name = "UserID"; | |
17286
58b4d103a5b8
Use symbolic constants for persist messages.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17285
diff
changeset
|
2571 dsn = MG_MYSPACE_INFO_BY_ID_DSN; |
58b4d103a5b8
Use symbolic constants for persist messages.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17285
diff
changeset
|
2572 lid = MG_MYSPACE_INFO_BY_ID_LID; |
16394 | 2573 } else if (msim_is_email(user)) { |
2574 field_name = "Email"; | |
17286
58b4d103a5b8
Use symbolic constants for persist messages.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17285
diff
changeset
|
2575 dsn = MG_MYSPACE_INFO_BY_STRING_DSN; |
58b4d103a5b8
Use symbolic constants for persist messages.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17285
diff
changeset
|
2576 lid = MG_MYSPACE_INFO_BY_STRING_LID; |
16394 | 2577 } else { |
2578 field_name = "UserName"; | |
17286
58b4d103a5b8
Use symbolic constants for persist messages.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17285
diff
changeset
|
2579 dsn = MG_MYSPACE_INFO_BY_STRING_DSN; |
58b4d103a5b8
Use symbolic constants for persist messages.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17285
diff
changeset
|
2580 lid = MG_MYSPACE_INFO_BY_STRING_LID; |
16394 | 2581 } |
2582 | |
2583 | |
17291
d8903e1320a9
Previously, the return value of the processing function and msim_process() told
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17290
diff
changeset
|
2584 g_return_if_fail(msim_send(session, |
16736
496855295bd7
Use MsimMessage via msim_send(), instead of msim_send_raw(). This is a more
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16735
diff
changeset
|
2585 "persist", MSIM_TYPE_INTEGER, 1, |
17297
c2208b64bffb
Change MsimSession.sesskey to an integer (used to be a string), now that
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17296
diff
changeset
|
2586 "sesskey", MSIM_TYPE_INTEGER, session->sesskey, |
16736
496855295bd7
Use MsimMessage via msim_send(), instead of msim_send_raw(). This is a more
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16735
diff
changeset
|
2587 "cmd", MSIM_TYPE_INTEGER, 1, |
496855295bd7
Use MsimMessage via msim_send(), instead of msim_send_raw(). This is a more
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16735
diff
changeset
|
2588 "dsn", MSIM_TYPE_INTEGER, dsn, |
17317
e9dfd3a5d4b6
Remove msim_get_own_uid{,_cb}() - it is not needed, since the login
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17316
diff
changeset
|
2589 "uid", MSIM_TYPE_INTEGER, session->userid, |
16736
496855295bd7
Use MsimMessage via msim_send(), instead of msim_send_raw(). This is a more
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16735
diff
changeset
|
2590 "lid", MSIM_TYPE_INTEGER, lid, |
496855295bd7
Use MsimMessage via msim_send(), instead of msim_send_raw(). This is a more
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16735
diff
changeset
|
2591 "rid", MSIM_TYPE_INTEGER, rid, |
496855295bd7
Use MsimMessage via msim_send(), instead of msim_send_raw(). This is a more
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16735
diff
changeset
|
2592 /* TODO: dictionary field type */ |
17676
e7612bd6835b
Be more defensive about null pointers, especially null strings in %s format
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17674
diff
changeset
|
2593 "body", MSIM_TYPE_STRING, |
e7612bd6835b
Be more defensive about null pointers, especially null strings in %s format
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17674
diff
changeset
|
2594 g_strdup_printf("%s=%s", field_name, user), |
17291
d8903e1320a9
Previously, the return value of the processing function and msim_process() told
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17290
diff
changeset
|
2595 NULL)); |
16394 | 2596 } |
2597 | |
2598 | |
2599 /** | |
2600 * Obtain the status text for a buddy. | |
2601 * | |
2602 * @param buddy The buddy to obtain status text for. | |
2603 * | |
17326
f057837085b0
Change to use const gchar * where appropriate.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17325
diff
changeset
|
2604 * @return Status text, or NULL if error. Caller g_free()'s. |
16394 | 2605 * |
2606 */ | |
17661
38030f1a2e56
Split return type and function name + arguments on to separate lines, to
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17660
diff
changeset
|
2607 char * |
38030f1a2e56
Split return type and function name + arguments on to separate lines, to
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17660
diff
changeset
|
2608 msim_status_text(PurpleBuddy *buddy) |
16394 | 2609 { |
2610 MsimSession *session; | |
17332
d198d62c5ff5
Add two boolean options to account dialog, to allow displaying of
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17331
diff
changeset
|
2611 const gchar *display_name, *headline; |
16394 | 2612 |
2613 g_return_val_if_fail(buddy != NULL, NULL); | |
2614 | |
16738
0fa4a3e9b318
Stylistic improvements - use type *name instead of type* name for pointers
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16736
diff
changeset
|
2615 session = (MsimSession *)buddy->account->gc->proto_data; |
16727
cd4a6bd9f69e
Use g_return_if_fail() instead of g_assert(), as to not crash the whole program.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16726
diff
changeset
|
2616 g_return_val_if_fail(MSIM_SESSION_VALID(session), NULL); |
16394 | 2617 |
17332
d198d62c5ff5
Add two boolean options to account dialog, to allow displaying of
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17331
diff
changeset
|
2618 display_name = headline = NULL; |
d198d62c5ff5
Add two boolean options to account dialog, to allow displaying of
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17331
diff
changeset
|
2619 |
d198d62c5ff5
Add two boolean options to account dialog, to allow displaying of
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17331
diff
changeset
|
2620 /* Retrieve display name and/or headline, depending on user preference. */ |
d198d62c5ff5
Add two boolean options to account dialog, to allow displaying of
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17331
diff
changeset
|
2621 if (purple_account_get_bool(session->account, "show_display_name", TRUE)) |
d198d62c5ff5
Add two boolean options to account dialog, to allow displaying of
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17331
diff
changeset
|
2622 { |
d198d62c5ff5
Add two boolean options to account dialog, to allow displaying of
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17331
diff
changeset
|
2623 display_name = purple_blist_node_get_string(&buddy->node, "DisplayName"); |
d198d62c5ff5
Add two boolean options to account dialog, to allow displaying of
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17331
diff
changeset
|
2624 } |
d198d62c5ff5
Add two boolean options to account dialog, to allow displaying of
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17331
diff
changeset
|
2625 |
d198d62c5ff5
Add two boolean options to account dialog, to allow displaying of
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17331
diff
changeset
|
2626 if (purple_account_get_bool(session->account, "show_headline", FALSE)) |
d198d62c5ff5
Add two boolean options to account dialog, to allow displaying of
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17331
diff
changeset
|
2627 { |
d198d62c5ff5
Add two boolean options to account dialog, to allow displaying of
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17331
diff
changeset
|
2628 headline = purple_blist_node_get_string(&buddy->node, "Headline"); |
d198d62c5ff5
Add two boolean options to account dialog, to allow displaying of
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17331
diff
changeset
|
2629 } |
d198d62c5ff5
Add two boolean options to account dialog, to allow displaying of
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17331
diff
changeset
|
2630 |
d198d62c5ff5
Add two boolean options to account dialog, to allow displaying of
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17331
diff
changeset
|
2631 /* Return appropriate combination of display name and/or headline, or neither. */ |
d198d62c5ff5
Add two boolean options to account dialog, to allow displaying of
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17331
diff
changeset
|
2632 |
d198d62c5ff5
Add two boolean options to account dialog, to allow displaying of
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17331
diff
changeset
|
2633 if (display_name && headline) |
d198d62c5ff5
Add two boolean options to account dialog, to allow displaying of
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17331
diff
changeset
|
2634 return g_strconcat(display_name, " ", headline, NULL); |
16394 | 2635 |
17322
6fa345a01dd8
Show buddy information in tooltip text, and the display name for status text.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17320
diff
changeset
|
2636 if (display_name) |
6fa345a01dd8
Show buddy information in tooltip text, and the display name for status text.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17320
diff
changeset
|
2637 return g_strdup(display_name); |
17332
d198d62c5ff5
Add two boolean options to account dialog, to allow displaying of
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17331
diff
changeset
|
2638 |
d198d62c5ff5
Add two boolean options to account dialog, to allow displaying of
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17331
diff
changeset
|
2639 if (headline) |
d198d62c5ff5
Add two boolean options to account dialog, to allow displaying of
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17331
diff
changeset
|
2640 return g_strdup(headline); |
d198d62c5ff5
Add two boolean options to account dialog, to allow displaying of
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17331
diff
changeset
|
2641 |
d198d62c5ff5
Add two boolean options to account dialog, to allow displaying of
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17331
diff
changeset
|
2642 return NULL; |
16394 | 2643 } |
2644 | |
2645 /** | |
2646 * Obtain the tooltip text for a buddy. | |
2647 * | |
2648 * @param buddy Buddy to obtain tooltip text on. | |
2649 * @param user_info Variable modified to have the tooltip text. | |
2650 * @param full TRUE if should obtain full tooltip text. | |
2651 * | |
2652 */ | |
17661
38030f1a2e56
Split return type and function name + arguments on to separate lines, to
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17660
diff
changeset
|
2653 void |
38030f1a2e56
Split return type and function name + arguments on to separate lines, to
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17660
diff
changeset
|
2654 msim_tooltip_text(PurpleBuddy *buddy, PurpleNotifyUserInfo *user_info, |
38030f1a2e56
Split return type and function name + arguments on to separate lines, to
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17660
diff
changeset
|
2655 gboolean full) |
16394 | 2656 { |
17673
d125c3562280
In msim_tooltip_text, do not try to display items with no value. In Linux,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17672
diff
changeset
|
2657 const gchar *str, *str2; |
d125c3562280
In msim_tooltip_text, do not try to display items with no value. In Linux,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17672
diff
changeset
|
2658 gint n; |
d125c3562280
In msim_tooltip_text, do not try to display items with no value. In Linux,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17672
diff
changeset
|
2659 |
16394 | 2660 g_return_if_fail(buddy != NULL); |
2661 g_return_if_fail(user_info != NULL); | |
2662 | |
16396 | 2663 if (PURPLE_BUDDY_IS_ONLINE(buddy)) |
16394 | 2664 { |
2665 MsimSession *session; | |
2666 | |
16738
0fa4a3e9b318
Stylistic improvements - use type *name instead of type* name for pointers
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16736
diff
changeset
|
2667 session = (MsimSession *)buddy->account->gc->proto_data; |
16394 | 2668 |
16727
cd4a6bd9f69e
Use g_return_if_fail() instead of g_assert(), as to not crash the whole program.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16726
diff
changeset
|
2669 g_return_if_fail(MSIM_SESSION_VALID(session)); |
16394 | 2670 |
17322
6fa345a01dd8
Show buddy information in tooltip text, and the display name for status text.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17320
diff
changeset
|
2671 /* TODO: if (full), do something different */ |
17323
fc2ccac8d826
Reorganize the tooltip text, to show more useful information.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17322
diff
changeset
|
2672 |
17673
d125c3562280
In msim_tooltip_text, do not try to display items with no value. In Linux,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17672
diff
changeset
|
2673 /* Useful to identify the account the tooltip refers to. |
d125c3562280
In msim_tooltip_text, do not try to display items with no value. In Linux,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17672
diff
changeset
|
2674 * Other prpls show this. */ |
d125c3562280
In msim_tooltip_text, do not try to display items with no value. In Linux,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17672
diff
changeset
|
2675 str = purple_blist_node_get_string(&buddy->node, "UserName"); |
d125c3562280
In msim_tooltip_text, do not try to display items with no value. In Linux,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17672
diff
changeset
|
2676 if (str) |
d125c3562280
In msim_tooltip_text, do not try to display items with no value. In Linux,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17672
diff
changeset
|
2677 purple_notify_user_info_add_pair(user_info, _("User Name"), str); |
17323
fc2ccac8d826
Reorganize the tooltip text, to show more useful information.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17322
diff
changeset
|
2678 |
fc2ccac8d826
Reorganize the tooltip text, to show more useful information.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17322
diff
changeset
|
2679 /* a/s/l...the vitals */ |
17673
d125c3562280
In msim_tooltip_text, do not try to display items with no value. In Linux,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17672
diff
changeset
|
2680 n = purple_blist_node_get_int(&buddy->node, "Age"); |
d125c3562280
In msim_tooltip_text, do not try to display items with no value. In Linux,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17672
diff
changeset
|
2681 if (n) |
d125c3562280
In msim_tooltip_text, do not try to display items with no value. In Linux,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17672
diff
changeset
|
2682 purple_notify_user_info_add_pair(user_info, _("Age"), |
d125c3562280
In msim_tooltip_text, do not try to display items with no value. In Linux,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17672
diff
changeset
|
2683 g_strdup_printf("%d", n)); |
d125c3562280
In msim_tooltip_text, do not try to display items with no value. In Linux,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17672
diff
changeset
|
2684 |
d125c3562280
In msim_tooltip_text, do not try to display items with no value. In Linux,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17672
diff
changeset
|
2685 str = purple_blist_node_get_string(&buddy->node, "Gender"); |
d125c3562280
In msim_tooltip_text, do not try to display items with no value. In Linux,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17672
diff
changeset
|
2686 if (str) |
d125c3562280
In msim_tooltip_text, do not try to display items with no value. In Linux,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17672
diff
changeset
|
2687 purple_notify_user_info_add_pair(user_info, _("Gender"), str); |
d125c3562280
In msim_tooltip_text, do not try to display items with no value. In Linux,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17672
diff
changeset
|
2688 |
d125c3562280
In msim_tooltip_text, do not try to display items with no value. In Linux,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17672
diff
changeset
|
2689 str = purple_blist_node_get_string(&buddy->node, "Location"); |
d125c3562280
In msim_tooltip_text, do not try to display items with no value. In Linux,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17672
diff
changeset
|
2690 if (str) |
d125c3562280
In msim_tooltip_text, do not try to display items with no value. In Linux,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17672
diff
changeset
|
2691 purple_notify_user_info_add_pair(user_info, _("Location"), str); |
17323
fc2ccac8d826
Reorganize the tooltip text, to show more useful information.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17322
diff
changeset
|
2692 |
fc2ccac8d826
Reorganize the tooltip text, to show more useful information.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17322
diff
changeset
|
2693 /* Other information */ |
17673
d125c3562280
In msim_tooltip_text, do not try to display items with no value. In Linux,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17672
diff
changeset
|
2694 str = purple_blist_node_get_string(&buddy->node, "Headline"); |
d125c3562280
In msim_tooltip_text, do not try to display items with no value. In Linux,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17672
diff
changeset
|
2695 if (str) |
d125c3562280
In msim_tooltip_text, do not try to display items with no value. In Linux,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17672
diff
changeset
|
2696 purple_notify_user_info_add_pair(user_info, _("Headline"), str); |
d125c3562280
In msim_tooltip_text, do not try to display items with no value. In Linux,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17672
diff
changeset
|
2697 |
d125c3562280
In msim_tooltip_text, do not try to display items with no value. In Linux,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17672
diff
changeset
|
2698 str = purple_blist_node_get_string(&buddy->node, "BandName"); |
d125c3562280
In msim_tooltip_text, do not try to display items with no value. In Linux,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17672
diff
changeset
|
2699 str2 = purple_blist_node_get_string(&buddy->node, "SongName"); |
d125c3562280
In msim_tooltip_text, do not try to display items with no value. In Linux,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17672
diff
changeset
|
2700 if (str || str2) |
d125c3562280
In msim_tooltip_text, do not try to display items with no value. In Linux,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17672
diff
changeset
|
2701 purple_notify_user_info_add_pair(user_info, _("Song"), |
17323
fc2ccac8d826
Reorganize the tooltip text, to show more useful information.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17322
diff
changeset
|
2702 g_strdup_printf("%s - %s", |
17673
d125c3562280
In msim_tooltip_text, do not try to display items with no value. In Linux,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17672
diff
changeset
|
2703 str ? str : _("Unknown Artist"), |
d125c3562280
In msim_tooltip_text, do not try to display items with no value. In Linux,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17672
diff
changeset
|
2704 str2 ? str2 : _("Unknown Song"))); |
d125c3562280
In msim_tooltip_text, do not try to display items with no value. In Linux,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17672
diff
changeset
|
2705 |
d125c3562280
In msim_tooltip_text, do not try to display items with no value. In Linux,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17672
diff
changeset
|
2706 n = purple_blist_node_get_int(&buddy->node, "TotalFriends"); |
d125c3562280
In msim_tooltip_text, do not try to display items with no value. In Linux,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17672
diff
changeset
|
2707 if (n) |
d125c3562280
In msim_tooltip_text, do not try to display items with no value. In Linux,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17672
diff
changeset
|
2708 purple_notify_user_info_add_pair(user_info, _("Total Friends"), |
d125c3562280
In msim_tooltip_text, do not try to display items with no value. In Linux,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17672
diff
changeset
|
2709 g_strdup_printf("%d", n)); |
17322
6fa345a01dd8
Show buddy information in tooltip text, and the display name for status text.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17320
diff
changeset
|
2710 |
16394 | 2711 } |
2712 } | |
2713 | |
16396 | 2714 /** Callbacks called by Purple, to access this plugin. */ |
16736
496855295bd7
Use MsimMessage via msim_send(), instead of msim_send_raw(). This is a more
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16735
diff
changeset
|
2715 PurplePluginProtocolInfo prpl_info = |
16394 | 2716 { |
17678
51f54868bbad
Fix typo to allow font face to be displayed correctly on incoming messages.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17677
diff
changeset
|
2717 /* options */ |
51f54868bbad
Fix typo to allow font face to be displayed correctly on incoming messages.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17677
diff
changeset
|
2718 OPT_PROTO_USE_POINTSIZE /* specify font size in sane point size */ |
51f54868bbad
Fix typo to allow font face to be displayed correctly on incoming messages.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17677
diff
changeset
|
2719 /* | OPT_PROTO_MAIL_CHECK - TODO: myspace will notify of mail */ |
51f54868bbad
Fix typo to allow font face to be displayed correctly on incoming messages.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17677
diff
changeset
|
2720 /* | OPT_PROTO_IM_IMAGE - TODO: direct images. */ |
51f54868bbad
Fix typo to allow font face to be displayed correctly on incoming messages.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17677
diff
changeset
|
2721 , |
16394 | 2722 NULL, /* user_splits */ |
2723 NULL, /* protocol_options */ | |
2724 NO_BUDDY_ICONS, /* icon_spec - TODO: eventually should add this */ | |
2725 msim_list_icon, /* list_icon */ | |
2726 NULL, /* list_emblems */ | |
2727 msim_status_text, /* status_text */ | |
2728 msim_tooltip_text, /* tooltip_text */ | |
2729 msim_status_types, /* status_types */ | |
2730 NULL, /* blist_node_menu */ | |
2731 NULL, /* chat_info */ | |
2732 NULL, /* chat_info_defaults */ | |
2733 msim_login, /* login */ | |
2734 msim_close, /* close */ | |
2735 msim_send_im, /* send_im */ | |
2736 NULL, /* set_info */ | |
17290
aa8e70fa1edc
Add, but do not use, incomplete functions for using typing notifications.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17289
diff
changeset
|
2737 msim_send_typing, /* send_typing */ |
17325
1a26b36889dc
Implement msim_get_info() for users on the user's buddy list.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17324
diff
changeset
|
2738 msim_get_info, /* get_info */ |
17679
608e4b47dfae
Allow setting status to away or online.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17678
diff
changeset
|
2739 msim_set_status, /* set_status */ |
16394 | 2740 NULL, /* set_idle */ |
2741 NULL, /* change_passwd */ | |
17296
1905859d7a3b
Add (incomplete) msim_remove_buddy().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17293
diff
changeset
|
2742 msim_add_buddy, /* add_buddy */ |
16394 | 2743 NULL, /* add_buddies */ |
17296
1905859d7a3b
Add (incomplete) msim_remove_buddy().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17293
diff
changeset
|
2744 msim_remove_buddy, /* remove_buddy */ |
16394 | 2745 NULL, /* remove_buddies */ |
2746 NULL, /* add_permit */ | |
2747 NULL, /* add_deny */ | |
2748 NULL, /* rem_permit */ | |
2749 NULL, /* rem_deny */ | |
2750 NULL, /* set_permit_deny */ | |
2751 NULL, /* join_chat */ | |
2752 NULL, /* reject chat invite */ | |
2753 NULL, /* get_chat_name */ | |
2754 NULL, /* chat_invite */ | |
2755 NULL, /* chat_leave */ | |
2756 NULL, /* chat_whisper */ | |
2757 NULL, /* chat_send */ | |
2758 NULL, /* keepalive */ | |
2759 NULL, /* register_user */ | |
2760 NULL, /* get_cb_info */ | |
2761 NULL, /* get_cb_away */ | |
2762 NULL, /* alias_buddy */ | |
2763 NULL, /* group_buddy */ | |
2764 NULL, /* rename_group */ | |
2765 NULL, /* buddy_free */ | |
2766 NULL, /* convo_closed */ | |
2767 NULL, /* normalize */ | |
2768 NULL, /* set_buddy_icon */ | |
2769 NULL, /* remove_group */ | |
2770 NULL, /* get_cb_real_name */ | |
2771 NULL, /* set_chat_topic */ | |
2772 NULL, /* find_blist_chat */ | |
2773 NULL, /* roomlist_get_list */ | |
2774 NULL, /* roomlist_cancel */ | |
2775 NULL, /* roomlist_expand_category */ | |
2776 NULL, /* can_receive_file */ | |
2777 NULL, /* send_file */ | |
2778 NULL, /* new_xfer */ | |
17324
df93e8773981
Add msim_offline_message() for offline message status. Always return TRUE,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17323
diff
changeset
|
2779 msim_offline_message, /* offline_message */ |
16394 | 2780 NULL, /* whiteboard_prpl_ops */ |
17660
cbda7f26d27d
Add a send_raw function, msim_send_really_raw, into the prpl_info struct,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17659
diff
changeset
|
2781 msim_send_really_raw, /* send_raw */ |
16723
3b5037a93807
Add initializers for reserved fields in plugin and prpl structures.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16409
diff
changeset
|
2782 NULL, /* roomlist_room_serialize */ |
3b5037a93807
Add initializers for reserved fields in plugin and prpl structures.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16409
diff
changeset
|
2783 NULL, /* _purple_reserved1 */ |
3b5037a93807
Add initializers for reserved fields in plugin and prpl structures.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16409
diff
changeset
|
2784 NULL, /* _purple_reserved2 */ |
3b5037a93807
Add initializers for reserved fields in plugin and prpl structures.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16409
diff
changeset
|
2785 NULL, /* _purple_reserved3 */ |
3b5037a93807
Add initializers for reserved fields in plugin and prpl structures.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16409
diff
changeset
|
2786 NULL /* _purple_reserved4 */ |
16394 | 2787 }; |
2788 | |
2789 | |
2790 | |
2791 /** Based on MSN's plugin info comments. */ | |
16736
496855295bd7
Use MsimMessage via msim_send(), instead of msim_send_raw(). This is a more
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16735
diff
changeset
|
2792 PurplePluginInfo info = |
16394 | 2793 { |
16396 | 2794 PURPLE_PLUGIN_MAGIC, |
2795 PURPLE_MAJOR_VERSION, | |
2796 PURPLE_MINOR_VERSION, | |
17289
73720427b132
Show online buddies on buddy list as online.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17287
diff
changeset
|
2797 PURPLE_PLUGIN_PROTOCOL, /**< type */ |
73720427b132
Show online buddies on buddy list as online.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17287
diff
changeset
|
2798 NULL, /**< ui_requirement */ |
73720427b132
Show online buddies on buddy list as online.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17287
diff
changeset
|
2799 0, /**< flags */ |
73720427b132
Show online buddies on buddy list as online.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17287
diff
changeset
|
2800 NULL, /**< dependencies */ |
73720427b132
Show online buddies on buddy list as online.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17287
diff
changeset
|
2801 PURPLE_PRIORITY_DEFAULT, /**< priority */ |
16394 | 2802 |
2803 "prpl-myspace", /**< id */ | |
2804 "MySpaceIM", /**< name */ | |
17647
04a00333546a
Add script to produce tarballs and zip archives for releases, for v0.8.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17332
diff
changeset
|
2805 "0.8", /**< version */ |
16394 | 2806 /** summary */ |
2807 "MySpaceIM Protocol Plugin", | |
2808 /** description */ | |
2809 "MySpaceIM Protocol Plugin", | |
17680
d87916bd1d73
Fix email address.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17679
diff
changeset
|
2810 "Jeff Connelly <jeff2@soc.pidgin.im>", /**< author */ |
16394 | 2811 "http://developer.pidgin.im/wiki/MySpaceIM/", /**< homepage */ |
2812 | |
16726
fc80e7b2540d
Check for RC4 in libpurple on plugin initialization.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16725
diff
changeset
|
2813 msim_load, /**< load */ |
16394 | 2814 NULL, /**< unload */ |
2815 NULL, /**< destroy */ | |
2816 NULL, /**< ui_info */ | |
2817 &prpl_info, /**< extra_info */ | |
2818 NULL, /**< prefs_info */ | |
2819 | |
2820 /* msim_actions */ | |
16723
3b5037a93807
Add initializers for reserved fields in plugin and prpl structures.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16409
diff
changeset
|
2821 NULL, |
3b5037a93807
Add initializers for reserved fields in plugin and prpl structures.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16409
diff
changeset
|
2822 |
3b5037a93807
Add initializers for reserved fields in plugin and prpl structures.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16409
diff
changeset
|
2823 NULL, /**< reserved1 */ |
3b5037a93807
Add initializers for reserved fields in plugin and prpl structures.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16409
diff
changeset
|
2824 NULL, /**< reserved2 */ |
3b5037a93807
Add initializers for reserved fields in plugin and prpl structures.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16409
diff
changeset
|
2825 NULL, /**< reserved3 */ |
3b5037a93807
Add initializers for reserved fields in plugin and prpl structures.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16409
diff
changeset
|
2826 NULL /**< reserved4 */ |
16394 | 2827 }; |
2828 | |
17648
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
2829 |
17651
333fe6ac1046
Add msim_unrecognized() to handle unhandled messages.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17650
diff
changeset
|
2830 #ifdef MSIM_SELF_TEST |
17648
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
2831 /** Test functions. |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
2832 * Used to test or try out the internal workings of msimprpl. If you're reading |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
2833 * this code for the first time, these functions can be instructive in how |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
2834 * msimprpl is architected. |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
2835 */ |
17661
38030f1a2e56
Split return type and function name + arguments on to separate lines, to
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17660
diff
changeset
|
2836 void |
17662
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
2837 msim_test_all(void) |
17648
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
2838 { |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
2839 guint failures; |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
2840 |
17662
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
2841 |
17648
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
2842 failures = 0; |
17662
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
2843 failures += msim_test_xml(); |
17648
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
2844 failures += msim_test_msg(); |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
2845 failures += msim_test_escaping(); |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
2846 |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
2847 if (failures) |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
2848 { |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
2849 purple_debug_info("msim", "msim_test_all HAD FAILURES: %d\n", failures); |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
2850 } |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
2851 else |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
2852 { |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
2853 purple_debug_info("msim", "msim_test_all - all tests passed!\n"); |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
2854 } |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
2855 exit(0); |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
2856 } |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
2857 |
17662
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
2858 int |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
2859 msim_test_xml(void) |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
2860 { |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
2861 gchar *msg_text; |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
2862 xmlnode *root, *n; |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
2863 guint failures; |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
2864 char *s; |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
2865 int len; |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
2866 |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
2867 failures = 0; |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
2868 |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
2869 msg_text = "<p><f n=\"Arial\" h=\"12\">woo!</f>xxx<c v='black'>yyy</c></p>"; |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
2870 |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
2871 purple_debug_info("msim", "msim_test_xml: msg_text=%s\n", msg_text); |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
2872 |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
2873 root = xmlnode_from_str(msg_text, -1); |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
2874 if (!root) |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
2875 { |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
2876 purple_debug_info("msim", "there is no root\n"); |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
2877 exit(0); |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
2878 } |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
2879 |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
2880 purple_debug_info("msim", "root name=%s, child name=%s\n", root->name, |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
2881 root->child->name); |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
2882 |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
2883 purple_debug_info("msim", "last child name=%s\n", root->lastchild->name); |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
2884 purple_debug_info("msim", "Root xml=%s\n", |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
2885 xmlnode_to_str(root, &len)); |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
2886 purple_debug_info("msim", "Child xml=%s\n", |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
2887 xmlnode_to_str(root->child, &len)); |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
2888 purple_debug_info("msim", "Lastchild xml=%s\n", |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
2889 xmlnode_to_str(root->lastchild, &len)); |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
2890 purple_debug_info("msim", "Next xml=%s\n", |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
2891 xmlnode_to_str(root->next, &len)); |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
2892 purple_debug_info("msim", "Next data=%s\n", |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
2893 xmlnode_get_data(root->next)); |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
2894 purple_debug_info("msim", "Child->next xml=%s\n", |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
2895 xmlnode_to_str(root->child->next, &len)); |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
2896 |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
2897 for (n = root->child; n; n = n->next) |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
2898 { |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
2899 if (n->name) |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
2900 { |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
2901 purple_debug_info("msim", " ** n=%s\n",n->name); |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
2902 } else { |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
2903 purple_debug_info("msim", " ** n data=%s\n", n->data); |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
2904 } |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
2905 } |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
2906 |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
2907 purple_debug_info("msim", "root data=%s, child data=%s, child 'h'=%s\n", |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
2908 xmlnode_get_data(root), |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
2909 xmlnode_get_data(root->child), |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
2910 xmlnode_get_attrib(root->child, "h")); |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
2911 |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
2912 |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
2913 for (n = root->child; |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
2914 n != NULL; |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
2915 n = n->next) |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
2916 { |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
2917 purple_debug_info("msim", "next name=%s\n", n->name); |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
2918 } |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
2919 |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
2920 s = xmlnode_to_str(root, &len); |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
2921 s[len] = 0; |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
2922 |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
2923 purple_debug_info("msim", "str: %s\n", s); |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
2924 g_free(s); |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
2925 |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
2926 xmlnode_free(root); |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
2927 |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
2928 exit(0); |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
2929 |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
2930 return failures; |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
2931 } |
7b890c79aabf
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
2932 |
17648
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
2933 /** Test MsimMessage for basic functionality. */ |
17661
38030f1a2e56
Split return type and function name + arguments on to separate lines, to
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17660
diff
changeset
|
2934 int |
38030f1a2e56
Split return type and function name + arguments on to separate lines, to
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17660
diff
changeset
|
2935 msim_test_msg(void) |
17648
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
2936 { |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
2937 MsimMessage *msg, *msg_cloned; |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
2938 gchar *packed, *packed_expected, *packed_cloned; |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
2939 guint failures; |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
2940 |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
2941 failures = 0; |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
2942 |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
2943 purple_debug_info("msim", "\n\nTesting MsimMessage\n"); |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
2944 msg = msim_msg_new(FALSE); /* Create a new, empty message. */ |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
2945 |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
2946 /* Append some new elements. */ |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
2947 msg = msim_msg_append(msg, "bx", MSIM_TYPE_BINARY, g_string_new_len(g_strdup("XXX"), 3)); |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
2948 msg = msim_msg_append(msg, "k1", MSIM_TYPE_STRING, g_strdup("v1")); |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
2949 msg = msim_msg_append(msg, "k1", MSIM_TYPE_INTEGER, GUINT_TO_POINTER(42)); |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
2950 msg = msim_msg_append(msg, "k1", MSIM_TYPE_STRING, g_strdup("v43")); |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
2951 msg = msim_msg_append(msg, "k1", MSIM_TYPE_STRING, g_strdup("v52/xxx\\yyy")); |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
2952 msg = msim_msg_append(msg, "k1", MSIM_TYPE_STRING, g_strdup("v7")); |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
2953 msim_msg_dump("msg debug str=%s\n", msg); |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
2954 packed = msim_msg_pack(msg); |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
2955 |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
2956 purple_debug_info("msim", "msg packed=%s\n", packed); |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
2957 |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
2958 packed_expected = "\\bx\\WFhY\\k1\\v1\\k1\\42\\k1" |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
2959 "\\v43\\k1\\v52/1xxx/2yyy\\k1\\v7\\final\\"; |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
2960 |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
2961 if (0 != strcmp(packed, packed_expected)) |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
2962 { |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
2963 purple_debug_info("msim", "!!!(%d), msim_msg_pack not what expected: %s != %s\n", |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
2964 ++failures, packed, packed_expected); |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
2965 } |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
2966 |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
2967 |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
2968 msg_cloned = msim_msg_clone(msg); |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
2969 packed_cloned = msim_msg_pack(msg_cloned); |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
2970 |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
2971 purple_debug_info("msim", "msg cloned=%s\n", packed_cloned); |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
2972 if (0 != strcmp(packed, packed_cloned)) |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
2973 { |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
2974 purple_debug_info("msim", "!!!(%d), msim_msg_pack on cloned message not equal to original: %s != %s\n", |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
2975 ++failures, packed_cloned, packed); |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
2976 } |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
2977 |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
2978 g_free(packed); |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
2979 g_free(packed_cloned); |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
2980 msim_msg_free(msg_cloned); |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
2981 msim_msg_free(msg); |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
2982 |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
2983 return failures; |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
2984 } |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
2985 |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
2986 /** Test protocol-level escaping/unescaping. */ |
17661
38030f1a2e56
Split return type and function name + arguments on to separate lines, to
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17660
diff
changeset
|
2987 int |
38030f1a2e56
Split return type and function name + arguments on to separate lines, to
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17660
diff
changeset
|
2988 msim_test_escaping(void) |
17648
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
2989 { |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
2990 guint failures; |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
2991 gchar *raw, *escaped, *unescaped, *expected; |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
2992 |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
2993 failures = 0; |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
2994 |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
2995 purple_debug_info("msim", "\n\nTesting escaping\n"); |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
2996 |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
2997 raw = "hello/world\\hello/world"; |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
2998 |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
2999 escaped = msim_escape(raw); |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
3000 purple_debug_info("msim", "msim_test_escaping: raw=%s, escaped=%s\n", raw, escaped); |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
3001 expected = "hello/1world/2hello/1world"; |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
3002 if (0 != strcmp(escaped, expected)) |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
3003 { |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
3004 purple_debug_info("msim", "!!!(%d), msim_escape failed: %s != %s\n", |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
3005 ++failures, escaped, expected); |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
3006 } |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
3007 |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
3008 |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
3009 unescaped = msim_unescape(escaped); |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
3010 g_free(escaped); |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
3011 purple_debug_info("msim", "msim_test_escaping: unescaped=%s\n", unescaped); |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
3012 if (0 != strcmp(raw, unescaped)) |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
3013 { |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
3014 purple_debug_info("msim", "!!!(%d), msim_unescape failed: %s != %s\n", |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
3015 ++failures, raw, unescaped); |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
3016 } |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
3017 |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
3018 return failures; |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
3019 } |
17651
333fe6ac1046
Add msim_unrecognized() to handle unhandled messages.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17650
diff
changeset
|
3020 #endif |
17648
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
3021 |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
3022 /** Initialize plugin. */ |
17661
38030f1a2e56
Split return type and function name + arguments on to separate lines, to
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17660
diff
changeset
|
3023 void |
38030f1a2e56
Split return type and function name + arguments on to separate lines, to
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17660
diff
changeset
|
3024 init_plugin(PurplePlugin *plugin) |
16733
a8e8482a2dc6
Clean up a few TODO's.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16731
diff
changeset
|
3025 { |
a8e8482a2dc6
Clean up a few TODO's.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16731
diff
changeset
|
3026 PurpleAccountOption *option; |
17648
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
3027 #ifdef MSIM_SELF_TEST |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
3028 msim_test_all(); |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
3029 #endif /* MSIM_SELF_TEST */ |
16733
a8e8482a2dc6
Clean up a few TODO's.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16731
diff
changeset
|
3030 |
a8e8482a2dc6
Clean up a few TODO's.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16731
diff
changeset
|
3031 /* TODO: default to automatically try different ports. Make the user be |
a8e8482a2dc6
Clean up a few TODO's.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16731
diff
changeset
|
3032 * able to set the first port to try (like LastConnectedPort in Windows client). */ |
a8e8482a2dc6
Clean up a few TODO's.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16731
diff
changeset
|
3033 option = purple_account_option_string_new(_("Connect server"), "server", MSIM_SERVER); |
a8e8482a2dc6
Clean up a few TODO's.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16731
diff
changeset
|
3034 prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option); |
a8e8482a2dc6
Clean up a few TODO's.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16731
diff
changeset
|
3035 |
a8e8482a2dc6
Clean up a few TODO's.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16731
diff
changeset
|
3036 option = purple_account_option_int_new(_("Connect port"), "port", MSIM_PORT); |
a8e8482a2dc6
Clean up a few TODO's.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16731
diff
changeset
|
3037 prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option); |
17332
d198d62c5ff5
Add two boolean options to account dialog, to allow displaying of
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17331
diff
changeset
|
3038 |
17681
5e8c02259c81
Add option to sign on as hidden, or as not (previously, always signed on
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17680
diff
changeset
|
3039 option = purple_account_option_bool_new(_("Sign on as hidden"), "hidden", FALSE); |
5e8c02259c81
Add option to sign on as hidden, or as not (previously, always signed on
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17680
diff
changeset
|
3040 prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option); |
5e8c02259c81
Add option to sign on as hidden, or as not (previously, always signed on
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17680
diff
changeset
|
3041 |
17332
d198d62c5ff5
Add two boolean options to account dialog, to allow displaying of
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17331
diff
changeset
|
3042 option = purple_account_option_bool_new(_("Show display name in status text"), "show_display_name", TRUE); |
d198d62c5ff5
Add two boolean options to account dialog, to allow displaying of
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17331
diff
changeset
|
3043 prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option); |
d198d62c5ff5
Add two boolean options to account dialog, to allow displaying of
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17331
diff
changeset
|
3044 |
d198d62c5ff5
Add two boolean options to account dialog, to allow displaying of
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17331
diff
changeset
|
3045 option = purple_account_option_bool_new(_("Show headline in status text"), "show_headline", TRUE); |
d198d62c5ff5
Add two boolean options to account dialog, to allow displaying of
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17331
diff
changeset
|
3046 prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option); |
16733
a8e8482a2dc6
Clean up a few TODO's.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16731
diff
changeset
|
3047 } |
16394 | 3048 |
16396 | 3049 PURPLE_INIT_PLUGIN(myspace, init_plugin, info); |