Mercurial > pidgin
annotate libpurple/protocols/myspace/myspace.c @ 17648:23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
testing on (so far), MsimMessage and msim_{,un}escape().
author | Jeffrey Connelly <jaconnel@calpoly.edu> |
---|---|
date | Wed, 20 Jun 2007 03:17:46 +0000 |
parents | 04a00333546a |
children | 9cb771adbdea |
rev | line source |
---|---|
16394 | 1 /* MySpaceIM Protocol Plugin |
2 * | |
3 * \author Jeff Connelly | |
4 * | |
16405
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
5 * Copyright (C) 2007, Jeff Connelly <jeff2@homing.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 */ |
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
|
43 gboolean msim_load(PurplePlugin *plugin) |
16726
fc80e7b2540d
Check for RC4 in libpurple on plugin initialization.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16725
diff
changeset
|
44 { |
fc80e7b2540d
Check for RC4 in libpurple on plugin initialization.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16725
diff
changeset
|
45 #ifdef MSIM_USE_PURPLE_RC4 |
fc80e7b2540d
Check for RC4 in libpurple on plugin initialization.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16725
diff
changeset
|
46 /* 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
|
47 if (!purple_ciphers_find_cipher("rc4")) |
fc80e7b2540d
Check for RC4 in libpurple on plugin initialization.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16725
diff
changeset
|
48 { |
fc80e7b2540d
Check for RC4 in libpurple on plugin initialization.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16725
diff
changeset
|
49 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
|
50 purple_notify_error(plugin, _("Missing Cipher"), |
8f6dcd5e9298
Use _ for translations in msimprpl. See #648.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16727
diff
changeset
|
51 _("The RC4 cipher could not be found"), |
8f6dcd5e9298
Use _ for translations in msimprpl. See #648.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16727
diff
changeset
|
52 _("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
|
53 "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
|
54 "plugin will not be loaded.")); |
16726
fc80e7b2540d
Check for RC4 in libpurple on plugin initialization.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16725
diff
changeset
|
55 return FALSE; |
fc80e7b2540d
Check for RC4 in libpurple on plugin initialization.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16725
diff
changeset
|
56 } |
fc80e7b2540d
Check for RC4 in libpurple on plugin initialization.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16725
diff
changeset
|
57 #endif |
fc80e7b2540d
Check for RC4 in libpurple on plugin initialization.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16725
diff
changeset
|
58 return TRUE; |
16394 | 59 } |
60 | |
61 /** | |
62 * Get possible user status types. Based on mockprpl. | |
63 * | |
64 * @return GList of status types. | |
65 */ | |
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
|
66 GList *msim_status_types(PurpleAccount *acct) |
16394 | 67 { |
68 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
|
69 PurpleStatusType *status; |
16394 | 70 |
17266
793301c04e3a
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16738
diff
changeset
|
71 purple_debug_info("myspace", "returning status types\n"); |
16394 | 72 |
73 types = NULL; | |
74 | |
17266
793301c04e3a
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16738
diff
changeset
|
75 /* TODO: Fix these: |
793301c04e3a
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16738
diff
changeset
|
76 * |
793301c04e3a
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16738
diff
changeset
|
77 * g_log: purple_presence_get_active_status: assertion `presence != NULL' failed |
793301c04e3a
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16738
diff
changeset
|
78 * g_log: purple_status_get_name: assertion `status != NULL' failed |
793301c04e3a
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16738
diff
changeset
|
79 * [...] |
793301c04e3a
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16738
diff
changeset
|
80 * |
793301c04e3a
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16738
diff
changeset
|
81 * and |
793301c04e3a
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16738
diff
changeset
|
82 * g_log: purple_presence_set_status_active: assertion `status != NULL' failed |
793301c04e3a
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16738
diff
changeset
|
83 * [...] |
793301c04e3a
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16738
diff
changeset
|
84 */ |
793301c04e3a
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16738
diff
changeset
|
85 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
|
86 types = g_list_append(types, status); |
16394 | 87 |
17266
793301c04e3a
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16738
diff
changeset
|
88 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
|
89 types = g_list_append(types, status); |
16394 | 90 |
17266
793301c04e3a
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16738
diff
changeset
|
91 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
|
92 types = g_list_append(types, status); |
16394 | 93 |
17266
793301c04e3a
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16738
diff
changeset
|
94 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
|
95 types = g_list_append(types, status); |
16394 | 96 |
97 return types; | |
98 } | |
99 | |
16405
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
100 /** |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
101 * 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
|
102 * |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
103 * @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
|
104 * @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
|
105 * |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
106 * @return The base icon name string. |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
107 */ |
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
|
108 const gchar *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
|
109 { |
17326
f057837085b0
Change to use const gchar * where appropriate.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17325
diff
changeset
|
110 /* 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
|
111 * 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
|
112 return "myspace"; |
16405
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
113 } |
16409
1aa62f7368ca
Add escaping and unescaping functions (for /1 and /2).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16407
diff
changeset
|
114 |
17648
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
115 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
|
116 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
|
117 |
16409
1aa62f7368ca
Add escaping and unescaping functions (for /1 and /2).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16407
diff
changeset
|
118 /** |
1aa62f7368ca
Add escaping and unescaping functions (for /1 and /2).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16407
diff
changeset
|
119 * Unescape a protocol message. |
1aa62f7368ca
Add escaping and unescaping functions (for /1 and /2).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16407
diff
changeset
|
120 * |
1aa62f7368ca
Add escaping and unescaping functions (for /1 and /2).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16407
diff
changeset
|
121 * @return The unescaped message. Caller must g_free(). |
1aa62f7368ca
Add escaping and unescaping functions (for /1 and /2).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16407
diff
changeset
|
122 */ |
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
|
123 gchar *msim_unescape(const gchar *msg) |
16409
1aa62f7368ca
Add escaping and unescaping functions (for /1 and /2).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16407
diff
changeset
|
124 { |
1aa62f7368ca
Add escaping and unescaping functions (for /1 and /2).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16407
diff
changeset
|
125 /* TODO: make more elegant, refactor with msim_escape */ |
1aa62f7368ca
Add escaping and unescaping functions (for /1 and /2).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16407
diff
changeset
|
126 gchar *tmp, *ret; |
1aa62f7368ca
Add escaping and unescaping functions (for /1 and /2).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16407
diff
changeset
|
127 |
1aa62f7368ca
Add escaping and unescaping functions (for /1 and /2).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16407
diff
changeset
|
128 tmp = str_replace(msg, "/1", "/"); |
1aa62f7368ca
Add escaping and unescaping functions (for /1 and /2).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16407
diff
changeset
|
129 ret = str_replace(tmp, "/2", "\\"); |
1aa62f7368ca
Add escaping and unescaping functions (for /1 and /2).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16407
diff
changeset
|
130 g_free(tmp); |
1aa62f7368ca
Add escaping and unescaping functions (for /1 and /2).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16407
diff
changeset
|
131 return ret; |
1aa62f7368ca
Add escaping and unescaping functions (for /1 and /2).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16407
diff
changeset
|
132 } |
1aa62f7368ca
Add escaping and unescaping functions (for /1 and /2).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16407
diff
changeset
|
133 |
1aa62f7368ca
Add escaping and unescaping functions (for /1 and /2).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16407
diff
changeset
|
134 /** |
1aa62f7368ca
Add escaping and unescaping functions (for /1 and /2).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16407
diff
changeset
|
135 * Escape a protocol message. |
1aa62f7368ca
Add escaping and unescaping functions (for /1 and /2).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16407
diff
changeset
|
136 * |
1aa62f7368ca
Add escaping and unescaping functions (for /1 and /2).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16407
diff
changeset
|
137 * @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
|
138 */ |
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
|
139 gchar *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
|
140 { |
1aa62f7368ca
Add escaping and unescaping functions (for /1 and /2).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16407
diff
changeset
|
141 /* TODO: make more elegant, refactor with msim_unescape */ |
1aa62f7368ca
Add escaping and unescaping functions (for /1 and /2).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16407
diff
changeset
|
142 gchar *tmp, *ret; |
1aa62f7368ca
Add escaping and unescaping functions (for /1 and /2).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16407
diff
changeset
|
143 |
1aa62f7368ca
Add escaping and unescaping functions (for /1 and /2).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16407
diff
changeset
|
144 tmp = str_replace(msg, "/", "/1"); |
1aa62f7368ca
Add escaping and unescaping functions (for /1 and /2).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16407
diff
changeset
|
145 ret = str_replace(tmp, "\\", "/2"); |
1aa62f7368ca
Add escaping and unescaping functions (for /1 and /2).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16407
diff
changeset
|
146 g_free(tmp); |
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 return ret; |
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 |
1aa62f7368ca
Add escaping and unescaping functions (for /1 and /2).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16407
diff
changeset
|
151 /** |
1aa62f7368ca
Add escaping and unescaping functions (for /1 and /2).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16407
diff
changeset
|
152 * 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
|
153 * |
1aa62f7368ca
Add escaping and unescaping functions (for /1 and /2).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16407
diff
changeset
|
154 * @param str The original string. |
1aa62f7368ca
Add escaping and unescaping functions (for /1 and /2).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16407
diff
changeset
|
155 * @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
|
156 * @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
|
157 * |
1aa62f7368ca
Add escaping and unescaping functions (for /1 and /2).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16407
diff
changeset
|
158 * @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
|
159 * 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
|
160 * |
1aa62f7368ca
Add escaping and unescaping functions (for /1 and /2).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16407
diff
changeset
|
161 * 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
|
162 * 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
|
163 * |
1aa62f7368ca
Add escaping and unescaping functions (for /1 and /2).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16407
diff
changeset
|
164 */ |
16738
0fa4a3e9b318
Stylistic improvements - use type *name instead of type* name for pointers
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16736
diff
changeset
|
165 gchar *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
|
166 { |
17326
f057837085b0
Change to use const gchar * where appropriate.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17325
diff
changeset
|
167 gchar **items; |
f057837085b0
Change to use const gchar * where appropriate.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17325
diff
changeset
|
168 gchar *ret; |
16409
1aa62f7368ca
Add escaping and unescaping functions (for /1 and /2).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16407
diff
changeset
|
169 |
1aa62f7368ca
Add escaping and unescaping functions (for /1 and /2).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16407
diff
changeset
|
170 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
|
171 ret = g_strjoinv(new, items); |
1aa62f7368ca
Add escaping and unescaping functions (for /1 and /2).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16407
diff
changeset
|
172 g_free(items); |
1aa62f7368ca
Add escaping and unescaping functions (for /1 and /2).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16407
diff
changeset
|
173 return ret; |
1aa62f7368ca
Add escaping and unescaping functions (for /1 and /2).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16407
diff
changeset
|
174 } |
1aa62f7368ca
Add escaping and unescaping functions (for /1 and /2).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16407
diff
changeset
|
175 |
1aa62f7368ca
Add escaping and unescaping functions (for /1 and /2).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16407
diff
changeset
|
176 |
16735
52357f6392a4
Add partial implementation of MsimMessage (not used anywhere yet).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16734
diff
changeset
|
177 |
16405
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
178 |
16725
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
179 #ifdef MSIM_DEBUG_MSG |
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
|
180 void print_hash_item(gpointer key, gpointer value, gpointer user_data) |
16394 | 181 { |
17326
f057837085b0
Change to use const gchar * where appropriate.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17325
diff
changeset
|
182 purple_debug_info("msim", "%s=%s\n", (gchar *)key, (gchar *)value); |
16394 | 183 } |
16407
bb649c52fc19
Replace printf() in MySpaceIM prpl with purple_debug_info().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16406
diff
changeset
|
184 #endif |
16394 | 185 |
186 /** | |
16723
3b5037a93807
Add initializers for reserved fields in plugin and prpl structures.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16409
diff
changeset
|
187 * Send raw data to the server. |
16394 | 188 * |
189 * @param session | |
16723
3b5037a93807
Add initializers for reserved fields in plugin and prpl structures.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16409
diff
changeset
|
190 * @param msg The raw data to send. |
16409
1aa62f7368ca
Add escaping and unescaping functions (for /1 and /2).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16407
diff
changeset
|
191 * |
1aa62f7368ca
Add escaping and unescaping functions (for /1 and /2).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16407
diff
changeset
|
192 * @return TRUE if succeeded, FALSE if not. |
16394 | 193 * |
194 */ | |
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
|
195 gboolean msim_send_raw(MsimSession *session, const gchar *msg) |
16394 | 196 { |
16409
1aa62f7368ca
Add escaping and unescaping functions (for /1 and /2).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16407
diff
changeset
|
197 int total_bytes_sent, total_bytes; |
16730
a2e9890a57e0
Implement msim_pack(), msim_sendh(), msim_send().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16729
diff
changeset
|
198 |
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
|
199 purple_debug_info("msim", "msim_send_raw: writing <%s>\n", msg); |
16394 | 200 |
16409
1aa62f7368ca
Add escaping and unescaping functions (for /1 and /2).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16407
diff
changeset
|
201 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
|
202 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
|
203 |
16394 | 204 |
16409
1aa62f7368ca
Add escaping and unescaping functions (for /1 and /2).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16407
diff
changeset
|
205 /* 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
|
206 total_bytes_sent = 0; |
1aa62f7368ca
Add escaping and unescaping functions (for /1 and /2).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16407
diff
changeset
|
207 total_bytes = strlen(msg); |
1aa62f7368ca
Add escaping and unescaping functions (for /1 and /2).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16407
diff
changeset
|
208 do |
1aa62f7368ca
Add escaping and unescaping functions (for /1 and /2).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16407
diff
changeset
|
209 { |
1aa62f7368ca
Add escaping and unescaping functions (for /1 and /2).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16407
diff
changeset
|
210 int bytes_sent; |
1aa62f7368ca
Add escaping and unescaping functions (for /1 and /2).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16407
diff
changeset
|
211 |
1aa62f7368ca
Add escaping and unescaping functions (for /1 and /2).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16407
diff
changeset
|
212 bytes_sent = send(session->fd, msg + total_bytes_sent, |
1aa62f7368ca
Add escaping and unescaping functions (for /1 and /2).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16407
diff
changeset
|
213 total_bytes - total_bytes_sent, 0); |
16394 | 214 |
16409
1aa62f7368ca
Add escaping and unescaping functions (for /1 and /2).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16407
diff
changeset
|
215 if (bytes_sent < 0) |
1aa62f7368ca
Add escaping and unescaping functions (for /1 and /2).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16407
diff
changeset
|
216 { |
16723
3b5037a93807
Add initializers for reserved fields in plugin and prpl structures.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16409
diff
changeset
|
217 purple_debug_info("msim", "msim_send_raw(%s): send() failed: %s\n", |
16409
1aa62f7368ca
Add escaping and unescaping functions (for /1 and /2).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16407
diff
changeset
|
218 msg, g_strerror(errno)); |
1aa62f7368ca
Add escaping and unescaping functions (for /1 and /2).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16407
diff
changeset
|
219 return FALSE; |
1aa62f7368ca
Add escaping and unescaping functions (for /1 and /2).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16407
diff
changeset
|
220 } |
1aa62f7368ca
Add escaping and unescaping functions (for /1 and /2).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16407
diff
changeset
|
221 total_bytes_sent += bytes_sent; |
1aa62f7368ca
Add escaping and unescaping functions (for /1 and /2).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16407
diff
changeset
|
222 |
1aa62f7368ca
Add escaping and unescaping functions (for /1 and /2).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16407
diff
changeset
|
223 } while(total_bytes_sent < total_bytes); |
1aa62f7368ca
Add escaping and unescaping functions (for /1 and /2).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16407
diff
changeset
|
224 return TRUE; |
16394 | 225 } |
226 | |
16405
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
227 /** |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
228 * Start logging in to the MSIM servers. |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
229 * |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
230 * @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
|
231 */ |
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
|
232 void msim_login(PurpleAccount *acct) |
16405
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
233 { |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
234 PurpleConnection *gc; |
17326
f057837085b0
Change to use const gchar * where appropriate.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17325
diff
changeset
|
235 const gchar *host; |
16405
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
236 int port; |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
237 |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
238 g_return_if_fail(acct != NULL); |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
239 |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
240 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
|
241 |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
242 gc = purple_account_get_connection(acct); |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
243 gc->proto_data = msim_session_new(acct); |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
244 |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
245 /* 1. connect to server */ |
16728
8f6dcd5e9298
Use _ for translations in msimprpl. See #648.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16727
diff
changeset
|
246 purple_connection_update_progress(gc, _("Connecting"), |
16405
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
247 0, /* which connection step this is */ |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
248 4); /* total number of steps */ |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
249 |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
250 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
|
251 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
|
252 |
16405
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
253 /* From purple.sf.net/api: |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
254 * """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
|
255 * "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
|
256 * whether through a proxy or not.""" */ |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
257 |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
258 /* Calls msim_connect_cb when connected. */ |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
259 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
|
260 { |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
261 /* 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
|
262 * 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
|
263 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
|
264 return; |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
265 } |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
266 } |
16394 | 267 /** |
268 * Process a login challenge, sending a response. | |
269 * | |
270 * @param session | |
17280
d3e17c9d16e9
Use MsimMessage for receiving messages everywhere, instead of GHashTable.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17266
diff
changeset
|
271 * @param msg Login challenge message. |
16394 | 272 * |
17291
d8903e1320a9
Previously, the return value of the processing function and msim_process() told
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17290
diff
changeset
|
273 * @return TRUE if successful, FALSE if not |
16394 | 274 */ |
17291
d8903e1320a9
Previously, the return value of the processing function and msim_process() told
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17290
diff
changeset
|
275 gboolean msim_login_challenge(MsimSession *session, MsimMessage *msg) |
16394 | 276 { |
16396 | 277 PurpleAccount *account; |
17326
f057837085b0
Change to use const gchar * where appropriate.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17325
diff
changeset
|
278 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
|
279 guint response_len; |
17280
d3e17c9d16e9
Use MsimMessage for receiving messages everywhere, instead of GHashTable.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17266
diff
changeset
|
280 gchar *nc; |
d3e17c9d16e9
Use MsimMessage for receiving messages everywhere, instead of GHashTable.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17266
diff
changeset
|
281 gsize nc_len; |
16394 | 282 |
17291
d8903e1320a9
Previously, the return value of the processing function and msim_process() told
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17290
diff
changeset
|
283 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
|
284 g_return_val_if_fail(msg != NULL, FALSE); |
16394 | 285 |
17291
d8903e1320a9
Previously, the return value of the processing function and msim_process() told
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17290
diff
changeset
|
286 g_return_val_if_fail(msim_msg_get_binary(msg, "nc", &nc, &nc_len), FALSE); |
16394 | 287 |
288 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
|
289 |
d8903e1320a9
Previously, the return value of the processing function and msim_process() told
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17290
diff
changeset
|
290 g_return_val_if_fail(account != NULL, FALSE); |
16394 | 291 |
16728
8f6dcd5e9298
Use _ for translations in msimprpl. See #648.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16727
diff
changeset
|
292 purple_connection_update_progress(session->gc, _("Reading challenge"), 1, 4); |
16394 | 293 |
17280
d3e17c9d16e9
Use MsimMessage for receiving messages everywhere, instead of GHashTable.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17266
diff
changeset
|
294 purple_debug_info("msim", "nc is %d bytes, decoded\n", nc_len); |
16394 | 295 |
296 if (nc_len != 0x40) | |
297 { | |
16396 | 298 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
|
299 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
|
300 return FALSE; |
16394 | 301 } |
302 | |
16728
8f6dcd5e9298
Use _ for translations in msimprpl. See #648.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16727
diff
changeset
|
303 purple_connection_update_progress(session->gc, _("Logging in"), 2, 4); |
16394 | 304 |
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
|
305 response = msim_compute_login_response(nc, account->username, account->password, &response_len); |
16394 | 306 |
307 g_free(nc); | |
308 | |
17291
d8903e1320a9
Previously, the return value of the processing function and msim_process() told
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17290
diff
changeset
|
309 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
|
310 "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
|
311 /* 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
|
312 "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
|
313 /* 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
|
314 "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
|
315 "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
|
316 "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
|
317 "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
|
318 "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
|
319 NULL); |
16394 | 320 } |
321 | |
16725
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
322 #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
|
323 /* 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
|
324 |
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
325 /* |
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
326 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
|
327 |
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
328 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
|
329 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
|
330 |
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
331 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
|
332 |
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
333 $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
|
334 |
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
335 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
|
336 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
|
337 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
|
338 (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
|
339 |
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
340 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
|
341 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
|
342 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
|
343 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
|
344 |
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
345 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
|
346 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
|
347 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
|
348 |
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
349 |
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
350 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
|
351 */ |
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
352 |
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
353 #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
|
354 #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
|
355 |
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
356 /* 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
|
357 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
|
358 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
|
359 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
|
360 |
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
361 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
|
362 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
|
363 */ |
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
364 |
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
365 void 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
|
366 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
|
367 { |
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
368 int ind; |
17326
f057837085b0
Change to use const gchar * where appropriate.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17325
diff
changeset
|
369 unsigned gchar j = 0; |
f057837085b0
Change to use const gchar * where appropriate.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17325
diff
changeset
|
370 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
|
371 |
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
372 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
|
373 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
|
374 |
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
375 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
|
376 { |
17326
f057837085b0
Change to use const gchar * where appropriate.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17325
diff
changeset
|
377 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
|
378 } |
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
379 |
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
380 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
|
381 { |
17326
f057837085b0
Change to use const gchar * where appropriate.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17325
diff
changeset
|
382 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
|
383 |
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
384 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
|
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 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
|
387 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
|
388 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
|
389 } |
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 } |
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
392 |
17326
f057837085b0
Change to use const gchar * where appropriate.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17325
diff
changeset
|
393 void 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
|
394 { |
17326
f057837085b0
Change to use const gchar * where appropriate.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17325
diff
changeset
|
395 guchar *s_box; |
f057837085b0
Change to use const gchar * where appropriate.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17325
diff
changeset
|
396 guchar index_i; |
f057837085b0
Change to use const gchar * where appropriate.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17325
diff
changeset
|
397 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
|
398 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
|
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 /* 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
|
401 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
|
402 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
|
403 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
|
404 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
|
405 |
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
406 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
|
407 { |
17326
f057837085b0
Change to use const gchar * where appropriate.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17325
diff
changeset
|
408 guchar tc; |
f057837085b0
Change to use const gchar * where appropriate.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17325
diff
changeset
|
409 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
|
410 |
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
411 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
|
412 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
|
413 |
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
414 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
|
415 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
|
416 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
|
417 |
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
418 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
|
419 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
|
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 |
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
422 /* 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
|
423 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
|
424 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
|
425 } |
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
426 |
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
427 #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
|
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 |
16394 | 430 /** |
16405
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
431 * 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
|
432 * |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
433 * @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
|
434 * @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
|
435 * @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
|
436 * @param response_len Will be written with response length. |
16394 | 437 * |
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
|
438 * @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
|
439 * when finished. |
16394 | 440 */ |
17326
f057837085b0
Change to use const gchar * where appropriate.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17325
diff
changeset
|
441 const gchar *msim_compute_login_response(const gchar nonce[2 * NONCE_SIZE], |
f057837085b0
Change to use const gchar * where appropriate.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17325
diff
changeset
|
442 const gchar *email, const gchar *password, guint *response_len) |
16394 | 443 { |
16405
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
444 PurpleCipherContext *key_context; |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
445 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
|
446 #ifdef MSIM_USE_PURPLE_RC4 |
16405
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
447 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
|
448 #else |
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
449 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
|
450 #endif |
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
451 |
16405
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
452 guchar hash_pw[HASH_SIZE]; |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
453 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
|
454 gchar *password_utf16le; |
0fa4a3e9b318
Stylistic improvements - use type *name instead of type* name for pointers
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16736
diff
changeset
|
455 guchar *data; |
0fa4a3e9b318
Stylistic improvements - use type *name instead of type* name for pointers
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16736
diff
changeset
|
456 guchar *data_out; |
16405
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
457 size_t data_len, data_out_len; |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
458 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
|
459 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
|
460 #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
|
461 int i; |
bb649c52fc19
Replace printf() in MySpaceIM prpl with purple_debug_info().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16406
diff
changeset
|
462 #endif |
16394 | 463 |
16405
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
464 /* Convert ASCII password to UTF16 little endian */ |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
465 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
|
466 conv_error = NULL; |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
467 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
|
468 &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
|
469 g_assert(conv_bytes_read == strlen(password)); |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
470 if (conv_error != NULL) |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
471 { |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
472 purple_debug_error("msim", |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
473 "g_convert password UTF8->UTF16LE failed: %s", |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
474 conv_error->message); |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
475 g_error_free(conv_error); |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
476 } |
16394 | 477 |
16405
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
478 /* 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
|
479 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
|
480 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
|
481 g_free(password_utf16le); |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
482 |
16725
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
483 #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
|
484 purple_debug_info("msim", "pwhash = "); |
16405
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
485 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
|
486 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
|
487 purple_debug_info("msim", "\n"); |
16405
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
488 #endif |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
489 |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
490 /* key = sha1(sha1(pw) + nonce2) */ |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
491 sha1 = purple_ciphers_find_cipher("sha1"); |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
492 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
|
493 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
|
494 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
|
495 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
|
496 |
16725
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
497 #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
|
498 purple_debug_info("msim", "key = "); |
16405
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
499 for (i = 0; i < sizeof(key); i++) |
16394 | 500 { |
16407
bb649c52fc19
Replace printf() in MySpaceIM prpl with purple_debug_info().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16406
diff
changeset
|
501 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
|
502 } |
16407
bb649c52fc19
Replace printf() in MySpaceIM prpl with purple_debug_info().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16406
diff
changeset
|
503 purple_debug_info("msim", "\n"); |
16405
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
504 #endif |
16394 | 505 |
16725
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
506 #ifdef MSIM_USE_PURPLE_RC4 |
16405
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
507 rc4 = purple_cipher_context_new_by_name("rc4", NULL); |
16394 | 508 |
16405
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
509 /* 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
|
510 * 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
|
511 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
|
512 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
|
513 #endif |
16405
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
514 |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
515 /* TODO: obtain IPs of network interfaces. This is not immediately |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
516 * important because you can still connect and perform basic |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
517 * functions of the protocol. There is also a high chance that the addreses |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
518 * are RFC1918 private, so the servers couldn't do anything with them |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
519 * anyways except make note of that fact. Probably important for any |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
520 * kind of direct connection, or file transfer functionality. |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
521 */ |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
522 /* rc4 encrypt: |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
523 * nonce1+email+IP list */ |
16734
3f53f8f502b2
Replacement magic numbers by symbolic constants.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16733
diff
changeset
|
524 data_len = NONCE_SIZE + strlen(email) |
3f53f8f502b2
Replacement magic numbers by symbolic constants.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16733
diff
changeset
|
525 /* TODO: change to length of IP list */ |
3f53f8f502b2
Replacement magic numbers by symbolic constants.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16733
diff
changeset
|
526 + 25; |
16405
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
527 data = g_new0(guchar, data_len); |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
528 memcpy(data, nonce, NONCE_SIZE); |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
529 memcpy(data + NONCE_SIZE, email, strlen(email)); |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
530 memcpy(data + NONCE_SIZE + strlen(email), |
16725
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
531 /* TODO: IP addresses of network interfaces */ |
16405
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
532 "\x00\x00\x00\x00\x05\x7f\x00\x00\x01\x00\x00\x00\x00\x0a\x00\x00\x40\xc0\xa8\x58\x01\xc0\xa8\x3c\x01", 25); |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
533 |
16725
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
534 #ifdef MSIM_USE_PURPLE_RC4 |
16405
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
535 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
|
536 |
16738
0fa4a3e9b318
Stylistic improvements - use type *name instead of type* name for pointers
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16736
diff
changeset
|
537 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
|
538 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
|
539 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
|
540 #else |
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
541 /* 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
|
542 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
|
543 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
|
544 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
|
545 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
|
546 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
|
547 #endif |
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
548 |
16405
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
549 g_assert(data_out_len == data_len); |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
550 |
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
|
551 #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
|
552 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
|
553 #endif |
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
554 |
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
|
555 *response_len = data_out_len; |
16405
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
556 |
17326
f057837085b0
Change to use const gchar * where appropriate.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17325
diff
changeset
|
557 return (const gchar *)data_out; |
16405
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
558 } |
16394 | 559 |
16405
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
560 /** |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
561 * 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
|
562 * |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
563 * @param gc Connection. |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
564 * @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
|
565 * @param message Instant message text to send. |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
566 * @param flags Flags. |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
567 * |
17310
05723949f75d
Change msim_send_im() to use msim_postprocess_outgoing(), eliminating the
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17309
diff
changeset
|
568 * @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
|
569 * |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
570 * 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
|
571 * 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
|
572 * 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
|
573 */ |
17326
f057837085b0
Change to use const gchar * where appropriate.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17325
diff
changeset
|
574 int msim_send_im(PurpleConnection *gc, const gchar *who, |
f057837085b0
Change to use const gchar * where appropriate.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17325
diff
changeset
|
575 const gchar *message, PurpleMessageFlags flags) |
16405
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
576 { |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
577 MsimSession *session; |
17315
d9aaccef8721
Send typing notifications (tested).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17314
diff
changeset
|
578 |
16405
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
579 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
|
580 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
|
581 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
|
582 |
17300
176b1ba4bafe
Remove 'flags' from send_im_cb_struct - it was never needed.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17299
diff
changeset
|
583 /* '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
|
584 |
17315
d9aaccef8721
Send typing notifications (tested).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17314
diff
changeset
|
585 session = gc->proto_data; |
16405
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
586 |
17326
f057837085b0
Change to use const gchar * where appropriate.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17325
diff
changeset
|
587 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
|
588 { |
05723949f75d
Change msim_send_im() to use msim_postprocess_outgoing(), eliminating the
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17309
diff
changeset
|
589 /* 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
|
590 * 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
|
591 * 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
|
592 * 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
|
593 */ |
17315
d9aaccef8721
Send typing notifications (tested).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17314
diff
changeset
|
594 return 1; |
17310
05723949f75d
Change msim_send_im() to use msim_postprocess_outgoing(), eliminating the
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17309
diff
changeset
|
595 } else { |
17315
d9aaccef8721
Send typing notifications (tested).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17314
diff
changeset
|
596 return -1; |
17310
05723949f75d
Change msim_send_im() to use msim_postprocess_outgoing(), eliminating the
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17309
diff
changeset
|
597 } |
05723949f75d
Change msim_send_im() to use msim_postprocess_outgoing(), eliminating the
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17309
diff
changeset
|
598 /* |
16405
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
599 * TODO: In MySpace, you login with your email address, but don't talk to other |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
600 * 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
|
601 * IM windows when using this plugin: |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
602 * |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
603 * you@example.com: hello |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
604 * some_other_user: what's going on? |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
605 * you@example.com: just coding a prpl |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
606 * |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
607 * 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
|
608 * 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
|
609 */ |
16394 | 610 } |
611 | |
17315
d9aaccef8721
Send typing notifications (tested).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17314
diff
changeset
|
612 /** Send a buddy message of a given type. |
d9aaccef8721
Send typing notifications (tested).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17314
diff
changeset
|
613 * |
d9aaccef8721
Send typing notifications (tested).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17314
diff
changeset
|
614 * @param session |
d9aaccef8721
Send typing notifications (tested).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17314
diff
changeset
|
615 * @param who Username to send message to. |
d9aaccef8721
Send typing notifications (tested).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17314
diff
changeset
|
616 * @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
|
617 * @param type A MSIM_BM_* constant. |
d9aaccef8721
Send typing notifications (tested).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17314
diff
changeset
|
618 * |
d9aaccef8721
Send typing notifications (tested).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17314
diff
changeset
|
619 * 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
|
620 */ |
17326
f057837085b0
Change to use const gchar * where appropriate.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17325
diff
changeset
|
621 gboolean msim_send_bm(MsimSession *session, const gchar *who, const gchar *text, int type) |
17315
d9aaccef8721
Send typing notifications (tested).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17314
diff
changeset
|
622 { |
d9aaccef8721
Send typing notifications (tested).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17314
diff
changeset
|
623 gboolean rc; |
d9aaccef8721
Send typing notifications (tested).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17314
diff
changeset
|
624 MsimMessage *msg; |
17326
f057837085b0
Change to use const gchar * where appropriate.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17325
diff
changeset
|
625 const gchar *from_username; |
f057837085b0
Change to use const gchar * where appropriate.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17325
diff
changeset
|
626 |
f057837085b0
Change to use const gchar * where appropriate.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17325
diff
changeset
|
627 from_username = session->account->username; |
17315
d9aaccef8721
Send typing notifications (tested).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17314
diff
changeset
|
628 |
d9aaccef8721
Send typing notifications (tested).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17314
diff
changeset
|
629 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
|
630 type, from_username, who, text); |
d9aaccef8721
Send typing notifications (tested).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17314
diff
changeset
|
631 |
d9aaccef8721
Send typing notifications (tested).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17314
diff
changeset
|
632 msg = msim_msg_new(TRUE, |
d9aaccef8721
Send typing notifications (tested).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17314
diff
changeset
|
633 "bm", MSIM_TYPE_INTEGER, GUINT_TO_POINTER(type), |
d9aaccef8721
Send typing notifications (tested).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17314
diff
changeset
|
634 "sesskey", MSIM_TYPE_INTEGER, GUINT_TO_POINTER(session->sesskey), |
d9aaccef8721
Send typing notifications (tested).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17314
diff
changeset
|
635 /* 't' will be inserted here */ |
d9aaccef8721
Send typing notifications (tested).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17314
diff
changeset
|
636 "cv", MSIM_TYPE_INTEGER, GUINT_TO_POINTER(MSIM_CLIENT_VERSION), |
d9aaccef8721
Send typing notifications (tested).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17314
diff
changeset
|
637 "msg", MSIM_TYPE_STRING, g_strdup(text), |
d9aaccef8721
Send typing notifications (tested).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17314
diff
changeset
|
638 NULL); |
d9aaccef8721
Send typing notifications (tested).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17314
diff
changeset
|
639 |
17326
f057837085b0
Change to use const gchar * where appropriate.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17325
diff
changeset
|
640 rc = msim_postprocess_outgoing(session, msg, who, "t", "cv"); |
17315
d9aaccef8721
Send typing notifications (tested).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17314
diff
changeset
|
641 |
d9aaccef8721
Send typing notifications (tested).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17314
diff
changeset
|
642 msim_msg_free(msg); |
d9aaccef8721
Send typing notifications (tested).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17314
diff
changeset
|
643 |
d9aaccef8721
Send typing notifications (tested).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17314
diff
changeset
|
644 return rc; |
d9aaccef8721
Send typing notifications (tested).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17314
diff
changeset
|
645 } |
d9aaccef8721
Send typing notifications (tested).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17314
diff
changeset
|
646 |
16394 | 647 /** |
17290
aa8e70fa1edc
Add, but do not use, incomplete functions for using typing notifications.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17289
diff
changeset
|
648 * Handle an incoming instant message. |
16405
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
649 * |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
650 * @param session The session |
17307
e64bcff3b674
Transition msim_incoming_im() to the callbackless infrastructure. Remove
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17306
diff
changeset
|
651 * @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
|
652 * 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
|
653 * |
17291
d8903e1320a9
Previously, the return value of the processing function and msim_process() told
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17290
diff
changeset
|
654 * @return TRUE if successful. |
16405
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
655 */ |
17291
d8903e1320a9
Previously, the return value of the processing function and msim_process() told
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17290
diff
changeset
|
656 gboolean 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
|
657 { |
17307
e64bcff3b674
Transition msim_incoming_im() to the callbackless infrastructure. Remove
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17306
diff
changeset
|
658 gchar *username; |
16405
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
659 |
17307
e64bcff3b674
Transition msim_incoming_im() to the callbackless infrastructure. Remove
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17306
diff
changeset
|
660 username = msim_msg_get_string(msg, "_username"); |
e64bcff3b674
Transition msim_incoming_im() to the callbackless infrastructure. Remove
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17306
diff
changeset
|
661 |
e64bcff3b674
Transition msim_incoming_im() to the callbackless infrastructure. Remove
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17306
diff
changeset
|
662 serv_got_im(session->gc, username, msim_msg_get_string(msg, "msg"), PURPLE_MESSAGE_RECV, time(NULL)); |
16405
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
663 |
17307
e64bcff3b674
Transition msim_incoming_im() to the callbackless infrastructure. Remove
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17306
diff
changeset
|
664 g_free(username); |
e64bcff3b674
Transition msim_incoming_im() to the callbackless infrastructure. Remove
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17306
diff
changeset
|
665 /* TODO: Free copy cloned from msim_incoming_im(). */ |
e64bcff3b674
Transition msim_incoming_im() to the callbackless infrastructure. Remove
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17306
diff
changeset
|
666 //msim_msg_free(msg); |
16405
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
667 |
17307
e64bcff3b674
Transition msim_incoming_im() to the callbackless infrastructure. Remove
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17306
diff
changeset
|
668 return TRUE; |
16405
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
669 } |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
670 |
17290
aa8e70fa1edc
Add, but do not use, incomplete functions for using typing notifications.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17289
diff
changeset
|
671 /** |
aa8e70fa1edc
Add, but do not use, incomplete functions for using typing notifications.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17289
diff
changeset
|
672 * 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
|
673 * |
aa8e70fa1edc
Add, but do not use, incomplete functions for using typing notifications.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17289
diff
changeset
|
674 * @param session |
aa8e70fa1edc
Add, but do not use, incomplete functions for using typing notifications.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17289
diff
changeset
|
675 * @param msg |
aa8e70fa1edc
Add, but do not use, incomplete functions for using typing notifications.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17289
diff
changeset
|
676 * |
17291
d8903e1320a9
Previously, the return value of the processing function and msim_process() told
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17290
diff
changeset
|
677 * @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
|
678 * |
17308
1277a0f82304
Add untested implementation of msim_incoming_action().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17307
diff
changeset
|
679 * UNTESTED |
17290
aa8e70fa1edc
Add, but do not use, incomplete functions for using typing notifications.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17289
diff
changeset
|
680 */ |
17291
d8903e1320a9
Previously, the return value of the processing function and msim_process() told
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17290
diff
changeset
|
681 gboolean 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
|
682 { |
17308
1277a0f82304
Add untested implementation of msim_incoming_action().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17307
diff
changeset
|
683 gchar *msg_text, *username; |
1277a0f82304
Add untested implementation of msim_incoming_action().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17307
diff
changeset
|
684 gboolean rc; |
1277a0f82304
Add untested implementation of msim_incoming_action().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17307
diff
changeset
|
685 |
1277a0f82304
Add untested implementation of msim_incoming_action().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17307
diff
changeset
|
686 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
|
687 username = msim_msg_get_string(msg, "_username"); |
1277a0f82304
Add untested implementation of msim_incoming_action().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17307
diff
changeset
|
688 |
1277a0f82304
Add untested implementation of msim_incoming_action().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17307
diff
changeset
|
689 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
|
690 |
17308
1277a0f82304
Add untested implementation of msim_incoming_action().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17307
diff
changeset
|
691 if (strcmp(msg_text, "%typing%") == 0) |
1277a0f82304
Add untested implementation of msim_incoming_action().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17307
diff
changeset
|
692 { |
1277a0f82304
Add untested implementation of msim_incoming_action().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17307
diff
changeset
|
693 /* TODO: find out if msim repeatedly sends typing messages, so we can give it a timeout. */ |
1277a0f82304
Add untested implementation of msim_incoming_action().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17307
diff
changeset
|
694 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
|
695 rc = TRUE; |
1277a0f82304
Add untested implementation of msim_incoming_action().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17307
diff
changeset
|
696 } else if (strcmp(msg_text, "%stoptyping%") == 0) { |
1277a0f82304
Add untested implementation of msim_incoming_action().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17307
diff
changeset
|
697 serv_got_typing_stopped(session->gc, username); |
1277a0f82304
Add untested implementation of msim_incoming_action().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17307
diff
changeset
|
698 rc = TRUE; |
1277a0f82304
Add untested implementation of msim_incoming_action().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17307
diff
changeset
|
699 } else { |
1277a0f82304
Add untested implementation of msim_incoming_action().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17307
diff
changeset
|
700 /* TODO: make a function, msim_unrecognized(), that logs all unhandled msgs to file. */ |
1277a0f82304
Add untested implementation of msim_incoming_action().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17307
diff
changeset
|
701 purple_debug_info("msim", "msim_incoming_action: for %s, unknown msg %s\n", |
1277a0f82304
Add untested implementation of msim_incoming_action().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17307
diff
changeset
|
702 username, msg_text); |
1277a0f82304
Add untested implementation of msim_incoming_action().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17307
diff
changeset
|
703 rc = FALSE; |
1277a0f82304
Add untested implementation of msim_incoming_action().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17307
diff
changeset
|
704 } |
1277a0f82304
Add untested implementation of msim_incoming_action().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17307
diff
changeset
|
705 |
1277a0f82304
Add untested implementation of msim_incoming_action().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17307
diff
changeset
|
706 |
1277a0f82304
Add untested implementation of msim_incoming_action().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17307
diff
changeset
|
707 g_free(msg_text); |
1277a0f82304
Add untested implementation of msim_incoming_action().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17307
diff
changeset
|
708 g_free(username); |
1277a0f82304
Add untested implementation of msim_incoming_action().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17307
diff
changeset
|
709 |
1277a0f82304
Add untested implementation of msim_incoming_action().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17307
diff
changeset
|
710 return rc; |
17290
aa8e70fa1edc
Add, but do not use, incomplete functions for using typing notifications.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17289
diff
changeset
|
711 } |
aa8e70fa1edc
Add, but do not use, incomplete functions for using typing notifications.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17289
diff
changeset
|
712 |
aa8e70fa1edc
Add, but do not use, incomplete functions for using typing notifications.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17289
diff
changeset
|
713 /** |
aa8e70fa1edc
Add, but do not use, incomplete functions for using typing notifications.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17289
diff
changeset
|
714 * 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
|
715 * |
aa8e70fa1edc
Add, but do not use, incomplete functions for using typing notifications.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17289
diff
changeset
|
716 * @param gc |
aa8e70fa1edc
Add, but do not use, incomplete functions for using typing notifications.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17289
diff
changeset
|
717 * @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
|
718 * @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
|
719 * |
aa8e70fa1edc
Add, but do not use, incomplete functions for using typing notifications.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17289
diff
changeset
|
720 */ |
17326
f057837085b0
Change to use const gchar * where appropriate.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17325
diff
changeset
|
721 unsigned int 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
|
722 { |
17326
f057837085b0
Change to use const gchar * where appropriate.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17325
diff
changeset
|
723 const gchar *typing_str; |
17315
d9aaccef8721
Send typing notifications (tested).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17314
diff
changeset
|
724 MsimSession *session; |
d9aaccef8721
Send typing notifications (tested).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17314
diff
changeset
|
725 |
d9aaccef8721
Send typing notifications (tested).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17314
diff
changeset
|
726 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
|
727 |
aa8e70fa1edc
Add, but do not use, incomplete functions for using typing notifications.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17289
diff
changeset
|
728 switch (state) |
aa8e70fa1edc
Add, but do not use, incomplete functions for using typing notifications.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17289
diff
changeset
|
729 { |
aa8e70fa1edc
Add, but do not use, incomplete functions for using typing notifications.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17289
diff
changeset
|
730 case PURPLE_TYPING: |
aa8e70fa1edc
Add, but do not use, incomplete functions for using typing notifications.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17289
diff
changeset
|
731 typing_str = "%typing%"; |
aa8e70fa1edc
Add, but do not use, incomplete functions for using typing notifications.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17289
diff
changeset
|
732 break; |
aa8e70fa1edc
Add, but do not use, incomplete functions for using typing notifications.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17289
diff
changeset
|
733 |
aa8e70fa1edc
Add, but do not use, incomplete functions for using typing notifications.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17289
diff
changeset
|
734 case PURPLE_TYPED: |
aa8e70fa1edc
Add, but do not use, incomplete functions for using typing notifications.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17289
diff
changeset
|
735 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
|
736 default: |
aa8e70fa1edc
Add, but do not use, incomplete functions for using typing notifications.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17289
diff
changeset
|
737 typing_str = "%stoptyping%"; |
aa8e70fa1edc
Add, but do not use, incomplete functions for using typing notifications.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17289
diff
changeset
|
738 break; |
aa8e70fa1edc
Add, but do not use, incomplete functions for using typing notifications.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17289
diff
changeset
|
739 } |
aa8e70fa1edc
Add, but do not use, incomplete functions for using typing notifications.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17289
diff
changeset
|
740 |
17309
25a55b52855a
Add, but do not use, two new functions to postprocess outgoing messages
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17308
diff
changeset
|
741 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
|
742 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
|
743 return 0; |
aa8e70fa1edc
Add, but do not use, incomplete functions for using typing notifications.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17289
diff
changeset
|
744 } |
16405
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
745 |
17325
1a26b36889dc
Implement msim_get_info() for users on the user's buddy list.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17324
diff
changeset
|
746 /** Retrieve a user's profile. */ |
17326
f057837085b0
Change to use const gchar * where appropriate.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17325
diff
changeset
|
747 void msim_get_info(PurpleConnection *gc, const gchar *name) |
17325
1a26b36889dc
Implement msim_get_info() for users on the user's buddy list.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17324
diff
changeset
|
748 { |
1a26b36889dc
Implement msim_get_info() for users on the user's buddy list.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17324
diff
changeset
|
749 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
|
750 PurpleBuddy *buddy; |
1a26b36889dc
Implement msim_get_info() for users on the user's buddy list.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17324
diff
changeset
|
751 MsimSession *session; |
1a26b36889dc
Implement msim_get_info() for users on the user's buddy list.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17324
diff
changeset
|
752 |
1a26b36889dc
Implement msim_get_info() for users on the user's buddy list.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17324
diff
changeset
|
753 session = (MsimSession *)gc->proto_data; |
1a26b36889dc
Implement msim_get_info() for users on the user's buddy list.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17324
diff
changeset
|
754 |
1a26b36889dc
Implement msim_get_info() for users on the user's buddy list.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17324
diff
changeset
|
755 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
|
756 |
1a26b36889dc
Implement msim_get_info() for users on the user's buddy list.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17324
diff
changeset
|
757 buddy = purple_find_buddy(session->account, name); |
1a26b36889dc
Implement msim_get_info() for users on the user's buddy list.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17324
diff
changeset
|
758 if (!buddy) |
1a26b36889dc
Implement msim_get_info() for users on the user's buddy list.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17324
diff
changeset
|
759 { |
1a26b36889dc
Implement msim_get_info() for users on the user's buddy list.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17324
diff
changeset
|
760 /* TODO: profile of buddies not on blist! */ |
1a26b36889dc
Implement msim_get_info() for users on the user's buddy list.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17324
diff
changeset
|
761 purple_notify_user_info_add_pair(user_info, NULL, |
1a26b36889dc
Implement msim_get_info() for users on the user's buddy list.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17324
diff
changeset
|
762 "Sorry, currently user information can only be retrieved from users on your buddy list."); |
1a26b36889dc
Implement msim_get_info() for users on the user's buddy list.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17324
diff
changeset
|
763 purple_notify_userinfo(gc, name, user_info, NULL, NULL); |
1a26b36889dc
Implement msim_get_info() for users on the user's buddy list.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17324
diff
changeset
|
764 purple_notify_user_info_destroy(user_info); |
1a26b36889dc
Implement msim_get_info() for users on the user's buddy list.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17324
diff
changeset
|
765 return; |
1a26b36889dc
Implement msim_get_info() for users on the user's buddy list.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17324
diff
changeset
|
766 } |
1a26b36889dc
Implement msim_get_info() for users on the user's buddy list.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17324
diff
changeset
|
767 |
1a26b36889dc
Implement msim_get_info() for users on the user's buddy list.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17324
diff
changeset
|
768 |
1a26b36889dc
Implement msim_get_info() for users on the user's buddy list.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17324
diff
changeset
|
769 /* Identification */ |
1a26b36889dc
Implement msim_get_info() for users on the user's buddy list.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17324
diff
changeset
|
770 purple_notify_user_info_add_pair(user_info, "User Name", |
1a26b36889dc
Implement msim_get_info() for users on the user's buddy list.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17324
diff
changeset
|
771 purple_blist_node_get_string(&buddy->node, "UserName")); |
1a26b36889dc
Implement msim_get_info() for users on the user's buddy list.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17324
diff
changeset
|
772 |
1a26b36889dc
Implement msim_get_info() for users on the user's buddy list.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17324
diff
changeset
|
773 |
1a26b36889dc
Implement msim_get_info() for users on the user's buddy list.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17324
diff
changeset
|
774 purple_notify_user_info_add_pair(user_info, "User ID", |
1a26b36889dc
Implement msim_get_info() for users on the user's buddy list.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17324
diff
changeset
|
775 g_strdup_printf("%d", purple_blist_node_get_int(&buddy->node, "UserID"))); |
1a26b36889dc
Implement msim_get_info() for users on the user's buddy list.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17324
diff
changeset
|
776 |
1a26b36889dc
Implement msim_get_info() for users on the user's buddy list.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17324
diff
changeset
|
777 purple_notify_user_info_add_pair(user_info, "Display Name", |
1a26b36889dc
Implement msim_get_info() for users on the user's buddy list.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17324
diff
changeset
|
778 purple_blist_node_get_string(&buddy->node, "DisplayName")); |
1a26b36889dc
Implement msim_get_info() for users on the user's buddy list.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17324
diff
changeset
|
779 |
1a26b36889dc
Implement msim_get_info() for users on the user's buddy list.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17324
diff
changeset
|
780 |
1a26b36889dc
Implement msim_get_info() for users on the user's buddy list.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17324
diff
changeset
|
781 /* a/s/l...the vitals */ |
1a26b36889dc
Implement msim_get_info() for users on the user's buddy list.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17324
diff
changeset
|
782 purple_notify_user_info_add_pair(user_info, "Age", |
1a26b36889dc
Implement msim_get_info() for users on the user's buddy list.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17324
diff
changeset
|
783 g_strdup_printf("%d", purple_blist_node_get_int(&buddy->node, "Age"))); |
1a26b36889dc
Implement msim_get_info() for users on the user's buddy list.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17324
diff
changeset
|
784 |
1a26b36889dc
Implement msim_get_info() for users on the user's buddy list.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17324
diff
changeset
|
785 purple_notify_user_info_add_pair(user_info, "Gender", |
1a26b36889dc
Implement msim_get_info() for users on the user's buddy list.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17324
diff
changeset
|
786 purple_blist_node_get_string(&buddy->node, "Gender")); |
1a26b36889dc
Implement msim_get_info() for users on the user's buddy list.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17324
diff
changeset
|
787 |
1a26b36889dc
Implement msim_get_info() for users on the user's buddy list.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17324
diff
changeset
|
788 purple_notify_user_info_add_pair(user_info, "Location", |
1a26b36889dc
Implement msim_get_info() for users on the user's buddy list.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17324
diff
changeset
|
789 purple_blist_node_get_string(&buddy->node, "Location")); |
1a26b36889dc
Implement msim_get_info() for users on the user's buddy list.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17324
diff
changeset
|
790 |
1a26b36889dc
Implement msim_get_info() for users on the user's buddy list.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17324
diff
changeset
|
791 /* Other information */ |
1a26b36889dc
Implement msim_get_info() for users on the user's buddy list.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17324
diff
changeset
|
792 if (purple_blist_node_get_string(&buddy->node, "Headline")) |
1a26b36889dc
Implement msim_get_info() for users on the user's buddy list.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17324
diff
changeset
|
793 purple_notify_user_info_add_pair(user_info, "Headline", |
1a26b36889dc
Implement msim_get_info() for users on the user's buddy list.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17324
diff
changeset
|
794 purple_blist_node_get_string(&buddy->node, "Headline")); |
1a26b36889dc
Implement msim_get_info() for users on the user's buddy list.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17324
diff
changeset
|
795 |
1a26b36889dc
Implement msim_get_info() for users on the user's buddy list.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17324
diff
changeset
|
796 purple_notify_user_info_add_pair(user_info, "Song", |
1a26b36889dc
Implement msim_get_info() for users on the user's buddy list.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17324
diff
changeset
|
797 g_strdup_printf("%s - %s", |
1a26b36889dc
Implement msim_get_info() for users on the user's buddy list.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17324
diff
changeset
|
798 purple_blist_node_get_string(&buddy->node, "BandName"), |
1a26b36889dc
Implement msim_get_info() for users on the user's buddy list.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17324
diff
changeset
|
799 purple_blist_node_get_string(&buddy->node, "SongName"))); |
1a26b36889dc
Implement msim_get_info() for users on the user's buddy list.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17324
diff
changeset
|
800 |
1a26b36889dc
Implement msim_get_info() for users on the user's buddy list.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17324
diff
changeset
|
801 purple_notify_user_info_add_pair(user_info, "Total Friends", |
1a26b36889dc
Implement msim_get_info() for users on the user's buddy list.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17324
diff
changeset
|
802 g_strdup_printf("%d", purple_blist_node_get_int(&buddy->node, "TotalFriends"))); |
1a26b36889dc
Implement msim_get_info() for users on the user's buddy list.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17324
diff
changeset
|
803 |
1a26b36889dc
Implement msim_get_info() for users on the user's buddy list.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17324
diff
changeset
|
804 |
1a26b36889dc
Implement msim_get_info() for users on the user's buddy list.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17324
diff
changeset
|
805 purple_notify_userinfo(gc, name, user_info, NULL, NULL); |
1a26b36889dc
Implement msim_get_info() for users on the user's buddy list.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17324
diff
changeset
|
806 purple_notify_user_info_destroy(user_info); |
1a26b36889dc
Implement msim_get_info() for users on the user's buddy list.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17324
diff
changeset
|
807 } |
1a26b36889dc
Implement msim_get_info() for users on the user's buddy list.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17324
diff
changeset
|
808 |
17306
3a02e7db91c7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17305
diff
changeset
|
809 /** 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
|
810 * |
3a02e7db91c7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17305
diff
changeset
|
811 * @param session |
3a02e7db91c7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17305
diff
changeset
|
812 * @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
|
813 * @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
|
814 */ |
3a02e7db91c7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17305
diff
changeset
|
815 static void msim_incoming_resolved(MsimSession *session, MsimMessage *userinfo, gpointer data) |
3a02e7db91c7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17305
diff
changeset
|
816 { |
3a02e7db91c7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17305
diff
changeset
|
817 gchar *body_str; |
3a02e7db91c7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17305
diff
changeset
|
818 GHashTable *body; |
3a02e7db91c7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17305
diff
changeset
|
819 gchar *username; |
3a02e7db91c7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17305
diff
changeset
|
820 MsimMessage *msg; |
3a02e7db91c7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17305
diff
changeset
|
821 |
3a02e7db91c7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17305
diff
changeset
|
822 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
|
823 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
|
824 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
|
825 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
|
826 g_free(body_str); |
3a02e7db91c7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17305
diff
changeset
|
827 |
3a02e7db91c7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17305
diff
changeset
|
828 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
|
829 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
|
830 |
3a02e7db91c7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17305
diff
changeset
|
831 msg = (MsimMessage *)data; |
3a02e7db91c7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17305
diff
changeset
|
832 /* 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
|
833 * 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
|
834 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
|
835 |
3a02e7db91c7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17305
diff
changeset
|
836 msim_process(session, msg); |
3a02e7db91c7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17305
diff
changeset
|
837 |
17307
e64bcff3b674
Transition msim_incoming_im() to the callbackless infrastructure. Remove
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17306
diff
changeset
|
838 /* 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
|
839 //XXX msim_msg_free(msg); |
3a02e7db91c7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17305
diff
changeset
|
840 g_hash_table_destroy(body); |
3a02e7db91c7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17305
diff
changeset
|
841 } |
3a02e7db91c7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17305
diff
changeset
|
842 |
17314
948373cbba1c
Add TODO in order to fix msim_tooltip_text.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17313
diff
changeset
|
843 #ifdef _MSIM_UID2USERNAME_WORKS |
17313
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
844 /* 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
|
845 * |
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
846 * @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
|
847 * |
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
848 * @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
|
849 * |
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
850 * 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
|
851 */ |
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
852 static const gchar *msim_uid2username_from_blist(MsimSession *session, guint wanted_uid) |
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
853 { |
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
854 GSList *buddies, *buddies_head; |
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
855 |
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
856 for (buddies = buddies_head = purple_find_buddies(session->account, NULL); |
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
857 buddies; |
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
858 buddies = g_slist_next(buddies)) |
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
859 { |
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
860 PurpleBuddy *buddy; |
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
861 guint uid; |
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
862 gchar *name; |
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
863 |
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
864 buddy = buddies->data; |
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
865 |
17322
6fa345a01dd8
Show buddy information in tooltip text, and the display name for status text.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17320
diff
changeset
|
866 uid = purple_blist_node_get_int(&buddy->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
|
867 |
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
868 /* 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
|
869 /* 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
|
870 |
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
871 /* 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
|
872 * 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
|
873 name = purple_buddy_get_name(buddy); /* crash */ |
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
874 /* 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
|
875 |
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
876 /* 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
|
877 /* 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
|
878 |
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
879 /* crash = |
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
880 *** 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
|
881 ======= Backtrace: ========= |
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
882 /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
|
883 /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
|
884 /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
|
885 /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
|
886 /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
|
887 /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
|
888 /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
|
889 /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
|
890 /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
|
891 /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
|
892 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
|
893 /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
|
894 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
|
895 |
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
896 or: |
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
897 *** 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
|
898 (gdb) bt |
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
899 #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
|
900 #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
|
901 #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
|
902 #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
|
903 #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
|
904 #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
|
905 #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
|
906 #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
|
907 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
|
908 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
|
909 #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
|
910 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
|
911 |
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
912 |
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
913 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
|
914 */ |
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
915 |
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
916 |
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
917 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
|
918 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
|
919 |
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
920 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
|
921 { |
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
922 g_slist_free(buddies_head); |
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
923 |
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
924 return name; |
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
925 } |
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
926 } |
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
927 |
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
928 g_slist_free(buddies_head); |
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
929 return NULL; |
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
930 } |
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
931 |
17314
948373cbba1c
Add TODO in order to fix msim_tooltip_text.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17313
diff
changeset
|
932 #endif |
948373cbba1c
Add TODO in order to fix msim_tooltip_text.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17313
diff
changeset
|
933 |
17306
3a02e7db91c7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17305
diff
changeset
|
934 /** 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
|
935 * |
3a02e7db91c7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17305
diff
changeset
|
936 * @param session |
3a02e7db91c7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17305
diff
changeset
|
937 * @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
|
938 */ |
3a02e7db91c7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17305
diff
changeset
|
939 gboolean msim_preprocess_incoming(MsimSession *session, MsimMessage *msg) |
3a02e7db91c7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17305
diff
changeset
|
940 { |
3a02e7db91c7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17305
diff
changeset
|
941 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
|
942 { |
17313
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
943 guint uid; |
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
944 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
|
945 |
17306
3a02e7db91c7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17305
diff
changeset
|
946 /* '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
|
947 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
|
948 |
17313
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
949 /* 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
|
950 * it crashes for unknown reasons, memory realloc error. */ |
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
951 //#define _MSIM_UID2USERNAME_WORKS |
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
952 #ifdef _MSIM_UID2USERNAME_WORKS |
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
953 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
|
954 #else |
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
955 username = NULL; |
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
956 #endif |
17306
3a02e7db91c7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17305
diff
changeset
|
957 |
17313
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
958 if (username) |
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
959 { |
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
960 /* 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
|
961 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
|
962 username); |
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
963 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
|
964 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
|
965 |
17313
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
966 } else { |
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
967 /* 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
|
968 /* 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
|
969 purple_debug_info("msim", "msim_incoming: sending lookup, setting up callback\n"); |
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
970 msim_lookup_user(session, msim_msg_get_string(msg, "f"), msim_incoming_resolved, msim_msg_clone(msg)); |
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
971 |
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
972 /* indeterminate */ |
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
973 return TRUE; |
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
974 } |
17306
3a02e7db91c7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17305
diff
changeset
|
975 } else { |
3a02e7db91c7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17305
diff
changeset
|
976 /* 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
|
977 return msim_process(session, msg); |
3a02e7db91c7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17305
diff
changeset
|
978 } |
3a02e7db91c7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17305
diff
changeset
|
979 } |
3a02e7db91c7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17305
diff
changeset
|
980 |
16405
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
981 /** |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
982 * Process a message. |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
983 * |
17306
3a02e7db91c7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17305
diff
changeset
|
984 * @param session |
3a02e7db91c7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17305
diff
changeset
|
985 * @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
|
986 * |
17291
d8903e1320a9
Previously, the return value of the processing function and msim_process() told
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17290
diff
changeset
|
987 * @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
|
988 */ |
17306
3a02e7db91c7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17305
diff
changeset
|
989 gboolean msim_process(MsimSession *session, MsimMessage *msg) |
16405
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
990 { |
17306
3a02e7db91c7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17305
diff
changeset
|
991 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
|
992 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
|
993 |
16725
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
994 #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
|
995 { |
17298
9c5b1dc7404f
Change msim_msg_debug_string() to msim_msg_dump(), which prints the string
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17297
diff
changeset
|
996 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
|
997 } |
16407
bb649c52fc19
Replace printf() in MySpaceIM prpl with purple_debug_info().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16406
diff
changeset
|
998 #endif |
16405
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
999 |
17280
d3e17c9d16e9
Use MsimMessage for receiving messages everywhere, instead of GHashTable.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17266
diff
changeset
|
1000 if (msim_msg_get(msg, "nc")) |
16405
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
1001 { |
17280
d3e17c9d16e9
Use MsimMessage for receiving messages everywhere, instead of GHashTable.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17266
diff
changeset
|
1002 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
|
1003 } else if (msim_msg_get(msg, "sesskey")) { |
16405
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
1004 |
17306
3a02e7db91c7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17305
diff
changeset
|
1005 purple_connection_update_progress(session->gc, _("Connected"), 3, 4); |
16405
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
1006 |
17297
c2208b64bffb
Change MsimSession.sesskey to an integer (used to be a string), now that
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17296
diff
changeset
|
1007 session->sesskey = msim_msg_get_integer(msg, "sesskey"); |
c2208b64bffb
Change MsimSession.sesskey to an integer (used to be a string), now that
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17296
diff
changeset
|
1008 purple_debug_info("msim", "SESSKEY=<%d>\n", session->sesskey); |
16405
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
1009 |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
1010 /* Comes with: proof,profileid,userid,uniquenick -- all same values |
17323
fc2ccac8d826
Reorganize the tooltip text, to show more useful information.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17322
diff
changeset
|
1011 * some of the time, but can vary. This is our own user ID. */ |
17316
2aff11bb5e72
Several small changes to work towards a working msim_remove_buddy():
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17315
diff
changeset
|
1012 session->userid = msim_msg_get_integer(msg, "userid"); |
16405
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
1013 |
17323
fc2ccac8d826
Reorganize the tooltip text, to show more useful information.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17322
diff
changeset
|
1014 /* TODO: fake our own userid being online */ |
fc2ccac8d826
Reorganize the tooltip text, to show more useful information.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17322
diff
changeset
|
1015 |
17306
3a02e7db91c7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17305
diff
changeset
|
1016 purple_connection_set_state(session->gc, PURPLE_CONNECTED); |
16405
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
1017 |
17291
d8903e1320a9
Previously, the return value of the processing function and msim_process() told
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17290
diff
changeset
|
1018 return TRUE; |
17280
d3e17c9d16e9
Use MsimMessage for receiving messages everywhere, instead of GHashTable.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17266
diff
changeset
|
1019 } 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
|
1020 guint bm; |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
1021 |
17280
d3e17c9d16e9
Use MsimMessage for receiving messages everywhere, instead of GHashTable.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17266
diff
changeset
|
1022 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
|
1023 switch (bm) |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
1024 { |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
1025 case MSIM_BM_STATUS: |
17280
d3e17c9d16e9
Use MsimMessage for receiving messages everywhere, instead of GHashTable.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17266
diff
changeset
|
1026 return msim_status(session, msg); |
16405
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
1027 case MSIM_BM_INSTANT: |
17280
d3e17c9d16e9
Use MsimMessage for receiving messages everywhere, instead of GHashTable.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17266
diff
changeset
|
1028 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
|
1029 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
|
1030 return msim_incoming_action(session, msg); |
16405
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
1031 default: |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
1032 /* 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
|
1033 * purposes during development. */ |
17280
d3e17c9d16e9
Use MsimMessage for receiving messages everywhere, instead of GHashTable.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17266
diff
changeset
|
1034 return msim_incoming_im(session, msg); |
16405
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
1035 } |
17280
d3e17c9d16e9
Use MsimMessage for receiving messages everywhere, instead of GHashTable.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17266
diff
changeset
|
1036 } 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
|
1037 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
|
1038 } 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
|
1039 return msim_error(session, msg); |
d3e17c9d16e9
Use MsimMessage for receiving messages everywhere, instead of GHashTable.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17266
diff
changeset
|
1040 } else if (msim_msg_get(msg, "ka")) { |
16405
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
1041 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
|
1042 return TRUE; |
16405
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
1043 } else { |
16407
bb649c52fc19
Replace printf() in MySpaceIM prpl with purple_debug_info().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16406
diff
changeset
|
1044 /* TODO: dump unknown msgs to file, so user can send them to me |
bb649c52fc19
Replace printf() in MySpaceIM prpl with purple_debug_info().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16406
diff
changeset
|
1045 * if they wish, to help add support for new messages (inspired |
bb649c52fc19
Replace printf() in MySpaceIM prpl with purple_debug_info().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16406
diff
changeset
|
1046 * by Alexandr Shutko, who maintains OSCAR protocol documentation). */ |
bb649c52fc19
Replace printf() in MySpaceIM prpl with purple_debug_info().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16406
diff
changeset
|
1047 purple_debug_info("msim", "msim_process: unhandled message\n"); |
17291
d8903e1320a9
Previously, the return value of the processing function and msim_process() told
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17290
diff
changeset
|
1048 return FALSE; |
16405
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
1049 } |
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
1050 } |
17266
793301c04e3a
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16738
diff
changeset
|
1051 |
17322
6fa345a01dd8
Show buddy information in tooltip text, and the display name for status text.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17320
diff
changeset
|
1052 /** Store an field of information about a buddy. */ |
6fa345a01dd8
Show buddy information in tooltip text, and the display name for status text.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17320
diff
changeset
|
1053 void msim_store_buddy_info_each(gpointer key, gpointer value, gpointer 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
|
1054 { |
6fa345a01dd8
Show buddy information in tooltip text, and the display name for status text.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17320
diff
changeset
|
1055 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
|
1056 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
|
1057 |
6fa345a01dd8
Show buddy information in tooltip text, and the display name for status text.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17320
diff
changeset
|
1058 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
|
1059 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
|
1060 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
|
1061 |
6fa345a01dd8
Show buddy information in tooltip text, and the display name for status text.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17320
diff
changeset
|
1062 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
|
1063 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
|
1064 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
|
1065 { |
6fa345a01dd8
Show buddy information in tooltip text, and the display name for status text.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17320
diff
changeset
|
1066 /* 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
|
1067 * 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
|
1068 * 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
|
1069 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
|
1070 } else { |
6fa345a01dd8
Show buddy information in tooltip text, and the display name for status text.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17320
diff
changeset
|
1071 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
|
1072 } |
6fa345a01dd8
Show buddy information in tooltip text, and the display name for status text.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17320
diff
changeset
|
1073 } |
6fa345a01dd8
Show buddy information in tooltip text, and the display name for status text.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17320
diff
changeset
|
1074 |
6fa345a01dd8
Show buddy information in tooltip text, and the display name for status text.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17320
diff
changeset
|
1075 /** 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
|
1076 * |
6fa345a01dd8
Show buddy information in tooltip text, and the display name for status text.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17320
diff
changeset
|
1077 * @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
|
1078 * @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
|
1079 * |
6fa345a01dd8
Show buddy information in tooltip text, and the display name for status text.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17320
diff
changeset
|
1080 * 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
|
1081 */ |
6fa345a01dd8
Show buddy information in tooltip text, and the display name for status text.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17320
diff
changeset
|
1082 gboolean msim_store_buddy_info(MsimSession *session, MsimMessage *msg) |
6fa345a01dd8
Show buddy information in tooltip text, and the display name for status text.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17320
diff
changeset
|
1083 { |
6fa345a01dd8
Show buddy information in tooltip text, and the display name for status text.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17320
diff
changeset
|
1084 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
|
1085 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
|
1086 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
|
1087 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
|
1088 |
6fa345a01dd8
Show buddy information in tooltip text, and the display name for status text.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17320
diff
changeset
|
1089 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
|
1090 |
6fa345a01dd8
Show buddy information in tooltip text, and the display name for status text.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17320
diff
changeset
|
1091 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
|
1092 |
6fa345a01dd8
Show buddy information in tooltip text, and the display name for status text.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17320
diff
changeset
|
1093 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
|
1094 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
|
1095 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
|
1096 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
|
1097 |
6fa345a01dd8
Show buddy information in tooltip text, and the display name for status text.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17320
diff
changeset
|
1098 /* 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
|
1099 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
|
1100 |
6fa345a01dd8
Show buddy information in tooltip text, and the display name for status text.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17320
diff
changeset
|
1101 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
|
1102 { |
6fa345a01dd8
Show buddy information in tooltip text, and the display name for status text.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17320
diff
changeset
|
1103 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
|
1104 "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
|
1105 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
|
1106 } |
6fa345a01dd8
Show buddy information in tooltip text, and the display name for status text.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17320
diff
changeset
|
1107 |
6fa345a01dd8
Show buddy information in tooltip text, and the display name for status text.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17320
diff
changeset
|
1108 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
|
1109 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
|
1110 |
6fa345a01dd8
Show buddy information in tooltip text, and the display name for status text.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17320
diff
changeset
|
1111 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
|
1112 |
6fa345a01dd8
Show buddy information in tooltip text, and the display name for status text.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17320
diff
changeset
|
1113 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
|
1114 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
|
1115 { |
6fa345a01dd8
Show buddy information in tooltip text, and the display name for status text.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17320
diff
changeset
|
1116 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
|
1117 } |
6fa345a01dd8
Show buddy information in tooltip text, and the display name for status text.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17320
diff
changeset
|
1118 |
6fa345a01dd8
Show buddy information in tooltip text, and the display name for status text.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17320
diff
changeset
|
1119 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
|
1120 } |
6fa345a01dd8
Show buddy information in tooltip text, and the display name for status text.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17320
diff
changeset
|
1121 |
16405
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
1122 /** |
17290
aa8e70fa1edc
Add, but do not use, incomplete functions for using typing notifications.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17289
diff
changeset
|
1123 * Process a persistance message reply from the server. |
16394 | 1124 * |
1125 * @param session | |
17280
d3e17c9d16e9
Use MsimMessage for receiving messages everywhere, instead of GHashTable.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17266
diff
changeset
|
1126 * @param msg Message reply from server. |
16394 | 1127 * |
17291
d8903e1320a9
Previously, the return value of the processing function and msim_process() told
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17290
diff
changeset
|
1128 * @return TRUE if successful. |
16394 | 1129 */ |
17291
d8903e1320a9
Previously, the return value of the processing function and msim_process() told
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17290
diff
changeset
|
1130 gboolean msim_process_reply(MsimSession *session, MsimMessage *msg) |
16394 | 1131 { |
17291
d8903e1320a9
Previously, the return value of the processing function and msim_process() told
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17290
diff
changeset
|
1132 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
|
1133 g_return_val_if_fail(msg != NULL, FALSE); |
16394 | 1134 |
17280
d3e17c9d16e9
Use MsimMessage for receiving messages everywhere, instead of GHashTable.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17266
diff
changeset
|
1135 if (msim_msg_get(msg, "rid")) /* msim_lookup_user sets callback for here */ |
16394 | 1136 { |
1137 MSIM_USER_LOOKUP_CB cb; | |
1138 gpointer data; | |
1139 guint rid; | |
17314
948373cbba1c
Add TODO in order to fix msim_tooltip_text.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17313
diff
changeset
|
1140 |
17322
6fa345a01dd8
Show buddy information in tooltip text, and the display name for status text.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17320
diff
changeset
|
1141 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
|
1142 |
17322
6fa345a01dd8
Show buddy information in tooltip text, and the display name for status text.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17320
diff
changeset
|
1143 rid = msim_msg_get_integer(msg, "rid"); |
16394 | 1144 |
1145 /* If a callback is registered for this userid lookup, call it. */ | |
1146 cb = g_hash_table_lookup(session->user_lookup_cb, GUINT_TO_POINTER(rid)); | |
1147 data = g_hash_table_lookup(session->user_lookup_cb_data, GUINT_TO_POINTER(rid)); | |
1148 | |
1149 if (cb) | |
1150 { | |
16404
47e07438f01c
Use g_convert for UTF-16LE conversion instead of converting manually.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16402
diff
changeset
|
1151 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
|
1152 "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
|
1153 /* 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
|
1154 cb(session, msim_msg_clone(msg), data); |
16394 | 1155 g_hash_table_remove(session->user_lookup_cb, GUINT_TO_POINTER(rid)); |
1156 g_hash_table_remove(session->user_lookup_cb_data, GUINT_TO_POINTER(rid)); | |
1157 } else { | |
16404
47e07438f01c
Use g_convert for UTF-16LE conversion instead of converting manually.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16402
diff
changeset
|
1158 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
|
1159 "msim_process_body: no callback for rid %d\n", rid); |
16394 | 1160 } |
1161 } | |
17291
d8903e1320a9
Previously, the return value of the processing function and msim_process() told
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17290
diff
changeset
|
1162 |
d8903e1320a9
Previously, the return value of the processing function and msim_process() told
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17290
diff
changeset
|
1163 return TRUE; |
16394 | 1164 } |
1165 | |
1166 /** | |
1167 * Handle an error from the server. | |
1168 * | |
1169 * @param session | |
17280
d3e17c9d16e9
Use MsimMessage for receiving messages everywhere, instead of GHashTable.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17266
diff
changeset
|
1170 * @param msg The message. |
16394 | 1171 * |
17291
d8903e1320a9
Previously, the return value of the processing function and msim_process() told
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17290
diff
changeset
|
1172 * @return TRUE if successfully reported error. |
16394 | 1173 */ |
17291
d8903e1320a9
Previously, the return value of the processing function and msim_process() told
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17290
diff
changeset
|
1174 gboolean msim_error(MsimSession *session, MsimMessage *msg) |
16394 | 1175 { |
17280
d3e17c9d16e9
Use MsimMessage for receiving messages everywhere, instead of GHashTable.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17266
diff
changeset
|
1176 gchar *errmsg, *full_errmsg; |
d3e17c9d16e9
Use MsimMessage for receiving messages everywhere, instead of GHashTable.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17266
diff
changeset
|
1177 guint err; |
16394 | 1178 |
17291
d8903e1320a9
Previously, the return value of the processing function and msim_process() told
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17290
diff
changeset
|
1179 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
|
1180 g_return_val_if_fail(msg != NULL, FALSE); |
16394 | 1181 |
17280
d3e17c9d16e9
Use MsimMessage for receiving messages everywhere, instead of GHashTable.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17266
diff
changeset
|
1182 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
|
1183 errmsg = msim_msg_get_string(msg, "errmsg"); |
16394 | 1184 |
17280
d3e17c9d16e9
Use MsimMessage for receiving messages everywhere, instead of GHashTable.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17266
diff
changeset
|
1185 full_errmsg = g_strdup_printf(_("Protocol error, code %d: %s"), err, errmsg); |
d3e17c9d16e9
Use MsimMessage for receiving messages everywhere, instead of GHashTable.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17266
diff
changeset
|
1186 |
d3e17c9d16e9
Use MsimMessage for receiving messages everywhere, instead of GHashTable.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17266
diff
changeset
|
1187 g_free(errmsg); |
16394 | 1188 |
16396 | 1189 purple_debug_info("msim", "msim_error: %s\n", full_errmsg); |
16394 | 1190 |
17291
d8903e1320a9
Previously, the return value of the processing function and msim_process() told
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17290
diff
changeset
|
1191 /* TODO: do something with the error # (localization of errmsg?) */ |
16728
8f6dcd5e9298
Use _ for translations in msimprpl. See #648.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16727
diff
changeset
|
1192 purple_notify_error(session->account, g_strdup(_("MySpaceIM Error")), |
16394 | 1193 full_errmsg, NULL); |
1194 | |
17291
d8903e1320a9
Previously, the return value of the processing function and msim_process() told
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17290
diff
changeset
|
1195 /* Destroy session if fatal. */ |
17280
d3e17c9d16e9
Use MsimMessage for receiving messages everywhere, instead of GHashTable.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17266
diff
changeset
|
1196 if (msim_msg_get(msg, "fatal")) |
16394 | 1197 { |
17296
1905859d7a3b
Add (incomplete) msim_remove_buddy().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17293
diff
changeset
|
1198 purple_debug_info("msim", "fatal error, closing\n"); |
16396 | 1199 purple_connection_error(session->gc, full_errmsg); |
17329
4205f33b658f
Fix crash when re-logging in.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17326
diff
changeset
|
1200 |
4205f33b658f
Fix crash when re-logging in.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17326
diff
changeset
|
1201 msim_close(session->gc); |
16394 | 1202 } |
1203 | |
17291
d8903e1320a9
Previously, the return value of the processing function and msim_process() told
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17290
diff
changeset
|
1204 return TRUE; |
16394 | 1205 } |
1206 | |
17306
3a02e7db91c7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17305
diff
changeset
|
1207 /** |
3a02e7db91c7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17305
diff
changeset
|
1208 * Process incoming status messages. |
3a02e7db91c7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17305
diff
changeset
|
1209 * |
3a02e7db91c7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17305
diff
changeset
|
1210 * @param session |
3a02e7db91c7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17305
diff
changeset
|
1211 * @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
|
1212 * |
3a02e7db91c7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17305
diff
changeset
|
1213 * @return TRUE if successful. |
3a02e7db91c7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17305
diff
changeset
|
1214 */ |
3a02e7db91c7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17305
diff
changeset
|
1215 gboolean msim_status(MsimSession *session, MsimMessage *msg) |
16394 | 1216 { |
16396 | 1217 PurpleBuddyList *blist; |
1218 PurpleBuddy *buddy; | |
1219 //PurpleStatus *status; | |
16394 | 1220 gchar **status_array; |
1221 GList *list; | |
17289
73720427b132
Show online buddies on buddy list as online.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17287
diff
changeset
|
1222 gchar *status_headline; |
16394 | 1223 gchar *status_str; |
17289
73720427b132
Show online buddies on buddy list as online.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17287
diff
changeset
|
1224 gint i, status_code, purple_status_code; |
16394 | 1225 gchar *username; |
1226 | |
17306
3a02e7db91c7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17305
diff
changeset
|
1227 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
|
1228 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
|
1229 |
6476a55a9542
msim_status_cb() now takes a MsimMessage *, just like msim_send_im_cb() and
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17304
diff
changeset
|
1230 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
|
1231 g_return_val_if_fail(status_str != NULL, FALSE); |
16394 | 1232 |
17306
3a02e7db91c7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17305
diff
changeset
|
1233 msim_msg_dump("msim_status msg=%s\n", msg); |
16394 | 1234 |
17306
3a02e7db91c7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17305
diff
changeset
|
1235 /* 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
|
1236 username = msim_msg_get_string(msg, "_username"); |
16394 | 1237 /* Note: DisplayName doesn't seem to be resolvable. It could be displayed on |
1238 * the buddy list, if the UserID was stored along with it. */ | |
1239 | |
17306
3a02e7db91c7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17305
diff
changeset
|
1240 if (username == NULL) |
3a02e7db91c7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17305
diff
changeset
|
1241 { |
3a02e7db91c7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17305
diff
changeset
|
1242 g_free(status_str); |
3a02e7db91c7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17305
diff
changeset
|
1243 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
|
1244 } |
16394 | 1245 |
16404
47e07438f01c
Use g_convert for UTF-16LE conversion instead of converting manually.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16402
diff
changeset
|
1246 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
|
1247 "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
|
1248 username, status_str); |
16394 | 1249 |
17289
73720427b132
Show online buddies on buddy list as online.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17287
diff
changeset
|
1250 /* TODO: generic functions to split into a GList, part of MsimMessage */ |
16394 | 1251 status_array = g_strsplit(status_str, "|", 0); |
1252 for (list = NULL, i = 0; | |
1253 status_array[i]; | |
1254 i++) | |
1255 { | |
17289
73720427b132
Show online buddies on buddy list as online.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17287
diff
changeset
|
1256 /* 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
|
1257 * 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
|
1258 */ |
16394 | 1259 list = g_list_append(list, status_array[i]); |
1260 } | |
1261 | |
17289
73720427b132
Show online buddies on buddy list as online.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17287
diff
changeset
|
1262 /* Example fields: |
73720427b132
Show online buddies on buddy list as online.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17287
diff
changeset
|
1263 * |s|0|ss|Offline |
73720427b132
Show online buddies on buddy list as online.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17287
diff
changeset
|
1264 * |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
|
1265 * |
73720427b132
Show online buddies on buddy list as online.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17287
diff
changeset
|
1266 * 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
|
1267 */ |
73720427b132
Show online buddies on buddy list as online.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17287
diff
changeset
|
1268 |
73720427b132
Show online buddies on buddy list as online.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17287
diff
changeset
|
1269 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
|
1270 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
|
1271 status_headline = g_list_nth_data(list, MSIM_STATUS_ORDINAL_HEADLINE); |
16394 | 1272 |
16396 | 1273 blist = purple_get_blist(); |
16394 | 1274 |
1275 /* Add buddy if not found */ | |
16396 | 1276 buddy = purple_find_buddy(session->account, username); |
16394 | 1277 if (!buddy) |
1278 { | |
16396 | 1279 /* TODO: purple aliases, userids and usernames */ |
16404
47e07438f01c
Use g_convert for UTF-16LE conversion instead of converting manually.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16402
diff
changeset
|
1280 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
|
1281 "msim_status: making new buddy for %s\n", username); |
16396 | 1282 buddy = purple_buddy_new(session->account, username, NULL); |
16394 | 1283 |
16396 | 1284 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
|
1285 |
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
|
1286 /* 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
|
1287 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
|
1288 |
fc2ccac8d826
Reorganize the tooltip text, to show more useful information.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17322
diff
changeset
|
1289 msim_store_buddy_info(session, msg); |
16394 | 1290 } else { |
16396 | 1291 purple_debug_info("msim", "msim_status: found buddy %s\n", username); |
16394 | 1292 } |
1293 | |
17323
fc2ccac8d826
Reorganize the tooltip text, to show more useful information.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17322
diff
changeset
|
1294 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
|
1295 |
73720427b132
Show online buddies on buddy list as online.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17287
diff
changeset
|
1296 /* Set user status */ |
73720427b132
Show online buddies on buddy list as online.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17287
diff
changeset
|
1297 switch (status_code) |
73720427b132
Show online buddies on buddy list as online.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17287
diff
changeset
|
1298 { |
73720427b132
Show online buddies on buddy list as online.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17287
diff
changeset
|
1299 case 1: purple_status_code = PURPLE_STATUS_AVAILABLE; |
73720427b132
Show online buddies on buddy list as online.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17287
diff
changeset
|
1300 break; |
73720427b132
Show online buddies on buddy list as online.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17287
diff
changeset
|
1301 case 0: purple_status_code = PURPLE_STATUS_OFFLINE; |
73720427b132
Show online buddies on buddy list as online.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17287
diff
changeset
|
1302 break; |
73720427b132
Show online buddies on buddy list as online.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17287
diff
changeset
|
1303 default: |
73720427b132
Show online buddies on buddy list as online.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17287
diff
changeset
|
1304 purple_debug_info("msim", "msim_status_cb for %s, unknown status code %d\n", |
73720427b132
Show online buddies on buddy list as online.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17287
diff
changeset
|
1305 username, status_code); |
73720427b132
Show online buddies on buddy list as online.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17287
diff
changeset
|
1306 purple_status_code = PURPLE_STATUS_AVAILABLE; |
73720427b132
Show online buddies on buddy list as online.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17287
diff
changeset
|
1307 } |
73720427b132
Show online buddies on buddy list as online.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17287
diff
changeset
|
1308 purple_prpl_got_user_status(session->account, username, purple_primitive_get_id_from_type(purple_status_code), NULL); |
16394 | 1309 |
1310 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
|
1311 g_free(status_str); |
17306
3a02e7db91c7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17305
diff
changeset
|
1312 g_free(username); |
16394 | 1313 g_list_free(list); |
1314 | |
17291
d8903e1320a9
Previously, the return value of the processing function and msim_process() told
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17290
diff
changeset
|
1315 return TRUE; |
16394 | 1316 } |
1317 | |
17331
b33a6f16356a
Update several outdated TODO comments.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17330
diff
changeset
|
1318 /** Add a buddy to user's buddy list. */ |
17293
bfda36bd957a
Add incomplete msim_add_buddy() implementation.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17291
diff
changeset
|
1319 void msim_add_buddy(PurpleConnection *gc, PurpleBuddy *buddy, PurpleGroup *group) |
bfda36bd957a
Add incomplete msim_add_buddy() implementation.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17291
diff
changeset
|
1320 { |
bfda36bd957a
Add incomplete msim_add_buddy() implementation.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17291
diff
changeset
|
1321 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
|
1322 MsimMessage *msg; |
17293
bfda36bd957a
Add incomplete msim_add_buddy() implementation.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17291
diff
changeset
|
1323 |
bfda36bd957a
Add incomplete msim_add_buddy() implementation.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17291
diff
changeset
|
1324 session = (MsimSession *)gc->proto_data; |
bfda36bd957a
Add incomplete msim_add_buddy() implementation.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17291
diff
changeset
|
1325 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
|
1326 group ? group->name : "(no group)"); |
bfda36bd957a
Add incomplete msim_add_buddy() implementation.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17291
diff
changeset
|
1327 |
17312
962edb051146
Use msim_postprocess_outgoing() to resolve uid for adding and deleting buddies.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17311
diff
changeset
|
1328 msg = msim_msg_new(TRUE, |
17293
bfda36bd957a
Add incomplete msim_add_buddy() implementation.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17291
diff
changeset
|
1329 "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
|
1330 "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
|
1331 /* "newprofileid" will be inserted here with uid. */ |
17293
bfda36bd957a
Add incomplete msim_add_buddy() implementation.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17291
diff
changeset
|
1332 "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
|
1333 NULL); |
962edb051146
Use msim_postprocess_outgoing() to resolve uid for adding and deleting buddies.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17311
diff
changeset
|
1334 |
962edb051146
Use msim_postprocess_outgoing() to resolve uid for adding and deleting buddies.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17311
diff
changeset
|
1335 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
|
1336 { |
bfda36bd957a
Add incomplete msim_add_buddy() implementation.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17291
diff
changeset
|
1337 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
|
1338 msim_msg_free(msg); |
17296
1905859d7a3b
Add (incomplete) msim_remove_buddy().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17293
diff
changeset
|
1339 return; |
17293
bfda36bd957a
Add incomplete msim_add_buddy() implementation.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17291
diff
changeset
|
1340 } |
17312
962edb051146
Use msim_postprocess_outgoing() to resolve uid for adding and deleting buddies.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17311
diff
changeset
|
1341 msim_msg_free(msg); |
17293
bfda36bd957a
Add incomplete msim_add_buddy() implementation.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17291
diff
changeset
|
1342 |
bfda36bd957a
Add incomplete msim_add_buddy() implementation.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17291
diff
changeset
|
1343 /* 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
|
1344 #if 0 |
962edb051146
Use msim_postprocess_outgoing() to resolve uid for adding and deleting buddies.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17311
diff
changeset
|
1345 /* TODO */ |
17331
b33a6f16356a
Update several outdated TODO comments.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17330
diff
changeset
|
1346 if (!msim_postprocess_outgoing(session, |
17293
bfda36bd957a
Add incomplete msim_add_buddy() implementation.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17291
diff
changeset
|
1347 "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
|
1348 "sesskey", MSIM_TYPE_INTEGER, session->sesskey, |
17293
bfda36bd957a
Add incomplete msim_add_buddy() implementation.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17291
diff
changeset
|
1349 "cmd", MSIM_TYPE_INTEGER, MSIM_CMD_BIT_ACTION | MSIM_CMD_PUT, |
bfda36bd957a
Add incomplete msim_add_buddy() implementation.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17291
diff
changeset
|
1350 "dsn", MSIM_TYPE_INTEGER, MC_CONTACT_INFO_DSN, |
bfda36bd957a
Add incomplete msim_add_buddy() implementation.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17291
diff
changeset
|
1351 "lid", MSIM_TYPE_INTEGER, MC_CONTACT_INFO_LID, |
17331
b33a6f16356a
Update several outdated TODO comments.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17330
diff
changeset
|
1352 /* TODO: Use msim_new_reply_callback to get rid. */ |
17293
bfda36bd957a
Add incomplete msim_add_buddy() implementation.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17291
diff
changeset
|
1353 "rid", MSIM_TYPE_INTEGER, session->next_rid++, |
bfda36bd957a
Add incomplete msim_add_buddy() implementation.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17291
diff
changeset
|
1354 "body", MSIM_TYPE_STRING, |
bfda36bd957a
Add incomplete msim_add_buddy() implementation.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17291
diff
changeset
|
1355 g_strdup_printf("ContactID=%s\034" |
bfda36bd957a
Add incomplete msim_add_buddy() implementation.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17291
diff
changeset
|
1356 "GroupName=%s\034" |
bfda36bd957a
Add incomplete msim_add_buddy() implementation.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17291
diff
changeset
|
1357 "Position=1000\034" |
bfda36bd957a
Add incomplete msim_add_buddy() implementation.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17291
diff
changeset
|
1358 "Visibility=1\034" |
bfda36bd957a
Add incomplete msim_add_buddy() implementation.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17291
diff
changeset
|
1359 "NickName=\034" |
bfda36bd957a
Add incomplete msim_add_buddy() implementation.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17291
diff
changeset
|
1360 "NameSelect=0", |
17296
1905859d7a3b
Add (incomplete) msim_remove_buddy().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17293
diff
changeset
|
1361 buddy->name, group->name), |
1905859d7a3b
Add (incomplete) msim_remove_buddy().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17293
diff
changeset
|
1362 NULL)) |
17293
bfda36bd957a
Add incomplete msim_add_buddy() implementation.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17291
diff
changeset
|
1363 { |
bfda36bd957a
Add incomplete msim_add_buddy() implementation.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17291
diff
changeset
|
1364 purple_notify_error(NULL, NULL, _("Failed to add buddy"), _("persist command failed")); |
17296
1905859d7a3b
Add (incomplete) msim_remove_buddy().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17293
diff
changeset
|
1365 return; |
17293
bfda36bd957a
Add incomplete msim_add_buddy() implementation.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17291
diff
changeset
|
1366 } |
17312
962edb051146
Use msim_postprocess_outgoing() to resolve uid for adding and deleting buddies.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17311
diff
changeset
|
1367 #endif |
17293
bfda36bd957a
Add incomplete msim_add_buddy() implementation.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17291
diff
changeset
|
1368 } |
bfda36bd957a
Add incomplete msim_add_buddy() implementation.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17291
diff
changeset
|
1369 |
17319
4cb842e0649c
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17317
diff
changeset
|
1370 /** 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
|
1371 * |
4cb842e0649c
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17317
diff
changeset
|
1372 * @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
|
1373 * @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
|
1374 * @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
|
1375 * @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
|
1376 * |
4cb842e0649c
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17317
diff
changeset
|
1377 * 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
|
1378 * 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
|
1379 * |
4cb842e0649c
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17317
diff
changeset
|
1380 * 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
|
1381 * 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
|
1382 * |
4cb842e0649c
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17317
diff
changeset
|
1383 * 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
|
1384 */ |
17326
f057837085b0
Change to use const gchar * where appropriate.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17325
diff
changeset
|
1385 MsimMessage *msim_do_postprocessing(MsimMessage *msg, const gchar *uid_before, 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
|
1386 { |
4cb842e0649c
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17317
diff
changeset
|
1387 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
|
1388 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
|
1389 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
|
1390 |
4cb842e0649c
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17317
diff
changeset
|
1391 /* 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
|
1392 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
|
1393 { |
4cb842e0649c
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17317
diff
changeset
|
1394 MsimMessageElement *elem; |
4cb842e0649c
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17317
diff
changeset
|
1395 gchar *fmt_string; |
4cb842e0649c
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17317
diff
changeset
|
1396 gchar *uid_str; |
4cb842e0649c
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17317
diff
changeset
|
1397 |
4cb842e0649c
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17317
diff
changeset
|
1398 /* 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
|
1399 |
4cb842e0649c
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17317
diff
changeset
|
1400 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
|
1401 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
|
1402 |
4cb842e0649c
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17317
diff
changeset
|
1403 /* 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
|
1404 * 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
|
1405 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
|
1406 |
4cb842e0649c
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17317
diff
changeset
|
1407 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
|
1408 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
|
1409 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
|
1410 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
|
1411 |
4cb842e0649c
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17317
diff
changeset
|
1412 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
|
1413 elem->data); |
4cb842e0649c
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17317
diff
changeset
|
1414 |
4cb842e0649c
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17317
diff
changeset
|
1415 } else { |
4cb842e0649c
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17317
diff
changeset
|
1416 /* 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
|
1417 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
|
1418 } |
4cb842e0649c
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17317
diff
changeset
|
1419 |
4cb842e0649c
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17317
diff
changeset
|
1420 return msg; |
4cb842e0649c
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17317
diff
changeset
|
1421 } |
4cb842e0649c
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17317
diff
changeset
|
1422 |
17316
2aff11bb5e72
Several small changes to work towards a working msim_remove_buddy():
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17315
diff
changeset
|
1423 /** 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
|
1424 * |
2aff11bb5e72
Several small changes to work towards a working msim_remove_buddy():
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17315
diff
changeset
|
1425 * @param session |
2aff11bb5e72
Several small changes to work towards a working msim_remove_buddy():
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17315
diff
changeset
|
1426 * @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
|
1427 * @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
|
1428 * |
2aff11bb5e72
Several small changes to work towards a working msim_remove_buddy():
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17315
diff
changeset
|
1429 * 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
|
1430 * |
2aff11bb5e72
Several small changes to work towards a working msim_remove_buddy():
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17315
diff
changeset
|
1431 * _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
|
1432 * _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
|
1433 * |
2aff11bb5e72
Several small changes to work towards a working msim_remove_buddy():
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17315
diff
changeset
|
1434 * |
17319
4cb842e0649c
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17317
diff
changeset
|
1435 */ |
17309
25a55b52855a
Add, but do not use, two new functions to postprocess outgoing messages
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17308
diff
changeset
|
1436 void msim_postprocess_outgoing_cb(MsimSession *session, MsimMessage *userinfo, gpointer data) |
25a55b52855a
Add, but do not use, two new functions to postprocess outgoing messages
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17308
diff
changeset
|
1437 { |
25a55b52855a
Add, but do not use, two new functions to postprocess outgoing messages
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17308
diff
changeset
|
1438 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
|
1439 GHashTable *body; |
17311
3720176bdac6
Pass postprocessing parameters inside MsimMessage * instead of in a new struct.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17310
diff
changeset
|
1440 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
|
1441 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
|
1442 |
17311
3720176bdac6
Pass postprocessing parameters inside MsimMessage * instead of in a new struct.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17310
diff
changeset
|
1443 msg = (MsimMessage *)data; |
3720176bdac6
Pass postprocessing parameters inside MsimMessage * instead of in a new struct.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17310
diff
changeset
|
1444 |
3720176bdac6
Pass postprocessing parameters inside MsimMessage * instead of in a new struct.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17310
diff
changeset
|
1445 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
|
1446 |
25a55b52855a
Add, but do not use, two new functions to postprocess outgoing messages
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17308
diff
changeset
|
1447 /* 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
|
1448 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
|
1449 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
|
1450 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
|
1451 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
|
1452 |
25a55b52855a
Add, but do not use, two new functions to postprocess outgoing messages
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17308
diff
changeset
|
1453 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
|
1454 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
|
1455 |
17311
3720176bdac6
Pass postprocessing parameters inside MsimMessage * instead of in a new struct.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17310
diff
changeset
|
1456 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
|
1457 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
|
1458 |
17319
4cb842e0649c
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17317
diff
changeset
|
1459 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
|
1460 |
17312
962edb051146
Use msim_postprocess_outgoing() to resolve uid for adding and deleting buddies.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17311
diff
changeset
|
1461 /* Send */ |
962edb051146
Use msim_postprocess_outgoing() to resolve uid for adding and deleting buddies.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17311
diff
changeset
|
1462 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
|
1463 { |
962edb051146
Use msim_postprocess_outgoing() to resolve uid for adding and deleting buddies.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17311
diff
changeset
|
1464 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
|
1465 } |
17311
3720176bdac6
Pass postprocessing parameters inside MsimMessage * instead of in a new struct.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17310
diff
changeset
|
1466 |
17319
4cb842e0649c
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17317
diff
changeset
|
1467 |
17312
962edb051146
Use msim_postprocess_outgoing() to resolve uid for adding and deleting buddies.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17311
diff
changeset
|
1468 /* 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
|
1469 * 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
|
1470 */ |
17311
3720176bdac6
Pass postprocessing parameters inside MsimMessage * instead of in a new struct.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17310
diff
changeset
|
1471 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
|
1472 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
|
1473 |
17312
962edb051146
Use msim_postprocess_outgoing() to resolve uid for adding and deleting buddies.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17311
diff
changeset
|
1474 //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
|
1475 } |
25a55b52855a
Add, but do not use, two new functions to postprocess outgoing messages
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17308
diff
changeset
|
1476 |
25a55b52855a
Add, but do not use, two new functions to postprocess outgoing messages
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17308
diff
changeset
|
1477 /** 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
|
1478 * |
25a55b52855a
Add, but do not use, two new functions to postprocess outgoing messages
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17308
diff
changeset
|
1479 * @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
|
1480 * @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
|
1481 * @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
|
1482 * @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
|
1483 * @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
|
1484 * |
25a55b52855a
Add, but do not use, two new functions to postprocess outgoing messages
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17308
diff
changeset
|
1485 * @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
|
1486 */ |
17326
f057837085b0
Change to use const gchar * where appropriate.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17325
diff
changeset
|
1487 gboolean msim_postprocess_outgoing(MsimSession *session, MsimMessage *msg, const gchar *username, |
f057837085b0
Change to use const gchar * where appropriate.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17325
diff
changeset
|
1488 const gchar *uid_field_name, 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
|
1489 { |
25a55b52855a
Add, but do not use, two new functions to postprocess outgoing messages
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17308
diff
changeset
|
1490 PurpleBuddy *buddy; |
25a55b52855a
Add, but do not use, two new functions to postprocess outgoing messages
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17308
diff
changeset
|
1491 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
|
1492 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
|
1493 |
17311
3720176bdac6
Pass postprocessing parameters inside MsimMessage * instead of in a new struct.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17310
diff
changeset
|
1494 /* 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
|
1495 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
|
1496 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
|
1497 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
|
1498 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
|
1499 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
|
1500 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
|
1501 |
05723949f75d
Change msim_send_im() to use msim_postprocess_outgoing(), eliminating the
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17309
diff
changeset
|
1502 /* 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
|
1503 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
|
1504 { |
05723949f75d
Change msim_send_im() to use msim_postprocess_outgoing(), eliminating the
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17309
diff
changeset
|
1505 uid = atol(username); |
05723949f75d
Change msim_send_im() to use msim_postprocess_outgoing(), eliminating the
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17309
diff
changeset
|
1506 } else { |
05723949f75d
Change msim_send_im() to use msim_postprocess_outgoing(), eliminating the
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17309
diff
changeset
|
1507 /* 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
|
1508 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
|
1509 if (buddy) |
05723949f75d
Change msim_send_im() to use msim_postprocess_outgoing(), eliminating the
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17309
diff
changeset
|
1510 { |
17322
6fa345a01dd8
Show buddy information in tooltip text, and the display name for status text.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17320
diff
changeset
|
1511 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
|
1512 } else { |
05723949f75d
Change msim_send_im() to use msim_postprocess_outgoing(), eliminating the
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17309
diff
changeset
|
1513 uid = 0; |
05723949f75d
Change msim_send_im() to use msim_postprocess_outgoing(), eliminating the
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17309
diff
changeset
|
1514 } |
05723949f75d
Change msim_send_im() to use msim_postprocess_outgoing(), eliminating the
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17309
diff
changeset
|
1515 |
05723949f75d
Change msim_send_im() to use msim_postprocess_outgoing(), eliminating the
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17309
diff
changeset
|
1516 if (!buddy || !uid) |
05723949f75d
Change msim_send_im() to use msim_postprocess_outgoing(), eliminating the
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17309
diff
changeset
|
1517 { |
17319
4cb842e0649c
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17317
diff
changeset
|
1518 /* 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
|
1519 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
|
1520 username); |
17312
962edb051146
Use msim_postprocess_outgoing() to resolve uid for adding and deleting buddies.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17311
diff
changeset
|
1521 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
|
1522 /* 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
|
1523 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
|
1524 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
|
1525 } |
17309
25a55b52855a
Add, but do not use, two new functions to postprocess outgoing messages
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17308
diff
changeset
|
1526 } |
25a55b52855a
Add, but do not use, two new functions to postprocess outgoing messages
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17308
diff
changeset
|
1527 |
17319
4cb842e0649c
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17317
diff
changeset
|
1528 /* 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
|
1529 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
|
1530 username, uid); |
25a55b52855a
Add, but do not use, two new functions to postprocess outgoing messages
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17308
diff
changeset
|
1531 |
17319
4cb842e0649c
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17317
diff
changeset
|
1532 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
|
1533 |
17319
4cb842e0649c
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17317
diff
changeset
|
1534 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
|
1535 |
17312
962edb051146
Use msim_postprocess_outgoing() to resolve uid for adding and deleting buddies.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17311
diff
changeset
|
1536 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
|
1537 |
962edb051146
Use msim_postprocess_outgoing() to resolve uid for adding and deleting buddies.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17311
diff
changeset
|
1538 //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
|
1539 |
962edb051146
Use msim_postprocess_outgoing() to resolve uid for adding and deleting buddies.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17311
diff
changeset
|
1540 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
|
1541 } |
25a55b52855a
Add, but do not use, two new functions to postprocess outgoing messages
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17308
diff
changeset
|
1542 |
17296
1905859d7a3b
Add (incomplete) msim_remove_buddy().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17293
diff
changeset
|
1543 /** Remove a buddy from the user's buddy list. */ |
1905859d7a3b
Add (incomplete) msim_remove_buddy().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17293
diff
changeset
|
1544 void msim_remove_buddy(PurpleConnection *gc, PurpleBuddy *buddy, PurpleGroup *group) |
1905859d7a3b
Add (incomplete) msim_remove_buddy().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17293
diff
changeset
|
1545 { |
1905859d7a3b
Add (incomplete) msim_remove_buddy().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17293
diff
changeset
|
1546 MsimSession *session; |
17319
4cb842e0649c
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17317
diff
changeset
|
1547 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
|
1548 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
|
1549 MsimMessage *blocklist_msg; |
17296
1905859d7a3b
Add (incomplete) msim_remove_buddy().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17293
diff
changeset
|
1550 |
1905859d7a3b
Add (incomplete) msim_remove_buddy().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17293
diff
changeset
|
1551 session = (MsimSession *)gc->proto_data; |
1905859d7a3b
Add (incomplete) msim_remove_buddy().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17293
diff
changeset
|
1552 |
17319
4cb842e0649c
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17317
diff
changeset
|
1553 delbuddy_msg = msim_msg_new(TRUE, |
17296
1905859d7a3b
Add (incomplete) msim_remove_buddy().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17293
diff
changeset
|
1554 "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
|
1555 "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
|
1556 /* '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
|
1557 NULL); |
962edb051146
Use msim_postprocess_outgoing() to resolve uid for adding and deleting buddies.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17311
diff
changeset
|
1558 /* 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
|
1559 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
|
1560 { |
1905859d7a3b
Add (incomplete) msim_remove_buddy().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17293
diff
changeset
|
1561 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
|
1562 return; |
1905859d7a3b
Add (incomplete) msim_remove_buddy().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17293
diff
changeset
|
1563 } |
1905859d7a3b
Add (incomplete) msim_remove_buddy().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17293
diff
changeset
|
1564 |
17319
4cb842e0649c
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17317
diff
changeset
|
1565 persist_msg = msim_msg_new(TRUE, |
17296
1905859d7a3b
Add (incomplete) msim_remove_buddy().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17293
diff
changeset
|
1566 "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
|
1567 "sesskey", MSIM_TYPE_INTEGER, session->sesskey, |
17296
1905859d7a3b
Add (incomplete) msim_remove_buddy().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17293
diff
changeset
|
1568 "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
|
1569 "dsn", MSIM_TYPE_INTEGER, MD_DELETE_BUDDY_DSN, |
1905859d7a3b
Add (incomplete) msim_remove_buddy().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17293
diff
changeset
|
1570 "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
|
1571 "uid", MSIM_TYPE_INTEGER, session->userid, |
17296
1905859d7a3b
Add (incomplete) msim_remove_buddy().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17293
diff
changeset
|
1572 "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
|
1573 /* <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
|
1574 "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
|
1575 NULL); |
2aff11bb5e72
Several small changes to work towards a working msim_remove_buddy():
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17315
diff
changeset
|
1576 |
2aff11bb5e72
Several small changes to work towards a working msim_remove_buddy():
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17315
diff
changeset
|
1577 /* 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
|
1578 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
|
1579 { |
1905859d7a3b
Add (incomplete) msim_remove_buddy().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17293
diff
changeset
|
1580 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
|
1581 return; |
1905859d7a3b
Add (incomplete) msim_remove_buddy().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17293
diff
changeset
|
1582 } |
1905859d7a3b
Add (incomplete) msim_remove_buddy().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17293
diff
changeset
|
1583 |
17319
4cb842e0649c
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17317
diff
changeset
|
1584 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
|
1585 "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
|
1586 "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
|
1587 /* TODO: MsimMessage lists */ |
4cb842e0649c
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17317
diff
changeset
|
1588 "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
|
1589 NULL); |
4cb842e0649c
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17317
diff
changeset
|
1590 |
4cb842e0649c
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17317
diff
changeset
|
1591 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
|
1592 { |
4cb842e0649c
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17317
diff
changeset
|
1593 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
|
1594 return; |
4cb842e0649c
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17317
diff
changeset
|
1595 } |
4cb842e0649c
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17317
diff
changeset
|
1596 |
17296
1905859d7a3b
Add (incomplete) msim_remove_buddy().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17293
diff
changeset
|
1597 /* TODO: update blocklist */ |
1905859d7a3b
Add (incomplete) msim_remove_buddy().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17293
diff
changeset
|
1598 } |
1905859d7a3b
Add (incomplete) msim_remove_buddy().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17293
diff
changeset
|
1599 |
17324
df93e8773981
Add msim_offline_message() for offline message status. Always return TRUE,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17323
diff
changeset
|
1600 /** 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
|
1601 * |
df93e8773981
Add msim_offline_message() for offline message status. Always return TRUE,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17323
diff
changeset
|
1602 * I always return TRUE, to allow sending to buddies whose status has not yet |
df93e8773981
Add msim_offline_message() for offline message status. Always return TRUE,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17323
diff
changeset
|
1603 * been received. The protocol _does_ support offline messages, but not this plugin. |
df93e8773981
Add msim_offline_message() for offline message status. Always return TRUE,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17323
diff
changeset
|
1604 * TODO: Real offline message support. |
df93e8773981
Add msim_offline_message() for offline message status. Always return TRUE,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17323
diff
changeset
|
1605 */ |
df93e8773981
Add msim_offline_message() for offline message status. Always return TRUE,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17323
diff
changeset
|
1606 gboolean msim_offline_message(const PurpleBuddy *buddy) |
df93e8773981
Add msim_offline_message() for offline message status. Always return TRUE,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17323
diff
changeset
|
1607 { |
df93e8773981
Add msim_offline_message() for offline message status. Always return TRUE,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17323
diff
changeset
|
1608 return TRUE; |
df93e8773981
Add msim_offline_message() for offline message status. Always return TRUE,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17323
diff
changeset
|
1609 } |
16394 | 1610 |
1611 | |
1612 /** | |
1613 * Callback when input available. | |
1614 * | |
16396 | 1615 * @param gc_uncasted A PurpleConnection pointer. |
16394 | 1616 * @param source File descriptor. |
16396 | 1617 * @param cond PURPLE_INPUT_READ |
16394 | 1618 * |
17306
3a02e7db91c7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17305
diff
changeset
|
1619 * Reads the input, and calls msim_preprocess_incoming() to handle it. |
16394 | 1620 */ |
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
|
1621 void msim_input_cb(gpointer gc_uncasted, gint source, PurpleInputCondition cond) |
16394 | 1622 { |
16396 | 1623 PurpleConnection *gc; |
1624 PurpleAccount *account; | |
16394 | 1625 MsimSession *session; |
1626 gchar *end; | |
1627 int n; | |
1628 | |
1629 g_return_if_fail(gc_uncasted != NULL); | |
1630 g_return_if_fail(source >= 0); /* Note: 0 is a valid fd */ | |
1631 | |
16738
0fa4a3e9b318
Stylistic improvements - use type *name instead of type* name for pointers
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16736
diff
changeset
|
1632 gc = (PurpleConnection *)(gc_uncasted); |
16396 | 1633 account = purple_connection_get_account(gc); |
16394 | 1634 session = gc->proto_data; |
1635 | |
17266
793301c04e3a
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16738
diff
changeset
|
1636 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
|
1637 g_return_if_fail(MSIM_SESSION_VALID(session)); |
16394 | 1638 |
1639 /* Only can handle so much data at once... | |
1640 * If this happens, try recompiling with a higher MSIM_READ_BUF_SIZE. | |
1641 * Should be large enough to hold the largest protocol message. | |
1642 */ | |
1643 if (session->rxoff == MSIM_READ_BUF_SIZE) | |
1644 { | |
16396 | 1645 purple_debug_error("msim", "msim_input_cb: %d-byte read buffer full!\n", |
16394 | 1646 MSIM_READ_BUF_SIZE); |
16728
8f6dcd5e9298
Use _ for translations in msimprpl. See #648.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16727
diff
changeset
|
1647 purple_connection_error(gc, _("Read buffer full")); |
17329
4205f33b658f
Fix crash when re-logging in.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17326
diff
changeset
|
1648 |
4205f33b658f
Fix crash when re-logging in.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17326
diff
changeset
|
1649 msim_close(session->gc); |
16394 | 1650 return; |
1651 } | |
1652 | |
16396 | 1653 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
|
1654 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
|
1655 MSIM_READ_BUF_SIZE - session->rxoff); |
16394 | 1656 |
1657 /* Read into buffer. On Win32, need recv() not read(). session->fd also holds | |
1658 * the file descriptor, but it sometimes differs from the 'source' parameter. | |
1659 */ | |
1660 n = recv(session->fd, session->rxbuf + session->rxoff, MSIM_READ_BUF_SIZE - session->rxoff, 0); | |
1661 | |
1662 if (n < 0 && errno == EAGAIN) | |
1663 { | |
1664 return; | |
1665 } | |
1666 else if (n < 0) | |
1667 { | |
16728
8f6dcd5e9298
Use _ for translations in msimprpl. See #648.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16727
diff
changeset
|
1668 purple_connection_error(gc, _("Read error")); |
16396 | 1669 purple_debug_error("msim", "msim_input_cb: read error, ret=%d, " |
16394 | 1670 "error=%s, source=%d, fd=%d (%X))\n", |
1671 n, strerror(errno), source, session->fd, session->fd); | |
17329
4205f33b658f
Fix crash when re-logging in.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17326
diff
changeset
|
1672 |
4205f33b658f
Fix crash when re-logging in.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17326
diff
changeset
|
1673 msim_close(session->gc); |
16394 | 1674 return; |
1675 } | |
1676 else if (n == 0) | |
1677 { | |
16396 | 1678 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
|
1679 purple_connection_error(gc, _("Server has disconnected")); |
16394 | 1680 return; |
1681 } | |
1682 | |
1683 /* Null terminate */ | |
1684 session->rxbuf[session->rxoff + n] = 0; | |
1685 | |
1686 /* Check for embedded NULs. I don't handle them, and they shouldn't occur. */ | |
1687 if (strlen(session->rxbuf + session->rxoff) != n) | |
1688 { | |
1689 /* Occurs after login, but it is not a null byte. */ | |
16396 | 1690 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
|
1691 "--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
|
1692 strlen(session->rxbuf + session->rxoff), n); |
16396 | 1693 //purple_connection_error(gc, "Invalid message - null byte on input"); |
16394 | 1694 return; |
1695 } | |
1696 | |
1697 session->rxoff += n; | |
16396 | 1698 purple_debug_info("msim", "msim_input_cb: read=%d\n", n); |
16394 | 1699 |
16725
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
1700 #ifdef MSIM_DEBUG_RXBUF |
16407
bb649c52fc19
Replace printf() in MySpaceIM prpl with purple_debug_info().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16406
diff
changeset
|
1701 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
|
1702 #endif |
16394 | 1703 |
1704 /* Look for \\final\\ end markers. If found, process message. */ | |
1705 while((end = strstr(session->rxbuf, MSIM_FINAL_STRING))) | |
1706 { | |
17266
793301c04e3a
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16738
diff
changeset
|
1707 MsimMessage *msg; |
16394 | 1708 |
16725
58cd11fcd84f
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16723
diff
changeset
|
1709 #ifdef MSIM_DEBUG_RXBUF |
16407
bb649c52fc19
Replace printf() in MySpaceIM prpl with purple_debug_info().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16406
diff
changeset
|
1710 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
|
1711 #endif |
16394 | 1712 *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
|
1713 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
|
1714 if (!msg) |
16394 | 1715 { |
16404
47e07438f01c
Use g_convert for UTF-16LE conversion instead of converting manually.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16402
diff
changeset
|
1716 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
|
1717 session->rxbuf); |
16728
8f6dcd5e9298
Use _ for translations in msimprpl. See #648.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16727
diff
changeset
|
1718 purple_connection_error(gc, _("Unparseable message")); |
16394 | 1719 } |
1720 else | |
1721 { | |
17291
d8903e1320a9
Previously, the return value of the processing function and msim_process() told
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17290
diff
changeset
|
1722 /* 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
|
1723 * 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
|
1724 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
|
1725 { |
17306
3a02e7db91c7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17305
diff
changeset
|
1726 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
|
1727 } |
d8903e1320a9
Previously, the return value of the processing function and msim_process() told
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17290
diff
changeset
|
1728 msim_msg_free(msg); |
16394 | 1729 } |
1730 | |
1731 /* Move remaining part of buffer to beginning. */ | |
1732 session->rxoff -= strlen(session->rxbuf) + strlen(MSIM_FINAL_STRING); | |
1733 memmove(session->rxbuf, end + strlen(MSIM_FINAL_STRING), | |
1734 MSIM_READ_BUF_SIZE - (end + strlen(MSIM_FINAL_STRING) - session->rxbuf)); | |
1735 | |
1736 /* Clear end of buffer */ | |
1737 //memset(end, 0, MSIM_READ_BUF_SIZE - (end - session->rxbuf)); | |
1738 } | |
1739 } | |
1740 | |
17316
2aff11bb5e72
Several small changes to work towards a working msim_remove_buddy():
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17315
diff
changeset
|
1741 /* 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
|
1742 * |
2aff11bb5e72
Several small changes to work towards a working msim_remove_buddy():
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17315
diff
changeset
|
1743 * @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
|
1744 * @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
|
1745 * |
2aff11bb5e72
Several small changes to work towards a working msim_remove_buddy():
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17315
diff
changeset
|
1746 * @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
|
1747 * |
2aff11bb5e72
Several small changes to work towards a working msim_remove_buddy():
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17315
diff
changeset
|
1748 * 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
|
1749 * 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
|
1750 * 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
|
1751 */ |
2aff11bb5e72
Several small changes to work towards a working msim_remove_buddy():
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17315
diff
changeset
|
1752 guint msim_new_reply_callback(MsimSession *session, MSIM_USER_LOOKUP_CB cb, gpointer data) |
2aff11bb5e72
Several small changes to work towards a working msim_remove_buddy():
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17315
diff
changeset
|
1753 { |
2aff11bb5e72
Several small changes to work towards a working msim_remove_buddy():
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17315
diff
changeset
|
1754 guint rid; |
2aff11bb5e72
Several small changes to work towards a working msim_remove_buddy():
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17315
diff
changeset
|
1755 |
2aff11bb5e72
Several small changes to work towards a working msim_remove_buddy():
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17315
diff
changeset
|
1756 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
|
1757 |
2aff11bb5e72
Several small changes to work towards a working msim_remove_buddy():
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17315
diff
changeset
|
1758 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
|
1759 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
|
1760 |
2aff11bb5e72
Several small changes to work towards a working msim_remove_buddy():
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17315
diff
changeset
|
1761 return rid; |
2aff11bb5e72
Several small changes to work towards a working msim_remove_buddy():
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17315
diff
changeset
|
1762 } |
2aff11bb5e72
Several small changes to work towards a working msim_remove_buddy():
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17315
diff
changeset
|
1763 |
16394 | 1764 /** |
1765 * Callback when connected. Sets up input handlers. | |
1766 * | |
16396 | 1767 * @param data A PurpleConnection pointer. |
16394 | 1768 * @param source File descriptor. |
1769 * @param error_message | |
1770 */ | |
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
|
1771 void msim_connect_cb(gpointer data, gint source, const gchar *error_message) |
16394 | 1772 { |
16396 | 1773 PurpleConnection *gc; |
16394 | 1774 MsimSession *session; |
1775 | |
1776 g_return_if_fail(data != NULL); | |
1777 | |
16738
0fa4a3e9b318
Stylistic improvements - use type *name instead of type* name for pointers
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16736
diff
changeset
|
1778 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
|
1779 session = (MsimSession *)gc->proto_data; |
16394 | 1780 |
1781 if (source < 0) | |
1782 { | |
16728
8f6dcd5e9298
Use _ for translations in msimprpl. See #648.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16727
diff
changeset
|
1783 purple_connection_error(gc, _("Couldn't connect to host")); |
8f6dcd5e9298
Use _ for translations in msimprpl. See #648.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16727
diff
changeset
|
1784 purple_connection_error(gc, g_strdup_printf(_("Couldn't connect to host: %s (%d)"), |
16394 | 1785 error_message, source)); |
1786 return; | |
1787 } | |
1788 | |
1789 session->fd = source; | |
1790 | |
16396 | 1791 gc->inpa = purple_input_add(source, PURPLE_INPUT_READ, msim_input_cb, gc); |
16394 | 1792 } |
1793 | |
1794 /* Session methods */ | |
1795 | |
1796 /** | |
1797 * Create a new MSIM session. | |
1798 * | |
1799 * @param acct The account to create the session from. | |
1800 * | |
1801 * @return Pointer to a new session. Free with msim_session_destroy. | |
1802 */ | |
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
|
1803 MsimSession *msim_session_new(PurpleAccount *acct) |
16394 | 1804 { |
1805 MsimSession *session; | |
1806 | |
1807 g_return_val_if_fail(acct != NULL, NULL); | |
1808 | |
1809 session = g_new0(MsimSession, 1); | |
1810 | |
1811 session->magic = MSIM_SESSION_STRUCT_MAGIC; | |
1812 session->account = acct; | |
16396 | 1813 session->gc = purple_account_get_connection(acct); |
16394 | 1814 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
|
1815 |
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
1816 /* TODO: Remove. */ |
16407
bb649c52fc19
Replace printf() in MySpaceIM prpl with purple_debug_info().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16406
diff
changeset
|
1817 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
|
1818 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
|
1819 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
|
1820 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
|
1821 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
|
1822 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
|
1823 Figure this out, once free cache. */ |
16394 | 1824 session->rxoff = 0; |
1825 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
|
1826 session->next_rid = 1; |
16394 | 1827 |
1828 return session; | |
1829 } | |
1830 | |
1831 /** | |
1832 * Free a session. | |
1833 * | |
1834 * @param session The session to destroy. | |
1835 */ | |
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
|
1836 void msim_session_destroy(MsimSession *session) |
16394 | 1837 { |
1838 g_return_if_fail(MSIM_SESSION_VALID(session)); | |
1839 | |
1840 session->magic = -1; | |
1841 | |
1842 g_free(session->rxbuf); | |
1843 | |
17313
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
1844 /* TODO: Remove. */ |
7a0061f4845d
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17312
diff
changeset
|
1845 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
|
1846 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
|
1847 |
16394 | 1848 g_free(session); |
1849 } | |
16405
8063f163f411
Add MySpaceIM header file and reorganize functions.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16404
diff
changeset
|
1850 |
16394 | 1851 |
1852 | |
1853 /** | |
1854 * Close the connection. | |
1855 * | |
1856 * @param gc The connection. | |
1857 */ | |
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
|
1858 void msim_close(PurpleConnection *gc) |
16394 | 1859 { |
17314
948373cbba1c
Add TODO in order to fix msim_tooltip_text.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17313
diff
changeset
|
1860 MsimSession *session; |
17293
bfda36bd957a
Add incomplete msim_add_buddy() implementation.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17291
diff
changeset
|
1861 |
bfda36bd957a
Add incomplete msim_add_buddy() implementation.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17291
diff
changeset
|
1862 purple_debug_info("msim", "msim_close: destroying session\n"); |
17314
948373cbba1c
Add TODO in order to fix msim_tooltip_text.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17313
diff
changeset
|
1863 |
948373cbba1c
Add TODO in order to fix msim_tooltip_text.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17313
diff
changeset
|
1864 session = (MsimSession *)gc->proto_data; |
948373cbba1c
Add TODO in order to fix msim_tooltip_text.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17313
diff
changeset
|
1865 |
948373cbba1c
Add TODO in order to fix msim_tooltip_text.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17313
diff
changeset
|
1866 g_return_if_fail(gc != NULL); |
948373cbba1c
Add TODO in order to fix msim_tooltip_text.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17313
diff
changeset
|
1867 g_return_if_fail(session != NULL); |
948373cbba1c
Add TODO in order to fix msim_tooltip_text.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17313
diff
changeset
|
1868 g_return_if_fail(MSIM_SESSION_VALID(session)); |
948373cbba1c
Add TODO in order to fix msim_tooltip_text.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17313
diff
changeset
|
1869 |
17329
4205f33b658f
Fix crash when re-logging in.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17326
diff
changeset
|
1870 purple_input_remove(session->gc->inpa); |
17314
948373cbba1c
Add TODO in order to fix msim_tooltip_text.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17313
diff
changeset
|
1871 msim_session_destroy(session); |
16394 | 1872 } |
1873 | |
1874 | |
1875 /** | |
1876 * Check if a string is a userid (all numeric). | |
1877 * | |
1878 * @param user The user id, email, or name. | |
1879 * | |
1880 * @return TRUE if is userid, FALSE if not. | |
1881 */ | |
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
|
1882 gboolean msim_is_userid(const gchar *user) |
16394 | 1883 { |
1884 g_return_val_if_fail(user != NULL, FALSE); | |
1885 | |
1886 return strspn(user, "0123456789") == strlen(user); | |
1887 } | |
1888 | |
1889 /** | |
1890 * Check if a string is an email address (contains an @). | |
1891 * | |
1892 * @param user The user id, email, or name. | |
1893 * | |
1894 * @return TRUE if is an email, FALSE if not. | |
1895 * | |
1896 * This function is not intended to be used as a generic | |
1897 * means of validating email addresses, but to distinguish | |
1898 * between a user represented by an email address from | |
1899 * other forms of identification. | |
1900 */ | |
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
|
1901 gboolean msim_is_email(const gchar *user) |
16394 | 1902 { |
1903 g_return_val_if_fail(user != NULL, FALSE); | |
1904 | |
1905 return strchr(user, '@') != NULL; | |
1906 } | |
1907 | |
1908 | |
1909 /** | |
1910 * Asynchronously lookup user information, calling callback when receive result. | |
1911 * | |
1912 * @param session | |
1913 * @param user The user id, email address, or username. | |
1914 * @param cb Callback, called with user information when available. | |
1915 * @param data An arbitray data pointer passed to the callback. | |
1916 */ | |
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
|
1917 /* TODO: change to not use callbacks */ |
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
|
1918 void msim_lookup_user(MsimSession *session, const gchar *user, MSIM_USER_LOOKUP_CB cb, gpointer data) |
16394 | 1919 { |
1920 gchar *field_name; | |
1921 guint rid, cmd, dsn, lid; | |
1922 | |
1923 g_return_if_fail(MSIM_SESSION_VALID(session)); | |
1924 g_return_if_fail(user != NULL); | |
1925 g_return_if_fail(cb != NULL); | |
1926 | |
17266
793301c04e3a
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16738
diff
changeset
|
1927 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
|
1928 "asynchronously looking up <%s>\n", user); |
16394 | 1929 |
17312
962edb051146
Use msim_postprocess_outgoing() to resolve uid for adding and deleting buddies.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17311
diff
changeset
|
1930 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
|
1931 |
16394 | 1932 /* TODO: check if this user's info was cached and fresh; if so return immediately */ |
1933 #if 0 | |
1934 /* If already know userid, then call callback immediately */ | |
1935 cached_userid = g_hash_table_lookup(session->userid_cache, who); | |
1936 if (cached_userid && !by_userid) | |
1937 { | |
1938 cb(cached_userid, NULL, NULL, data); | |
1939 return; | |
1940 } | |
1941 #endif | |
1942 | |
1943 /* 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
|
1944 rid = msim_new_reply_callback(session, cb, data); |
16394 | 1945 |
1946 /* Send request */ | |
1947 | |
17286
58b4d103a5b8
Use symbolic constants for persist messages.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17285
diff
changeset
|
1948 cmd = MSIM_CMD_GET; |
16394 | 1949 |
1950 if (msim_is_userid(user)) | |
1951 { | |
1952 field_name = "UserID"; | |
17286
58b4d103a5b8
Use symbolic constants for persist messages.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17285
diff
changeset
|
1953 dsn = MG_MYSPACE_INFO_BY_ID_DSN; |
58b4d103a5b8
Use symbolic constants for persist messages.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17285
diff
changeset
|
1954 lid = MG_MYSPACE_INFO_BY_ID_LID; |
16394 | 1955 } else if (msim_is_email(user)) { |
1956 field_name = "Email"; | |
17286
58b4d103a5b8
Use symbolic constants for persist messages.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17285
diff
changeset
|
1957 dsn = MG_MYSPACE_INFO_BY_STRING_DSN; |
58b4d103a5b8
Use symbolic constants for persist messages.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17285
diff
changeset
|
1958 lid = MG_MYSPACE_INFO_BY_STRING_LID; |
16394 | 1959 } else { |
1960 field_name = "UserName"; | |
17286
58b4d103a5b8
Use symbolic constants for persist messages.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17285
diff
changeset
|
1961 dsn = MG_MYSPACE_INFO_BY_STRING_DSN; |
58b4d103a5b8
Use symbolic constants for persist messages.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17285
diff
changeset
|
1962 lid = MG_MYSPACE_INFO_BY_STRING_LID; |
16394 | 1963 } |
1964 | |
1965 | |
17291
d8903e1320a9
Previously, the return value of the processing function and msim_process() told
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17290
diff
changeset
|
1966 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
|
1967 "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
|
1968 "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
|
1969 "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
|
1970 "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
|
1971 "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
|
1972 "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
|
1973 "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
|
1974 /* TODO: dictionary field type */ |
496855295bd7
Use MsimMessage via msim_send(), instead of msim_send_raw(). This is a more
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16735
diff
changeset
|
1975 "body", MSIM_TYPE_STRING, 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
|
1976 NULL)); |
16394 | 1977 } |
1978 | |
1979 | |
1980 /** | |
1981 * Obtain the status text for a buddy. | |
1982 * | |
1983 * @param buddy The buddy to obtain status text for. | |
1984 * | |
17326
f057837085b0
Change to use const gchar * where appropriate.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17325
diff
changeset
|
1985 * @return Status text, or NULL if error. Caller g_free()'s. |
16394 | 1986 * |
1987 */ | |
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
|
1988 char *msim_status_text(PurpleBuddy *buddy) |
16394 | 1989 { |
1990 MsimSession *session; | |
17332
d198d62c5ff5
Add two boolean options to account dialog, to allow displaying of
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17331
diff
changeset
|
1991 const gchar *display_name, *headline; |
16394 | 1992 |
1993 g_return_val_if_fail(buddy != NULL, NULL); | |
1994 | |
16738
0fa4a3e9b318
Stylistic improvements - use type *name instead of type* name for pointers
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16736
diff
changeset
|
1995 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
|
1996 g_return_val_if_fail(MSIM_SESSION_VALID(session), NULL); |
16394 | 1997 |
17332
d198d62c5ff5
Add two boolean options to account dialog, to allow displaying of
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17331
diff
changeset
|
1998 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
|
1999 |
d198d62c5ff5
Add two boolean options to account dialog, to allow displaying of
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17331
diff
changeset
|
2000 /* 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
|
2001 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
|
2002 { |
d198d62c5ff5
Add two boolean options to account dialog, to allow displaying of
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17331
diff
changeset
|
2003 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
|
2004 } |
d198d62c5ff5
Add two boolean options to account dialog, to allow displaying of
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17331
diff
changeset
|
2005 |
d198d62c5ff5
Add two boolean options to account dialog, to allow displaying of
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17331
diff
changeset
|
2006 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
|
2007 { |
d198d62c5ff5
Add two boolean options to account dialog, to allow displaying of
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17331
diff
changeset
|
2008 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
|
2009 } |
d198d62c5ff5
Add two boolean options to account dialog, to allow displaying of
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17331
diff
changeset
|
2010 |
d198d62c5ff5
Add two boolean options to account dialog, to allow displaying of
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17331
diff
changeset
|
2011 /* 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
|
2012 |
d198d62c5ff5
Add two boolean options to account dialog, to allow displaying of
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17331
diff
changeset
|
2013 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
|
2014 return g_strconcat(display_name, " ", headline, NULL); |
16394 | 2015 |
17322
6fa345a01dd8
Show buddy information in tooltip text, and the display name for status text.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17320
diff
changeset
|
2016 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
|
2017 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
|
2018 |
d198d62c5ff5
Add two boolean options to account dialog, to allow displaying of
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17331
diff
changeset
|
2019 if (headline) |
d198d62c5ff5
Add two boolean options to account dialog, to allow displaying of
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17331
diff
changeset
|
2020 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
|
2021 |
d198d62c5ff5
Add two boolean options to account dialog, to allow displaying of
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17331
diff
changeset
|
2022 return NULL; |
16394 | 2023 } |
2024 | |
2025 /** | |
2026 * Obtain the tooltip text for a buddy. | |
2027 * | |
2028 * @param buddy Buddy to obtain tooltip text on. | |
2029 * @param user_info Variable modified to have the tooltip text. | |
2030 * @param full TRUE if should obtain full tooltip text. | |
2031 * | |
2032 */ | |
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
|
2033 void msim_tooltip_text(PurpleBuddy *buddy, PurpleNotifyUserInfo *user_info, gboolean full) |
16394 | 2034 { |
2035 g_return_if_fail(buddy != NULL); | |
2036 g_return_if_fail(user_info != NULL); | |
2037 | |
16396 | 2038 if (PURPLE_BUDDY_IS_ONLINE(buddy)) |
16394 | 2039 { |
2040 MsimSession *session; | |
2041 | |
16738
0fa4a3e9b318
Stylistic improvements - use type *name instead of type* name for pointers
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16736
diff
changeset
|
2042 session = (MsimSession *)buddy->account->gc->proto_data; |
16394 | 2043 |
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
|
2044 g_return_if_fail(MSIM_SESSION_VALID(session)); |
16394 | 2045 |
17322
6fa345a01dd8
Show buddy information in tooltip text, and the display name for status text.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17320
diff
changeset
|
2046 /* 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
|
2047 |
fc2ccac8d826
Reorganize the tooltip text, to show more useful information.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17322
diff
changeset
|
2048 /* TODO: move to buddy profile |
17322
6fa345a01dd8
Show buddy information in tooltip text, and the display name for status text.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17320
diff
changeset
|
2049 purple_notify_user_info_add_pair(user_info, "User ID", |
6fa345a01dd8
Show buddy information in tooltip text, and the display name for status text.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17320
diff
changeset
|
2050 g_strdup_printf("%d", purple_blist_node_get_int(&buddy->node, "UserID"))); |
17323
fc2ccac8d826
Reorganize the tooltip text, to show more useful information.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17322
diff
changeset
|
2051 */ |
fc2ccac8d826
Reorganize the tooltip text, to show more useful information.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17322
diff
changeset
|
2052 |
fc2ccac8d826
Reorganize the tooltip text, to show more useful information.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17322
diff
changeset
|
2053 /* Already shown in status text. |
17322
6fa345a01dd8
Show buddy information in tooltip text, and the display name for status text.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17320
diff
changeset
|
2054 purple_notify_user_info_add_pair(user_info, "Display Name", |
17323
fc2ccac8d826
Reorganize the tooltip text, to show more useful information.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17322
diff
changeset
|
2055 purple_blist_node_get_string(&buddy->node, "DisplayName")); */ |
fc2ccac8d826
Reorganize the tooltip text, to show more useful information.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17322
diff
changeset
|
2056 |
fc2ccac8d826
Reorganize the tooltip text, to show more useful information.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17322
diff
changeset
|
2057 /* Useful to identify the account the tooltip refers to. Other prpls show this. */ |
fc2ccac8d826
Reorganize the tooltip text, to show more useful information.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17322
diff
changeset
|
2058 purple_notify_user_info_add_pair(user_info, "Account", |
fc2ccac8d826
Reorganize the tooltip text, to show more useful information.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17322
diff
changeset
|
2059 purple_blist_node_get_string(&buddy->node, "UserName")); |
fc2ccac8d826
Reorganize the tooltip text, to show more useful information.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17322
diff
changeset
|
2060 |
fc2ccac8d826
Reorganize the tooltip text, to show more useful information.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17322
diff
changeset
|
2061 |
fc2ccac8d826
Reorganize the tooltip text, to show more useful information.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17322
diff
changeset
|
2062 /* a/s/l...the vitals */ |
fc2ccac8d826
Reorganize the tooltip text, to show more useful information.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17322
diff
changeset
|
2063 purple_notify_user_info_add_pair(user_info, "Age", |
fc2ccac8d826
Reorganize the tooltip text, to show more useful information.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17322
diff
changeset
|
2064 g_strdup_printf("%d", purple_blist_node_get_int(&buddy->node, "Age"))); |
17322
6fa345a01dd8
Show buddy information in tooltip text, and the display name for status text.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17320
diff
changeset
|
2065 |
17323
fc2ccac8d826
Reorganize the tooltip text, to show more useful information.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17322
diff
changeset
|
2066 purple_notify_user_info_add_pair(user_info, "Gender", |
fc2ccac8d826
Reorganize the tooltip text, to show more useful information.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17322
diff
changeset
|
2067 purple_blist_node_get_string(&buddy->node, "Gender")); |
fc2ccac8d826
Reorganize the tooltip text, to show more useful information.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17322
diff
changeset
|
2068 |
fc2ccac8d826
Reorganize the tooltip text, to show more useful information.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17322
diff
changeset
|
2069 purple_notify_user_info_add_pair(user_info, "Location", |
fc2ccac8d826
Reorganize the tooltip text, to show more useful information.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17322
diff
changeset
|
2070 purple_blist_node_get_string(&buddy->node, "Location")); |
fc2ccac8d826
Reorganize the tooltip text, to show more useful information.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17322
diff
changeset
|
2071 |
fc2ccac8d826
Reorganize the tooltip text, to show more useful information.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17322
diff
changeset
|
2072 /* Other information */ |
fc2ccac8d826
Reorganize the tooltip text, to show more useful information.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17322
diff
changeset
|
2073 if (purple_blist_node_get_string(&buddy->node, "Headline")) |
fc2ccac8d826
Reorganize the tooltip text, to show more useful information.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17322
diff
changeset
|
2074 purple_notify_user_info_add_pair(user_info, "Headline", |
fc2ccac8d826
Reorganize the tooltip text, to show more useful information.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17322
diff
changeset
|
2075 purple_blist_node_get_string(&buddy->node, "Headline")); |
fc2ccac8d826
Reorganize the tooltip text, to show more useful information.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17322
diff
changeset
|
2076 |
fc2ccac8d826
Reorganize the tooltip text, to show more useful information.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17322
diff
changeset
|
2077 purple_notify_user_info_add_pair(user_info, "Song", |
fc2ccac8d826
Reorganize the tooltip text, to show more useful information.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17322
diff
changeset
|
2078 g_strdup_printf("%s - %s", |
fc2ccac8d826
Reorganize the tooltip text, to show more useful information.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17322
diff
changeset
|
2079 purple_blist_node_get_string(&buddy->node, "BandName"), |
fc2ccac8d826
Reorganize the tooltip text, to show more useful information.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17322
diff
changeset
|
2080 purple_blist_node_get_string(&buddy->node, "SongName"))); |
fc2ccac8d826
Reorganize the tooltip text, to show more useful information.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17322
diff
changeset
|
2081 |
17322
6fa345a01dd8
Show buddy information in tooltip text, and the display name for status text.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17320
diff
changeset
|
2082 purple_notify_user_info_add_pair(user_info, "Total Friends", |
6fa345a01dd8
Show buddy information in tooltip text, and the display name for status text.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17320
diff
changeset
|
2083 g_strdup_printf("%d", purple_blist_node_get_int(&buddy->node, "TotalFriends"))); |
6fa345a01dd8
Show buddy information in tooltip text, and the display name for status text.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17320
diff
changeset
|
2084 |
16394 | 2085 } |
2086 } | |
2087 | |
16396 | 2088 /** 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
|
2089 PurplePluginProtocolInfo prpl_info = |
16394 | 2090 { |
2091 OPT_PROTO_MAIL_CHECK,/* options - TODO: myspace will notify of mail */ | |
2092 NULL, /* user_splits */ | |
2093 NULL, /* protocol_options */ | |
2094 NO_BUDDY_ICONS, /* icon_spec - TODO: eventually should add this */ | |
2095 msim_list_icon, /* list_icon */ | |
2096 NULL, /* list_emblems */ | |
2097 msim_status_text, /* status_text */ | |
2098 msim_tooltip_text, /* tooltip_text */ | |
2099 msim_status_types, /* status_types */ | |
2100 NULL, /* blist_node_menu */ | |
2101 NULL, /* chat_info */ | |
2102 NULL, /* chat_info_defaults */ | |
2103 msim_login, /* login */ | |
2104 msim_close, /* close */ | |
2105 msim_send_im, /* send_im */ | |
2106 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
|
2107 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
|
2108 msim_get_info, /* get_info */ |
16394 | 2109 NULL, /* set_away */ |
2110 NULL, /* set_idle */ | |
2111 NULL, /* change_passwd */ | |
17296
1905859d7a3b
Add (incomplete) msim_remove_buddy().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17293
diff
changeset
|
2112 msim_add_buddy, /* add_buddy */ |
16394 | 2113 NULL, /* add_buddies */ |
17296
1905859d7a3b
Add (incomplete) msim_remove_buddy().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17293
diff
changeset
|
2114 msim_remove_buddy, /* remove_buddy */ |
16394 | 2115 NULL, /* remove_buddies */ |
2116 NULL, /* add_permit */ | |
2117 NULL, /* add_deny */ | |
2118 NULL, /* rem_permit */ | |
2119 NULL, /* rem_deny */ | |
2120 NULL, /* set_permit_deny */ | |
2121 NULL, /* join_chat */ | |
2122 NULL, /* reject chat invite */ | |
2123 NULL, /* get_chat_name */ | |
2124 NULL, /* chat_invite */ | |
2125 NULL, /* chat_leave */ | |
2126 NULL, /* chat_whisper */ | |
2127 NULL, /* chat_send */ | |
2128 NULL, /* keepalive */ | |
2129 NULL, /* register_user */ | |
2130 NULL, /* get_cb_info */ | |
2131 NULL, /* get_cb_away */ | |
2132 NULL, /* alias_buddy */ | |
2133 NULL, /* group_buddy */ | |
2134 NULL, /* rename_group */ | |
2135 NULL, /* buddy_free */ | |
2136 NULL, /* convo_closed */ | |
2137 NULL, /* normalize */ | |
2138 NULL, /* set_buddy_icon */ | |
2139 NULL, /* remove_group */ | |
2140 NULL, /* get_cb_real_name */ | |
2141 NULL, /* set_chat_topic */ | |
2142 NULL, /* find_blist_chat */ | |
2143 NULL, /* roomlist_get_list */ | |
2144 NULL, /* roomlist_cancel */ | |
2145 NULL, /* roomlist_expand_category */ | |
2146 NULL, /* can_receive_file */ | |
2147 NULL, /* send_file */ | |
2148 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
|
2149 msim_offline_message, /* offline_message */ |
16394 | 2150 NULL, /* whiteboard_prpl_ops */ |
2151 NULL, /* send_raw */ | |
16723
3b5037a93807
Add initializers for reserved fields in plugin and prpl structures.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16409
diff
changeset
|
2152 NULL, /* roomlist_room_serialize */ |
3b5037a93807
Add initializers for reserved fields in plugin and prpl structures.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16409
diff
changeset
|
2153 NULL, /* _purple_reserved1 */ |
3b5037a93807
Add initializers for reserved fields in plugin and prpl structures.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16409
diff
changeset
|
2154 NULL, /* _purple_reserved2 */ |
3b5037a93807
Add initializers for reserved fields in plugin and prpl structures.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16409
diff
changeset
|
2155 NULL, /* _purple_reserved3 */ |
3b5037a93807
Add initializers for reserved fields in plugin and prpl structures.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16409
diff
changeset
|
2156 NULL /* _purple_reserved4 */ |
16394 | 2157 }; |
2158 | |
2159 | |
2160 | |
2161 /** 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
|
2162 PurplePluginInfo info = |
16394 | 2163 { |
16396 | 2164 PURPLE_PLUGIN_MAGIC, |
2165 PURPLE_MAJOR_VERSION, | |
2166 PURPLE_MINOR_VERSION, | |
17289
73720427b132
Show online buddies on buddy list as online.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17287
diff
changeset
|
2167 PURPLE_PLUGIN_PROTOCOL, /**< type */ |
73720427b132
Show online buddies on buddy list as online.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17287
diff
changeset
|
2168 NULL, /**< ui_requirement */ |
73720427b132
Show online buddies on buddy list as online.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17287
diff
changeset
|
2169 0, /**< flags */ |
73720427b132
Show online buddies on buddy list as online.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17287
diff
changeset
|
2170 NULL, /**< dependencies */ |
73720427b132
Show online buddies on buddy list as online.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17287
diff
changeset
|
2171 PURPLE_PRIORITY_DEFAULT, /**< priority */ |
16394 | 2172 |
2173 "prpl-myspace", /**< id */ | |
2174 "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
|
2175 "0.8", /**< version */ |
16394 | 2176 /** summary */ |
2177 "MySpaceIM Protocol Plugin", | |
2178 /** description */ | |
2179 "MySpaceIM Protocol Plugin", | |
2180 "Jeff Connelly <myspaceim@xyzzy.cjb.net>", /**< author */ | |
2181 "http://developer.pidgin.im/wiki/MySpaceIM/", /**< homepage */ | |
2182 | |
16726
fc80e7b2540d
Check for RC4 in libpurple on plugin initialization.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16725
diff
changeset
|
2183 msim_load, /**< load */ |
16394 | 2184 NULL, /**< unload */ |
2185 NULL, /**< destroy */ | |
2186 NULL, /**< ui_info */ | |
2187 &prpl_info, /**< extra_info */ | |
2188 NULL, /**< prefs_info */ | |
2189 | |
2190 /* msim_actions */ | |
16723
3b5037a93807
Add initializers for reserved fields in plugin and prpl structures.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16409
diff
changeset
|
2191 NULL, |
3b5037a93807
Add initializers for reserved fields in plugin and prpl structures.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16409
diff
changeset
|
2192 |
3b5037a93807
Add initializers for reserved fields in plugin and prpl structures.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16409
diff
changeset
|
2193 NULL, /**< reserved1 */ |
3b5037a93807
Add initializers for reserved fields in plugin and prpl structures.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16409
diff
changeset
|
2194 NULL, /**< reserved2 */ |
3b5037a93807
Add initializers for reserved fields in plugin and prpl structures.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16409
diff
changeset
|
2195 NULL, /**< reserved3 */ |
3b5037a93807
Add initializers for reserved fields in plugin and prpl structures.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16409
diff
changeset
|
2196 NULL /**< reserved4 */ |
16394 | 2197 }; |
2198 | |
17648
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
2199 |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
2200 /** Test functions. |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
2201 * 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
|
2202 * 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
|
2203 * msimprpl is architected. |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
2204 */ |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
2205 void msim_test_all(void) |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
2206 { |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
2207 guint failures; |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
2208 |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
2209 failures = 0; |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
2210 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
|
2211 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
|
2212 |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
2213 if (failures) |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
2214 { |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
2215 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
|
2216 } |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
2217 else |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
2218 { |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
2219 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
|
2220 } |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
2221 exit(0); |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
2222 } |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
2223 |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
2224 /** Test MsimMessage for basic functionality. */ |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
2225 int msim_test_msg(void) |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
2226 { |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
2227 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
|
2228 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
|
2229 guint failures; |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
2230 |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
2231 failures = 0; |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
2232 |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
2233 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
|
2234 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
|
2235 |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
2236 /* 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
|
2237 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
|
2238 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
|
2239 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
|
2240 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
|
2241 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
|
2242 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
|
2243 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
|
2244 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
|
2245 |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
2246 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
|
2247 |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
2248 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
|
2249 "\\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
|
2250 |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
2251 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
|
2252 { |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
2253 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
|
2254 ++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
|
2255 } |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
2256 |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
2257 |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
2258 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
|
2259 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
|
2260 |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
2261 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
|
2262 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
|
2263 { |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
2264 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
|
2265 ++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
|
2266 } |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
2267 |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
2268 g_free(packed); |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
2269 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
|
2270 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
|
2271 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
|
2272 |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
2273 return failures; |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
2274 } |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
2275 |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
2276 /** Test protocol-level escaping/unescaping. */ |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
2277 int msim_test_escaping(void) |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
2278 { |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
2279 guint failures; |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
2280 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
|
2281 |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
2282 failures = 0; |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
2283 |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
2284 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
|
2285 |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
2286 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
|
2287 |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
2288 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
|
2289 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
|
2290 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
|
2291 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
|
2292 { |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
2293 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
|
2294 ++failures, escaped, expected); |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
2295 } |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
2296 |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
2297 |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
2298 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
|
2299 g_free(escaped); |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
2300 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
|
2301 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
|
2302 { |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
2303 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
|
2304 ++failures, raw, unescaped); |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
2305 } |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
2306 |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
2307 return failures; |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
2308 } |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
2309 |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
2310 /** Initialize 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
|
2311 void init_plugin(PurplePlugin *plugin) |
16733
a8e8482a2dc6
Clean up a few TODO's.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16731
diff
changeset
|
2312 { |
a8e8482a2dc6
Clean up a few TODO's.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16731
diff
changeset
|
2313 PurpleAccountOption *option; |
17648
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
2314 #define MSIM_SELF_TEST |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
2315 #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
|
2316 msim_test_all(); |
23f57d36cb65
Add msim_test_all() and related procedures, to perform basic functionality
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17647
diff
changeset
|
2317 #endif /* MSIM_SELF_TEST */ |
16733
a8e8482a2dc6
Clean up a few TODO's.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16731
diff
changeset
|
2318 |
a8e8482a2dc6
Clean up a few TODO's.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16731
diff
changeset
|
2319 /* 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
|
2320 * 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
|
2321 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
|
2322 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
|
2323 |
a8e8482a2dc6
Clean up a few TODO's.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
16731
diff
changeset
|
2324 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
|
2325 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
|
2326 |
d198d62c5ff5
Add two boolean options to account dialog, to allow displaying of
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17331
diff
changeset
|
2327 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
|
2328 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
|
2329 |
d198d62c5ff5
Add two boolean options to account dialog, to allow displaying of
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17331
diff
changeset
|
2330 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
|
2331 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
|
2332 } |
16394 | 2333 |
16396 | 2334 PURPLE_INIT_PLUGIN(myspace, init_plugin, info); |