Wed, 04 Jul 2007 21:36:19 +0000
disapproval of revision 'cf3c4bed82063e96b0522c7e20bba356b6a0e38c'
| 16322 | 1 | /* MySpaceIM Protocol Plugin |
| 2 | * | |
| 3 | * \author Jeff Connelly | |
| 4 | * | |
| 18013 | 5 | * Copyright (C) 2007, Jeff Connelly <jeff2@soc.pidgin.im> |
| 16322 | 6 | * |
| 16324 | 7 | * Based on Purple's "C Plugin HOWTO" hello world example. |
| 16322 | 8 | * |
|
17903
1c344d9266b8
Use MsimMessage via msim_send(), instead of msim_send_raw(). This is a more
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17902
diff
changeset
|
9 | * Code also drawn from mockprpl: |
| 16324 | 10 | * http://snarfed.org/space/purple+mock+protocol+plugin |
| 16322 | 11 | * Copyright (C) 2004-2007, Ryan Barrett <mockprpl@ryanb.org> |
| 12 | * | |
| 16324 | 13 | * and some constructs also based on existing Purple plugins, which are: |
| 14 | * Copyright (C) 2003, Robbert Haarman <purple@inglorion.net> | |
| 16322 | 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 | ||
| 16324 | 34 | #define PURPLE_PLUGIN |
| 16322 | 35 | |
|
17910
9bbfa75ba90b
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17906
diff
changeset
|
36 | #include "message.h" |
|
17930
d8908611bf64
Use symbolic constants for persist messages.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17929
diff
changeset
|
37 | #include "persist.h" |
|
16333
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
38 | #include "myspace.h" |
| 16322 | 39 | |
|
17893
308a27332b57
Check for RC4 in libpurple on plugin initialization.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17892
diff
changeset
|
40 | /** |
|
308a27332b57
Check for RC4 in libpurple on plugin initialization.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17892
diff
changeset
|
41 | * Load the plugin. |
|
308a27332b57
Check for RC4 in libpurple on plugin initialization.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17892
diff
changeset
|
42 | */ |
|
17994
b3b072dd8478
Split return type and function name + arguments on to separate lines, to
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17993
diff
changeset
|
43 | gboolean |
|
b3b072dd8478
Split return type and function name + arguments on to separate lines, to
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17993
diff
changeset
|
44 | msim_load(PurplePlugin *plugin) |
|
17893
308a27332b57
Check for RC4 in libpurple on plugin initialization.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17892
diff
changeset
|
45 | { |
|
308a27332b57
Check for RC4 in libpurple on plugin initialization.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17892
diff
changeset
|
46 | /* If compiled to use RC4 from libpurple, check if it is really there. */ |
|
308a27332b57
Check for RC4 in libpurple on plugin initialization.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17892
diff
changeset
|
47 | if (!purple_ciphers_find_cipher("rc4")) |
|
308a27332b57
Check for RC4 in libpurple on plugin initialization.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17892
diff
changeset
|
48 | { |
|
18016
ca7f1387a04b
Remove RC4 implementation, now exclusively rely on libpurple to provide RC4.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18014
diff
changeset
|
49 | purple_debug_error("msim", "rc4 not in libpurple, but it is required - not loading MySpaceIM plugin!\n"); |
|
17895
6c2facc6c33b
Use _ for translations in msimprpl. See #648.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17894
diff
changeset
|
50 | purple_notify_error(plugin, _("Missing Cipher"), |
|
6c2facc6c33b
Use _ for translations in msimprpl. See #648.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17894
diff
changeset
|
51 | _("The RC4 cipher could not be found"), |
|
18016
ca7f1387a04b
Remove RC4 implementation, now exclusively rely on libpurple to provide RC4.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18014
diff
changeset
|
52 | _("Upgrade " |
|
17895
6c2facc6c33b
Use _ for translations in msimprpl. See #648.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17894
diff
changeset
|
53 | "to a libpurple with RC4 support (>= 2.0.1). MySpaceIM " |
|
17903
1c344d9266b8
Use MsimMessage via msim_send(), instead of msim_send_raw(). This is a more
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17902
diff
changeset
|
54 | "plugin will not be loaded.")); |
|
17893
308a27332b57
Check for RC4 in libpurple on plugin initialization.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17892
diff
changeset
|
55 | return FALSE; |
|
308a27332b57
Check for RC4 in libpurple on plugin initialization.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17892
diff
changeset
|
56 | } |
|
308a27332b57
Check for RC4 in libpurple on plugin initialization.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17892
diff
changeset
|
57 | return TRUE; |
| 16322 | 58 | } |
| 59 | ||
| 60 | /** | |
| 61 | * Get possible user status types. Based on mockprpl. | |
| 62 | * | |
| 63 | * @return GList of status types. | |
| 64 | */ | |
|
17994
b3b072dd8478
Split return type and function name + arguments on to separate lines, to
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17993
diff
changeset
|
65 | GList * |
|
b3b072dd8478
Split return type and function name + arguments on to separate lines, to
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17993
diff
changeset
|
66 | msim_status_types(PurpleAccount *acct) |
| 16322 | 67 | { |
| 68 | GList *types; | |
|
17910
9bbfa75ba90b
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17906
diff
changeset
|
69 | PurpleStatusType *status; |
| 16322 | 70 | |
|
17910
9bbfa75ba90b
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17906
diff
changeset
|
71 | purple_debug_info("myspace", "returning status types\n"); |
| 16322 | 72 | |
| 73 | types = NULL; | |
| 74 | ||
|
17910
9bbfa75ba90b
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17906
diff
changeset
|
75 | status = purple_status_type_new_full(PURPLE_STATUS_AVAILABLE, NULL, NULL, FALSE, TRUE, FALSE); |
|
9bbfa75ba90b
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17906
diff
changeset
|
76 | types = g_list_append(types, status); |
| 16322 | 77 | |
|
17910
9bbfa75ba90b
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17906
diff
changeset
|
78 | status = purple_status_type_new_full(PURPLE_STATUS_AWAY, NULL, NULL, FALSE, TRUE, FALSE); |
|
9bbfa75ba90b
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17906
diff
changeset
|
79 | types = g_list_append(types, status); |
| 16322 | 80 | |
|
17910
9bbfa75ba90b
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17906
diff
changeset
|
81 | status = purple_status_type_new_full(PURPLE_STATUS_OFFLINE, NULL, NULL, FALSE, TRUE, FALSE); |
|
9bbfa75ba90b
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17906
diff
changeset
|
82 | types = g_list_append(types, status); |
| 16322 | 83 | |
|
17910
9bbfa75ba90b
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17906
diff
changeset
|
84 | status = purple_status_type_new_full(PURPLE_STATUS_INVISIBLE, NULL, NULL, FALSE, TRUE, FALSE); |
|
9bbfa75ba90b
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17906
diff
changeset
|
85 | types = g_list_append(types, status); |
| 16322 | 86 | |
| 87 | return types; | |
| 88 | } | |
| 89 | ||
|
16333
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
90 | /** |
|
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
91 | * Return the icon name for a buddy and account. |
|
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
92 | * |
|
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
93 | * @param acct The account to find the icon for, or NULL for protocol icon. |
|
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
94 | * @param buddy The buddy to find the icon for, or NULL for the account icon. |
|
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
95 | * |
|
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
96 | * @return The base icon name string. |
|
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
97 | */ |
|
17994
b3b072dd8478
Split return type and function name + arguments on to separate lines, to
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17993
diff
changeset
|
98 | const gchar * |
|
b3b072dd8478
Split return type and function name + arguments on to separate lines, to
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17993
diff
changeset
|
99 | msim_list_icon(PurpleAccount *acct, PurpleBuddy *buddy) |
|
16333
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
100 | { |
|
17970
3c92ce43ddae
Change to use const gchar * where appropriate.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17969
diff
changeset
|
101 | /* Use a MySpace icon submitted by hbons at |
|
17900
402fdc925e30
Clean up a few TODO's.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17898
diff
changeset
|
102 | * http://developer.pidgin.im/wiki/MySpaceIM. */ |
|
16334
ff6947265141
Add and use MySpaceIM icon uploaded by hbons (48x48 original and resized 22x22 and 16x16 versions).
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16333
diff
changeset
|
103 | return "myspace"; |
|
16333
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
104 | } |
|
16337
ba0ded418e6a
Add escaping and unescaping functions (for /1 and /2).
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16335
diff
changeset
|
105 | |
|
17982
7c2fe89250cd
Refactor msim_escape() & msim_unescape().
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17981
diff
changeset
|
106 | /* Replacement codes to be replaced with associated replacement text, |
|
7c2fe89250cd
Refactor msim_escape() & msim_unescape().
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17981
diff
changeset
|
107 | * used for protocol message escaping / unescaping. */ |
|
17981
2e330f731690
Add msim_test_all() and related procedures, to perform basic functionality
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17980
diff
changeset
|
108 | static gchar* msim_replacement_code[] = { "/1", "/2", NULL }; |
|
2e330f731690
Add msim_test_all() and related procedures, to perform basic functionality
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17980
diff
changeset
|
109 | static gchar* msim_replacement_text[] = { "/", "\\", NULL }; |
|
2e330f731690
Add msim_test_all() and related procedures, to perform basic functionality
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17980
diff
changeset
|
110 | |
|
16337
ba0ded418e6a
Add escaping and unescaping functions (for /1 and /2).
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16335
diff
changeset
|
111 | /** |
|
17982
7c2fe89250cd
Refactor msim_escape() & msim_unescape().
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17981
diff
changeset
|
112 | * Unescape or escape a protocol message. |
|
16337
ba0ded418e6a
Add escaping and unescaping functions (for /1 and /2).
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16335
diff
changeset
|
113 | * |
|
17982
7c2fe89250cd
Refactor msim_escape() & msim_unescape().
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17981
diff
changeset
|
114 | * @param msg The message to be unescaped or escaped. WILL BE FREED. |
|
7c2fe89250cd
Refactor msim_escape() & msim_unescape().
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17981
diff
changeset
|
115 | * @param escape TRUE to escape, FALSE to unescape. |
|
7c2fe89250cd
Refactor msim_escape() & msim_unescape().
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17981
diff
changeset
|
116 | * |
|
7c2fe89250cd
Refactor msim_escape() & msim_unescape().
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17981
diff
changeset
|
117 | * @return The unescaped or escaped message. Caller must g_free(). |
|
16337
ba0ded418e6a
Add escaping and unescaping functions (for /1 and /2).
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16335
diff
changeset
|
118 | */ |
|
17994
b3b072dd8478
Split return type and function name + arguments on to separate lines, to
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17993
diff
changeset
|
119 | gchar * |
|
b3b072dd8478
Split return type and function name + arguments on to separate lines, to
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17993
diff
changeset
|
120 | msim_unescape_or_escape(gchar *msg, gboolean escape) |
|
16337
ba0ded418e6a
Add escaping and unescaping functions (for /1 and /2).
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16335
diff
changeset
|
121 | { |
|
17982
7c2fe89250cd
Refactor msim_escape() & msim_unescape().
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17981
diff
changeset
|
122 | gchar *tmp, *code, *text; |
|
7c2fe89250cd
Refactor msim_escape() & msim_unescape().
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17981
diff
changeset
|
123 | guint i; |
|
7c2fe89250cd
Refactor msim_escape() & msim_unescape().
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17981
diff
changeset
|
124 | |
|
7c2fe89250cd
Refactor msim_escape() & msim_unescape().
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17981
diff
changeset
|
125 | /* Replace each code in msim_replacement_code with |
|
7c2fe89250cd
Refactor msim_escape() & msim_unescape().
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17981
diff
changeset
|
126 | * corresponding entry in msim_replacement_text. */ |
|
7c2fe89250cd
Refactor msim_escape() & msim_unescape().
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17981
diff
changeset
|
127 | for (i = 0; (code = msim_replacement_code[i]) |
|
7c2fe89250cd
Refactor msim_escape() & msim_unescape().
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17981
diff
changeset
|
128 | && (text = msim_replacement_text[i]); ++i) |
|
7c2fe89250cd
Refactor msim_escape() & msim_unescape().
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17981
diff
changeset
|
129 | { |
|
7c2fe89250cd
Refactor msim_escape() & msim_unescape().
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17981
diff
changeset
|
130 | if (escape) |
|
7c2fe89250cd
Refactor msim_escape() & msim_unescape().
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17981
diff
changeset
|
131 | { |
|
7c2fe89250cd
Refactor msim_escape() & msim_unescape().
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17981
diff
changeset
|
132 | tmp = str_replace(msg, text, code); |
|
7c2fe89250cd
Refactor msim_escape() & msim_unescape().
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17981
diff
changeset
|
133 | } |
|
7c2fe89250cd
Refactor msim_escape() & msim_unescape().
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17981
diff
changeset
|
134 | else |
|
7c2fe89250cd
Refactor msim_escape() & msim_unescape().
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17981
diff
changeset
|
135 | { |
|
7c2fe89250cd
Refactor msim_escape() & msim_unescape().
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17981
diff
changeset
|
136 | tmp = str_replace(msg, code, text); |
|
7c2fe89250cd
Refactor msim_escape() & msim_unescape().
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17981
diff
changeset
|
137 | } |
|
7c2fe89250cd
Refactor msim_escape() & msim_unescape().
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17981
diff
changeset
|
138 | g_free(msg); |
|
7c2fe89250cd
Refactor msim_escape() & msim_unescape().
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17981
diff
changeset
|
139 | msg = tmp; |
|
7c2fe89250cd
Refactor msim_escape() & msim_unescape().
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17981
diff
changeset
|
140 | } |
|
16337
ba0ded418e6a
Add escaping and unescaping functions (for /1 and /2).
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16335
diff
changeset
|
141 | |
|
17982
7c2fe89250cd
Refactor msim_escape() & msim_unescape().
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17981
diff
changeset
|
142 | return msg; |
|
16337
ba0ded418e6a
Add escaping and unescaping functions (for /1 and /2).
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16335
diff
changeset
|
143 | } |
|
ba0ded418e6a
Add escaping and unescaping functions (for /1 and /2).
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16335
diff
changeset
|
144 | |
|
ba0ded418e6a
Add escaping and unescaping functions (for /1 and /2).
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16335
diff
changeset
|
145 | /** |
|
ba0ded418e6a
Add escaping and unescaping functions (for /1 and /2).
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16335
diff
changeset
|
146 | * Escape a protocol message. |
|
ba0ded418e6a
Add escaping and unescaping functions (for /1 and /2).
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16335
diff
changeset
|
147 | * |
|
ba0ded418e6a
Add escaping and unescaping functions (for /1 and /2).
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16335
diff
changeset
|
148 | * @return The escaped message. Caller must g_free(). |
|
ba0ded418e6a
Add escaping and unescaping functions (for /1 and /2).
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16335
diff
changeset
|
149 | */ |
|
17994
b3b072dd8478
Split return type and function name + arguments on to separate lines, to
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17993
diff
changeset
|
150 | gchar * |
|
b3b072dd8478
Split return type and function name + arguments on to separate lines, to
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17993
diff
changeset
|
151 | msim_escape(const gchar *msg) |
|
16337
ba0ded418e6a
Add escaping and unescaping functions (for /1 and /2).
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16335
diff
changeset
|
152 | { |
|
17982
7c2fe89250cd
Refactor msim_escape() & msim_unescape().
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17981
diff
changeset
|
153 | return msim_unescape_or_escape(g_strdup(msg), TRUE); |
|
7c2fe89250cd
Refactor msim_escape() & msim_unescape().
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17981
diff
changeset
|
154 | } |
|
16337
ba0ded418e6a
Add escaping and unescaping functions (for /1 and /2).
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16335
diff
changeset
|
155 | |
|
17994
b3b072dd8478
Split return type and function name + arguments on to separate lines, to
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17993
diff
changeset
|
156 | gchar * |
|
b3b072dd8478
Split return type and function name + arguments on to separate lines, to
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17993
diff
changeset
|
157 | msim_unescape(const gchar *msg) |
|
17982
7c2fe89250cd
Refactor msim_escape() & msim_unescape().
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17981
diff
changeset
|
158 | { |
|
7c2fe89250cd
Refactor msim_escape() & msim_unescape().
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17981
diff
changeset
|
159 | return msim_unescape_or_escape(g_strdup(msg), FALSE); |
|
16337
ba0ded418e6a
Add escaping and unescaping functions (for /1 and /2).
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16335
diff
changeset
|
160 | } |
|
ba0ded418e6a
Add escaping and unescaping functions (for /1 and /2).
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16335
diff
changeset
|
161 | |
|
ba0ded418e6a
Add escaping and unescaping functions (for /1 and /2).
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16335
diff
changeset
|
162 | /** |
|
ba0ded418e6a
Add escaping and unescaping functions (for /1 and /2).
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16335
diff
changeset
|
163 | * Replace 'old' with 'new' in 'str'. |
|
ba0ded418e6a
Add escaping and unescaping functions (for /1 and /2).
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16335
diff
changeset
|
164 | * |
|
ba0ded418e6a
Add escaping and unescaping functions (for /1 and /2).
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16335
diff
changeset
|
165 | * @param str The original string. |
|
ba0ded418e6a
Add escaping and unescaping functions (for /1 and /2).
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16335
diff
changeset
|
166 | * @param old The substring of 'str' to replace. |
|
ba0ded418e6a
Add escaping and unescaping functions (for /1 and /2).
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16335
diff
changeset
|
167 | * @param new The replacement for 'old' within 'str'. |
|
ba0ded418e6a
Add escaping and unescaping functions (for /1 and /2).
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16335
diff
changeset
|
168 | * |
|
ba0ded418e6a
Add escaping and unescaping functions (for /1 and /2).
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16335
diff
changeset
|
169 | * @return A _new_ string, based on 'str', with 'old' replaced |
|
ba0ded418e6a
Add escaping and unescaping functions (for /1 and /2).
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16335
diff
changeset
|
170 | * by 'new'. Must be g_free()'d by caller. |
|
ba0ded418e6a
Add escaping and unescaping functions (for /1 and /2).
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16335
diff
changeset
|
171 | * |
|
ba0ded418e6a
Add escaping and unescaping functions (for /1 and /2).
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16335
diff
changeset
|
172 | * This string replace method is based on |
|
ba0ded418e6a
Add escaping and unescaping functions (for /1 and /2).
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16335
diff
changeset
|
173 | * http://mail.gnome.org/archives/gtk-app-devel-list/2000-July/msg00201.html |
|
ba0ded418e6a
Add escaping and unescaping functions (for /1 and /2).
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16335
diff
changeset
|
174 | * |
|
ba0ded418e6a
Add escaping and unescaping functions (for /1 and /2).
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16335
diff
changeset
|
175 | */ |
|
17994
b3b072dd8478
Split return type and function name + arguments on to separate lines, to
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17993
diff
changeset
|
176 | gchar * |
|
b3b072dd8478
Split return type and function name + arguments on to separate lines, to
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17993
diff
changeset
|
177 | str_replace(const gchar *str, const gchar *old, const gchar *new) |
|
16337
ba0ded418e6a
Add escaping and unescaping functions (for /1 and /2).
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16335
diff
changeset
|
178 | { |
|
17970
3c92ce43ddae
Change to use const gchar * where appropriate.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17969
diff
changeset
|
179 | gchar **items; |
|
3c92ce43ddae
Change to use const gchar * where appropriate.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17969
diff
changeset
|
180 | gchar *ret; |
|
16337
ba0ded418e6a
Add escaping and unescaping functions (for /1 and /2).
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16335
diff
changeset
|
181 | |
|
ba0ded418e6a
Add escaping and unescaping functions (for /1 and /2).
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16335
diff
changeset
|
182 | items = g_strsplit(str, old, -1); |
|
ba0ded418e6a
Add escaping and unescaping functions (for /1 and /2).
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16335
diff
changeset
|
183 | ret = g_strjoinv(new, items); |
|
ba0ded418e6a
Add escaping and unescaping functions (for /1 and /2).
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16335
diff
changeset
|
184 | g_free(items); |
|
ba0ded418e6a
Add escaping and unescaping functions (for /1 and /2).
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16335
diff
changeset
|
185 | return ret; |
|
ba0ded418e6a
Add escaping and unescaping functions (for /1 and /2).
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16335
diff
changeset
|
186 | } |
|
ba0ded418e6a
Add escaping and unescaping functions (for /1 and /2).
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16335
diff
changeset
|
187 | |
|
17892
66984c1aac79
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17890
diff
changeset
|
188 | #ifdef MSIM_DEBUG_MSG |
|
17994
b3b072dd8478
Split return type and function name + arguments on to separate lines, to
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17993
diff
changeset
|
189 | void |
|
b3b072dd8478
Split return type and function name + arguments on to separate lines, to
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17993
diff
changeset
|
190 | print_hash_item(gpointer key, gpointer value, gpointer user_data) |
| 16322 | 191 | { |
|
17970
3c92ce43ddae
Change to use const gchar * where appropriate.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17969
diff
changeset
|
192 | purple_debug_info("msim", "%s=%s\n", (gchar *)key, (gchar *)value); |
| 16322 | 193 | } |
|
16335
0c2b32acc27a
Replace printf() in MySpaceIM prpl with purple_debug_info().
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16334
diff
changeset
|
194 | #endif |
| 16322 | 195 | |
| 196 | /** | |
|
17993
d11321258152
Add a send_raw function, msim_send_really_raw, into the prpl_info struct,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17992
diff
changeset
|
197 | * Send raw data (given as a NUL-terminated string) to the server. |
| 16322 | 198 | * |
| 199 | * @param session | |
|
17993
d11321258152
Add a send_raw function, msim_send_really_raw, into the prpl_info struct,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17992
diff
changeset
|
200 | * @param msg The raw data to send, in a NUL-terminated string. |
|
16337
ba0ded418e6a
Add escaping and unescaping functions (for /1 and /2).
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16335
diff
changeset
|
201 | * |
|
ba0ded418e6a
Add escaping and unescaping functions (for /1 and /2).
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16335
diff
changeset
|
202 | * @return TRUE if succeeded, FALSE if not. |
| 16322 | 203 | * |
| 204 | */ | |
|
17994
b3b072dd8478
Split return type and function name + arguments on to separate lines, to
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17993
diff
changeset
|
205 | gboolean |
|
b3b072dd8478
Split return type and function name + arguments on to separate lines, to
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17993
diff
changeset
|
206 | msim_send_raw(MsimSession *session, const gchar *msg) |
| 16322 | 207 | { |
|
17903
1c344d9266b8
Use MsimMessage via msim_send(), instead of msim_send_raw(). This is a more
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17902
diff
changeset
|
208 | purple_debug_info("msim", "msim_send_raw: writing <%s>\n", msg); |
| 16322 | 209 | |
|
16337
ba0ded418e6a
Add escaping and unescaping functions (for /1 and /2).
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16335
diff
changeset
|
210 | g_return_val_if_fail(MSIM_SESSION_VALID(session), FALSE); |
|
ba0ded418e6a
Add escaping and unescaping functions (for /1 and /2).
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16335
diff
changeset
|
211 | g_return_val_if_fail(msg != NULL, FALSE); |
|
ba0ded418e6a
Add escaping and unescaping functions (for /1 and /2).
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16335
diff
changeset
|
212 | |
|
17993
d11321258152
Add a send_raw function, msim_send_really_raw, into the prpl_info struct,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17992
diff
changeset
|
213 | return msim_send_really_raw(session->gc, msg, strlen(msg)) == |
|
d11321258152
Add a send_raw function, msim_send_really_raw, into the prpl_info struct,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17992
diff
changeset
|
214 | strlen(msg); |
|
d11321258152
Add a send_raw function, msim_send_really_raw, into the prpl_info struct,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17992
diff
changeset
|
215 | } |
| 16322 | 216 | |
|
17993
d11321258152
Add a send_raw function, msim_send_really_raw, into the prpl_info struct,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17992
diff
changeset
|
217 | /** Send raw data to the server, possibly with embedded NULs. |
|
d11321258152
Add a send_raw function, msim_send_really_raw, into the prpl_info struct,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17992
diff
changeset
|
218 | * |
|
d11321258152
Add a send_raw function, msim_send_really_raw, into the prpl_info struct,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17992
diff
changeset
|
219 | * Used in prpl_info struct, so that plugins can have the most possible |
|
d11321258152
Add a send_raw function, msim_send_really_raw, into the prpl_info struct,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17992
diff
changeset
|
220 | * control of what is sent over the connection. Inside this prpl, |
|
d11321258152
Add a send_raw function, msim_send_really_raw, into the prpl_info struct,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17992
diff
changeset
|
221 | * msim_send_raw() is used, since it sends NUL-terminated strings (easier). |
|
d11321258152
Add a send_raw function, msim_send_really_raw, into the prpl_info struct,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17992
diff
changeset
|
222 | * |
|
d11321258152
Add a send_raw function, msim_send_really_raw, into the prpl_info struct,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17992
diff
changeset
|
223 | * @param gc PurpleConnection |
|
d11321258152
Add a send_raw function, msim_send_really_raw, into the prpl_info struct,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17992
diff
changeset
|
224 | * @param buf Buffer to send |
|
d11321258152
Add a send_raw function, msim_send_really_raw, into the prpl_info struct,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17992
diff
changeset
|
225 | * @param total_bytes Size of buffer to send |
|
d11321258152
Add a send_raw function, msim_send_really_raw, into the prpl_info struct,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17992
diff
changeset
|
226 | * |
|
d11321258152
Add a send_raw function, msim_send_really_raw, into the prpl_info struct,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17992
diff
changeset
|
227 | * @return Bytes successfully sent. |
|
d11321258152
Add a send_raw function, msim_send_really_raw, into the prpl_info struct,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17992
diff
changeset
|
228 | */ |
|
17994
b3b072dd8478
Split return type and function name + arguments on to separate lines, to
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17993
diff
changeset
|
229 | int |
|
b3b072dd8478
Split return type and function name + arguments on to separate lines, to
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17993
diff
changeset
|
230 | msim_send_really_raw(PurpleConnection *gc, const char *buf, int total_bytes) |
|
17993
d11321258152
Add a send_raw function, msim_send_really_raw, into the prpl_info struct,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17992
diff
changeset
|
231 | { |
|
d11321258152
Add a send_raw function, msim_send_really_raw, into the prpl_info struct,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17992
diff
changeset
|
232 | int total_bytes_sent; |
|
d11321258152
Add a send_raw function, msim_send_really_raw, into the prpl_info struct,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17992
diff
changeset
|
233 | |
|
16337
ba0ded418e6a
Add escaping and unescaping functions (for /1 and /2).
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16335
diff
changeset
|
234 | /* Loop until all data is sent, or a failure occurs. */ |
|
ba0ded418e6a
Add escaping and unescaping functions (for /1 and /2).
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16335
diff
changeset
|
235 | total_bytes_sent = 0; |
|
ba0ded418e6a
Add escaping and unescaping functions (for /1 and /2).
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16335
diff
changeset
|
236 | do |
|
ba0ded418e6a
Add escaping and unescaping functions (for /1 and /2).
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16335
diff
changeset
|
237 | { |
|
ba0ded418e6a
Add escaping and unescaping functions (for /1 and /2).
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16335
diff
changeset
|
238 | int bytes_sent; |
|
ba0ded418e6a
Add escaping and unescaping functions (for /1 and /2).
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16335
diff
changeset
|
239 | |
|
17993
d11321258152
Add a send_raw function, msim_send_really_raw, into the prpl_info struct,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17992
diff
changeset
|
240 | bytes_sent = send(((MsimSession*)(gc->proto_data))->fd, |
|
d11321258152
Add a send_raw function, msim_send_really_raw, into the prpl_info struct,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17992
diff
changeset
|
241 | buf + total_bytes_sent, total_bytes - total_bytes_sent, 0); |
| 16322 | 242 | |
|
16337
ba0ded418e6a
Add escaping and unescaping functions (for /1 and /2).
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16335
diff
changeset
|
243 | if (bytes_sent < 0) |
|
ba0ded418e6a
Add escaping and unescaping functions (for /1 and /2).
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16335
diff
changeset
|
244 | { |
|
17890
6926ed504a9a
Add initializers for reserved fields in plugin and prpl structures.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16337
diff
changeset
|
245 | purple_debug_info("msim", "msim_send_raw(%s): send() failed: %s\n", |
|
17993
d11321258152
Add a send_raw function, msim_send_really_raw, into the prpl_info struct,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17992
diff
changeset
|
246 | buf, g_strerror(errno)); |
|
d11321258152
Add a send_raw function, msim_send_really_raw, into the prpl_info struct,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17992
diff
changeset
|
247 | return total_bytes_sent; |
|
16337
ba0ded418e6a
Add escaping and unescaping functions (for /1 and /2).
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16335
diff
changeset
|
248 | } |
|
ba0ded418e6a
Add escaping and unescaping functions (for /1 and /2).
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16335
diff
changeset
|
249 | total_bytes_sent += bytes_sent; |
|
ba0ded418e6a
Add escaping and unescaping functions (for /1 and /2).
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16335
diff
changeset
|
250 | |
|
ba0ded418e6a
Add escaping and unescaping functions (for /1 and /2).
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16335
diff
changeset
|
251 | } while(total_bytes_sent < total_bytes); |
|
17993
d11321258152
Add a send_raw function, msim_send_really_raw, into the prpl_info struct,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17992
diff
changeset
|
252 | |
|
d11321258152
Add a send_raw function, msim_send_really_raw, into the prpl_info struct,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17992
diff
changeset
|
253 | return total_bytes_sent; |
| 16322 | 254 | } |
| 255 | ||
|
17993
d11321258152
Add a send_raw function, msim_send_really_raw, into the prpl_info struct,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17992
diff
changeset
|
256 | |
|
16333
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
257 | /** |
|
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
258 | * Start logging in to the MSIM servers. |
|
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
259 | * |
|
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
260 | * @param acct Account information to use to login. |
|
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
261 | */ |
|
17994
b3b072dd8478
Split return type and function name + arguments on to separate lines, to
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17993
diff
changeset
|
262 | void |
|
b3b072dd8478
Split return type and function name + arguments on to separate lines, to
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17993
diff
changeset
|
263 | msim_login(PurpleAccount *acct) |
|
16333
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
264 | { |
|
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
265 | PurpleConnection *gc; |
|
17970
3c92ce43ddae
Change to use const gchar * where appropriate.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17969
diff
changeset
|
266 | const gchar *host; |
|
16333
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
267 | int port; |
|
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
268 | |
|
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
269 | g_return_if_fail(acct != NULL); |
|
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
270 | |
|
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
271 | purple_debug_info("myspace", "logging in %s\n", acct->username); |
|
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
272 | |
|
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
273 | gc = purple_account_get_connection(acct); |
|
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
274 | gc->proto_data = msim_session_new(acct); |
|
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
275 | |
|
18017
48384af36ad9
Increase password length limit to 10 and update changes file.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18016
diff
changeset
|
276 | /* Passwords are limited in length. */ |
|
17998
e739eb3e0567
Fail with our own error message if an entered password is greater than 8
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17997
diff
changeset
|
277 | if (strlen(acct->password) > MSIM_MAX_PASSWORD_LENGTH) |
|
e739eb3e0567
Fail with our own error message if an entered password is greater than 8
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17997
diff
changeset
|
278 | { |
|
e739eb3e0567
Fail with our own error message if an entered password is greater than 8
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17997
diff
changeset
|
279 | gchar *str; |
|
e739eb3e0567
Fail with our own error message if an entered password is greater than 8
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17997
diff
changeset
|
280 | |
|
e739eb3e0567
Fail with our own error message if an entered password is greater than 8
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17997
diff
changeset
|
281 | |
|
18009
59eed9bd2dea
Be more defensive about null pointers, especially null strings in %s format
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18007
diff
changeset
|
282 | str = g_strdup_printf( |
|
59eed9bd2dea
Be more defensive about null pointers, especially null strings in %s format
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18007
diff
changeset
|
283 | _("Sorry, passwords over %d characters in length (yours is " |
|
59eed9bd2dea
Be more defensive about null pointers, especially null strings in %s format
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18007
diff
changeset
|
284 | "%d) are currently not supported by the MySpaceIM plugin."), |
|
59eed9bd2dea
Be more defensive about null pointers, especially null strings in %s format
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18007
diff
changeset
|
285 | MSIM_MAX_PASSWORD_LENGTH, |
|
17998
e739eb3e0567
Fail with our own error message if an entered password is greater than 8
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17997
diff
changeset
|
286 | (int)strlen(acct->password)); |
|
e739eb3e0567
Fail with our own error message if an entered password is greater than 8
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17997
diff
changeset
|
287 | |
|
e739eb3e0567
Fail with our own error message if an entered password is greater than 8
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17997
diff
changeset
|
288 | /* Notify an error message also, because this is important! */ |
|
e739eb3e0567
Fail with our own error message if an entered password is greater than 8
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17997
diff
changeset
|
289 | purple_notify_error(acct, g_strdup(_("MySpaceIM Error")), str, NULL); |
|
e739eb3e0567
Fail with our own error message if an entered password is greater than 8
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17997
diff
changeset
|
290 | |
|
e739eb3e0567
Fail with our own error message if an entered password is greater than 8
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17997
diff
changeset
|
291 | purple_connection_error(gc, str); |
|
e739eb3e0567
Fail with our own error message if an entered password is greater than 8
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17997
diff
changeset
|
292 | |
|
e739eb3e0567
Fail with our own error message if an entered password is greater than 8
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17997
diff
changeset
|
293 | g_free(str); |
|
e739eb3e0567
Fail with our own error message if an entered password is greater than 8
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17997
diff
changeset
|
294 | } |
|
e739eb3e0567
Fail with our own error message if an entered password is greater than 8
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17997
diff
changeset
|
295 | |
|
16333
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
296 | /* 1. connect to server */ |
|
17895
6c2facc6c33b
Use _ for translations in msimprpl. See #648.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17894
diff
changeset
|
297 | purple_connection_update_progress(gc, _("Connecting"), |
|
16333
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
298 | 0, /* which connection step this is */ |
|
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
299 | 4); /* total number of steps */ |
|
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
300 | |
|
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
301 | host = purple_account_get_string(acct, "server", MSIM_SERVER); |
|
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
302 | port = purple_account_get_int(acct, "port", MSIM_PORT); |
|
17900
402fdc925e30
Clean up a few TODO's.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17898
diff
changeset
|
303 | |
|
16333
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
304 | /* From purple.sf.net/api: |
|
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
305 | * """Note that this function name can be misleading--although it is called |
|
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
306 | * "proxy connect," it is used for establishing any outgoing TCP connection, |
|
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
307 | * whether through a proxy or not.""" */ |
|
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
308 | |
|
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
309 | /* Calls msim_connect_cb when connected. */ |
|
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
310 | if (purple_proxy_connect(gc, acct, host, port, msim_connect_cb, gc) == NULL) |
|
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
311 | { |
|
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
312 | /* TODO: try other ports if in auto mode, then save |
|
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
313 | * working port and try that first next time. */ |
|
17895
6c2facc6c33b
Use _ for translations in msimprpl. See #648.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17894
diff
changeset
|
314 | purple_connection_error(gc, _("Couldn't create socket")); |
|
16333
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
315 | return; |
|
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
316 | } |
|
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
317 | } |
|
17993
d11321258152
Add a send_raw function, msim_send_really_raw, into the prpl_info struct,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17992
diff
changeset
|
318 | |
| 16322 | 319 | /** |
| 320 | * Process a login challenge, sending a response. | |
| 321 | * | |
| 322 | * @param session | |
|
17924
191c78db42ae
Use MsimMessage for receiving messages everywhere, instead of GHashTable.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17910
diff
changeset
|
323 | * @param msg Login challenge message. |
| 16322 | 324 | * |
|
17935
a6a70c7213ab
Previously, the return value of the processing function and msim_process() told
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17934
diff
changeset
|
325 | * @return TRUE if successful, FALSE if not |
| 16322 | 326 | */ |
|
17994
b3b072dd8478
Split return type and function name + arguments on to separate lines, to
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17993
diff
changeset
|
327 | gboolean |
|
b3b072dd8478
Split return type and function name + arguments on to separate lines, to
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17993
diff
changeset
|
328 | msim_login_challenge(MsimSession *session, MsimMessage *msg) |
| 16322 | 329 | { |
| 16324 | 330 | PurpleAccount *account; |
|
17970
3c92ce43ddae
Change to use const gchar * where appropriate.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17969
diff
changeset
|
331 | const gchar *response; |
|
17903
1c344d9266b8
Use MsimMessage via msim_send(), instead of msim_send_raw(). This is a more
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17902
diff
changeset
|
332 | guint response_len; |
|
17924
191c78db42ae
Use MsimMessage for receiving messages everywhere, instead of GHashTable.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17910
diff
changeset
|
333 | gchar *nc; |
|
191c78db42ae
Use MsimMessage for receiving messages everywhere, instead of GHashTable.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17910
diff
changeset
|
334 | gsize nc_len; |
| 16322 | 335 | |
|
17935
a6a70c7213ab
Previously, the return value of the processing function and msim_process() told
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17934
diff
changeset
|
336 | g_return_val_if_fail(MSIM_SESSION_VALID(session), FALSE); |
|
a6a70c7213ab
Previously, the return value of the processing function and msim_process() told
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17934
diff
changeset
|
337 | g_return_val_if_fail(msg != NULL, FALSE); |
| 16322 | 338 | |
|
17935
a6a70c7213ab
Previously, the return value of the processing function and msim_process() told
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17934
diff
changeset
|
339 | g_return_val_if_fail(msim_msg_get_binary(msg, "nc", &nc, &nc_len), FALSE); |
| 16322 | 340 | |
| 341 | account = session->account; | |
|
17935
a6a70c7213ab
Previously, the return value of the processing function and msim_process() told
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17934
diff
changeset
|
342 | |
|
a6a70c7213ab
Previously, the return value of the processing function and msim_process() told
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17934
diff
changeset
|
343 | g_return_val_if_fail(account != NULL, FALSE); |
| 16322 | 344 | |
|
17895
6c2facc6c33b
Use _ for translations in msimprpl. See #648.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17894
diff
changeset
|
345 | purple_connection_update_progress(session->gc, _("Reading challenge"), 1, 4); |
| 16322 | 346 | |
|
17924
191c78db42ae
Use MsimMessage for receiving messages everywhere, instead of GHashTable.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17910
diff
changeset
|
347 | purple_debug_info("msim", "nc is %d bytes, decoded\n", nc_len); |
| 16322 | 348 | |
| 349 | if (nc_len != 0x40) | |
| 350 | { | |
| 16324 | 351 | purple_debug_info("msim", "bad nc length: %x != 0x40\n", nc_len); |
|
17895
6c2facc6c33b
Use _ for translations in msimprpl. See #648.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17894
diff
changeset
|
352 | purple_connection_error(session->gc, _("Unexpected challenge length from server")); |
|
17935
a6a70c7213ab
Previously, the return value of the processing function and msim_process() told
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17934
diff
changeset
|
353 | return FALSE; |
| 16322 | 354 | } |
| 355 | ||
|
17895
6c2facc6c33b
Use _ for translations in msimprpl. See #648.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17894
diff
changeset
|
356 | purple_connection_update_progress(session->gc, _("Logging in"), 2, 4); |
| 16322 | 357 | |
|
17903
1c344d9266b8
Use MsimMessage via msim_send(), instead of msim_send_raw(). This is a more
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17902
diff
changeset
|
358 | response = msim_compute_login_response(nc, account->username, account->password, &response_len); |
| 16322 | 359 | |
| 360 | g_free(nc); | |
| 361 | ||
|
17935
a6a70c7213ab
Previously, the return value of the processing function and msim_process() told
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17934
diff
changeset
|
362 | return msim_send(session, |
|
17903
1c344d9266b8
Use MsimMessage via msim_send(), instead of msim_send_raw(). This is a more
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17902
diff
changeset
|
363 | "login2", MSIM_TYPE_INTEGER, MSIM_AUTH_ALGORITHM, |
|
17953
c76e16c7cf0a
Add, but do not use, two new functions to postprocess outgoing messages
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17952
diff
changeset
|
364 | /* This is actually user's email address. */ |
|
17903
1c344d9266b8
Use MsimMessage via msim_send(), instead of msim_send_raw(). This is a more
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17902
diff
changeset
|
365 | "username", MSIM_TYPE_STRING, g_strdup(account->username), |
|
1c344d9266b8
Use MsimMessage via msim_send(), instead of msim_send_raw(). This is a more
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17902
diff
changeset
|
366 | /* GString and gchar * response will be freed in msim_msg_free() in msim_send(). */ |
|
1c344d9266b8
Use MsimMessage via msim_send(), instead of msim_send_raw(). This is a more
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17902
diff
changeset
|
367 | "response", MSIM_TYPE_BINARY, g_string_new_len(response, response_len), |
|
1c344d9266b8
Use MsimMessage via msim_send(), instead of msim_send_raw(). This is a more
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17902
diff
changeset
|
368 | "clientver", MSIM_TYPE_INTEGER, MSIM_CLIENT_VERSION, |
|
1c344d9266b8
Use MsimMessage via msim_send(), instead of msim_send_raw(). This is a more
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17902
diff
changeset
|
369 | "reconn", MSIM_TYPE_INTEGER, 0, |
|
1c344d9266b8
Use MsimMessage via msim_send(), instead of msim_send_raw(). This is a more
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17902
diff
changeset
|
370 | "status", MSIM_TYPE_INTEGER, 100, |
|
1c344d9266b8
Use MsimMessage via msim_send(), instead of msim_send_raw(). This is a more
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17902
diff
changeset
|
371 | "id", MSIM_TYPE_INTEGER, 1, |
|
17898
d08d6d221276
Incomplete attempt at using msim_send() instead of msim_send_raw().
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17897
diff
changeset
|
372 | NULL); |
| 16322 | 373 | } |
| 374 | ||
| 375 | /** | |
|
16333
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
376 | * Compute the base64'd login challenge response based on username, password, nonce, and IPs. |
|
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
377 | * |
|
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
378 | * @param nonce The base64 encoded nonce ('nc') field from the server. |
|
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
379 | * @param email User's email address (used as login name). |
|
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
380 | * @param password User's cleartext password. |
|
17903
1c344d9266b8
Use MsimMessage via msim_send(), instead of msim_send_raw(). This is a more
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17902
diff
changeset
|
381 | * @param response_len Will be written with response length. |
| 16322 | 382 | * |
|
17903
1c344d9266b8
Use MsimMessage via msim_send(), instead of msim_send_raw(). This is a more
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17902
diff
changeset
|
383 | * @return Binary login challenge response, ready to send to the server. Must be g_free()'d |
|
16333
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
384 | * when finished. |
| 16322 | 385 | */ |
|
17994
b3b072dd8478
Split return type and function name + arguments on to separate lines, to
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17993
diff
changeset
|
386 | const gchar * |
|
b3b072dd8478
Split return type and function name + arguments on to separate lines, to
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17993
diff
changeset
|
387 | msim_compute_login_response(const gchar nonce[2 * NONCE_SIZE], |
|
17970
3c92ce43ddae
Change to use const gchar * where appropriate.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17969
diff
changeset
|
388 | const gchar *email, const gchar *password, guint *response_len) |
| 16322 | 389 | { |
|
16333
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
390 | PurpleCipherContext *key_context; |
|
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
391 | PurpleCipher *sha1; |
|
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
392 | PurpleCipherContext *rc4; |
|
17892
66984c1aac79
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17890
diff
changeset
|
393 | |
|
16333
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
394 | guchar hash_pw[HASH_SIZE]; |
|
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
395 | guchar key[HASH_SIZE]; |
|
17906
f87472f223aa
Stylistic improvements - use type *name instead of type* name for pointers
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17903
diff
changeset
|
396 | gchar *password_utf16le; |
|
f87472f223aa
Stylistic improvements - use type *name instead of type* name for pointers
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17903
diff
changeset
|
397 | guchar *data; |
|
f87472f223aa
Stylistic improvements - use type *name instead of type* name for pointers
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17903
diff
changeset
|
398 | guchar *data_out; |
|
16333
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
399 | size_t data_len, data_out_len; |
|
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
400 | gsize conv_bytes_read, conv_bytes_written; |
|
17906
f87472f223aa
Stylistic improvements - use type *name instead of type* name for pointers
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17903
diff
changeset
|
401 | GError *conv_error; |
|
17892
66984c1aac79
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17890
diff
changeset
|
402 | #ifdef MSIM_DEBUG_LOGIN_CHALLENGE |
|
16335
0c2b32acc27a
Replace printf() in MySpaceIM prpl with purple_debug_info().
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16334
diff
changeset
|
403 | int i; |
|
0c2b32acc27a
Replace printf() in MySpaceIM prpl with purple_debug_info().
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16334
diff
changeset
|
404 | #endif |
| 16322 | 405 | |
|
16333
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
406 | /* Convert ASCII password to UTF16 little endian */ |
|
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
407 | purple_debug_info("msim", "converting password to UTF-16LE\n"); |
|
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
408 | conv_error = NULL; |
|
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
409 | password_utf16le = g_convert(password, -1, "UTF-16LE", "UTF-8", |
|
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
410 | &conv_bytes_read, &conv_bytes_written, &conv_error); |
|
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
411 | g_assert(conv_bytes_read == strlen(password)); |
|
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
412 | if (conv_error != NULL) |
|
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
413 | { |
|
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
414 | purple_debug_error("msim", |
|
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
415 | "g_convert password UTF8->UTF16LE failed: %s", |
|
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
416 | conv_error->message); |
|
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
417 | g_error_free(conv_error); |
|
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
418 | } |
| 16322 | 419 | |
|
16333
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
420 | /* Compute password hash */ |
|
17906
f87472f223aa
Stylistic improvements - use type *name instead of type* name for pointers
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17903
diff
changeset
|
421 | purple_cipher_digest_region("sha1", (guchar *)password_utf16le, |
|
16333
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
422 | conv_bytes_written, sizeof(hash_pw), hash_pw, NULL); |
|
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
423 | g_free(password_utf16le); |
|
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
424 | |
|
17892
66984c1aac79
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17890
diff
changeset
|
425 | #ifdef MSIM_DEBUG_LOGIN_CHALLENGE |
|
16335
0c2b32acc27a
Replace printf() in MySpaceIM prpl with purple_debug_info().
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16334
diff
changeset
|
426 | purple_debug_info("msim", "pwhash = "); |
|
16333
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
427 | for (i = 0; i < sizeof(hash_pw); i++) |
|
16335
0c2b32acc27a
Replace printf() in MySpaceIM prpl with purple_debug_info().
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16334
diff
changeset
|
428 | purple_debug_info("msim", "%.2x ", hash_pw[i]); |
|
0c2b32acc27a
Replace printf() in MySpaceIM prpl with purple_debug_info().
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16334
diff
changeset
|
429 | purple_debug_info("msim", "\n"); |
|
16333
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
430 | #endif |
|
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
431 | |
|
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
432 | /* key = sha1(sha1(pw) + nonce2) */ |
|
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
433 | sha1 = purple_ciphers_find_cipher("sha1"); |
|
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
434 | key_context = purple_cipher_context_new(sha1, NULL); |
|
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
435 | purple_cipher_context_append(key_context, hash_pw, HASH_SIZE); |
|
17924
191c78db42ae
Use MsimMessage for receiving messages everywhere, instead of GHashTable.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17910
diff
changeset
|
436 | purple_cipher_context_append(key_context, (guchar *)(nonce + NONCE_SIZE), NONCE_SIZE); |
|
16333
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
437 | purple_cipher_context_digest(key_context, sizeof(key), key, NULL); |
|
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
438 | |
|
17892
66984c1aac79
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17890
diff
changeset
|
439 | #ifdef MSIM_DEBUG_LOGIN_CHALLENGE |
|
16335
0c2b32acc27a
Replace printf() in MySpaceIM prpl with purple_debug_info().
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16334
diff
changeset
|
440 | purple_debug_info("msim", "key = "); |
|
16333
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
441 | for (i = 0; i < sizeof(key); i++) |
| 16322 | 442 | { |
|
16335
0c2b32acc27a
Replace printf() in MySpaceIM prpl with purple_debug_info().
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16334
diff
changeset
|
443 | purple_debug_info("msim", "%.2x ", key[i]); |
|
16333
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
444 | } |
|
16335
0c2b32acc27a
Replace printf() in MySpaceIM prpl with purple_debug_info().
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16334
diff
changeset
|
445 | purple_debug_info("msim", "\n"); |
|
16333
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
446 | #endif |
| 16322 | 447 | |
|
16333
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
448 | rc4 = purple_cipher_context_new_by_name("rc4", NULL); |
| 16322 | 449 | |
|
16333
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
450 | /* Note: 'key' variable is 0x14 bytes (from SHA-1 hash), |
|
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
451 | * but only first 0x10 used for the RC4 key. */ |
|
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
452 | purple_cipher_context_set_option(rc4, "key_len", (gpointer)0x10); |
|
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
453 | purple_cipher_context_set_key(rc4, key); |
|
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
454 | |
|
17985
930a05d4e86f
Use constants for IP address list, defined in myspace.h.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17984
diff
changeset
|
455 | /* TODO: obtain IPs of network interfaces */ |
|
930a05d4e86f
Use constants for IP address list, defined in myspace.h.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17984
diff
changeset
|
456 | |
|
16333
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
457 | /* rc4 encrypt: |
|
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
458 | * nonce1+email+IP list */ |
|
17985
930a05d4e86f
Use constants for IP address list, defined in myspace.h.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17984
diff
changeset
|
459 | |
|
930a05d4e86f
Use constants for IP address list, defined in myspace.h.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17984
diff
changeset
|
460 | data_len = NONCE_SIZE + strlen(email) + MSIM_LOGIN_IP_LIST_LEN; |
|
16333
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
461 | data = g_new0(guchar, data_len); |
|
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
462 | memcpy(data, nonce, NONCE_SIZE); |
|
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
463 | memcpy(data + NONCE_SIZE, email, strlen(email)); |
|
17985
930a05d4e86f
Use constants for IP address list, defined in myspace.h.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17984
diff
changeset
|
464 | memcpy(data + NONCE_SIZE + strlen(email), MSIM_LOGIN_IP_LIST, MSIM_LOGIN_IP_LIST_LEN); |
|
16333
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
465 | |
|
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
466 | data_out = g_new0(guchar, data_len); |
|
17892
66984c1aac79
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17890
diff
changeset
|
467 | |
|
17906
f87472f223aa
Stylistic improvements - use type *name instead of type* name for pointers
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17903
diff
changeset
|
468 | purple_cipher_context_encrypt(rc4, (const guchar *)data, |
|
16333
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
469 | data_len, data_out, &data_out_len); |
|
17892
66984c1aac79
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17890
diff
changeset
|
470 | purple_cipher_context_destroy(rc4); |
|
66984c1aac79
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17890
diff
changeset
|
471 | |
|
16333
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
472 | g_assert(data_out_len == data_len); |
|
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
473 | |
|
17903
1c344d9266b8
Use MsimMessage via msim_send(), instead of msim_send_raw(). This is a more
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17902
diff
changeset
|
474 | #ifdef MSIM_DEBUG_LOGIN_CHALLENGE |
|
1c344d9266b8
Use MsimMessage via msim_send(), instead of msim_send_raw(). This is a more
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17902
diff
changeset
|
475 | purple_debug_info("msim", "response=<%s>\n", data_out); |
|
17892
66984c1aac79
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17890
diff
changeset
|
476 | #endif |
|
66984c1aac79
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17890
diff
changeset
|
477 | |
|
17903
1c344d9266b8
Use MsimMessage via msim_send(), instead of msim_send_raw(). This is a more
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17902
diff
changeset
|
478 | *response_len = data_out_len; |
|
16333
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
479 | |
|
17970
3c92ce43ddae
Change to use const gchar * where appropriate.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17969
diff
changeset
|
480 | return (const gchar *)data_out; |
|
16333
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
481 | } |
| 16322 | 482 | |
|
16333
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
483 | /** |
|
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
484 | * Schedule an IM to be sent once the user ID is looked up. |
|
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
485 | * |
|
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
486 | * @param gc Connection. |
|
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
487 | * @param who A user id, email, or username to send the message to. |
|
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
488 | * @param message Instant message text to send. |
|
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
489 | * @param flags Flags. |
|
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
490 | * |
|
17954
b5d62ba24136
Change msim_send_im() to use msim_postprocess_outgoing(), eliminating the
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17953
diff
changeset
|
491 | * @return 1 if successful or postponed, -1 if failed |
|
16333
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
492 | * |
|
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
493 | * Allows sending to a user by username, email address, or userid. If |
|
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
494 | * a username or email address is given, the userid must be looked up. |
|
17954
b5d62ba24136
Change msim_send_im() to use msim_postprocess_outgoing(), eliminating the
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17953
diff
changeset
|
495 | * This function does that by calling msim_postprocess_outgoing(). |
|
16333
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
496 | */ |
|
17994
b3b072dd8478
Split return type and function name + arguments on to separate lines, to
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17993
diff
changeset
|
497 | int |
|
b3b072dd8478
Split return type and function name + arguments on to separate lines, to
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17993
diff
changeset
|
498 | msim_send_im(PurpleConnection *gc, const gchar *who, const gchar *message, |
|
b3b072dd8478
Split return type and function name + arguments on to separate lines, to
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17993
diff
changeset
|
499 | PurpleMessageFlags flags) |
|
16333
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
500 | { |
|
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
501 | MsimSession *session; |
|
17959
cfbe7f9e5200
Send typing notifications (tested).
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17958
diff
changeset
|
502 | |
|
16333
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
503 | g_return_val_if_fail(gc != NULL, 0); |
|
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
504 | g_return_val_if_fail(who != NULL, 0); |
|
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
505 | g_return_val_if_fail(message != NULL, 0); |
|
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
506 | |
|
17944
62750b952935
Remove 'flags' from send_im_cb_struct - it was never needed.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17943
diff
changeset
|
507 | /* 'flags' has many options, not used here. */ |
|
62750b952935
Remove 'flags' from send_im_cb_struct - it was never needed.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17943
diff
changeset
|
508 | |
|
17959
cfbe7f9e5200
Send typing notifications (tested).
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17958
diff
changeset
|
509 | session = gc->proto_data; |
|
16333
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
510 | |
|
17970
3c92ce43ddae
Change to use const gchar * where appropriate.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17969
diff
changeset
|
511 | if (msim_send_bm(session, who, message, MSIM_BM_INSTANT)) |
|
17954
b5d62ba24136
Change msim_send_im() to use msim_postprocess_outgoing(), eliminating the
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17953
diff
changeset
|
512 | { |
|
b5d62ba24136
Change msim_send_im() to use msim_postprocess_outgoing(), eliminating the
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17953
diff
changeset
|
513 | /* Return 1 to have Purple show this IM as being sent, 0 to not. I always |
|
b5d62ba24136
Change msim_send_im() to use msim_postprocess_outgoing(), eliminating the
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17953
diff
changeset
|
514 | * return 1 even if the message could not be sent, since I don't know if |
|
b5d62ba24136
Change msim_send_im() to use msim_postprocess_outgoing(), eliminating the
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17953
diff
changeset
|
515 | * it has failed yet--because the IM is only sent after the userid is |
|
b5d62ba24136
Change msim_send_im() to use msim_postprocess_outgoing(), eliminating the
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17953
diff
changeset
|
516 | * retrieved from the server (which happens after this function returns). |
|
b5d62ba24136
Change msim_send_im() to use msim_postprocess_outgoing(), eliminating the
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17953
diff
changeset
|
517 | */ |
|
17959
cfbe7f9e5200
Send typing notifications (tested).
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17958
diff
changeset
|
518 | return 1; |
|
17954
b5d62ba24136
Change msim_send_im() to use msim_postprocess_outgoing(), eliminating the
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17953
diff
changeset
|
519 | } else { |
|
17959
cfbe7f9e5200
Send typing notifications (tested).
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17958
diff
changeset
|
520 | return -1; |
|
17954
b5d62ba24136
Change msim_send_im() to use msim_postprocess_outgoing(), eliminating the
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17953
diff
changeset
|
521 | } |
|
b5d62ba24136
Change msim_send_im() to use msim_postprocess_outgoing(), eliminating the
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17953
diff
changeset
|
522 | /* |
|
17984
9a53a8583bba
Add msim_unrecognized() to handle unhandled messages.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17983
diff
changeset
|
523 | * In MySpace, you login with your email address, but don't talk to other |
|
16333
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
524 | * users using their email address. So there is currently an asymmetry in the |
|
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
525 | * IM windows when using this plugin: |
|
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
526 | * |
|
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
527 | * you@example.com: hello |
|
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
528 | * some_other_user: what's going on? |
|
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
529 | * you@example.com: just coding a prpl |
|
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
530 | * |
|
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
531 | * TODO: Make the sent IM's appear as from the user's username, instead of |
|
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
532 | * their email address. Purple uses the login (in MSIM, the email)--change this. |
|
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
533 | */ |
| 16322 | 534 | } |
| 535 | ||
|
17959
cfbe7f9e5200
Send typing notifications (tested).
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17958
diff
changeset
|
536 | /** Send a buddy message of a given type. |
|
cfbe7f9e5200
Send typing notifications (tested).
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17958
diff
changeset
|
537 | * |
|
cfbe7f9e5200
Send typing notifications (tested).
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17958
diff
changeset
|
538 | * @param session |
|
cfbe7f9e5200
Send typing notifications (tested).
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17958
diff
changeset
|
539 | * @param who Username to send message to. |
|
cfbe7f9e5200
Send typing notifications (tested).
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17958
diff
changeset
|
540 | * @param text Message text to send. Not freed; will be copied. |
|
cfbe7f9e5200
Send typing notifications (tested).
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17958
diff
changeset
|
541 | * @param type A MSIM_BM_* constant. |
|
cfbe7f9e5200
Send typing notifications (tested).
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17958
diff
changeset
|
542 | * |
|
cfbe7f9e5200
Send typing notifications (tested).
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17958
diff
changeset
|
543 | * Buddy messages ('bm') include instant messages, action messages, status messages, etc. |
|
cfbe7f9e5200
Send typing notifications (tested).
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17958
diff
changeset
|
544 | */ |
|
17994
b3b072dd8478
Split return type and function name + arguments on to separate lines, to
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17993
diff
changeset
|
545 | gboolean |
|
b3b072dd8478
Split return type and function name + arguments on to separate lines, to
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17993
diff
changeset
|
546 | msim_send_bm(MsimSession *session, const gchar *who, const gchar *text, |
|
b3b072dd8478
Split return type and function name + arguments on to separate lines, to
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17993
diff
changeset
|
547 | int type) |
|
17959
cfbe7f9e5200
Send typing notifications (tested).
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17958
diff
changeset
|
548 | { |
|
cfbe7f9e5200
Send typing notifications (tested).
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17958
diff
changeset
|
549 | gboolean rc; |
|
cfbe7f9e5200
Send typing notifications (tested).
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17958
diff
changeset
|
550 | MsimMessage *msg; |
|
17970
3c92ce43ddae
Change to use const gchar * where appropriate.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17969
diff
changeset
|
551 | const gchar *from_username; |
|
3c92ce43ddae
Change to use const gchar * where appropriate.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17969
diff
changeset
|
552 | |
|
3c92ce43ddae
Change to use const gchar * where appropriate.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17969
diff
changeset
|
553 | from_username = session->account->username; |
|
17959
cfbe7f9e5200
Send typing notifications (tested).
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17958
diff
changeset
|
554 | |
|
cfbe7f9e5200
Send typing notifications (tested).
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17958
diff
changeset
|
555 | purple_debug_info("msim", "sending %d message from %s to %s: %s\n", |
|
cfbe7f9e5200
Send typing notifications (tested).
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17958
diff
changeset
|
556 | type, from_username, who, text); |
|
cfbe7f9e5200
Send typing notifications (tested).
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17958
diff
changeset
|
557 | |
|
cfbe7f9e5200
Send typing notifications (tested).
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17958
diff
changeset
|
558 | msg = msim_msg_new(TRUE, |
|
cfbe7f9e5200
Send typing notifications (tested).
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17958
diff
changeset
|
559 | "bm", MSIM_TYPE_INTEGER, GUINT_TO_POINTER(type), |
|
cfbe7f9e5200
Send typing notifications (tested).
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17958
diff
changeset
|
560 | "sesskey", MSIM_TYPE_INTEGER, GUINT_TO_POINTER(session->sesskey), |
|
cfbe7f9e5200
Send typing notifications (tested).
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17958
diff
changeset
|
561 | /* 't' will be inserted here */ |
|
cfbe7f9e5200
Send typing notifications (tested).
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17958
diff
changeset
|
562 | "cv", MSIM_TYPE_INTEGER, GUINT_TO_POINTER(MSIM_CLIENT_VERSION), |
|
cfbe7f9e5200
Send typing notifications (tested).
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17958
diff
changeset
|
563 | "msg", MSIM_TYPE_STRING, g_strdup(text), |
|
cfbe7f9e5200
Send typing notifications (tested).
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17958
diff
changeset
|
564 | NULL); |
|
cfbe7f9e5200
Send typing notifications (tested).
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17958
diff
changeset
|
565 | |
|
17970
3c92ce43ddae
Change to use const gchar * where appropriate.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17969
diff
changeset
|
566 | rc = msim_postprocess_outgoing(session, msg, who, "t", "cv"); |
|
17959
cfbe7f9e5200
Send typing notifications (tested).
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17958
diff
changeset
|
567 | |
|
cfbe7f9e5200
Send typing notifications (tested).
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17958
diff
changeset
|
568 | msim_msg_free(msg); |
|
cfbe7f9e5200
Send typing notifications (tested).
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17958
diff
changeset
|
569 | |
|
cfbe7f9e5200
Send typing notifications (tested).
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17958
diff
changeset
|
570 | return rc; |
|
cfbe7f9e5200
Send typing notifications (tested).
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17958
diff
changeset
|
571 | } |
|
cfbe7f9e5200
Send typing notifications (tested).
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17958
diff
changeset
|
572 | |
|
18014
4d667ccd35ed
Add option to sign on as hidden, or as not (previously, always signed on
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18013
diff
changeset
|
573 | |
|
4d667ccd35ed
Add option to sign on as hidden, or as not (previously, always signed on
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18013
diff
changeset
|
574 | #ifdef MSIM_FONT_SIZE_WORKS |
|
17995
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
575 | /** Convert a msim markup font height to points. */ |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
576 | static guint |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
577 | msim_font_height_to_point(guint height) |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
578 | { |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
579 | /* See also: libpurple/protocols/bonjour/jabber.c |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
580 | * _font_size_ichat_to_purple */ |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
581 | switch (height) |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
582 | { |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
583 | case 11: return 8; |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
584 | case 12: return 9; |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
585 | case 13: return 10; |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
586 | case 14: |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
587 | case 15: return 11; |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
588 | case 16: return 12; |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
589 | case 17: |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
590 | case 18: return 13; |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
591 | case 19: return 14; |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
592 | case 20: return 15; |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
593 | case 21: return 16; |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
594 | default: return 12; |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
595 | } |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
596 | } |
|
18014
4d667ccd35ed
Add option to sign on as hidden, or as not (previously, always signed on
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18013
diff
changeset
|
597 | #endif |
|
17995
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
598 | |
|
18001
cb5747cb6992
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17998
diff
changeset
|
599 | /** Convert the msim markup <f> (font) tag into HTML. */ |
|
cb5747cb6992
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17998
diff
changeset
|
600 | static void msim_markup_f_to_html(xmlnode *root, gchar **begin, gchar **end) |
|
cb5747cb6992
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17998
diff
changeset
|
601 | { |
|
cb5747cb6992
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17998
diff
changeset
|
602 | const gchar *face, *height_str, *decor_str; |
|
cb5747cb6992
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17998
diff
changeset
|
603 | GString *gs_end, *gs_begin; |
|
cb5747cb6992
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17998
diff
changeset
|
604 | guint decor, height; |
|
cb5747cb6992
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17998
diff
changeset
|
605 | |
|
18011
c60bea7aee94
Fix typo to allow font face to be displayed correctly on incoming messages.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18010
diff
changeset
|
606 | face = xmlnode_get_attrib(root, "f"); |
|
18001
cb5747cb6992
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17998
diff
changeset
|
607 | height_str = xmlnode_get_attrib(root, "h"); |
|
cb5747cb6992
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17998
diff
changeset
|
608 | decor_str = xmlnode_get_attrib(root, "s"); |
|
cb5747cb6992
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17998
diff
changeset
|
609 | |
|
cb5747cb6992
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17998
diff
changeset
|
610 | if (height_str) |
|
cb5747cb6992
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17998
diff
changeset
|
611 | height = atol(height_str); |
|
cb5747cb6992
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17998
diff
changeset
|
612 | else |
|
cb5747cb6992
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17998
diff
changeset
|
613 | height = 12; |
|
cb5747cb6992
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17998
diff
changeset
|
614 | |
|
cb5747cb6992
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17998
diff
changeset
|
615 | if (decor_str) |
|
cb5747cb6992
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17998
diff
changeset
|
616 | decor = atol(decor_str); |
|
cb5747cb6992
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17998
diff
changeset
|
617 | else |
|
cb5747cb6992
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17998
diff
changeset
|
618 | decor = 0; |
|
cb5747cb6992
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17998
diff
changeset
|
619 | |
|
cb5747cb6992
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17998
diff
changeset
|
620 | gs_begin = g_string_new(""); |
|
18011
c60bea7aee94
Fix typo to allow font face to be displayed correctly on incoming messages.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18010
diff
changeset
|
621 | #ifdef MSIM_FONT_SIZE_WORKS |
|
c60bea7aee94
Fix typo to allow font face to be displayed correctly on incoming messages.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18010
diff
changeset
|
622 | /* TODO: get font size working */ |
|
18009
59eed9bd2dea
Be more defensive about null pointers, especially null strings in %s format
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18007
diff
changeset
|
623 | if (!face) |
|
59eed9bd2dea
Be more defensive about null pointers, especially null strings in %s format
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18007
diff
changeset
|
624 | g_string_printf(gs_begin, "<font size='%d'>", |
|
18011
c60bea7aee94
Fix typo to allow font face to be displayed correctly on incoming messages.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18010
diff
changeset
|
625 | msim_font_height_to_point(height)); |
|
18009
59eed9bd2dea
Be more defensive about null pointers, especially null strings in %s format
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18007
diff
changeset
|
626 | else |
|
59eed9bd2dea
Be more defensive about null pointers, especially null strings in %s format
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18007
diff
changeset
|
627 | g_string_printf(gs_begin, "<font face='%s' size='%d'>", face, |
|
18011
c60bea7aee94
Fix typo to allow font face to be displayed correctly on incoming messages.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18010
diff
changeset
|
628 | msim_font_height_to_point(height)); |
|
c60bea7aee94
Fix typo to allow font face to be displayed correctly on incoming messages.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18010
diff
changeset
|
629 | #else |
|
c60bea7aee94
Fix typo to allow font face to be displayed correctly on incoming messages.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18010
diff
changeset
|
630 | if (face) |
|
c60bea7aee94
Fix typo to allow font face to be displayed correctly on incoming messages.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18010
diff
changeset
|
631 | { |
|
c60bea7aee94
Fix typo to allow font face to be displayed correctly on incoming messages.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18010
diff
changeset
|
632 | g_string_printf(gs_begin, "<font face='%s'>", face); |
|
c60bea7aee94
Fix typo to allow font face to be displayed correctly on incoming messages.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18010
diff
changeset
|
633 | } else { |
|
c60bea7aee94
Fix typo to allow font face to be displayed correctly on incoming messages.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18010
diff
changeset
|
634 | g_string_printf(gs_begin, "<font>"); |
|
c60bea7aee94
Fix typo to allow font face to be displayed correctly on incoming messages.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18010
diff
changeset
|
635 | } |
|
c60bea7aee94
Fix typo to allow font face to be displayed correctly on incoming messages.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18010
diff
changeset
|
636 | #endif |
|
c60bea7aee94
Fix typo to allow font face to be displayed correctly on incoming messages.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18010
diff
changeset
|
637 | |
|
18009
59eed9bd2dea
Be more defensive about null pointers, especially null strings in %s format
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18007
diff
changeset
|
638 | |
|
18001
cb5747cb6992
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17998
diff
changeset
|
639 | /* No support for font-size CSS? */ |
|
cb5747cb6992
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17998
diff
changeset
|
640 | /* g_string_printf(gs_begin, "<span style='font-family: %s; font-size: %dpt'>", face, |
|
cb5747cb6992
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17998
diff
changeset
|
641 | msim_font_height_to_point(height)); */ |
|
cb5747cb6992
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17998
diff
changeset
|
642 | |
|
cb5747cb6992
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17998
diff
changeset
|
643 | gs_end = g_string_new("</font>"); |
|
cb5747cb6992
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17998
diff
changeset
|
644 | |
|
cb5747cb6992
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17998
diff
changeset
|
645 | if (decor & 1) |
|
cb5747cb6992
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17998
diff
changeset
|
646 | { |
|
cb5747cb6992
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17998
diff
changeset
|
647 | g_string_append(gs_begin, "<b>"); |
|
cb5747cb6992
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17998
diff
changeset
|
648 | g_string_prepend(gs_end, "</b>"); |
|
cb5747cb6992
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17998
diff
changeset
|
649 | } |
|
cb5747cb6992
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17998
diff
changeset
|
650 | |
|
cb5747cb6992
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17998
diff
changeset
|
651 | if (decor & 2) |
|
cb5747cb6992
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17998
diff
changeset
|
652 | { |
|
cb5747cb6992
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17998
diff
changeset
|
653 | g_string_append(gs_begin, "<i>"); |
|
cb5747cb6992
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17998
diff
changeset
|
654 | g_string_append(gs_end, "</i>"); |
|
cb5747cb6992
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17998
diff
changeset
|
655 | } |
|
cb5747cb6992
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17998
diff
changeset
|
656 | |
|
cb5747cb6992
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17998
diff
changeset
|
657 | if (decor & 4) |
|
cb5747cb6992
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17998
diff
changeset
|
658 | { |
|
cb5747cb6992
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17998
diff
changeset
|
659 | g_string_append(gs_begin, "<u>"); |
|
cb5747cb6992
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17998
diff
changeset
|
660 | g_string_append(gs_end, "</u>"); |
|
cb5747cb6992
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17998
diff
changeset
|
661 | } |
|
cb5747cb6992
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17998
diff
changeset
|
662 | |
|
cb5747cb6992
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17998
diff
changeset
|
663 | |
|
cb5747cb6992
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17998
diff
changeset
|
664 | *begin = gs_begin->str; |
|
cb5747cb6992
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17998
diff
changeset
|
665 | *end = gs_end->str; |
|
cb5747cb6992
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17998
diff
changeset
|
666 | } |
|
cb5747cb6992
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17998
diff
changeset
|
667 | |
|
18010
3b1fc616ee59
Add msim_color_to_purple() to convert msim markup color to a color for
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18009
diff
changeset
|
668 | /** Convert a msim markup color to a color suitable for libpurple. |
|
3b1fc616ee59
Add msim_color_to_purple() to convert msim markup color to a color for
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18009
diff
changeset
|
669 | * |
|
3b1fc616ee59
Add msim_color_to_purple() to convert msim markup color to a color for
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18009
diff
changeset
|
670 | * @param msim Either a color name, or an rgb(x,y,z) code. |
|
3b1fc616ee59
Add msim_color_to_purple() to convert msim markup color to a color for
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18009
diff
changeset
|
671 | * |
|
3b1fc616ee59
Add msim_color_to_purple() to convert msim markup color to a color for
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18009
diff
changeset
|
672 | * @return A new string, either a color name or #rrggbb code. Must g_free(). |
|
3b1fc616ee59
Add msim_color_to_purple() to convert msim markup color to a color for
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18009
diff
changeset
|
673 | */ |
|
3b1fc616ee59
Add msim_color_to_purple() to convert msim markup color to a color for
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18009
diff
changeset
|
674 | static char *msim_color_to_purple(const char *msim) |
|
3b1fc616ee59
Add msim_color_to_purple() to convert msim markup color to a color for
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18009
diff
changeset
|
675 | { |
|
3b1fc616ee59
Add msim_color_to_purple() to convert msim markup color to a color for
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18009
diff
changeset
|
676 | guint red, green, blue; |
|
3b1fc616ee59
Add msim_color_to_purple() to convert msim markup color to a color for
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18009
diff
changeset
|
677 | |
|
3b1fc616ee59
Add msim_color_to_purple() to convert msim markup color to a color for
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18009
diff
changeset
|
678 | if (!msim) |
|
3b1fc616ee59
Add msim_color_to_purple() to convert msim markup color to a color for
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18009
diff
changeset
|
679 | return g_strdup("black"); |
|
3b1fc616ee59
Add msim_color_to_purple() to convert msim markup color to a color for
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18009
diff
changeset
|
680 | |
|
3b1fc616ee59
Add msim_color_to_purple() to convert msim markup color to a color for
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18009
diff
changeset
|
681 | if (sscanf(msim, "rgb(%d,%d,%d)", &red, &green, &blue) != 3) |
|
3b1fc616ee59
Add msim_color_to_purple() to convert msim markup color to a color for
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18009
diff
changeset
|
682 | { |
|
3b1fc616ee59
Add msim_color_to_purple() to convert msim markup color to a color for
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18009
diff
changeset
|
683 | /* Color name. */ |
|
3b1fc616ee59
Add msim_color_to_purple() to convert msim markup color to a color for
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18009
diff
changeset
|
684 | return g_strdup(msim); |
|
3b1fc616ee59
Add msim_color_to_purple() to convert msim markup color to a color for
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18009
diff
changeset
|
685 | } |
|
3b1fc616ee59
Add msim_color_to_purple() to convert msim markup color to a color for
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18009
diff
changeset
|
686 | /* TODO: rgba (alpha). */ |
|
3b1fc616ee59
Add msim_color_to_purple() to convert msim markup color to a color for
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18009
diff
changeset
|
687 | |
|
3b1fc616ee59
Add msim_color_to_purple() to convert msim markup color to a color for
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18009
diff
changeset
|
688 | return g_strdup_printf("#%.2x%.2x%.2x", red, green, blue); |
|
3b1fc616ee59
Add msim_color_to_purple() to convert msim markup color to a color for
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18009
diff
changeset
|
689 | } |
|
3b1fc616ee59
Add msim_color_to_purple() to convert msim markup color to a color for
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18009
diff
changeset
|
690 | |
|
18001
cb5747cb6992
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17998
diff
changeset
|
691 | /** Convert the msim markup <p> (paragraph) tag into HTML. */ |
|
cb5747cb6992
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17998
diff
changeset
|
692 | static void msim_markup_p_to_html(xmlnode *root, gchar **begin, gchar **end) |
|
cb5747cb6992
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17998
diff
changeset
|
693 | { |
|
cb5747cb6992
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17998
diff
changeset
|
694 | /* Just pass through unchanged. |
|
cb5747cb6992
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17998
diff
changeset
|
695 | * |
|
cb5747cb6992
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17998
diff
changeset
|
696 | * Note: attributes currently aren't passed, if there are any. */ |
|
cb5747cb6992
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17998
diff
changeset
|
697 | *begin = g_strdup("<p>"); |
|
cb5747cb6992
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17998
diff
changeset
|
698 | *end = g_strdup("</p>"); |
|
cb5747cb6992
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17998
diff
changeset
|
699 | } |
|
cb5747cb6992
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17998
diff
changeset
|
700 | |
|
cb5747cb6992
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17998
diff
changeset
|
701 | /** Convert the msim markup <c> tag (text color) into HTML. TODO: Test */ |
|
cb5747cb6992
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17998
diff
changeset
|
702 | static void msim_markup_c_to_html(xmlnode *root, gchar **begin, gchar **end) |
|
cb5747cb6992
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17998
diff
changeset
|
703 | { |
|
cb5747cb6992
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17998
diff
changeset
|
704 | const gchar *color; |
|
18010
3b1fc616ee59
Add msim_color_to_purple() to convert msim markup color to a color for
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18009
diff
changeset
|
705 | gchar *purple_color; |
|
18001
cb5747cb6992
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17998
diff
changeset
|
706 | |
|
cb5747cb6992
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17998
diff
changeset
|
707 | color = xmlnode_get_attrib(root, "v"); |
|
18009
59eed9bd2dea
Be more defensive about null pointers, especially null strings in %s format
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18007
diff
changeset
|
708 | if (!color) |
|
59eed9bd2dea
Be more defensive about null pointers, especially null strings in %s format
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18007
diff
changeset
|
709 | { |
|
59eed9bd2dea
Be more defensive about null pointers, especially null strings in %s format
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18007
diff
changeset
|
710 | purple_debug_info("msim", "msim_markup_c_to_html: <c> tag w/o v attr"); |
|
59eed9bd2dea
Be more defensive about null pointers, especially null strings in %s format
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18007
diff
changeset
|
711 | *begin = g_strdup(""); |
|
59eed9bd2dea
Be more defensive about null pointers, especially null strings in %s format
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18007
diff
changeset
|
712 | *end = g_strdup(""); |
|
59eed9bd2dea
Be more defensive about null pointers, especially null strings in %s format
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18007
diff
changeset
|
713 | /* TODO: log as unrecognized */ |
|
59eed9bd2dea
Be more defensive about null pointers, especially null strings in %s format
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18007
diff
changeset
|
714 | return; |
|
59eed9bd2dea
Be more defensive about null pointers, especially null strings in %s format
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18007
diff
changeset
|
715 | } |
|
18001
cb5747cb6992
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17998
diff
changeset
|
716 | |
|
18010
3b1fc616ee59
Add msim_color_to_purple() to convert msim markup color to a color for
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18009
diff
changeset
|
717 | purple_color = msim_color_to_purple(color); |
|
3b1fc616ee59
Add msim_color_to_purple() to convert msim markup color to a color for
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18009
diff
changeset
|
718 | |
|
3b1fc616ee59
Add msim_color_to_purple() to convert msim markup color to a color for
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18009
diff
changeset
|
719 | *begin = g_strdup_printf("<font color='%s'>", purple_color); |
|
3b1fc616ee59
Add msim_color_to_purple() to convert msim markup color to a color for
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18009
diff
changeset
|
720 | |
|
3b1fc616ee59
Add msim_color_to_purple() to convert msim markup color to a color for
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18009
diff
changeset
|
721 | g_free(purple_color); |
|
3b1fc616ee59
Add msim_color_to_purple() to convert msim markup color to a color for
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18009
diff
changeset
|
722 | |
|
18009
59eed9bd2dea
Be more defensive about null pointers, especially null strings in %s format
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18007
diff
changeset
|
723 | /* *begin = g_strdup_printf("<span style='color: %s'>", color); */ |
|
59eed9bd2dea
Be more defensive about null pointers, especially null strings in %s format
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18007
diff
changeset
|
724 | *end = g_strdup("</font>"); |
|
18001
cb5747cb6992
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17998
diff
changeset
|
725 | } |
|
cb5747cb6992
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17998
diff
changeset
|
726 | |
|
cb5747cb6992
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17998
diff
changeset
|
727 | /** Convert the msim markup <b> tag (background color) into HTML. TODO: Test */ |
|
cb5747cb6992
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17998
diff
changeset
|
728 | static void msim_markup_b_to_html(xmlnode *root, gchar **begin, gchar **end) |
|
cb5747cb6992
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17998
diff
changeset
|
729 | { |
|
cb5747cb6992
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17998
diff
changeset
|
730 | const gchar *color; |
|
18010
3b1fc616ee59
Add msim_color_to_purple() to convert msim markup color to a color for
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18009
diff
changeset
|
731 | gchar *purple_color; |
|
18001
cb5747cb6992
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17998
diff
changeset
|
732 | |
|
cb5747cb6992
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17998
diff
changeset
|
733 | color = xmlnode_get_attrib(root, "v"); |
|
18009
59eed9bd2dea
Be more defensive about null pointers, especially null strings in %s format
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18007
diff
changeset
|
734 | if (!color) |
|
59eed9bd2dea
Be more defensive about null pointers, especially null strings in %s format
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18007
diff
changeset
|
735 | { |
|
59eed9bd2dea
Be more defensive about null pointers, especially null strings in %s format
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18007
diff
changeset
|
736 | *begin = g_strdup(""); |
|
59eed9bd2dea
Be more defensive about null pointers, especially null strings in %s format
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18007
diff
changeset
|
737 | *end = g_strdup(""); |
|
59eed9bd2dea
Be more defensive about null pointers, especially null strings in %s format
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18007
diff
changeset
|
738 | purple_debug_info("msim", "msim_markup_b_to_html: <b> w/o v attr"); |
|
59eed9bd2dea
Be more defensive about null pointers, especially null strings in %s format
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18007
diff
changeset
|
739 | /* TODO: log as unrecognized. */ |
|
59eed9bd2dea
Be more defensive about null pointers, especially null strings in %s format
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18007
diff
changeset
|
740 | return; |
|
59eed9bd2dea
Be more defensive about null pointers, especially null strings in %s format
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18007
diff
changeset
|
741 | } |
|
18001
cb5747cb6992
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17998
diff
changeset
|
742 | |
|
18010
3b1fc616ee59
Add msim_color_to_purple() to convert msim markup color to a color for
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18009
diff
changeset
|
743 | purple_color = msim_color_to_purple(color); |
|
3b1fc616ee59
Add msim_color_to_purple() to convert msim markup color to a color for
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18009
diff
changeset
|
744 | |
|
18009
59eed9bd2dea
Be more defensive about null pointers, especially null strings in %s format
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18007
diff
changeset
|
745 | /* TODO: find out how to set background color. */ |
|
18010
3b1fc616ee59
Add msim_color_to_purple() to convert msim markup color to a color for
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18009
diff
changeset
|
746 | *begin = g_strdup_printf("<span style='background-color: %s'>", |
|
3b1fc616ee59
Add msim_color_to_purple() to convert msim markup color to a color for
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18009
diff
changeset
|
747 | purple_color); |
|
3b1fc616ee59
Add msim_color_to_purple() to convert msim markup color to a color for
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18009
diff
changeset
|
748 | g_free(purple_color); |
|
3b1fc616ee59
Add msim_color_to_purple() to convert msim markup color to a color for
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18009
diff
changeset
|
749 | |
|
18001
cb5747cb6992
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17998
diff
changeset
|
750 | *end = g_strdup("</p>"); |
|
cb5747cb6992
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17998
diff
changeset
|
751 | } |
|
cb5747cb6992
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17998
diff
changeset
|
752 | |
|
cb5747cb6992
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17998
diff
changeset
|
753 | /** Convert the msim markup <i> tag (emoticon image) into HTML. TODO: Test */ |
|
cb5747cb6992
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17998
diff
changeset
|
754 | static void msim_markup_i_to_html(xmlnode *root, gchar **begin, gchar **end) |
|
cb5747cb6992
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17998
diff
changeset
|
755 | { |
|
cb5747cb6992
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17998
diff
changeset
|
756 | const gchar *name; |
|
cb5747cb6992
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17998
diff
changeset
|
757 | |
|
cb5747cb6992
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17998
diff
changeset
|
758 | name = xmlnode_get_attrib(root, "n"); |
|
18009
59eed9bd2dea
Be more defensive about null pointers, especially null strings in %s format
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18007
diff
changeset
|
759 | if (!name) |
|
59eed9bd2dea
Be more defensive about null pointers, especially null strings in %s format
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18007
diff
changeset
|
760 | { |
|
59eed9bd2dea
Be more defensive about null pointers, especially null strings in %s format
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18007
diff
changeset
|
761 | purple_debug_info("msim", "msim_markup_i_to_html: <i> w/o n"); |
|
59eed9bd2dea
Be more defensive about null pointers, especially null strings in %s format
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18007
diff
changeset
|
762 | *begin = g_strdup(""); |
|
59eed9bd2dea
Be more defensive about null pointers, especially null strings in %s format
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18007
diff
changeset
|
763 | *end = g_strdup(""); |
|
59eed9bd2dea
Be more defensive about null pointers, especially null strings in %s format
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18007
diff
changeset
|
764 | /* TODO: log as unrecognized */ |
|
59eed9bd2dea
Be more defensive about null pointers, especially null strings in %s format
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18007
diff
changeset
|
765 | return; |
|
59eed9bd2dea
Be more defensive about null pointers, especially null strings in %s format
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18007
diff
changeset
|
766 | } |
|
18001
cb5747cb6992
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17998
diff
changeset
|
767 | |
|
cb5747cb6992
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17998
diff
changeset
|
768 | /* TODO: Support these emoticons: |
|
cb5747cb6992
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17998
diff
changeset
|
769 | * |
|
cb5747cb6992
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17998
diff
changeset
|
770 | * bigsmile growl mad scared tongue devil happy messed sidefrown upset |
|
cb5747cb6992
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17998
diff
changeset
|
771 | * frazzled heart nerd sinister wink geek laugh oops smirk worried |
|
cb5747cb6992
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17998
diff
changeset
|
772 | * googles mohawk pirate straight kiss |
|
cb5747cb6992
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17998
diff
changeset
|
773 | */ |
|
cb5747cb6992
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17998
diff
changeset
|
774 | |
|
cb5747cb6992
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17998
diff
changeset
|
775 | *begin = g_strdup_printf("<img id='%s'>", name); |
|
cb5747cb6992
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17998
diff
changeset
|
776 | *end = g_strdup("</p>"); |
|
cb5747cb6992
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17998
diff
changeset
|
777 | } |
|
cb5747cb6992
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17998
diff
changeset
|
778 | |
|
cb5747cb6992
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17998
diff
changeset
|
779 | |
|
17995
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
780 | /** Convert an xmlnode of msim markup to an HTML string. |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
781 | * @return An HTML string. Caller frees. |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
782 | */ |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
783 | static gchar *msim_markup_xmlnode_to_html(xmlnode *root) |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
784 | { |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
785 | xmlnode *node; |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
786 | gchar *begin, *inner, *end; |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
787 | gchar *final; |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
788 | |
|
18009
59eed9bd2dea
Be more defensive about null pointers, especially null strings in %s format
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18007
diff
changeset
|
789 | if (!root || !root->name) |
|
17995
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
790 | return g_strdup(""); |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
791 | |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
792 | purple_debug_info("msim", "msim_markup_xmlnode_to_html: got root=%s\n", |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
793 | root->name); |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
794 | |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
795 | begin = inner = end = NULL; |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
796 | |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
797 | if (!strcmp(root->name, "f")) |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
798 | { |
|
18001
cb5747cb6992
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17998
diff
changeset
|
799 | msim_markup_f_to_html(root, &begin, &end); |
|
cb5747cb6992
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17998
diff
changeset
|
800 | } else if (!strcmp(root->name, "p")) { |
|
cb5747cb6992
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17998
diff
changeset
|
801 | msim_markup_p_to_html(root, &begin, &end); |
|
cb5747cb6992
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17998
diff
changeset
|
802 | } else if (!strcmp(root->name, "c")) { |
|
cb5747cb6992
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17998
diff
changeset
|
803 | msim_markup_c_to_html(root, &begin, &end); |
|
cb5747cb6992
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17998
diff
changeset
|
804 | } else if (!strcmp(root->name, "b")) { |
|
cb5747cb6992
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17998
diff
changeset
|
805 | msim_markup_b_to_html(root, &begin, &end); |
|
cb5747cb6992
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17998
diff
changeset
|
806 | } else if (!strcmp(root->name, "i")) { |
|
cb5747cb6992
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17998
diff
changeset
|
807 | msim_markup_i_to_html(root, &begin, &end); |
|
17995
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
808 | } else { |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
809 | purple_debug_info("msim", "msim_markup_xmlnode_to_html: " |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
810 | "unknown tag name=%s, ignoring", root->name); |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
811 | begin = g_strdup(""); |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
812 | end = g_strdup(""); |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
813 | } |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
814 | |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
815 | /* Loop over all child nodes. */ |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
816 | for (node = root->child; node != NULL; node = node->next) |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
817 | { |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
818 | switch (node->type) |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
819 | { |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
820 | case XMLNODE_TYPE_ATTRIB: |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
821 | /* Attributes handled above. */ |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
822 | break; |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
823 | |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
824 | case XMLNODE_TYPE_TAG: |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
825 | /* A tag or tag with attributes. Recursively descend. */ |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
826 | inner = msim_markup_xmlnode_to_html(node); |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
827 | |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
828 | purple_debug_info("msim", " ** node name=%s\n", node->name); |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
829 | break; |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
830 | |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
831 | |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
832 | case XMLNODE_TYPE_DATA: |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
833 | /* Literal text. */ |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
834 | inner = g_new0(char, node->data_sz + 1); |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
835 | strncpy(inner, node->data, node->data_sz); |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
836 | inner[node->data_sz + 1] = 0; |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
837 | |
|
18011
c60bea7aee94
Fix typo to allow font face to be displayed correctly on incoming messages.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18010
diff
changeset
|
838 | purple_debug_info("msim", " ** node data=%s\n", inner); |
|
17995
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
839 | break; |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
840 | |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
841 | default: |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
842 | purple_debug_info("msim", |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
843 | "msim_markup_xmlnode_to_html: strange node\n"); |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
844 | inner = g_strdup(""); |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
845 | } |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
846 | } |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
847 | |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
848 | final = g_strconcat(begin, inner, end, NULL); |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
849 | g_free(begin); |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
850 | g_free(inner); |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
851 | g_free(end); |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
852 | |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
853 | purple_debug_info("msim", "msim_markup_xmlnode_to_gtkhtml: RETURNING %s\n", |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
854 | final); |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
855 | |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
856 | return final; |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
857 | } |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
858 | |
|
18001
cb5747cb6992
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17998
diff
changeset
|
859 | /** Convert MySpaceIM markup to Purple (HTML) markup. |
|
17995
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
860 | * |
|
18001
cb5747cb6992
Add (at least placeholder) functions to process p, f, c, b, and i markup tags
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17998
diff
changeset
|
861 | * @return Purple markup string, must be g_free()'d. */ |
|
17995
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
862 | gchar * |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
863 | msim_markup_to_html(const gchar *raw) |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
864 | { |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
865 | xmlnode *root; |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
866 | gchar *str; |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
867 | |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
868 | root = xmlnode_from_str(raw, -1); |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
869 | if (!root) |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
870 | { |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
871 | purple_debug_info("msim", "msim_markup_to_html: couldn't parse " |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
872 | "%s as XML, returning raw\n", raw); |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
873 | return g_strdup(raw); |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
874 | } |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
875 | |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
876 | str = msim_markup_xmlnode_to_html(root); |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
877 | purple_debug_info("msim", "msim_markup_to_html: returning %s\n", str); |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
878 | |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
879 | xmlnode_free(root); |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
880 | |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
881 | return g_strdup(str); |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
882 | } |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
883 | |
| 16322 | 884 | /** |
|
17934
d163dde3aff1
Add, but do not use, incomplete functions for using typing notifications.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17933
diff
changeset
|
885 | * Handle an incoming instant message. |
|
16333
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
886 | * |
|
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
887 | * @param session The session |
|
17951
313b994beb1d
Transition msim_incoming_im() to the callbackless infrastructure. Remove
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17950
diff
changeset
|
888 | * @param msg Message from the server, containing 'f' (userid from) and 'msg'. |
|
313b994beb1d
Transition msim_incoming_im() to the callbackless infrastructure. Remove
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17950
diff
changeset
|
889 | * Should also contain username in _username from preprocessing. |
|
16333
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
890 | * |
|
17935
a6a70c7213ab
Previously, the return value of the processing function and msim_process() told
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17934
diff
changeset
|
891 | * @return TRUE if successful. |
|
16333
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
892 | */ |
|
17994
b3b072dd8478
Split return type and function name + arguments on to separate lines, to
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17993
diff
changeset
|
893 | gboolean |
|
b3b072dd8478
Split return type and function name + arguments on to separate lines, to
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17993
diff
changeset
|
894 | msim_incoming_im(MsimSession *session, MsimMessage *msg) |
|
16333
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
895 | { |
|
17995
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
896 | gchar *username, *msg_msim_markup, *msg_purple_markup; |
|
16333
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
897 | |
|
17951
313b994beb1d
Transition msim_incoming_im() to the callbackless infrastructure. Remove
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17950
diff
changeset
|
898 | username = msim_msg_get_string(msg, "_username"); |
|
17995
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
899 | msg_msim_markup = msim_msg_get_string(msg, "msg"); |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
900 | |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
901 | msg_purple_markup = msim_markup_to_html(msg_msim_markup); |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
902 | g_free(msg_msim_markup); |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
903 | |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
904 | serv_got_im(session->gc, username, msg_purple_markup, |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
905 | PURPLE_MESSAGE_RECV, time(NULL)); |
|
16333
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
906 | |
|
17951
313b994beb1d
Transition msim_incoming_im() to the callbackless infrastructure. Remove
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17950
diff
changeset
|
907 | g_free(username); |
|
17995
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
908 | g_free(msg_purple_markup); |
|
16333
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
909 | |
|
17951
313b994beb1d
Transition msim_incoming_im() to the callbackless infrastructure. Remove
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17950
diff
changeset
|
910 | return TRUE; |
|
16333
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
911 | } |
|
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
912 | |
|
17934
d163dde3aff1
Add, but do not use, incomplete functions for using typing notifications.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17933
diff
changeset
|
913 | /** |
|
17984
9a53a8583bba
Add msim_unrecognized() to handle unhandled messages.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17983
diff
changeset
|
914 | * Handle an unrecognized message. |
|
9a53a8583bba
Add msim_unrecognized() to handle unhandled messages.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17983
diff
changeset
|
915 | */ |
|
17994
b3b072dd8478
Split return type and function name + arguments on to separate lines, to
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17993
diff
changeset
|
916 | void |
|
b3b072dd8478
Split return type and function name + arguments on to separate lines, to
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17993
diff
changeset
|
917 | msim_unrecognized(MsimSession *session, MsimMessage *msg, gchar *note) |
|
17984
9a53a8583bba
Add msim_unrecognized() to handle unhandled messages.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17983
diff
changeset
|
918 | { |
|
9a53a8583bba
Add msim_unrecognized() to handle unhandled messages.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17983
diff
changeset
|
919 | /* TODO: Some more context, outwardly equivalent to a backtrace, for helping figure |
|
9a53a8583bba
Add msim_unrecognized() to handle unhandled messages.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17983
diff
changeset
|
920 | * out what this msg is for. But not too much information so that a user |
|
9a53a8583bba
Add msim_unrecognized() to handle unhandled messages.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17983
diff
changeset
|
921 | * posting this dump reveals confidential information. |
|
9a53a8583bba
Add msim_unrecognized() to handle unhandled messages.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17983
diff
changeset
|
922 | */ |
|
9a53a8583bba
Add msim_unrecognized() to handle unhandled messages.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17983
diff
changeset
|
923 | /* TODO: dump unknown msgs to file, so user can send them to me |
|
9a53a8583bba
Add msim_unrecognized() to handle unhandled messages.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17983
diff
changeset
|
924 | * if they wish, to help add support for new messages (inspired |
|
9a53a8583bba
Add msim_unrecognized() to handle unhandled messages.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17983
diff
changeset
|
925 | * by Alexandr Shutko, who maintains OSCAR protocol documentation). */ |
|
9a53a8583bba
Add msim_unrecognized() to handle unhandled messages.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17983
diff
changeset
|
926 | |
|
9a53a8583bba
Add msim_unrecognized() to handle unhandled messages.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17983
diff
changeset
|
927 | purple_debug_info("msim", "Unrecognized message on account for %s\n", session->account->username); |
|
9a53a8583bba
Add msim_unrecognized() to handle unhandled messages.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17983
diff
changeset
|
928 | if (note) |
|
9a53a8583bba
Add msim_unrecognized() to handle unhandled messages.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17983
diff
changeset
|
929 | { |
|
9a53a8583bba
Add msim_unrecognized() to handle unhandled messages.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17983
diff
changeset
|
930 | purple_debug_info("msim", "(Note: %s)\n", note); |
|
9a53a8583bba
Add msim_unrecognized() to handle unhandled messages.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17983
diff
changeset
|
931 | } |
|
9a53a8583bba
Add msim_unrecognized() to handle unhandled messages.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17983
diff
changeset
|
932 | |
|
9a53a8583bba
Add msim_unrecognized() to handle unhandled messages.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17983
diff
changeset
|
933 | msim_msg_dump("Unrecognized message dump: %s\n", msg); |
|
9a53a8583bba
Add msim_unrecognized() to handle unhandled messages.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17983
diff
changeset
|
934 | } |
|
9a53a8583bba
Add msim_unrecognized() to handle unhandled messages.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17983
diff
changeset
|
935 | |
|
9a53a8583bba
Add msim_unrecognized() to handle unhandled messages.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17983
diff
changeset
|
936 | /** |
|
17934
d163dde3aff1
Add, but do not use, incomplete functions for using typing notifications.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17933
diff
changeset
|
937 | * Handle an incoming action message. |
|
d163dde3aff1
Add, but do not use, incomplete functions for using typing notifications.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17933
diff
changeset
|
938 | * |
|
d163dde3aff1
Add, but do not use, incomplete functions for using typing notifications.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17933
diff
changeset
|
939 | * @param session |
|
d163dde3aff1
Add, but do not use, incomplete functions for using typing notifications.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17933
diff
changeset
|
940 | * @param msg |
|
d163dde3aff1
Add, but do not use, incomplete functions for using typing notifications.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17933
diff
changeset
|
941 | * |
|
17935
a6a70c7213ab
Previously, the return value of the processing function and msim_process() told
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17934
diff
changeset
|
942 | * @return TRUE if successful. |
|
17934
d163dde3aff1
Add, but do not use, incomplete functions for using typing notifications.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17933
diff
changeset
|
943 | * |
|
17952
4f2723ecd15a
Add untested implementation of msim_incoming_action().
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17951
diff
changeset
|
944 | * UNTESTED |
|
17934
d163dde3aff1
Add, but do not use, incomplete functions for using typing notifications.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17933
diff
changeset
|
945 | */ |
|
17994
b3b072dd8478
Split return type and function name + arguments on to separate lines, to
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17993
diff
changeset
|
946 | gboolean |
|
b3b072dd8478
Split return type and function name + arguments on to separate lines, to
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17993
diff
changeset
|
947 | msim_incoming_action(MsimSession *session, MsimMessage *msg) |
|
17934
d163dde3aff1
Add, but do not use, incomplete functions for using typing notifications.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17933
diff
changeset
|
948 | { |
|
17952
4f2723ecd15a
Add untested implementation of msim_incoming_action().
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17951
diff
changeset
|
949 | gchar *msg_text, *username; |
|
4f2723ecd15a
Add untested implementation of msim_incoming_action().
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17951
diff
changeset
|
950 | gboolean rc; |
|
4f2723ecd15a
Add untested implementation of msim_incoming_action().
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17951
diff
changeset
|
951 | |
|
4f2723ecd15a
Add untested implementation of msim_incoming_action().
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17951
diff
changeset
|
952 | msg_text = msim_msg_get_string(msg, "msg"); |
|
4f2723ecd15a
Add untested implementation of msim_incoming_action().
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17951
diff
changeset
|
953 | username = msim_msg_get_string(msg, "_username"); |
|
4f2723ecd15a
Add untested implementation of msim_incoming_action().
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17951
diff
changeset
|
954 | |
|
4f2723ecd15a
Add untested implementation of msim_incoming_action().
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17951
diff
changeset
|
955 | purple_debug_info("msim", "msim_incoming_action: action <%s> from <%d>\n", msg_text, username); |
|
17935
a6a70c7213ab
Previously, the return value of the processing function and msim_process() told
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17934
diff
changeset
|
956 | |
|
17952
4f2723ecd15a
Add untested implementation of msim_incoming_action().
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17951
diff
changeset
|
957 | if (strcmp(msg_text, "%typing%") == 0) |
|
4f2723ecd15a
Add untested implementation of msim_incoming_action().
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17951
diff
changeset
|
958 | { |
|
17984
9a53a8583bba
Add msim_unrecognized() to handle unhandled messages.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17983
diff
changeset
|
959 | /* TODO: find out if msim repeatedly sends typing messages, so we can give it a timeout. |
|
9a53a8583bba
Add msim_unrecognized() to handle unhandled messages.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17983
diff
changeset
|
960 | * Right now, there does seem to be an inordinately amount of time between typing/ |
|
9a53a8583bba
Add msim_unrecognized() to handle unhandled messages.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17983
diff
changeset
|
961 | * stopped-typing notifications. */ |
|
17952
4f2723ecd15a
Add untested implementation of msim_incoming_action().
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17951
diff
changeset
|
962 | serv_got_typing(session->gc, username, 0, PURPLE_TYPING); |
|
4f2723ecd15a
Add untested implementation of msim_incoming_action().
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17951
diff
changeset
|
963 | rc = TRUE; |
|
4f2723ecd15a
Add untested implementation of msim_incoming_action().
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17951
diff
changeset
|
964 | } else if (strcmp(msg_text, "%stoptyping%") == 0) { |
|
4f2723ecd15a
Add untested implementation of msim_incoming_action().
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17951
diff
changeset
|
965 | serv_got_typing_stopped(session->gc, username); |
|
4f2723ecd15a
Add untested implementation of msim_incoming_action().
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17951
diff
changeset
|
966 | rc = TRUE; |
|
4f2723ecd15a
Add untested implementation of msim_incoming_action().
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17951
diff
changeset
|
967 | } else { |
|
17984
9a53a8583bba
Add msim_unrecognized() to handle unhandled messages.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17983
diff
changeset
|
968 | msim_unrecognized(session, msg, "got to msim_incoming_action but unrecognized value for 'msg'"); |
|
17952
4f2723ecd15a
Add untested implementation of msim_incoming_action().
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17951
diff
changeset
|
969 | rc = FALSE; |
|
4f2723ecd15a
Add untested implementation of msim_incoming_action().
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17951
diff
changeset
|
970 | } |
|
4f2723ecd15a
Add untested implementation of msim_incoming_action().
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17951
diff
changeset
|
971 | |
|
4f2723ecd15a
Add untested implementation of msim_incoming_action().
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17951
diff
changeset
|
972 | |
|
4f2723ecd15a
Add untested implementation of msim_incoming_action().
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17951
diff
changeset
|
973 | g_free(msg_text); |
|
4f2723ecd15a
Add untested implementation of msim_incoming_action().
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17951
diff
changeset
|
974 | g_free(username); |
|
4f2723ecd15a
Add untested implementation of msim_incoming_action().
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17951
diff
changeset
|
975 | |
|
4f2723ecd15a
Add untested implementation of msim_incoming_action().
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17951
diff
changeset
|
976 | return rc; |
|
17934
d163dde3aff1
Add, but do not use, incomplete functions for using typing notifications.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17933
diff
changeset
|
977 | } |
|
d163dde3aff1
Add, but do not use, incomplete functions for using typing notifications.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17933
diff
changeset
|
978 | |
|
d163dde3aff1
Add, but do not use, incomplete functions for using typing notifications.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17933
diff
changeset
|
979 | /** |
|
d163dde3aff1
Add, but do not use, incomplete functions for using typing notifications.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17933
diff
changeset
|
980 | * Handle when our user starts or stops typing to another user. |
|
d163dde3aff1
Add, but do not use, incomplete functions for using typing notifications.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17933
diff
changeset
|
981 | * |
|
d163dde3aff1
Add, but do not use, incomplete functions for using typing notifications.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17933
diff
changeset
|
982 | * @param gc |
|
d163dde3aff1
Add, but do not use, incomplete functions for using typing notifications.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17933
diff
changeset
|
983 | * @param name The buddy name to which our user is typing to |
|
d163dde3aff1
Add, but do not use, incomplete functions for using typing notifications.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17933
diff
changeset
|
984 | * @param state PURPLE_TYPING, PURPLE_TYPED, PURPLE_NOT_TYPING |
|
d163dde3aff1
Add, but do not use, incomplete functions for using typing notifications.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17933
diff
changeset
|
985 | * |
|
d163dde3aff1
Add, but do not use, incomplete functions for using typing notifications.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17933
diff
changeset
|
986 | */ |
|
17994
b3b072dd8478
Split return type and function name + arguments on to separate lines, to
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17993
diff
changeset
|
987 | unsigned int |
|
b3b072dd8478
Split return type and function name + arguments on to separate lines, to
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17993
diff
changeset
|
988 | msim_send_typing(PurpleConnection *gc, const gchar *name, PurpleTypingState state) |
|
17934
d163dde3aff1
Add, but do not use, incomplete functions for using typing notifications.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17933
diff
changeset
|
989 | { |
|
17970
3c92ce43ddae
Change to use const gchar * where appropriate.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17969
diff
changeset
|
990 | const gchar *typing_str; |
|
17959
cfbe7f9e5200
Send typing notifications (tested).
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17958
diff
changeset
|
991 | MsimSession *session; |
|
cfbe7f9e5200
Send typing notifications (tested).
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17958
diff
changeset
|
992 | |
|
cfbe7f9e5200
Send typing notifications (tested).
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17958
diff
changeset
|
993 | session = (MsimSession *)gc->proto_data; |
|
17934
d163dde3aff1
Add, but do not use, incomplete functions for using typing notifications.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17933
diff
changeset
|
994 | |
|
d163dde3aff1
Add, but do not use, incomplete functions for using typing notifications.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17933
diff
changeset
|
995 | switch (state) |
|
d163dde3aff1
Add, but do not use, incomplete functions for using typing notifications.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17933
diff
changeset
|
996 | { |
|
d163dde3aff1
Add, but do not use, incomplete functions for using typing notifications.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17933
diff
changeset
|
997 | case PURPLE_TYPING: |
|
d163dde3aff1
Add, but do not use, incomplete functions for using typing notifications.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17933
diff
changeset
|
998 | typing_str = "%typing%"; |
|
d163dde3aff1
Add, but do not use, incomplete functions for using typing notifications.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17933
diff
changeset
|
999 | break; |
|
d163dde3aff1
Add, but do not use, incomplete functions for using typing notifications.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17933
diff
changeset
|
1000 | |
|
d163dde3aff1
Add, but do not use, incomplete functions for using typing notifications.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17933
diff
changeset
|
1001 | case PURPLE_TYPED: |
|
d163dde3aff1
Add, but do not use, incomplete functions for using typing notifications.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17933
diff
changeset
|
1002 | case PURPLE_NOT_TYPING: |
|
d163dde3aff1
Add, but do not use, incomplete functions for using typing notifications.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17933
diff
changeset
|
1003 | default: |
|
d163dde3aff1
Add, but do not use, incomplete functions for using typing notifications.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17933
diff
changeset
|
1004 | typing_str = "%stoptyping%"; |
|
d163dde3aff1
Add, but do not use, incomplete functions for using typing notifications.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17933
diff
changeset
|
1005 | break; |
|
d163dde3aff1
Add, but do not use, incomplete functions for using typing notifications.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17933
diff
changeset
|
1006 | } |
|
d163dde3aff1
Add, but do not use, incomplete functions for using typing notifications.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17933
diff
changeset
|
1007 | |
|
17953
c76e16c7cf0a
Add, but do not use, two new functions to postprocess outgoing messages
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17952
diff
changeset
|
1008 | purple_debug_info("msim", "msim_send_typing(%s): %d (%s)\n", name, state, typing_str); |
|
17970
3c92ce43ddae
Change to use const gchar * where appropriate.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17969
diff
changeset
|
1009 | msim_send_bm(session, name, typing_str, MSIM_BM_ACTION); |
|
17934
d163dde3aff1
Add, but do not use, incomplete functions for using typing notifications.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17933
diff
changeset
|
1010 | return 0; |
|
d163dde3aff1
Add, but do not use, incomplete functions for using typing notifications.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17933
diff
changeset
|
1011 | } |
|
16333
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
1012 | |
|
17989
48499e10fac3
Retrieve information for profile ("Get Info") from server, instead of from
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17988
diff
changeset
|
1013 | /** Callback for msim_get_info(), for when user info is received. */ |
|
17994
b3b072dd8478
Split return type and function name + arguments on to separate lines, to
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17993
diff
changeset
|
1014 | void |
|
b3b072dd8478
Split return type and function name + arguments on to separate lines, to
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17993
diff
changeset
|
1015 | msim_get_info_cb(MsimSession *session, MsimMessage *user_info_msg, gpointer data) |
|
17969
9a043ea6bc44
Implement msim_get_info() for users on the user's buddy list.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17968
diff
changeset
|
1016 | { |
|
17989
48499e10fac3
Retrieve information for profile ("Get Info") from server, instead of from
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17988
diff
changeset
|
1017 | GHashTable *body; |
|
48499e10fac3
Retrieve information for profile ("Get Info") from server, instead of from
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17988
diff
changeset
|
1018 | gchar *body_str; |
|
48499e10fac3
Retrieve information for profile ("Get Info") from server, instead of from
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17988
diff
changeset
|
1019 | MsimMessage *msg; |
|
48499e10fac3
Retrieve information for profile ("Get Info") from server, instead of from
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17988
diff
changeset
|
1020 | gchar *user; |
|
17969
9a043ea6bc44
Implement msim_get_info() for users on the user's buddy list.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17968
diff
changeset
|
1021 | PurpleNotifyUserInfo *user_info; |
|
9a043ea6bc44
Implement msim_get_info() for users on the user's buddy list.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17968
diff
changeset
|
1022 | PurpleBuddy *buddy; |
|
18009
59eed9bd2dea
Be more defensive about null pointers, especially null strings in %s format
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18007
diff
changeset
|
1023 | const gchar *str, *str2; |
|
59eed9bd2dea
Be more defensive about null pointers, especially null strings in %s format
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18007
diff
changeset
|
1024 | |
|
59eed9bd2dea
Be more defensive about null pointers, especially null strings in %s format
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18007
diff
changeset
|
1025 | |
|
59eed9bd2dea
Be more defensive about null pointers, especially null strings in %s format
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18007
diff
changeset
|
1026 | /* Get user{name,id} from msim_get_info, passed as an MsimMessage for |
|
59eed9bd2dea
Be more defensive about null pointers, especially null strings in %s format
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18007
diff
changeset
|
1027 | orthogonality. */ |
|
17989
48499e10fac3
Retrieve information for profile ("Get Info") from server, instead of from
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17988
diff
changeset
|
1028 | msg = (MsimMessage *)data; |
|
18009
59eed9bd2dea
Be more defensive about null pointers, especially null strings in %s format
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18007
diff
changeset
|
1029 | user = msim_msg_get_string(msg, "user"); |
|
59eed9bd2dea
Be more defensive about null pointers, especially null strings in %s format
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18007
diff
changeset
|
1030 | if (!user) |
|
59eed9bd2dea
Be more defensive about null pointers, especially null strings in %s format
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18007
diff
changeset
|
1031 | { |
|
59eed9bd2dea
Be more defensive about null pointers, especially null strings in %s format
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18007
diff
changeset
|
1032 | purple_debug_info("msim", "msim_get_info_cb: no 'user' in msg"); |
|
59eed9bd2dea
Be more defensive about null pointers, especially null strings in %s format
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18007
diff
changeset
|
1033 | return; |
|
59eed9bd2dea
Be more defensive about null pointers, especially null strings in %s format
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18007
diff
changeset
|
1034 | } |
|
59eed9bd2dea
Be more defensive about null pointers, especially null strings in %s format
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18007
diff
changeset
|
1035 | |
|
17989
48499e10fac3
Retrieve information for profile ("Get Info") from server, instead of from
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17988
diff
changeset
|
1036 | purple_debug_info("msim", "msim_get_info_cb: got for user: %s\n", user); |
|
48499e10fac3
Retrieve information for profile ("Get Info") from server, instead of from
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17988
diff
changeset
|
1037 | msim_msg_free(msg); |
|
48499e10fac3
Retrieve information for profile ("Get Info") from server, instead of from
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17988
diff
changeset
|
1038 | |
|
48499e10fac3
Retrieve information for profile ("Get Info") from server, instead of from
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17988
diff
changeset
|
1039 | |
|
48499e10fac3
Retrieve information for profile ("Get Info") from server, instead of from
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17988
diff
changeset
|
1040 | body_str = msim_msg_get_string(user_info_msg, "body"); |
|
48499e10fac3
Retrieve information for profile ("Get Info") from server, instead of from
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17988
diff
changeset
|
1041 | body = msim_parse_body(body_str); |
|
48499e10fac3
Retrieve information for profile ("Get Info") from server, instead of from
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17988
diff
changeset
|
1042 | g_free(body_str); |
|
48499e10fac3
Retrieve information for profile ("Get Info") from server, instead of from
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17988
diff
changeset
|
1043 | |
|
48499e10fac3
Retrieve information for profile ("Get Info") from server, instead of from
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17988
diff
changeset
|
1044 | buddy = purple_find_buddy(session->account, user); |
|
48499e10fac3
Retrieve information for profile ("Get Info") from server, instead of from
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17988
diff
changeset
|
1045 | /* Note: don't assume buddy is non-NULL; will be if lookup random user not on blist. */ |
|
17969
9a043ea6bc44
Implement msim_get_info() for users on the user's buddy list.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17968
diff
changeset
|
1046 | |
|
9a043ea6bc44
Implement msim_get_info() for users on the user's buddy list.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17968
diff
changeset
|
1047 | user_info = purple_notify_user_info_new(); |
|
9a043ea6bc44
Implement msim_get_info() for users on the user's buddy list.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17968
diff
changeset
|
1048 | |
|
17989
48499e10fac3
Retrieve information for profile ("Get Info") from server, instead of from
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17988
diff
changeset
|
1049 | /* Identification */ |
|
18009
59eed9bd2dea
Be more defensive about null pointers, especially null strings in %s format
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18007
diff
changeset
|
1050 | purple_notify_user_info_add_pair(user_info, _("User"), g_strdup(user)); |
|
17969
9a043ea6bc44
Implement msim_get_info() for users on the user's buddy list.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17968
diff
changeset
|
1051 | |
|
17989
48499e10fac3
Retrieve information for profile ("Get Info") from server, instead of from
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17988
diff
changeset
|
1052 | /* note: g_hash_table_lookup does not create a new string! */ |
|
18009
59eed9bd2dea
Be more defensive about null pointers, especially null strings in %s format
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18007
diff
changeset
|
1053 | str = g_hash_table_lookup(body, "UserID"); |
|
59eed9bd2dea
Be more defensive about null pointers, especially null strings in %s format
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18007
diff
changeset
|
1054 | if (str) |
|
59eed9bd2dea
Be more defensive about null pointers, especially null strings in %s format
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18007
diff
changeset
|
1055 | purple_notify_user_info_add_pair(user_info, _("User ID"), |
|
59eed9bd2dea
Be more defensive about null pointers, especially null strings in %s format
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18007
diff
changeset
|
1056 | g_strdup(str)); |
|
17969
9a043ea6bc44
Implement msim_get_info() for users on the user's buddy list.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17968
diff
changeset
|
1057 | |
|
9a043ea6bc44
Implement msim_get_info() for users on the user's buddy list.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17968
diff
changeset
|
1058 | /* a/s/l...the vitals */ |
|
18009
59eed9bd2dea
Be more defensive about null pointers, especially null strings in %s format
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18007
diff
changeset
|
1059 | str = g_hash_table_lookup(body, "Age"); |
|
59eed9bd2dea
Be more defensive about null pointers, especially null strings in %s format
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18007
diff
changeset
|
1060 | if (str) |
|
59eed9bd2dea
Be more defensive about null pointers, especially null strings in %s format
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18007
diff
changeset
|
1061 | purple_notify_user_info_add_pair(user_info, _("Age"), g_strdup(str)); |
|
59eed9bd2dea
Be more defensive about null pointers, especially null strings in %s format
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18007
diff
changeset
|
1062 | |
|
59eed9bd2dea
Be more defensive about null pointers, especially null strings in %s format
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18007
diff
changeset
|
1063 | str = g_hash_table_lookup(body, "Gender"); |
|
59eed9bd2dea
Be more defensive about null pointers, especially null strings in %s format
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18007
diff
changeset
|
1064 | if (str) |
|
59eed9bd2dea
Be more defensive about null pointers, especially null strings in %s format
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18007
diff
changeset
|
1065 | purple_notify_user_info_add_pair(user_info, _("Gender"), g_strdup(str)); |
|
59eed9bd2dea
Be more defensive about null pointers, especially null strings in %s format
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18007
diff
changeset
|
1066 | |
|
59eed9bd2dea
Be more defensive about null pointers, especially null strings in %s format
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18007
diff
changeset
|
1067 | str = g_hash_table_lookup(body, "Location"); |
|
59eed9bd2dea
Be more defensive about null pointers, especially null strings in %s format
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18007
diff
changeset
|
1068 | if (str) |
|
59eed9bd2dea
Be more defensive about null pointers, especially null strings in %s format
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18007
diff
changeset
|
1069 | purple_notify_user_info_add_pair(user_info, _("Location"), |
|
59eed9bd2dea
Be more defensive about null pointers, especially null strings in %s format
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18007
diff
changeset
|
1070 | g_strdup(str)); |
|
17969
9a043ea6bc44
Implement msim_get_info() for users on the user's buddy list.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17968
diff
changeset
|
1071 | |
|
9a043ea6bc44
Implement msim_get_info() for users on the user's buddy list.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17968
diff
changeset
|
1072 | /* Other information */ |
|
17989
48499e10fac3
Retrieve information for profile ("Get Info") from server, instead of from
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17988
diff
changeset
|
1073 | |
|
48499e10fac3
Retrieve information for profile ("Get Info") from server, instead of from
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17988
diff
changeset
|
1074 | /* Headline comes from buddy status messages */ |
|
18009
59eed9bd2dea
Be more defensive about null pointers, especially null strings in %s format
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18007
diff
changeset
|
1075 | if (buddy) |
|
59eed9bd2dea
Be more defensive about null pointers, especially null strings in %s format
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18007
diff
changeset
|
1076 | { |
|
59eed9bd2dea
Be more defensive about null pointers, especially null strings in %s format
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18007
diff
changeset
|
1077 | str = purple_blist_node_get_string(&buddy->node, "Headline"); |
|
59eed9bd2dea
Be more defensive about null pointers, especially null strings in %s format
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18007
diff
changeset
|
1078 | if (str) |
|
59eed9bd2dea
Be more defensive about null pointers, especially null strings in %s format
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18007
diff
changeset
|
1079 | purple_notify_user_info_add_pair(user_info, "Headline", str); |
|
59eed9bd2dea
Be more defensive about null pointers, especially null strings in %s format
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18007
diff
changeset
|
1080 | } |
|
59eed9bd2dea
Be more defensive about null pointers, especially null strings in %s format
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18007
diff
changeset
|
1081 | |
|
59eed9bd2dea
Be more defensive about null pointers, especially null strings in %s format
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18007
diff
changeset
|
1082 | |
|
59eed9bd2dea
Be more defensive about null pointers, especially null strings in %s format
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18007
diff
changeset
|
1083 | str = g_hash_table_lookup(body, "BandName"); |
|
59eed9bd2dea
Be more defensive about null pointers, especially null strings in %s format
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18007
diff
changeset
|
1084 | str2 = g_hash_table_lookup(body, "SongName"); |
|
59eed9bd2dea
Be more defensive about null pointers, especially null strings in %s format
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18007
diff
changeset
|
1085 | if (str || str2) |
|
59eed9bd2dea
Be more defensive about null pointers, especially null strings in %s format
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18007
diff
changeset
|
1086 | { |
|
59eed9bd2dea
Be more defensive about null pointers, especially null strings in %s format
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18007
diff
changeset
|
1087 | purple_notify_user_info_add_pair(user_info, _("Song"), |
|
59eed9bd2dea
Be more defensive about null pointers, especially null strings in %s format
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18007
diff
changeset
|
1088 | g_strdup_printf("%s - %s", |
|
59eed9bd2dea
Be more defensive about null pointers, especially null strings in %s format
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18007
diff
changeset
|
1089 | str ? str : "Unknown Artist", |
|
59eed9bd2dea
Be more defensive about null pointers, especially null strings in %s format
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18007
diff
changeset
|
1090 | str2 ? str2 : "Unknown Song")); |
|
59eed9bd2dea
Be more defensive about null pointers, especially null strings in %s format
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18007
diff
changeset
|
1091 | } |
|
59eed9bd2dea
Be more defensive about null pointers, especially null strings in %s format
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18007
diff
changeset
|
1092 | |
|
17989
48499e10fac3
Retrieve information for profile ("Get Info") from server, instead of from
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17988
diff
changeset
|
1093 | |
|
48499e10fac3
Retrieve information for profile ("Get Info") from server, instead of from
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17988
diff
changeset
|
1094 | /* Total friends only available if looked up by uid, not username. */ |
|
18009
59eed9bd2dea
Be more defensive about null pointers, especially null strings in %s format
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18007
diff
changeset
|
1095 | str = g_hash_table_lookup(body, "TotalFriends"); |
|
59eed9bd2dea
Be more defensive about null pointers, especially null strings in %s format
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18007
diff
changeset
|
1096 | if (str) |
|
17989
48499e10fac3
Retrieve information for profile ("Get Info") from server, instead of from
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17988
diff
changeset
|
1097 | purple_notify_user_info_add_pair(user_info, _("Total Friends"), |
|
18009
59eed9bd2dea
Be more defensive about null pointers, especially null strings in %s format
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18007
diff
changeset
|
1098 | g_strdup(str)); |
|
17989
48499e10fac3
Retrieve information for profile ("Get Info") from server, instead of from
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17988
diff
changeset
|
1099 | |
|
48499e10fac3
Retrieve information for profile ("Get Info") from server, instead of from
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17988
diff
changeset
|
1100 | purple_notify_userinfo(session->gc, user, user_info, NULL, NULL); |
|
48499e10fac3
Retrieve information for profile ("Get Info") from server, instead of from
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17988
diff
changeset
|
1101 | purple_debug_info("msim", "msim_get_info_cb: username=%s\n", user); |
|
48499e10fac3
Retrieve information for profile ("Get Info") from server, instead of from
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17988
diff
changeset
|
1102 | //purple_notify_user_info_destroy(user_info); |
|
48499e10fac3
Retrieve information for profile ("Get Info") from server, instead of from
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17988
diff
changeset
|
1103 | /* Do not free username, since it will be used by user_info. */ |
|
48499e10fac3
Retrieve information for profile ("Get Info") from server, instead of from
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17988
diff
changeset
|
1104 | |
|
48499e10fac3
Retrieve information for profile ("Get Info") from server, instead of from
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17988
diff
changeset
|
1105 | //g_hash_table_destroy(body); |
|
48499e10fac3
Retrieve information for profile ("Get Info") from server, instead of from
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17988
diff
changeset
|
1106 | } |
|
48499e10fac3
Retrieve information for profile ("Get Info") from server, instead of from
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17988
diff
changeset
|
1107 | |
|
48499e10fac3
Retrieve information for profile ("Get Info") from server, instead of from
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17988
diff
changeset
|
1108 | /** Retrieve a user's profile. */ |
|
17994
b3b072dd8478
Split return type and function name + arguments on to separate lines, to
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17993
diff
changeset
|
1109 | void |
|
b3b072dd8478
Split return type and function name + arguments on to separate lines, to
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17993
diff
changeset
|
1110 | msim_get_info(PurpleConnection *gc, const gchar *user) |
|
17989
48499e10fac3
Retrieve information for profile ("Get Info") from server, instead of from
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17988
diff
changeset
|
1111 | { |
|
48499e10fac3
Retrieve information for profile ("Get Info") from server, instead of from
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17988
diff
changeset
|
1112 | PurpleBuddy *buddy; |
|
48499e10fac3
Retrieve information for profile ("Get Info") from server, instead of from
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17988
diff
changeset
|
1113 | MsimSession *session; |
|
48499e10fac3
Retrieve information for profile ("Get Info") from server, instead of from
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17988
diff
changeset
|
1114 | guint uid; |
|
48499e10fac3
Retrieve information for profile ("Get Info") from server, instead of from
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17988
diff
changeset
|
1115 | gchar *user_to_lookup; |
|
48499e10fac3
Retrieve information for profile ("Get Info") from server, instead of from
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17988
diff
changeset
|
1116 | MsimMessage *user_msg; |
|
48499e10fac3
Retrieve information for profile ("Get Info") from server, instead of from
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17988
diff
changeset
|
1117 | |
|
48499e10fac3
Retrieve information for profile ("Get Info") from server, instead of from
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17988
diff
changeset
|
1118 | session = (MsimSession *)gc->proto_data; |
|
48499e10fac3
Retrieve information for profile ("Get Info") from server, instead of from
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17988
diff
changeset
|
1119 | |
|
48499e10fac3
Retrieve information for profile ("Get Info") from server, instead of from
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17988
diff
changeset
|
1120 | /* Obtain uid of buddy. */ |
|
48499e10fac3
Retrieve information for profile ("Get Info") from server, instead of from
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17988
diff
changeset
|
1121 | buddy = purple_find_buddy(session->account, user); |
|
48499e10fac3
Retrieve information for profile ("Get Info") from server, instead of from
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17988
diff
changeset
|
1122 | if (buddy) |
|
48499e10fac3
Retrieve information for profile ("Get Info") from server, instead of from
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17988
diff
changeset
|
1123 | { |
|
48499e10fac3
Retrieve information for profile ("Get Info") from server, instead of from
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17988
diff
changeset
|
1124 | uid = purple_blist_node_get_int(&buddy->node, "UserID"); |
|
48499e10fac3
Retrieve information for profile ("Get Info") from server, instead of from
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17988
diff
changeset
|
1125 | if (!uid) |
|
48499e10fac3
Retrieve information for profile ("Get Info") from server, instead of from
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17988
diff
changeset
|
1126 | { |
|
48499e10fac3
Retrieve information for profile ("Get Info") from server, instead of from
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17988
diff
changeset
|
1127 | PurpleNotifyUserInfo *user_info; |
|
48499e10fac3
Retrieve information for profile ("Get Info") from server, instead of from
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17988
diff
changeset
|
1128 | |
|
48499e10fac3
Retrieve information for profile ("Get Info") from server, instead of from
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17988
diff
changeset
|
1129 | user_info = purple_notify_user_info_new(); |
|
48499e10fac3
Retrieve information for profile ("Get Info") from server, instead of from
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17988
diff
changeset
|
1130 | purple_notify_user_info_add_pair(user_info, NULL, |
|
48499e10fac3
Retrieve information for profile ("Get Info") from server, instead of from
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17988
diff
changeset
|
1131 | _("This buddy appears to not have a userid stored in the buddy list, can't look up. Is the user really on the buddy list?")); |
|
48499e10fac3
Retrieve information for profile ("Get Info") from server, instead of from
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17988
diff
changeset
|
1132 | |
|
48499e10fac3
Retrieve information for profile ("Get Info") from server, instead of from
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17988
diff
changeset
|
1133 | purple_notify_userinfo(session->gc, user, user_info, NULL, NULL); |
|
48499e10fac3
Retrieve information for profile ("Get Info") from server, instead of from
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17988
diff
changeset
|
1134 | purple_notify_user_info_destroy(user_info); |
|
48499e10fac3
Retrieve information for profile ("Get Info") from server, instead of from
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17988
diff
changeset
|
1135 | return; |
|
48499e10fac3
Retrieve information for profile ("Get Info") from server, instead of from
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17988
diff
changeset
|
1136 | } |
|
48499e10fac3
Retrieve information for profile ("Get Info") from server, instead of from
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17988
diff
changeset
|
1137 | |
|
48499e10fac3
Retrieve information for profile ("Get Info") from server, instead of from
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17988
diff
changeset
|
1138 | user_to_lookup = g_strdup_printf("%d", uid); |
|
48499e10fac3
Retrieve information for profile ("Get Info") from server, instead of from
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17988
diff
changeset
|
1139 | } else { |
|
48499e10fac3
Retrieve information for profile ("Get Info") from server, instead of from
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17988
diff
changeset
|
1140 | |
|
48499e10fac3
Retrieve information for profile ("Get Info") from server, instead of from
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17988
diff
changeset
|
1141 | /* Looking up buddy not on blist. Lookup by whatever user entered. */ |
|
48499e10fac3
Retrieve information for profile ("Get Info") from server, instead of from
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17988
diff
changeset
|
1142 | user_to_lookup = g_strdup(user); |
|
48499e10fac3
Retrieve information for profile ("Get Info") from server, instead of from
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17988
diff
changeset
|
1143 | } |
|
48499e10fac3
Retrieve information for profile ("Get Info") from server, instead of from
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17988
diff
changeset
|
1144 | |
|
48499e10fac3
Retrieve information for profile ("Get Info") from server, instead of from
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17988
diff
changeset
|
1145 | /* Pass the username to msim_get_info_cb(), because since we lookup |
|
48499e10fac3
Retrieve information for profile ("Get Info") from server, instead of from
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17988
diff
changeset
|
1146 | * by userid, the userinfo message will only contain the uid (not |
|
48499e10fac3
Retrieve information for profile ("Get Info") from server, instead of from
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17988
diff
changeset
|
1147 | * the username). |
|
48499e10fac3
Retrieve information for profile ("Get Info") from server, instead of from
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17988
diff
changeset
|
1148 | */ |
|
48499e10fac3
Retrieve information for profile ("Get Info") from server, instead of from
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17988
diff
changeset
|
1149 | user_msg = msim_msg_new(TRUE, |
|
48499e10fac3
Retrieve information for profile ("Get Info") from server, instead of from
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17988
diff
changeset
|
1150 | "user", MSIM_TYPE_STRING, g_strdup(user), |
|
48499e10fac3
Retrieve information for profile ("Get Info") from server, instead of from
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17988
diff
changeset
|
1151 | NULL); |
|
48499e10fac3
Retrieve information for profile ("Get Info") from server, instead of from
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17988
diff
changeset
|
1152 | purple_debug_info("msim", "msim_get_info, setting up lookup, user=%s\n", user); |
|
48499e10fac3
Retrieve information for profile ("Get Info") from server, instead of from
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17988
diff
changeset
|
1153 | |
|
48499e10fac3
Retrieve information for profile ("Get Info") from server, instead of from
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17988
diff
changeset
|
1154 | msim_lookup_user(session, user_to_lookup, msim_get_info_cb, user_msg); |
|
48499e10fac3
Retrieve information for profile ("Get Info") from server, instead of from
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17988
diff
changeset
|
1155 | |
|
48499e10fac3
Retrieve information for profile ("Get Info") from server, instead of from
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17988
diff
changeset
|
1156 | g_free(user_to_lookup); |
|
17969
9a043ea6bc44
Implement msim_get_info() for users on the user's buddy list.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17968
diff
changeset
|
1157 | } |
|
9a043ea6bc44
Implement msim_get_info() for users on the user's buddy list.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17968
diff
changeset
|
1158 | |
|
18014
4d667ccd35ed
Add option to sign on as hidden, or as not (previously, always signed on
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18013
diff
changeset
|
1159 | /** Set your status - callback for when user manually sets it. */ |
|
18012
c83766296952
Allow setting status to away or online.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18011
diff
changeset
|
1160 | void |
|
c83766296952
Allow setting status to away or online.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18011
diff
changeset
|
1161 | msim_set_status(PurpleAccount *account, PurpleStatus *status) |
|
c83766296952
Allow setting status to away or online.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18011
diff
changeset
|
1162 | { |
|
c83766296952
Allow setting status to away or online.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18011
diff
changeset
|
1163 | PurpleStatusType *type; |
|
c83766296952
Allow setting status to away or online.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18011
diff
changeset
|
1164 | MsimSession *session; |
|
18019
dc5d60a5ac54
Add support for idle.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18018
diff
changeset
|
1165 | guint status_code; |
|
18012
c83766296952
Allow setting status to away or online.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18011
diff
changeset
|
1166 | |
|
c83766296952
Allow setting status to away or online.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18011
diff
changeset
|
1167 | session = (MsimSession *)account->gc->proto_data; |
|
c83766296952
Allow setting status to away or online.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18011
diff
changeset
|
1168 | |
|
c83766296952
Allow setting status to away or online.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18011
diff
changeset
|
1169 | type = purple_status_get_type(status); |
|
c83766296952
Allow setting status to away or online.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18011
diff
changeset
|
1170 | |
|
18019
dc5d60a5ac54
Add support for idle.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18018
diff
changeset
|
1171 | switch (purple_status_type_get_primitive(type)) |
|
18012
c83766296952
Allow setting status to away or online.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18011
diff
changeset
|
1172 | { |
|
c83766296952
Allow setting status to away or online.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18011
diff
changeset
|
1173 | case PURPLE_STATUS_AVAILABLE: |
|
c83766296952
Allow setting status to away or online.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18011
diff
changeset
|
1174 | status_code = MSIM_STATUS_CODE_ONLINE; |
|
c83766296952
Allow setting status to away or online.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18011
diff
changeset
|
1175 | break; |
|
c83766296952
Allow setting status to away or online.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18011
diff
changeset
|
1176 | |
|
c83766296952
Allow setting status to away or online.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18011
diff
changeset
|
1177 | case PURPLE_STATUS_INVISIBLE: |
| 18013 | 1178 | status_code = MSIM_STATUS_CODE_OFFLINE_OR_HIDDEN; |
|
18012
c83766296952
Allow setting status to away or online.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18011
diff
changeset
|
1179 | break; |
|
c83766296952
Allow setting status to away or online.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18011
diff
changeset
|
1180 | |
|
c83766296952
Allow setting status to away or online.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18011
diff
changeset
|
1181 | case PURPLE_STATUS_AWAY: |
|
c83766296952
Allow setting status to away or online.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18011
diff
changeset
|
1182 | status_code = MSIM_STATUS_CODE_AWAY; |
|
c83766296952
Allow setting status to away or online.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18011
diff
changeset
|
1183 | break; |
|
c83766296952
Allow setting status to away or online.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18011
diff
changeset
|
1184 | |
|
c83766296952
Allow setting status to away or online.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18011
diff
changeset
|
1185 | default: |
|
c83766296952
Allow setting status to away or online.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18011
diff
changeset
|
1186 | purple_debug_info("msim", "msim_set_status: unknown " |
|
c83766296952
Allow setting status to away or online.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18011
diff
changeset
|
1187 | "status interpreting as online"); |
|
c83766296952
Allow setting status to away or online.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18011
diff
changeset
|
1188 | status_code = MSIM_STATUS_CODE_ONLINE; |
|
c83766296952
Allow setting status to away or online.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18011
diff
changeset
|
1189 | break; |
|
c83766296952
Allow setting status to away or online.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18011
diff
changeset
|
1190 | } |
|
c83766296952
Allow setting status to away or online.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18011
diff
changeset
|
1191 | |
|
18019
dc5d60a5ac54
Add support for idle.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18018
diff
changeset
|
1192 | |
|
dc5d60a5ac54
Add support for idle.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18018
diff
changeset
|
1193 | msim_set_status_code(session, status_code); |
|
dc5d60a5ac54
Add support for idle.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18018
diff
changeset
|
1194 | } |
|
dc5d60a5ac54
Add support for idle.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18018
diff
changeset
|
1195 | |
|
dc5d60a5ac54
Add support for idle.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18018
diff
changeset
|
1196 | /** Go idle. */ |
|
dc5d60a5ac54
Add support for idle.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18018
diff
changeset
|
1197 | void |
|
dc5d60a5ac54
Add support for idle.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18018
diff
changeset
|
1198 | msim_set_idle(PurpleConnection *gc, int time) |
|
dc5d60a5ac54
Add support for idle.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18018
diff
changeset
|
1199 | { |
|
dc5d60a5ac54
Add support for idle.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18018
diff
changeset
|
1200 | MsimSession *session; |
|
dc5d60a5ac54
Add support for idle.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18018
diff
changeset
|
1201 | |
|
dc5d60a5ac54
Add support for idle.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18018
diff
changeset
|
1202 | session = (MsimSession *)gc->proto_data; |
|
dc5d60a5ac54
Add support for idle.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18018
diff
changeset
|
1203 | |
|
dc5d60a5ac54
Add support for idle.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18018
diff
changeset
|
1204 | if (time == 0) |
|
dc5d60a5ac54
Add support for idle.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18018
diff
changeset
|
1205 | { |
|
dc5d60a5ac54
Add support for idle.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18018
diff
changeset
|
1206 | /* Going back from idle. In msim, idle is mutually exclusive |
|
dc5d60a5ac54
Add support for idle.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18018
diff
changeset
|
1207 | * from the other states (you can only be away or idle, but not |
|
dc5d60a5ac54
Add support for idle.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18018
diff
changeset
|
1208 | * both, for example), so by going non-idle I go online. |
|
dc5d60a5ac54
Add support for idle.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18018
diff
changeset
|
1209 | */ |
|
dc5d60a5ac54
Add support for idle.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18018
diff
changeset
|
1210 | msim_set_status_code(session, MSIM_STATUS_CODE_ONLINE); |
|
dc5d60a5ac54
Add support for idle.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18018
diff
changeset
|
1211 | } else { |
|
dc5d60a5ac54
Add support for idle.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18018
diff
changeset
|
1212 | /* msim doesn't support idle time */ |
|
dc5d60a5ac54
Add support for idle.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18018
diff
changeset
|
1213 | msim_set_status_code(session, MSIM_STATUS_CODE_IDLE); |
|
dc5d60a5ac54
Add support for idle.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18018
diff
changeset
|
1214 | } |
|
dc5d60a5ac54
Add support for idle.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18018
diff
changeset
|
1215 | } |
|
dc5d60a5ac54
Add support for idle.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18018
diff
changeset
|
1216 | |
|
dc5d60a5ac54
Add support for idle.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18018
diff
changeset
|
1217 | /** Set status using an MSIM_STATUS_CODE_* value. (TODO: also set message) */ |
|
dc5d60a5ac54
Add support for idle.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18018
diff
changeset
|
1218 | void |
|
dc5d60a5ac54
Add support for idle.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18018
diff
changeset
|
1219 | msim_set_status_code(MsimSession *session, guint status_code) |
|
dc5d60a5ac54
Add support for idle.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18018
diff
changeset
|
1220 | { |
|
18012
c83766296952
Allow setting status to away or online.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18011
diff
changeset
|
1221 | if (!msim_send(session, |
|
c83766296952
Allow setting status to away or online.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18011
diff
changeset
|
1222 | "status", MSIM_TYPE_INTEGER, status_code, |
|
c83766296952
Allow setting status to away or online.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18011
diff
changeset
|
1223 | "sesskey", MSIM_TYPE_INTEGER, session->sesskey, |
|
c83766296952
Allow setting status to away or online.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18011
diff
changeset
|
1224 | "statstring", MSIM_TYPE_STRING, g_strdup(""), |
|
c83766296952
Allow setting status to away or online.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18011
diff
changeset
|
1225 | "locstring", MSIM_TYPE_STRING, g_strdup(""))) |
|
c83766296952
Allow setting status to away or online.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18011
diff
changeset
|
1226 | { |
|
c83766296952
Allow setting status to away or online.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18011
diff
changeset
|
1227 | purple_debug_info("msim", "msim_set_status: failed to set status"); |
|
c83766296952
Allow setting status to away or online.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18011
diff
changeset
|
1228 | } |
|
c83766296952
Allow setting status to away or online.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18011
diff
changeset
|
1229 | |
|
c83766296952
Allow setting status to away or online.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18011
diff
changeset
|
1230 | } |
|
c83766296952
Allow setting status to away or online.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18011
diff
changeset
|
1231 | |
|
17950
c146721d0ca7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17949
diff
changeset
|
1232 | /** After a uid is resolved to username, tag it with the username and submit for processing. |
|
c146721d0ca7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17949
diff
changeset
|
1233 | * |
|
c146721d0ca7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17949
diff
changeset
|
1234 | * @param session |
|
c146721d0ca7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17949
diff
changeset
|
1235 | * @param userinfo Response messsage to resolving request. |
|
c146721d0ca7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17949
diff
changeset
|
1236 | * @param data MsimMessage *, the message to attach information to. |
|
c146721d0ca7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17949
diff
changeset
|
1237 | */ |
|
17994
b3b072dd8478
Split return type and function name + arguments on to separate lines, to
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17993
diff
changeset
|
1238 | static void |
|
b3b072dd8478
Split return type and function name + arguments on to separate lines, to
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17993
diff
changeset
|
1239 | msim_incoming_resolved(MsimSession *session, MsimMessage *userinfo, |
|
b3b072dd8478
Split return type and function name + arguments on to separate lines, to
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17993
diff
changeset
|
1240 | gpointer data) |
|
17950
c146721d0ca7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17949
diff
changeset
|
1241 | { |
|
c146721d0ca7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17949
diff
changeset
|
1242 | gchar *body_str; |
|
c146721d0ca7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17949
diff
changeset
|
1243 | GHashTable *body; |
|
c146721d0ca7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17949
diff
changeset
|
1244 | gchar *username; |
|
c146721d0ca7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17949
diff
changeset
|
1245 | MsimMessage *msg; |
|
c146721d0ca7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17949
diff
changeset
|
1246 | |
|
c146721d0ca7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17949
diff
changeset
|
1247 | body_str = msim_msg_get_string(userinfo, "body"); |
|
c146721d0ca7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17949
diff
changeset
|
1248 | g_return_if_fail(body_str != NULL); |
|
c146721d0ca7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17949
diff
changeset
|
1249 | body = msim_parse_body(body_str); |
|
c146721d0ca7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17949
diff
changeset
|
1250 | g_return_if_fail(body != NULL); |
|
c146721d0ca7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17949
diff
changeset
|
1251 | g_free(body_str); |
|
c146721d0ca7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17949
diff
changeset
|
1252 | |
|
c146721d0ca7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17949
diff
changeset
|
1253 | username = g_hash_table_lookup(body, "UserName"); |
|
c146721d0ca7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17949
diff
changeset
|
1254 | g_return_if_fail(username != NULL); |
|
c146721d0ca7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17949
diff
changeset
|
1255 | |
|
c146721d0ca7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17949
diff
changeset
|
1256 | msg = (MsimMessage *)data; |
|
c146721d0ca7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17949
diff
changeset
|
1257 | /* Special elements name beginning with '_', we'll use internally within the |
|
c146721d0ca7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17949
diff
changeset
|
1258 | * program (did not come from the wire). */ |
|
c146721d0ca7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17949
diff
changeset
|
1259 | msg = msim_msg_append(msg, "_username", MSIM_TYPE_STRING, g_strdup(username)); |
|
c146721d0ca7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17949
diff
changeset
|
1260 | |
|
c146721d0ca7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17949
diff
changeset
|
1261 | msim_process(session, msg); |
|
c146721d0ca7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17949
diff
changeset
|
1262 | |
|
17951
313b994beb1d
Transition msim_incoming_im() to the callbackless infrastructure. Remove
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17950
diff
changeset
|
1263 | /* TODO: Free copy cloned from msim_preprocess_incoming(). */ |
|
17950
c146721d0ca7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17949
diff
changeset
|
1264 | //XXX msim_msg_free(msg); |
|
c146721d0ca7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17949
diff
changeset
|
1265 | g_hash_table_destroy(body); |
|
c146721d0ca7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17949
diff
changeset
|
1266 | } |
|
c146721d0ca7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17949
diff
changeset
|
1267 | |
|
18002
ba63892ad307
Change around msim_uid2username_from_blist() to try to get it to work
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18001
diff
changeset
|
1268 | #if 0 |
|
17957
bc5874ed7a09
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17956
diff
changeset
|
1269 | /* Lookup a username by userid, from buddy list. |
|
bc5874ed7a09
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17956
diff
changeset
|
1270 | * |
|
bc5874ed7a09
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17956
diff
changeset
|
1271 | * @param wanted_uid |
|
bc5874ed7a09
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17956
diff
changeset
|
1272 | * |
|
bc5874ed7a09
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17956
diff
changeset
|
1273 | * @return Username of wanted_uid, if on blist, or NULL. Static string. |
|
bc5874ed7a09
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17956
diff
changeset
|
1274 | * |
|
bc5874ed7a09
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17956
diff
changeset
|
1275 | * XXX WARNING: UNKNOWN MEMORY CORRUPTION HERE! |
|
bc5874ed7a09
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17956
diff
changeset
|
1276 | */ |
|
17994
b3b072dd8478
Split return type and function name + arguments on to separate lines, to
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17993
diff
changeset
|
1277 | static const gchar * |
|
b3b072dd8478
Split return type and function name + arguments on to separate lines, to
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17993
diff
changeset
|
1278 | msim_uid2username_from_blist(MsimSession *session, guint wanted_uid) |
|
17957
bc5874ed7a09
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17956
diff
changeset
|
1279 | { |
|
18002
ba63892ad307
Change around msim_uid2username_from_blist() to try to get it to work
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18001
diff
changeset
|
1280 | GSList *buddies, *cur; |
|
ba63892ad307
Change around msim_uid2username_from_blist() to try to get it to work
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18001
diff
changeset
|
1281 | |
|
ba63892ad307
Change around msim_uid2username_from_blist() to try to get it to work
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18001
diff
changeset
|
1282 | buddies = purple_find_buddies(session->account, NULL); |
|
ba63892ad307
Change around msim_uid2username_from_blist() to try to get it to work
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18001
diff
changeset
|
1283 | |
|
ba63892ad307
Change around msim_uid2username_from_blist() to try to get it to work
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18001
diff
changeset
|
1284 | if (!buddies) |
|
ba63892ad307
Change around msim_uid2username_from_blist() to try to get it to work
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18001
diff
changeset
|
1285 | { |
|
ba63892ad307
Change around msim_uid2username_from_blist() to try to get it to work
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18001
diff
changeset
|
1286 | purple_debug_info("msim", "msim_uid2username_from_blist: no buddies?"); |
|
ba63892ad307
Change around msim_uid2username_from_blist() to try to get it to work
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18001
diff
changeset
|
1287 | return NULL; |
|
ba63892ad307
Change around msim_uid2username_from_blist() to try to get it to work
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18001
diff
changeset
|
1288 | } |
|
ba63892ad307
Change around msim_uid2username_from_blist() to try to get it to work
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18001
diff
changeset
|
1289 | |
|
ba63892ad307
Change around msim_uid2username_from_blist() to try to get it to work
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18001
diff
changeset
|
1290 | for (cur = buddies; cur != NULL; cur = g_slist_next(cur)) |
|
17957
bc5874ed7a09
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17956
diff
changeset
|
1291 | { |
|
bc5874ed7a09
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17956
diff
changeset
|
1292 | PurpleBuddy *buddy; |
|
18002
ba63892ad307
Change around msim_uid2username_from_blist() to try to get it to work
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18001
diff
changeset
|
1293 | //PurpleBlistNode *node; |
|
17957
bc5874ed7a09
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17956
diff
changeset
|
1294 | guint uid; |
|
18002
ba63892ad307
Change around msim_uid2username_from_blist() to try to get it to work
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18001
diff
changeset
|
1295 | const gchar *name; |
|
ba63892ad307
Change around msim_uid2username_from_blist() to try to get it to work
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18001
diff
changeset
|
1296 | |
|
ba63892ad307
Change around msim_uid2username_from_blist() to try to get it to work
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18001
diff
changeset
|
1297 | |
|
ba63892ad307
Change around msim_uid2username_from_blist() to try to get it to work
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18001
diff
changeset
|
1298 | /* See finch/gnthistory.c */ |
|
ba63892ad307
Change around msim_uid2username_from_blist() to try to get it to work
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18001
diff
changeset
|
1299 | buddy = cur->data; |
|
ba63892ad307
Change around msim_uid2username_from_blist() to try to get it to work
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18001
diff
changeset
|
1300 | //node = cur->data; |
|
17957
bc5874ed7a09
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17956
diff
changeset
|
1301 | |
|
17966
e2bdcbb55218
Show buddy information in tooltip text, and the display name for status text.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17964
diff
changeset
|
1302 | uid = purple_blist_node_get_int(&buddy->node, "UserID"); |
|
18002
ba63892ad307
Change around msim_uid2username_from_blist() to try to get it to work
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18001
diff
changeset
|
1303 | //uid = purple_blist_node_get_int(node, "UserID"); |
|
17957
bc5874ed7a09
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17956
diff
changeset
|
1304 | |
|
bc5874ed7a09
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17956
diff
changeset
|
1305 | /* name = buddy->name; */ /* crash */ |
|
bc5874ed7a09
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17956
diff
changeset
|
1306 | /* name = PURPLE_BLIST_NODE_NAME(&buddy->node); */ /* crash */ |
|
bc5874ed7a09
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17956
diff
changeset
|
1307 | |
|
bc5874ed7a09
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17956
diff
changeset
|
1308 | /* XXX Is this right? Memory corruption here somehow. Happens only |
|
bc5874ed7a09
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17956
diff
changeset
|
1309 | * when return one of these values. */ |
|
bc5874ed7a09
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17956
diff
changeset
|
1310 | name = purple_buddy_get_name(buddy); /* crash */ |
|
18002
ba63892ad307
Change around msim_uid2username_from_blist() to try to get it to work
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18001
diff
changeset
|
1311 | //name = purple_buddy_get_name((PurpleBuddy *)node); /* crash */ |
|
17957
bc5874ed7a09
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17956
diff
changeset
|
1312 | /* return name; */ /* crash (with above) */ |
|
bc5874ed7a09
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17956
diff
changeset
|
1313 | |
|
bc5874ed7a09
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17956
diff
changeset
|
1314 | /* name = NULL; */ /* no crash */ |
|
bc5874ed7a09
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17956
diff
changeset
|
1315 | /* return NULL; */ /* no crash (with anything) */ |
|
bc5874ed7a09
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17956
diff
changeset
|
1316 | |
|
bc5874ed7a09
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17956
diff
changeset
|
1317 | /* crash = |
|
bc5874ed7a09
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17956
diff
changeset
|
1318 | *** glibc detected *** pidgin: realloc(): invalid pointer: 0x0000000000d2aec0 *** |
|
bc5874ed7a09
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17956
diff
changeset
|
1319 | ======= Backtrace: ========= |
|
bc5874ed7a09
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17956
diff
changeset
|
1320 | /lib/libc.so.6(__libc_realloc+0x323)[0x2b7bfc012e03] |
|
bc5874ed7a09
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17956
diff
changeset
|
1321 | /usr/lib/libglib-2.0.so.0(g_realloc+0x31)[0x2b7bfba79a41] |
|
bc5874ed7a09
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17956
diff
changeset
|
1322 | /usr/lib/libgtk-x11-2.0.so.0(gtk_tree_path_append_index+0x3a)[0x2b7bfa110d5a] |
|
bc5874ed7a09
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17956
diff
changeset
|
1323 | /usr/lib/libgtk-x11-2.0.so.0[0x2b7bfa1287dc] |
|
bc5874ed7a09
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17956
diff
changeset
|
1324 | /usr/lib/libgtk-x11-2.0.so.0[0x2b7bfa128e56] |
|
bc5874ed7a09
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17956
diff
changeset
|
1325 | /usr/lib/libgtk-x11-2.0.so.0[0x2b7bfa128efd] |
|
bc5874ed7a09
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17956
diff
changeset
|
1326 | /usr/lib/libglib-2.0.so.0(g_main_context_dispatch+0x1b4)[0x2b7bfba72c84] |
|
bc5874ed7a09
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17956
diff
changeset
|
1327 | /usr/lib/libglib-2.0.so.0[0x2b7bfba75acd] |
|
bc5874ed7a09
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17956
diff
changeset
|
1328 | /usr/lib/libglib-2.0.so.0(g_main_loop_run+0x1ca)[0x2b7bfba75dda] |
|
bc5874ed7a09
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17956
diff
changeset
|
1329 | /usr/lib/libgtk-x11-2.0.so.0(gtk_main+0xa3)[0x2b7bfa0475f3] |
|
bc5874ed7a09
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17956
diff
changeset
|
1330 | pidgin(main+0x8be)[0x46b45e] |
|
bc5874ed7a09
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17956
diff
changeset
|
1331 | /lib/libc.so.6(__libc_start_main+0xf4)[0x2b7bfbfbf0c4] |
|
bc5874ed7a09
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17956
diff
changeset
|
1332 | pidgin(gtk_widget_grab_focus+0x39)[0x429ab9] |
|
bc5874ed7a09
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17956
diff
changeset
|
1333 | |
|
bc5874ed7a09
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17956
diff
changeset
|
1334 | or: |
|
bc5874ed7a09
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17956
diff
changeset
|
1335 | *** glibc detected *** /usr/local/bin/pidgin: malloc(): memory corruption (fast): 0x0000000000c10076 *** |
|
bc5874ed7a09
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17956
diff
changeset
|
1336 | (gdb) bt |
|
bc5874ed7a09
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17956
diff
changeset
|
1337 | #0 0x00002b4074ecd47b in raise () from /lib/libc.so.6 |
|
bc5874ed7a09
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17956
diff
changeset
|
1338 | #1 0x00002b4074eceda0 in abort () from /lib/libc.so.6 |
|
bc5874ed7a09
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17956
diff
changeset
|
1339 | #2 0x00002b4074f0453b in __fsetlocking () from /lib/libc.so.6 |
|
bc5874ed7a09
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17956
diff
changeset
|
1340 | #3 0x00002b4074f0c810 in free () from /lib/libc.so.6 |
|
bc5874ed7a09
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17956
diff
changeset
|
1341 | #4 0x00002b4074f0d6dd in malloc () from /lib/libc.so.6 |
|
bc5874ed7a09
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17956
diff
changeset
|
1342 | #5 0x00002b4074974b5b in g_malloc () from /usr/lib/libglib-2.0.so.0 |
|
bc5874ed7a09
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17956
diff
changeset
|
1343 | #6 0x00002b40749868bf in g_strdup () from /usr/lib/libglib-2.0.so.0 |
|
bc5874ed7a09
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17956
diff
changeset
|
1344 | #7 0x00002b407810969f in msim_parse ( |
|
bc5874ed7a09
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17956
diff
changeset
|
1345 | raw=0xd2a910 "\\bm\\100\\f\\3656574\\msg\\|s|0|ss|Offline") |
|
bc5874ed7a09
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17956
diff
changeset
|
1346 | at message.c:648 |
|
bc5874ed7a09
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17956
diff
changeset
|
1347 | #8 0x00002b407810889c in msim_input_cb (gc_uncasted=0xcf92c0, |
|
bc5874ed7a09
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17956
diff
changeset
|
1348 | source=<value optimized out>, cond=<value optimized out>) at myspace.c:1478 |
|
bc5874ed7a09
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17956
diff
changeset
|
1349 | |
|
bc5874ed7a09
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17956
diff
changeset
|
1350 | |
|
bc5874ed7a09
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17956
diff
changeset
|
1351 | Why is it crashing in msim_parse()'s g_strdup()? |
|
bc5874ed7a09
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17956
diff
changeset
|
1352 | */ |
|
bc5874ed7a09
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17956
diff
changeset
|
1353 | purple_debug_info("msim", "msim_uid2username_from_blist: %s's uid=%d (want %d)\n", |
|
bc5874ed7a09
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17956
diff
changeset
|
1354 | name, uid, wanted_uid); |
|
bc5874ed7a09
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17956
diff
changeset
|
1355 | |
|
bc5874ed7a09
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17956
diff
changeset
|
1356 | if (uid == wanted_uid) |
|
bc5874ed7a09
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17956
diff
changeset
|
1357 | { |
|
18002
ba63892ad307
Change around msim_uid2username_from_blist() to try to get it to work
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18001
diff
changeset
|
1358 | gchar *ret; |
|
ba63892ad307
Change around msim_uid2username_from_blist() to try to get it to work
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18001
diff
changeset
|
1359 | |
|
ba63892ad307
Change around msim_uid2username_from_blist() to try to get it to work
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18001
diff
changeset
|
1360 | ret = g_strdup(name); |
|
ba63892ad307
Change around msim_uid2username_from_blist() to try to get it to work
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18001
diff
changeset
|
1361 | |
|
ba63892ad307
Change around msim_uid2username_from_blist() to try to get it to work
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18001
diff
changeset
|
1362 | g_slist_free(buddies); |
|
ba63892ad307
Change around msim_uid2username_from_blist() to try to get it to work
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18001
diff
changeset
|
1363 | |
|
ba63892ad307
Change around msim_uid2username_from_blist() to try to get it to work
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18001
diff
changeset
|
1364 | return ret; |
|
17957
bc5874ed7a09
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17956
diff
changeset
|
1365 | } |
|
bc5874ed7a09
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17956
diff
changeset
|
1366 | } |
|
bc5874ed7a09
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17956
diff
changeset
|
1367 | |
|
18002
ba63892ad307
Change around msim_uid2username_from_blist() to try to get it to work
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18001
diff
changeset
|
1368 | g_slist_free(buddies); |
|
17957
bc5874ed7a09
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17956
diff
changeset
|
1369 | return NULL; |
|
bc5874ed7a09
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17956
diff
changeset
|
1370 | } |
|
17958
9f809365230b
Add TODO in order to fix msim_tooltip_text.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17957
diff
changeset
|
1371 | #endif |
|
9f809365230b
Add TODO in order to fix msim_tooltip_text.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17957
diff
changeset
|
1372 | |
|
17950
c146721d0ca7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17949
diff
changeset
|
1373 | /** Preprocess incoming messages, resolving as needed, calling msim_process() when ready to process. |
|
c146721d0ca7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17949
diff
changeset
|
1374 | * |
|
c146721d0ca7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17949
diff
changeset
|
1375 | * @param session |
|
c146721d0ca7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17949
diff
changeset
|
1376 | * @param msg MsimMessage *, freed by caller. |
|
c146721d0ca7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17949
diff
changeset
|
1377 | */ |
|
17994
b3b072dd8478
Split return type and function name + arguments on to separate lines, to
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17993
diff
changeset
|
1378 | gboolean |
|
b3b072dd8478
Split return type and function name + arguments on to separate lines, to
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17993
diff
changeset
|
1379 | msim_preprocess_incoming(MsimSession *session, MsimMessage *msg) |
|
17950
c146721d0ca7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17949
diff
changeset
|
1380 | { |
|
c146721d0ca7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17949
diff
changeset
|
1381 | if (msim_msg_get(msg, "bm") && msim_msg_get(msg, "f")) |
|
c146721d0ca7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17949
diff
changeset
|
1382 | { |
|
17957
bc5874ed7a09
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17956
diff
changeset
|
1383 | guint uid; |
|
bc5874ed7a09
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17956
diff
changeset
|
1384 | const gchar *username; |
|
bc5874ed7a09
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17956
diff
changeset
|
1385 | |
|
17950
c146721d0ca7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17949
diff
changeset
|
1386 | /* 'f' = userid message is from, in buddy messages */ |
|
17957
bc5874ed7a09
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17956
diff
changeset
|
1387 | uid = msim_msg_get_integer(msg, "f"); |
|
17950
c146721d0ca7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17949
diff
changeset
|
1388 | |
|
17957
bc5874ed7a09
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17956
diff
changeset
|
1389 | /* TODO: Make caching work. Currently it is commented out because |
|
bc5874ed7a09
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17956
diff
changeset
|
1390 | * it crashes for unknown reasons, memory realloc error. */ |
|
18002
ba63892ad307
Change around msim_uid2username_from_blist() to try to get it to work
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18001
diff
changeset
|
1391 | #if 0 |
|
17957
bc5874ed7a09
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17956
diff
changeset
|
1392 | username = msim_uid2username_from_blist(session, uid); |
|
bc5874ed7a09
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17956
diff
changeset
|
1393 | #else |
|
18002
ba63892ad307
Change around msim_uid2username_from_blist() to try to get it to work
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18001
diff
changeset
|
1394 | username = NULL; |
|
17957
bc5874ed7a09
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17956
diff
changeset
|
1395 | #endif |
|
17950
c146721d0ca7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17949
diff
changeset
|
1396 | |
|
17957
bc5874ed7a09
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17956
diff
changeset
|
1397 | if (username) |
|
bc5874ed7a09
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17956
diff
changeset
|
1398 | { |
|
bc5874ed7a09
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17956
diff
changeset
|
1399 | /* Know username already, use it. */ |
|
bc5874ed7a09
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17956
diff
changeset
|
1400 | purple_debug_info("msim", "msim_preprocess_incoming: tagging with _username=%s\n", |
|
bc5874ed7a09
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17956
diff
changeset
|
1401 | username); |
|
bc5874ed7a09
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17956
diff
changeset
|
1402 | msg = msim_msg_append(msg, "_username", MSIM_TYPE_STRING, g_strdup(username)); |
|
bc5874ed7a09
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17956
diff
changeset
|
1403 | return msim_process(session, msg); |
|
17950
c146721d0ca7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17949
diff
changeset
|
1404 | |
|
17957
bc5874ed7a09
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17956
diff
changeset
|
1405 | } else { |
|
17989
48499e10fac3
Retrieve information for profile ("Get Info") from server, instead of from
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17988
diff
changeset
|
1406 | gchar *from; |
|
48499e10fac3
Retrieve information for profile ("Get Info") from server, instead of from
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17988
diff
changeset
|
1407 | |
|
17957
bc5874ed7a09
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17956
diff
changeset
|
1408 | /* Send lookup request. */ |
|
bc5874ed7a09
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17956
diff
changeset
|
1409 | /* XXX: where is msim_msg_get_string() freed? make _strdup and _nonstrdup. */ |
|
bc5874ed7a09
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17956
diff
changeset
|
1410 | purple_debug_info("msim", "msim_incoming: sending lookup, setting up callback\n"); |
|
17989
48499e10fac3
Retrieve information for profile ("Get Info") from server, instead of from
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17988
diff
changeset
|
1411 | from = msim_msg_get_string(msg, "f"); |
|
48499e10fac3
Retrieve information for profile ("Get Info") from server, instead of from
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17988
diff
changeset
|
1412 | msim_lookup_user(session, from, msim_incoming_resolved, msim_msg_clone(msg)); |
|
48499e10fac3
Retrieve information for profile ("Get Info") from server, instead of from
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17988
diff
changeset
|
1413 | g_free(from); |
|
17957
bc5874ed7a09
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17956
diff
changeset
|
1414 | |
|
bc5874ed7a09
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17956
diff
changeset
|
1415 | /* indeterminate */ |
|
bc5874ed7a09
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17956
diff
changeset
|
1416 | return TRUE; |
|
bc5874ed7a09
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17956
diff
changeset
|
1417 | } |
|
17950
c146721d0ca7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17949
diff
changeset
|
1418 | } else { |
|
c146721d0ca7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17949
diff
changeset
|
1419 | /* Nothing to resolve - send directly to processing. */ |
|
c146721d0ca7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17949
diff
changeset
|
1420 | return msim_process(session, msg); |
|
c146721d0ca7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17949
diff
changeset
|
1421 | } |
|
c146721d0ca7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17949
diff
changeset
|
1422 | } |
|
c146721d0ca7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17949
diff
changeset
|
1423 | |
|
18020
f951defd22fd
Add msim_check_alive(), called every MSIM_KEEPALIVE_INTERVAL_CHECK milliseconds,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18019
diff
changeset
|
1424 | /** Check if the connection is still alive, based on last communication. */ |
|
f951defd22fd
Add msim_check_alive(), called every MSIM_KEEPALIVE_INTERVAL_CHECK milliseconds,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18019
diff
changeset
|
1425 | gboolean |
|
f951defd22fd
Add msim_check_alive(), called every MSIM_KEEPALIVE_INTERVAL_CHECK milliseconds,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18019
diff
changeset
|
1426 | msim_check_alive(gpointer data) |
|
f951defd22fd
Add msim_check_alive(), called every MSIM_KEEPALIVE_INTERVAL_CHECK milliseconds,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18019
diff
changeset
|
1427 | { |
|
f951defd22fd
Add msim_check_alive(), called every MSIM_KEEPALIVE_INTERVAL_CHECK milliseconds,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18019
diff
changeset
|
1428 | MsimSession *session; |
|
f951defd22fd
Add msim_check_alive(), called every MSIM_KEEPALIVE_INTERVAL_CHECK milliseconds,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18019
diff
changeset
|
1429 | time_t delta; |
|
f951defd22fd
Add msim_check_alive(), called every MSIM_KEEPALIVE_INTERVAL_CHECK milliseconds,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18019
diff
changeset
|
1430 | gchar *errmsg; |
|
f951defd22fd
Add msim_check_alive(), called every MSIM_KEEPALIVE_INTERVAL_CHECK milliseconds,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18019
diff
changeset
|
1431 | |
|
f951defd22fd
Add msim_check_alive(), called every MSIM_KEEPALIVE_INTERVAL_CHECK milliseconds,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18019
diff
changeset
|
1432 | session = (MsimSession *)data; |
|
f951defd22fd
Add msim_check_alive(), called every MSIM_KEEPALIVE_INTERVAL_CHECK milliseconds,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18019
diff
changeset
|
1433 | |
|
f951defd22fd
Add msim_check_alive(), called every MSIM_KEEPALIVE_INTERVAL_CHECK milliseconds,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18019
diff
changeset
|
1434 | delta = time(NULL) - session->last_comm; |
|
f951defd22fd
Add msim_check_alive(), called every MSIM_KEEPALIVE_INTERVAL_CHECK milliseconds,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18019
diff
changeset
|
1435 | purple_debug_info("msim", "msim_check_alive: delta=%d\n", delta); |
|
f951defd22fd
Add msim_check_alive(), called every MSIM_KEEPALIVE_INTERVAL_CHECK milliseconds,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18019
diff
changeset
|
1436 | if (delta >= MSIM_KEEPALIVE_INTERVAL) |
|
f951defd22fd
Add msim_check_alive(), called every MSIM_KEEPALIVE_INTERVAL_CHECK milliseconds,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18019
diff
changeset
|
1437 | { |
|
f951defd22fd
Add msim_check_alive(), called every MSIM_KEEPALIVE_INTERVAL_CHECK milliseconds,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18019
diff
changeset
|
1438 | errmsg = g_strdup_printf(_("Connection to server lost (no data received within %d seconds)"), delta); |
|
f951defd22fd
Add msim_check_alive(), called every MSIM_KEEPALIVE_INTERVAL_CHECK milliseconds,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18019
diff
changeset
|
1439 | |
|
f951defd22fd
Add msim_check_alive(), called every MSIM_KEEPALIVE_INTERVAL_CHECK milliseconds,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18019
diff
changeset
|
1440 | purple_debug_info("msim", "msim_check_alive: %s > interval of %d, presumed dead\n", |
|
f951defd22fd
Add msim_check_alive(), called every MSIM_KEEPALIVE_INTERVAL_CHECK milliseconds,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18019
diff
changeset
|
1441 | errmsg, MSIM_KEEPALIVE_INTERVAL); |
|
f951defd22fd
Add msim_check_alive(), called every MSIM_KEEPALIVE_INTERVAL_CHECK milliseconds,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18019
diff
changeset
|
1442 | purple_connection_error(session->gc, errmsg); |
|
f951defd22fd
Add msim_check_alive(), called every MSIM_KEEPALIVE_INTERVAL_CHECK milliseconds,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18019
diff
changeset
|
1443 | |
|
f951defd22fd
Add msim_check_alive(), called every MSIM_KEEPALIVE_INTERVAL_CHECK milliseconds,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18019
diff
changeset
|
1444 | purple_notify_error(session->gc, NULL, errmsg, NULL); |
|
f951defd22fd
Add msim_check_alive(), called every MSIM_KEEPALIVE_INTERVAL_CHECK milliseconds,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18019
diff
changeset
|
1445 | |
|
f951defd22fd
Add msim_check_alive(), called every MSIM_KEEPALIVE_INTERVAL_CHECK milliseconds,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18019
diff
changeset
|
1446 | g_free(errmsg); |
|
f951defd22fd
Add msim_check_alive(), called every MSIM_KEEPALIVE_INTERVAL_CHECK milliseconds,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18019
diff
changeset
|
1447 | |
|
f951defd22fd
Add msim_check_alive(), called every MSIM_KEEPALIVE_INTERVAL_CHECK milliseconds,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18019
diff
changeset
|
1448 | return FALSE; |
|
f951defd22fd
Add msim_check_alive(), called every MSIM_KEEPALIVE_INTERVAL_CHECK milliseconds,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18019
diff
changeset
|
1449 | } |
|
f951defd22fd
Add msim_check_alive(), called every MSIM_KEEPALIVE_INTERVAL_CHECK milliseconds,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18019
diff
changeset
|
1450 | |
|
f951defd22fd
Add msim_check_alive(), called every MSIM_KEEPALIVE_INTERVAL_CHECK milliseconds,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18019
diff
changeset
|
1451 | return TRUE; |
|
f951defd22fd
Add msim_check_alive(), called every MSIM_KEEPALIVE_INTERVAL_CHECK milliseconds,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18019
diff
changeset
|
1452 | } |
|
f951defd22fd
Add msim_check_alive(), called every MSIM_KEEPALIVE_INTERVAL_CHECK milliseconds,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18019
diff
changeset
|
1453 | |
|
18014
4d667ccd35ed
Add option to sign on as hidden, or as not (previously, always signed on
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18013
diff
changeset
|
1454 | /** Called when the session key arrives. */ |
|
4d667ccd35ed
Add option to sign on as hidden, or as not (previously, always signed on
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18013
diff
changeset
|
1455 | gboolean |
|
4d667ccd35ed
Add option to sign on as hidden, or as not (previously, always signed on
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18013
diff
changeset
|
1456 | msim_we_are_logged_on(MsimSession *session, MsimMessage *msg) |
|
4d667ccd35ed
Add option to sign on as hidden, or as not (previously, always signed on
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18013
diff
changeset
|
1457 | { |
|
4d667ccd35ed
Add option to sign on as hidden, or as not (previously, always signed on
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18013
diff
changeset
|
1458 | purple_connection_update_progress(session->gc, _("Connected"), 3, 4); |
|
4d667ccd35ed
Add option to sign on as hidden, or as not (previously, always signed on
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18013
diff
changeset
|
1459 | |
|
4d667ccd35ed
Add option to sign on as hidden, or as not (previously, always signed on
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18013
diff
changeset
|
1460 | session->sesskey = msim_msg_get_integer(msg, "sesskey"); |
|
4d667ccd35ed
Add option to sign on as hidden, or as not (previously, always signed on
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18013
diff
changeset
|
1461 | purple_debug_info("msim", "SESSKEY=<%d>\n", session->sesskey); |
|
4d667ccd35ed
Add option to sign on as hidden, or as not (previously, always signed on
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18013
diff
changeset
|
1462 | |
|
4d667ccd35ed
Add option to sign on as hidden, or as not (previously, always signed on
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18013
diff
changeset
|
1463 | /* Comes with: proof,profileid,userid,uniquenick -- all same values |
|
4d667ccd35ed
Add option to sign on as hidden, or as not (previously, always signed on
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18013
diff
changeset
|
1464 | * some of the time, but can vary. This is our own user ID. */ |
|
4d667ccd35ed
Add option to sign on as hidden, or as not (previously, always signed on
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18013
diff
changeset
|
1465 | session->userid = msim_msg_get_integer(msg, "userid"); |
|
4d667ccd35ed
Add option to sign on as hidden, or as not (previously, always signed on
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18013
diff
changeset
|
1466 | |
|
4d667ccd35ed
Add option to sign on as hidden, or as not (previously, always signed on
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18013
diff
changeset
|
1467 | |
|
4d667ccd35ed
Add option to sign on as hidden, or as not (previously, always signed on
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18013
diff
changeset
|
1468 | purple_connection_set_state(session->gc, PURPLE_CONNECTED); |
|
4d667ccd35ed
Add option to sign on as hidden, or as not (previously, always signed on
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18013
diff
changeset
|
1469 | |
|
4d667ccd35ed
Add option to sign on as hidden, or as not (previously, always signed on
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18013
diff
changeset
|
1470 | |
|
4d667ccd35ed
Add option to sign on as hidden, or as not (previously, always signed on
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18013
diff
changeset
|
1471 | /* We now know are our own username, only after we're logged in.. |
|
4d667ccd35ed
Add option to sign on as hidden, or as not (previously, always signed on
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18013
diff
changeset
|
1472 | * which is weird, but happens because you login with your email |
|
4d667ccd35ed
Add option to sign on as hidden, or as not (previously, always signed on
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18013
diff
changeset
|
1473 | * address and not username. Will be freed in msim_session_destroy(). */ |
|
4d667ccd35ed
Add option to sign on as hidden, or as not (previously, always signed on
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18013
diff
changeset
|
1474 | session->username = msim_msg_get_string(msg, "uniquenick"); |
|
4d667ccd35ed
Add option to sign on as hidden, or as not (previously, always signed on
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18013
diff
changeset
|
1475 | |
|
4d667ccd35ed
Add option to sign on as hidden, or as not (previously, always signed on
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18013
diff
changeset
|
1476 | #ifdef MSIM_FAKE_SELF_ONLINE |
|
4d667ccd35ed
Add option to sign on as hidden, or as not (previously, always signed on
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18013
diff
changeset
|
1477 | /* Fake our self coming online. */ |
|
4d667ccd35ed
Add option to sign on as hidden, or as not (previously, always signed on
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18013
diff
changeset
|
1478 | purple_prpl_got_user_status(session->account, session->username, purple_primitive_get_id_from_type(PURPLE_STATUS_AVAILABLE), NULL); |
|
4d667ccd35ed
Add option to sign on as hidden, or as not (previously, always signed on
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18013
diff
changeset
|
1479 | #endif |
|
4d667ccd35ed
Add option to sign on as hidden, or as not (previously, always signed on
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18013
diff
changeset
|
1480 | |
|
4d667ccd35ed
Add option to sign on as hidden, or as not (previously, always signed on
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18013
diff
changeset
|
1481 | /* Set status depending on preference. */ |
|
18020
f951defd22fd
Add msim_check_alive(), called every MSIM_KEEPALIVE_INTERVAL_CHECK milliseconds,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18019
diff
changeset
|
1482 | /* TODO: set status to current status, change status to hidden if sign on as hidden. |
|
f951defd22fd
Add msim_check_alive(), called every MSIM_KEEPALIVE_INTERVAL_CHECK milliseconds,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18019
diff
changeset
|
1483 | * Or remove this preference alltogether, and set status to current status? */ |
|
18019
dc5d60a5ac54
Add support for idle.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18018
diff
changeset
|
1484 | msim_set_status_code(session, |
|
18014
4d667ccd35ed
Add option to sign on as hidden, or as not (previously, always signed on
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18013
diff
changeset
|
1485 | purple_account_get_bool(session->account, "hidden", FALSE) |
|
4d667ccd35ed
Add option to sign on as hidden, or as not (previously, always signed on
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18013
diff
changeset
|
1486 | ? PURPLE_STATUS_INVISIBLE |
|
4d667ccd35ed
Add option to sign on as hidden, or as not (previously, always signed on
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18013
diff
changeset
|
1487 | : PURPLE_STATUS_AVAILABLE); |
|
4d667ccd35ed
Add option to sign on as hidden, or as not (previously, always signed on
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18013
diff
changeset
|
1488 | |
|
18020
f951defd22fd
Add msim_check_alive(), called every MSIM_KEEPALIVE_INTERVAL_CHECK milliseconds,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18019
diff
changeset
|
1489 | purple_timeout_add(MSIM_KEEPALIVE_INTERVAL_CHECK, msim_check_alive, session); |
|
f951defd22fd
Add msim_check_alive(), called every MSIM_KEEPALIVE_INTERVAL_CHECK milliseconds,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18019
diff
changeset
|
1490 | |
|
18014
4d667ccd35ed
Add option to sign on as hidden, or as not (previously, always signed on
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18013
diff
changeset
|
1491 | return TRUE; |
|
4d667ccd35ed
Add option to sign on as hidden, or as not (previously, always signed on
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18013
diff
changeset
|
1492 | } |
|
4d667ccd35ed
Add option to sign on as hidden, or as not (previously, always signed on
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18013
diff
changeset
|
1493 | |
|
16333
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
1494 | /** |
|
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
1495 | * Process a message. |
|
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
1496 | * |
|
17950
c146721d0ca7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17949
diff
changeset
|
1497 | * @param session |
|
c146721d0ca7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17949
diff
changeset
|
1498 | * @param msg A message from the server, ready for processing (possibly with resolved username information attached). Caller frees. |
|
16333
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
1499 | * |
|
17935
a6a70c7213ab
Previously, the return value of the processing function and msim_process() told
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17934
diff
changeset
|
1500 | * @return TRUE if successful. FALSE if processing failed. |
|
16333
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
1501 | */ |
|
17994
b3b072dd8478
Split return type and function name + arguments on to separate lines, to
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17993
diff
changeset
|
1502 | gboolean |
|
b3b072dd8478
Split return type and function name + arguments on to separate lines, to
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17993
diff
changeset
|
1503 | msim_process(MsimSession *session, MsimMessage *msg) |
|
16333
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
1504 | { |
|
17950
c146721d0ca7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17949
diff
changeset
|
1505 | g_return_val_if_fail(session != NULL, -1); |
|
17910
9bbfa75ba90b
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17906
diff
changeset
|
1506 | g_return_val_if_fail(msg != NULL, -1); |
|
16333
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
1507 | |
|
17892
66984c1aac79
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17890
diff
changeset
|
1508 | #ifdef MSIM_DEBUG_MSG |
|
17910
9bbfa75ba90b
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17906
diff
changeset
|
1509 | { |
|
17942
4d750e00cdae
Change msim_msg_debug_string() to msim_msg_dump(), which prints the string
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17941
diff
changeset
|
1510 | msim_msg_dump("ready to process: %s\n", msg); |
|
17910
9bbfa75ba90b
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17906
diff
changeset
|
1511 | } |
|
16335
0c2b32acc27a
Replace printf() in MySpaceIM prpl with purple_debug_info().
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16334
diff
changeset
|
1512 | #endif |
|
16333
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
1513 | |
|
17924
191c78db42ae
Use MsimMessage for receiving messages everywhere, instead of GHashTable.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17910
diff
changeset
|
1514 | if (msim_msg_get(msg, "nc")) |
|
16333
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
1515 | { |
|
17924
191c78db42ae
Use MsimMessage for receiving messages everywhere, instead of GHashTable.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17910
diff
changeset
|
1516 | return msim_login_challenge(session, msg); |
|
191c78db42ae
Use MsimMessage for receiving messages everywhere, instead of GHashTable.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17910
diff
changeset
|
1517 | } else if (msim_msg_get(msg, "sesskey")) { |
|
18014
4d667ccd35ed
Add option to sign on as hidden, or as not (previously, always signed on
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18013
diff
changeset
|
1518 | return msim_we_are_logged_on(session, msg); |
|
17924
191c78db42ae
Use MsimMessage for receiving messages everywhere, instead of GHashTable.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17910
diff
changeset
|
1519 | } else if (msim_msg_get(msg, "bm")) { |
|
16333
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
1520 | guint bm; |
|
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
1521 | |
|
17924
191c78db42ae
Use MsimMessage for receiving messages everywhere, instead of GHashTable.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17910
diff
changeset
|
1522 | bm = msim_msg_get_integer(msg, "bm"); |
|
16333
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
1523 | switch (bm) |
|
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
1524 | { |
|
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
1525 | case MSIM_BM_STATUS: |
|
17924
191c78db42ae
Use MsimMessage for receiving messages everywhere, instead of GHashTable.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17910
diff
changeset
|
1526 | return msim_status(session, msg); |
|
16333
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
1527 | case MSIM_BM_INSTANT: |
|
17924
191c78db42ae
Use MsimMessage for receiving messages everywhere, instead of GHashTable.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17910
diff
changeset
|
1528 | return msim_incoming_im(session, msg); |
|
17934
d163dde3aff1
Add, but do not use, incomplete functions for using typing notifications.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17933
diff
changeset
|
1529 | case MSIM_BM_ACTION: |
|
d163dde3aff1
Add, but do not use, incomplete functions for using typing notifications.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17933
diff
changeset
|
1530 | return msim_incoming_action(session, msg); |
|
16333
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
1531 | default: |
|
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
1532 | /* Not really an IM, but show it for informational |
|
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
1533 | * purposes during development. */ |
|
17924
191c78db42ae
Use MsimMessage for receiving messages everywhere, instead of GHashTable.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17910
diff
changeset
|
1534 | return msim_incoming_im(session, msg); |
|
16333
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
1535 | } |
|
17924
191c78db42ae
Use MsimMessage for receiving messages everywhere, instead of GHashTable.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17910
diff
changeset
|
1536 | } else if (msim_msg_get(msg, "rid")) { |
|
191c78db42ae
Use MsimMessage for receiving messages everywhere, instead of GHashTable.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17910
diff
changeset
|
1537 | return msim_process_reply(session, msg); |
|
191c78db42ae
Use MsimMessage for receiving messages everywhere, instead of GHashTable.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17910
diff
changeset
|
1538 | } else if (msim_msg_get(msg, "error")) { |
|
191c78db42ae
Use MsimMessage for receiving messages everywhere, instead of GHashTable.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17910
diff
changeset
|
1539 | return msim_error(session, msg); |
|
191c78db42ae
Use MsimMessage for receiving messages everywhere, instead of GHashTable.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17910
diff
changeset
|
1540 | } else if (msim_msg_get(msg, "ka")) { |
|
17983
ab605d563943
Add TODO for msimprpl to timeout (handling keep-alives).
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17982
diff
changeset
|
1541 | /* TODO: Setup a timer, if keep-alive is not received within ~3 minutes, then |
|
ab605d563943
Add TODO for msimprpl to timeout (handling keep-alives).
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17982
diff
changeset
|
1542 | * disconnect the user. As it stands, if Internet connection goes out (this |
|
ab605d563943
Add TODO for msimprpl to timeout (handling keep-alives).
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17982
diff
changeset
|
1543 | * just happened here), msimprpl will appear to be connected forever, while |
|
ab605d563943
Add TODO for msimprpl to timeout (handling keep-alives).
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17982
diff
changeset
|
1544 | * other plugins (oscar, etc.) will time out. Msimprpl should timeout too. */ |
|
16333
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
1545 | purple_debug_info("msim", "msim_process: got keep alive\n"); |
|
17935
a6a70c7213ab
Previously, the return value of the processing function and msim_process() told
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17934
diff
changeset
|
1546 | return TRUE; |
|
16333
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
1547 | } else { |
|
17984
9a53a8583bba
Add msim_unrecognized() to handle unhandled messages.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17983
diff
changeset
|
1548 | msim_unrecognized(session, msg, "in msim_process"); |
|
17935
a6a70c7213ab
Previously, the return value of the processing function and msim_process() told
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17934
diff
changeset
|
1549 | return FALSE; |
|
16333
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
1550 | } |
|
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
1551 | } |
|
17910
9bbfa75ba90b
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17906
diff
changeset
|
1552 | |
|
17966
e2bdcbb55218
Show buddy information in tooltip text, and the display name for status text.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17964
diff
changeset
|
1553 | /** Store an field of information about a buddy. */ |
|
17994
b3b072dd8478
Split return type and function name + arguments on to separate lines, to
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17993
diff
changeset
|
1554 | void |
|
b3b072dd8478
Split return type and function name + arguments on to separate lines, to
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17993
diff
changeset
|
1555 | msim_store_buddy_info_each(gpointer key, gpointer value, gpointer user_data) |
|
17966
e2bdcbb55218
Show buddy information in tooltip text, and the display name for status text.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17964
diff
changeset
|
1556 | { |
|
e2bdcbb55218
Show buddy information in tooltip text, and the display name for status text.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17964
diff
changeset
|
1557 | PurpleBuddy *buddy; |
|
e2bdcbb55218
Show buddy information in tooltip text, and the display name for status text.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17964
diff
changeset
|
1558 | gchar *key_str, *value_str; |
|
e2bdcbb55218
Show buddy information in tooltip text, and the display name for status text.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17964
diff
changeset
|
1559 | |
|
e2bdcbb55218
Show buddy information in tooltip text, and the display name for status text.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17964
diff
changeset
|
1560 | buddy = (PurpleBuddy *)user_data; |
|
e2bdcbb55218
Show buddy information in tooltip text, and the display name for status text.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17964
diff
changeset
|
1561 | key_str = (gchar *)key; |
|
e2bdcbb55218
Show buddy information in tooltip text, and the display name for status text.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17964
diff
changeset
|
1562 | value_str = (gchar *)value; |
|
e2bdcbb55218
Show buddy information in tooltip text, and the display name for status text.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17964
diff
changeset
|
1563 | |
|
e2bdcbb55218
Show buddy information in tooltip text, and the display name for status text.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17964
diff
changeset
|
1564 | if (strcmp(key_str, "UserID") == 0 || |
|
e2bdcbb55218
Show buddy information in tooltip text, and the display name for status text.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17964
diff
changeset
|
1565 | strcmp(key_str, "Age") == 0 || |
|
e2bdcbb55218
Show buddy information in tooltip text, and the display name for status text.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17964
diff
changeset
|
1566 | strcmp(key_str, "TotalFriends") == 0) |
|
e2bdcbb55218
Show buddy information in tooltip text, and the display name for status text.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17964
diff
changeset
|
1567 | { |
|
e2bdcbb55218
Show buddy information in tooltip text, and the display name for status text.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17964
diff
changeset
|
1568 | /* Certain fields get set as integers, instead of strings, for |
|
e2bdcbb55218
Show buddy information in tooltip text, and the display name for status text.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17964
diff
changeset
|
1569 | * convenience. May not be the best way to do it, but having at least |
|
e2bdcbb55218
Show buddy information in tooltip text, and the display name for status text.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17964
diff
changeset
|
1570 | * UserID as an integer is convenient...until it overflows! */ |
|
e2bdcbb55218
Show buddy information in tooltip text, and the display name for status text.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17964
diff
changeset
|
1571 | purple_blist_node_set_int(&buddy->node, key_str, atol(value_str)); |
|
e2bdcbb55218
Show buddy information in tooltip text, and the display name for status text.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17964
diff
changeset
|
1572 | } else { |
|
e2bdcbb55218
Show buddy information in tooltip text, and the display name for status text.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17964
diff
changeset
|
1573 | purple_blist_node_set_string(&buddy->node, key_str, value_str); |
|
e2bdcbb55218
Show buddy information in tooltip text, and the display name for status text.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17964
diff
changeset
|
1574 | } |
|
e2bdcbb55218
Show buddy information in tooltip text, and the display name for status text.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17964
diff
changeset
|
1575 | } |
|
e2bdcbb55218
Show buddy information in tooltip text, and the display name for status text.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17964
diff
changeset
|
1576 | |
|
e2bdcbb55218
Show buddy information in tooltip text, and the display name for status text.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17964
diff
changeset
|
1577 | /** Save buddy information to the buddy list from a user info reply message. |
|
e2bdcbb55218
Show buddy information in tooltip text, and the display name for status text.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17964
diff
changeset
|
1578 | * |
|
e2bdcbb55218
Show buddy information in tooltip text, and the display name for status text.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17964
diff
changeset
|
1579 | * @param session |
|
e2bdcbb55218
Show buddy information in tooltip text, and the display name for status text.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17964
diff
changeset
|
1580 | * @param msg The user information reply, with any amount of information. |
|
e2bdcbb55218
Show buddy information in tooltip text, and the display name for status text.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17964
diff
changeset
|
1581 | * |
|
e2bdcbb55218
Show buddy information in tooltip text, and the display name for status text.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17964
diff
changeset
|
1582 | * The information is saved to the buddy's blist node, which ends up in blist.xml. |
|
e2bdcbb55218
Show buddy information in tooltip text, and the display name for status text.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17964
diff
changeset
|
1583 | */ |
|
17994
b3b072dd8478
Split return type and function name + arguments on to separate lines, to
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17993
diff
changeset
|
1584 | gboolean |
|
b3b072dd8478
Split return type and function name + arguments on to separate lines, to
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17993
diff
changeset
|
1585 | msim_store_buddy_info(MsimSession *session, MsimMessage *msg) |
|
17966
e2bdcbb55218
Show buddy information in tooltip text, and the display name for status text.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17964
diff
changeset
|
1586 | { |
|
e2bdcbb55218
Show buddy information in tooltip text, and the display name for status text.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17964
diff
changeset
|
1587 | GHashTable *body; |
|
e2bdcbb55218
Show buddy information in tooltip text, and the display name for status text.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17964
diff
changeset
|
1588 | gchar *username, *body_str, *uid; |
|
e2bdcbb55218
Show buddy information in tooltip text, and the display name for status text.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17964
diff
changeset
|
1589 | PurpleBuddy *buddy; |
|
e2bdcbb55218
Show buddy information in tooltip text, and the display name for status text.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17964
diff
changeset
|
1590 | guint rid; |
|
e2bdcbb55218
Show buddy information in tooltip text, and the display name for status text.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17964
diff
changeset
|
1591 | |
|
e2bdcbb55218
Show buddy information in tooltip text, and the display name for status text.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17964
diff
changeset
|
1592 | rid = msim_msg_get_integer(msg, "rid"); |
|
e2bdcbb55218
Show buddy information in tooltip text, and the display name for status text.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17964
diff
changeset
|
1593 | |
|
e2bdcbb55218
Show buddy information in tooltip text, and the display name for status text.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17964
diff
changeset
|
1594 | g_return_val_if_fail(rid != 0, FALSE); |
|
e2bdcbb55218
Show buddy information in tooltip text, and the display name for status text.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17964
diff
changeset
|
1595 | |
|
e2bdcbb55218
Show buddy information in tooltip text, and the display name for status text.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17964
diff
changeset
|
1596 | body_str = msim_msg_get_string(msg, "body"); |
|
e2bdcbb55218
Show buddy information in tooltip text, and the display name for status text.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17964
diff
changeset
|
1597 | g_return_val_if_fail(body_str != NULL, FALSE); |
|
e2bdcbb55218
Show buddy information in tooltip text, and the display name for status text.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17964
diff
changeset
|
1598 | body = msim_parse_body(body_str); |
|
e2bdcbb55218
Show buddy information in tooltip text, and the display name for status text.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17964
diff
changeset
|
1599 | g_free(body_str); |
|
e2bdcbb55218
Show buddy information in tooltip text, and the display name for status text.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17964
diff
changeset
|
1600 | |
|
e2bdcbb55218
Show buddy information in tooltip text, and the display name for status text.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17964
diff
changeset
|
1601 | /* TODO: implement a better hash-like interface, and use it. */ |
|
e2bdcbb55218
Show buddy information in tooltip text, and the display name for status text.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17964
diff
changeset
|
1602 | username = g_hash_table_lookup(body, "UserName"); |
|
e2bdcbb55218
Show buddy information in tooltip text, and the display name for status text.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17964
diff
changeset
|
1603 | |
|
e2bdcbb55218
Show buddy information in tooltip text, and the display name for status text.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17964
diff
changeset
|
1604 | if (!username) |
|
e2bdcbb55218
Show buddy information in tooltip text, and the display name for status text.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17964
diff
changeset
|
1605 | { |
|
e2bdcbb55218
Show buddy information in tooltip text, and the display name for status text.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17964
diff
changeset
|
1606 | purple_debug_info("msim", |
|
e2bdcbb55218
Show buddy information in tooltip text, and the display name for status text.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17964
diff
changeset
|
1607 | "msim_process_reply: not caching body, no UserName\n"); |
|
e2bdcbb55218
Show buddy information in tooltip text, and the display name for status text.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17964
diff
changeset
|
1608 | return FALSE; |
|
e2bdcbb55218
Show buddy information in tooltip text, and the display name for status text.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17964
diff
changeset
|
1609 | } |
|
e2bdcbb55218
Show buddy information in tooltip text, and the display name for status text.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17964
diff
changeset
|
1610 | |
|
e2bdcbb55218
Show buddy information in tooltip text, and the display name for status text.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17964
diff
changeset
|
1611 | uid = g_hash_table_lookup(body, "UserID"); |
|
e2bdcbb55218
Show buddy information in tooltip text, and the display name for status text.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17964
diff
changeset
|
1612 | g_return_val_if_fail(uid, FALSE); |
|
e2bdcbb55218
Show buddy information in tooltip text, and the display name for status text.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17964
diff
changeset
|
1613 | |
|
e2bdcbb55218
Show buddy information in tooltip text, and the display name for status text.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17964
diff
changeset
|
1614 | purple_debug_info("msim", "associating uid %d with username %s\n", uid, username); |
|
e2bdcbb55218
Show buddy information in tooltip text, and the display name for status text.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17964
diff
changeset
|
1615 | |
|
e2bdcbb55218
Show buddy information in tooltip text, and the display name for status text.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17964
diff
changeset
|
1616 | buddy = purple_find_buddy(session->account, username); |
|
e2bdcbb55218
Show buddy information in tooltip text, and the display name for status text.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17964
diff
changeset
|
1617 | if (buddy) |
|
e2bdcbb55218
Show buddy information in tooltip text, and the display name for status text.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17964
diff
changeset
|
1618 | { |
|
e2bdcbb55218
Show buddy information in tooltip text, and the display name for status text.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17964
diff
changeset
|
1619 | g_hash_table_foreach(body, msim_store_buddy_info_each, buddy); |
|
e2bdcbb55218
Show buddy information in tooltip text, and the display name for status text.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17964
diff
changeset
|
1620 | } |
|
e2bdcbb55218
Show buddy information in tooltip text, and the display name for status text.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17964
diff
changeset
|
1621 | |
|
e2bdcbb55218
Show buddy information in tooltip text, and the display name for status text.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17964
diff
changeset
|
1622 | return TRUE; |
|
e2bdcbb55218
Show buddy information in tooltip text, and the display name for status text.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17964
diff
changeset
|
1623 | } |
|
e2bdcbb55218
Show buddy information in tooltip text, and the display name for status text.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17964
diff
changeset
|
1624 | |
|
16333
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
1625 | /** |
|
17934
d163dde3aff1
Add, but do not use, incomplete functions for using typing notifications.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17933
diff
changeset
|
1626 | * Process a persistance message reply from the server. |
| 16322 | 1627 | * |
| 1628 | * @param session | |
|
17924
191c78db42ae
Use MsimMessage for receiving messages everywhere, instead of GHashTable.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17910
diff
changeset
|
1629 | * @param msg Message reply from server. |
| 16322 | 1630 | * |
|
17935
a6a70c7213ab
Previously, the return value of the processing function and msim_process() told
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17934
diff
changeset
|
1631 | * @return TRUE if successful. |
| 16322 | 1632 | */ |
|
17994
b3b072dd8478
Split return type and function name + arguments on to separate lines, to
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17993
diff
changeset
|
1633 | gboolean |
|
b3b072dd8478
Split return type and function name + arguments on to separate lines, to
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17993
diff
changeset
|
1634 | msim_process_reply(MsimSession *session, MsimMessage *msg) |
| 16322 | 1635 | { |
|
17935
a6a70c7213ab
Previously, the return value of the processing function and msim_process() told
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17934
diff
changeset
|
1636 | g_return_val_if_fail(MSIM_SESSION_VALID(session), FALSE); |
|
a6a70c7213ab
Previously, the return value of the processing function and msim_process() told
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17934
diff
changeset
|
1637 | g_return_val_if_fail(msg != NULL, FALSE); |
| 16322 | 1638 | |
|
17924
191c78db42ae
Use MsimMessage for receiving messages everywhere, instead of GHashTable.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17910
diff
changeset
|
1639 | if (msim_msg_get(msg, "rid")) /* msim_lookup_user sets callback for here */ |
| 16322 | 1640 | { |
| 1641 | MSIM_USER_LOOKUP_CB cb; | |
| 1642 | gpointer data; | |
| 1643 | guint rid; | |
|
17958
9f809365230b
Add TODO in order to fix msim_tooltip_text.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17957
diff
changeset
|
1644 | |
|
17966
e2bdcbb55218
Show buddy information in tooltip text, and the display name for status text.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17964
diff
changeset
|
1645 | msim_store_buddy_info(session, msg); |
|
17957
bc5874ed7a09
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17956
diff
changeset
|
1646 | |
|
17966
e2bdcbb55218
Show buddy information in tooltip text, and the display name for status text.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17964
diff
changeset
|
1647 | rid = msim_msg_get_integer(msg, "rid"); |
| 16322 | 1648 | |
| 1649 | /* If a callback is registered for this userid lookup, call it. */ | |
| 1650 | cb = g_hash_table_lookup(session->user_lookup_cb, GUINT_TO_POINTER(rid)); | |
| 1651 | data = g_hash_table_lookup(session->user_lookup_cb_data, GUINT_TO_POINTER(rid)); | |
| 1652 | ||
| 1653 | if (cb) | |
| 1654 | { | |
|
16332
f0e987f024e0
Use g_convert for UTF-16LE conversion instead of converting manually.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16330
diff
changeset
|
1655 | purple_debug_info("msim", |
|
f0e987f024e0
Use g_convert for UTF-16LE conversion instead of converting manually.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16330
diff
changeset
|
1656 | "msim_process_body: calling callback now\n"); |
|
17935
a6a70c7213ab
Previously, the return value of the processing function and msim_process() told
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17934
diff
changeset
|
1657 | /* Clone message, so that the callback 'cb' can use it (needs to free it also). */ |
|
a6a70c7213ab
Previously, the return value of the processing function and msim_process() told
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17934
diff
changeset
|
1658 | cb(session, msim_msg_clone(msg), data); |
| 16322 | 1659 | g_hash_table_remove(session->user_lookup_cb, GUINT_TO_POINTER(rid)); |
| 1660 | g_hash_table_remove(session->user_lookup_cb_data, GUINT_TO_POINTER(rid)); | |
| 1661 | } else { | |
|
16332
f0e987f024e0
Use g_convert for UTF-16LE conversion instead of converting manually.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16330
diff
changeset
|
1662 | purple_debug_info("msim", |
|
f0e987f024e0
Use g_convert for UTF-16LE conversion instead of converting manually.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16330
diff
changeset
|
1663 | "msim_process_body: no callback for rid %d\n", rid); |
| 16322 | 1664 | } |
| 1665 | } | |
|
17935
a6a70c7213ab
Previously, the return value of the processing function and msim_process() told
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17934
diff
changeset
|
1666 | |
|
a6a70c7213ab
Previously, the return value of the processing function and msim_process() told
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17934
diff
changeset
|
1667 | return TRUE; |
| 16322 | 1668 | } |
| 1669 | ||
| 1670 | /** | |
| 1671 | * Handle an error from the server. | |
| 1672 | * | |
| 1673 | * @param session | |
|
17924
191c78db42ae
Use MsimMessage for receiving messages everywhere, instead of GHashTable.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17910
diff
changeset
|
1674 | * @param msg The message. |
| 16322 | 1675 | * |
|
17935
a6a70c7213ab
Previously, the return value of the processing function and msim_process() told
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17934
diff
changeset
|
1676 | * @return TRUE if successfully reported error. |
| 16322 | 1677 | */ |
|
17994
b3b072dd8478
Split return type and function name + arguments on to separate lines, to
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17993
diff
changeset
|
1678 | gboolean |
|
b3b072dd8478
Split return type and function name + arguments on to separate lines, to
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17993
diff
changeset
|
1679 | msim_error(MsimSession *session, MsimMessage *msg) |
| 16322 | 1680 | { |
|
17924
191c78db42ae
Use MsimMessage for receiving messages everywhere, instead of GHashTable.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17910
diff
changeset
|
1681 | gchar *errmsg, *full_errmsg; |
|
191c78db42ae
Use MsimMessage for receiving messages everywhere, instead of GHashTable.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17910
diff
changeset
|
1682 | guint err; |
| 16322 | 1683 | |
|
17935
a6a70c7213ab
Previously, the return value of the processing function and msim_process() told
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17934
diff
changeset
|
1684 | g_return_val_if_fail(MSIM_SESSION_VALID(session), FALSE); |
|
a6a70c7213ab
Previously, the return value of the processing function and msim_process() told
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17934
diff
changeset
|
1685 | g_return_val_if_fail(msg != NULL, FALSE); |
| 16322 | 1686 | |
|
17924
191c78db42ae
Use MsimMessage for receiving messages everywhere, instead of GHashTable.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17910
diff
changeset
|
1687 | err = msim_msg_get_integer(msg, "err"); |
|
191c78db42ae
Use MsimMessage for receiving messages everywhere, instead of GHashTable.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17910
diff
changeset
|
1688 | errmsg = msim_msg_get_string(msg, "errmsg"); |
| 16322 | 1689 | |
|
18009
59eed9bd2dea
Be more defensive about null pointers, especially null strings in %s format
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18007
diff
changeset
|
1690 | full_errmsg = g_strdup_printf(_("Protocol error, code %d: %s"), err, |
|
59eed9bd2dea
Be more defensive about null pointers, especially null strings in %s format
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18007
diff
changeset
|
1691 | errmsg ? errmsg : "no 'errmsg' given"); |
|
17924
191c78db42ae
Use MsimMessage for receiving messages everywhere, instead of GHashTable.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17910
diff
changeset
|
1692 | |
|
191c78db42ae
Use MsimMessage for receiving messages everywhere, instead of GHashTable.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17910
diff
changeset
|
1693 | g_free(errmsg); |
| 16322 | 1694 | |
| 16324 | 1695 | purple_debug_info("msim", "msim_error: %s\n", full_errmsg); |
| 16322 | 1696 | |
|
17895
6c2facc6c33b
Use _ for translations in msimprpl. See #648.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17894
diff
changeset
|
1697 | purple_notify_error(session->account, g_strdup(_("MySpaceIM Error")), |
| 16322 | 1698 | full_errmsg, NULL); |
| 1699 | ||
|
17935
a6a70c7213ab
Previously, the return value of the processing function and msim_process() told
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17934
diff
changeset
|
1700 | /* Destroy session if fatal. */ |
|
17924
191c78db42ae
Use MsimMessage for receiving messages everywhere, instead of GHashTable.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17910
diff
changeset
|
1701 | if (msim_msg_get(msg, "fatal")) |
| 16322 | 1702 | { |
|
17940
46246b04b219
Add (incomplete) msim_remove_buddy().
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17937
diff
changeset
|
1703 | purple_debug_info("msim", "fatal error, closing\n"); |
| 16324 | 1704 | purple_connection_error(session->gc, full_errmsg); |
| 16322 | 1705 | } |
| 1706 | ||
|
17935
a6a70c7213ab
Previously, the return value of the processing function and msim_process() told
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17934
diff
changeset
|
1707 | return TRUE; |
| 16322 | 1708 | } |
| 1709 | ||
|
17950
c146721d0ca7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17949
diff
changeset
|
1710 | /** |
|
c146721d0ca7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17949
diff
changeset
|
1711 | * Process incoming status messages. |
|
c146721d0ca7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17949
diff
changeset
|
1712 | * |
|
c146721d0ca7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17949
diff
changeset
|
1713 | * @param session |
|
c146721d0ca7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17949
diff
changeset
|
1714 | * @param msg Status update message. Caller frees. |
|
c146721d0ca7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17949
diff
changeset
|
1715 | * |
|
c146721d0ca7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17949
diff
changeset
|
1716 | * @return TRUE if successful. |
|
c146721d0ca7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17949
diff
changeset
|
1717 | */ |
|
17994
b3b072dd8478
Split return type and function name + arguments on to separate lines, to
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17993
diff
changeset
|
1718 | gboolean |
|
b3b072dd8478
Split return type and function name + arguments on to separate lines, to
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17993
diff
changeset
|
1719 | msim_status(MsimSession *session, MsimMessage *msg) |
| 16322 | 1720 | { |
| 16324 | 1721 | PurpleBuddyList *blist; |
| 1722 | PurpleBuddy *buddy; | |
| 1723 | //PurpleStatus *status; | |
| 16322 | 1724 | gchar **status_array; |
| 1725 | GList *list; | |
|
17933
03228b5c78b5
Show online buddies on buddy list as online.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17931
diff
changeset
|
1726 | gchar *status_headline; |
| 16322 | 1727 | gchar *status_str; |
|
17933
03228b5c78b5
Show online buddies on buddy list as online.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17931
diff
changeset
|
1728 | gint i, status_code, purple_status_code; |
| 16322 | 1729 | gchar *username; |
| 1730 | ||
|
17950
c146721d0ca7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17949
diff
changeset
|
1731 | g_return_val_if_fail(MSIM_SESSION_VALID(session), FALSE); |
|
c146721d0ca7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17949
diff
changeset
|
1732 | g_return_val_if_fail(msg != NULL, FALSE); |
|
17949
a74745e42b2b
msim_status_cb() now takes a MsimMessage *, just like msim_send_im_cb() and
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17948
diff
changeset
|
1733 | |
|
a74745e42b2b
msim_status_cb() now takes a MsimMessage *, just like msim_send_im_cb() and
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17948
diff
changeset
|
1734 | status_str = msim_msg_get_string(msg, "msg"); |
|
17950
c146721d0ca7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17949
diff
changeset
|
1735 | g_return_val_if_fail(status_str != NULL, FALSE); |
| 16322 | 1736 | |
|
17950
c146721d0ca7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17949
diff
changeset
|
1737 | msim_msg_dump("msim_status msg=%s\n", msg); |
| 16322 | 1738 | |
|
17950
c146721d0ca7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17949
diff
changeset
|
1739 | /* Helpfully looked up by msim_incoming_resolve() for us. */ |
|
c146721d0ca7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17949
diff
changeset
|
1740 | username = msim_msg_get_string(msg, "_username"); |
| 16322 | 1741 | /* Note: DisplayName doesn't seem to be resolvable. It could be displayed on |
| 1742 | * the buddy list, if the UserID was stored along with it. */ | |
| 1743 | ||
|
17950
c146721d0ca7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17949
diff
changeset
|
1744 | if (username == NULL) |
|
c146721d0ca7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17949
diff
changeset
|
1745 | { |
|
c146721d0ca7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17949
diff
changeset
|
1746 | g_free(status_str); |
|
c146721d0ca7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17949
diff
changeset
|
1747 | g_return_val_if_fail(NULL, FALSE); |
|
c146721d0ca7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17949
diff
changeset
|
1748 | } |
| 16322 | 1749 | |
|
16332
f0e987f024e0
Use g_convert for UTF-16LE conversion instead of converting manually.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16330
diff
changeset
|
1750 | purple_debug_info("msim", |
|
f0e987f024e0
Use g_convert for UTF-16LE conversion instead of converting manually.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16330
diff
changeset
|
1751 | "msim_status_cb: updating status for <%s> to <%s>\n", |
|
f0e987f024e0
Use g_convert for UTF-16LE conversion instead of converting manually.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16330
diff
changeset
|
1752 | username, status_str); |
| 16322 | 1753 | |
|
17933
03228b5c78b5
Show online buddies on buddy list as online.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17931
diff
changeset
|
1754 | /* TODO: generic functions to split into a GList, part of MsimMessage */ |
| 16322 | 1755 | status_array = g_strsplit(status_str, "|", 0); |
| 1756 | for (list = NULL, i = 0; | |
| 1757 | status_array[i]; | |
| 1758 | i++) | |
| 1759 | { | |
|
17933
03228b5c78b5
Show online buddies on buddy list as online.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17931
diff
changeset
|
1760 | /* Note: this adds the 0th ordinal too, which might not be a value |
|
03228b5c78b5
Show online buddies on buddy list as online.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17931
diff
changeset
|
1761 | * at all (the 0 in the 0|1|2|3... status fields, but 0 always appears blank). |
|
03228b5c78b5
Show online buddies on buddy list as online.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17931
diff
changeset
|
1762 | */ |
| 16322 | 1763 | list = g_list_append(list, status_array[i]); |
| 1764 | } | |
| 1765 | ||
|
17933
03228b5c78b5
Show online buddies on buddy list as online.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17931
diff
changeset
|
1766 | /* Example fields: |
|
03228b5c78b5
Show online buddies on buddy list as online.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17931
diff
changeset
|
1767 | * |s|0|ss|Offline |
|
03228b5c78b5
Show online buddies on buddy list as online.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17931
diff
changeset
|
1768 | * |s|1|ss|:-)|ls||ip|0|p|0 |
|
03228b5c78b5
Show online buddies on buddy list as online.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17931
diff
changeset
|
1769 | * |
|
03228b5c78b5
Show online buddies on buddy list as online.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17931
diff
changeset
|
1770 | * TODO: write list support in MsimMessage, and use it here. |
|
03228b5c78b5
Show online buddies on buddy list as online.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17931
diff
changeset
|
1771 | */ |
|
03228b5c78b5
Show online buddies on buddy list as online.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17931
diff
changeset
|
1772 | |
|
03228b5c78b5
Show online buddies on buddy list as online.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17931
diff
changeset
|
1773 | status_code = atoi(g_list_nth_data(list, MSIM_STATUS_ORDINAL_ONLINE)); |
|
03228b5c78b5
Show online buddies on buddy list as online.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17931
diff
changeset
|
1774 | purple_debug_info("msim", "msim_status_cb: %s's status code = %d\n", username, status_code); |
|
03228b5c78b5
Show online buddies on buddy list as online.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17931
diff
changeset
|
1775 | status_headline = g_list_nth_data(list, MSIM_STATUS_ORDINAL_HEADLINE); |
| 16322 | 1776 | |
| 16324 | 1777 | blist = purple_get_blist(); |
| 16322 | 1778 | |
| 1779 | /* Add buddy if not found */ | |
| 16324 | 1780 | buddy = purple_find_buddy(session->account, username); |
| 16322 | 1781 | if (!buddy) |
| 1782 | { | |
|
16332
f0e987f024e0
Use g_convert for UTF-16LE conversion instead of converting manually.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16330
diff
changeset
|
1783 | purple_debug_info("msim", |
|
f0e987f024e0
Use g_convert for UTF-16LE conversion instead of converting manually.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16330
diff
changeset
|
1784 | "msim_status: making new buddy for %s\n", username); |
| 16324 | 1785 | buddy = purple_buddy_new(session->account, username, NULL); |
| 16322 | 1786 | |
| 16324 | 1787 | purple_blist_add_buddy(buddy, NULL, NULL, NULL); |
|
17967
a16d7668ab43
Reorganize the tooltip text, to show more useful information.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17966
diff
changeset
|
1788 | |
|
17943
d33c1657f68b
Add TODOs about username/email->userid resolution, use g_return_if_fail() in a few places.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17942
diff
changeset
|
1789 | /* All buddies on list should have 'uid' integer associated with them. */ |
|
17966
e2bdcbb55218
Show buddy information in tooltip text, and the display name for status text.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17964
diff
changeset
|
1790 | purple_blist_node_set_int(&buddy->node, "UserID", msim_msg_get_integer(msg, "f")); |
|
17967
a16d7668ab43
Reorganize the tooltip text, to show more useful information.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17966
diff
changeset
|
1791 | |
|
a16d7668ab43
Reorganize the tooltip text, to show more useful information.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17966
diff
changeset
|
1792 | msim_store_buddy_info(session, msg); |
| 16322 | 1793 | } else { |
| 16324 | 1794 | purple_debug_info("msim", "msim_status: found buddy %s\n", username); |
| 16322 | 1795 | } |
| 1796 | ||
|
17967
a16d7668ab43
Reorganize the tooltip text, to show more useful information.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17966
diff
changeset
|
1797 | purple_blist_node_set_string(&buddy->node, "Headline", status_headline); |
|
17933
03228b5c78b5
Show online buddies on buddy list as online.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17931
diff
changeset
|
1798 | |
|
03228b5c78b5
Show online buddies on buddy list as online.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17931
diff
changeset
|
1799 | /* Set user status */ |
|
03228b5c78b5
Show online buddies on buddy list as online.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17931
diff
changeset
|
1800 | switch (status_code) |
|
03228b5c78b5
Show online buddies on buddy list as online.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17931
diff
changeset
|
1801 | { |
| 18013 | 1802 | case MSIM_STATUS_CODE_OFFLINE_OR_HIDDEN: |
|
18007
d9fcb200fff6
Recognize online/away status of buddies on buddy list.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18006
diff
changeset
|
1803 | purple_status_code = PURPLE_STATUS_OFFLINE; |
|
d9fcb200fff6
Recognize online/away status of buddies on buddy list.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18006
diff
changeset
|
1804 | break; |
|
d9fcb200fff6
Recognize online/away status of buddies on buddy list.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18006
diff
changeset
|
1805 | |
|
d9fcb200fff6
Recognize online/away status of buddies on buddy list.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18006
diff
changeset
|
1806 | case MSIM_STATUS_CODE_ONLINE: |
|
d9fcb200fff6
Recognize online/away status of buddies on buddy list.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18006
diff
changeset
|
1807 | purple_status_code = PURPLE_STATUS_AVAILABLE; |
|
d9fcb200fff6
Recognize online/away status of buddies on buddy list.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18006
diff
changeset
|
1808 | break; |
|
d9fcb200fff6
Recognize online/away status of buddies on buddy list.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18006
diff
changeset
|
1809 | |
|
d9fcb200fff6
Recognize online/away status of buddies on buddy list.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18006
diff
changeset
|
1810 | case MSIM_STATUS_CODE_AWAY: |
|
d9fcb200fff6
Recognize online/away status of buddies on buddy list.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18006
diff
changeset
|
1811 | purple_status_code = PURPLE_STATUS_AWAY; |
|
d9fcb200fff6
Recognize online/away status of buddies on buddy list.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18006
diff
changeset
|
1812 | break; |
|
d9fcb200fff6
Recognize online/away status of buddies on buddy list.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18006
diff
changeset
|
1813 | |
|
18019
dc5d60a5ac54
Add support for idle.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18018
diff
changeset
|
1814 | case MSIM_STATUS_CODE_IDLE: |
|
dc5d60a5ac54
Add support for idle.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18018
diff
changeset
|
1815 | /* will be handled below */ |
|
dc5d60a5ac54
Add support for idle.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18018
diff
changeset
|
1816 | purple_status_code = -1; |
|
dc5d60a5ac54
Add support for idle.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18018
diff
changeset
|
1817 | break; |
|
dc5d60a5ac54
Add support for idle.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18018
diff
changeset
|
1818 | |
|
17933
03228b5c78b5
Show online buddies on buddy list as online.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17931
diff
changeset
|
1819 | default: |
|
18007
d9fcb200fff6
Recognize online/away status of buddies on buddy list.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18006
diff
changeset
|
1820 | purple_debug_info("msim", "msim_status_cb for %s, unknown status code %d, treating as available\n", |
|
17933
03228b5c78b5
Show online buddies on buddy list as online.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17931
diff
changeset
|
1821 | username, status_code); |
|
03228b5c78b5
Show online buddies on buddy list as online.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17931
diff
changeset
|
1822 | purple_status_code = PURPLE_STATUS_AVAILABLE; |
|
03228b5c78b5
Show online buddies on buddy list as online.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17931
diff
changeset
|
1823 | } |
|
18003
fb399e32e44c
Add MSIM_FAKE_SELF_ONLINE preprocessor definition (which I define) to fake
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18002
diff
changeset
|
1824 | |
|
fb399e32e44c
Add MSIM_FAKE_SELF_ONLINE preprocessor definition (which I define) to fake
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18002
diff
changeset
|
1825 | #ifdef MSIM_FAKE_SELF_ONLINE |
|
fb399e32e44c
Add MSIM_FAKE_SELF_ONLINE preprocessor definition (which I define) to fake
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18002
diff
changeset
|
1826 | if (!strcmp(username, session->username) && purple_status_code == PURPLE_STATUS_OFFLINE) |
|
fb399e32e44c
Add MSIM_FAKE_SELF_ONLINE preprocessor definition (which I define) to fake
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18002
diff
changeset
|
1827 | { |
|
fb399e32e44c
Add MSIM_FAKE_SELF_ONLINE preprocessor definition (which I define) to fake
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18002
diff
changeset
|
1828 | /* Hack to ignore offline status notices on self. */ |
|
18019
dc5d60a5ac54
Add support for idle.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18018
diff
changeset
|
1829 | } else if (status_code != MSIM_STATUS_CODE_IDLE) { |
|
18003
fb399e32e44c
Add MSIM_FAKE_SELF_ONLINE preprocessor definition (which I define) to fake
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18002
diff
changeset
|
1830 | #endif |
|
fb399e32e44c
Add MSIM_FAKE_SELF_ONLINE preprocessor definition (which I define) to fake
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18002
diff
changeset
|
1831 | purple_prpl_got_user_status(session->account, username, purple_primitive_get_id_from_type(purple_status_code), NULL); |
|
fb399e32e44c
Add MSIM_FAKE_SELF_ONLINE preprocessor definition (which I define) to fake
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18002
diff
changeset
|
1832 | #ifdef MSIM_FAKE_SELF_ONLINE |
|
fb399e32e44c
Add MSIM_FAKE_SELF_ONLINE preprocessor definition (which I define) to fake
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18002
diff
changeset
|
1833 | } |
|
fb399e32e44c
Add MSIM_FAKE_SELF_ONLINE preprocessor definition (which I define) to fake
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18002
diff
changeset
|
1834 | #endif |
| 16322 | 1835 | |
|
18019
dc5d60a5ac54
Add support for idle.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18018
diff
changeset
|
1836 | if (status_code == MSIM_STATUS_CODE_IDLE) |
|
dc5d60a5ac54
Add support for idle.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18018
diff
changeset
|
1837 | { |
|
dc5d60a5ac54
Add support for idle.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18018
diff
changeset
|
1838 | purple_debug_info("msim", "msim_status: got idle: %s\n", username); |
|
dc5d60a5ac54
Add support for idle.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18018
diff
changeset
|
1839 | purple_prpl_got_user_idle(session->account, username, TRUE, time(NULL)); |
|
dc5d60a5ac54
Add support for idle.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18018
diff
changeset
|
1840 | } else { |
|
dc5d60a5ac54
Add support for idle.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18018
diff
changeset
|
1841 | /* All other statuses indicate going back to non-idle. */ |
|
dc5d60a5ac54
Add support for idle.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18018
diff
changeset
|
1842 | purple_prpl_got_user_idle(session->account, username, FALSE, time(NULL)); |
|
dc5d60a5ac54
Add support for idle.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18018
diff
changeset
|
1843 | } |
|
dc5d60a5ac54
Add support for idle.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18018
diff
changeset
|
1844 | |
| 16322 | 1845 | g_strfreev(status_array); |
|
17949
a74745e42b2b
msim_status_cb() now takes a MsimMessage *, just like msim_send_im_cb() and
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17948
diff
changeset
|
1846 | g_free(status_str); |
|
17950
c146721d0ca7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17949
diff
changeset
|
1847 | g_free(username); |
| 16322 | 1848 | g_list_free(list); |
| 1849 | ||
|
17935
a6a70c7213ab
Previously, the return value of the processing function and msim_process() told
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17934
diff
changeset
|
1850 | return TRUE; |
| 16322 | 1851 | } |
| 1852 | ||
|
17975
1404d3846cd4
Update several outdated TODO comments.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17974
diff
changeset
|
1853 | /** Add a buddy to user's buddy list. */ |
|
17994
b3b072dd8478
Split return type and function name + arguments on to separate lines, to
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17993
diff
changeset
|
1854 | void |
|
b3b072dd8478
Split return type and function name + arguments on to separate lines, to
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17993
diff
changeset
|
1855 | msim_add_buddy(PurpleConnection *gc, PurpleBuddy *buddy, PurpleGroup *group) |
|
17937
0f30d74fcd9c
Add incomplete msim_add_buddy() implementation.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17935
diff
changeset
|
1856 | { |
|
0f30d74fcd9c
Add incomplete msim_add_buddy() implementation.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17935
diff
changeset
|
1857 | MsimSession *session; |
|
17956
0b3393767f6d
Use msim_postprocess_outgoing() to resolve uid for adding and deleting buddies.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17955
diff
changeset
|
1858 | MsimMessage *msg; |
|
17987
a0baf4e80ee9
Rework addbuddy, but leave it commented-out (non-functional). Add TODO for
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17986
diff
changeset
|
1859 | /* MsimMessage *msg_blocklist; */ |
|
17937
0f30d74fcd9c
Add incomplete msim_add_buddy() implementation.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17935
diff
changeset
|
1860 | |
|
0f30d74fcd9c
Add incomplete msim_add_buddy() implementation.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17935
diff
changeset
|
1861 | session = (MsimSession *)gc->proto_data; |
|
0f30d74fcd9c
Add incomplete msim_add_buddy() implementation.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17935
diff
changeset
|
1862 | purple_debug_info("msim", "msim_add_buddy: want to add %s to %s\n", buddy->name, |
|
0f30d74fcd9c
Add incomplete msim_add_buddy() implementation.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17935
diff
changeset
|
1863 | group ? group->name : "(no group)"); |
|
0f30d74fcd9c
Add incomplete msim_add_buddy() implementation.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17935
diff
changeset
|
1864 | |
|
17956
0b3393767f6d
Use msim_postprocess_outgoing() to resolve uid for adding and deleting buddies.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17955
diff
changeset
|
1865 | msg = msim_msg_new(TRUE, |
|
17937
0f30d74fcd9c
Add incomplete msim_add_buddy() implementation.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17935
diff
changeset
|
1866 | "addbuddy", MSIM_TYPE_BOOLEAN, TRUE, |
|
17941
cdc104d92cdf
Change MsimSession.sesskey to an integer (used to be a string), now that
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17940
diff
changeset
|
1867 | "sesskey", MSIM_TYPE_INTEGER, session->sesskey, |
|
17956
0b3393767f6d
Use msim_postprocess_outgoing() to resolve uid for adding and deleting buddies.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17955
diff
changeset
|
1868 | /* "newprofileid" will be inserted here with uid. */ |
|
17937
0f30d74fcd9c
Add incomplete msim_add_buddy() implementation.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17935
diff
changeset
|
1869 | "reason", MSIM_TYPE_STRING, g_strdup(""), |
|
17956
0b3393767f6d
Use msim_postprocess_outgoing() to resolve uid for adding and deleting buddies.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17955
diff
changeset
|
1870 | NULL); |
|
0b3393767f6d
Use msim_postprocess_outgoing() to resolve uid for adding and deleting buddies.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17955
diff
changeset
|
1871 | |
|
0b3393767f6d
Use msim_postprocess_outgoing() to resolve uid for adding and deleting buddies.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17955
diff
changeset
|
1872 | if (!msim_postprocess_outgoing(session, msg, buddy->name, "newprofileid", "reason")) |
|
17937
0f30d74fcd9c
Add incomplete msim_add_buddy() implementation.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17935
diff
changeset
|
1873 | { |
|
0f30d74fcd9c
Add incomplete msim_add_buddy() implementation.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17935
diff
changeset
|
1874 | purple_notify_error(NULL, NULL, _("Failed to add buddy"), _("'addbuddy' command failed.")); |
|
17956
0b3393767f6d
Use msim_postprocess_outgoing() to resolve uid for adding and deleting buddies.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17955
diff
changeset
|
1875 | msim_msg_free(msg); |
|
17940
46246b04b219
Add (incomplete) msim_remove_buddy().
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17937
diff
changeset
|
1876 | return; |
|
17937
0f30d74fcd9c
Add incomplete msim_add_buddy() implementation.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17935
diff
changeset
|
1877 | } |
|
17956
0b3393767f6d
Use msim_postprocess_outgoing() to resolve uid for adding and deleting buddies.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17955
diff
changeset
|
1878 | msim_msg_free(msg); |
|
17987
a0baf4e80ee9
Rework addbuddy, but leave it commented-out (non-functional). Add TODO for
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17986
diff
changeset
|
1879 | |
|
a0baf4e80ee9
Rework addbuddy, but leave it commented-out (non-functional). Add TODO for
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17986
diff
changeset
|
1880 | /* TODO: if addbuddy fails ('error' message is returned), delete added buddy from |
|
a0baf4e80ee9
Rework addbuddy, but leave it commented-out (non-functional). Add TODO for
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17986
diff
changeset
|
1881 | * buddy list since Purple adds it locally. */ |
|
17937
0f30d74fcd9c
Add incomplete msim_add_buddy() implementation.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17935
diff
changeset
|
1882 | |
|
17987
a0baf4e80ee9
Rework addbuddy, but leave it commented-out (non-functional). Add TODO for
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17986
diff
changeset
|
1883 | /* TODO: Update blocklist. */ |
|
17956
0b3393767f6d
Use msim_postprocess_outgoing() to resolve uid for adding and deleting buddies.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17955
diff
changeset
|
1884 | #if 0 |
|
17987
a0baf4e80ee9
Rework addbuddy, but leave it commented-out (non-functional). Add TODO for
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17986
diff
changeset
|
1885 | msg_blocklist = msim_msg_new(TRUE, |
|
a0baf4e80ee9
Rework addbuddy, but leave it commented-out (non-functional). Add TODO for
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17986
diff
changeset
|
1886 | "persist", MSIM_TYPE_INTEGER, 1, |
|
a0baf4e80ee9
Rework addbuddy, but leave it commented-out (non-functional). Add TODO for
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17986
diff
changeset
|
1887 | "sesskey", MSIM_TYPE_INTEGER, session->sesskey, |
|
a0baf4e80ee9
Rework addbuddy, but leave it commented-out (non-functional). Add TODO for
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17986
diff
changeset
|
1888 | "cmd", MSIM_TYPE_INTEGER, MSIM_CMD_BIT_ACTION | MSIM_CMD_PUT, |
|
a0baf4e80ee9
Rework addbuddy, but leave it commented-out (non-functional). Add TODO for
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17986
diff
changeset
|
1889 | "dsn", MSIM_TYPE_INTEGER, MC_CONTACT_INFO_DSN, |
|
a0baf4e80ee9
Rework addbuddy, but leave it commented-out (non-functional). Add TODO for
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17986
diff
changeset
|
1890 | "lid", MSIM_TYPE_INTEGER, MC_CONTACT_INFO_LID, |
|
a0baf4e80ee9
Rework addbuddy, but leave it commented-out (non-functional). Add TODO for
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17986
diff
changeset
|
1891 | /* TODO: Use msim_new_reply_callback to get rid. */ |
|
a0baf4e80ee9
Rework addbuddy, but leave it commented-out (non-functional). Add TODO for
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17986
diff
changeset
|
1892 | "rid", MSIM_TYPE_INTEGER, session->next_rid++, |
|
a0baf4e80ee9
Rework addbuddy, but leave it commented-out (non-functional). Add TODO for
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17986
diff
changeset
|
1893 | "body", MSIM_TYPE_STRING, |
|
a0baf4e80ee9
Rework addbuddy, but leave it commented-out (non-functional). Add TODO for
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17986
diff
changeset
|
1894 | g_strdup_printf("ContactID=<uid>\034" |
|
a0baf4e80ee9
Rework addbuddy, but leave it commented-out (non-functional). Add TODO for
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17986
diff
changeset
|
1895 | "GroupName=%s\034" |
|
a0baf4e80ee9
Rework addbuddy, but leave it commented-out (non-functional). Add TODO for
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17986
diff
changeset
|
1896 | "Position=1000\034" |
|
a0baf4e80ee9
Rework addbuddy, but leave it commented-out (non-functional). Add TODO for
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17986
diff
changeset
|
1897 | "Visibility=1\034" |
|
a0baf4e80ee9
Rework addbuddy, but leave it commented-out (non-functional). Add TODO for
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17986
diff
changeset
|
1898 | "NickName=\034" |
|
a0baf4e80ee9
Rework addbuddy, but leave it commented-out (non-functional). Add TODO for
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17986
diff
changeset
|
1899 | "NameSelect=0", |
|
a0baf4e80ee9
Rework addbuddy, but leave it commented-out (non-functional). Add TODO for
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17986
diff
changeset
|
1900 | "Friends" /*group->name*/ )); |
|
a0baf4e80ee9
Rework addbuddy, but leave it commented-out (non-functional). Add TODO for
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17986
diff
changeset
|
1901 | |
|
a0baf4e80ee9
Rework addbuddy, but leave it commented-out (non-functional). Add TODO for
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17986
diff
changeset
|
1902 | if (!msim_postprocess_outgoing(session, msg, buddy->name, "body", NULL)) |
|
17937
0f30d74fcd9c
Add incomplete msim_add_buddy() implementation.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17935
diff
changeset
|
1903 | { |
|
0f30d74fcd9c
Add incomplete msim_add_buddy() implementation.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17935
diff
changeset
|
1904 | purple_notify_error(NULL, NULL, _("Failed to add buddy"), _("persist command failed")); |
|
17987
a0baf4e80ee9
Rework addbuddy, but leave it commented-out (non-functional). Add TODO for
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17986
diff
changeset
|
1905 | msim_msg_free(msg_blocklist); |
|
17940
46246b04b219
Add (incomplete) msim_remove_buddy().
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17937
diff
changeset
|
1906 | return; |
|
17937
0f30d74fcd9c
Add incomplete msim_add_buddy() implementation.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17935
diff
changeset
|
1907 | } |
|
17987
a0baf4e80ee9
Rework addbuddy, but leave it commented-out (non-functional). Add TODO for
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17986
diff
changeset
|
1908 | msim_msg_free(msg_blocklist); |
|
17956
0b3393767f6d
Use msim_postprocess_outgoing() to resolve uid for adding and deleting buddies.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17955
diff
changeset
|
1909 | #endif |
|
17937
0f30d74fcd9c
Add incomplete msim_add_buddy() implementation.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17935
diff
changeset
|
1910 | } |
|
0f30d74fcd9c
Add incomplete msim_add_buddy() implementation.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17935
diff
changeset
|
1911 | |
|
17963
07e61fbc0abe
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17961
diff
changeset
|
1912 | /** Perform actual postprocessing on a message, adding userid as specified. |
|
07e61fbc0abe
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17961
diff
changeset
|
1913 | * |
|
07e61fbc0abe
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17961
diff
changeset
|
1914 | * @param msg The message to postprocess. |
|
07e61fbc0abe
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17961
diff
changeset
|
1915 | * @param uid_before Name of field where to insert new field before, or NULL for end. |
|
07e61fbc0abe
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17961
diff
changeset
|
1916 | * @param uid_field_name Name of field to add uid to. |
|
07e61fbc0abe
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17961
diff
changeset
|
1917 | * @param uid The userid to insert. |
|
07e61fbc0abe
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17961
diff
changeset
|
1918 | * |
|
07e61fbc0abe
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17961
diff
changeset
|
1919 | * If the field named by uid_field_name already exists, then its string contents will |
|
07e61fbc0abe
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17961
diff
changeset
|
1920 | * be used for the field, except "<uid>" will be replaced by the userid. |
|
07e61fbc0abe
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17961
diff
changeset
|
1921 | * |
|
07e61fbc0abe
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17961
diff
changeset
|
1922 | * If the field named by uid_field_name does not exist, it will be added before the |
|
07e61fbc0abe
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17961
diff
changeset
|
1923 | * field named by uid_before, as an integer, with the userid. |
|
07e61fbc0abe
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17961
diff
changeset
|
1924 | * |
|
07e61fbc0abe
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17961
diff
changeset
|
1925 | * Does not handle sending, or scheduling userid lookup. For that, see msim_postprocess_outgoing(). |
|
07e61fbc0abe
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17961
diff
changeset
|
1926 | */ |
|
17994
b3b072dd8478
Split return type and function name + arguments on to separate lines, to
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17993
diff
changeset
|
1927 | MsimMessage * |
|
b3b072dd8478
Split return type and function name + arguments on to separate lines, to
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17993
diff
changeset
|
1928 | msim_do_postprocessing(MsimMessage *msg, const gchar *uid_before, |
|
b3b072dd8478
Split return type and function name + arguments on to separate lines, to
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17993
diff
changeset
|
1929 | const gchar *uid_field_name, guint uid) |
|
17963
07e61fbc0abe
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17961
diff
changeset
|
1930 | { |
|
07e61fbc0abe
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17961
diff
changeset
|
1931 | purple_debug_info("msim", "msim_do_postprocessing called with ufn=%s, ub=%s, uid=%d\n", |
|
07e61fbc0abe
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17961
diff
changeset
|
1932 | uid_field_name, uid_before, uid); |
|
07e61fbc0abe
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17961
diff
changeset
|
1933 | msim_msg_dump("msim_do_postprocessing msg: %s\n", msg); |
|
07e61fbc0abe
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17961
diff
changeset
|
1934 | |
|
07e61fbc0abe
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17961
diff
changeset
|
1935 | /* First, check - if the field already exists, treat it as a format string. */ |
|
07e61fbc0abe
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17961
diff
changeset
|
1936 | if (msim_msg_get(msg, uid_field_name)) |
|
07e61fbc0abe
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17961
diff
changeset
|
1937 | { |
|
07e61fbc0abe
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17961
diff
changeset
|
1938 | MsimMessageElement *elem; |
|
07e61fbc0abe
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17961
diff
changeset
|
1939 | gchar *fmt_string; |
|
07e61fbc0abe
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17961
diff
changeset
|
1940 | gchar *uid_str; |
|
07e61fbc0abe
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17961
diff
changeset
|
1941 | |
|
07e61fbc0abe
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17961
diff
changeset
|
1942 | /* Warning: this probably violates the encapsulation of MsimMessage */ |
|
07e61fbc0abe
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17961
diff
changeset
|
1943 | |
|
07e61fbc0abe
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17961
diff
changeset
|
1944 | elem = msim_msg_get(msg, uid_field_name); |
|
07e61fbc0abe
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17961
diff
changeset
|
1945 | g_return_val_if_fail(elem->type == MSIM_TYPE_STRING, NULL); |
|
07e61fbc0abe
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17961
diff
changeset
|
1946 | |
|
07e61fbc0abe
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17961
diff
changeset
|
1947 | /* Get the raw string, not with msim_msg_get_string() since that copies it. |
|
07e61fbc0abe
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17961
diff
changeset
|
1948 | * Want the original string so can free it. */ |
|
07e61fbc0abe
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17961
diff
changeset
|
1949 | fmt_string = (gchar *)(elem->data); |
|
07e61fbc0abe
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17961
diff
changeset
|
1950 | |
|
07e61fbc0abe
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17961
diff
changeset
|
1951 | uid_str = g_strdup_printf("%d", uid); |
|
07e61fbc0abe
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17961
diff
changeset
|
1952 | elem->data = str_replace(fmt_string, "<uid>", uid_str); |
|
07e61fbc0abe
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17961
diff
changeset
|
1953 | g_free(uid_str); |
|
07e61fbc0abe
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17961
diff
changeset
|
1954 | g_free(fmt_string); |
|
07e61fbc0abe
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17961
diff
changeset
|
1955 | |
|
07e61fbc0abe
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17961
diff
changeset
|
1956 | purple_debug_info("msim", "msim_postprocess_outgoing_cb: formatted new string, %s\n", |
|
07e61fbc0abe
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17961
diff
changeset
|
1957 | elem->data); |
|
07e61fbc0abe
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17961
diff
changeset
|
1958 | |
|
07e61fbc0abe
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17961
diff
changeset
|
1959 | } else { |
|
07e61fbc0abe
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17961
diff
changeset
|
1960 | /* Otherwise, insert new field into outgoing message. */ |
|
07e61fbc0abe
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17961
diff
changeset
|
1961 | msg = msim_msg_insert_before(msg, uid_before, uid_field_name, MSIM_TYPE_INTEGER, GUINT_TO_POINTER(uid)); |
|
07e61fbc0abe
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17961
diff
changeset
|
1962 | } |
|
07e61fbc0abe
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17961
diff
changeset
|
1963 | |
|
07e61fbc0abe
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17961
diff
changeset
|
1964 | return msg; |
|
07e61fbc0abe
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17961
diff
changeset
|
1965 | } |
|
07e61fbc0abe
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17961
diff
changeset
|
1966 | |
|
17960
0c7d41bbf8d7
Several small changes to work towards a working msim_remove_buddy():
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17959
diff
changeset
|
1967 | /** Callback for msim_postprocess_outgoing() to add a userid to a message, and send it (once receiving userid). |
|
0c7d41bbf8d7
Several small changes to work towards a working msim_remove_buddy():
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17959
diff
changeset
|
1968 | * |
|
0c7d41bbf8d7
Several small changes to work towards a working msim_remove_buddy():
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17959
diff
changeset
|
1969 | * @param session |
|
0c7d41bbf8d7
Several small changes to work towards a working msim_remove_buddy():
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17959
diff
changeset
|
1970 | * @param userinfo The user information reply message, containing the user ID |
|
0c7d41bbf8d7
Several small changes to work towards a working msim_remove_buddy():
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17959
diff
changeset
|
1971 | * @param data The message to postprocess and send. |
|
0c7d41bbf8d7
Several small changes to work towards a working msim_remove_buddy():
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17959
diff
changeset
|
1972 | * |
|
0c7d41bbf8d7
Several small changes to work towards a working msim_remove_buddy():
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17959
diff
changeset
|
1973 | * The data message should contain these fields: |
|
0c7d41bbf8d7
Several small changes to work towards a working msim_remove_buddy():
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17959
diff
changeset
|
1974 | * |
|
0c7d41bbf8d7
Several small changes to work towards a working msim_remove_buddy():
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17959
diff
changeset
|
1975 | * _uid_field_name: string, name of field to add with userid from userinfo message |
|
0c7d41bbf8d7
Several small changes to work towards a working msim_remove_buddy():
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17959
diff
changeset
|
1976 | * _uid_before: string, name of field before field to insert, or NULL for end |
|
0c7d41bbf8d7
Several small changes to work towards a working msim_remove_buddy():
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17959
diff
changeset
|
1977 | * |
|
0c7d41bbf8d7
Several small changes to work towards a working msim_remove_buddy():
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17959
diff
changeset
|
1978 | * |
|
17963
07e61fbc0abe
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17961
diff
changeset
|
1979 | */ |
|
17994
b3b072dd8478
Split return type and function name + arguments on to separate lines, to
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17993
diff
changeset
|
1980 | void |
|
b3b072dd8478
Split return type and function name + arguments on to separate lines, to
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17993
diff
changeset
|
1981 | msim_postprocess_outgoing_cb(MsimSession *session, MsimMessage *userinfo, gpointer data) |
|
17953
c76e16c7cf0a
Add, but do not use, two new functions to postprocess outgoing messages
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17952
diff
changeset
|
1982 | { |
|
c76e16c7cf0a
Add, but do not use, two new functions to postprocess outgoing messages
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17952
diff
changeset
|
1983 | gchar *body_str; |
|
c76e16c7cf0a
Add, but do not use, two new functions to postprocess outgoing messages
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17952
diff
changeset
|
1984 | GHashTable *body; |
|
17955
70cfe01b0466
Pass postprocessing parameters inside MsimMessage * instead of in a new struct.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17954
diff
changeset
|
1985 | gchar *uid, *uid_field_name, *uid_before; |
|
70cfe01b0466
Pass postprocessing parameters inside MsimMessage * instead of in a new struct.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17954
diff
changeset
|
1986 | MsimMessage *msg; |
|
17953
c76e16c7cf0a
Add, but do not use, two new functions to postprocess outgoing messages
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17952
diff
changeset
|
1987 | |
|
17955
70cfe01b0466
Pass postprocessing parameters inside MsimMessage * instead of in a new struct.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17954
diff
changeset
|
1988 | msg = (MsimMessage *)data; |
|
70cfe01b0466
Pass postprocessing parameters inside MsimMessage * instead of in a new struct.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17954
diff
changeset
|
1989 | |
|
70cfe01b0466
Pass postprocessing parameters inside MsimMessage * instead of in a new struct.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17954
diff
changeset
|
1990 | msim_msg_dump("msim_postprocess_outgoing_cb() got msg=%s\n", msg); |
|
17953
c76e16c7cf0a
Add, but do not use, two new functions to postprocess outgoing messages
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17952
diff
changeset
|
1991 | |
|
c76e16c7cf0a
Add, but do not use, two new functions to postprocess outgoing messages
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17952
diff
changeset
|
1992 | /* Obtain userid from userinfo message. */ |
|
17954
b5d62ba24136
Change msim_send_im() to use msim_postprocess_outgoing(), eliminating the
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17953
diff
changeset
|
1993 | body_str = msim_msg_get_string(userinfo, "body"); |
|
b5d62ba24136
Change msim_send_im() to use msim_postprocess_outgoing(), eliminating the
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17953
diff
changeset
|
1994 | g_return_if_fail(body_str != NULL); |
|
17953
c76e16c7cf0a
Add, but do not use, two new functions to postprocess outgoing messages
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17952
diff
changeset
|
1995 | body = msim_parse_body(body_str); |
|
c76e16c7cf0a
Add, but do not use, two new functions to postprocess outgoing messages
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17952
diff
changeset
|
1996 | g_free(body_str); |
|
c76e16c7cf0a
Add, but do not use, two new functions to postprocess outgoing messages
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17952
diff
changeset
|
1997 | |
|
c76e16c7cf0a
Add, but do not use, two new functions to postprocess outgoing messages
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17952
diff
changeset
|
1998 | uid = g_strdup(g_hash_table_lookup(body, "UserID")); |
|
c76e16c7cf0a
Add, but do not use, two new functions to postprocess outgoing messages
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17952
diff
changeset
|
1999 | g_hash_table_destroy(body); |
|
c76e16c7cf0a
Add, but do not use, two new functions to postprocess outgoing messages
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17952
diff
changeset
|
2000 | |
|
17955
70cfe01b0466
Pass postprocessing parameters inside MsimMessage * instead of in a new struct.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17954
diff
changeset
|
2001 | uid_field_name = msim_msg_get_string(msg, "_uid_field_name"); |
|
70cfe01b0466
Pass postprocessing parameters inside MsimMessage * instead of in a new struct.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17954
diff
changeset
|
2002 | uid_before = msim_msg_get_string(msg, "_uid_before"); |
|
70cfe01b0466
Pass postprocessing parameters inside MsimMessage * instead of in a new struct.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17954
diff
changeset
|
2003 | |
|
17963
07e61fbc0abe
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17961
diff
changeset
|
2004 | msg = msim_do_postprocessing(msg, uid_before, uid_field_name, atol(uid)); |
|
17960
0c7d41bbf8d7
Several small changes to work towards a working msim_remove_buddy():
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17959
diff
changeset
|
2005 | |
|
17956
0b3393767f6d
Use msim_postprocess_outgoing() to resolve uid for adding and deleting buddies.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17955
diff
changeset
|
2006 | /* Send */ |
|
0b3393767f6d
Use msim_postprocess_outgoing() to resolve uid for adding and deleting buddies.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17955
diff
changeset
|
2007 | if (!msim_msg_send(session, msg)) |
|
0b3393767f6d
Use msim_postprocess_outgoing() to resolve uid for adding and deleting buddies.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17955
diff
changeset
|
2008 | { |
|
0b3393767f6d
Use msim_postprocess_outgoing() to resolve uid for adding and deleting buddies.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17955
diff
changeset
|
2009 | purple_debug_info("msim", "msim_postprocess_outgoing_cb: sending failed for message: %s\n", msg); |
|
0b3393767f6d
Use msim_postprocess_outgoing() to resolve uid for adding and deleting buddies.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17955
diff
changeset
|
2010 | } |
|
17955
70cfe01b0466
Pass postprocessing parameters inside MsimMessage * instead of in a new struct.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17954
diff
changeset
|
2011 | |
|
17963
07e61fbc0abe
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17961
diff
changeset
|
2012 | |
|
17956
0b3393767f6d
Use msim_postprocess_outgoing() to resolve uid for adding and deleting buddies.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17955
diff
changeset
|
2013 | /* Free field names AFTER sending message, because MsimMessage does NOT copy |
|
0b3393767f6d
Use msim_postprocess_outgoing() to resolve uid for adding and deleting buddies.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17955
diff
changeset
|
2014 | * field names - instead, treats them as static strings (which they usually are). |
|
0b3393767f6d
Use msim_postprocess_outgoing() to resolve uid for adding and deleting buddies.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17955
diff
changeset
|
2015 | */ |
|
17955
70cfe01b0466
Pass postprocessing parameters inside MsimMessage * instead of in a new struct.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17954
diff
changeset
|
2016 | g_free(uid_field_name); |
|
70cfe01b0466
Pass postprocessing parameters inside MsimMessage * instead of in a new struct.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17954
diff
changeset
|
2017 | g_free(uid_before); |
|
17953
c76e16c7cf0a
Add, but do not use, two new functions to postprocess outgoing messages
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17952
diff
changeset
|
2018 | |
|
17956
0b3393767f6d
Use msim_postprocess_outgoing() to resolve uid for adding and deleting buddies.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17955
diff
changeset
|
2019 | //msim_msg_free(msg); |
|
17953
c76e16c7cf0a
Add, but do not use, two new functions to postprocess outgoing messages
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17952
diff
changeset
|
2020 | } |
|
c76e16c7cf0a
Add, but do not use, two new functions to postprocess outgoing messages
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17952
diff
changeset
|
2021 | |
|
c76e16c7cf0a
Add, but do not use, two new functions to postprocess outgoing messages
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17952
diff
changeset
|
2022 | /** Postprocess and send a message. |
|
c76e16c7cf0a
Add, but do not use, two new functions to postprocess outgoing messages
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17952
diff
changeset
|
2023 | * |
|
c76e16c7cf0a
Add, but do not use, two new functions to postprocess outgoing messages
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17952
diff
changeset
|
2024 | * @param session |
|
17956
0b3393767f6d
Use msim_postprocess_outgoing() to resolve uid for adding and deleting buddies.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17955
diff
changeset
|
2025 | * @param msg Message to postprocess. Will NOT be freed. |
|
17955
70cfe01b0466
Pass postprocessing parameters inside MsimMessage * instead of in a new struct.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17954
diff
changeset
|
2026 | * @param username Username to resolve. Assumed to be a static string (will not be freed or copied). |
|
70cfe01b0466
Pass postprocessing parameters inside MsimMessage * instead of in a new struct.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17954
diff
changeset
|
2027 | * @param uid_field_name Name of new field to add, containing uid of username. Static string. |
|
70cfe01b0466
Pass postprocessing parameters inside MsimMessage * instead of in a new struct.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17954
diff
changeset
|
2028 | * @param uid_before Name of existing field to insert username field before. Static string. |
|
17953
c76e16c7cf0a
Add, but do not use, two new functions to postprocess outgoing messages
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17952
diff
changeset
|
2029 | * |
|
c76e16c7cf0a
Add, but do not use, two new functions to postprocess outgoing messages
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17952
diff
changeset
|
2030 | * @return Postprocessed message. |
|
c76e16c7cf0a
Add, but do not use, two new functions to postprocess outgoing messages
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17952
diff
changeset
|
2031 | */ |
|
17994
b3b072dd8478
Split return type and function name + arguments on to separate lines, to
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17993
diff
changeset
|
2032 | gboolean |
|
b3b072dd8478
Split return type and function name + arguments on to separate lines, to
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17993
diff
changeset
|
2033 | msim_postprocess_outgoing(MsimSession *session, MsimMessage *msg, |
|
b3b072dd8478
Split return type and function name + arguments on to separate lines, to
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17993
diff
changeset
|
2034 | const gchar *username, const gchar *uid_field_name, |
|
b3b072dd8478
Split return type and function name + arguments on to separate lines, to
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17993
diff
changeset
|
2035 | const gchar *uid_before) |
|
17953
c76e16c7cf0a
Add, but do not use, two new functions to postprocess outgoing messages
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17952
diff
changeset
|
2036 | { |
|
c76e16c7cf0a
Add, but do not use, two new functions to postprocess outgoing messages
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17952
diff
changeset
|
2037 | PurpleBuddy *buddy; |
|
c76e16c7cf0a
Add, but do not use, two new functions to postprocess outgoing messages
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17952
diff
changeset
|
2038 | guint uid; |
|
17956
0b3393767f6d
Use msim_postprocess_outgoing() to resolve uid for adding and deleting buddies.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17955
diff
changeset
|
2039 | gboolean rc; |
|
17953
c76e16c7cf0a
Add, but do not use, two new functions to postprocess outgoing messages
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17952
diff
changeset
|
2040 | |
|
17955
70cfe01b0466
Pass postprocessing parameters inside MsimMessage * instead of in a new struct.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17954
diff
changeset
|
2041 | /* Store information for msim_postprocess_outgoing_cb(). */ |
|
70cfe01b0466
Pass postprocessing parameters inside MsimMessage * instead of in a new struct.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17954
diff
changeset
|
2042 | purple_debug_info("msim", "msim_postprocess_outgoing(u=%s,ufn=%s,ub=%s)\n", |
|
70cfe01b0466
Pass postprocessing parameters inside MsimMessage * instead of in a new struct.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17954
diff
changeset
|
2043 | username, uid_field_name, uid_before); |
|
17963
07e61fbc0abe
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17961
diff
changeset
|
2044 | msim_msg_dump("msim_postprocess_outgoing: msg before=%s\n", msg); |
|
17955
70cfe01b0466
Pass postprocessing parameters inside MsimMessage * instead of in a new struct.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17954
diff
changeset
|
2045 | msg = msim_msg_append(msg, "_username", MSIM_TYPE_STRING, g_strdup(username)); |
|
70cfe01b0466
Pass postprocessing parameters inside MsimMessage * instead of in a new struct.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17954
diff
changeset
|
2046 | msg = msim_msg_append(msg, "_uid_field_name", MSIM_TYPE_STRING, g_strdup(uid_field_name)); |
|
70cfe01b0466
Pass postprocessing parameters inside MsimMessage * instead of in a new struct.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17954
diff
changeset
|
2047 | msg = msim_msg_append(msg, "_uid_before", MSIM_TYPE_STRING, g_strdup(uid_before)); |
|
17954
b5d62ba24136
Change msim_send_im() to use msim_postprocess_outgoing(), eliminating the
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17953
diff
changeset
|
2048 | |
|
b5d62ba24136
Change msim_send_im() to use msim_postprocess_outgoing(), eliminating the
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17953
diff
changeset
|
2049 | /* First, try the most obvious. If numeric userid is given, use that directly. */ |
|
b5d62ba24136
Change msim_send_im() to use msim_postprocess_outgoing(), eliminating the
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17953
diff
changeset
|
2050 | if (msim_is_userid(username)) |
|
b5d62ba24136
Change msim_send_im() to use msim_postprocess_outgoing(), eliminating the
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17953
diff
changeset
|
2051 | { |
|
b5d62ba24136
Change msim_send_im() to use msim_postprocess_outgoing(), eliminating the
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17953
diff
changeset
|
2052 | uid = atol(username); |
|
b5d62ba24136
Change msim_send_im() to use msim_postprocess_outgoing(), eliminating the
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17953
diff
changeset
|
2053 | } else { |
|
b5d62ba24136
Change msim_send_im() to use msim_postprocess_outgoing(), eliminating the
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17953
diff
changeset
|
2054 | /* Next, see if on buddy list and know uid. */ |
|
b5d62ba24136
Change msim_send_im() to use msim_postprocess_outgoing(), eliminating the
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17953
diff
changeset
|
2055 | buddy = purple_find_buddy(session->account, username); |
|
b5d62ba24136
Change msim_send_im() to use msim_postprocess_outgoing(), eliminating the
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17953
diff
changeset
|
2056 | if (buddy) |
|
b5d62ba24136
Change msim_send_im() to use msim_postprocess_outgoing(), eliminating the
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17953
diff
changeset
|
2057 | { |
|
17966
e2bdcbb55218
Show buddy information in tooltip text, and the display name for status text.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17964
diff
changeset
|
2058 | uid = purple_blist_node_get_int(&buddy->node, "UserID"); |
|
17954
b5d62ba24136
Change msim_send_im() to use msim_postprocess_outgoing(), eliminating the
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17953
diff
changeset
|
2059 | } else { |
|
b5d62ba24136
Change msim_send_im() to use msim_postprocess_outgoing(), eliminating the
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17953
diff
changeset
|
2060 | uid = 0; |
|
b5d62ba24136
Change msim_send_im() to use msim_postprocess_outgoing(), eliminating the
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17953
diff
changeset
|
2061 | } |
|
b5d62ba24136
Change msim_send_im() to use msim_postprocess_outgoing(), eliminating the
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17953
diff
changeset
|
2062 | |
|
b5d62ba24136
Change msim_send_im() to use msim_postprocess_outgoing(), eliminating the
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17953
diff
changeset
|
2063 | if (!buddy || !uid) |
|
b5d62ba24136
Change msim_send_im() to use msim_postprocess_outgoing(), eliminating the
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17953
diff
changeset
|
2064 | { |
|
17963
07e61fbc0abe
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17961
diff
changeset
|
2065 | /* Don't have uid offhand - need to ask for it, and wait until hear back before sending. */ |
|
17954
b5d62ba24136
Change msim_send_im() to use msim_postprocess_outgoing(), eliminating the
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17953
diff
changeset
|
2066 | purple_debug_info("msim", ">>> msim_postprocess_outgoing: couldn't find username %s in blist\n", |
|
b5d62ba24136
Change msim_send_im() to use msim_postprocess_outgoing(), eliminating the
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17953
diff
changeset
|
2067 | username); |
|
17956
0b3393767f6d
Use msim_postprocess_outgoing() to resolve uid for adding and deleting buddies.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17955
diff
changeset
|
2068 | msim_msg_dump("msim_postprocess_outgoing - scheduling lookup, msg=%s\n", msg); |
|
0b3393767f6d
Use msim_postprocess_outgoing() to resolve uid for adding and deleting buddies.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17955
diff
changeset
|
2069 | /* TODO: where is cloned message freed? Should be in _cb. */ |
|
17955
70cfe01b0466
Pass postprocessing parameters inside MsimMessage * instead of in a new struct.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17954
diff
changeset
|
2070 | msim_lookup_user(session, username, msim_postprocess_outgoing_cb, msim_msg_clone(msg)); |
|
17954
b5d62ba24136
Change msim_send_im() to use msim_postprocess_outgoing(), eliminating the
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17953
diff
changeset
|
2071 | return TRUE; /* not sure of status yet - haven't sent! */ |
|
b5d62ba24136
Change msim_send_im() to use msim_postprocess_outgoing(), eliminating the
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17953
diff
changeset
|
2072 | } |
|
17953
c76e16c7cf0a
Add, but do not use, two new functions to postprocess outgoing messages
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17952
diff
changeset
|
2073 | } |
|
c76e16c7cf0a
Add, but do not use, two new functions to postprocess outgoing messages
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17952
diff
changeset
|
2074 | |
|
17963
07e61fbc0abe
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17961
diff
changeset
|
2075 | /* Already have uid, postprocess and send msg immediately. */ |
|
17953
c76e16c7cf0a
Add, but do not use, two new functions to postprocess outgoing messages
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17952
diff
changeset
|
2076 | purple_debug_info("msim", "msim_postprocess_outgoing: found username %s has uid %d\n", |
|
c76e16c7cf0a
Add, but do not use, two new functions to postprocess outgoing messages
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17952
diff
changeset
|
2077 | username, uid); |
|
c76e16c7cf0a
Add, but do not use, two new functions to postprocess outgoing messages
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17952
diff
changeset
|
2078 | |
|
17963
07e61fbc0abe
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17961
diff
changeset
|
2079 | msg = msim_do_postprocessing(msg, uid_before, uid_field_name, uid); |
|
17953
c76e16c7cf0a
Add, but do not use, two new functions to postprocess outgoing messages
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17952
diff
changeset
|
2080 | |
|
17963
07e61fbc0abe
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17961
diff
changeset
|
2081 | msim_msg_dump("msim_postprocess_outgoing: msg after (uid immediate)=%s\n", msg); |
|
07e61fbc0abe
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17961
diff
changeset
|
2082 | |
|
17956
0b3393767f6d
Use msim_postprocess_outgoing() to resolve uid for adding and deleting buddies.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17955
diff
changeset
|
2083 | rc = msim_msg_send(session, msg); |
|
0b3393767f6d
Use msim_postprocess_outgoing() to resolve uid for adding and deleting buddies.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17955
diff
changeset
|
2084 | |
|
0b3393767f6d
Use msim_postprocess_outgoing() to resolve uid for adding and deleting buddies.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17955
diff
changeset
|
2085 | //msim_msg_free(msg); |
|
0b3393767f6d
Use msim_postprocess_outgoing() to resolve uid for adding and deleting buddies.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17955
diff
changeset
|
2086 | |
|
0b3393767f6d
Use msim_postprocess_outgoing() to resolve uid for adding and deleting buddies.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17955
diff
changeset
|
2087 | return rc; |
|
17953
c76e16c7cf0a
Add, but do not use, two new functions to postprocess outgoing messages
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17952
diff
changeset
|
2088 | } |
|
c76e16c7cf0a
Add, but do not use, two new functions to postprocess outgoing messages
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17952
diff
changeset
|
2089 | |
|
17940
46246b04b219
Add (incomplete) msim_remove_buddy().
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17937
diff
changeset
|
2090 | /** Remove a buddy from the user's buddy list. */ |
|
17994
b3b072dd8478
Split return type and function name + arguments on to separate lines, to
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17993
diff
changeset
|
2091 | void |
|
b3b072dd8478
Split return type and function name + arguments on to separate lines, to
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17993
diff
changeset
|
2092 | msim_remove_buddy(PurpleConnection *gc, PurpleBuddy *buddy, PurpleGroup *group) |
|
17940
46246b04b219
Add (incomplete) msim_remove_buddy().
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17937
diff
changeset
|
2093 | { |
|
46246b04b219
Add (incomplete) msim_remove_buddy().
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17937
diff
changeset
|
2094 | MsimSession *session; |
|
17963
07e61fbc0abe
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17961
diff
changeset
|
2095 | MsimMessage *delbuddy_msg; |
|
17960
0c7d41bbf8d7
Several small changes to work towards a working msim_remove_buddy():
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17959
diff
changeset
|
2096 | MsimMessage *persist_msg; |
|
17963
07e61fbc0abe
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17961
diff
changeset
|
2097 | MsimMessage *blocklist_msg; |
|
17940
46246b04b219
Add (incomplete) msim_remove_buddy().
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17937
diff
changeset
|
2098 | |
|
46246b04b219
Add (incomplete) msim_remove_buddy().
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17937
diff
changeset
|
2099 | session = (MsimSession *)gc->proto_data; |
|
46246b04b219
Add (incomplete) msim_remove_buddy().
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17937
diff
changeset
|
2100 | |
|
17963
07e61fbc0abe
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17961
diff
changeset
|
2101 | delbuddy_msg = msim_msg_new(TRUE, |
|
17940
46246b04b219
Add (incomplete) msim_remove_buddy().
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17937
diff
changeset
|
2102 | "delbuddy", MSIM_TYPE_BOOLEAN, TRUE, |
|
17941
cdc104d92cdf
Change MsimSession.sesskey to an integer (used to be a string), now that
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17940
diff
changeset
|
2103 | "sesskey", MSIM_TYPE_INTEGER, session->sesskey, |
|
17956
0b3393767f6d
Use msim_postprocess_outgoing() to resolve uid for adding and deleting buddies.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17955
diff
changeset
|
2104 | /* 'delprofileid' with uid will be inserted here. */ |
|
0b3393767f6d
Use msim_postprocess_outgoing() to resolve uid for adding and deleting buddies.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17955
diff
changeset
|
2105 | NULL); |
|
0b3393767f6d
Use msim_postprocess_outgoing() to resolve uid for adding and deleting buddies.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17955
diff
changeset
|
2106 | /* TODO: free msg */ |
|
17963
07e61fbc0abe
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17961
diff
changeset
|
2107 | if (!msim_postprocess_outgoing(session, delbuddy_msg, buddy->name, "delprofileid", NULL)) |
|
17940
46246b04b219
Add (incomplete) msim_remove_buddy().
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17937
diff
changeset
|
2108 | { |
|
46246b04b219
Add (incomplete) msim_remove_buddy().
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17937
diff
changeset
|
2109 | purple_notify_error(NULL, NULL, _("Failed to remove buddy"), _("'delbuddy' command failed")); |
|
46246b04b219
Add (incomplete) msim_remove_buddy().
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17937
diff
changeset
|
2110 | return; |
|
46246b04b219
Add (incomplete) msim_remove_buddy().
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17937
diff
changeset
|
2111 | } |
|
46246b04b219
Add (incomplete) msim_remove_buddy().
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17937
diff
changeset
|
2112 | |
|
17963
07e61fbc0abe
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17961
diff
changeset
|
2113 | persist_msg = msim_msg_new(TRUE, |
|
17940
46246b04b219
Add (incomplete) msim_remove_buddy().
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17937
diff
changeset
|
2114 | "persist", MSIM_TYPE_INTEGER, 1, |
|
17941
cdc104d92cdf
Change MsimSession.sesskey to an integer (used to be a string), now that
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17940
diff
changeset
|
2115 | "sesskey", MSIM_TYPE_INTEGER, session->sesskey, |
|
17940
46246b04b219
Add (incomplete) msim_remove_buddy().
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17937
diff
changeset
|
2116 | "cmd", MSIM_TYPE_INTEGER, MSIM_CMD_BIT_ACTION | MSIM_CMD_DELETE, |
|
46246b04b219
Add (incomplete) msim_remove_buddy().
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17937
diff
changeset
|
2117 | "dsn", MSIM_TYPE_INTEGER, MD_DELETE_BUDDY_DSN, |
|
46246b04b219
Add (incomplete) msim_remove_buddy().
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17937
diff
changeset
|
2118 | "lid", MSIM_TYPE_INTEGER, MD_DELETE_BUDDY_LID, |
|
17961
16c5545a0a95
Remove msim_get_own_uid{,_cb}() - it is not needed, since the login
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17960
diff
changeset
|
2119 | "uid", MSIM_TYPE_INTEGER, session->userid, |
|
17940
46246b04b219
Add (incomplete) msim_remove_buddy().
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17937
diff
changeset
|
2120 | "rid", MSIM_TYPE_INTEGER, session->next_rid++, |
|
17963
07e61fbc0abe
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17961
diff
changeset
|
2121 | /* <uid> will be replaced by postprocessing */ |
|
07e61fbc0abe
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17961
diff
changeset
|
2122 | "body", MSIM_TYPE_STRING, g_strdup("ContactID=<uid>"), |
|
17960
0c7d41bbf8d7
Several small changes to work towards a working msim_remove_buddy():
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17959
diff
changeset
|
2123 | NULL); |
|
0c7d41bbf8d7
Several small changes to work towards a working msim_remove_buddy():
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17959
diff
changeset
|
2124 | |
|
0c7d41bbf8d7
Several small changes to work towards a working msim_remove_buddy():
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17959
diff
changeset
|
2125 | /* TODO: free msg */ |
|
17963
07e61fbc0abe
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17961
diff
changeset
|
2126 | if (!msim_postprocess_outgoing(session, persist_msg, buddy->name, "body", NULL)) |
|
17940
46246b04b219
Add (incomplete) msim_remove_buddy().
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17937
diff
changeset
|
2127 | { |
|
46246b04b219
Add (incomplete) msim_remove_buddy().
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17937
diff
changeset
|
2128 | purple_notify_error(NULL, NULL, _("Failed to remove buddy"), _("persist command failed")); |
|
46246b04b219
Add (incomplete) msim_remove_buddy().
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17937
diff
changeset
|
2129 | return; |
|
46246b04b219
Add (incomplete) msim_remove_buddy().
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17937
diff
changeset
|
2130 | } |
|
46246b04b219
Add (incomplete) msim_remove_buddy().
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17937
diff
changeset
|
2131 | |
|
17963
07e61fbc0abe
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17961
diff
changeset
|
2132 | blocklist_msg = msim_msg_new(TRUE, |
|
07e61fbc0abe
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17961
diff
changeset
|
2133 | "blocklist", MSIM_TYPE_BOOLEAN, TRUE, |
|
07e61fbc0abe
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17961
diff
changeset
|
2134 | "sesskey", MSIM_TYPE_INTEGER, session->sesskey, |
|
07e61fbc0abe
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17961
diff
changeset
|
2135 | /* TODO: MsimMessage lists */ |
|
07e61fbc0abe
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17961
diff
changeset
|
2136 | "idlist", MSIM_TYPE_STRING, g_strdup("a-|<uid>|b-|<uid>"), |
|
07e61fbc0abe
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17961
diff
changeset
|
2137 | NULL); |
|
07e61fbc0abe
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17961
diff
changeset
|
2138 | |
|
07e61fbc0abe
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17961
diff
changeset
|
2139 | if (!msim_postprocess_outgoing(session, blocklist_msg, buddy->name, "idlist", NULL)) |
|
07e61fbc0abe
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17961
diff
changeset
|
2140 | { |
|
07e61fbc0abe
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17961
diff
changeset
|
2141 | purple_notify_error(NULL, NULL, _("Failed to remove buddy"), _("blocklist command failed")); |
|
07e61fbc0abe
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17961
diff
changeset
|
2142 | return; |
|
07e61fbc0abe
Make msim_remove_buddy() functional. It now sends the delbuddy, persist,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17961
diff
changeset
|
2143 | } |
|
17940
46246b04b219
Add (incomplete) msim_remove_buddy().
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17937
diff
changeset
|
2144 | } |
|
46246b04b219
Add (incomplete) msim_remove_buddy().
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17937
diff
changeset
|
2145 | |
|
17968
c29352b95fa6
Add msim_offline_message() for offline message status. Always return TRUE,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17967
diff
changeset
|
2146 | /** Return whether the buddy can be messaged while offline. |
|
c29352b95fa6
Add msim_offline_message() for offline message status. Always return TRUE,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17967
diff
changeset
|
2147 | * |
|
17994
b3b072dd8478
Split return type and function name + arguments on to separate lines, to
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17993
diff
changeset
|
2148 | * The protocol supports offline messages in just the same way as online |
|
b3b072dd8478
Split return type and function name + arguments on to separate lines, to
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17993
diff
changeset
|
2149 | * messages. |
|
17968
c29352b95fa6
Add msim_offline_message() for offline message status. Always return TRUE,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17967
diff
changeset
|
2150 | */ |
|
17994
b3b072dd8478
Split return type and function name + arguments on to separate lines, to
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17993
diff
changeset
|
2151 | gboolean |
|
b3b072dd8478
Split return type and function name + arguments on to separate lines, to
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17993
diff
changeset
|
2152 | msim_offline_message(const PurpleBuddy *buddy) |
|
17968
c29352b95fa6
Add msim_offline_message() for offline message status. Always return TRUE,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17967
diff
changeset
|
2153 | { |
|
c29352b95fa6
Add msim_offline_message() for offline message status. Always return TRUE,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17967
diff
changeset
|
2154 | return TRUE; |
|
c29352b95fa6
Add msim_offline_message() for offline message status. Always return TRUE,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17967
diff
changeset
|
2155 | } |
| 16322 | 2156 | |
| 2157 | /** | |
| 2158 | * Callback when input available. | |
| 2159 | * | |
| 16324 | 2160 | * @param gc_uncasted A PurpleConnection pointer. |
| 16322 | 2161 | * @param source File descriptor. |
| 16324 | 2162 | * @param cond PURPLE_INPUT_READ |
| 16322 | 2163 | * |
|
17950
c146721d0ca7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17949
diff
changeset
|
2164 | * Reads the input, and calls msim_preprocess_incoming() to handle it. |
| 16322 | 2165 | */ |
|
17994
b3b072dd8478
Split return type and function name + arguments on to separate lines, to
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17993
diff
changeset
|
2166 | void |
|
b3b072dd8478
Split return type and function name + arguments on to separate lines, to
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17993
diff
changeset
|
2167 | msim_input_cb(gpointer gc_uncasted, gint source, PurpleInputCondition cond) |
| 16322 | 2168 | { |
| 16324 | 2169 | PurpleConnection *gc; |
| 2170 | PurpleAccount *account; | |
| 16322 | 2171 | MsimSession *session; |
| 2172 | gchar *end; | |
| 2173 | int n; | |
| 2174 | ||
| 2175 | g_return_if_fail(gc_uncasted != NULL); | |
| 2176 | g_return_if_fail(source >= 0); /* Note: 0 is a valid fd */ | |
| 2177 | ||
|
17906
f87472f223aa
Stylistic improvements - use type *name instead of type* name for pointers
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17903
diff
changeset
|
2178 | gc = (PurpleConnection *)(gc_uncasted); |
| 16324 | 2179 | account = purple_connection_get_account(gc); |
| 16322 | 2180 | session = gc->proto_data; |
| 2181 | ||
|
17910
9bbfa75ba90b
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17906
diff
changeset
|
2182 | g_return_if_fail(cond == PURPLE_INPUT_READ); |
|
17958
9f809365230b
Add TODO in order to fix msim_tooltip_text.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17957
diff
changeset
|
2183 | g_return_if_fail(MSIM_SESSION_VALID(session)); |
| 16322 | 2184 | |
|
18020
f951defd22fd
Add msim_check_alive(), called every MSIM_KEEPALIVE_INTERVAL_CHECK milliseconds,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18019
diff
changeset
|
2185 | /* Mark down that we got data, so don't timeout. */ |
|
f951defd22fd
Add msim_check_alive(), called every MSIM_KEEPALIVE_INTERVAL_CHECK milliseconds,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18019
diff
changeset
|
2186 | session->last_comm = time(NULL); |
|
f951defd22fd
Add msim_check_alive(), called every MSIM_KEEPALIVE_INTERVAL_CHECK milliseconds,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18019
diff
changeset
|
2187 | |
| 16322 | 2188 | /* Only can handle so much data at once... |
| 2189 | * If this happens, try recompiling with a higher MSIM_READ_BUF_SIZE. | |
| 2190 | * Should be large enough to hold the largest protocol message. | |
| 2191 | */ | |
| 2192 | if (session->rxoff == MSIM_READ_BUF_SIZE) | |
| 2193 | { | |
| 16324 | 2194 | purple_debug_error("msim", "msim_input_cb: %d-byte read buffer full!\n", |
| 16322 | 2195 | MSIM_READ_BUF_SIZE); |
|
17895
6c2facc6c33b
Use _ for translations in msimprpl. See #648.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17894
diff
changeset
|
2196 | purple_connection_error(gc, _("Read buffer full")); |
| 16322 | 2197 | return; |
| 2198 | } | |
| 2199 | ||
| 16324 | 2200 | purple_debug_info("msim", "buffer at %d (max %d), reading up to %d\n", |
|
16332
f0e987f024e0
Use g_convert for UTF-16LE conversion instead of converting manually.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16330
diff
changeset
|
2201 | session->rxoff, MSIM_READ_BUF_SIZE, |
|
f0e987f024e0
Use g_convert for UTF-16LE conversion instead of converting manually.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16330
diff
changeset
|
2202 | MSIM_READ_BUF_SIZE - session->rxoff); |
| 16322 | 2203 | |
| 2204 | /* Read into buffer. On Win32, need recv() not read(). session->fd also holds | |
| 2205 | * the file descriptor, but it sometimes differs from the 'source' parameter. | |
| 2206 | */ | |
| 2207 | n = recv(session->fd, session->rxbuf + session->rxoff, MSIM_READ_BUF_SIZE - session->rxoff, 0); | |
| 2208 | ||
| 2209 | if (n < 0 && errno == EAGAIN) | |
| 2210 | { | |
| 2211 | return; | |
| 2212 | } | |
| 2213 | else if (n < 0) | |
| 2214 | { | |
| 16324 | 2215 | purple_debug_error("msim", "msim_input_cb: read error, ret=%d, " |
| 16322 | 2216 | "error=%s, source=%d, fd=%d (%X))\n", |
| 2217 | n, strerror(errno), source, session->fd, session->fd); | |
|
17996
d419619280db
Add a bunch of debugging to help fix #193.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17995
diff
changeset
|
2218 | purple_connection_error(gc, _("Read error")); |
| 16322 | 2219 | return; |
| 2220 | } | |
| 2221 | else if (n == 0) | |
| 2222 | { | |
| 16324 | 2223 | purple_debug_info("msim", "msim_input_cb: server disconnected\n"); |
|
17895
6c2facc6c33b
Use _ for translations in msimprpl. See #648.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17894
diff
changeset
|
2224 | purple_connection_error(gc, _("Server has disconnected")); |
| 16322 | 2225 | return; |
| 2226 | } | |
| 2227 | ||
| 2228 | /* Null terminate */ | |
| 2229 | session->rxbuf[session->rxoff + n] = 0; | |
| 2230 | ||
|
18005
f8992f7ce49b
Remove check in msim_input_cb() for embedded nulls. May be causing #1990.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18003
diff
changeset
|
2231 | #ifdef MSIM_CHECK_EMBEDDED_NULLS |
| 16322 | 2232 | /* Check for embedded NULs. I don't handle them, and they shouldn't occur. */ |
| 2233 | if (strlen(session->rxbuf + session->rxoff) != n) | |
| 2234 | { | |
| 2235 | /* Occurs after login, but it is not a null byte. */ | |
| 16324 | 2236 | purple_debug_info("msim", "msim_input_cb: strlen=%d, but read %d bytes" |
|
16332
f0e987f024e0
Use g_convert for UTF-16LE conversion instead of converting manually.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16330
diff
changeset
|
2237 | "--null byte encountered?\n", |
|
f0e987f024e0
Use g_convert for UTF-16LE conversion instead of converting manually.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16330
diff
changeset
|
2238 | strlen(session->rxbuf + session->rxoff), n); |
| 16324 | 2239 | //purple_connection_error(gc, "Invalid message - null byte on input"); |
| 16322 | 2240 | return; |
| 2241 | } | |
|
18005
f8992f7ce49b
Remove check in msim_input_cb() for embedded nulls. May be causing #1990.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18003
diff
changeset
|
2242 | #endif |
| 16322 | 2243 | |
| 2244 | session->rxoff += n; | |
| 16324 | 2245 | purple_debug_info("msim", "msim_input_cb: read=%d\n", n); |
| 16322 | 2246 | |
|
17892
66984c1aac79
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17890
diff
changeset
|
2247 | #ifdef MSIM_DEBUG_RXBUF |
|
16335
0c2b32acc27a
Replace printf() in MySpaceIM prpl with purple_debug_info().
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16334
diff
changeset
|
2248 | purple_debug_info("msim", "buf=<%s>\n", session->rxbuf); |
|
0c2b32acc27a
Replace printf() in MySpaceIM prpl with purple_debug_info().
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16334
diff
changeset
|
2249 | #endif |
| 16322 | 2250 | |
| 2251 | /* Look for \\final\\ end markers. If found, process message. */ | |
| 2252 | while((end = strstr(session->rxbuf, MSIM_FINAL_STRING))) | |
| 2253 | { | |
|
17910
9bbfa75ba90b
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17906
diff
changeset
|
2254 | MsimMessage *msg; |
| 16322 | 2255 | |
|
17892
66984c1aac79
Re-add RC4 code from Samba, whose use is enabled by not defining
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17890
diff
changeset
|
2256 | #ifdef MSIM_DEBUG_RXBUF |
|
16335
0c2b32acc27a
Replace printf() in MySpaceIM prpl with purple_debug_info().
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16334
diff
changeset
|
2257 | purple_debug_info("msim", "in loop: buf=<%s>\n", session->rxbuf); |
|
0c2b32acc27a
Replace printf() in MySpaceIM prpl with purple_debug_info().
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16334
diff
changeset
|
2258 | #endif |
| 16322 | 2259 | *end = 0; |
|
17910
9bbfa75ba90b
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17906
diff
changeset
|
2260 | msg = msim_parse(g_strdup(session->rxbuf)); |
|
9bbfa75ba90b
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17906
diff
changeset
|
2261 | if (!msg) |
| 16322 | 2262 | { |
|
16332
f0e987f024e0
Use g_convert for UTF-16LE conversion instead of converting manually.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16330
diff
changeset
|
2263 | purple_debug_info("msim", "msim_input_cb: couldn't parse <%s>\n", |
|
f0e987f024e0
Use g_convert for UTF-16LE conversion instead of converting manually.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16330
diff
changeset
|
2264 | session->rxbuf); |
|
17895
6c2facc6c33b
Use _ for translations in msimprpl. See #648.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17894
diff
changeset
|
2265 | purple_connection_error(gc, _("Unparseable message")); |
| 16322 | 2266 | } |
| 2267 | else | |
| 2268 | { | |
|
17935
a6a70c7213ab
Previously, the return value of the processing function and msim_process() told
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17934
diff
changeset
|
2269 | /* Process message and then free it (processing function should |
|
a6a70c7213ab
Previously, the return value of the processing function and msim_process() told
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17934
diff
changeset
|
2270 | * clone message if it wants to keep it afterwards.) */ |
|
17950
c146721d0ca7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17949
diff
changeset
|
2271 | if (!msim_preprocess_incoming(session, msg)) |
|
17935
a6a70c7213ab
Previously, the return value of the processing function and msim_process() told
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17934
diff
changeset
|
2272 | { |
|
17950
c146721d0ca7
Add message preprocessing in msim_preprocess_incoming(), to resolve
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17949
diff
changeset
|
2273 | msim_msg_dump("msim_input_cb: preprocessing message failed on msg: %s\n", msg); |
|
17935
a6a70c7213ab
Previously, the return value of the processing function and msim_process() told
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17934
diff
changeset
|
2274 | } |
|
a6a70c7213ab
Previously, the return value of the processing function and msim_process() told
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17934
diff
changeset
|
2275 | msim_msg_free(msg); |
| 16322 | 2276 | } |
| 2277 | ||
| 2278 | /* Move remaining part of buffer to beginning. */ | |
| 2279 | session->rxoff -= strlen(session->rxbuf) + strlen(MSIM_FINAL_STRING); | |
| 2280 | memmove(session->rxbuf, end + strlen(MSIM_FINAL_STRING), | |
| 2281 | MSIM_READ_BUF_SIZE - (end + strlen(MSIM_FINAL_STRING) - session->rxbuf)); | |
| 2282 | ||
| 2283 | /* Clear end of buffer */ | |
| 2284 | //memset(end, 0, MSIM_READ_BUF_SIZE - (end - session->rxbuf)); | |
| 2285 | } | |
| 2286 | } | |
| 2287 | ||
|
17960
0c7d41bbf8d7
Several small changes to work towards a working msim_remove_buddy():
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17959
diff
changeset
|
2288 | /* Setup a callback, to be called when a reply is received with the returned rid. |
|
0c7d41bbf8d7
Several small changes to work towards a working msim_remove_buddy():
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17959
diff
changeset
|
2289 | * |
|
0c7d41bbf8d7
Several small changes to work towards a working msim_remove_buddy():
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17959
diff
changeset
|
2290 | * @param cb The callback, an MSIM_USER_LOOKUP_CB. |
|
0c7d41bbf8d7
Several small changes to work towards a working msim_remove_buddy():
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17959
diff
changeset
|
2291 | * @param data Arbitrary user data to be passed to callback (probably an MsimMessage *). |
|
0c7d41bbf8d7
Several small changes to work towards a working msim_remove_buddy():
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17959
diff
changeset
|
2292 | * |
|
0c7d41bbf8d7
Several small changes to work towards a working msim_remove_buddy():
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17959
diff
changeset
|
2293 | * @return The request/reply ID, used to link replies with requests. Put the rid in your request. |
|
0c7d41bbf8d7
Several small changes to work towards a working msim_remove_buddy():
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17959
diff
changeset
|
2294 | * |
|
0c7d41bbf8d7
Several small changes to work towards a working msim_remove_buddy():
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17959
diff
changeset
|
2295 | * TODO: Make more generic and more specific: |
|
0c7d41bbf8d7
Several small changes to work towards a working msim_remove_buddy():
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17959
diff
changeset
|
2296 | * 1) MSIM_USER_LOOKUP_CB - make it for PERSIST_REPLY, not just user lookup |
|
0c7d41bbf8d7
Several small changes to work towards a working msim_remove_buddy():
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17959
diff
changeset
|
2297 | * 2) data - make it an MsimMessage? |
|
0c7d41bbf8d7
Several small changes to work towards a working msim_remove_buddy():
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17959
diff
changeset
|
2298 | */ |
|
17994
b3b072dd8478
Split return type and function name + arguments on to separate lines, to
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17993
diff
changeset
|
2299 | guint |
|
b3b072dd8478
Split return type and function name + arguments on to separate lines, to
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17993
diff
changeset
|
2300 | msim_new_reply_callback(MsimSession *session, MSIM_USER_LOOKUP_CB cb, |
|
b3b072dd8478
Split return type and function name + arguments on to separate lines, to
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17993
diff
changeset
|
2301 | gpointer data) |
|
17960
0c7d41bbf8d7
Several small changes to work towards a working msim_remove_buddy():
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17959
diff
changeset
|
2302 | { |
|
0c7d41bbf8d7
Several small changes to work towards a working msim_remove_buddy():
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17959
diff
changeset
|
2303 | guint rid; |
|
0c7d41bbf8d7
Several small changes to work towards a working msim_remove_buddy():
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17959
diff
changeset
|
2304 | |
|
0c7d41bbf8d7
Several small changes to work towards a working msim_remove_buddy():
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17959
diff
changeset
|
2305 | rid = session->next_rid++; |
|
0c7d41bbf8d7
Several small changes to work towards a working msim_remove_buddy():
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17959
diff
changeset
|
2306 | |
|
0c7d41bbf8d7
Several small changes to work towards a working msim_remove_buddy():
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17959
diff
changeset
|
2307 | g_hash_table_insert(session->user_lookup_cb, GUINT_TO_POINTER(rid), cb); |
|
0c7d41bbf8d7
Several small changes to work towards a working msim_remove_buddy():
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17959
diff
changeset
|
2308 | g_hash_table_insert(session->user_lookup_cb_data, GUINT_TO_POINTER(rid), data); |
|
0c7d41bbf8d7
Several small changes to work towards a working msim_remove_buddy():
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17959
diff
changeset
|
2309 | |
|
0c7d41bbf8d7
Several small changes to work towards a working msim_remove_buddy():
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17959
diff
changeset
|
2310 | return rid; |
|
0c7d41bbf8d7
Several small changes to work towards a working msim_remove_buddy():
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17959
diff
changeset
|
2311 | } |
|
0c7d41bbf8d7
Several small changes to work towards a working msim_remove_buddy():
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17959
diff
changeset
|
2312 | |
| 16322 | 2313 | /** |
| 2314 | * Callback when connected. Sets up input handlers. | |
| 2315 | * | |
| 16324 | 2316 | * @param data A PurpleConnection pointer. |
| 16322 | 2317 | * @param source File descriptor. |
| 2318 | * @param error_message | |
| 2319 | */ | |
|
17994
b3b072dd8478
Split return type and function name + arguments on to separate lines, to
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17993
diff
changeset
|
2320 | void |
|
b3b072dd8478
Split return type and function name + arguments on to separate lines, to
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17993
diff
changeset
|
2321 | msim_connect_cb(gpointer data, gint source, const gchar *error_message) |
| 16322 | 2322 | { |
| 16324 | 2323 | PurpleConnection *gc; |
| 16322 | 2324 | MsimSession *session; |
| 2325 | ||
| 2326 | g_return_if_fail(data != NULL); | |
| 2327 | ||
|
17906
f87472f223aa
Stylistic improvements - use type *name instead of type* name for pointers
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17903
diff
changeset
|
2328 | gc = (PurpleConnection *)data; |
|
17960
0c7d41bbf8d7
Several small changes to work towards a working msim_remove_buddy():
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17959
diff
changeset
|
2329 | session = (MsimSession *)gc->proto_data; |
| 16322 | 2330 | |
| 2331 | if (source < 0) | |
| 2332 | { | |
|
17895
6c2facc6c33b
Use _ for translations in msimprpl. See #648.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17894
diff
changeset
|
2333 | purple_connection_error(gc, _("Couldn't connect to host")); |
|
18009
59eed9bd2dea
Be more defensive about null pointers, especially null strings in %s format
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18007
diff
changeset
|
2334 | purple_connection_error(gc, g_strdup_printf( |
|
59eed9bd2dea
Be more defensive about null pointers, especially null strings in %s format
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18007
diff
changeset
|
2335 | _("Couldn't connect to host: %s (%d)"), |
|
59eed9bd2dea
Be more defensive about null pointers, especially null strings in %s format
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18007
diff
changeset
|
2336 | error_message ? error_message : "no message given", |
|
59eed9bd2dea
Be more defensive about null pointers, especially null strings in %s format
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18007
diff
changeset
|
2337 | source)); |
| 16322 | 2338 | return; |
| 2339 | } | |
| 2340 | ||
| 2341 | session->fd = source; | |
| 2342 | ||
| 16324 | 2343 | gc->inpa = purple_input_add(source, PURPLE_INPUT_READ, msim_input_cb, gc); |
|
18003
fb399e32e44c
Add MSIM_FAKE_SELF_ONLINE preprocessor definition (which I define) to fake
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18002
diff
changeset
|
2344 | |
|
fb399e32e44c
Add MSIM_FAKE_SELF_ONLINE preprocessor definition (which I define) to fake
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18002
diff
changeset
|
2345 | |
| 16322 | 2346 | } |
| 2347 | ||
| 2348 | /* Session methods */ | |
| 2349 | ||
| 2350 | /** | |
| 2351 | * Create a new MSIM session. | |
| 2352 | * | |
| 2353 | * @param acct The account to create the session from. | |
| 2354 | * | |
| 2355 | * @return Pointer to a new session. Free with msim_session_destroy. | |
| 2356 | */ | |
|
17994
b3b072dd8478
Split return type and function name + arguments on to separate lines, to
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17993
diff
changeset
|
2357 | MsimSession * |
|
b3b072dd8478
Split return type and function name + arguments on to separate lines, to
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17993
diff
changeset
|
2358 | msim_session_new(PurpleAccount *acct) |
| 16322 | 2359 | { |
| 2360 | MsimSession *session; | |
| 2361 | ||
| 2362 | g_return_val_if_fail(acct != NULL, NULL); | |
| 2363 | ||
| 2364 | session = g_new0(MsimSession, 1); | |
| 2365 | ||
| 2366 | session->magic = MSIM_SESSION_STRUCT_MAGIC; | |
| 2367 | session->account = acct; | |
| 16324 | 2368 | session->gc = purple_account_get_connection(acct); |
|
18003
fb399e32e44c
Add MSIM_FAKE_SELF_ONLINE preprocessor definition (which I define) to fake
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18002
diff
changeset
|
2369 | session->sesskey = 0; |
|
fb399e32e44c
Add MSIM_FAKE_SELF_ONLINE preprocessor definition (which I define) to fake
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18002
diff
changeset
|
2370 | session->userid = 0; |
|
fb399e32e44c
Add MSIM_FAKE_SELF_ONLINE preprocessor definition (which I define) to fake
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18002
diff
changeset
|
2371 | session->username = NULL; |
| 16322 | 2372 | session->fd = -1; |
|
17957
bc5874ed7a09
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17956
diff
changeset
|
2373 | |
|
bc5874ed7a09
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17956
diff
changeset
|
2374 | /* TODO: Remove. */ |
|
16335
0c2b32acc27a
Replace printf() in MySpaceIM prpl with purple_debug_info().
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16334
diff
changeset
|
2375 | session->user_lookup_cb = g_hash_table_new_full(g_direct_hash, |
|
17924
191c78db42ae
Use MsimMessage for receiving messages everywhere, instead of GHashTable.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17910
diff
changeset
|
2376 | g_direct_equal, NULL, NULL); /* do NOT free function pointers! (values) */ |
|
16335
0c2b32acc27a
Replace printf() in MySpaceIM prpl with purple_debug_info().
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16334
diff
changeset
|
2377 | session->user_lookup_cb_data = g_hash_table_new_full(g_direct_hash, |
|
17947
a423b14fda56
Change msim_send_im_by_userid_cb() to msim_send_im_cb(), and remove
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17944
diff
changeset
|
2378 | g_direct_equal, NULL, NULL);/* TODO: we don't know what the values are, |
|
17924
191c78db42ae
Use MsimMessage for receiving messages everywhere, instead of GHashTable.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17910
diff
changeset
|
2379 | they could be integers inside gpointers |
|
17947
a423b14fda56
Change msim_send_im_by_userid_cb() to msim_send_im_cb(), and remove
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17944
diff
changeset
|
2380 | or strings, so I don't freed them. |
|
17924
191c78db42ae
Use MsimMessage for receiving messages everywhere, instead of GHashTable.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17910
diff
changeset
|
2381 | Figure this out, once free cache. */ |
| 16322 | 2382 | session->rxoff = 0; |
| 2383 | session->rxbuf = g_new0(gchar, MSIM_READ_BUF_SIZE); | |
|
16335
0c2b32acc27a
Replace printf() in MySpaceIM prpl with purple_debug_info().
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16334
diff
changeset
|
2384 | session->next_rid = 1; |
|
18020
f951defd22fd
Add msim_check_alive(), called every MSIM_KEEPALIVE_INTERVAL_CHECK milliseconds,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18019
diff
changeset
|
2385 | session->last_comm = time(NULL); |
| 16322 | 2386 | |
| 2387 | return session; | |
| 2388 | } | |
| 2389 | ||
| 2390 | /** | |
| 2391 | * Free a session. | |
| 2392 | * | |
| 2393 | * @param session The session to destroy. | |
| 2394 | */ | |
|
17994
b3b072dd8478
Split return type and function name + arguments on to separate lines, to
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17993
diff
changeset
|
2395 | void |
|
b3b072dd8478
Split return type and function name + arguments on to separate lines, to
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17993
diff
changeset
|
2396 | msim_session_destroy(MsimSession *session) |
| 16322 | 2397 | { |
| 2398 | g_return_if_fail(MSIM_SESSION_VALID(session)); | |
|
17996
d419619280db
Add a bunch of debugging to help fix #193.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17995
diff
changeset
|
2399 | |
| 16322 | 2400 | session->magic = -1; |
| 2401 | ||
| 2402 | g_free(session->rxbuf); | |
|
18003
fb399e32e44c
Add MSIM_FAKE_SELF_ONLINE preprocessor definition (which I define) to fake
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18002
diff
changeset
|
2403 | g_free(session->username); |
| 16322 | 2404 | |
|
17957
bc5874ed7a09
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17956
diff
changeset
|
2405 | /* TODO: Remove. */ |
|
bc5874ed7a09
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17956
diff
changeset
|
2406 | g_hash_table_destroy(session->user_lookup_cb); |
|
bc5874ed7a09
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17956
diff
changeset
|
2407 | g_hash_table_destroy(session->user_lookup_cb_data); |
|
bc5874ed7a09
Add msim_uid2username_from_blist() to lookup a username by userid, by
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17956
diff
changeset
|
2408 | |
| 16322 | 2409 | g_free(session); |
| 2410 | } | |
|
16333
0fdea8ad21cb
Add MySpaceIM header file and reorganize functions.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16332
diff
changeset
|
2411 | |
| 16322 | 2412 | /** |
| 2413 | * Close the connection. | |
| 2414 | * | |
| 2415 | * @param gc The connection. | |
| 2416 | */ | |
|
17994
b3b072dd8478
Split return type and function name + arguments on to separate lines, to
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17993
diff
changeset
|
2417 | void |
|
b3b072dd8478
Split return type and function name + arguments on to separate lines, to
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17993
diff
changeset
|
2418 | msim_close(PurpleConnection *gc) |
| 16322 | 2419 | { |
|
17958
9f809365230b
Add TODO in order to fix msim_tooltip_text.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17957
diff
changeset
|
2420 | MsimSession *session; |
|
17937
0f30d74fcd9c
Add incomplete msim_add_buddy() implementation.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17935
diff
changeset
|
2421 | |
|
17996
d419619280db
Add a bunch of debugging to help fix #193.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17995
diff
changeset
|
2422 | if (gc == NULL) |
|
d419619280db
Add a bunch of debugging to help fix #193.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17995
diff
changeset
|
2423 | return; |
|
d419619280db
Add a bunch of debugging to help fix #193.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17995
diff
changeset
|
2424 | |
|
17958
9f809365230b
Add TODO in order to fix msim_tooltip_text.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17957
diff
changeset
|
2425 | session = (MsimSession *)gc->proto_data; |
|
17996
d419619280db
Add a bunch of debugging to help fix #193.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17995
diff
changeset
|
2426 | if (session == NULL) |
|
d419619280db
Add a bunch of debugging to help fix #193.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17995
diff
changeset
|
2427 | return; |
|
d419619280db
Add a bunch of debugging to help fix #193.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17995
diff
changeset
|
2428 | |
|
d419619280db
Add a bunch of debugging to help fix #193.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17995
diff
changeset
|
2429 | gc->proto_data = NULL; |
|
d419619280db
Add a bunch of debugging to help fix #193.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17995
diff
changeset
|
2430 | |
|
d419619280db
Add a bunch of debugging to help fix #193.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17995
diff
changeset
|
2431 | if (!MSIM_SESSION_VALID(session)) |
|
d419619280db
Add a bunch of debugging to help fix #193.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17995
diff
changeset
|
2432 | return; |
|
d419619280db
Add a bunch of debugging to help fix #193.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17995
diff
changeset
|
2433 | |
|
d419619280db
Add a bunch of debugging to help fix #193.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17995
diff
changeset
|
2434 | if (session->gc->inpa) |
|
d419619280db
Add a bunch of debugging to help fix #193.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17995
diff
changeset
|
2435 | purple_input_remove(session->gc->inpa); |
|
d419619280db
Add a bunch of debugging to help fix #193.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17995
diff
changeset
|
2436 | |
|
17958
9f809365230b
Add TODO in order to fix msim_tooltip_text.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17957
diff
changeset
|
2437 | msim_session_destroy(session); |
| 16322 | 2438 | } |
| 2439 | ||
| 2440 | ||
| 2441 | /** | |
| 2442 | * Check if a string is a userid (all numeric). | |
| 2443 | * | |
| 2444 | * @param user The user id, email, or name. | |
| 2445 | * | |
| 2446 | * @return TRUE if is userid, FALSE if not. | |
| 2447 | */ | |
|
17994
b3b072dd8478
Split return type and function name + arguments on to separate lines, to
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17993
diff
changeset
|
2448 | gboolean |
|
b3b072dd8478
Split return type and function name + arguments on to separate lines, to
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17993
diff
changeset
|
2449 | msim_is_userid(const gchar *user) |
| 16322 | 2450 | { |
| 2451 | g_return_val_if_fail(user != NULL, FALSE); | |
| 2452 | ||
| 2453 | return strspn(user, "0123456789") == strlen(user); | |
| 2454 | } | |
| 2455 | ||
| 2456 | /** | |
| 2457 | * Check if a string is an email address (contains an @). | |
| 2458 | * | |
| 2459 | * @param user The user id, email, or name. | |
| 2460 | * | |
| 2461 | * @return TRUE if is an email, FALSE if not. | |
| 2462 | * | |
| 2463 | * This function is not intended to be used as a generic | |
| 2464 | * means of validating email addresses, but to distinguish | |
| 2465 | * between a user represented by an email address from | |
| 2466 | * other forms of identification. | |
| 2467 | */ | |
|
17994
b3b072dd8478
Split return type and function name + arguments on to separate lines, to
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17993
diff
changeset
|
2468 | gboolean |
|
b3b072dd8478
Split return type and function name + arguments on to separate lines, to
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17993
diff
changeset
|
2469 | msim_is_email(const gchar *user) |
| 16322 | 2470 | { |
| 2471 | g_return_val_if_fail(user != NULL, FALSE); | |
| 2472 | ||
| 2473 | return strchr(user, '@') != NULL; | |
| 2474 | } | |
| 2475 | ||
| 2476 | ||
| 2477 | /** | |
| 2478 | * Asynchronously lookup user information, calling callback when receive result. | |
| 2479 | * | |
| 2480 | * @param session | |
|
17989
48499e10fac3
Retrieve information for profile ("Get Info") from server, instead of from
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17988
diff
changeset
|
2481 | * @param user The user id, email address, or username. Not freed. |
| 16322 | 2482 | * @param cb Callback, called with user information when available. |
| 2483 | * @param data An arbitray data pointer passed to the callback. | |
| 2484 | */ | |
|
17943
d33c1657f68b
Add TODOs about username/email->userid resolution, use g_return_if_fail() in a few places.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17942
diff
changeset
|
2485 | /* TODO: change to not use callbacks */ |
|
17994
b3b072dd8478
Split return type and function name + arguments on to separate lines, to
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17993
diff
changeset
|
2486 | void |
|
b3b072dd8478
Split return type and function name + arguments on to separate lines, to
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17993
diff
changeset
|
2487 | msim_lookup_user(MsimSession *session, const gchar *user, |
|
b3b072dd8478
Split return type and function name + arguments on to separate lines, to
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17993
diff
changeset
|
2488 | MSIM_USER_LOOKUP_CB cb, gpointer data) |
| 16322 | 2489 | { |
| 2490 | gchar *field_name; | |
| 2491 | guint rid, cmd, dsn, lid; | |
| 2492 | ||
| 2493 | g_return_if_fail(MSIM_SESSION_VALID(session)); | |
| 2494 | g_return_if_fail(user != NULL); | |
| 2495 | g_return_if_fail(cb != NULL); | |
| 2496 | ||
|
17910
9bbfa75ba90b
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17906
diff
changeset
|
2497 | purple_debug_info("msim", "msim_lookup_userid: " |
|
16332
f0e987f024e0
Use g_convert for UTF-16LE conversion instead of converting manually.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16330
diff
changeset
|
2498 | "asynchronously looking up <%s>\n", user); |
| 16322 | 2499 | |
|
17956
0b3393767f6d
Use msim_postprocess_outgoing() to resolve uid for adding and deleting buddies.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17955
diff
changeset
|
2500 | msim_msg_dump("msim_lookup_user: data=%s\n", (MsimMessage *)data); |
|
0b3393767f6d
Use msim_postprocess_outgoing() to resolve uid for adding and deleting buddies.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17955
diff
changeset
|
2501 | |
| 16322 | 2502 | /* Setup callback. Response will be associated with request using 'rid'. */ |
|
17960
0c7d41bbf8d7
Several small changes to work towards a working msim_remove_buddy():
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17959
diff
changeset
|
2503 | rid = msim_new_reply_callback(session, cb, data); |
| 16322 | 2504 | |
| 2505 | /* Send request */ | |
| 2506 | ||
|
17930
d8908611bf64
Use symbolic constants for persist messages.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17929
diff
changeset
|
2507 | cmd = MSIM_CMD_GET; |
| 16322 | 2508 | |
| 2509 | if (msim_is_userid(user)) | |
| 2510 | { | |
| 2511 | field_name = "UserID"; | |
|
17930
d8908611bf64
Use symbolic constants for persist messages.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17929
diff
changeset
|
2512 | dsn = MG_MYSPACE_INFO_BY_ID_DSN; |
|
d8908611bf64
Use symbolic constants for persist messages.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17929
diff
changeset
|
2513 | lid = MG_MYSPACE_INFO_BY_ID_LID; |
| 16322 | 2514 | } else if (msim_is_email(user)) { |
| 2515 | field_name = "Email"; | |
|
17930
d8908611bf64
Use symbolic constants for persist messages.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17929
diff
changeset
|
2516 | dsn = MG_MYSPACE_INFO_BY_STRING_DSN; |
|
d8908611bf64
Use symbolic constants for persist messages.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17929
diff
changeset
|
2517 | lid = MG_MYSPACE_INFO_BY_STRING_LID; |
| 16322 | 2518 | } else { |
| 2519 | field_name = "UserName"; | |
|
17930
d8908611bf64
Use symbolic constants for persist messages.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17929
diff
changeset
|
2520 | dsn = MG_MYSPACE_INFO_BY_STRING_DSN; |
|
d8908611bf64
Use symbolic constants for persist messages.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17929
diff
changeset
|
2521 | lid = MG_MYSPACE_INFO_BY_STRING_LID; |
| 16322 | 2522 | } |
| 2523 | ||
| 2524 | ||
|
17935
a6a70c7213ab
Previously, the return value of the processing function and msim_process() told
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17934
diff
changeset
|
2525 | g_return_if_fail(msim_send(session, |
|
17903
1c344d9266b8
Use MsimMessage via msim_send(), instead of msim_send_raw(). This is a more
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17902
diff
changeset
|
2526 | "persist", MSIM_TYPE_INTEGER, 1, |
|
17941
cdc104d92cdf
Change MsimSession.sesskey to an integer (used to be a string), now that
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17940
diff
changeset
|
2527 | "sesskey", MSIM_TYPE_INTEGER, session->sesskey, |
|
17903
1c344d9266b8
Use MsimMessage via msim_send(), instead of msim_send_raw(). This is a more
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17902
diff
changeset
|
2528 | "cmd", MSIM_TYPE_INTEGER, 1, |
|
1c344d9266b8
Use MsimMessage via msim_send(), instead of msim_send_raw(). This is a more
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17902
diff
changeset
|
2529 | "dsn", MSIM_TYPE_INTEGER, dsn, |
|
17961
16c5545a0a95
Remove msim_get_own_uid{,_cb}() - it is not needed, since the login
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17960
diff
changeset
|
2530 | "uid", MSIM_TYPE_INTEGER, session->userid, |
|
17903
1c344d9266b8
Use MsimMessage via msim_send(), instead of msim_send_raw(). This is a more
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17902
diff
changeset
|
2531 | "lid", MSIM_TYPE_INTEGER, lid, |
|
1c344d9266b8
Use MsimMessage via msim_send(), instead of msim_send_raw(). This is a more
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17902
diff
changeset
|
2532 | "rid", MSIM_TYPE_INTEGER, rid, |
|
1c344d9266b8
Use MsimMessage via msim_send(), instead of msim_send_raw(). This is a more
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17902
diff
changeset
|
2533 | /* TODO: dictionary field type */ |
|
18009
59eed9bd2dea
Be more defensive about null pointers, especially null strings in %s format
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18007
diff
changeset
|
2534 | "body", MSIM_TYPE_STRING, |
|
59eed9bd2dea
Be more defensive about null pointers, especially null strings in %s format
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18007
diff
changeset
|
2535 | g_strdup_printf("%s=%s", field_name, user), |
|
17935
a6a70c7213ab
Previously, the return value of the processing function and msim_process() told
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17934
diff
changeset
|
2536 | NULL)); |
| 16322 | 2537 | } |
| 2538 | ||
| 2539 | ||
| 2540 | /** | |
| 2541 | * Obtain the status text for a buddy. | |
| 2542 | * | |
| 2543 | * @param buddy The buddy to obtain status text for. | |
| 2544 | * | |
|
17970
3c92ce43ddae
Change to use const gchar * where appropriate.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17969
diff
changeset
|
2545 | * @return Status text, or NULL if error. Caller g_free()'s. |
| 16322 | 2546 | * |
| 2547 | */ | |
|
17994
b3b072dd8478
Split return type and function name + arguments on to separate lines, to
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17993
diff
changeset
|
2548 | char * |
|
b3b072dd8478
Split return type and function name + arguments on to separate lines, to
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17993
diff
changeset
|
2549 | msim_status_text(PurpleBuddy *buddy) |
| 16322 | 2550 | { |
| 2551 | MsimSession *session; | |
|
17976
4fe92c2fa5af
Add two boolean options to account dialog, to allow displaying of
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17975
diff
changeset
|
2552 | const gchar *display_name, *headline; |
| 16322 | 2553 | |
| 2554 | g_return_val_if_fail(buddy != NULL, NULL); | |
| 2555 | ||
|
17906
f87472f223aa
Stylistic improvements - use type *name instead of type* name for pointers
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17903
diff
changeset
|
2556 | session = (MsimSession *)buddy->account->gc->proto_data; |
|
17894
e9d07c821d6f
Use g_return_if_fail() instead of g_assert(), as to not crash the whole program.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17893
diff
changeset
|
2557 | g_return_val_if_fail(MSIM_SESSION_VALID(session), NULL); |
| 16322 | 2558 | |
|
17976
4fe92c2fa5af
Add two boolean options to account dialog, to allow displaying of
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17975
diff
changeset
|
2559 | display_name = headline = NULL; |
|
4fe92c2fa5af
Add two boolean options to account dialog, to allow displaying of
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17975
diff
changeset
|
2560 | |
|
4fe92c2fa5af
Add two boolean options to account dialog, to allow displaying of
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17975
diff
changeset
|
2561 | /* Retrieve display name and/or headline, depending on user preference. */ |
|
4fe92c2fa5af
Add two boolean options to account dialog, to allow displaying of
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17975
diff
changeset
|
2562 | if (purple_account_get_bool(session->account, "show_display_name", TRUE)) |
|
4fe92c2fa5af
Add two boolean options to account dialog, to allow displaying of
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17975
diff
changeset
|
2563 | { |
|
4fe92c2fa5af
Add two boolean options to account dialog, to allow displaying of
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17975
diff
changeset
|
2564 | display_name = purple_blist_node_get_string(&buddy->node, "DisplayName"); |
|
4fe92c2fa5af
Add two boolean options to account dialog, to allow displaying of
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17975
diff
changeset
|
2565 | } |
|
4fe92c2fa5af
Add two boolean options to account dialog, to allow displaying of
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17975
diff
changeset
|
2566 | |
|
4fe92c2fa5af
Add two boolean options to account dialog, to allow displaying of
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17975
diff
changeset
|
2567 | if (purple_account_get_bool(session->account, "show_headline", FALSE)) |
|
4fe92c2fa5af
Add two boolean options to account dialog, to allow displaying of
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17975
diff
changeset
|
2568 | { |
|
4fe92c2fa5af
Add two boolean options to account dialog, to allow displaying of
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17975
diff
changeset
|
2569 | headline = purple_blist_node_get_string(&buddy->node, "Headline"); |
|
4fe92c2fa5af
Add two boolean options to account dialog, to allow displaying of
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17975
diff
changeset
|
2570 | } |
|
4fe92c2fa5af
Add two boolean options to account dialog, to allow displaying of
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17975
diff
changeset
|
2571 | |
|
4fe92c2fa5af
Add two boolean options to account dialog, to allow displaying of
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17975
diff
changeset
|
2572 | /* Return appropriate combination of display name and/or headline, or neither. */ |
|
4fe92c2fa5af
Add two boolean options to account dialog, to allow displaying of
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17975
diff
changeset
|
2573 | |
|
4fe92c2fa5af
Add two boolean options to account dialog, to allow displaying of
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17975
diff
changeset
|
2574 | if (display_name && headline) |
|
4fe92c2fa5af
Add two boolean options to account dialog, to allow displaying of
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17975
diff
changeset
|
2575 | return g_strconcat(display_name, " ", headline, NULL); |
| 16322 | 2576 | |
|
17966
e2bdcbb55218
Show buddy information in tooltip text, and the display name for status text.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17964
diff
changeset
|
2577 | if (display_name) |
|
e2bdcbb55218
Show buddy information in tooltip text, and the display name for status text.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17964
diff
changeset
|
2578 | return g_strdup(display_name); |
|
17976
4fe92c2fa5af
Add two boolean options to account dialog, to allow displaying of
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17975
diff
changeset
|
2579 | |
|
4fe92c2fa5af
Add two boolean options to account dialog, to allow displaying of
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17975
diff
changeset
|
2580 | if (headline) |
|
4fe92c2fa5af
Add two boolean options to account dialog, to allow displaying of
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17975
diff
changeset
|
2581 | return g_strdup(headline); |
|
4fe92c2fa5af
Add two boolean options to account dialog, to allow displaying of
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17975
diff
changeset
|
2582 | |
|
4fe92c2fa5af
Add two boolean options to account dialog, to allow displaying of
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17975
diff
changeset
|
2583 | return NULL; |
| 16322 | 2584 | } |
| 2585 | ||
| 2586 | /** | |
| 2587 | * Obtain the tooltip text for a buddy. | |
| 2588 | * | |
| 2589 | * @param buddy Buddy to obtain tooltip text on. | |
| 2590 | * @param user_info Variable modified to have the tooltip text. | |
| 2591 | * @param full TRUE if should obtain full tooltip text. | |
| 2592 | * | |
| 2593 | */ | |
|
17994
b3b072dd8478
Split return type and function name + arguments on to separate lines, to
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17993
diff
changeset
|
2594 | void |
|
b3b072dd8478
Split return type and function name + arguments on to separate lines, to
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17993
diff
changeset
|
2595 | msim_tooltip_text(PurpleBuddy *buddy, PurpleNotifyUserInfo *user_info, |
|
b3b072dd8478
Split return type and function name + arguments on to separate lines, to
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17993
diff
changeset
|
2596 | gboolean full) |
| 16322 | 2597 | { |
|
18006
a63c60e26d12
In msim_tooltip_text, do not try to display items with no value. In Linux,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18005
diff
changeset
|
2598 | const gchar *str, *str2; |
|
a63c60e26d12
In msim_tooltip_text, do not try to display items with no value. In Linux,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18005
diff
changeset
|
2599 | gint n; |
|
a63c60e26d12
In msim_tooltip_text, do not try to display items with no value. In Linux,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18005
diff
changeset
|
2600 | |
| 16322 | 2601 | g_return_if_fail(buddy != NULL); |
| 2602 | g_return_if_fail(user_info != NULL); | |
| 2603 | ||
| 16324 | 2604 | if (PURPLE_BUDDY_IS_ONLINE(buddy)) |
| 16322 | 2605 | { |
| 2606 | MsimSession *session; | |
| 2607 | ||
|
17906
f87472f223aa
Stylistic improvements - use type *name instead of type* name for pointers
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17903
diff
changeset
|
2608 | session = (MsimSession *)buddy->account->gc->proto_data; |
| 16322 | 2609 | |
|
17894
e9d07c821d6f
Use g_return_if_fail() instead of g_assert(), as to not crash the whole program.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17893
diff
changeset
|
2610 | g_return_if_fail(MSIM_SESSION_VALID(session)); |
| 16322 | 2611 | |
|
17966
e2bdcbb55218
Show buddy information in tooltip text, and the display name for status text.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17964
diff
changeset
|
2612 | /* TODO: if (full), do something different */ |
|
17967
a16d7668ab43
Reorganize the tooltip text, to show more useful information.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17966
diff
changeset
|
2613 | |
|
18006
a63c60e26d12
In msim_tooltip_text, do not try to display items with no value. In Linux,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18005
diff
changeset
|
2614 | /* Useful to identify the account the tooltip refers to. |
|
a63c60e26d12
In msim_tooltip_text, do not try to display items with no value. In Linux,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18005
diff
changeset
|
2615 | * Other prpls show this. */ |
|
a63c60e26d12
In msim_tooltip_text, do not try to display items with no value. In Linux,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18005
diff
changeset
|
2616 | str = purple_blist_node_get_string(&buddy->node, "UserName"); |
|
a63c60e26d12
In msim_tooltip_text, do not try to display items with no value. In Linux,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18005
diff
changeset
|
2617 | if (str) |
|
a63c60e26d12
In msim_tooltip_text, do not try to display items with no value. In Linux,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18005
diff
changeset
|
2618 | purple_notify_user_info_add_pair(user_info, _("User Name"), str); |
|
17967
a16d7668ab43
Reorganize the tooltip text, to show more useful information.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17966
diff
changeset
|
2619 | |
|
a16d7668ab43
Reorganize the tooltip text, to show more useful information.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17966
diff
changeset
|
2620 | /* a/s/l...the vitals */ |
|
18006
a63c60e26d12
In msim_tooltip_text, do not try to display items with no value. In Linux,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18005
diff
changeset
|
2621 | n = purple_blist_node_get_int(&buddy->node, "Age"); |
|
a63c60e26d12
In msim_tooltip_text, do not try to display items with no value. In Linux,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18005
diff
changeset
|
2622 | if (n) |
|
a63c60e26d12
In msim_tooltip_text, do not try to display items with no value. In Linux,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18005
diff
changeset
|
2623 | purple_notify_user_info_add_pair(user_info, _("Age"), |
|
a63c60e26d12
In msim_tooltip_text, do not try to display items with no value. In Linux,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18005
diff
changeset
|
2624 | g_strdup_printf("%d", n)); |
|
a63c60e26d12
In msim_tooltip_text, do not try to display items with no value. In Linux,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18005
diff
changeset
|
2625 | |
|
a63c60e26d12
In msim_tooltip_text, do not try to display items with no value. In Linux,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18005
diff
changeset
|
2626 | str = purple_blist_node_get_string(&buddy->node, "Gender"); |
|
a63c60e26d12
In msim_tooltip_text, do not try to display items with no value. In Linux,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18005
diff
changeset
|
2627 | if (str) |
|
a63c60e26d12
In msim_tooltip_text, do not try to display items with no value. In Linux,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18005
diff
changeset
|
2628 | purple_notify_user_info_add_pair(user_info, _("Gender"), str); |
|
a63c60e26d12
In msim_tooltip_text, do not try to display items with no value. In Linux,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18005
diff
changeset
|
2629 | |
|
a63c60e26d12
In msim_tooltip_text, do not try to display items with no value. In Linux,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18005
diff
changeset
|
2630 | str = purple_blist_node_get_string(&buddy->node, "Location"); |
|
a63c60e26d12
In msim_tooltip_text, do not try to display items with no value. In Linux,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18005
diff
changeset
|
2631 | if (str) |
|
a63c60e26d12
In msim_tooltip_text, do not try to display items with no value. In Linux,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18005
diff
changeset
|
2632 | purple_notify_user_info_add_pair(user_info, _("Location"), str); |
|
17967
a16d7668ab43
Reorganize the tooltip text, to show more useful information.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17966
diff
changeset
|
2633 | |
|
a16d7668ab43
Reorganize the tooltip text, to show more useful information.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17966
diff
changeset
|
2634 | /* Other information */ |
|
18006
a63c60e26d12
In msim_tooltip_text, do not try to display items with no value. In Linux,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18005
diff
changeset
|
2635 | str = purple_blist_node_get_string(&buddy->node, "Headline"); |
|
a63c60e26d12
In msim_tooltip_text, do not try to display items with no value. In Linux,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18005
diff
changeset
|
2636 | if (str) |
|
a63c60e26d12
In msim_tooltip_text, do not try to display items with no value. In Linux,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18005
diff
changeset
|
2637 | purple_notify_user_info_add_pair(user_info, _("Headline"), str); |
|
a63c60e26d12
In msim_tooltip_text, do not try to display items with no value. In Linux,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18005
diff
changeset
|
2638 | |
|
a63c60e26d12
In msim_tooltip_text, do not try to display items with no value. In Linux,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18005
diff
changeset
|
2639 | str = purple_blist_node_get_string(&buddy->node, "BandName"); |
|
a63c60e26d12
In msim_tooltip_text, do not try to display items with no value. In Linux,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18005
diff
changeset
|
2640 | str2 = purple_blist_node_get_string(&buddy->node, "SongName"); |
|
a63c60e26d12
In msim_tooltip_text, do not try to display items with no value. In Linux,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18005
diff
changeset
|
2641 | if (str || str2) |
|
a63c60e26d12
In msim_tooltip_text, do not try to display items with no value. In Linux,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18005
diff
changeset
|
2642 | purple_notify_user_info_add_pair(user_info, _("Song"), |
|
17967
a16d7668ab43
Reorganize the tooltip text, to show more useful information.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17966
diff
changeset
|
2643 | g_strdup_printf("%s - %s", |
|
18006
a63c60e26d12
In msim_tooltip_text, do not try to display items with no value. In Linux,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18005
diff
changeset
|
2644 | str ? str : _("Unknown Artist"), |
|
a63c60e26d12
In msim_tooltip_text, do not try to display items with no value. In Linux,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18005
diff
changeset
|
2645 | str2 ? str2 : _("Unknown Song"))); |
|
a63c60e26d12
In msim_tooltip_text, do not try to display items with no value. In Linux,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18005
diff
changeset
|
2646 | |
|
a63c60e26d12
In msim_tooltip_text, do not try to display items with no value. In Linux,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18005
diff
changeset
|
2647 | n = purple_blist_node_get_int(&buddy->node, "TotalFriends"); |
|
a63c60e26d12
In msim_tooltip_text, do not try to display items with no value. In Linux,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18005
diff
changeset
|
2648 | if (n) |
|
a63c60e26d12
In msim_tooltip_text, do not try to display items with no value. In Linux,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18005
diff
changeset
|
2649 | purple_notify_user_info_add_pair(user_info, _("Total Friends"), |
|
a63c60e26d12
In msim_tooltip_text, do not try to display items with no value. In Linux,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18005
diff
changeset
|
2650 | g_strdup_printf("%d", n)); |
|
17966
e2bdcbb55218
Show buddy information in tooltip text, and the display name for status text.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17964
diff
changeset
|
2651 | |
| 16322 | 2652 | } |
| 2653 | } | |
| 2654 | ||
| 16324 | 2655 | /** Callbacks called by Purple, to access this plugin. */ |
|
17903
1c344d9266b8
Use MsimMessage via msim_send(), instead of msim_send_raw(). This is a more
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17902
diff
changeset
|
2656 | PurplePluginProtocolInfo prpl_info = |
| 16322 | 2657 | { |
|
18011
c60bea7aee94
Fix typo to allow font face to be displayed correctly on incoming messages.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18010
diff
changeset
|
2658 | /* options */ |
|
c60bea7aee94
Fix typo to allow font face to be displayed correctly on incoming messages.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18010
diff
changeset
|
2659 | OPT_PROTO_USE_POINTSIZE /* specify font size in sane point size */ |
|
c60bea7aee94
Fix typo to allow font face to be displayed correctly on incoming messages.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18010
diff
changeset
|
2660 | /* | OPT_PROTO_MAIL_CHECK - TODO: myspace will notify of mail */ |
|
c60bea7aee94
Fix typo to allow font face to be displayed correctly on incoming messages.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18010
diff
changeset
|
2661 | /* | OPT_PROTO_IM_IMAGE - TODO: direct images. */ |
|
c60bea7aee94
Fix typo to allow font face to be displayed correctly on incoming messages.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18010
diff
changeset
|
2662 | , |
| 16322 | 2663 | NULL, /* user_splits */ |
| 2664 | NULL, /* protocol_options */ | |
| 2665 | NO_BUDDY_ICONS, /* icon_spec - TODO: eventually should add this */ | |
| 2666 | msim_list_icon, /* list_icon */ | |
| 2667 | NULL, /* list_emblems */ | |
| 2668 | msim_status_text, /* status_text */ | |
| 2669 | msim_tooltip_text, /* tooltip_text */ | |
| 2670 | msim_status_types, /* status_types */ | |
| 2671 | NULL, /* blist_node_menu */ | |
| 2672 | NULL, /* chat_info */ | |
| 2673 | NULL, /* chat_info_defaults */ | |
| 2674 | msim_login, /* login */ | |
| 2675 | msim_close, /* close */ | |
| 2676 | msim_send_im, /* send_im */ | |
| 2677 | NULL, /* set_info */ | |
|
17934
d163dde3aff1
Add, but do not use, incomplete functions for using typing notifications.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17933
diff
changeset
|
2678 | msim_send_typing, /* send_typing */ |
|
17969
9a043ea6bc44
Implement msim_get_info() for users on the user's buddy list.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17968
diff
changeset
|
2679 | msim_get_info, /* get_info */ |
|
18012
c83766296952
Allow setting status to away or online.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18011
diff
changeset
|
2680 | msim_set_status, /* set_status */ |
|
18019
dc5d60a5ac54
Add support for idle.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18018
diff
changeset
|
2681 | msim_set_idle, /* set_idle */ |
| 16322 | 2682 | NULL, /* change_passwd */ |
|
17940
46246b04b219
Add (incomplete) msim_remove_buddy().
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17937
diff
changeset
|
2683 | msim_add_buddy, /* add_buddy */ |
| 16322 | 2684 | NULL, /* add_buddies */ |
|
17940
46246b04b219
Add (incomplete) msim_remove_buddy().
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17937
diff
changeset
|
2685 | msim_remove_buddy, /* remove_buddy */ |
| 16322 | 2686 | NULL, /* remove_buddies */ |
| 2687 | NULL, /* add_permit */ | |
| 2688 | NULL, /* add_deny */ | |
| 2689 | NULL, /* rem_permit */ | |
| 2690 | NULL, /* rem_deny */ | |
| 2691 | NULL, /* set_permit_deny */ | |
| 2692 | NULL, /* join_chat */ | |
| 2693 | NULL, /* reject chat invite */ | |
| 2694 | NULL, /* get_chat_name */ | |
| 2695 | NULL, /* chat_invite */ | |
| 2696 | NULL, /* chat_leave */ | |
| 2697 | NULL, /* chat_whisper */ | |
| 2698 | NULL, /* chat_send */ | |
| 2699 | NULL, /* keepalive */ | |
| 2700 | NULL, /* register_user */ | |
| 2701 | NULL, /* get_cb_info */ | |
| 2702 | NULL, /* get_cb_away */ | |
| 2703 | NULL, /* alias_buddy */ | |
| 2704 | NULL, /* group_buddy */ | |
| 2705 | NULL, /* rename_group */ | |
| 2706 | NULL, /* buddy_free */ | |
| 2707 | NULL, /* convo_closed */ | |
| 2708 | NULL, /* normalize */ | |
| 2709 | NULL, /* set_buddy_icon */ | |
| 2710 | NULL, /* remove_group */ | |
| 2711 | NULL, /* get_cb_real_name */ | |
| 2712 | NULL, /* set_chat_topic */ | |
| 2713 | NULL, /* find_blist_chat */ | |
| 2714 | NULL, /* roomlist_get_list */ | |
| 2715 | NULL, /* roomlist_cancel */ | |
| 2716 | NULL, /* roomlist_expand_category */ | |
| 2717 | NULL, /* can_receive_file */ | |
| 2718 | NULL, /* send_file */ | |
| 2719 | NULL, /* new_xfer */ | |
|
17968
c29352b95fa6
Add msim_offline_message() for offline message status. Always return TRUE,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17967
diff
changeset
|
2720 | msim_offline_message, /* offline_message */ |
| 16322 | 2721 | NULL, /* whiteboard_prpl_ops */ |
|
17993
d11321258152
Add a send_raw function, msim_send_really_raw, into the prpl_info struct,
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17992
diff
changeset
|
2722 | msim_send_really_raw, /* send_raw */ |
|
17890
6926ed504a9a
Add initializers for reserved fields in plugin and prpl structures.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16337
diff
changeset
|
2723 | NULL, /* roomlist_room_serialize */ |
|
6926ed504a9a
Add initializers for reserved fields in plugin and prpl structures.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16337
diff
changeset
|
2724 | NULL, /* _purple_reserved1 */ |
|
6926ed504a9a
Add initializers for reserved fields in plugin and prpl structures.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16337
diff
changeset
|
2725 | NULL, /* _purple_reserved2 */ |
|
6926ed504a9a
Add initializers for reserved fields in plugin and prpl structures.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16337
diff
changeset
|
2726 | NULL, /* _purple_reserved3 */ |
|
6926ed504a9a
Add initializers for reserved fields in plugin and prpl structures.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16337
diff
changeset
|
2727 | NULL /* _purple_reserved4 */ |
| 16322 | 2728 | }; |
| 2729 | ||
| 2730 | ||
| 2731 | ||
| 2732 | /** Based on MSN's plugin info comments. */ | |
|
17903
1c344d9266b8
Use MsimMessage via msim_send(), instead of msim_send_raw(). This is a more
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17902
diff
changeset
|
2733 | PurplePluginInfo info = |
| 16322 | 2734 | { |
| 16324 | 2735 | PURPLE_PLUGIN_MAGIC, |
| 2736 | PURPLE_MAJOR_VERSION, | |
| 2737 | PURPLE_MINOR_VERSION, | |
|
17933
03228b5c78b5
Show online buddies on buddy list as online.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17931
diff
changeset
|
2738 | PURPLE_PLUGIN_PROTOCOL, /**< type */ |
|
03228b5c78b5
Show online buddies on buddy list as online.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17931
diff
changeset
|
2739 | NULL, /**< ui_requirement */ |
|
03228b5c78b5
Show online buddies on buddy list as online.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17931
diff
changeset
|
2740 | 0, /**< flags */ |
|
03228b5c78b5
Show online buddies on buddy list as online.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17931
diff
changeset
|
2741 | NULL, /**< dependencies */ |
|
03228b5c78b5
Show online buddies on buddy list as online.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17931
diff
changeset
|
2742 | PURPLE_PRIORITY_DEFAULT, /**< priority */ |
| 16322 | 2743 | |
| 2744 | "prpl-myspace", /**< id */ | |
| 2745 | "MySpaceIM", /**< name */ | |
| 18018 | 2746 | "0.10", /**< version */ |
| 16322 | 2747 | /** summary */ |
| 2748 | "MySpaceIM Protocol Plugin", | |
| 2749 | /** description */ | |
| 2750 | "MySpaceIM Protocol Plugin", | |
| 18013 | 2751 | "Jeff Connelly <jeff2@soc.pidgin.im>", /**< author */ |
| 16322 | 2752 | "http://developer.pidgin.im/wiki/MySpaceIM/", /**< homepage */ |
| 2753 | ||
|
17893
308a27332b57
Check for RC4 in libpurple on plugin initialization.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17892
diff
changeset
|
2754 | msim_load, /**< load */ |
| 16322 | 2755 | NULL, /**< unload */ |
| 2756 | NULL, /**< destroy */ | |
| 2757 | NULL, /**< ui_info */ | |
| 2758 | &prpl_info, /**< extra_info */ | |
| 2759 | NULL, /**< prefs_info */ | |
| 2760 | ||
| 2761 | /* msim_actions */ | |
|
17890
6926ed504a9a
Add initializers for reserved fields in plugin and prpl structures.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16337
diff
changeset
|
2762 | NULL, |
|
6926ed504a9a
Add initializers for reserved fields in plugin and prpl structures.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16337
diff
changeset
|
2763 | |
|
6926ed504a9a
Add initializers for reserved fields in plugin and prpl structures.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16337
diff
changeset
|
2764 | NULL, /**< reserved1 */ |
|
6926ed504a9a
Add initializers for reserved fields in plugin and prpl structures.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16337
diff
changeset
|
2765 | NULL, /**< reserved2 */ |
|
6926ed504a9a
Add initializers for reserved fields in plugin and prpl structures.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16337
diff
changeset
|
2766 | NULL, /**< reserved3 */ |
|
6926ed504a9a
Add initializers for reserved fields in plugin and prpl structures.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
16337
diff
changeset
|
2767 | NULL /**< reserved4 */ |
| 16322 | 2768 | }; |
| 2769 | ||
|
17981
2e330f731690
Add msim_test_all() and related procedures, to perform basic functionality
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17980
diff
changeset
|
2770 | |
|
17984
9a53a8583bba
Add msim_unrecognized() to handle unhandled messages.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17983
diff
changeset
|
2771 | #ifdef MSIM_SELF_TEST |
|
17981
2e330f731690
Add msim_test_all() and related procedures, to perform basic functionality
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17980
diff
changeset
|
2772 | /** Test functions. |
|
2e330f731690
Add msim_test_all() and related procedures, to perform basic functionality
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17980
diff
changeset
|
2773 | * Used to test or try out the internal workings of msimprpl. If you're reading |
|
2e330f731690
Add msim_test_all() and related procedures, to perform basic functionality
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17980
diff
changeset
|
2774 | * this code for the first time, these functions can be instructive in how |
|
2e330f731690
Add msim_test_all() and related procedures, to perform basic functionality
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17980
diff
changeset
|
2775 | * msimprpl is architected. |
|
2e330f731690
Add msim_test_all() and related procedures, to perform basic functionality
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17980
diff
changeset
|
2776 | */ |
|
17994
b3b072dd8478
Split return type and function name + arguments on to separate lines, to
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17993
diff
changeset
|
2777 | void |
|
17995
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
2778 | msim_test_all(void) |
|
17981
2e330f731690
Add msim_test_all() and related procedures, to perform basic functionality
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17980
diff
changeset
|
2779 | { |
|
2e330f731690
Add msim_test_all() and related procedures, to perform basic functionality
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17980
diff
changeset
|
2780 | guint failures; |
|
2e330f731690
Add msim_test_all() and related procedures, to perform basic functionality
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17980
diff
changeset
|
2781 | |
|
17995
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
2782 | |
|
17981
2e330f731690
Add msim_test_all() and related procedures, to perform basic functionality
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17980
diff
changeset
|
2783 | failures = 0; |
|
17995
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
2784 | failures += msim_test_xml(); |
|
17981
2e330f731690
Add msim_test_all() and related procedures, to perform basic functionality
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17980
diff
changeset
|
2785 | failures += msim_test_msg(); |
|
2e330f731690
Add msim_test_all() and related procedures, to perform basic functionality
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17980
diff
changeset
|
2786 | failures += msim_test_escaping(); |
|
2e330f731690
Add msim_test_all() and related procedures, to perform basic functionality
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17980
diff
changeset
|
2787 | |
|
2e330f731690
Add msim_test_all() and related procedures, to perform basic functionality
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17980
diff
changeset
|
2788 | if (failures) |
|
2e330f731690
Add msim_test_all() and related procedures, to perform basic functionality
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17980
diff
changeset
|
2789 | { |
|
2e330f731690
Add msim_test_all() and related procedures, to perform basic functionality
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17980
diff
changeset
|
2790 | purple_debug_info("msim", "msim_test_all HAD FAILURES: %d\n", failures); |
|
2e330f731690
Add msim_test_all() and related procedures, to perform basic functionality
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17980
diff
changeset
|
2791 | } |
|
2e330f731690
Add msim_test_all() and related procedures, to perform basic functionality
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17980
diff
changeset
|
2792 | else |
|
2e330f731690
Add msim_test_all() and related procedures, to perform basic functionality
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17980
diff
changeset
|
2793 | { |
|
2e330f731690
Add msim_test_all() and related procedures, to perform basic functionality
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17980
diff
changeset
|
2794 | purple_debug_info("msim", "msim_test_all - all tests passed!\n"); |
|
2e330f731690
Add msim_test_all() and related procedures, to perform basic functionality
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17980
diff
changeset
|
2795 | } |
|
2e330f731690
Add msim_test_all() and related procedures, to perform basic functionality
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17980
diff
changeset
|
2796 | exit(0); |
|
2e330f731690
Add msim_test_all() and related procedures, to perform basic functionality
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17980
diff
changeset
|
2797 | } |
|
2e330f731690
Add msim_test_all() and related procedures, to perform basic functionality
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17980
diff
changeset
|
2798 | |
|
17995
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
2799 | int |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
2800 | msim_test_xml(void) |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
2801 | { |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
2802 | gchar *msg_text; |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
2803 | xmlnode *root, *n; |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
2804 | guint failures; |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
2805 | char *s; |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
2806 | int len; |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
2807 | |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
2808 | failures = 0; |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
2809 | |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
2810 | msg_text = "<p><f n=\"Arial\" h=\"12\">woo!</f>xxx<c v='black'>yyy</c></p>"; |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
2811 | |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
2812 | purple_debug_info("msim", "msim_test_xml: msg_text=%s\n", msg_text); |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
2813 | |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
2814 | root = xmlnode_from_str(msg_text, -1); |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
2815 | if (!root) |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
2816 | { |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
2817 | purple_debug_info("msim", "there is no root\n"); |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
2818 | exit(0); |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
2819 | } |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
2820 | |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
2821 | purple_debug_info("msim", "root name=%s, child name=%s\n", root->name, |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
2822 | root->child->name); |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
2823 | |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
2824 | purple_debug_info("msim", "last child name=%s\n", root->lastchild->name); |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
2825 | purple_debug_info("msim", "Root xml=%s\n", |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
2826 | xmlnode_to_str(root, &len)); |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
2827 | purple_debug_info("msim", "Child xml=%s\n", |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
2828 | xmlnode_to_str(root->child, &len)); |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
2829 | purple_debug_info("msim", "Lastchild xml=%s\n", |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
2830 | xmlnode_to_str(root->lastchild, &len)); |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
2831 | purple_debug_info("msim", "Next xml=%s\n", |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
2832 | xmlnode_to_str(root->next, &len)); |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
2833 | purple_debug_info("msim", "Next data=%s\n", |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
2834 | xmlnode_get_data(root->next)); |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
2835 | purple_debug_info("msim", "Child->next xml=%s\n", |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
2836 | xmlnode_to_str(root->child->next, &len)); |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
2837 | |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
2838 | for (n = root->child; n; n = n->next) |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
2839 | { |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
2840 | if (n->name) |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
2841 | { |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
2842 | purple_debug_info("msim", " ** n=%s\n",n->name); |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
2843 | } else { |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
2844 | purple_debug_info("msim", " ** n data=%s\n", n->data); |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
2845 | } |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
2846 | } |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
2847 | |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
2848 | purple_debug_info("msim", "root data=%s, child data=%s, child 'h'=%s\n", |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
2849 | xmlnode_get_data(root), |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
2850 | xmlnode_get_data(root->child), |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
2851 | xmlnode_get_attrib(root->child, "h")); |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
2852 | |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
2853 | |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
2854 | for (n = root->child; |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
2855 | n != NULL; |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
2856 | n = n->next) |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
2857 | { |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
2858 | purple_debug_info("msim", "next name=%s\n", n->name); |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
2859 | } |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
2860 | |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
2861 | s = xmlnode_to_str(root, &len); |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
2862 | s[len] = 0; |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
2863 | |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
2864 | purple_debug_info("msim", "str: %s\n", s); |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
2865 | g_free(s); |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
2866 | |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
2867 | xmlnode_free(root); |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
2868 | |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
2869 | exit(0); |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
2870 | |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
2871 | return failures; |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
2872 | } |
|
8ca08f4eface
Add msim_markup_to_html() to convert MySpaceIM-style markup to Purple-compatible
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17994
diff
changeset
|
2873 | |
|
17981
2e330f731690
Add msim_test_all() and related procedures, to perform basic functionality
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17980
diff
changeset
|
2874 | /** Test MsimMessage for basic functionality. */ |
|
17994
b3b072dd8478
Split return type and function name + arguments on to separate lines, to
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17993
diff
changeset
|
2875 | int |
|
b3b072dd8478
Split return type and function name + arguments on to separate lines, to
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17993
diff
changeset
|
2876 | msim_test_msg(void) |
|
17981
2e330f731690
Add msim_test_all() and related procedures, to perform basic functionality
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17980
diff
changeset
|
2877 | { |
|
2e330f731690
Add msim_test_all() and related procedures, to perform basic functionality
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17980
diff
changeset
|
2878 | MsimMessage *msg, *msg_cloned; |
|
2e330f731690
Add msim_test_all() and related procedures, to perform basic functionality
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17980
diff
changeset
|
2879 | gchar *packed, *packed_expected, *packed_cloned; |
|
2e330f731690
Add msim_test_all() and related procedures, to perform basic functionality
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17980
diff
changeset
|
2880 | guint failures; |
|
2e330f731690
Add msim_test_all() and related procedures, to perform basic functionality
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17980
diff
changeset
|
2881 | |
|
2e330f731690
Add msim_test_all() and related procedures, to perform basic functionality
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17980
diff
changeset
|
2882 | failures = 0; |
|
2e330f731690
Add msim_test_all() and related procedures, to perform basic functionality
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17980
diff
changeset
|
2883 | |
|
2e330f731690
Add msim_test_all() and related procedures, to perform basic functionality
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17980
diff
changeset
|
2884 | purple_debug_info("msim", "\n\nTesting MsimMessage\n"); |
|
2e330f731690
Add msim_test_all() and related procedures, to perform basic functionality
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17980
diff
changeset
|
2885 | msg = msim_msg_new(FALSE); /* Create a new, empty message. */ |
|
2e330f731690
Add msim_test_all() and related procedures, to perform basic functionality
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17980
diff
changeset
|
2886 | |
|
2e330f731690
Add msim_test_all() and related procedures, to perform basic functionality
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17980
diff
changeset
|
2887 | /* Append some new elements. */ |
|
2e330f731690
Add msim_test_all() and related procedures, to perform basic functionality
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17980
diff
changeset
|
2888 | msg = msim_msg_append(msg, "bx", MSIM_TYPE_BINARY, g_string_new_len(g_strdup("XXX"), 3)); |
|
2e330f731690
Add msim_test_all() and related procedures, to perform basic functionality
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17980
diff
changeset
|
2889 | msg = msim_msg_append(msg, "k1", MSIM_TYPE_STRING, g_strdup("v1")); |
|
2e330f731690
Add msim_test_all() and related procedures, to perform basic functionality
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17980
diff
changeset
|
2890 | msg = msim_msg_append(msg, "k1", MSIM_TYPE_INTEGER, GUINT_TO_POINTER(42)); |
|
2e330f731690
Add msim_test_all() and related procedures, to perform basic functionality
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17980
diff
changeset
|
2891 | msg = msim_msg_append(msg, "k1", MSIM_TYPE_STRING, g_strdup("v43")); |
|
2e330f731690
Add msim_test_all() and related procedures, to perform basic functionality
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17980
diff
changeset
|
2892 | msg = msim_msg_append(msg, "k1", MSIM_TYPE_STRING, g_strdup("v52/xxx\\yyy")); |
|
2e330f731690
Add msim_test_all() and related procedures, to perform basic functionality
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17980
diff
changeset
|
2893 | msg = msim_msg_append(msg, "k1", MSIM_TYPE_STRING, g_strdup("v7")); |
|
2e330f731690
Add msim_test_all() and related procedures, to perform basic functionality
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17980
diff
changeset
|
2894 | msim_msg_dump("msg debug str=%s\n", msg); |
|
2e330f731690
Add msim_test_all() and related procedures, to perform basic functionality
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17980
diff
changeset
|
2895 | packed = msim_msg_pack(msg); |
|
2e330f731690
Add msim_test_all() and related procedures, to perform basic functionality
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17980
diff
changeset
|
2896 | |
|
2e330f731690
Add msim_test_all() and related procedures, to perform basic functionality
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17980
diff
changeset
|
2897 | purple_debug_info("msim", "msg packed=%s\n", packed); |
|
2e330f731690
Add msim_test_all() and related procedures, to perform basic functionality
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17980
diff
changeset
|
2898 | |
|
2e330f731690
Add msim_test_all() and related procedures, to perform basic functionality
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17980
diff
changeset
|
2899 | packed_expected = "\\bx\\WFhY\\k1\\v1\\k1\\42\\k1" |
|
2e330f731690
Add msim_test_all() and related procedures, to perform basic functionality
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17980
diff
changeset
|
2900 | "\\v43\\k1\\v52/1xxx/2yyy\\k1\\v7\\final\\"; |
|
2e330f731690
Add msim_test_all() and related procedures, to perform basic functionality
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17980
diff
changeset
|
2901 | |
|
2e330f731690
Add msim_test_all() and related procedures, to perform basic functionality
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17980
diff
changeset
|
2902 | if (0 != strcmp(packed, packed_expected)) |
|
2e330f731690
Add msim_test_all() and related procedures, to perform basic functionality
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17980
diff
changeset
|
2903 | { |
|
2e330f731690
Add msim_test_all() and related procedures, to perform basic functionality
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17980
diff
changeset
|
2904 | purple_debug_info("msim", "!!!(%d), msim_msg_pack not what expected: %s != %s\n", |
|
2e330f731690
Add msim_test_all() and related procedures, to perform basic functionality
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17980
diff
changeset
|
2905 | ++failures, packed, packed_expected); |
|
2e330f731690
Add msim_test_all() and related procedures, to perform basic functionality
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17980
diff
changeset
|
2906 | } |
|
2e330f731690
Add msim_test_all() and related procedures, to perform basic functionality
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17980
diff
changeset
|
2907 | |
|
2e330f731690
Add msim_test_all() and related procedures, to perform basic functionality
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17980
diff
changeset
|
2908 | |
|
2e330f731690
Add msim_test_all() and related procedures, to perform basic functionality
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17980
diff
changeset
|
2909 | msg_cloned = msim_msg_clone(msg); |
|
2e330f731690
Add msim_test_all() and related procedures, to perform basic functionality
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17980
diff
changeset
|
2910 | packed_cloned = msim_msg_pack(msg_cloned); |
|
2e330f731690
Add msim_test_all() and related procedures, to perform basic functionality
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17980
diff
changeset
|
2911 | |
|
2e330f731690
Add msim_test_all() and related procedures, to perform basic functionality
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17980
diff
changeset
|
2912 | purple_debug_info("msim", "msg cloned=%s\n", packed_cloned); |
|
2e330f731690
Add msim_test_all() and related procedures, to perform basic functionality
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17980
diff
changeset
|
2913 | if (0 != strcmp(packed, packed_cloned)) |
|
2e330f731690
Add msim_test_all() and related procedures, to perform basic functionality
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17980
diff
changeset
|
2914 | { |
|
2e330f731690
Add msim_test_all() and related procedures, to perform basic functionality
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17980
diff
changeset
|
2915 | purple_debug_info("msim", "!!!(%d), msim_msg_pack on cloned message not equal to original: %s != %s\n", |
|
2e330f731690
Add msim_test_all() and related procedures, to perform basic functionality
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17980
diff
changeset
|
2916 | ++failures, packed_cloned, packed); |
|
2e330f731690
Add msim_test_all() and related procedures, to perform basic functionality
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17980
diff
changeset
|
2917 | } |
|
2e330f731690
Add msim_test_all() and related procedures, to perform basic functionality
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17980
diff
changeset
|
2918 | |
|
2e330f731690
Add msim_test_all() and related procedures, to perform basic functionality
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17980
diff
changeset
|
2919 | g_free(packed); |
|
2e330f731690
Add msim_test_all() and related procedures, to perform basic functionality
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17980
diff
changeset
|
2920 | g_free(packed_cloned); |
|
2e330f731690
Add msim_test_all() and related procedures, to perform basic functionality
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17980
diff
changeset
|
2921 | msim_msg_free(msg_cloned); |
|
2e330f731690
Add msim_test_all() and related procedures, to perform basic functionality
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17980
diff
changeset
|
2922 | msim_msg_free(msg); |
|
2e330f731690
Add msim_test_all() and related procedures, to perform basic functionality
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17980
diff
changeset
|
2923 | |
|
2e330f731690
Add msim_test_all() and related procedures, to perform basic functionality
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17980
diff
changeset
|
2924 | return failures; |
|
2e330f731690
Add msim_test_all() and related procedures, to perform basic functionality
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17980
diff
changeset
|
2925 | } |
|
2e330f731690
Add msim_test_all() and related procedures, to perform basic functionality
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17980
diff
changeset
|
2926 | |
|
2e330f731690
Add msim_test_all() and related procedures, to perform basic functionality
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17980
diff
changeset
|
2927 | /** Test protocol-level escaping/unescaping. */ |
|
17994
b3b072dd8478
Split return type and function name + arguments on to separate lines, to
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17993
diff
changeset
|
2928 | int |
|
b3b072dd8478
Split return type and function name + arguments on to separate lines, to
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17993
diff
changeset
|
2929 | msim_test_escaping(void) |
|
17981
2e330f731690
Add msim_test_all() and related procedures, to perform basic functionality
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17980
diff
changeset
|
2930 | { |
|
2e330f731690
Add msim_test_all() and related procedures, to perform basic functionality
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17980
diff
changeset
|
2931 | guint failures; |
|
2e330f731690
Add msim_test_all() and related procedures, to perform basic functionality
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17980
diff
changeset
|
2932 | gchar *raw, *escaped, *unescaped, *expected; |
|
2e330f731690
Add msim_test_all() and related procedures, to perform basic functionality
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17980
diff
changeset
|
2933 | |
|
2e330f731690
Add msim_test_all() and related procedures, to perform basic functionality
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17980
diff
changeset
|
2934 | failures = 0; |
|
2e330f731690
Add msim_test_all() and related procedures, to perform basic functionality
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17980
diff
changeset
|
2935 | |
|
2e330f731690
Add msim_test_all() and related procedures, to perform basic functionality
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17980
diff
changeset
|
2936 | purple_debug_info("msim", "\n\nTesting escaping\n"); |
|
2e330f731690
Add msim_test_all() and related procedures, to perform basic functionality
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17980
diff
changeset
|
2937 | |
|
2e330f731690
Add msim_test_all() and related procedures, to perform basic functionality
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17980
diff
changeset
|
2938 | raw = "hello/world\\hello/world"; |
|
2e330f731690
Add msim_test_all() and related procedures, to perform basic functionality
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17980
diff
changeset
|
2939 | |
|
2e330f731690
Add msim_test_all() and related procedures, to perform basic functionality
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17980
diff
changeset
|
2940 | escaped = msim_escape(raw); |
|
2e330f731690
Add msim_test_all() and related procedures, to perform basic functionality
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17980
diff
changeset
|
2941 | purple_debug_info("msim", "msim_test_escaping: raw=%s, escaped=%s\n", raw, escaped); |
|
2e330f731690
Add msim_test_all() and related procedures, to perform basic functionality
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17980
diff
changeset
|
2942 | expected = "hello/1world/2hello/1world"; |
|
2e330f731690
Add msim_test_all() and related procedures, to perform basic functionality
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17980
diff
changeset
|
2943 | if (0 != strcmp(escaped, expected)) |
|
2e330f731690
Add msim_test_all() and related procedures, to perform basic functionality
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17980
diff
changeset
|
2944 | { |
|
2e330f731690
Add msim_test_all() and related procedures, to perform basic functionality
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17980
diff
changeset
|
2945 | purple_debug_info("msim", "!!!(%d), msim_escape failed: %s != %s\n", |
|
2e330f731690
Add msim_test_all() and related procedures, to perform basic functionality
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17980
diff
changeset
|
2946 | ++failures, escaped, expected); |
|
2e330f731690
Add msim_test_all() and related procedures, to perform basic functionality
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17980
diff
changeset
|
2947 | } |
|
2e330f731690
Add msim_test_all() and related procedures, to perform basic functionality
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17980
diff
changeset
|
2948 | |
|
2e330f731690
Add msim_test_all() and related procedures, to perform basic functionality
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17980
diff
changeset
|
2949 | |
|
2e330f731690
Add msim_test_all() and related procedures, to perform basic functionality
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17980
diff
changeset
|
2950 | unescaped = msim_unescape(escaped); |
|
2e330f731690
Add msim_test_all() and related procedures, to perform basic functionality
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17980
diff
changeset
|
2951 | g_free(escaped); |
|
2e330f731690
Add msim_test_all() and related procedures, to perform basic functionality
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17980
diff
changeset
|
2952 | purple_debug_info("msim", "msim_test_escaping: unescaped=%s\n", unescaped); |
|
2e330f731690
Add msim_test_all() and related procedures, to perform basic functionality
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17980
diff
changeset
|
2953 | if (0 != strcmp(raw, unescaped)) |
|
2e330f731690
Add msim_test_all() and related procedures, to perform basic functionality
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17980
diff
changeset
|
2954 | { |
|
2e330f731690
Add msim_test_all() and related procedures, to perform basic functionality
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17980
diff
changeset
|
2955 | purple_debug_info("msim", "!!!(%d), msim_unescape failed: %s != %s\n", |
|
2e330f731690
Add msim_test_all() and related procedures, to perform basic functionality
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17980
diff
changeset
|
2956 | ++failures, raw, unescaped); |
|
2e330f731690
Add msim_test_all() and related procedures, to perform basic functionality
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17980
diff
changeset
|
2957 | } |
|
2e330f731690
Add msim_test_all() and related procedures, to perform basic functionality
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17980
diff
changeset
|
2958 | |
|
2e330f731690
Add msim_test_all() and related procedures, to perform basic functionality
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17980
diff
changeset
|
2959 | return failures; |
|
2e330f731690
Add msim_test_all() and related procedures, to perform basic functionality
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17980
diff
changeset
|
2960 | } |
|
17984
9a53a8583bba
Add msim_unrecognized() to handle unhandled messages.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17983
diff
changeset
|
2961 | #endif |
|
17981
2e330f731690
Add msim_test_all() and related procedures, to perform basic functionality
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17980
diff
changeset
|
2962 | |
|
2e330f731690
Add msim_test_all() and related procedures, to perform basic functionality
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17980
diff
changeset
|
2963 | /** Initialize plugin. */ |
|
17994
b3b072dd8478
Split return type and function name + arguments on to separate lines, to
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17993
diff
changeset
|
2964 | void |
|
b3b072dd8478
Split return type and function name + arguments on to separate lines, to
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17993
diff
changeset
|
2965 | init_plugin(PurplePlugin *plugin) |
|
17900
402fdc925e30
Clean up a few TODO's.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17898
diff
changeset
|
2966 | { |
|
402fdc925e30
Clean up a few TODO's.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17898
diff
changeset
|
2967 | PurpleAccountOption *option; |
|
17981
2e330f731690
Add msim_test_all() and related procedures, to perform basic functionality
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17980
diff
changeset
|
2968 | #ifdef MSIM_SELF_TEST |
|
2e330f731690
Add msim_test_all() and related procedures, to perform basic functionality
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17980
diff
changeset
|
2969 | msim_test_all(); |
|
2e330f731690
Add msim_test_all() and related procedures, to perform basic functionality
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17980
diff
changeset
|
2970 | #endif /* MSIM_SELF_TEST */ |
|
17900
402fdc925e30
Clean up a few TODO's.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17898
diff
changeset
|
2971 | |
|
402fdc925e30
Clean up a few TODO's.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17898
diff
changeset
|
2972 | /* TODO: default to automatically try different ports. Make the user be |
|
402fdc925e30
Clean up a few TODO's.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17898
diff
changeset
|
2973 | * able to set the first port to try (like LastConnectedPort in Windows client). */ |
|
402fdc925e30
Clean up a few TODO's.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17898
diff
changeset
|
2974 | option = purple_account_option_string_new(_("Connect server"), "server", MSIM_SERVER); |
|
402fdc925e30
Clean up a few TODO's.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17898
diff
changeset
|
2975 | prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option); |
|
402fdc925e30
Clean up a few TODO's.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17898
diff
changeset
|
2976 | |
|
402fdc925e30
Clean up a few TODO's.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17898
diff
changeset
|
2977 | option = purple_account_option_int_new(_("Connect port"), "port", MSIM_PORT); |
|
402fdc925e30
Clean up a few TODO's.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17898
diff
changeset
|
2978 | prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option); |
|
17976
4fe92c2fa5af
Add two boolean options to account dialog, to allow displaying of
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17975
diff
changeset
|
2979 | |
|
18014
4d667ccd35ed
Add option to sign on as hidden, or as not (previously, always signed on
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18013
diff
changeset
|
2980 | option = purple_account_option_bool_new(_("Sign on as hidden"), "hidden", FALSE); |
|
4d667ccd35ed
Add option to sign on as hidden, or as not (previously, always signed on
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18013
diff
changeset
|
2981 | prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option); |
|
4d667ccd35ed
Add option to sign on as hidden, or as not (previously, always signed on
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
18013
diff
changeset
|
2982 | |
|
17976
4fe92c2fa5af
Add two boolean options to account dialog, to allow displaying of
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17975
diff
changeset
|
2983 | option = purple_account_option_bool_new(_("Show display name in status text"), "show_display_name", TRUE); |
|
4fe92c2fa5af
Add two boolean options to account dialog, to allow displaying of
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17975
diff
changeset
|
2984 | prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option); |
|
4fe92c2fa5af
Add two boolean options to account dialog, to allow displaying of
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17975
diff
changeset
|
2985 | |
|
4fe92c2fa5af
Add two boolean options to account dialog, to allow displaying of
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17975
diff
changeset
|
2986 | option = purple_account_option_bool_new(_("Show headline in status text"), "show_headline", TRUE); |
|
4fe92c2fa5af
Add two boolean options to account dialog, to allow displaying of
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17975
diff
changeset
|
2987 | prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option); |
|
17900
402fdc925e30
Clean up a few TODO's.
Jeff Connelly <jeff2@soc.pidgin.im>
parents:
17898
diff
changeset
|
2988 | } |
| 16322 | 2989 | |
| 16324 | 2990 | PURPLE_INIT_PLUGIN(myspace, init_plugin, info); |