Wed, 07 May 2008 18:10:43 +0000
Leak fix
| 7014 | 1 | /* |
| 15884 | 2 | * purple - Jabber Protocol Plugin |
| 7014 | 3 | * |
| 4 | * Copyright (C) 2003, Nathan Walp <faceprint@faceprint.com> | |
| 5 | * | |
| 6 | * This program is free software; you can redistribute it and/or modify | |
| 7 | * it under the terms of the GNU General Public License as published by | |
| 8 | * the Free Software Foundation; either version 2 of the License, or | |
| 9 | * (at your option) any later version. | |
| 10 | * | |
| 11 | * This program is distributed in the hope that it will be useful, | |
| 12 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 13 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
| 14 | * GNU General Public License for more details. | |
| 15 | * | |
| 16 | * You should have received a copy of the GNU General Public License | |
| 17 | * along with this program; if not, write to the Free Software | |
|
19859
71d37b57eff2
The FSF changed its address a while ago; our files were out of date.
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
18315
diff
changeset
|
18 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA |
| 7014 | 19 | * |
| 20 | */ | |
| 21 | #include "internal.h" | |
|
10684
0325b164a7eb
[gaim-migrate @ 12231]
Luke Schierer <lschiere@pidgin.im>
parents:
10662
diff
changeset
|
22 | #include "cipher.h" |
| 7014 | 23 | #include "debug.h" |
| 7076 | 24 | #include "imgstore.h" |
|
9713
bb37562302a1
[gaim-migrate @ 10574]
Mark Doliner <markdoliner@pidgin.im>
parents:
9466
diff
changeset
|
25 | #include "prpl.h" |
| 7014 | 26 | #include "notify.h" |
| 27 | #include "request.h" | |
| 28 | #include "util.h" | |
| 7395 | 29 | #include "xmlnode.h" |
| 7014 | 30 | |
| 31 | #include "buddy.h" | |
| 32 | #include "chat.h" | |
| 33 | #include "jabber.h" | |
| 34 | #include "iq.h" | |
| 35 | #include "presence.h" | |
| 11675 | 36 | #include "xdata.h" |
|
17787
439329d20337
Added support for setting the avatar via XEP-0084. Receiving other people's avatar is up next.
Andreas Monitzer <am@adiumx.com>
parents:
17770
diff
changeset
|
37 | #include "pep.h" |
|
17816
1b7362b4a7a2
Implemented ad-hoc commands for the buddy action menu (untested), implemented the receiving end of XEP-0115: Entity Capabilities. Note that this seems not to be reliable right now, since some clients seem to have a very broken [read: completely non-functional] implementation (most notably Gajim and the py-transports).
Andreas Monitzer <am@adiumx.com>
parents:
17808
diff
changeset
|
38 | #include "adhoccommands.h" |
| 7014 | 39 | |
| 13794 | 40 | typedef struct { |
| 41 | long idle_seconds; | |
| 42 | } JabberBuddyInfoResource; | |
| 43 | ||
| 44 | typedef struct { | |
| 45 | JabberStream *js; | |
| 46 | JabberBuddy *jb; | |
| 47 | char *jid; | |
| 48 | GSList *ids; | |
| 49 | GHashTable *resources; | |
| 50 | int timeout_handle; | |
| 51 | char *vcard_text; | |
| 52 | GSList *vcard_imgids; | |
| 53 | } JabberBuddyInfo; | |
| 54 | ||
| 7116 | 55 | void jabber_buddy_free(JabberBuddy *jb) |
| 56 | { | |
| 57 | g_return_if_fail(jb != NULL); | |
| 58 | ||
|
22942
2bf494f8e2a4
Change the string "screen name" to "username" everywhere. I think most
Mark Doliner <markdoliner@pidgin.im>
parents:
22928
diff
changeset
|
59 | g_free(jb->error_msg); |
| 7116 | 60 | while(jb->resources) |
| 61 | jabber_buddy_resource_free(jb->resources->data); | |
| 62 | ||
| 63 | g_free(jb); | |
| 64 | } | |
| 65 | ||
| 7014 | 66 | JabberBuddy *jabber_buddy_find(JabberStream *js, const char *name, |
| 67 | gboolean create) | |
| 68 | { | |
| 69 | JabberBuddy *jb; | |
| 7445 | 70 | const char *realname; |
| 7014 | 71 | |
|
15143
37451143f5c4
[gaim-migrate @ 17867]
Mark Doliner <markdoliner@pidgin.im>
parents:
15092
diff
changeset
|
72 | if (js->buddies == NULL) |
|
37451143f5c4
[gaim-migrate @ 17867]
Mark Doliner <markdoliner@pidgin.im>
parents:
15092
diff
changeset
|
73 | return NULL; |
|
37451143f5c4
[gaim-migrate @ 17867]
Mark Doliner <markdoliner@pidgin.im>
parents:
15092
diff
changeset
|
74 | |
| 7445 | 75 | if(!(realname = jabber_normalize(js->gc->account, name))) |
| 7014 | 76 | return NULL; |
| 77 | ||
| 78 | jb = g_hash_table_lookup(js->buddies, realname); | |
| 79 | ||
| 80 | if(!jb && create) { | |
| 81 | jb = g_new0(JabberBuddy, 1); | |
| 82 | g_hash_table_insert(js->buddies, g_strdup(realname), jb); | |
| 83 | } | |
| 84 | ||
| 85 | return jb; | |
| 86 | } | |
| 87 | ||
| 88 | ||
| 89 | JabberBuddyResource *jabber_buddy_find_resource(JabberBuddy *jb, | |
| 90 | const char *resource) | |
| 91 | { | |
| 92 | JabberBuddyResource *jbr = NULL; | |
| 93 | GList *l; | |
| 94 | ||
| 95 | if(!jb) | |
| 96 | return NULL; | |
| 97 | ||
| 98 | for(l = jb->resources; l; l = l->next) | |
| 99 | { | |
| 100 | if(!jbr && !resource) { | |
| 101 | jbr = l->data; | |
| 102 | } else if(!resource) { | |
|
22550
bbfe56f7ad40
Prefer more available resources to less available ones when priorities are the same. Fixes #5079.
Evan Schoenberg <evands@pidgin.im>
parents:
22425
diff
changeset
|
103 | if(((JabberBuddyResource *)l->data)->priority > jbr->priority) |
| 7014 | 104 | jbr = l->data; |
|
22550
bbfe56f7ad40
Prefer more available resources to less available ones when priorities are the same. Fixes #5079.
Evan Schoenberg <evands@pidgin.im>
parents:
22425
diff
changeset
|
105 | else if(((JabberBuddyResource *)l->data)->priority == jbr->priority) { |
|
bbfe56f7ad40
Prefer more available resources to less available ones when priorities are the same. Fixes #5079.
Evan Schoenberg <evands@pidgin.im>
parents:
22425
diff
changeset
|
106 | /* Determine if this resource is more available than the one we've currently chosen */ |
|
bbfe56f7ad40
Prefer more available resources to less available ones when priorities are the same. Fixes #5079.
Evan Schoenberg <evands@pidgin.im>
parents:
22425
diff
changeset
|
107 | switch(((JabberBuddyResource *)l->data)->state) { |
|
bbfe56f7ad40
Prefer more available resources to less available ones when priorities are the same. Fixes #5079.
Evan Schoenberg <evands@pidgin.im>
parents:
22425
diff
changeset
|
108 | case JABBER_BUDDY_STATE_ONLINE: |
|
bbfe56f7ad40
Prefer more available resources to less available ones when priorities are the same. Fixes #5079.
Evan Schoenberg <evands@pidgin.im>
parents:
22425
diff
changeset
|
109 | case JABBER_BUDDY_STATE_CHAT: |
|
bbfe56f7ad40
Prefer more available resources to less available ones when priorities are the same. Fixes #5079.
Evan Schoenberg <evands@pidgin.im>
parents:
22425
diff
changeset
|
110 | /* This resource is online/chatty. Prefer to one which isn't either. */ |
|
bbfe56f7ad40
Prefer more available resources to less available ones when priorities are the same. Fixes #5079.
Evan Schoenberg <evands@pidgin.im>
parents:
22425
diff
changeset
|
111 | if ((jbr->state != JABBER_BUDDY_STATE_ONLINE) && (jbr->state != JABBER_BUDDY_STATE_CHAT)) |
|
bbfe56f7ad40
Prefer more available resources to less available ones when priorities are the same. Fixes #5079.
Evan Schoenberg <evands@pidgin.im>
parents:
22425
diff
changeset
|
112 | jbr = l->data; |
|
bbfe56f7ad40
Prefer more available resources to less available ones when priorities are the same. Fixes #5079.
Evan Schoenberg <evands@pidgin.im>
parents:
22425
diff
changeset
|
113 | break; |
|
bbfe56f7ad40
Prefer more available resources to less available ones when priorities are the same. Fixes #5079.
Evan Schoenberg <evands@pidgin.im>
parents:
22425
diff
changeset
|
114 | case JABBER_BUDDY_STATE_AWAY: |
|
bbfe56f7ad40
Prefer more available resources to less available ones when priorities are the same. Fixes #5079.
Evan Schoenberg <evands@pidgin.im>
parents:
22425
diff
changeset
|
115 | case JABBER_BUDDY_STATE_DND: |
|
bbfe56f7ad40
Prefer more available resources to less available ones when priorities are the same. Fixes #5079.
Evan Schoenberg <evands@pidgin.im>
parents:
22425
diff
changeset
|
116 | case JABBER_BUDDY_STATE_UNAVAILABLE: |
|
bbfe56f7ad40
Prefer more available resources to less available ones when priorities are the same. Fixes #5079.
Evan Schoenberg <evands@pidgin.im>
parents:
22425
diff
changeset
|
117 | /* This resource is away/dnd/unavailable. Prefer to one which is extended away or unknown. */ |
|
bbfe56f7ad40
Prefer more available resources to less available ones when priorities are the same. Fixes #5079.
Evan Schoenberg <evands@pidgin.im>
parents:
22425
diff
changeset
|
118 | if ((jbr->state == JABBER_BUDDY_STATE_XA) || |
|
bbfe56f7ad40
Prefer more available resources to less available ones when priorities are the same. Fixes #5079.
Evan Schoenberg <evands@pidgin.im>
parents:
22425
diff
changeset
|
119 | (jbr->state == JABBER_BUDDY_STATE_UNKNOWN) || (jbr->state == JABBER_BUDDY_STATE_ERROR)) |
|
bbfe56f7ad40
Prefer more available resources to less available ones when priorities are the same. Fixes #5079.
Evan Schoenberg <evands@pidgin.im>
parents:
22425
diff
changeset
|
120 | jbr = l->data; |
|
bbfe56f7ad40
Prefer more available resources to less available ones when priorities are the same. Fixes #5079.
Evan Schoenberg <evands@pidgin.im>
parents:
22425
diff
changeset
|
121 | break; |
|
bbfe56f7ad40
Prefer more available resources to less available ones when priorities are the same. Fixes #5079.
Evan Schoenberg <evands@pidgin.im>
parents:
22425
diff
changeset
|
122 | case JABBER_BUDDY_STATE_XA: |
|
bbfe56f7ad40
Prefer more available resources to less available ones when priorities are the same. Fixes #5079.
Evan Schoenberg <evands@pidgin.im>
parents:
22425
diff
changeset
|
123 | /* This resource is extended away. That's better than unknown. */ |
|
bbfe56f7ad40
Prefer more available resources to less available ones when priorities are the same. Fixes #5079.
Evan Schoenberg <evands@pidgin.im>
parents:
22425
diff
changeset
|
124 | if ((jbr->state == JABBER_BUDDY_STATE_UNKNOWN) || (jbr->state == JABBER_BUDDY_STATE_ERROR)) |
|
bbfe56f7ad40
Prefer more available resources to less available ones when priorities are the same. Fixes #5079.
Evan Schoenberg <evands@pidgin.im>
parents:
22425
diff
changeset
|
125 | jbr = l->data; |
|
bbfe56f7ad40
Prefer more available resources to less available ones when priorities are the same. Fixes #5079.
Evan Schoenberg <evands@pidgin.im>
parents:
22425
diff
changeset
|
126 | break; |
|
bbfe56f7ad40
Prefer more available resources to less available ones when priorities are the same. Fixes #5079.
Evan Schoenberg <evands@pidgin.im>
parents:
22425
diff
changeset
|
127 | case JABBER_BUDDY_STATE_UNKNOWN: |
|
bbfe56f7ad40
Prefer more available resources to less available ones when priorities are the same. Fixes #5079.
Evan Schoenberg <evands@pidgin.im>
parents:
22425
diff
changeset
|
128 | case JABBER_BUDDY_STATE_ERROR: |
|
bbfe56f7ad40
Prefer more available resources to less available ones when priorities are the same. Fixes #5079.
Evan Schoenberg <evands@pidgin.im>
parents:
22425
diff
changeset
|
129 | /* These are never preferable. */ |
|
bbfe56f7ad40
Prefer more available resources to less available ones when priorities are the same. Fixes #5079.
Evan Schoenberg <evands@pidgin.im>
parents:
22425
diff
changeset
|
130 | break; |
|
bbfe56f7ad40
Prefer more available resources to less available ones when priorities are the same. Fixes #5079.
Evan Schoenberg <evands@pidgin.im>
parents:
22425
diff
changeset
|
131 | } |
|
bbfe56f7ad40
Prefer more available resources to less available ones when priorities are the same. Fixes #5079.
Evan Schoenberg <evands@pidgin.im>
parents:
22425
diff
changeset
|
132 | } |
| 7014 | 133 | } else if(((JabberBuddyResource *)l->data)->name) { |
| 134 | if(!strcmp(((JabberBuddyResource *)l->data)->name, resource)) { | |
| 135 | jbr = l->data; | |
| 136 | break; | |
| 137 | } | |
| 138 | } | |
| 139 | } | |
| 140 | ||
| 141 | return jbr; | |
| 142 | } | |
| 143 | ||
| 9954 | 144 | JabberBuddyResource *jabber_buddy_track_resource(JabberBuddy *jb, const char *resource, |
| 145 | int priority, JabberBuddyState state, const char *status) | |
| 7014 | 146 | { |
| 147 | JabberBuddyResource *jbr = jabber_buddy_find_resource(jb, resource); | |
| 148 | if(!jbr) { | |
| 149 | jbr = g_new0(JabberBuddyResource, 1); | |
| 7116 | 150 | jbr->jb = jb; |
| 7014 | 151 | jbr->name = g_strdup(resource); |
| 152 | jbr->capabilities = JABBER_CAP_XHTML; | |
| 153 | jb->resources = g_list_append(jb->resources, jbr); | |
| 154 | } | |
| 155 | jbr->priority = priority; | |
| 156 | jbr->state = state; | |
| 22928 | 157 | g_free(jbr->status); |
| 158 | jbr->status = status != NULL ? g_markup_escape_text(status, -1) : NULL; | |
| 9954 | 159 | |
| 160 | return jbr; | |
| 7014 | 161 | } |
| 162 | ||
| 7116 | 163 | void jabber_buddy_resource_free(JabberBuddyResource *jbr) |
| 164 | { | |
| 165 | g_return_if_fail(jbr != NULL); | |
| 166 | ||
| 167 | jbr->jb->resources = g_list_remove(jbr->jb->resources, jbr); | |
|
17816
1b7362b4a7a2
Implemented ad-hoc commands for the buddy action menu (untested), implemented the receiving end of XEP-0115: Entity Capabilities. Note that this seems not to be reliable right now, since some clients seem to have a very broken [read: completely non-functional] implementation (most notably Gajim and the py-transports).
Andreas Monitzer <am@adiumx.com>
parents:
17808
diff
changeset
|
168 | |
|
1b7362b4a7a2
Implemented ad-hoc commands for the buddy action menu (untested), implemented the receiving end of XEP-0115: Entity Capabilities. Note that this seems not to be reliable right now, since some clients seem to have a very broken [read: completely non-functional] implementation (most notably Gajim and the py-transports).
Andreas Monitzer <am@adiumx.com>
parents:
17808
diff
changeset
|
169 | while(jbr->commands) { |
|
1b7362b4a7a2
Implemented ad-hoc commands for the buddy action menu (untested), implemented the receiving end of XEP-0115: Entity Capabilities. Note that this seems not to be reliable right now, since some clients seem to have a very broken [read: completely non-functional] implementation (most notably Gajim and the py-transports).
Andreas Monitzer <am@adiumx.com>
parents:
17808
diff
changeset
|
170 | JabberAdHocCommands *cmd = jbr->commands->data; |
|
1b7362b4a7a2
Implemented ad-hoc commands for the buddy action menu (untested), implemented the receiving end of XEP-0115: Entity Capabilities. Note that this seems not to be reliable right now, since some clients seem to have a very broken [read: completely non-functional] implementation (most notably Gajim and the py-transports).
Andreas Monitzer <am@adiumx.com>
parents:
17808
diff
changeset
|
171 | g_free(cmd->jid); |
|
1b7362b4a7a2
Implemented ad-hoc commands for the buddy action menu (untested), implemented the receiving end of XEP-0115: Entity Capabilities. Note that this seems not to be reliable right now, since some clients seem to have a very broken [read: completely non-functional] implementation (most notably Gajim and the py-transports).
Andreas Monitzer <am@adiumx.com>
parents:
17808
diff
changeset
|
172 | g_free(cmd->node); |
|
1b7362b4a7a2
Implemented ad-hoc commands for the buddy action menu (untested), implemented the receiving end of XEP-0115: Entity Capabilities. Note that this seems not to be reliable right now, since some clients seem to have a very broken [read: completely non-functional] implementation (most notably Gajim and the py-transports).
Andreas Monitzer <am@adiumx.com>
parents:
17808
diff
changeset
|
173 | g_free(cmd->name); |
|
1b7362b4a7a2
Implemented ad-hoc commands for the buddy action menu (untested), implemented the receiving end of XEP-0115: Entity Capabilities. Note that this seems not to be reliable right now, since some clients seem to have a very broken [read: completely non-functional] implementation (most notably Gajim and the py-transports).
Andreas Monitzer <am@adiumx.com>
parents:
17808
diff
changeset
|
174 | g_free(cmd); |
|
1b7362b4a7a2
Implemented ad-hoc commands for the buddy action menu (untested), implemented the receiving end of XEP-0115: Entity Capabilities. Note that this seems not to be reliable right now, since some clients seem to have a very broken [read: completely non-functional] implementation (most notably Gajim and the py-transports).
Andreas Monitzer <am@adiumx.com>
parents:
17808
diff
changeset
|
175 | jbr->commands = g_list_delete_link(jbr->commands, jbr->commands); |
|
1b7362b4a7a2
Implemented ad-hoc commands for the buddy action menu (untested), implemented the receiving end of XEP-0115: Entity Capabilities. Note that this seems not to be reliable right now, since some clients seem to have a very broken [read: completely non-functional] implementation (most notably Gajim and the py-transports).
Andreas Monitzer <am@adiumx.com>
parents:
17808
diff
changeset
|
176 | } |
|
1b7362b4a7a2
Implemented ad-hoc commands for the buddy action menu (untested), implemented the receiving end of XEP-0115: Entity Capabilities. Note that this seems not to be reliable right now, since some clients seem to have a very broken [read: completely non-functional] implementation (most notably Gajim and the py-transports).
Andreas Monitzer <am@adiumx.com>
parents:
17808
diff
changeset
|
177 | |
|
1b7362b4a7a2
Implemented ad-hoc commands for the buddy action menu (untested), implemented the receiving end of XEP-0115: Entity Capabilities. Note that this seems not to be reliable right now, since some clients seem to have a very broken [read: completely non-functional] implementation (most notably Gajim and the py-transports).
Andreas Monitzer <am@adiumx.com>
parents:
17808
diff
changeset
|
178 | jabber_caps_free_clientinfo(jbr->caps); |
| 7116 | 179 | |
| 180 | g_free(jbr->name); | |
| 13794 | 181 | g_free(jbr->status); |
| 182 | g_free(jbr->thread_id); | |
| 183 | g_free(jbr->client.name); | |
| 184 | g_free(jbr->client.version); | |
| 185 | g_free(jbr->client.os); | |
| 7116 | 186 | g_free(jbr); |
| 187 | } | |
| 188 | ||
| 7014 | 189 | void jabber_buddy_remove_resource(JabberBuddy *jb, const char *resource) |
| 190 | { | |
| 191 | JabberBuddyResource *jbr = jabber_buddy_find_resource(jb, resource); | |
| 192 | ||
| 193 | if(!jbr) | |
| 194 | return; | |
| 195 | ||
| 7116 | 196 | jabber_buddy_resource_free(jbr); |
| 7014 | 197 | } |
| 198 | ||
| 199 | const char *jabber_buddy_get_status_msg(JabberBuddy *jb) | |
| 200 | { | |
| 201 | JabberBuddyResource *jbr; | |
| 202 | ||
| 203 | if(!jb) | |
| 204 | return NULL; | |
| 205 | ||
| 206 | jbr = jabber_buddy_find_resource(jb, NULL); | |
| 207 | ||
| 208 | if(!jbr) | |
| 209 | return NULL; | |
| 210 | ||
| 211 | return jbr->status; | |
| 212 | } | |
| 213 | ||
| 214 | /******* | |
| 215 | * This is the old vCard stuff taken from the old prpl. vCards, by definition | |
| 216 | * are a temporary thing until jabber can get its act together and come up | |
| 217 | * with a format for user information, hence the namespace of 'vcard-temp' | |
| 218 | * | |
| 219 | * Since I don't feel like putting that much work into something that's | |
| 220 | * _supposed_ to go away, i'm going to just copy the kludgy old code here, | |
| 221 | * and make it purdy when jabber comes up with a standards-track JEP to | |
| 222 | * replace vcard-temp | |
| 223 | * --Nathan | |
| 224 | *******/ | |
| 225 | ||
| 226 | /*---------------------------------------*/ | |
| 227 | /* Jabber "set info" (vCard) support */ | |
| 228 | /*---------------------------------------*/ | |
| 229 | ||
| 230 | /* | |
| 231 | * V-Card format: | |
| 232 | * | |
| 233 | * <vCard prodid='' version='' xmlns=''> | |
| 234 | * <FN></FN> | |
| 235 | * <N> | |
| 236 | * <FAMILY/> | |
| 237 | * <GIVEN/> | |
| 238 | * </N> | |
| 239 | * <NICKNAME/> | |
| 240 | * <URL/> | |
| 241 | * <ADR> | |
| 242 | * <STREET/> | |
| 243 | * <EXTADD/> | |
| 244 | * <LOCALITY/> | |
| 245 | * <REGION/> | |
| 246 | * <PCODE/> | |
| 247 | * <COUNTRY/> | |
| 248 | * </ADR> | |
| 249 | * <TEL/> | |
| 250 | * <EMAIL/> | |
| 251 | * <ORG> | |
| 252 | * <ORGNAME/> | |
| 253 | * <ORGUNIT/> | |
| 254 | * </ORG> | |
| 255 | * <TITLE/> | |
| 256 | * <ROLE/> | |
| 257 | * <DESC/> | |
| 258 | * <BDAY/> | |
| 259 | * </vCard> | |
| 260 | * | |
| 261 | * See also: | |
| 262 | * | |
| 263 | * http://docs.jabber.org/proto/html/vcard-temp.html | |
| 264 | * http://www.vcard-xml.org/dtd/vCard-XML-v2-20010520.dtd | |
| 265 | */ | |
| 266 | ||
| 267 | /* | |
| 268 | * Cross-reference user-friendly V-Card entry labels to vCard XML tags | |
| 269 | * and attributes. | |
| 270 | * | |
| 271 | * Order is (or should be) unimportant. For example: we have no way of | |
| 272 | * knowing in what order real data will arrive. | |
| 273 | * | |
| 274 | * Format: Label, Pre-set text, "visible" flag, "editable" flag, XML tag | |
| 275 | * name, XML tag's parent tag "path" (relative to vCard node). | |
| 276 | * | |
| 277 | * List is terminated by a NULL label pointer. | |
| 278 | * | |
| 279 | * Entries with no label text, but with XML tag and parent tag | |
| 280 | * entries, are used by V-Card XML construction routines to | |
| 281 | * "automagically" construct the appropriate XML node tree. | |
| 282 | * | |
| 283 | * Thoughts on future direction/expansion | |
| 284 | * | |
| 285 | * This is a "simple" vCard. | |
| 286 | * | |
| 287 | * It is possible for nodes other than the "vCard" node to have | |
| 288 | * attributes. Should that prove necessary/desirable, add an | |
| 289 | * "attributes" pointer to the vcard_template struct, create the | |
| 290 | * necessary tag_attr structs, and add 'em to the vcard_dflt_data | |
| 291 | * array. | |
| 292 | * | |
| 293 | * The above changes will (obviously) require changes to the vCard | |
| 294 | * construction routines. | |
| 295 | */ | |
| 296 | ||
| 297 | struct vcard_template { | |
| 298 | char *label; /* label text pointer */ | |
| 299 | char *text; /* entry text pointer */ | |
| 300 | int visible; /* should entry field be "visible?" */ | |
| 301 | int editable; /* should entry field be editable? */ | |
| 302 | char *tag; /* tag text */ | |
| 303 | char *ptag; /* parent tag "path" text */ | |
| 304 | char *url; /* vCard display format if URL */ | |
|
21091
07fe1a99c47b
Patch from Andrew Gaul to constify a bunch of static variables to reduce
Ka-Hing Cheung <khc@pidgin.im>
parents:
20169
diff
changeset
|
305 | } const vcard_template_data[] = { |
| 7014 | 306 | {N_("Full Name"), NULL, TRUE, TRUE, "FN", NULL, NULL}, |
| 307 | {N_("Family Name"), NULL, TRUE, TRUE, "FAMILY", "N", NULL}, | |
| 308 | {N_("Given Name"), NULL, TRUE, TRUE, "GIVEN", "N", NULL}, | |
| 309 | {N_("Nickname"), NULL, TRUE, TRUE, "NICKNAME", NULL, NULL}, | |
| 310 | {N_("URL"), NULL, TRUE, TRUE, "URL", NULL, "<A HREF=\"%s\">%s</A>"}, | |
| 311 | {N_("Street Address"), NULL, TRUE, TRUE, "STREET", "ADR", NULL}, | |
| 312 | {N_("Extended Address"), NULL, TRUE, TRUE, "EXTADD", "ADR", NULL}, | |
| 313 | {N_("Locality"), NULL, TRUE, TRUE, "LOCALITY", "ADR", NULL}, | |
| 314 | {N_("Region"), NULL, TRUE, TRUE, "REGION", "ADR", NULL}, | |
| 315 | {N_("Postal Code"), NULL, TRUE, TRUE, "PCODE", "ADR", NULL}, | |
| 13332 | 316 | {N_("Country"), NULL, TRUE, TRUE, "CTRY", "ADR", NULL}, |
| 11361 | 317 | {N_("Telephone"), NULL, TRUE, TRUE, "NUMBER", "TEL", NULL}, |
|
13546
0700f0c29e14
[gaim-migrate @ 15922]
Richard Laager <rlaager@pidgin.im>
parents:
13345
diff
changeset
|
318 | {N_("E-Mail"), NULL, TRUE, TRUE, "USERID", "EMAIL", "<A HREF=\"mailto:%s\">%s</A>"}, |
| 7014 | 319 | {N_("Organization Name"), NULL, TRUE, TRUE, "ORGNAME", "ORG", NULL}, |
| 320 | {N_("Organization Unit"), NULL, TRUE, TRUE, "ORGUNIT", "ORG", NULL}, | |
| 321 | {N_("Title"), NULL, TRUE, TRUE, "TITLE", NULL, NULL}, | |
| 322 | {N_("Role"), NULL, TRUE, TRUE, "ROLE", NULL, NULL}, | |
| 323 | {N_("Birthday"), NULL, TRUE, TRUE, "BDAY", NULL, NULL}, | |
| 324 | {N_("Description"), NULL, TRUE, TRUE, "DESC", NULL, NULL}, | |
| 325 | {"", NULL, TRUE, TRUE, "N", NULL, NULL}, | |
| 326 | {"", NULL, TRUE, TRUE, "ADR", NULL, NULL}, | |
| 327 | {"", NULL, TRUE, TRUE, "ORG", NULL, NULL}, | |
| 328 | {NULL, NULL, 0, 0, NULL, NULL, NULL} | |
| 329 | }; | |
| 330 | ||
| 331 | /* | |
|
8735
01248ea222d3
[gaim-migrate @ 9490]
Jonathan Champ <royanee@users.sourceforge.net>
parents:
8401
diff
changeset
|
332 | * The "vCard" tag's attribute list... |
| 7014 | 333 | */ |
| 334 | struct tag_attr { | |
| 335 | char *attr; | |
| 336 | char *value; | |
|
21091
07fe1a99c47b
Patch from Andrew Gaul to constify a bunch of static variables to reduce
Ka-Hing Cheung <khc@pidgin.im>
parents:
20169
diff
changeset
|
337 | } const vcard_tag_attr_list[] = { |
| 7014 | 338 | {"prodid", "-//HandGen//NONSGML vGen v1.0//EN"}, |
| 339 | {"version", "2.0", }, | |
| 340 | {"xmlns", "vcard-temp", }, | |
| 341 | {NULL, NULL}, | |
| 342 | }; | |
| 343 | ||
| 344 | ||
| 345 | /* | |
| 346 | * Insert a tag node into an xmlnode tree, recursively inserting parent tag | |
| 347 | * nodes as necessary | |
| 348 | * | |
| 349 | * Returns pointer to inserted node | |
| 350 | * | |
| 351 | * Note to hackers: this code is designed to be re-entrant (it's recursive--it | |
| 352 | * calls itself), so don't put any "static"s in here! | |
| 353 | */ | |
| 354 | static xmlnode *insert_tag_to_parent_tag(xmlnode *start, const char *parent_tag, const char *new_tag) | |
| 355 | { | |
| 356 | xmlnode *x = NULL; | |
| 357 | ||
| 358 | /* | |
| 359 | * If the parent tag wasn't specified, see if we can get it | |
| 360 | * from the vCard template struct. | |
| 361 | */ | |
| 362 | if(parent_tag == NULL) { | |
|
21091
07fe1a99c47b
Patch from Andrew Gaul to constify a bunch of static variables to reduce
Ka-Hing Cheung <khc@pidgin.im>
parents:
20169
diff
changeset
|
363 | const struct vcard_template *vc_tp = vcard_template_data; |
| 7014 | 364 | |
| 365 | while(vc_tp->label != NULL) { | |
| 366 | if(strcmp(vc_tp->tag, new_tag) == 0) { | |
| 367 | parent_tag = vc_tp->ptag; | |
| 368 | break; | |
| 369 | } | |
| 370 | ++vc_tp; | |
| 371 | } | |
| 372 | } | |
| 373 | ||
| 374 | /* | |
| 375 | * If we have a parent tag... | |
| 376 | */ | |
| 377 | if(parent_tag != NULL ) { | |
| 378 | /* | |
| 379 | * Try to get the parent node for a tag | |
| 380 | */ | |
| 381 | if((x = xmlnode_get_child(start, parent_tag)) == NULL) { | |
| 382 | /* | |
| 383 | * Descend? | |
| 384 | */ | |
| 385 | char *grand_parent = g_strdup(parent_tag); | |
| 386 | char *parent; | |
| 387 | ||
| 388 | if((parent = strrchr(grand_parent, '/')) != NULL) { | |
| 389 | *(parent++) = '\0'; | |
| 390 | x = insert_tag_to_parent_tag(start, grand_parent, parent); | |
| 391 | } else { | |
| 392 | x = xmlnode_new_child(start, grand_parent); | |
| 393 | } | |
| 394 | g_free(grand_parent); | |
| 395 | } else { | |
| 396 | /* | |
| 397 | * We found *something* to be the parent node. | |
| 398 | * Note: may be the "root" node! | |
| 399 | */ | |
| 400 | xmlnode *y; | |
| 401 | if((y = xmlnode_get_child(x, new_tag)) != NULL) { | |
| 402 | return(y); | |
| 403 | } | |
| 404 | } | |
| 405 | } | |
| 406 | ||
| 407 | /* | |
| 408 | * insert the new tag into its parent node | |
| 409 | */ | |
| 410 | return(xmlnode_new_child((x == NULL? start : x), new_tag)); | |
| 411 | } | |
| 412 | ||
| 413 | /* | |
| 414 | * Send vCard info to Jabber server | |
| 415 | */ | |
| 15884 | 416 | void jabber_set_info(PurpleConnection *gc, const char *info) |
| 7014 | 417 | { |
|
22425
42142a0938a2
Fix setting vCard buddy icons when we don't have any other user info set.
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
21957
diff
changeset
|
418 | PurpleStoredImage *img; |
| 7014 | 419 | JabberIq *iq; |
| 420 | JabberStream *js = gc->proto_data; | |
| 421 | xmlnode *vc_node; | |
|
21091
07fe1a99c47b
Patch from Andrew Gaul to constify a bunch of static variables to reduce
Ka-Hing Cheung <khc@pidgin.im>
parents:
20169
diff
changeset
|
422 | const struct tag_attr *tag_attr; |
| 7014 | 423 | |
|
18235
60a9bd99f035
server-side jabber vcards now take precedence over local vcards, so
Nathan Walp <nwalp@pidgin.im>
parents:
18196
diff
changeset
|
424 | /* if we have't grabbed the remote vcard yet, we can't |
|
60a9bd99f035
server-side jabber vcards now take precedence over local vcards, so
Nathan Walp <nwalp@pidgin.im>
parents:
18196
diff
changeset
|
425 | * assume that what we have here is correct */ |
|
60a9bd99f035
server-side jabber vcards now take precedence over local vcards, so
Nathan Walp <nwalp@pidgin.im>
parents:
18196
diff
changeset
|
426 | if(!js->vcard_fetched) |
|
60a9bd99f035
server-side jabber vcards now take precedence over local vcards, so
Nathan Walp <nwalp@pidgin.im>
parents:
18196
diff
changeset
|
427 | return; |
|
60a9bd99f035
server-side jabber vcards now take precedence over local vcards, so
Nathan Walp <nwalp@pidgin.im>
parents:
18196
diff
changeset
|
428 | |
|
15273
a7838f939207
[gaim-migrate @ 18001]
Mark Doliner <markdoliner@pidgin.im>
parents:
15205
diff
changeset
|
429 | g_free(js->avatar_hash); |
| 10189 | 430 | js->avatar_hash = NULL; |
| 7014 | 431 | |
| 432 | /* | |
| 433 | * Send only if there's actually any *information* to send | |
| 434 | */ | |
| 11388 | 435 | vc_node = info ? xmlnode_from_str(info, -1) : NULL; |
| 10189 | 436 | |
|
22425
42142a0938a2
Fix setting vCard buddy icons when we don't have any other user info set.
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
21957
diff
changeset
|
437 | if (vc_node && (!vc_node->name || |
|
42142a0938a2
Fix setting vCard buddy icons when we don't have any other user info set.
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
21957
diff
changeset
|
438 | g_ascii_strncasecmp(vc_node->name, "vCard", 5))) { |
|
42142a0938a2
Fix setting vCard buddy icons when we don't have any other user info set.
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
21957
diff
changeset
|
439 | xmlnode_free(vc_node); |
|
42142a0938a2
Fix setting vCard buddy icons when we don't have any other user info set.
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
21957
diff
changeset
|
440 | vc_node = NULL; |
| 10189 | 441 | } |
| 7014 | 442 | |
|
22425
42142a0938a2
Fix setting vCard buddy icons when we don't have any other user info set.
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
21957
diff
changeset
|
443 | if ((img = purple_buddy_icons_find_account_icon(gc->account))) { |
|
42142a0938a2
Fix setting vCard buddy icons when we don't have any other user info set.
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
21957
diff
changeset
|
444 | gconstpointer avatar_data; |
|
42142a0938a2
Fix setting vCard buddy icons when we don't have any other user info set.
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
21957
diff
changeset
|
445 | gsize avatar_len; |
|
42142a0938a2
Fix setting vCard buddy icons when we don't have any other user info set.
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
21957
diff
changeset
|
446 | xmlnode *photo, *binval, *type; |
|
42142a0938a2
Fix setting vCard buddy icons when we don't have any other user info set.
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
21957
diff
changeset
|
447 | gchar *enc; |
|
42142a0938a2
Fix setting vCard buddy icons when we don't have any other user info set.
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
21957
diff
changeset
|
448 | int i; |
|
42142a0938a2
Fix setting vCard buddy icons when we don't have any other user info set.
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
21957
diff
changeset
|
449 | unsigned char hashval[20]; |
|
42142a0938a2
Fix setting vCard buddy icons when we don't have any other user info set.
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
21957
diff
changeset
|
450 | char *p, hash[41]; |
| 10189 | 451 | |
|
22425
42142a0938a2
Fix setting vCard buddy icons when we don't have any other user info set.
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
21957
diff
changeset
|
452 | if(!vc_node) { |
|
42142a0938a2
Fix setting vCard buddy icons when we don't have any other user info set.
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
21957
diff
changeset
|
453 | vc_node = xmlnode_new("vCard"); |
|
42142a0938a2
Fix setting vCard buddy icons when we don't have any other user info set.
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
21957
diff
changeset
|
454 | for(tag_attr = vcard_tag_attr_list; tag_attr->attr != NULL; ++tag_attr) |
|
42142a0938a2
Fix setting vCard buddy icons when we don't have any other user info set.
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
21957
diff
changeset
|
455 | xmlnode_set_attrib(vc_node, tag_attr->attr, tag_attr->value); |
|
15273
a7838f939207
[gaim-migrate @ 18001]
Mark Doliner <markdoliner@pidgin.im>
parents:
15205
diff
changeset
|
456 | } |
| 10189 | 457 | |
|
22425
42142a0938a2
Fix setting vCard buddy icons when we don't have any other user info set.
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
21957
diff
changeset
|
458 | avatar_data = purple_imgstore_get_data(img); |
|
42142a0938a2
Fix setting vCard buddy icons when we don't have any other user info set.
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
21957
diff
changeset
|
459 | avatar_len = purple_imgstore_get_size(img); |
|
42142a0938a2
Fix setting vCard buddy icons when we don't have any other user info set.
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
21957
diff
changeset
|
460 | /* have to get rid of the old PHOTO if it exists */ |
|
42142a0938a2
Fix setting vCard buddy icons when we don't have any other user info set.
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
21957
diff
changeset
|
461 | if((photo = xmlnode_get_child(vc_node, "PHOTO"))) { |
|
42142a0938a2
Fix setting vCard buddy icons when we don't have any other user info set.
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
21957
diff
changeset
|
462 | xmlnode_free(photo); |
|
42142a0938a2
Fix setting vCard buddy icons when we don't have any other user info set.
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
21957
diff
changeset
|
463 | } |
|
42142a0938a2
Fix setting vCard buddy icons when we don't have any other user info set.
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
21957
diff
changeset
|
464 | photo = xmlnode_new_child(vc_node, "PHOTO"); |
|
42142a0938a2
Fix setting vCard buddy icons when we don't have any other user info set.
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
21957
diff
changeset
|
465 | type = xmlnode_new_child(photo, "TYPE"); |
|
42142a0938a2
Fix setting vCard buddy icons when we don't have any other user info set.
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
21957
diff
changeset
|
466 | xmlnode_insert_data(type, "image/png", -1); |
|
42142a0938a2
Fix setting vCard buddy icons when we don't have any other user info set.
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
21957
diff
changeset
|
467 | binval = xmlnode_new_child(photo, "BINVAL"); |
|
42142a0938a2
Fix setting vCard buddy icons when we don't have any other user info set.
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
21957
diff
changeset
|
468 | enc = purple_base64_encode(avatar_data, avatar_len); |
|
42142a0938a2
Fix setting vCard buddy icons when we don't have any other user info set.
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
21957
diff
changeset
|
469 | |
|
42142a0938a2
Fix setting vCard buddy icons when we don't have any other user info set.
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
21957
diff
changeset
|
470 | purple_cipher_digest_region("sha1", avatar_data, |
|
42142a0938a2
Fix setting vCard buddy icons when we don't have any other user info set.
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
21957
diff
changeset
|
471 | avatar_len, sizeof(hashval), |
|
42142a0938a2
Fix setting vCard buddy icons when we don't have any other user info set.
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
21957
diff
changeset
|
472 | hashval, NULL); |
|
42142a0938a2
Fix setting vCard buddy icons when we don't have any other user info set.
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
21957
diff
changeset
|
473 | |
|
42142a0938a2
Fix setting vCard buddy icons when we don't have any other user info set.
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
21957
diff
changeset
|
474 | purple_imgstore_unref(img); |
|
42142a0938a2
Fix setting vCard buddy icons when we don't have any other user info set.
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
21957
diff
changeset
|
475 | |
|
42142a0938a2
Fix setting vCard buddy icons when we don't have any other user info set.
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
21957
diff
changeset
|
476 | p = hash; |
|
42142a0938a2
Fix setting vCard buddy icons when we don't have any other user info set.
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
21957
diff
changeset
|
477 | for(i=0; i<20; i++, p+=2) |
|
42142a0938a2
Fix setting vCard buddy icons when we don't have any other user info set.
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
21957
diff
changeset
|
478 | snprintf(p, 3, "%02x", hashval[i]); |
|
42142a0938a2
Fix setting vCard buddy icons when we don't have any other user info set.
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
21957
diff
changeset
|
479 | js->avatar_hash = g_strdup(hash); |
|
42142a0938a2
Fix setting vCard buddy icons when we don't have any other user info set.
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
21957
diff
changeset
|
480 | |
|
42142a0938a2
Fix setting vCard buddy icons when we don't have any other user info set.
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
21957
diff
changeset
|
481 | xmlnode_insert_data(binval, enc, -1); |
|
42142a0938a2
Fix setting vCard buddy icons when we don't have any other user info set.
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
21957
diff
changeset
|
482 | g_free(enc); |
|
42142a0938a2
Fix setting vCard buddy icons when we don't have any other user info set.
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
21957
diff
changeset
|
483 | } |
|
42142a0938a2
Fix setting vCard buddy icons when we don't have any other user info set.
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
21957
diff
changeset
|
484 | |
|
42142a0938a2
Fix setting vCard buddy icons when we don't have any other user info set.
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
21957
diff
changeset
|
485 | if (vc_node != NULL) { |
|
15273
a7838f939207
[gaim-migrate @ 18001]
Mark Doliner <markdoliner@pidgin.im>
parents:
15205
diff
changeset
|
486 | iq = jabber_iq_new(js, JABBER_IQ_SET); |
|
a7838f939207
[gaim-migrate @ 18001]
Mark Doliner <markdoliner@pidgin.im>
parents:
15205
diff
changeset
|
487 | xmlnode_insert_child(iq->node, vc_node); |
|
a7838f939207
[gaim-migrate @ 18001]
Mark Doliner <markdoliner@pidgin.im>
parents:
15205
diff
changeset
|
488 | jabber_iq_send(iq); |
| 7014 | 489 | } |
| 490 | } | |
| 491 | ||
|
16538
c7e61e2917c9
Updates for the account buddy icon stuff. This doesn't yet work fully (and maybe not even partly), but it compiles.
Richard Laager <rlaager@pidgin.im>
parents:
16534
diff
changeset
|
492 | void jabber_set_buddy_icon(PurpleConnection *gc, PurpleStoredImage *img) |
| 10189 | 493 | { |
| 15884 | 494 | PurplePresence *gpresence; |
| 495 | PurpleStatus *status; | |
|
17787
439329d20337
Added support for setting the avatar via XEP-0084. Receiving other people's avatar is up next.
Andreas Monitzer <am@adiumx.com>
parents:
17770
diff
changeset
|
496 | |
|
439329d20337
Added support for setting the avatar via XEP-0084. Receiving other people's avatar is up next.
Andreas Monitzer <am@adiumx.com>
parents:
17770
diff
changeset
|
497 | if(((JabberStream*)gc->proto_data)->pep) { |
|
439329d20337
Added support for setting the avatar via XEP-0084. Receiving other people's avatar is up next.
Andreas Monitzer <am@adiumx.com>
parents:
17770
diff
changeset
|
498 | /* XEP-0084: User Avatars */ |
|
439329d20337
Added support for setting the avatar via XEP-0084. Receiving other people's avatar is up next.
Andreas Monitzer <am@adiumx.com>
parents:
17770
diff
changeset
|
499 | if(img) { |
|
22942
2bf494f8e2a4
Change the string "screen name" to "username" everywhere. I think most
Mark Doliner <markdoliner@pidgin.im>
parents:
22928
diff
changeset
|
500 | /* |
|
2bf494f8e2a4
Change the string "screen name" to "username" everywhere. I think most
Mark Doliner <markdoliner@pidgin.im>
parents:
22928
diff
changeset
|
501 | * TODO: This is pretty gross. The Jabber PRPL really shouldn't |
|
2bf494f8e2a4
Change the string "screen name" to "username" everywhere. I think most
Mark Doliner <markdoliner@pidgin.im>
parents:
22928
diff
changeset
|
502 | * do voodoo to try to determine the image type, height |
|
2bf494f8e2a4
Change the string "screen name" to "username" everywhere. I think most
Mark Doliner <markdoliner@pidgin.im>
parents:
22928
diff
changeset
|
503 | * and width. |
|
2bf494f8e2a4
Change the string "screen name" to "username" everywhere. I think most
Mark Doliner <markdoliner@pidgin.im>
parents:
22928
diff
changeset
|
504 | */ |
|
17787
439329d20337
Added support for setting the avatar via XEP-0084. Receiving other people's avatar is up next.
Andreas Monitzer <am@adiumx.com>
parents:
17770
diff
changeset
|
505 | /* A PNG header, including the IHDR, but nothing else */ |
|
439329d20337
Added support for setting the avatar via XEP-0084. Receiving other people's avatar is up next.
Andreas Monitzer <am@adiumx.com>
parents:
17770
diff
changeset
|
506 | const struct { |
|
439329d20337
Added support for setting the avatar via XEP-0084. Receiving other people's avatar is up next.
Andreas Monitzer <am@adiumx.com>
parents:
17770
diff
changeset
|
507 | guchar signature[8]; /* must be hex 89 50 4E 47 0D 0A 1A 0A */ |
|
439329d20337
Added support for setting the avatar via XEP-0084. Receiving other people's avatar is up next.
Andreas Monitzer <am@adiumx.com>
parents:
17770
diff
changeset
|
508 | struct { |
|
439329d20337
Added support for setting the avatar via XEP-0084. Receiving other people's avatar is up next.
Andreas Monitzer <am@adiumx.com>
parents:
17770
diff
changeset
|
509 | guint32 length; /* must be 0x0d */ |
|
439329d20337
Added support for setting the avatar via XEP-0084. Receiving other people's avatar is up next.
Andreas Monitzer <am@adiumx.com>
parents:
17770
diff
changeset
|
510 | guchar type[4]; /* must be 'I' 'H' 'D' 'R' */ |
|
439329d20337
Added support for setting the avatar via XEP-0084. Receiving other people's avatar is up next.
Andreas Monitzer <am@adiumx.com>
parents:
17770
diff
changeset
|
511 | guint32 width; |
|
439329d20337
Added support for setting the avatar via XEP-0084. Receiving other people's avatar is up next.
Andreas Monitzer <am@adiumx.com>
parents:
17770
diff
changeset
|
512 | guint32 height; |
|
439329d20337
Added support for setting the avatar via XEP-0084. Receiving other people's avatar is up next.
Andreas Monitzer <am@adiumx.com>
parents:
17770
diff
changeset
|
513 | guchar bitdepth; |
|
439329d20337
Added support for setting the avatar via XEP-0084. Receiving other people's avatar is up next.
Andreas Monitzer <am@adiumx.com>
parents:
17770
diff
changeset
|
514 | guchar colortype; |
|
439329d20337
Added support for setting the avatar via XEP-0084. Receiving other people's avatar is up next.
Andreas Monitzer <am@adiumx.com>
parents:
17770
diff
changeset
|
515 | guchar compression; |
|
439329d20337
Added support for setting the avatar via XEP-0084. Receiving other people's avatar is up next.
Andreas Monitzer <am@adiumx.com>
parents:
17770
diff
changeset
|
516 | guchar filter; |
|
439329d20337
Added support for setting the avatar via XEP-0084. Receiving other people's avatar is up next.
Andreas Monitzer <am@adiumx.com>
parents:
17770
diff
changeset
|
517 | guchar interlace; |
|
439329d20337
Added support for setting the avatar via XEP-0084. Receiving other people's avatar is up next.
Andreas Monitzer <am@adiumx.com>
parents:
17770
diff
changeset
|
518 | } ihdr; |
|
439329d20337
Added support for setting the avatar via XEP-0084. Receiving other people's avatar is up next.
Andreas Monitzer <am@adiumx.com>
parents:
17770
diff
changeset
|
519 | } *png = purple_imgstore_get_data(img); /* ATTN: this is in network byte order! */ |
| 10189 | 520 | |
|
17787
439329d20337
Added support for setting the avatar via XEP-0084. Receiving other people's avatar is up next.
Andreas Monitzer <am@adiumx.com>
parents:
17770
diff
changeset
|
521 | /* check if the data is a valid png file (well, at least to some extend) */ |
|
439329d20337
Added support for setting the avatar via XEP-0084. Receiving other people's avatar is up next.
Andreas Monitzer <am@adiumx.com>
parents:
17770
diff
changeset
|
522 | if(png->signature[0] == 0x89 && |
|
439329d20337
Added support for setting the avatar via XEP-0084. Receiving other people's avatar is up next.
Andreas Monitzer <am@adiumx.com>
parents:
17770
diff
changeset
|
523 | png->signature[1] == 0x50 && |
|
439329d20337
Added support for setting the avatar via XEP-0084. Receiving other people's avatar is up next.
Andreas Monitzer <am@adiumx.com>
parents:
17770
diff
changeset
|
524 | png->signature[2] == 0x4e && |
|
439329d20337
Added support for setting the avatar via XEP-0084. Receiving other people's avatar is up next.
Andreas Monitzer <am@adiumx.com>
parents:
17770
diff
changeset
|
525 | png->signature[3] == 0x47 && |
|
439329d20337
Added support for setting the avatar via XEP-0084. Receiving other people's avatar is up next.
Andreas Monitzer <am@adiumx.com>
parents:
17770
diff
changeset
|
526 | png->signature[4] == 0x0d && |
|
439329d20337
Added support for setting the avatar via XEP-0084. Receiving other people's avatar is up next.
Andreas Monitzer <am@adiumx.com>
parents:
17770
diff
changeset
|
527 | png->signature[5] == 0x0a && |
|
439329d20337
Added support for setting the avatar via XEP-0084. Receiving other people's avatar is up next.
Andreas Monitzer <am@adiumx.com>
parents:
17770
diff
changeset
|
528 | png->signature[6] == 0x1a && |
|
439329d20337
Added support for setting the avatar via XEP-0084. Receiving other people's avatar is up next.
Andreas Monitzer <am@adiumx.com>
parents:
17770
diff
changeset
|
529 | png->signature[7] == 0x0a && |
|
439329d20337
Added support for setting the avatar via XEP-0084. Receiving other people's avatar is up next.
Andreas Monitzer <am@adiumx.com>
parents:
17770
diff
changeset
|
530 | ntohl(png->ihdr.length) == 0x0d && |
|
439329d20337
Added support for setting the avatar via XEP-0084. Receiving other people's avatar is up next.
Andreas Monitzer <am@adiumx.com>
parents:
17770
diff
changeset
|
531 | png->ihdr.type[0] == 'I' && |
|
439329d20337
Added support for setting the avatar via XEP-0084. Receiving other people's avatar is up next.
Andreas Monitzer <am@adiumx.com>
parents:
17770
diff
changeset
|
532 | png->ihdr.type[1] == 'H' && |
|
439329d20337
Added support for setting the avatar via XEP-0084. Receiving other people's avatar is up next.
Andreas Monitzer <am@adiumx.com>
parents:
17770
diff
changeset
|
533 | png->ihdr.type[2] == 'D' && |
|
439329d20337
Added support for setting the avatar via XEP-0084. Receiving other people's avatar is up next.
Andreas Monitzer <am@adiumx.com>
parents:
17770
diff
changeset
|
534 | png->ihdr.type[3] == 'R') { |
|
439329d20337
Added support for setting the avatar via XEP-0084. Receiving other people's avatar is up next.
Andreas Monitzer <am@adiumx.com>
parents:
17770
diff
changeset
|
535 | /* parse PNG header to get the size of the image (yes, this is required) */ |
|
439329d20337
Added support for setting the avatar via XEP-0084. Receiving other people's avatar is up next.
Andreas Monitzer <am@adiumx.com>
parents:
17770
diff
changeset
|
536 | guint32 width = ntohl(png->ihdr.width); |
|
439329d20337
Added support for setting the avatar via XEP-0084. Receiving other people's avatar is up next.
Andreas Monitzer <am@adiumx.com>
parents:
17770
diff
changeset
|
537 | guint32 height = ntohl(png->ihdr.height); |
|
439329d20337
Added support for setting the avatar via XEP-0084. Receiving other people's avatar is up next.
Andreas Monitzer <am@adiumx.com>
parents:
17770
diff
changeset
|
538 | xmlnode *publish, *item, *data, *metadata, *info; |
|
439329d20337
Added support for setting the avatar via XEP-0084. Receiving other people's avatar is up next.
Andreas Monitzer <am@adiumx.com>
parents:
17770
diff
changeset
|
539 | char *lengthstring, *widthstring, *heightstring; |
|
439329d20337
Added support for setting the avatar via XEP-0084. Receiving other people's avatar is up next.
Andreas Monitzer <am@adiumx.com>
parents:
17770
diff
changeset
|
540 | |
|
439329d20337
Added support for setting the avatar via XEP-0084. Receiving other people's avatar is up next.
Andreas Monitzer <am@adiumx.com>
parents:
17770
diff
changeset
|
541 | /* compute the sha1 hash */ |
|
439329d20337
Added support for setting the avatar via XEP-0084. Receiving other people's avatar is up next.
Andreas Monitzer <am@adiumx.com>
parents:
17770
diff
changeset
|
542 | PurpleCipherContext *ctx; |
|
439329d20337
Added support for setting the avatar via XEP-0084. Receiving other people's avatar is up next.
Andreas Monitzer <am@adiumx.com>
parents:
17770
diff
changeset
|
543 | unsigned char digest[20]; |
|
439329d20337
Added support for setting the avatar via XEP-0084. Receiving other people's avatar is up next.
Andreas Monitzer <am@adiumx.com>
parents:
17770
diff
changeset
|
544 | char *hash; |
|
439329d20337
Added support for setting the avatar via XEP-0084. Receiving other people's avatar is up next.
Andreas Monitzer <am@adiumx.com>
parents:
17770
diff
changeset
|
545 | char *base64avatar; |
|
439329d20337
Added support for setting the avatar via XEP-0084. Receiving other people's avatar is up next.
Andreas Monitzer <am@adiumx.com>
parents:
17770
diff
changeset
|
546 | |
|
439329d20337
Added support for setting the avatar via XEP-0084. Receiving other people's avatar is up next.
Andreas Monitzer <am@adiumx.com>
parents:
17770
diff
changeset
|
547 | ctx = purple_cipher_context_new_by_name("sha1", NULL); |
|
439329d20337
Added support for setting the avatar via XEP-0084. Receiving other people's avatar is up next.
Andreas Monitzer <am@adiumx.com>
parents:
17770
diff
changeset
|
548 | purple_cipher_context_append(ctx, purple_imgstore_get_data(img), purple_imgstore_get_size(img)); |
|
439329d20337
Added support for setting the avatar via XEP-0084. Receiving other people's avatar is up next.
Andreas Monitzer <am@adiumx.com>
parents:
17770
diff
changeset
|
549 | purple_cipher_context_digest(ctx, sizeof(digest), digest, NULL); |
| 23026 | 550 | purple_cipher_context_destroy(ctx); |
|
17787
439329d20337
Added support for setting the avatar via XEP-0084. Receiving other people's avatar is up next.
Andreas Monitzer <am@adiumx.com>
parents:
17770
diff
changeset
|
551 | |
|
439329d20337
Added support for setting the avatar via XEP-0084. Receiving other people's avatar is up next.
Andreas Monitzer <am@adiumx.com>
parents:
17770
diff
changeset
|
552 | /* convert digest to a string */ |
|
439329d20337
Added support for setting the avatar via XEP-0084. Receiving other people's avatar is up next.
Andreas Monitzer <am@adiumx.com>
parents:
17770
diff
changeset
|
553 | hash = g_strdup_printf("%x%x%x%x%x%x%x%x%x%x%x%x%x%x%x%x%x%x%x%x",digest[0],digest[1],digest[2],digest[3],digest[4],digest[5],digest[6],digest[7],digest[8],digest[9],digest[10],digest[11],digest[12],digest[13],digest[14],digest[15],digest[16],digest[17],digest[18],digest[19]); |
|
439329d20337
Added support for setting the avatar via XEP-0084. Receiving other people's avatar is up next.
Andreas Monitzer <am@adiumx.com>
parents:
17770
diff
changeset
|
554 | |
|
439329d20337
Added support for setting the avatar via XEP-0084. Receiving other people's avatar is up next.
Andreas Monitzer <am@adiumx.com>
parents:
17770
diff
changeset
|
555 | publish = xmlnode_new("publish"); |
|
17788
e6e381b0c7d6
Implemented receiving other people's avatars via XEP-0084. Note that this code now includes a workaround for a non-spec incompatibility for the current ejabberd PEP implementation, and doesn't use the correct namespace due to Psi using the wrong one (outdated?). Works fine though, and the vcard-based approach is retained.
Andreas Monitzer <am@adiumx.com>
parents:
17787
diff
changeset
|
556 | xmlnode_set_attrib(publish,"node",AVATARNAMESPACEDATA); |
|
17787
439329d20337
Added support for setting the avatar via XEP-0084. Receiving other people's avatar is up next.
Andreas Monitzer <am@adiumx.com>
parents:
17770
diff
changeset
|
557 | |
|
439329d20337
Added support for setting the avatar via XEP-0084. Receiving other people's avatar is up next.
Andreas Monitzer <am@adiumx.com>
parents:
17770
diff
changeset
|
558 | item = xmlnode_new_child(publish, "item"); |
|
439329d20337
Added support for setting the avatar via XEP-0084. Receiving other people's avatar is up next.
Andreas Monitzer <am@adiumx.com>
parents:
17770
diff
changeset
|
559 | xmlnode_set_attrib(item, "id", hash); |
|
439329d20337
Added support for setting the avatar via XEP-0084. Receiving other people's avatar is up next.
Andreas Monitzer <am@adiumx.com>
parents:
17770
diff
changeset
|
560 | |
|
439329d20337
Added support for setting the avatar via XEP-0084. Receiving other people's avatar is up next.
Andreas Monitzer <am@adiumx.com>
parents:
17770
diff
changeset
|
561 | data = xmlnode_new_child(item, "data"); |
|
17788
e6e381b0c7d6
Implemented receiving other people's avatars via XEP-0084. Note that this code now includes a workaround for a non-spec incompatibility for the current ejabberd PEP implementation, and doesn't use the correct namespace due to Psi using the wrong one (outdated?). Works fine though, and the vcard-based approach is retained.
Andreas Monitzer <am@adiumx.com>
parents:
17787
diff
changeset
|
562 | xmlnode_set_namespace(data,AVATARNAMESPACEDATA); |
|
17787
439329d20337
Added support for setting the avatar via XEP-0084. Receiving other people's avatar is up next.
Andreas Monitzer <am@adiumx.com>
parents:
17770
diff
changeset
|
563 | |
|
439329d20337
Added support for setting the avatar via XEP-0084. Receiving other people's avatar is up next.
Andreas Monitzer <am@adiumx.com>
parents:
17770
diff
changeset
|
564 | base64avatar = purple_base64_encode(purple_imgstore_get_data(img), purple_imgstore_get_size(img)); |
|
439329d20337
Added support for setting the avatar via XEP-0084. Receiving other people's avatar is up next.
Andreas Monitzer <am@adiumx.com>
parents:
17770
diff
changeset
|
565 | xmlnode_insert_data(data,base64avatar,-1); |
|
439329d20337
Added support for setting the avatar via XEP-0084. Receiving other people's avatar is up next.
Andreas Monitzer <am@adiumx.com>
parents:
17770
diff
changeset
|
566 | g_free(base64avatar); |
|
439329d20337
Added support for setting the avatar via XEP-0084. Receiving other people's avatar is up next.
Andreas Monitzer <am@adiumx.com>
parents:
17770
diff
changeset
|
567 | |
|
439329d20337
Added support for setting the avatar via XEP-0084. Receiving other people's avatar is up next.
Andreas Monitzer <am@adiumx.com>
parents:
17770
diff
changeset
|
568 | /* publish the avatar itself */ |
|
439329d20337
Added support for setting the avatar via XEP-0084. Receiving other people's avatar is up next.
Andreas Monitzer <am@adiumx.com>
parents:
17770
diff
changeset
|
569 | jabber_pep_publish((JabberStream*)gc->proto_data, publish); |
|
439329d20337
Added support for setting the avatar via XEP-0084. Receiving other people's avatar is up next.
Andreas Monitzer <am@adiumx.com>
parents:
17770
diff
changeset
|
570 | |
|
439329d20337
Added support for setting the avatar via XEP-0084. Receiving other people's avatar is up next.
Andreas Monitzer <am@adiumx.com>
parents:
17770
diff
changeset
|
571 | /* next step: publish the metadata */ |
|
439329d20337
Added support for setting the avatar via XEP-0084. Receiving other people's avatar is up next.
Andreas Monitzer <am@adiumx.com>
parents:
17770
diff
changeset
|
572 | publish = xmlnode_new("publish"); |
|
17788
e6e381b0c7d6
Implemented receiving other people's avatars via XEP-0084. Note that this code now includes a workaround for a non-spec incompatibility for the current ejabberd PEP implementation, and doesn't use the correct namespace due to Psi using the wrong one (outdated?). Works fine though, and the vcard-based approach is retained.
Andreas Monitzer <am@adiumx.com>
parents:
17787
diff
changeset
|
573 | xmlnode_set_attrib(publish,"node",AVATARNAMESPACEMETA); |
|
17787
439329d20337
Added support for setting the avatar via XEP-0084. Receiving other people's avatar is up next.
Andreas Monitzer <am@adiumx.com>
parents:
17770
diff
changeset
|
574 | |
|
439329d20337
Added support for setting the avatar via XEP-0084. Receiving other people's avatar is up next.
Andreas Monitzer <am@adiumx.com>
parents:
17770
diff
changeset
|
575 | item = xmlnode_new_child(publish, "item"); |
|
439329d20337
Added support for setting the avatar via XEP-0084. Receiving other people's avatar is up next.
Andreas Monitzer <am@adiumx.com>
parents:
17770
diff
changeset
|
576 | xmlnode_set_attrib(item, "id", hash); |
|
439329d20337
Added support for setting the avatar via XEP-0084. Receiving other people's avatar is up next.
Andreas Monitzer <am@adiumx.com>
parents:
17770
diff
changeset
|
577 | |
|
439329d20337
Added support for setting the avatar via XEP-0084. Receiving other people's avatar is up next.
Andreas Monitzer <am@adiumx.com>
parents:
17770
diff
changeset
|
578 | metadata = xmlnode_new_child(item, "metadata"); |
|
17788
e6e381b0c7d6
Implemented receiving other people's avatars via XEP-0084. Note that this code now includes a workaround for a non-spec incompatibility for the current ejabberd PEP implementation, and doesn't use the correct namespace due to Psi using the wrong one (outdated?). Works fine though, and the vcard-based approach is retained.
Andreas Monitzer <am@adiumx.com>
parents:
17787
diff
changeset
|
579 | xmlnode_set_namespace(metadata,AVATARNAMESPACEMETA); |
|
17787
439329d20337
Added support for setting the avatar via XEP-0084. Receiving other people's avatar is up next.
Andreas Monitzer <am@adiumx.com>
parents:
17770
diff
changeset
|
580 | |
|
439329d20337
Added support for setting the avatar via XEP-0084. Receiving other people's avatar is up next.
Andreas Monitzer <am@adiumx.com>
parents:
17770
diff
changeset
|
581 | info = xmlnode_new_child(metadata, "info"); |
|
439329d20337
Added support for setting the avatar via XEP-0084. Receiving other people's avatar is up next.
Andreas Monitzer <am@adiumx.com>
parents:
17770
diff
changeset
|
582 | xmlnode_set_attrib(info, "id", hash); |
|
439329d20337
Added support for setting the avatar via XEP-0084. Receiving other people's avatar is up next.
Andreas Monitzer <am@adiumx.com>
parents:
17770
diff
changeset
|
583 | xmlnode_set_attrib(info, "type", "image/png"); |
|
439329d20337
Added support for setting the avatar via XEP-0084. Receiving other people's avatar is up next.
Andreas Monitzer <am@adiumx.com>
parents:
17770
diff
changeset
|
584 | lengthstring = g_strdup_printf("%u", (unsigned)purple_imgstore_get_size(img)); |
|
439329d20337
Added support for setting the avatar via XEP-0084. Receiving other people's avatar is up next.
Andreas Monitzer <am@adiumx.com>
parents:
17770
diff
changeset
|
585 | xmlnode_set_attrib(info, "bytes", lengthstring); |
|
439329d20337
Added support for setting the avatar via XEP-0084. Receiving other people's avatar is up next.
Andreas Monitzer <am@adiumx.com>
parents:
17770
diff
changeset
|
586 | g_free(lengthstring); |
|
439329d20337
Added support for setting the avatar via XEP-0084. Receiving other people's avatar is up next.
Andreas Monitzer <am@adiumx.com>
parents:
17770
diff
changeset
|
587 | widthstring = g_strdup_printf("%u", width); |
|
439329d20337
Added support for setting the avatar via XEP-0084. Receiving other people's avatar is up next.
Andreas Monitzer <am@adiumx.com>
parents:
17770
diff
changeset
|
588 | xmlnode_set_attrib(info, "width", widthstring); |
|
439329d20337
Added support for setting the avatar via XEP-0084. Receiving other people's avatar is up next.
Andreas Monitzer <am@adiumx.com>
parents:
17770
diff
changeset
|
589 | g_free(widthstring); |
|
439329d20337
Added support for setting the avatar via XEP-0084. Receiving other people's avatar is up next.
Andreas Monitzer <am@adiumx.com>
parents:
17770
diff
changeset
|
590 | heightstring = g_strdup_printf("%u", height); |
|
439329d20337
Added support for setting the avatar via XEP-0084. Receiving other people's avatar is up next.
Andreas Monitzer <am@adiumx.com>
parents:
17770
diff
changeset
|
591 | xmlnode_set_attrib(info, "height", heightstring); |
|
21681
80530c8be0a1
Fix a double-free and a leak at the same time.
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
21630
diff
changeset
|
592 | g_free(heightstring); |
|
17787
439329d20337
Added support for setting the avatar via XEP-0084. Receiving other people's avatar is up next.
Andreas Monitzer <am@adiumx.com>
parents:
17770
diff
changeset
|
593 | |
|
439329d20337
Added support for setting the avatar via XEP-0084. Receiving other people's avatar is up next.
Andreas Monitzer <am@adiumx.com>
parents:
17770
diff
changeset
|
594 | /* publish the metadata */ |
|
439329d20337
Added support for setting the avatar via XEP-0084. Receiving other people's avatar is up next.
Andreas Monitzer <am@adiumx.com>
parents:
17770
diff
changeset
|
595 | jabber_pep_publish((JabberStream*)gc->proto_data, publish); |
|
439329d20337
Added support for setting the avatar via XEP-0084. Receiving other people's avatar is up next.
Andreas Monitzer <am@adiumx.com>
parents:
17770
diff
changeset
|
596 | |
|
439329d20337
Added support for setting the avatar via XEP-0084. Receiving other people's avatar is up next.
Andreas Monitzer <am@adiumx.com>
parents:
17770
diff
changeset
|
597 | g_free(hash); |
|
439329d20337
Added support for setting the avatar via XEP-0084. Receiving other people's avatar is up next.
Andreas Monitzer <am@adiumx.com>
parents:
17770
diff
changeset
|
598 | } else { /* if(img) */ |
|
439329d20337
Added support for setting the avatar via XEP-0084. Receiving other people's avatar is up next.
Andreas Monitzer <am@adiumx.com>
parents:
17770
diff
changeset
|
599 | /* remove the metadata */ |
|
439329d20337
Added support for setting the avatar via XEP-0084. Receiving other people's avatar is up next.
Andreas Monitzer <am@adiumx.com>
parents:
17770
diff
changeset
|
600 | xmlnode *metadata, *item; |
|
439329d20337
Added support for setting the avatar via XEP-0084. Receiving other people's avatar is up next.
Andreas Monitzer <am@adiumx.com>
parents:
17770
diff
changeset
|
601 | xmlnode *publish = xmlnode_new("publish"); |
|
17788
e6e381b0c7d6
Implemented receiving other people's avatars via XEP-0084. Note that this code now includes a workaround for a non-spec incompatibility for the current ejabberd PEP implementation, and doesn't use the correct namespace due to Psi using the wrong one (outdated?). Works fine though, and the vcard-based approach is retained.
Andreas Monitzer <am@adiumx.com>
parents:
17787
diff
changeset
|
602 | xmlnode_set_attrib(publish,"node",AVATARNAMESPACEMETA); |
|
17787
439329d20337
Added support for setting the avatar via XEP-0084. Receiving other people's avatar is up next.
Andreas Monitzer <am@adiumx.com>
parents:
17770
diff
changeset
|
603 | |
|
439329d20337
Added support for setting the avatar via XEP-0084. Receiving other people's avatar is up next.
Andreas Monitzer <am@adiumx.com>
parents:
17770
diff
changeset
|
604 | item = xmlnode_new_child(publish, "item"); |
|
439329d20337
Added support for setting the avatar via XEP-0084. Receiving other people's avatar is up next.
Andreas Monitzer <am@adiumx.com>
parents:
17770
diff
changeset
|
605 | |
|
439329d20337
Added support for setting the avatar via XEP-0084. Receiving other people's avatar is up next.
Andreas Monitzer <am@adiumx.com>
parents:
17770
diff
changeset
|
606 | metadata = xmlnode_new_child(item, "metadata"); |
|
17788
e6e381b0c7d6
Implemented receiving other people's avatars via XEP-0084. Note that this code now includes a workaround for a non-spec incompatibility for the current ejabberd PEP implementation, and doesn't use the correct namespace due to Psi using the wrong one (outdated?). Works fine though, and the vcard-based approach is retained.
Andreas Monitzer <am@adiumx.com>
parents:
17787
diff
changeset
|
607 | xmlnode_set_namespace(metadata,AVATARNAMESPACEMETA); |
|
17787
439329d20337
Added support for setting the avatar via XEP-0084. Receiving other people's avatar is up next.
Andreas Monitzer <am@adiumx.com>
parents:
17770
diff
changeset
|
608 | |
|
439329d20337
Added support for setting the avatar via XEP-0084. Receiving other people's avatar is up next.
Andreas Monitzer <am@adiumx.com>
parents:
17770
diff
changeset
|
609 | xmlnode_new_child(metadata, "stop"); |
|
439329d20337
Added support for setting the avatar via XEP-0084. Receiving other people's avatar is up next.
Andreas Monitzer <am@adiumx.com>
parents:
17770
diff
changeset
|
610 | |
|
439329d20337
Added support for setting the avatar via XEP-0084. Receiving other people's avatar is up next.
Andreas Monitzer <am@adiumx.com>
parents:
17770
diff
changeset
|
611 | /* publish the metadata */ |
|
439329d20337
Added support for setting the avatar via XEP-0084. Receiving other people's avatar is up next.
Andreas Monitzer <am@adiumx.com>
parents:
17770
diff
changeset
|
612 | jabber_pep_publish((JabberStream*)gc->proto_data, publish); |
|
439329d20337
Added support for setting the avatar via XEP-0084. Receiving other people's avatar is up next.
Andreas Monitzer <am@adiumx.com>
parents:
17770
diff
changeset
|
613 | } |
|
439329d20337
Added support for setting the avatar via XEP-0084. Receiving other people's avatar is up next.
Andreas Monitzer <am@adiumx.com>
parents:
17770
diff
changeset
|
614 | } else { |
|
439329d20337
Added support for setting the avatar via XEP-0084. Receiving other people's avatar is up next.
Andreas Monitzer <am@adiumx.com>
parents:
17770
diff
changeset
|
615 | purple_debug(PURPLE_DEBUG_ERROR, "jabber", |
|
439329d20337
Added support for setting the avatar via XEP-0084. Receiving other people's avatar is up next.
Andreas Monitzer <am@adiumx.com>
parents:
17770
diff
changeset
|
616 | "jabber_set_buddy_icon received non-png data"); |
|
439329d20337
Added support for setting the avatar via XEP-0084. Receiving other people's avatar is up next.
Andreas Monitzer <am@adiumx.com>
parents:
17770
diff
changeset
|
617 | } |
|
439329d20337
Added support for setting the avatar via XEP-0084. Receiving other people's avatar is up next.
Andreas Monitzer <am@adiumx.com>
parents:
17770
diff
changeset
|
618 | } |
|
439329d20337
Added support for setting the avatar via XEP-0084. Receiving other people's avatar is up next.
Andreas Monitzer <am@adiumx.com>
parents:
17770
diff
changeset
|
619 | |
|
439329d20337
Added support for setting the avatar via XEP-0084. Receiving other people's avatar is up next.
Andreas Monitzer <am@adiumx.com>
parents:
17770
diff
changeset
|
620 | /* even when the image is not png, we can still publish the vCard, since this |
|
439329d20337
Added support for setting the avatar via XEP-0084. Receiving other people's avatar is up next.
Andreas Monitzer <am@adiumx.com>
parents:
17770
diff
changeset
|
621 | one doesn't require a specific image type */ |
|
439329d20337
Added support for setting the avatar via XEP-0084. Receiving other people's avatar is up next.
Andreas Monitzer <am@adiumx.com>
parents:
17770
diff
changeset
|
622 | |
|
439329d20337
Added support for setting the avatar via XEP-0084. Receiving other people's avatar is up next.
Andreas Monitzer <am@adiumx.com>
parents:
17770
diff
changeset
|
623 | /* publish vCard for those poor older clients */ |
| 15884 | 624 | jabber_set_info(gc, purple_account_get_user_info(gc->account)); |
| 10189 | 625 | |
| 15884 | 626 | gpresence = purple_account_get_presence(gc->account); |
| 627 | status = purple_presence_get_active_status(gpresence); | |
| 10216 | 628 | jabber_presence_send(gc->account, status); |
| 10189 | 629 | } |
| 630 | ||
| 7014 | 631 | /* |
| 632 | * This is the callback from the "ok clicked" for "set vCard" | |
| 633 | * | |
| 634 | * Formats GSList data into XML-encoded string and returns a pointer | |
| 635 | * to said string. | |
| 636 | * | |
| 637 | * g_free()'ing the returned string space is the responsibility of | |
| 638 | * the caller. | |
| 639 | */ | |
| 640 | static void | |
| 15884 | 641 | jabber_format_info(PurpleConnection *gc, PurpleRequestFields *fields) |
| 7014 | 642 | { |
| 643 | xmlnode *vc_node; | |
| 15884 | 644 | PurpleRequestField *field; |
| 7014 | 645 | const char *text; |
| 646 | char *p; | |
| 647 | const struct vcard_template *vc_tp; | |
|
21091
07fe1a99c47b
Patch from Andrew Gaul to constify a bunch of static variables to reduce
Ka-Hing Cheung <khc@pidgin.im>
parents:
20169
diff
changeset
|
648 | const struct tag_attr *tag_attr; |
| 7014 | 649 | |
| 650 | vc_node = xmlnode_new("vCard"); | |
| 651 | ||
| 652 | for(tag_attr = vcard_tag_attr_list; tag_attr->attr != NULL; ++tag_attr) | |
| 653 | xmlnode_set_attrib(vc_node, tag_attr->attr, tag_attr->value); | |
| 654 | ||
| 655 | for (vc_tp = vcard_template_data; vc_tp->label != NULL; vc_tp++) { | |
| 656 | if (*vc_tp->label == '\0') | |
| 657 | continue; | |
| 658 | ||
| 15884 | 659 | field = purple_request_fields_get_field(fields, vc_tp->tag); |
| 660 | text = purple_request_field_string_get_value(field); | |
| 7014 | 661 | |
| 662 | ||
| 663 | if (text != NULL && *text != '\0') { | |
| 664 | xmlnode *xp; | |
| 665 | ||
| 15884 | 666 | purple_debug(PURPLE_DEBUG_INFO, "jabber", |
| 9339 | 667 | "Setting %s to '%s'\n", vc_tp->tag, text); |
| 668 | ||
| 7014 | 669 | if ((xp = insert_tag_to_parent_tag(vc_node, |
| 670 | NULL, vc_tp->tag)) != NULL) { | |
| 671 | ||
| 672 | xmlnode_insert_data(xp, text, -1); | |
| 673 | } | |
| 674 | } | |
| 675 | } | |
| 676 | ||
| 7642 | 677 | p = xmlnode_to_str(vc_node, NULL); |
| 7014 | 678 | xmlnode_free(vc_node); |
| 679 | ||
| 15884 | 680 | purple_account_set_user_info(purple_connection_get_account(gc), p); |
|
14669
df3f48ab4aff
[gaim-migrate @ 17335]
Mark Doliner <markdoliner@pidgin.im>
parents:
14525
diff
changeset
|
681 | serv_set_info(gc, p); |
| 7014 | 682 | |
| 683 | g_free(p); | |
| 684 | } | |
| 685 | ||
| 686 | /* | |
| 687 | * This gets executed by the proto action | |
| 688 | * | |
| 15884 | 689 | * Creates a new PurpleRequestFields struct, gets the XML-formatted user_info |
| 7014 | 690 | * string (if any) into GSLists for the (multi-entry) edit dialog and |
| 691 | * calls the set_vcard dialog. | |
| 692 | */ | |
| 15884 | 693 | void jabber_setup_set_info(PurplePluginAction *action) |
| 7014 | 694 | { |
| 15884 | 695 | PurpleConnection *gc = (PurpleConnection *) action->context; |
| 696 | PurpleRequestFields *fields; | |
| 697 | PurpleRequestFieldGroup *group; | |
| 698 | PurpleRequestField *field; | |
| 7014 | 699 | const struct vcard_template *vc_tp; |
|
14129
70db31dfeeb1
[gaim-migrate @ 16688]
Daniel Atallah <datallah@pidgin.im>
parents:
13808
diff
changeset
|
700 | const char *user_info; |
|
14130
02a5f8dad9cf
[gaim-migrate @ 16689]
Daniel Atallah <datallah@pidgin.im>
parents:
14129
diff
changeset
|
701 | char *cdata = NULL; |
| 7014 | 702 | xmlnode *x_vc_data = NULL; |
| 703 | ||
| 15884 | 704 | fields = purple_request_fields_new(); |
| 705 | group = purple_request_field_group_new(NULL); | |
| 706 | purple_request_fields_add_group(fields, group); | |
| 7014 | 707 | |
| 708 | /* | |
| 709 | * Get existing, XML-formatted, user info | |
| 710 | */ | |
| 15884 | 711 | if((user_info = purple_account_get_user_info(gc->account)) != NULL) |
| 7014 | 712 | x_vc_data = xmlnode_from_str(user_info, -1); |
| 713 | ||
| 714 | /* | |
| 715 | * Set up GSLists for edit with labels from "template," data from user info | |
| 716 | */ | |
| 717 | for(vc_tp = vcard_template_data; vc_tp->label != NULL; ++vc_tp) { | |
| 718 | xmlnode *data_node; | |
| 719 | if((vc_tp->label)[0] == '\0') | |
| 720 | continue; | |
|
14129
70db31dfeeb1
[gaim-migrate @ 16688]
Daniel Atallah <datallah@pidgin.im>
parents:
13808
diff
changeset
|
721 | |
|
70db31dfeeb1
[gaim-migrate @ 16688]
Daniel Atallah <datallah@pidgin.im>
parents:
13808
diff
changeset
|
722 | if (x_vc_data != NULL) { |
|
70db31dfeeb1
[gaim-migrate @ 16688]
Daniel Atallah <datallah@pidgin.im>
parents:
13808
diff
changeset
|
723 | if(vc_tp->ptag == NULL) { |
|
70db31dfeeb1
[gaim-migrate @ 16688]
Daniel Atallah <datallah@pidgin.im>
parents:
13808
diff
changeset
|
724 | data_node = xmlnode_get_child(x_vc_data, vc_tp->tag); |
|
70db31dfeeb1
[gaim-migrate @ 16688]
Daniel Atallah <datallah@pidgin.im>
parents:
13808
diff
changeset
|
725 | } else { |
|
70db31dfeeb1
[gaim-migrate @ 16688]
Daniel Atallah <datallah@pidgin.im>
parents:
13808
diff
changeset
|
726 | gchar *tag = g_strdup_printf("%s/%s", vc_tp->ptag, vc_tp->tag); |
|
70db31dfeeb1
[gaim-migrate @ 16688]
Daniel Atallah <datallah@pidgin.im>
parents:
13808
diff
changeset
|
727 | data_node = xmlnode_get_child(x_vc_data, tag); |
|
70db31dfeeb1
[gaim-migrate @ 16688]
Daniel Atallah <datallah@pidgin.im>
parents:
13808
diff
changeset
|
728 | g_free(tag); |
|
70db31dfeeb1
[gaim-migrate @ 16688]
Daniel Atallah <datallah@pidgin.im>
parents:
13808
diff
changeset
|
729 | } |
|
70db31dfeeb1
[gaim-migrate @ 16688]
Daniel Atallah <datallah@pidgin.im>
parents:
13808
diff
changeset
|
730 | if(data_node) |
|
70db31dfeeb1
[gaim-migrate @ 16688]
Daniel Atallah <datallah@pidgin.im>
parents:
13808
diff
changeset
|
731 | cdata = xmlnode_get_data(data_node); |
|
14130
02a5f8dad9cf
[gaim-migrate @ 16689]
Daniel Atallah <datallah@pidgin.im>
parents:
14129
diff
changeset
|
732 | } |
| 7014 | 733 | |
| 734 | if(strcmp(vc_tp->tag, "DESC") == 0) { | |
| 15884 | 735 | field = purple_request_field_string_new(vc_tp->tag, |
| 7014 | 736 | _(vc_tp->label), cdata, |
| 737 | TRUE); | |
| 738 | } else { | |
| 15884 | 739 | field = purple_request_field_string_new(vc_tp->tag, |
| 7014 | 740 | _(vc_tp->label), cdata, |
| 741 | FALSE); | |
| 742 | } | |
| 743 | ||
|
14130
02a5f8dad9cf
[gaim-migrate @ 16689]
Daniel Atallah <datallah@pidgin.im>
parents:
14129
diff
changeset
|
744 | g_free(cdata); |
|
02a5f8dad9cf
[gaim-migrate @ 16689]
Daniel Atallah <datallah@pidgin.im>
parents:
14129
diff
changeset
|
745 | cdata = NULL; |
|
02a5f8dad9cf
[gaim-migrate @ 16689]
Daniel Atallah <datallah@pidgin.im>
parents:
14129
diff
changeset
|
746 | |
| 15884 | 747 | purple_request_field_group_add_field(group, field); |
| 7014 | 748 | } |
| 749 | ||
| 750 | if(x_vc_data != NULL) | |
| 751 | xmlnode_free(x_vc_data); | |
| 752 | ||
|
21175
c6d76b49c206
disapproval of revision '8ba833993a115415727bb1b70362e0bd1603c169'
Richard Laager <rlaager@pidgin.im>
parents:
21174
diff
changeset
|
753 | purple_request_fields(gc, _("Edit XMPP vCard"), |
|
16961
b6955f946f8f
s/Jabber/XMPP in user-visible places.
Richard Laager <rlaager@pidgin.im>
parents:
16799
diff
changeset
|
754 | _("Edit XMPP vCard"), |
| 7014 | 755 | _("All items below are optional. Enter only the " |
| 756 | "information with which you feel comfortable."), | |
| 757 | fields, | |
| 758 | _("Save"), G_CALLBACK(jabber_format_info), | |
| 759 | _("Cancel"), NULL, | |
|
16490
68c22924d66b
Added account, who, and conversation parameters to the request API calls, and updated all code to match. I can't compile the Perl module, so I'd appreciate it if someone who knows it would verify that this doesn't break Perl.
Evan Schoenberg <evands@pidgin.im>
parents:
15884
diff
changeset
|
760 | purple_connection_get_account(gc), NULL, NULL, |
|
21175
c6d76b49c206
disapproval of revision '8ba833993a115415727bb1b70362e0bd1603c169'
Richard Laager <rlaager@pidgin.im>
parents:
21174
diff
changeset
|
761 | gc); |
| 7014 | 762 | } |
| 763 | ||
| 764 | /*---------------------------------------*/ | |
| 765 | /* End Jabber "set info" (vCard) support */ | |
| 766 | /*---------------------------------------*/ | |
| 767 | ||
| 768 | /****** | |
| 769 | * end of that ancient crap that needs to die | |
| 770 | ******/ | |
| 771 | ||
|
15363
f6b9d1e3d0cb
[gaim-migrate @ 18092]
Evan Schoenberg <evands@pidgin.im>
parents:
15273
diff
changeset
|
772 | static void jabber_buddy_info_destroy(JabberBuddyInfo *jbi) |
|
f6b9d1e3d0cb
[gaim-migrate @ 18092]
Evan Schoenberg <evands@pidgin.im>
parents:
15273
diff
changeset
|
773 | { |
|
f6b9d1e3d0cb
[gaim-migrate @ 18092]
Evan Schoenberg <evands@pidgin.im>
parents:
15273
diff
changeset
|
774 | /* Remove the timeout, which would otherwise trigger jabber_buddy_get_info_timeout() */ |
|
f6b9d1e3d0cb
[gaim-migrate @ 18092]
Evan Schoenberg <evands@pidgin.im>
parents:
15273
diff
changeset
|
775 | if (jbi->timeout_handle > 0) |
| 15884 | 776 | purple_timeout_remove(jbi->timeout_handle); |
|
15727
0754583ceeae
Don't access the list element after it has been freed.
Daniel Atallah <datallah@pidgin.im>
parents:
15688
diff
changeset
|
777 | |
|
15363
f6b9d1e3d0cb
[gaim-migrate @ 18092]
Evan Schoenberg <evands@pidgin.im>
parents:
15273
diff
changeset
|
778 | g_free(jbi->jid); |
|
f6b9d1e3d0cb
[gaim-migrate @ 18092]
Evan Schoenberg <evands@pidgin.im>
parents:
15273
diff
changeset
|
779 | g_hash_table_destroy(jbi->resources); |
|
f6b9d1e3d0cb
[gaim-migrate @ 18092]
Evan Schoenberg <evands@pidgin.im>
parents:
15273
diff
changeset
|
780 | g_free(jbi->vcard_text); |
|
15727
0754583ceeae
Don't access the list element after it has been freed.
Daniel Atallah <datallah@pidgin.im>
parents:
15688
diff
changeset
|
781 | g_free(jbi); |
|
15363
f6b9d1e3d0cb
[gaim-migrate @ 18092]
Evan Schoenberg <evands@pidgin.im>
parents:
15273
diff
changeset
|
782 | } |
|
f6b9d1e3d0cb
[gaim-migrate @ 18092]
Evan Schoenberg <evands@pidgin.im>
parents:
15273
diff
changeset
|
783 | |
| 13794 | 784 | static void jabber_buddy_info_show_if_ready(JabberBuddyInfo *jbi) |
| 7014 | 785 | { |
|
15205
f642029b2f97
[gaim-migrate @ 17929]
Evan Schoenberg <evands@pidgin.im>
parents:
15143
diff
changeset
|
786 | char *resource_name, *tmp; |
| 13794 | 787 | JabberBuddyResource *jbr; |
|
15092
e7c5edee202e
[gaim-migrate @ 17813]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
14669
diff
changeset
|
788 | JabberBuddyInfoResource *jbir = NULL; |
| 13794 | 789 | GList *resources; |
| 15884 | 790 | PurpleNotifyUserInfo *user_info; |
| 7014 | 791 | |
| 13794 | 792 | /* not yet */ |
| 793 | if(jbi->ids) | |
| 11361 | 794 | return; |
| 795 | ||
| 15884 | 796 | user_info = purple_notify_user_info_new(); |
| 13794 | 797 | resource_name = jabber_get_resource(jbi->jid); |
| 7014 | 798 | |
| 799 | if(resource_name) { | |
| 13794 | 800 | jbr = jabber_buddy_find_resource(jbi->jb, resource_name); |
| 801 | jbir = g_hash_table_lookup(jbi->resources, resource_name); | |
| 7014 | 802 | if(jbr) { |
| 7145 | 803 | char *purdy = NULL; |
| 804 | if(jbr->status) | |
| 15884 | 805 | purdy = purple_strdup_withhtml(jbr->status); |
|
15205
f642029b2f97
[gaim-migrate @ 17929]
Evan Schoenberg <evands@pidgin.im>
parents:
15143
diff
changeset
|
806 | tmp = g_strdup_printf("%s%s%s", jabber_buddy_state_get_name(jbr->state), |
|
f642029b2f97
[gaim-migrate @ 17929]
Evan Schoenberg <evands@pidgin.im>
parents:
15143
diff
changeset
|
807 | (purdy ? ": " : ""), |
|
f642029b2f97
[gaim-migrate @ 17929]
Evan Schoenberg <evands@pidgin.im>
parents:
15143
diff
changeset
|
808 | (purdy ? purdy : "")); |
| 15884 | 809 | purple_notify_user_info_add_pair(user_info, _("Status"), tmp); |
|
15205
f642029b2f97
[gaim-migrate @ 17929]
Evan Schoenberg <evands@pidgin.im>
parents:
15143
diff
changeset
|
810 | g_free(tmp); |
|
f642029b2f97
[gaim-migrate @ 17929]
Evan Schoenberg <evands@pidgin.im>
parents:
15143
diff
changeset
|
811 | g_free(purdy); |
| 7014 | 812 | } else { |
| 15884 | 813 | purple_notify_user_info_add_pair(user_info, _("Status"), _("Unknown")); |
| 7014 | 814 | } |
| 13794 | 815 | if(jbir) { |
| 816 | if(jbir->idle_seconds > 0) { | |
| 15884 | 817 | char *idle = purple_str_seconds_to_string(jbir->idle_seconds); |
| 818 | purple_notify_user_info_add_pair(user_info, _("Idle"), idle); | |
|
15688
048953c6b084
Fixed 3 Jabber memory leaks: in jabber_roster_parse(), there's no need to g_strdup() this normalized jid since it's only used immediately, and there was no correspoding g_free(). When removing an id from jbi->ids, its data should always be freed. Finally, gaim_str_seconds_to_string() returns retained memory -- we must free the returned pointer when we're done using it.
Evan Schoenberg <evands@pidgin.im>
parents:
15435
diff
changeset
|
819 | g_free(idle); |
| 13794 | 820 | } |
| 821 | } | |
| 822 | if(jbr && jbr->client.name) { | |
|
15205
f642029b2f97
[gaim-migrate @ 17929]
Evan Schoenberg <evands@pidgin.im>
parents:
15143
diff
changeset
|
823 | tmp = g_strdup_printf("%s%s%s", jbr->client.name, |
|
f642029b2f97
[gaim-migrate @ 17929]
Evan Schoenberg <evands@pidgin.im>
parents:
15143
diff
changeset
|
824 | (jbr->client.version ? " " : ""), |
|
f642029b2f97
[gaim-migrate @ 17929]
Evan Schoenberg <evands@pidgin.im>
parents:
15143
diff
changeset
|
825 | (jbr->client.version ? jbr->client.version : "")); |
| 15884 | 826 | purple_notify_user_info_add_pair(user_info, _("Client"), tmp); |
|
15205
f642029b2f97
[gaim-migrate @ 17929]
Evan Schoenberg <evands@pidgin.im>
parents:
15143
diff
changeset
|
827 | g_free(tmp); |
|
f642029b2f97
[gaim-migrate @ 17929]
Evan Schoenberg <evands@pidgin.im>
parents:
15143
diff
changeset
|
828 | |
| 13794 | 829 | if(jbr->client.os) { |
| 15884 | 830 | purple_notify_user_info_add_pair(user_info, _("Operating System"), jbr->client.os); |
| 13794 | 831 | } |
| 832 | } | |
|
19921
d920ce72002e
Dont spam the buddy info window with esoteric capabilities
Sean Egan <seanegan@pidgin.im>
parents:
19897
diff
changeset
|
833 | #if 0 |
|
d920ce72002e
Dont spam the buddy info window with esoteric capabilities
Sean Egan <seanegan@pidgin.im>
parents:
19897
diff
changeset
|
834 | /* #if 0 this for now; I think this would be far more useful if we limited this to a particular set of features |
|
d920ce72002e
Dont spam the buddy info window with esoteric capabilities
Sean Egan <seanegan@pidgin.im>
parents:
19897
diff
changeset
|
835 | * of particular interest (-vv jumps out as one). As it is now, I don't picture people getting all excited: "Oh sweet crap! |
|
d920ce72002e
Dont spam the buddy info window with esoteric capabilities
Sean Egan <seanegan@pidgin.im>
parents:
19897
diff
changeset
|
836 | * So-and-so supports 'jabber:x:data' AND 'Collaborative Data Objects'!" |
|
d920ce72002e
Dont spam the buddy info window with esoteric capabilities
Sean Egan <seanegan@pidgin.im>
parents:
19897
diff
changeset
|
837 | */ |
|
d920ce72002e
Dont spam the buddy info window with esoteric capabilities
Sean Egan <seanegan@pidgin.im>
parents:
19897
diff
changeset
|
838 | |
|
18798
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
839 | if(jbr && jbr->caps) { |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
840 | GString *tmp = g_string_new(""); |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
841 | GList *iter; |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
842 | for(iter = jbr->caps->features; iter; iter = g_list_next(iter)) { |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
843 | const char *feature = iter->data; |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
844 | |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
845 | if(!strcmp(feature, "jabber:iq:last")) |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
846 | feature = _("Last Activity"); |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
847 | else if(!strcmp(feature, "http://jabber.org/protocol/disco#info")) |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
848 | feature = _("Service Discovery Info"); |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
849 | else if(!strcmp(feature, "http://jabber.org/protocol/disco#items")) |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
850 | feature = _("Service Discovery Items"); |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
851 | else if(!strcmp(feature, "http://jabber.org/protocol/address")) |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
852 | feature = _("Extended Stanza Addressing"); |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
853 | else if(!strcmp(feature, "http://jabber.org/protocol/muc")) |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
854 | feature = _("Multi-User Chat"); |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
855 | else if(!strcmp(feature, "http://jabber.org/protocol/muc#user")) |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
856 | feature = _("Multi-User Chat Extended Presence Information"); |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
857 | else if(!strcmp(feature, "http://jabber.org/protocol/ibb")) |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
858 | feature = _("In-Band Bytestreams"); |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
859 | else if(!strcmp(feature, "http://jabber.org/protocol/commands")) |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
860 | feature = _("Ad-Hoc Commands"); |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
861 | else if(!strcmp(feature, "http://jabber.org/protocol/pubsub")) |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
862 | feature = _("PubSub Service"); |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
863 | else if(!strcmp(feature, "http://jabber.org/protocol/bytestreams")) |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
864 | feature = _("SOCKS5 Bytestreams"); |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
865 | else if(!strcmp(feature, "jabber:x:oob")) |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
866 | feature = _("Out of Band Data"); |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
867 | else if(!strcmp(feature, "http://jabber.org/protocol/xhtml-im")) |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
868 | feature = _("XHTML-IM"); |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
869 | else if(!strcmp(feature, "jabber:iq:register")) |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
870 | feature = _("In-Band Registration"); |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
871 | else if(!strcmp(feature, "http://jabber.org/protocol/geoloc")) |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
872 | feature = _("User Location"); |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
873 | else if(!strcmp(feature, "http://www.xmpp.org/extensions/xep-0084.html")) |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
874 | feature = _("User Avatar"); |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
875 | else if(!strcmp(feature, "http://jabber.org/protocol/chatstates")) |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
876 | feature = _("Chat State Notifications"); |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
877 | else if(!strcmp(feature, "jabber:iq:version")) |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
878 | feature = _("Software Version"); |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
879 | else if(!strcmp(feature, "http://jabber.org/protocol/si")) |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
880 | feature = _("Stream Initiation"); |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
881 | else if(!strcmp(feature, "http://jabber.org/protocol/si/profile/file-transfer")) |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
882 | feature = _("File Transfer"); |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
883 | else if(!strcmp(feature, "http://jabber.org/protocol/mood")) |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
884 | feature = _("User Mood"); |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
885 | else if(!strcmp(feature, "http://jabber.org/protocol/activity")) |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
886 | feature = _("User Activity"); |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
887 | else if(!strcmp(feature, "http://jabber.org/protocol/caps")) |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
888 | feature = _("Entity Capabilities"); |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
889 | else if(!strcmp(feature, "http://www.xmpp.org/extensions/xep-0116.html")) |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
890 | feature = _("Encrypted Session Negotiations"); |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
891 | else if(!strcmp(feature, "http://jabber.org/protocol/tune")) |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
892 | feature = _("User Tune"); |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
893 | else if(!strcmp(feature, "http://jabber.org/protocol/rosterx")) |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
894 | feature = _("Roster Item Exchange"); |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
895 | else if(!strcmp(feature, "http://jabber.org/protocol/reach")) |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
896 | feature = _("Reachability Address"); |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
897 | else if(!strcmp(feature, "http://jabber.org/protocol/profile")) |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
898 | feature = _("User Profile"); |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
899 | else if(!strcmp(feature, "http://www.xmpp.org/extensions/xep-0166.html#ns")) |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
900 | feature = _("Jingle"); |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
901 | else if(!strcmp(feature, "http://www.xmpp.org/extensions/xep-0167.html#ns")) |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
902 | feature = _("Jingle Audio"); |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
903 | else if(!strcmp(feature, "http://jabber.org/protocol/nick")) |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
904 | feature = _("User Nickname"); |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
905 | else if(!strcmp(feature, "http://www.xmpp.org/extensions/xep-0176.html#ns-udp")) |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
906 | feature = _("Jingle ICE UDP"); |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
907 | else if(!strcmp(feature, "http://www.xmpp.org/extensions/xep-0176.html#ns-tcp")) |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
908 | feature = _("Jingle ICE TCP"); |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
909 | else if(!strcmp(feature, "http://www.xmpp.org/extensions/xep-0177.html#ns")) |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
910 | feature = _("Jingle Raw UDP"); |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
911 | else if(!strcmp(feature, "http://www.xmpp.org/extensions/xep-0180.html#ns")) |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
912 | feature = _("Jingle Video"); |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
913 | else if(!strcmp(feature, "http://www.xmpp.org/extensions/xep-0181.html#ns")) |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
914 | feature = _("Jingle DTMF"); |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
915 | else if(!strcmp(feature, "http://www.xmpp.org/extensions/xep-0184.html#ns")) |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
916 | feature = _("Message Receipts"); |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
917 | else if(!strcmp(feature, "http://www.xmpp.org/extensions/xep-0189.html#ns")) |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
918 | feature = _("Public Key Publishing"); |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
919 | else if(!strcmp(feature, "http://jabber.org/protocol/chatting")) |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
920 | feature = _("User Chatting"); |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
921 | else if(!strcmp(feature, "http://jabber.org/protocol/browsing")) |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
922 | feature = _("User Browsing"); |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
923 | else if(!strcmp(feature, "http://jabber.org/protocol/gaming")) |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
924 | feature = _("User Gaming"); |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
925 | else if(!strcmp(feature, "http://jabber.org/protocol/viewing")) |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
926 | feature = _("User Viewing"); |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
927 | else if(!strcmp(feature, "urn:xmpp:ping") || !strcmp(feature, "http://www.xmpp.org/extensions/xep-0199.html#ns")) |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
928 | feature = _("Ping"); |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
929 | else if(!strcmp(feature, "http://www.xmpp.org/extensions/xep-0200.html#ns")) |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
930 | feature = _("Stanza Encryption"); |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
931 | else if(!strcmp(feature, "urn:xmpp:time")) |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
932 | feature = _("Entity Time"); |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
933 | else if(!strcmp(feature, "urn:xmpp:delay")) |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
934 | feature = _("Delayed Delivery"); |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
935 | else if(!strcmp(feature, "http://www.xmpp.org/extensions/xep-0204.html#ns")) |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
936 | feature = _("Collaborative Data Objects"); |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
937 | else if(!strcmp(feature, "http://jabber.org/protocol/fileshare")) |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
938 | feature = _("File Repository and Sharing"); |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
939 | else if(!strcmp(feature, "http://www.xmpp.org/extensions/xep-0215.html#ns")) |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
940 | feature = _("STUN Service Discovery for Jingle"); |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
941 | else if(!strcmp(feature, "http://www.xmpp.org/extensions/xep-0116.html#ns")) |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
942 | feature = _("Simplified Encrypted Session Negotiation"); |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
943 | else if(!strcmp(feature, "http://www.xmpp.org/extensions/xep-0219.html#ns")) |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
944 | feature = _("Hop Check"); |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
945 | else if(g_str_has_suffix(feature, "+notify")) |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
946 | feature = NULL; |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
947 | if(feature) |
|
19921
d920ce72002e
Dont spam the buddy info window with esoteric capabilities
Sean Egan <seanegan@pidgin.im>
parents:
19897
diff
changeset
|
948 | g_string_append_printf(tmp, "%s<br/>", feature); |
|
18798
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
949 | } |
|
19921
d920ce72002e
Dont spam the buddy info window with esoteric capabilities
Sean Egan <seanegan@pidgin.im>
parents:
19897
diff
changeset
|
950 | |
|
18798
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
951 | if(strlen(tmp->str) > 0) |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
952 | purple_notify_user_info_add_pair(user_info, _("Capabilities"), tmp->str); |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
953 | |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
954 | g_string_free(tmp, TRUE); |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
955 | } |
|
19921
d920ce72002e
Dont spam the buddy info window with esoteric capabilities
Sean Egan <seanegan@pidgin.im>
parents:
19897
diff
changeset
|
956 | #endif |
| 7014 | 957 | } else { |
| 13794 | 958 | for(resources = jbi->jb->resources; resources; resources = resources->next) { |
| 7145 | 959 | char *purdy = NULL; |
| 7014 | 960 | jbr = resources->data; |
| 7145 | 961 | if(jbr->status) |
| 15884 | 962 | purdy = purple_strdup_withhtml(jbr->status); |
|
15092
e7c5edee202e
[gaim-migrate @ 17813]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
14669
diff
changeset
|
963 | if(jbr->name) |
| 15884 | 964 | purple_notify_user_info_add_pair(user_info, _("Resource"), jbr->name); |
|
15205
f642029b2f97
[gaim-migrate @ 17929]
Evan Schoenberg <evands@pidgin.im>
parents:
15143
diff
changeset
|
965 | tmp = g_strdup_printf("%d", jbr->priority); |
| 15884 | 966 | purple_notify_user_info_add_pair(user_info, _("Priority"), tmp); |
|
15205
f642029b2f97
[gaim-migrate @ 17929]
Evan Schoenberg <evands@pidgin.im>
parents:
15143
diff
changeset
|
967 | g_free(tmp); |
|
f642029b2f97
[gaim-migrate @ 17929]
Evan Schoenberg <evands@pidgin.im>
parents:
15143
diff
changeset
|
968 | |
|
f642029b2f97
[gaim-migrate @ 17929]
Evan Schoenberg <evands@pidgin.im>
parents:
15143
diff
changeset
|
969 | tmp = g_strdup_printf("%s%s%s", jabber_buddy_state_get_name(jbr->state), |
|
f642029b2f97
[gaim-migrate @ 17929]
Evan Schoenberg <evands@pidgin.im>
parents:
15143
diff
changeset
|
970 | (purdy ? ": " : ""), |
|
f642029b2f97
[gaim-migrate @ 17929]
Evan Schoenberg <evands@pidgin.im>
parents:
15143
diff
changeset
|
971 | (purdy ? purdy : "")); |
| 15884 | 972 | purple_notify_user_info_add_pair(user_info, _("Status"), tmp); |
|
15205
f642029b2f97
[gaim-migrate @ 17929]
Evan Schoenberg <evands@pidgin.im>
parents:
15143
diff
changeset
|
973 | g_free(tmp); |
|
f642029b2f97
[gaim-migrate @ 17929]
Evan Schoenberg <evands@pidgin.im>
parents:
15143
diff
changeset
|
974 | g_free(purdy); |
| 13794 | 975 | |
|
15092
e7c5edee202e
[gaim-migrate @ 17813]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
14669
diff
changeset
|
976 | if(jbr->name) |
|
e7c5edee202e
[gaim-migrate @ 17813]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
14669
diff
changeset
|
977 | jbir = g_hash_table_lookup(jbi->resources, jbr->name); |
|
e7c5edee202e
[gaim-migrate @ 17813]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
14669
diff
changeset
|
978 | |
| 13794 | 979 | if(jbir) { |
| 980 | if(jbir->idle_seconds > 0) { | |
| 15884 | 981 | char *idle = purple_str_seconds_to_string(jbir->idle_seconds); |
| 982 | purple_notify_user_info_add_pair(user_info, _("Idle"), idle); | |
|
15688
048953c6b084
Fixed 3 Jabber memory leaks: in jabber_roster_parse(), there's no need to g_strdup() this normalized jid since it's only used immediately, and there was no correspoding g_free(). When removing an id from jbi->ids, its data should always be freed. Finally, gaim_str_seconds_to_string() returns retained memory -- we must free the returned pointer when we're done using it.
Evan Schoenberg <evands@pidgin.im>
parents:
15435
diff
changeset
|
983 | g_free(idle); |
| 13794 | 984 | } |
| 985 | } | |
|
15205
f642029b2f97
[gaim-migrate @ 17929]
Evan Schoenberg <evands@pidgin.im>
parents:
15143
diff
changeset
|
986 | if(jbr && jbr->client.name) { |
|
f642029b2f97
[gaim-migrate @ 17929]
Evan Schoenberg <evands@pidgin.im>
parents:
15143
diff
changeset
|
987 | tmp = g_strdup_printf("%s%s%s", jbr->client.name, |
|
f642029b2f97
[gaim-migrate @ 17929]
Evan Schoenberg <evands@pidgin.im>
parents:
15143
diff
changeset
|
988 | (jbr->client.version ? " " : ""), |
|
f642029b2f97
[gaim-migrate @ 17929]
Evan Schoenberg <evands@pidgin.im>
parents:
15143
diff
changeset
|
989 | (jbr->client.version ? jbr->client.version : "")); |
| 15884 | 990 | purple_notify_user_info_add_pair(user_info, |
|
15205
f642029b2f97
[gaim-migrate @ 17929]
Evan Schoenberg <evands@pidgin.im>
parents:
15143
diff
changeset
|
991 | _("Client"), tmp); |
|
f642029b2f97
[gaim-migrate @ 17929]
Evan Schoenberg <evands@pidgin.im>
parents:
15143
diff
changeset
|
992 | g_free(tmp); |
|
15727
0754583ceeae
Don't access the list element after it has been freed.
Daniel Atallah <datallah@pidgin.im>
parents:
15688
diff
changeset
|
993 | |
| 13794 | 994 | if(jbr->client.os) { |
| 15884 | 995 | purple_notify_user_info_add_pair(user_info, _("Operating System"), jbr->client.os); |
| 13794 | 996 | } |
| 997 | } | |
|
19921
d920ce72002e
Dont spam the buddy info window with esoteric capabilities
Sean Egan <seanegan@pidgin.im>
parents:
19897
diff
changeset
|
998 | #if 0 |
|
18798
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
999 | if(jbr && jbr->caps) { |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
1000 | GString *tmp = g_string_new(""); |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
1001 | GList *iter; |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
1002 | for(iter = jbr->caps->features; iter; iter = g_list_next(iter)) { |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
1003 | const char *feature = iter->data; |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
1004 | |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
1005 | if(!strcmp(feature, "jabber:iq:last")) |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
1006 | feature = _("Last Activity"); |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
1007 | else if(!strcmp(feature, "http://jabber.org/protocol/disco#info")) |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
1008 | feature = _("Service Discovery Info"); |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
1009 | else if(!strcmp(feature, "http://jabber.org/protocol/disco#items")) |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
1010 | feature = _("Service Discovery Items"); |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
1011 | else if(!strcmp(feature, "http://jabber.org/protocol/address")) |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
1012 | feature = _("Extended Stanza Addressing"); |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
1013 | else if(!strcmp(feature, "http://jabber.org/protocol/muc")) |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
1014 | feature = _("Multi-User Chat"); |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
1015 | else if(!strcmp(feature, "http://jabber.org/protocol/muc#user")) |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
1016 | feature = _("Multi-User Chat Extended Presence Information"); |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
1017 | else if(!strcmp(feature, "http://jabber.org/protocol/ibb")) |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
1018 | feature = _("In-Band Bytestreams"); |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
1019 | else if(!strcmp(feature, "http://jabber.org/protocol/commands")) |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
1020 | feature = _("Ad-Hoc Commands"); |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
1021 | else if(!strcmp(feature, "http://jabber.org/protocol/pubsub")) |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
1022 | feature = _("PubSub Service"); |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
1023 | else if(!strcmp(feature, "http://jabber.org/protocol/bytestreams")) |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
1024 | feature = _("SOCKS5 Bytestreams"); |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
1025 | else if(!strcmp(feature, "jabber:x:oob")) |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
1026 | feature = _("Out of Band Data"); |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
1027 | else if(!strcmp(feature, "http://jabber.org/protocol/xhtml-im")) |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
1028 | feature = _("XHTML-IM"); |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
1029 | else if(!strcmp(feature, "jabber:iq:register")) |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
1030 | feature = _("In-Band Registration"); |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
1031 | else if(!strcmp(feature, "http://jabber.org/protocol/geoloc")) |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
1032 | feature = _("User Location"); |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
1033 | else if(!strcmp(feature, "http://www.xmpp.org/extensions/xep-0084.html")) |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
1034 | feature = _("User Avatar"); |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
1035 | else if(!strcmp(feature, "http://jabber.org/protocol/chatstates")) |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
1036 | feature = _("Chat State Notifications"); |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
1037 | else if(!strcmp(feature, "jabber:iq:version")) |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
1038 | feature = _("Software Version"); |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
1039 | else if(!strcmp(feature, "http://jabber.org/protocol/si")) |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
1040 | feature = _("Stream Initiation"); |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
1041 | else if(!strcmp(feature, "http://jabber.org/protocol/si/profile/file-transfer")) |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
1042 | feature = _("File Transfer"); |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
1043 | else if(!strcmp(feature, "http://jabber.org/protocol/mood")) |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
1044 | feature = _("User Mood"); |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
1045 | else if(!strcmp(feature, "http://jabber.org/protocol/activity")) |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
1046 | feature = _("User Activity"); |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
1047 | else if(!strcmp(feature, "http://jabber.org/protocol/caps")) |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
1048 | feature = _("Entity Capabilities"); |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
1049 | else if(!strcmp(feature, "http://www.xmpp.org/extensions/xep-0116.html")) |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
1050 | feature = _("Encrypted Session Negotiations"); |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
1051 | else if(!strcmp(feature, "http://jabber.org/protocol/tune")) |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
1052 | feature = _("User Tune"); |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
1053 | else if(!strcmp(feature, "http://jabber.org/protocol/rosterx")) |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
1054 | feature = _("Roster Item Exchange"); |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
1055 | else if(!strcmp(feature, "http://jabber.org/protocol/reach")) |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
1056 | feature = _("Reachability Address"); |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
1057 | else if(!strcmp(feature, "http://jabber.org/protocol/profile")) |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
1058 | feature = _("User Profile"); |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
1059 | else if(!strcmp(feature, "http://www.xmpp.org/extensions/xep-0166.html#ns")) |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
1060 | feature = _("Jingle"); |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
1061 | else if(!strcmp(feature, "http://www.xmpp.org/extensions/xep-0167.html#ns")) |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
1062 | feature = _("Jingle Audio"); |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
1063 | else if(!strcmp(feature, "http://jabber.org/protocol/nick")) |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
1064 | feature = _("User Nickname"); |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
1065 | else if(!strcmp(feature, "http://www.xmpp.org/extensions/xep-0176.html#ns-udp")) |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
1066 | feature = _("Jingle ICE UDP"); |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
1067 | else if(!strcmp(feature, "http://www.xmpp.org/extensions/xep-0176.html#ns-tcp")) |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
1068 | feature = _("Jingle ICE TCP"); |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
1069 | else if(!strcmp(feature, "http://www.xmpp.org/extensions/xep-0177.html#ns")) |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
1070 | feature = _("Jingle Raw UDP"); |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
1071 | else if(!strcmp(feature, "http://www.xmpp.org/extensions/xep-0180.html#ns")) |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
1072 | feature = _("Jingle Video"); |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
1073 | else if(!strcmp(feature, "http://www.xmpp.org/extensions/xep-0181.html#ns")) |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
1074 | feature = _("Jingle DTMF"); |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
1075 | else if(!strcmp(feature, "http://www.xmpp.org/extensions/xep-0184.html#ns")) |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
1076 | feature = _("Message Receipts"); |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
1077 | else if(!strcmp(feature, "http://www.xmpp.org/extensions/xep-0189.html#ns")) |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
1078 | feature = _("Public Key Publishing"); |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
1079 | else if(!strcmp(feature, "http://jabber.org/protocol/chatting")) |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
1080 | feature = _("User Chatting"); |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
1081 | else if(!strcmp(feature, "http://jabber.org/protocol/browsing")) |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
1082 | feature = _("User Browsing"); |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
1083 | else if(!strcmp(feature, "http://jabber.org/protocol/gaming")) |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
1084 | feature = _("User Gaming"); |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
1085 | else if(!strcmp(feature, "http://jabber.org/protocol/viewing")) |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
1086 | feature = _("User Viewing"); |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
1087 | else if(!strcmp(feature, "urn:xmpp:ping") || !strcmp(feature, "http://www.xmpp.org/extensions/xep-0199.html#ns")) |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
1088 | feature = _("Ping"); |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
1089 | else if(!strcmp(feature, "http://www.xmpp.org/extensions/xep-0200.html#ns")) |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
1090 | feature = _("Stanza Encryption"); |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
1091 | else if(!strcmp(feature, "urn:xmpp:time")) |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
1092 | feature = _("Entity Time"); |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
1093 | else if(!strcmp(feature, "urn:xmpp:delay")) |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
1094 | feature = _("Delayed Delivery"); |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
1095 | else if(!strcmp(feature, "http://www.xmpp.org/extensions/xep-0204.html#ns")) |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
1096 | feature = _("Collaborative Data Objects"); |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
1097 | else if(!strcmp(feature, "http://jabber.org/protocol/fileshare")) |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
1098 | feature = _("File Repository and Sharing"); |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
1099 | else if(!strcmp(feature, "http://www.xmpp.org/extensions/xep-0215.html#ns")) |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
1100 | feature = _("STUN Service Discovery for Jingle"); |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
1101 | else if(!strcmp(feature, "http://www.xmpp.org/extensions/xep-0116.html#ns")) |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
1102 | feature = _("Simplified Encrypted Session Negotiation"); |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
1103 | else if(!strcmp(feature, "http://www.xmpp.org/extensions/xep-0219.html#ns")) |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
1104 | feature = _("Hop Check"); |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
1105 | else if(g_str_has_suffix(feature, "+notify")) |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
1106 | feature = NULL; |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
1107 | |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
1108 | if(feature) |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
1109 | g_string_append_printf(tmp, "%s\n", feature); |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
1110 | } |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
1111 | if(strlen(tmp->str) > 0) |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
1112 | purple_notify_user_info_add_pair(user_info, _("Capabilities"), tmp->str); |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
1113 | |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
1114 | g_string_free(tmp, TRUE); |
|
148a6c45b6f7
Now displaying a contact's client's capabilities in the info text if that client supports the caps extension.
Andreas Monitzer <am@adiumx.com>
parents:
18718
diff
changeset
|
1115 | } |
|
19921
d920ce72002e
Dont spam the buddy info window with esoteric capabilities
Sean Egan <seanegan@pidgin.im>
parents:
19897
diff
changeset
|
1116 | #endif |
| 7014 | 1117 | } |
| 1118 | } | |
| 1119 | ||
| 7306 | 1120 | g_free(resource_name); |
| 1121 | ||
|
15205
f642029b2f97
[gaim-migrate @ 17929]
Evan Schoenberg <evands@pidgin.im>
parents:
15143
diff
changeset
|
1122 | if (jbi->vcard_text != NULL) { |
| 15884 | 1123 | purple_notify_user_info_add_section_break(user_info); |
|
15205
f642029b2f97
[gaim-migrate @ 17929]
Evan Schoenberg <evands@pidgin.im>
parents:
15143
diff
changeset
|
1124 | /* Should this have some sort of label? */ |
| 15884 | 1125 | purple_notify_user_info_add_pair(user_info, NULL, jbi->vcard_text); |
|
15205
f642029b2f97
[gaim-migrate @ 17929]
Evan Schoenberg <evands@pidgin.im>
parents:
15143
diff
changeset
|
1126 | } |
| 13794 | 1127 | |
| 15884 | 1128 | purple_notify_userinfo(jbi->js->gc, jbi->jid, user_info, NULL, NULL); |
| 1129 | purple_notify_user_info_destroy(user_info); | |
| 13794 | 1130 | |
| 1131 | while(jbi->vcard_imgids) { | |
|
16437
7ff7c3405ea2
Rework the buddy icon subsystem to use the imgstore subsystem, and modify the
Richard Laager <rlaager@pidgin.im>
parents:
15884
diff
changeset
|
1132 | purple_imgstore_unref_by_id(GPOINTER_TO_INT(jbi->vcard_imgids->data)); |
| 13794 | 1133 | jbi->vcard_imgids = g_slist_delete_link(jbi->vcard_imgids, jbi->vcard_imgids); |
| 1134 | } | |
| 1135 | ||
|
15363
f6b9d1e3d0cb
[gaim-migrate @ 18092]
Evan Schoenberg <evands@pidgin.im>
parents:
15273
diff
changeset
|
1136 | jbi->js->pending_buddy_info_requests = g_slist_remove(jbi->js->pending_buddy_info_requests, jbi); |
|
14155
c754f6e5be1f
[gaim-migrate @ 16719]
Mark Doliner <markdoliner@pidgin.im>
parents:
14130
diff
changeset
|
1137 | |
|
15363
f6b9d1e3d0cb
[gaim-migrate @ 18092]
Evan Schoenberg <evands@pidgin.im>
parents:
15273
diff
changeset
|
1138 | jabber_buddy_info_destroy(jbi); |
| 13794 | 1139 | } |
| 1140 | ||
| 1141 | static void jabber_buddy_info_remove_id(JabberBuddyInfo *jbi, const char *id) | |
| 1142 | { | |
| 1143 | GSList *l = jbi->ids; | |
|
15727
0754583ceeae
Don't access the list element after it has been freed.
Daniel Atallah <datallah@pidgin.im>
parents:
15688
diff
changeset
|
1144 | char *comp_id; |
| 13794 | 1145 | |
| 1146 | if(!id) | |
| 1147 | return; | |
| 1148 | ||
| 1149 | while(l) { | |
|
15727
0754583ceeae
Don't access the list element after it has been freed.
Daniel Atallah <datallah@pidgin.im>
parents:
15688
diff
changeset
|
1150 | comp_id = l->data; |
|
0754583ceeae
Don't access the list element after it has been freed.
Daniel Atallah <datallah@pidgin.im>
parents:
15688
diff
changeset
|
1151 | if(!strcmp(id, comp_id)) { |
|
0754583ceeae
Don't access the list element after it has been freed.
Daniel Atallah <datallah@pidgin.im>
parents:
15688
diff
changeset
|
1152 | jbi->ids = g_slist_remove(jbi->ids, comp_id); |
|
0754583ceeae
Don't access the list element after it has been freed.
Daniel Atallah <datallah@pidgin.im>
parents:
15688
diff
changeset
|
1153 | g_free(comp_id); |
| 13794 | 1154 | return; |
| 1155 | } | |
| 1156 | l = l->next; | |
| 1157 | } | |
| 1158 | } | |
| 1159 | ||
|
18235
60a9bd99f035
server-side jabber vcards now take precedence over local vcards, so
Nathan Walp <nwalp@pidgin.im>
parents:
18196
diff
changeset
|
1160 | static void jabber_vcard_save_mine(JabberStream *js, xmlnode *packet, gpointer data) |
|
60a9bd99f035
server-side jabber vcards now take precedence over local vcards, so
Nathan Walp <nwalp@pidgin.im>
parents:
18196
diff
changeset
|
1161 | { |
|
60a9bd99f035
server-side jabber vcards now take precedence over local vcards, so
Nathan Walp <nwalp@pidgin.im>
parents:
18196
diff
changeset
|
1162 | xmlnode *vcard; |
|
60a9bd99f035
server-side jabber vcards now take precedence over local vcards, so
Nathan Walp <nwalp@pidgin.im>
parents:
18196
diff
changeset
|
1163 | char *txt; |
|
60a9bd99f035
server-side jabber vcards now take precedence over local vcards, so
Nathan Walp <nwalp@pidgin.im>
parents:
18196
diff
changeset
|
1164 | PurpleStoredImage *img; |
|
60a9bd99f035
server-side jabber vcards now take precedence over local vcards, so
Nathan Walp <nwalp@pidgin.im>
parents:
18196
diff
changeset
|
1165 | |
|
60a9bd99f035
server-side jabber vcards now take precedence over local vcards, so
Nathan Walp <nwalp@pidgin.im>
parents:
18196
diff
changeset
|
1166 | if((vcard = xmlnode_get_child(packet, "vCard")) || |
|
60a9bd99f035
server-side jabber vcards now take precedence over local vcards, so
Nathan Walp <nwalp@pidgin.im>
parents:
18196
diff
changeset
|
1167 | (vcard = xmlnode_get_child_with_namespace(packet, "query", "vcard-temp"))) |
|
60a9bd99f035
server-side jabber vcards now take precedence over local vcards, so
Nathan Walp <nwalp@pidgin.im>
parents:
18196
diff
changeset
|
1168 | { |
|
60a9bd99f035
server-side jabber vcards now take precedence over local vcards, so
Nathan Walp <nwalp@pidgin.im>
parents:
18196
diff
changeset
|
1169 | txt = xmlnode_to_str(vcard, NULL); |
|
60a9bd99f035
server-side jabber vcards now take precedence over local vcards, so
Nathan Walp <nwalp@pidgin.im>
parents:
18196
diff
changeset
|
1170 | purple_account_set_user_info(purple_connection_get_account(js->gc), txt); |
|
60a9bd99f035
server-side jabber vcards now take precedence over local vcards, so
Nathan Walp <nwalp@pidgin.im>
parents:
18196
diff
changeset
|
1171 | |
|
60a9bd99f035
server-side jabber vcards now take precedence over local vcards, so
Nathan Walp <nwalp@pidgin.im>
parents:
18196
diff
changeset
|
1172 | g_free(txt); |
|
60a9bd99f035
server-side jabber vcards now take precedence over local vcards, so
Nathan Walp <nwalp@pidgin.im>
parents:
18196
diff
changeset
|
1173 | } else { |
|
60a9bd99f035
server-side jabber vcards now take precedence over local vcards, so
Nathan Walp <nwalp@pidgin.im>
parents:
18196
diff
changeset
|
1174 | /* if we have no vCard, then lets not overwrite what we might have locally */ |
|
60a9bd99f035
server-side jabber vcards now take precedence over local vcards, so
Nathan Walp <nwalp@pidgin.im>
parents:
18196
diff
changeset
|
1175 | } |
|
60a9bd99f035
server-side jabber vcards now take precedence over local vcards, so
Nathan Walp <nwalp@pidgin.im>
parents:
18196
diff
changeset
|
1176 | |
|
60a9bd99f035
server-side jabber vcards now take precedence over local vcards, so
Nathan Walp <nwalp@pidgin.im>
parents:
18196
diff
changeset
|
1177 | js->vcard_fetched = TRUE; |
|
60a9bd99f035
server-side jabber vcards now take precedence over local vcards, so
Nathan Walp <nwalp@pidgin.im>
parents:
18196
diff
changeset
|
1178 | |
|
60a9bd99f035
server-side jabber vcards now take precedence over local vcards, so
Nathan Walp <nwalp@pidgin.im>
parents:
18196
diff
changeset
|
1179 | if(NULL != (img = purple_buddy_icons_find_account_icon(js->gc->account))) { |
|
60a9bd99f035
server-side jabber vcards now take precedence over local vcards, so
Nathan Walp <nwalp@pidgin.im>
parents:
18196
diff
changeset
|
1180 | jabber_set_buddy_icon(js->gc, img); |
|
60a9bd99f035
server-side jabber vcards now take precedence over local vcards, so
Nathan Walp <nwalp@pidgin.im>
parents:
18196
diff
changeset
|
1181 | purple_imgstore_unref(img); |
|
60a9bd99f035
server-side jabber vcards now take precedence over local vcards, so
Nathan Walp <nwalp@pidgin.im>
parents:
18196
diff
changeset
|
1182 | } |
|
60a9bd99f035
server-side jabber vcards now take precedence over local vcards, so
Nathan Walp <nwalp@pidgin.im>
parents:
18196
diff
changeset
|
1183 | } |
|
60a9bd99f035
server-side jabber vcards now take precedence over local vcards, so
Nathan Walp <nwalp@pidgin.im>
parents:
18196
diff
changeset
|
1184 | |
|
60a9bd99f035
server-side jabber vcards now take precedence over local vcards, so
Nathan Walp <nwalp@pidgin.im>
parents:
18196
diff
changeset
|
1185 | void jabber_vcard_fetch_mine(JabberStream *js) |
|
60a9bd99f035
server-side jabber vcards now take precedence over local vcards, so
Nathan Walp <nwalp@pidgin.im>
parents:
18196
diff
changeset
|
1186 | { |
|
21957
0ce77f86c7f3
Fix XMPP buddy icons. Somehow a 'VCard' element got changed to a query
Sean Egan <seanegan@pidgin.im>
parents:
21681
diff
changeset
|
1187 | JabberIq *iq = jabber_iq_new(js, JABBER_IQ_GET); |
|
0ce77f86c7f3
Fix XMPP buddy icons. Somehow a 'VCard' element got changed to a query
Sean Egan <seanegan@pidgin.im>
parents:
21681
diff
changeset
|
1188 | |
|
0ce77f86c7f3
Fix XMPP buddy icons. Somehow a 'VCard' element got changed to a query
Sean Egan <seanegan@pidgin.im>
parents:
21681
diff
changeset
|
1189 | xmlnode *vcard = xmlnode_new_child(iq->node, "vCard"); |
|
0ce77f86c7f3
Fix XMPP buddy icons. Somehow a 'VCard' element got changed to a query
Sean Egan <seanegan@pidgin.im>
parents:
21681
diff
changeset
|
1190 | xmlnode_set_namespace(vcard, "vcard-temp"); |
|
18235
60a9bd99f035
server-side jabber vcards now take precedence over local vcards, so
Nathan Walp <nwalp@pidgin.im>
parents:
18196
diff
changeset
|
1191 | jabber_iq_set_callback(iq, jabber_vcard_save_mine, NULL); |
|
60a9bd99f035
server-side jabber vcards now take precedence over local vcards, so
Nathan Walp <nwalp@pidgin.im>
parents:
18196
diff
changeset
|
1192 | |
|
60a9bd99f035
server-side jabber vcards now take precedence over local vcards, so
Nathan Walp <nwalp@pidgin.im>
parents:
18196
diff
changeset
|
1193 | jabber_iq_send(iq); |
|
60a9bd99f035
server-side jabber vcards now take precedence over local vcards, so
Nathan Walp <nwalp@pidgin.im>
parents:
18196
diff
changeset
|
1194 | } |
|
60a9bd99f035
server-side jabber vcards now take precedence over local vcards, so
Nathan Walp <nwalp@pidgin.im>
parents:
18196
diff
changeset
|
1195 | |
|
19931
229fb62285b0
Data in vCards is supposed to be plain text, not HTML. So escape
Mark Doliner <markdoliner@pidgin.im>
parents:
19921
diff
changeset
|
1196 | static void |
|
229fb62285b0
Data in vCards is supposed to be plain text, not HTML. So escape
Mark Doliner <markdoliner@pidgin.im>
parents:
19921
diff
changeset
|
1197 | jabber_string_escape_and_append(GString *string, const char *name, const char *value, gboolean indent) |
|
229fb62285b0
Data in vCards is supposed to be plain text, not HTML. So escape
Mark Doliner <markdoliner@pidgin.im>
parents:
19921
diff
changeset
|
1198 | { |
|
229fb62285b0
Data in vCards is supposed to be plain text, not HTML. So escape
Mark Doliner <markdoliner@pidgin.im>
parents:
19921
diff
changeset
|
1199 | gchar *escaped; |
|
229fb62285b0
Data in vCards is supposed to be plain text, not HTML. So escape
Mark Doliner <markdoliner@pidgin.im>
parents:
19921
diff
changeset
|
1200 | |
|
229fb62285b0
Data in vCards is supposed to be plain text, not HTML. So escape
Mark Doliner <markdoliner@pidgin.im>
parents:
19921
diff
changeset
|
1201 | escaped = g_markup_escape_text(value, -1); |
|
229fb62285b0
Data in vCards is supposed to be plain text, not HTML. So escape
Mark Doliner <markdoliner@pidgin.im>
parents:
19921
diff
changeset
|
1202 | g_string_append_printf(string, "%s<b>%s:</b> %s<br/>", |
|
229fb62285b0
Data in vCards is supposed to be plain text, not HTML. So escape
Mark Doliner <markdoliner@pidgin.im>
parents:
19921
diff
changeset
|
1203 | indent ? " " : "", name, escaped); |
|
229fb62285b0
Data in vCards is supposed to be plain text, not HTML. So escape
Mark Doliner <markdoliner@pidgin.im>
parents:
19921
diff
changeset
|
1204 | g_free(escaped); |
|
229fb62285b0
Data in vCards is supposed to be plain text, not HTML. So escape
Mark Doliner <markdoliner@pidgin.im>
parents:
19921
diff
changeset
|
1205 | } |
|
229fb62285b0
Data in vCards is supposed to be plain text, not HTML. So escape
Mark Doliner <markdoliner@pidgin.im>
parents:
19921
diff
changeset
|
1206 | |
| 13794 | 1207 | static void jabber_vcard_parse(JabberStream *js, xmlnode *packet, gpointer data) |
| 1208 | { | |
|
14129
70db31dfeeb1
[gaim-migrate @ 16688]
Daniel Atallah <datallah@pidgin.im>
parents:
13808
diff
changeset
|
1209 | const char *id, *from; |
| 13794 | 1210 | GString *info_text; |
| 1211 | char *bare_jid; | |
| 1212 | char *text; | |
|
22586
ae2d0016b91e
If we receive a Full Name and no nickname, use the Full Name as the serverside alias for an XMPP contact. If we receive just a nickname or both a full name and a nickname, prefer the nickname.
Evan Schoenberg <evands@pidgin.im>
parents:
22550
diff
changeset
|
1213 | char *serverside_alias = NULL; |
| 13794 | 1214 | xmlnode *vcard; |
| 15884 | 1215 | PurpleBuddy *b; |
| 13794 | 1216 | JabberBuddyInfo *jbi = data; |
| 1217 | ||
| 1218 | from = xmlnode_get_attrib(packet, "from"); | |
| 1219 | id = xmlnode_get_attrib(packet, "id"); | |
| 1220 | ||
| 1221 | if(!jbi) | |
| 1222 | return; | |
| 1223 | ||
|
14129
70db31dfeeb1
[gaim-migrate @ 16688]
Daniel Atallah <datallah@pidgin.im>
parents:
13808
diff
changeset
|
1224 | jabber_buddy_info_remove_id(jbi, id); |
|
70db31dfeeb1
[gaim-migrate @ 16688]
Daniel Atallah <datallah@pidgin.im>
parents:
13808
diff
changeset
|
1225 | |
| 13794 | 1226 | if(!from) |
| 1227 | return; | |
| 1228 | ||
|
14129
70db31dfeeb1
[gaim-migrate @ 16688]
Daniel Atallah <datallah@pidgin.im>
parents:
13808
diff
changeset
|
1229 | if(!jabber_buddy_find(js, from, FALSE)) |
| 13794 | 1230 | return; |
| 1231 | ||
| 1232 | /* XXX: handle the error case */ | |
| 1233 | ||
| 1234 | bare_jid = jabber_get_bare_jid(from); | |
| 1235 | ||
| 15884 | 1236 | b = purple_find_buddy(js->gc->account, bare_jid); |
| 13794 | 1237 | |
| 1238 | info_text = g_string_new(""); | |
| 1239 | ||
| 10189 | 1240 | if((vcard = xmlnode_get_child(packet, "vCard")) || |
| 1241 | (vcard = xmlnode_get_child_with_namespace(packet, "query", "vcard-temp"))) { | |
| 7014 | 1242 | xmlnode *child; |
| 1243 | for(child = vcard->child; child; child = child->next) | |
| 1244 | { | |
| 1245 | xmlnode *child2; | |
| 1246 | ||
| 8135 | 1247 | if(child->type != XMLNODE_TYPE_TAG) |
| 7014 | 1248 | continue; |
| 1249 | ||
| 1250 | text = xmlnode_get_data(child); | |
| 1251 | if(text && !strcmp(child->name, "FN")) { | |
|
22586
ae2d0016b91e
If we receive a Full Name and no nickname, use the Full Name as the serverside alias for an XMPP contact. If we receive just a nickname or both a full name and a nickname, prefer the nickname.
Evan Schoenberg <evands@pidgin.im>
parents:
22550
diff
changeset
|
1252 | /* If we havne't found a name yet, use this one as the serverside name */ |
|
ae2d0016b91e
If we receive a Full Name and no nickname, use the Full Name as the serverside alias for an XMPP contact. If we receive just a nickname or both a full name and a nickname, prefer the nickname.
Evan Schoenberg <evands@pidgin.im>
parents:
22550
diff
changeset
|
1253 | if (!serverside_alias) |
|
ae2d0016b91e
If we receive a Full Name and no nickname, use the Full Name as the serverside alias for an XMPP contact. If we receive just a nickname or both a full name and a nickname, prefer the nickname.
Evan Schoenberg <evands@pidgin.im>
parents:
22550
diff
changeset
|
1254 | serverside_alias = g_strdup(text); |
|
ae2d0016b91e
If we receive a Full Name and no nickname, use the Full Name as the serverside alias for an XMPP contact. If we receive just a nickname or both a full name and a nickname, prefer the nickname.
Evan Schoenberg <evands@pidgin.im>
parents:
22550
diff
changeset
|
1255 | |
|
19931
229fb62285b0
Data in vCards is supposed to be plain text, not HTML. So escape
Mark Doliner <markdoliner@pidgin.im>
parents:
19921
diff
changeset
|
1256 | jabber_string_escape_and_append(info_text, |
|
229fb62285b0
Data in vCards is supposed to be plain text, not HTML. So escape
Mark Doliner <markdoliner@pidgin.im>
parents:
19921
diff
changeset
|
1257 | _("Full Name"), text, FALSE); |
| 7014 | 1258 | } else if(!strcmp(child->name, "N")) { |
| 1259 | for(child2 = child->child; child2; child2 = child2->next) | |
| 1260 | { | |
| 1261 | char *text2; | |
| 1262 | ||
| 8135 | 1263 | if(child2->type != XMLNODE_TYPE_TAG) |
| 7014 | 1264 | continue; |
| 1265 | ||
| 1266 | text2 = xmlnode_get_data(child2); | |
| 1267 | if(text2 && !strcmp(child2->name, "FAMILY")) { | |
|
19931
229fb62285b0
Data in vCards is supposed to be plain text, not HTML. So escape
Mark Doliner <markdoliner@pidgin.im>
parents:
19921
diff
changeset
|
1268 | jabber_string_escape_and_append(info_text, |
|
229fb62285b0
Data in vCards is supposed to be plain text, not HTML. So escape
Mark Doliner <markdoliner@pidgin.im>
parents:
19921
diff
changeset
|
1269 | _("Family Name"), text2, FALSE); |
| 7014 | 1270 | } else if(text2 && !strcmp(child2->name, "GIVEN")) { |
|
19931
229fb62285b0
Data in vCards is supposed to be plain text, not HTML. So escape
Mark Doliner <markdoliner@pidgin.im>
parents:
19921
diff
changeset
|
1271 | jabber_string_escape_and_append(info_text, |
|
229fb62285b0
Data in vCards is supposed to be plain text, not HTML. So escape
Mark Doliner <markdoliner@pidgin.im>
parents:
19921
diff
changeset
|
1272 | _("Given Name"), text2, FALSE); |
| 7014 | 1273 | } else if(text2 && !strcmp(child2->name, "MIDDLE")) { |
|
19931
229fb62285b0
Data in vCards is supposed to be plain text, not HTML. So escape
Mark Doliner <markdoliner@pidgin.im>
parents:
19921
diff
changeset
|
1274 | jabber_string_escape_and_append(info_text, |
|
229fb62285b0
Data in vCards is supposed to be plain text, not HTML. So escape
Mark Doliner <markdoliner@pidgin.im>
parents:
19921
diff
changeset
|
1275 | _("Middle Name"), text2, FALSE); |
| 7014 | 1276 | } |
| 1277 | g_free(text2); | |
| 1278 | } | |
|
22586
ae2d0016b91e
If we receive a Full Name and no nickname, use the Full Name as the serverside alias for an XMPP contact. If we receive just a nickname or both a full name and a nickname, prefer the nickname.
Evan Schoenberg <evands@pidgin.im>
parents:
22550
diff
changeset
|
1279 | } else if(text && !strcmp(child->name, "NICKNAME")) { |
|
ae2d0016b91e
If we receive a Full Name and no nickname, use the Full Name as the serverside alias for an XMPP contact. If we receive just a nickname or both a full name and a nickname, prefer the nickname.
Evan Schoenberg <evands@pidgin.im>
parents:
22550
diff
changeset
|
1280 | /* Prefer the Nickcname to the Full Name as the serverside alias */ |
|
ae2d0016b91e
If we receive a Full Name and no nickname, use the Full Name as the serverside alias for an XMPP contact. If we receive just a nickname or both a full name and a nickname, prefer the nickname.
Evan Schoenberg <evands@pidgin.im>
parents:
22550
diff
changeset
|
1281 | g_free(serverside_alias); |
|
ae2d0016b91e
If we receive a Full Name and no nickname, use the Full Name as the serverside alias for an XMPP contact. If we receive just a nickname or both a full name and a nickname, prefer the nickname.
Evan Schoenberg <evands@pidgin.im>
parents:
22550
diff
changeset
|
1282 | serverside_alias = g_strdup(text); |
|
ae2d0016b91e
If we receive a Full Name and no nickname, use the Full Name as the serverside alias for an XMPP contact. If we receive just a nickname or both a full name and a nickname, prefer the nickname.
Evan Schoenberg <evands@pidgin.im>
parents:
22550
diff
changeset
|
1283 | |
|
19931
229fb62285b0
Data in vCards is supposed to be plain text, not HTML. So escape
Mark Doliner <markdoliner@pidgin.im>
parents:
19921
diff
changeset
|
1284 | jabber_string_escape_and_append(info_text, |
|
229fb62285b0
Data in vCards is supposed to be plain text, not HTML. So escape
Mark Doliner <markdoliner@pidgin.im>
parents:
19921
diff
changeset
|
1285 | _("Nickname"), text, FALSE); |
| 7014 | 1286 | } else if(text && !strcmp(child->name, "BDAY")) { |
|
19931
229fb62285b0
Data in vCards is supposed to be plain text, not HTML. So escape
Mark Doliner <markdoliner@pidgin.im>
parents:
19921
diff
changeset
|
1287 | jabber_string_escape_and_append(info_text, |
|
229fb62285b0
Data in vCards is supposed to be plain text, not HTML. So escape
Mark Doliner <markdoliner@pidgin.im>
parents:
19921
diff
changeset
|
1288 | _("Birthday"), text, FALSE); |
| 7014 | 1289 | } else if(!strcmp(child->name, "ADR")) { |
|
12933
885970470a9b
[gaim-migrate @ 15286]
Richard Laager <rlaager@pidgin.im>
parents:
12919
diff
changeset
|
1290 | gboolean address_line_added = FALSE; |
|
885970470a9b
[gaim-migrate @ 15286]
Richard Laager <rlaager@pidgin.im>
parents:
12919
diff
changeset
|
1291 | |
| 7014 | 1292 | for(child2 = child->child; child2; child2 = child2->next) |
| 1293 | { | |
| 1294 | char *text2; | |
| 1295 | ||
| 8135 | 1296 | if(child2->type != XMLNODE_TYPE_TAG) |
| 7014 | 1297 | continue; |
| 1298 | ||
| 1299 | text2 = xmlnode_get_data(child2); | |
|
12933
885970470a9b
[gaim-migrate @ 15286]
Richard Laager <rlaager@pidgin.im>
parents:
12919
diff
changeset
|
1300 | if (text2 == NULL) |
|
885970470a9b
[gaim-migrate @ 15286]
Richard Laager <rlaager@pidgin.im>
parents:
12919
diff
changeset
|
1301 | continue; |
|
885970470a9b
[gaim-migrate @ 15286]
Richard Laager <rlaager@pidgin.im>
parents:
12919
diff
changeset
|
1302 | |
|
885970470a9b
[gaim-migrate @ 15286]
Richard Laager <rlaager@pidgin.im>
parents:
12919
diff
changeset
|
1303 | /* We do this here so that it's not added if all the child |
|
885970470a9b
[gaim-migrate @ 15286]
Richard Laager <rlaager@pidgin.im>
parents:
12919
diff
changeset
|
1304 | * elements are empty. */ |
|
885970470a9b
[gaim-migrate @ 15286]
Richard Laager <rlaager@pidgin.im>
parents:
12919
diff
changeset
|
1305 | if (!address_line_added) |
|
885970470a9b
[gaim-migrate @ 15286]
Richard Laager <rlaager@pidgin.im>
parents:
12919
diff
changeset
|
1306 | { |
|
885970470a9b
[gaim-migrate @ 15286]
Richard Laager <rlaager@pidgin.im>
parents:
12919
diff
changeset
|
1307 | g_string_append_printf(info_text, "<b>%s:</b><br/>", |
|
885970470a9b
[gaim-migrate @ 15286]
Richard Laager <rlaager@pidgin.im>
parents:
12919
diff
changeset
|
1308 | _("Address")); |
|
885970470a9b
[gaim-migrate @ 15286]
Richard Laager <rlaager@pidgin.im>
parents:
12919
diff
changeset
|
1309 | address_line_added = TRUE; |
|
885970470a9b
[gaim-migrate @ 15286]
Richard Laager <rlaager@pidgin.im>
parents:
12919
diff
changeset
|
1310 | } |
|
885970470a9b
[gaim-migrate @ 15286]
Richard Laager <rlaager@pidgin.im>
parents:
12919
diff
changeset
|
1311 | |
|
885970470a9b
[gaim-migrate @ 15286]
Richard Laager <rlaager@pidgin.im>
parents:
12919
diff
changeset
|
1312 | if(!strcmp(child2->name, "POBOX")) { |
|
19931
229fb62285b0
Data in vCards is supposed to be plain text, not HTML. So escape
Mark Doliner <markdoliner@pidgin.im>
parents:
19921
diff
changeset
|
1313 | jabber_string_escape_and_append(info_text, |
|
229fb62285b0
Data in vCards is supposed to be plain text, not HTML. So escape
Mark Doliner <markdoliner@pidgin.im>
parents:
19921
diff
changeset
|
1314 | _("P.O. Box"), text2, TRUE); |
|
12933
885970470a9b
[gaim-migrate @ 15286]
Richard Laager <rlaager@pidgin.im>
parents:
12919
diff
changeset
|
1315 | } else if(!strcmp(child2->name, "EXTADR")) { |
|
19931
229fb62285b0
Data in vCards is supposed to be plain text, not HTML. So escape
Mark Doliner <markdoliner@pidgin.im>
parents:
19921
diff
changeset
|
1316 | jabber_string_escape_and_append(info_text, |
|
229fb62285b0
Data in vCards is supposed to be plain text, not HTML. So escape
Mark Doliner <markdoliner@pidgin.im>
parents:
19921
diff
changeset
|
1317 | _("Extended Address"), text2, TRUE); |
|
12933
885970470a9b
[gaim-migrate @ 15286]
Richard Laager <rlaager@pidgin.im>
parents:
12919
diff
changeset
|
1318 | } else if(!strcmp(child2->name, "STREET")) { |
|
19931
229fb62285b0
Data in vCards is supposed to be plain text, not HTML. So escape
Mark Doliner <markdoliner@pidgin.im>
parents:
19921
diff
changeset
|
1319 | jabber_string_escape_and_append(info_text, |
|
229fb62285b0
Data in vCards is supposed to be plain text, not HTML. So escape
Mark Doliner <markdoliner@pidgin.im>
parents:
19921
diff
changeset
|
1320 | _("Street Address"), text2, TRUE); |
|
12933
885970470a9b
[gaim-migrate @ 15286]
Richard Laager <rlaager@pidgin.im>
parents:
12919
diff
changeset
|
1321 | } else if(!strcmp(child2->name, "LOCALITY")) { |
|
19931
229fb62285b0
Data in vCards is supposed to be plain text, not HTML. So escape
Mark Doliner <markdoliner@pidgin.im>
parents:
19921
diff
changeset
|
1322 | jabber_string_escape_and_append(info_text, |
|
229fb62285b0
Data in vCards is supposed to be plain text, not HTML. So escape
Mark Doliner <markdoliner@pidgin.im>
parents:
19921
diff
changeset
|
1323 | _("Locality"), text2, TRUE); |
|
12933
885970470a9b
[gaim-migrate @ 15286]
Richard Laager <rlaager@pidgin.im>
parents:
12919
diff
changeset
|
1324 | } else if(!strcmp(child2->name, "REGION")) { |
|
19931
229fb62285b0
Data in vCards is supposed to be plain text, not HTML. So escape
Mark Doliner <markdoliner@pidgin.im>
parents:
19921
diff
changeset
|
1325 | jabber_string_escape_and_append(info_text, |
|
229fb62285b0
Data in vCards is supposed to be plain text, not HTML. So escape
Mark Doliner <markdoliner@pidgin.im>
parents:
19921
diff
changeset
|
1326 | _("Region"), text2, TRUE); |
|
12933
885970470a9b
[gaim-migrate @ 15286]
Richard Laager <rlaager@pidgin.im>
parents:
12919
diff
changeset
|
1327 | } else if(!strcmp(child2->name, "PCODE")) { |
|
19931
229fb62285b0
Data in vCards is supposed to be plain text, not HTML. So escape
Mark Doliner <markdoliner@pidgin.im>
parents:
19921
diff
changeset
|
1328 | jabber_string_escape_and_append(info_text, |
|
229fb62285b0
Data in vCards is supposed to be plain text, not HTML. So escape
Mark Doliner <markdoliner@pidgin.im>
parents:
19921
diff
changeset
|
1329 | _("Postal Code"), text2, TRUE); |
|
12933
885970470a9b
[gaim-migrate @ 15286]
Richard Laager <rlaager@pidgin.im>
parents:
12919
diff
changeset
|
1330 | } else if(!strcmp(child2->name, "CTRY") |
|
885970470a9b
[gaim-migrate @ 15286]
Richard Laager <rlaager@pidgin.im>
parents:
12919
diff
changeset
|
1331 | || !strcmp(child2->name, "COUNTRY")) { |
|
19931
229fb62285b0
Data in vCards is supposed to be plain text, not HTML. So escape
Mark Doliner <markdoliner@pidgin.im>
parents:
19921
diff
changeset
|
1332 | jabber_string_escape_and_append(info_text, |
|
229fb62285b0
Data in vCards is supposed to be plain text, not HTML. So escape
Mark Doliner <markdoliner@pidgin.im>
parents:
19921
diff
changeset
|
1333 | _("Country"), text2, TRUE); |
| 7014 | 1334 | } |
| 1335 | g_free(text2); | |
| 1336 | } | |
| 1337 | } else if(!strcmp(child->name, "TEL")) { | |
| 1338 | char *number; | |
| 1339 | if((child2 = xmlnode_get_child(child, "NUMBER"))) { | |
| 1340 | /* show what kind of number it is */ | |
| 1341 | number = xmlnode_get_data(child2); | |
| 1342 | if(number) { | |
|
19931
229fb62285b0
Data in vCards is supposed to be plain text, not HTML. So escape
Mark Doliner <markdoliner@pidgin.im>
parents:
19921
diff
changeset
|
1343 | jabber_string_escape_and_append(info_text, |
|
229fb62285b0
Data in vCards is supposed to be plain text, not HTML. So escape
Mark Doliner <markdoliner@pidgin.im>
parents:
19921
diff
changeset
|
1344 | _("Telephone"), number, FALSE); |
| 7014 | 1345 | g_free(number); |
| 1346 | } | |
| 1347 | } else if((number = xmlnode_get_data(child))) { | |
| 15884 | 1348 | /* lots of clients (including purple) do this, but it's |
| 7014 | 1349 | * out of spec */ |
|
19931
229fb62285b0
Data in vCards is supposed to be plain text, not HTML. So escape
Mark Doliner <markdoliner@pidgin.im>
parents:
19921
diff
changeset
|
1350 | jabber_string_escape_and_append(info_text, |
|
229fb62285b0
Data in vCards is supposed to be plain text, not HTML. So escape
Mark Doliner <markdoliner@pidgin.im>
parents:
19921
diff
changeset
|
1351 | _("Telephone"), number, FALSE); |
| 7014 | 1352 | g_free(number); |
| 1353 | } | |
| 1354 | } else if(!strcmp(child->name, "EMAIL")) { | |
|
19931
229fb62285b0
Data in vCards is supposed to be plain text, not HTML. So escape
Mark Doliner <markdoliner@pidgin.im>
parents:
19921
diff
changeset
|
1355 | char *userid, *escaped; |
| 7014 | 1356 | if((child2 = xmlnode_get_child(child, "USERID"))) { |
| 1357 | /* show what kind of email it is */ | |
| 1358 | userid = xmlnode_get_data(child2); | |
| 1359 | if(userid) { | |
|
19931
229fb62285b0
Data in vCards is supposed to be plain text, not HTML. So escape
Mark Doliner <markdoliner@pidgin.im>
parents:
19921
diff
changeset
|
1360 | escaped = g_markup_escape_text(userid, -1); |
| 7014 | 1361 | g_string_append_printf(info_text, |
|
19931
229fb62285b0
Data in vCards is supposed to be plain text, not HTML. So escape
Mark Doliner <markdoliner@pidgin.im>
parents:
19921
diff
changeset
|
1362 | "<b>%s:</b> <a href=\"mailto:%s\">%s</a><br/>", |
|
229fb62285b0
Data in vCards is supposed to be plain text, not HTML. So escape
Mark Doliner <markdoliner@pidgin.im>
parents:
19921
diff
changeset
|
1363 | _("E-Mail"), escaped, escaped); |
|
229fb62285b0
Data in vCards is supposed to be plain text, not HTML. So escape
Mark Doliner <markdoliner@pidgin.im>
parents:
19921
diff
changeset
|
1364 | g_free(escaped); |
| 7014 | 1365 | g_free(userid); |
| 1366 | } | |
| 1367 | } else if((userid = xmlnode_get_data(child))) { | |
| 15884 | 1368 | /* lots of clients (including purple) do this, but it's |
| 7014 | 1369 | * out of spec */ |
|
19931
229fb62285b0
Data in vCards is supposed to be plain text, not HTML. So escape
Mark Doliner <markdoliner@pidgin.im>
parents:
19921
diff
changeset
|
1370 | escaped = g_markup_escape_text(userid, -1); |
|
229fb62285b0
Data in vCards is supposed to be plain text, not HTML. So escape
Mark Doliner <markdoliner@pidgin.im>
parents:
19921
diff
changeset
|
1371 | g_string_append_printf(info_text, |
|
229fb62285b0
Data in vCards is supposed to be plain text, not HTML. So escape
Mark Doliner <markdoliner@pidgin.im>
parents:
19921
diff
changeset
|
1372 | "<b>%s:</b> <a href=\"mailto:%s\">%s</a><br/>", |
|
229fb62285b0
Data in vCards is supposed to be plain text, not HTML. So escape
Mark Doliner <markdoliner@pidgin.im>
parents:
19921
diff
changeset
|
1373 | _("E-Mail"), escaped, escaped); |
|
229fb62285b0
Data in vCards is supposed to be plain text, not HTML. So escape
Mark Doliner <markdoliner@pidgin.im>
parents:
19921
diff
changeset
|
1374 | g_free(escaped); |
| 7014 | 1375 | g_free(userid); |
| 1376 | } | |
| 1377 | } else if(!strcmp(child->name, "ORG")) { | |
| 1378 | for(child2 = child->child; child2; child2 = child2->next) | |
| 1379 | { | |
| 1380 | char *text2; | |
| 1381 | ||
| 8135 | 1382 | if(child2->type != XMLNODE_TYPE_TAG) |
| 7014 | 1383 | continue; |
| 1384 | ||
| 1385 | text2 = xmlnode_get_data(child2); | |
| 1386 | if(text2 && !strcmp(child2->name, "ORGNAME")) { | |
|
19931
229fb62285b0
Data in vCards is supposed to be plain text, not HTML. So escape
Mark Doliner <markdoliner@pidgin.im>
parents:
19921
diff
changeset
|
1387 | jabber_string_escape_and_append(info_text, |
|
229fb62285b0
Data in vCards is supposed to be plain text, not HTML. So escape
Mark Doliner <markdoliner@pidgin.im>
parents:
19921
diff
changeset
|
1388 | _("Organization Name"), text2, FALSE); |
| 7014 | 1389 | } else if(text2 && !strcmp(child2->name, "ORGUNIT")) { |
|
19931
229fb62285b0
Data in vCards is supposed to be plain text, not HTML. So escape
Mark Doliner <markdoliner@pidgin.im>
parents:
19921
diff
changeset
|
1390 | jabber_string_escape_and_append(info_text, |
|
229fb62285b0
Data in vCards is supposed to be plain text, not HTML. So escape
Mark Doliner <markdoliner@pidgin.im>
parents:
19921
diff
changeset
|
1391 | _("Organization Unit"), text2, FALSE); |
| 7014 | 1392 | } |
| 1393 | g_free(text2); | |
| 1394 | } | |
| 1395 | } else if(text && !strcmp(child->name, "TITLE")) { | |
|
19931
229fb62285b0
Data in vCards is supposed to be plain text, not HTML. So escape
Mark Doliner <markdoliner@pidgin.im>
parents:
19921
diff
changeset
|
1396 | jabber_string_escape_and_append(info_text, |
|
229fb62285b0
Data in vCards is supposed to be plain text, not HTML. So escape
Mark Doliner <markdoliner@pidgin.im>
parents:
19921
diff
changeset
|
1397 | _("Title"), text, FALSE); |
| 7014 | 1398 | } else if(text && !strcmp(child->name, "ROLE")) { |
|
19931
229fb62285b0
Data in vCards is supposed to be plain text, not HTML. So escape
Mark Doliner <markdoliner@pidgin.im>
parents:
19921
diff
changeset
|
1399 | jabber_string_escape_and_append(info_text, |
|
229fb62285b0
Data in vCards is supposed to be plain text, not HTML. So escape
Mark Doliner <markdoliner@pidgin.im>
parents:
19921
diff
changeset
|
1400 | _("Role"), text, FALSE); |
| 7014 | 1401 | } else if(text && !strcmp(child->name, "DESC")) { |
|
19931
229fb62285b0
Data in vCards is supposed to be plain text, not HTML. So escape
Mark Doliner <markdoliner@pidgin.im>
parents:
19921
diff
changeset
|
1402 | jabber_string_escape_and_append(info_text, |
|
229fb62285b0
Data in vCards is supposed to be plain text, not HTML. So escape
Mark Doliner <markdoliner@pidgin.im>
parents:
19921
diff
changeset
|
1403 | _("Description"), text, FALSE); |
| 7076 | 1404 | } else if(!strcmp(child->name, "PHOTO") || |
| 1405 | !strcmp(child->name, "LOGO")) { | |
| 10941 | 1406 | char *bintext = NULL; |
| 1407 | xmlnode *binval; | |
| 11361 | 1408 | |
| 1409 | if( ((binval = xmlnode_get_child(child, "BINVAL")) && | |
| 1410 | (bintext = xmlnode_get_data(binval))) || | |
| 1411 | (bintext = xmlnode_get_data(child))) { | |
|
11127
5e539d9d26a4
[gaim-migrate @ 13183]
Mark Doliner <markdoliner@pidgin.im>
parents:
10941
diff
changeset
|
1412 | gsize size; |
|
11137
cf40226ddff7
[gaim-migrate @ 13201]
Mark Doliner <markdoliner@pidgin.im>
parents:
11127
diff
changeset
|
1413 | guchar *data; |
|
11127
5e539d9d26a4
[gaim-migrate @ 13183]
Mark Doliner <markdoliner@pidgin.im>
parents:
10941
diff
changeset
|
1414 | int i; |
| 10941 | 1415 | unsigned char hashval[20]; |
|
11127
5e539d9d26a4
[gaim-migrate @ 13183]
Mark Doliner <markdoliner@pidgin.im>
parents:
10941
diff
changeset
|
1416 | char *p, hash[41]; |
| 10941 | 1417 | gboolean photo = (strcmp(child->name, "PHOTO") == 0); |
| 10189 | 1418 | |
| 15884 | 1419 | data = purple_base64_decode(bintext, &size); |
|
16587
50de12a4b81b
disapproval of revision 'f95b376c0d2f066996620c5bb595dc71b5ee22d9'
Richard Laager <rlaager@pidgin.im>
parents:
16585
diff
changeset
|
1420 | if (data) { |
|
50de12a4b81b
disapproval of revision 'f95b376c0d2f066996620c5bb595dc71b5ee22d9'
Richard Laager <rlaager@pidgin.im>
parents:
16585
diff
changeset
|
1421 | jbi->vcard_imgids = g_slist_prepend(jbi->vcard_imgids, GINT_TO_POINTER(purple_imgstore_add_with_id(g_memdup(data, size), size, "logo.png"))); |
|
50de12a4b81b
disapproval of revision 'f95b376c0d2f066996620c5bb595dc71b5ee22d9'
Richard Laager <rlaager@pidgin.im>
parents:
16585
diff
changeset
|
1422 | g_string_append_printf(info_text, |
|
50de12a4b81b
disapproval of revision 'f95b376c0d2f066996620c5bb595dc71b5ee22d9'
Richard Laager <rlaager@pidgin.im>
parents:
16585
diff
changeset
|
1423 | "<b>%s:</b> <img id='%d'><br/>", |
|
50de12a4b81b
disapproval of revision 'f95b376c0d2f066996620c5bb595dc71b5ee22d9'
Richard Laager <rlaager@pidgin.im>
parents:
16585
diff
changeset
|
1424 | photo ? _("Photo") : _("Logo"), |
|
50de12a4b81b
disapproval of revision 'f95b376c0d2f066996620c5bb595dc71b5ee22d9'
Richard Laager <rlaager@pidgin.im>
parents:
16585
diff
changeset
|
1425 | GPOINTER_TO_INT(jbi->vcard_imgids->data)); |
|
50de12a4b81b
disapproval of revision 'f95b376c0d2f066996620c5bb595dc71b5ee22d9'
Richard Laager <rlaager@pidgin.im>
parents:
16585
diff
changeset
|
1426 | |
|
50de12a4b81b
disapproval of revision 'f95b376c0d2f066996620c5bb595dc71b5ee22d9'
Richard Laager <rlaager@pidgin.im>
parents:
16585
diff
changeset
|
1427 | purple_cipher_digest_region("sha1", (guchar *)data, size, |
|
50de12a4b81b
disapproval of revision 'f95b376c0d2f066996620c5bb595dc71b5ee22d9'
Richard Laager <rlaager@pidgin.im>
parents:
16585
diff
changeset
|
1428 | sizeof(hashval), hashval, NULL); |
|
50de12a4b81b
disapproval of revision 'f95b376c0d2f066996620c5bb595dc71b5ee22d9'
Richard Laager <rlaager@pidgin.im>
parents:
16585
diff
changeset
|
1429 | p = hash; |
|
50de12a4b81b
disapproval of revision 'f95b376c0d2f066996620c5bb595dc71b5ee22d9'
Richard Laager <rlaager@pidgin.im>
parents:
16585
diff
changeset
|
1430 | for(i=0; i<20; i++, p+=2) |
|
50de12a4b81b
disapproval of revision 'f95b376c0d2f066996620c5bb595dc71b5ee22d9'
Richard Laager <rlaager@pidgin.im>
parents:
16585
diff
changeset
|
1431 | snprintf(p, 3, "%02x", hashval[i]); |
| 7076 | 1432 | |
|
16587
50de12a4b81b
disapproval of revision 'f95b376c0d2f066996620c5bb595dc71b5ee22d9'
Richard Laager <rlaager@pidgin.im>
parents:
16585
diff
changeset
|
1433 | purple_buddy_icons_set_for_user(js->gc->account, bare_jid, |
|
50de12a4b81b
disapproval of revision 'f95b376c0d2f066996620c5bb595dc71b5ee22d9'
Richard Laager <rlaager@pidgin.im>
parents:
16585
diff
changeset
|
1434 | data, size, hash); |
|
50de12a4b81b
disapproval of revision 'f95b376c0d2f066996620c5bb595dc71b5ee22d9'
Richard Laager <rlaager@pidgin.im>
parents:
16585
diff
changeset
|
1435 | g_free(bintext); |
|
50de12a4b81b
disapproval of revision 'f95b376c0d2f066996620c5bb595dc71b5ee22d9'
Richard Laager <rlaager@pidgin.im>
parents:
16585
diff
changeset
|
1436 | } |
| 10941 | 1437 | } |
| 7014 | 1438 | } |
| 1439 | g_free(text); | |
| 1440 | } | |
| 1441 | } | |
| 1442 | ||
|
22586
ae2d0016b91e
If we receive a Full Name and no nickname, use the Full Name as the serverside alias for an XMPP contact. If we receive just a nickname or both a full name and a nickname, prefer the nickname.
Evan Schoenberg <evands@pidgin.im>
parents:
22550
diff
changeset
|
1443 | if (serverside_alias) { |
|
ae2d0016b91e
If we receive a Full Name and no nickname, use the Full Name as the serverside alias for an XMPP contact. If we receive just a nickname or both a full name and a nickname, prefer the nickname.
Evan Schoenberg <evands@pidgin.im>
parents:
22550
diff
changeset
|
1444 | /* If we found a serverside alias, set it and tell the core */ |
|
ae2d0016b91e
If we receive a Full Name and no nickname, use the Full Name as the serverside alias for an XMPP contact. If we receive just a nickname or both a full name and a nickname, prefer the nickname.
Evan Schoenberg <evands@pidgin.im>
parents:
22550
diff
changeset
|
1445 | serv_got_alias(js->gc, from, serverside_alias); |
|
ae2d0016b91e
If we receive a Full Name and no nickname, use the Full Name as the serverside alias for an XMPP contact. If we receive just a nickname or both a full name and a nickname, prefer the nickname.
Evan Schoenberg <evands@pidgin.im>
parents:
22550
diff
changeset
|
1446 | if (b) { |
|
ae2d0016b91e
If we receive a Full Name and no nickname, use the Full Name as the serverside alias for an XMPP contact. If we receive just a nickname or both a full name and a nickname, prefer the nickname.
Evan Schoenberg <evands@pidgin.im>
parents:
22550
diff
changeset
|
1447 | purple_blist_node_set_string((PurpleBlistNode*)b, "servernick", serverside_alias); |
|
ae2d0016b91e
If we receive a Full Name and no nickname, use the Full Name as the serverside alias for an XMPP contact. If we receive just a nickname or both a full name and a nickname, prefer the nickname.
Evan Schoenberg <evands@pidgin.im>
parents:
22550
diff
changeset
|
1448 | } |
|
ae2d0016b91e
If we receive a Full Name and no nickname, use the Full Name as the serverside alias for an XMPP contact. If we receive just a nickname or both a full name and a nickname, prefer the nickname.
Evan Schoenberg <evands@pidgin.im>
parents:
22550
diff
changeset
|
1449 | |
|
ae2d0016b91e
If we receive a Full Name and no nickname, use the Full Name as the serverside alias for an XMPP contact. If we receive just a nickname or both a full name and a nickname, prefer the nickname.
Evan Schoenberg <evands@pidgin.im>
parents:
22550
diff
changeset
|
1450 | g_free(serverside_alias); |
|
ae2d0016b91e
If we receive a Full Name and no nickname, use the Full Name as the serverside alias for an XMPP contact. If we receive just a nickname or both a full name and a nickname, prefer the nickname.
Evan Schoenberg <evands@pidgin.im>
parents:
22550
diff
changeset
|
1451 | } |
|
ae2d0016b91e
If we receive a Full Name and no nickname, use the Full Name as the serverside alias for an XMPP contact. If we receive just a nickname or both a full name and a nickname, prefer the nickname.
Evan Schoenberg <evands@pidgin.im>
parents:
22550
diff
changeset
|
1452 | |
| 15884 | 1453 | jbi->vcard_text = purple_strdup_withhtml(info_text->str); |
| 13794 | 1454 | g_string_free(info_text, TRUE); |
| 1455 | g_free(bare_jid); | |
| 1456 | ||
| 1457 | jabber_buddy_info_show_if_ready(jbi); | |
| 1458 | } | |
| 1459 | ||
|
17788
e6e381b0c7d6
Implemented receiving other people's avatars via XEP-0084. Note that this code now includes a workaround for a non-spec incompatibility for the current ejabberd PEP implementation, and doesn't use the correct namespace due to Psi using the wrong one (outdated?). Works fine though, and the vcard-based approach is retained.
Andreas Monitzer <am@adiumx.com>
parents:
17787
diff
changeset
|
1460 | typedef struct _JabberBuddyAvatarUpdateURLInfo { |
|
e6e381b0c7d6
Implemented receiving other people's avatars via XEP-0084. Note that this code now includes a workaround for a non-spec incompatibility for the current ejabberd PEP implementation, and doesn't use the correct namespace due to Psi using the wrong one (outdated?). Works fine though, and the vcard-based approach is retained.
Andreas Monitzer <am@adiumx.com>
parents:
17787
diff
changeset
|
1461 | JabberStream *js; |
|
e6e381b0c7d6
Implemented receiving other people's avatars via XEP-0084. Note that this code now includes a workaround for a non-spec incompatibility for the current ejabberd PEP implementation, and doesn't use the correct namespace due to Psi using the wrong one (outdated?). Works fine though, and the vcard-based approach is retained.
Andreas Monitzer <am@adiumx.com>
parents:
17787
diff
changeset
|
1462 | char *from; |
|
e6e381b0c7d6
Implemented receiving other people's avatars via XEP-0084. Note that this code now includes a workaround for a non-spec incompatibility for the current ejabberd PEP implementation, and doesn't use the correct namespace due to Psi using the wrong one (outdated?). Works fine though, and the vcard-based approach is retained.
Andreas Monitzer <am@adiumx.com>
parents:
17787
diff
changeset
|
1463 | char *id; |
|
e6e381b0c7d6
Implemented receiving other people's avatars via XEP-0084. Note that this code now includes a workaround for a non-spec incompatibility for the current ejabberd PEP implementation, and doesn't use the correct namespace due to Psi using the wrong one (outdated?). Works fine though, and the vcard-based approach is retained.
Andreas Monitzer <am@adiumx.com>
parents:
17787
diff
changeset
|
1464 | } JabberBuddyAvatarUpdateURLInfo; |
|
e6e381b0c7d6
Implemented receiving other people's avatars via XEP-0084. Note that this code now includes a workaround for a non-spec incompatibility for the current ejabberd PEP implementation, and doesn't use the correct namespace due to Psi using the wrong one (outdated?). Works fine though, and the vcard-based approach is retained.
Andreas Monitzer <am@adiumx.com>
parents:
17787
diff
changeset
|
1465 | |
|
e6e381b0c7d6
Implemented receiving other people's avatars via XEP-0084. Note that this code now includes a workaround for a non-spec incompatibility for the current ejabberd PEP implementation, and doesn't use the correct namespace due to Psi using the wrong one (outdated?). Works fine though, and the vcard-based approach is retained.
Andreas Monitzer <am@adiumx.com>
parents:
17787
diff
changeset
|
1466 | static void do_buddy_avatar_update_fromurl(PurpleUtilFetchUrlData *url_data, gpointer user_data, const gchar *url_text, gsize len, const gchar *error_message) { |
|
e6e381b0c7d6
Implemented receiving other people's avatars via XEP-0084. Note that this code now includes a workaround for a non-spec incompatibility for the current ejabberd PEP implementation, and doesn't use the correct namespace due to Psi using the wrong one (outdated?). Works fine though, and the vcard-based approach is retained.
Andreas Monitzer <am@adiumx.com>
parents:
17787
diff
changeset
|
1467 | JabberBuddyAvatarUpdateURLInfo *info = user_data; |
|
e6e381b0c7d6
Implemented receiving other people's avatars via XEP-0084. Note that this code now includes a workaround for a non-spec incompatibility for the current ejabberd PEP implementation, and doesn't use the correct namespace due to Psi using the wrong one (outdated?). Works fine though, and the vcard-based approach is retained.
Andreas Monitzer <am@adiumx.com>
parents:
17787
diff
changeset
|
1468 | if(!url_text) { |
|
e6e381b0c7d6
Implemented receiving other people's avatars via XEP-0084. Note that this code now includes a workaround for a non-spec incompatibility for the current ejabberd PEP implementation, and doesn't use the correct namespace due to Psi using the wrong one (outdated?). Works fine though, and the vcard-based approach is retained.
Andreas Monitzer <am@adiumx.com>
parents:
17787
diff
changeset
|
1469 | purple_debug(PURPLE_DEBUG_ERROR, "jabber", |
|
e6e381b0c7d6
Implemented receiving other people's avatars via XEP-0084. Note that this code now includes a workaround for a non-spec incompatibility for the current ejabberd PEP implementation, and doesn't use the correct namespace due to Psi using the wrong one (outdated?). Works fine though, and the vcard-based approach is retained.
Andreas Monitzer <am@adiumx.com>
parents:
17787
diff
changeset
|
1470 | "do_buddy_avatar_update_fromurl got error \"%s\"", error_message); |
|
e6e381b0c7d6
Implemented receiving other people's avatars via XEP-0084. Note that this code now includes a workaround for a non-spec incompatibility for the current ejabberd PEP implementation, and doesn't use the correct namespace due to Psi using the wrong one (outdated?). Works fine though, and the vcard-based approach is retained.
Andreas Monitzer <am@adiumx.com>
parents:
17787
diff
changeset
|
1471 | return; |
|
e6e381b0c7d6
Implemented receiving other people's avatars via XEP-0084. Note that this code now includes a workaround for a non-spec incompatibility for the current ejabberd PEP implementation, and doesn't use the correct namespace due to Psi using the wrong one (outdated?). Works fine though, and the vcard-based approach is retained.
Andreas Monitzer <am@adiumx.com>
parents:
17787
diff
changeset
|
1472 | } |
|
e6e381b0c7d6
Implemented receiving other people's avatars via XEP-0084. Note that this code now includes a workaround for a non-spec incompatibility for the current ejabberd PEP implementation, and doesn't use the correct namespace due to Psi using the wrong one (outdated?). Works fine though, and the vcard-based approach is retained.
Andreas Monitzer <am@adiumx.com>
parents:
17787
diff
changeset
|
1473 | |
|
e6e381b0c7d6
Implemented receiving other people's avatars via XEP-0084. Note that this code now includes a workaround for a non-spec incompatibility for the current ejabberd PEP implementation, and doesn't use the correct namespace due to Psi using the wrong one (outdated?). Works fine though, and the vcard-based approach is retained.
Andreas Monitzer <am@adiumx.com>
parents:
17787
diff
changeset
|
1474 | purple_buddy_icons_set_for_user(purple_connection_get_account(info->js->gc), info->from, (void*)url_text, len, info->id); |
|
e6e381b0c7d6
Implemented receiving other people's avatars via XEP-0084. Note that this code now includes a workaround for a non-spec incompatibility for the current ejabberd PEP implementation, and doesn't use the correct namespace due to Psi using the wrong one (outdated?). Works fine though, and the vcard-based approach is retained.
Andreas Monitzer <am@adiumx.com>
parents:
17787
diff
changeset
|
1475 | g_free(info->from); |
|
e6e381b0c7d6
Implemented receiving other people's avatars via XEP-0084. Note that this code now includes a workaround for a non-spec incompatibility for the current ejabberd PEP implementation, and doesn't use the correct namespace due to Psi using the wrong one (outdated?). Works fine though, and the vcard-based approach is retained.
Andreas Monitzer <am@adiumx.com>
parents:
17787
diff
changeset
|
1476 | g_free(info->id); |
|
e6e381b0c7d6
Implemented receiving other people's avatars via XEP-0084. Note that this code now includes a workaround for a non-spec incompatibility for the current ejabberd PEP implementation, and doesn't use the correct namespace due to Psi using the wrong one (outdated?). Works fine though, and the vcard-based approach is retained.
Andreas Monitzer <am@adiumx.com>
parents:
17787
diff
changeset
|
1477 | g_free(info); |
|
e6e381b0c7d6
Implemented receiving other people's avatars via XEP-0084. Note that this code now includes a workaround for a non-spec incompatibility for the current ejabberd PEP implementation, and doesn't use the correct namespace due to Psi using the wrong one (outdated?). Works fine though, and the vcard-based approach is retained.
Andreas Monitzer <am@adiumx.com>
parents:
17787
diff
changeset
|
1478 | } |
|
e6e381b0c7d6
Implemented receiving other people's avatars via XEP-0084. Note that this code now includes a workaround for a non-spec incompatibility for the current ejabberd PEP implementation, and doesn't use the correct namespace due to Psi using the wrong one (outdated?). Works fine though, and the vcard-based approach is retained.
Andreas Monitzer <am@adiumx.com>
parents:
17787
diff
changeset
|
1479 | |
|
17789
f75d542850e3
Turns out the example in XEP-0084 is wrong. Fixed my implementation to not try to work around an issue that isn't one.
Andreas Monitzer <am@adiumx.com>
parents:
17788
diff
changeset
|
1480 | static void do_buddy_avatar_update_data(JabberStream *js, const char *from, xmlnode *items) { |
|
f75d542850e3
Turns out the example in XEP-0084 is wrong. Fixed my implementation to not try to work around an issue that isn't one.
Andreas Monitzer <am@adiumx.com>
parents:
17788
diff
changeset
|
1481 | xmlnode *item, *data; |
|
17788
e6e381b0c7d6
Implemented receiving other people's avatars via XEP-0084. Note that this code now includes a workaround for a non-spec incompatibility for the current ejabberd PEP implementation, and doesn't use the correct namespace due to Psi using the wrong one (outdated?). Works fine though, and the vcard-based approach is retained.
Andreas Monitzer <am@adiumx.com>
parents:
17787
diff
changeset
|
1482 | const char *checksum; |
|
e6e381b0c7d6
Implemented receiving other people's avatars via XEP-0084. Note that this code now includes a workaround for a non-spec incompatibility for the current ejabberd PEP implementation, and doesn't use the correct namespace due to Psi using the wrong one (outdated?). Works fine though, and the vcard-based approach is retained.
Andreas Monitzer <am@adiumx.com>
parents:
17787
diff
changeset
|
1483 | char *b64data; |
|
e6e381b0c7d6
Implemented receiving other people's avatars via XEP-0084. Note that this code now includes a workaround for a non-spec incompatibility for the current ejabberd PEP implementation, and doesn't use the correct namespace due to Psi using the wrong one (outdated?). Works fine though, and the vcard-based approach is retained.
Andreas Monitzer <am@adiumx.com>
parents:
17787
diff
changeset
|
1484 | void *img; |
|
e6e381b0c7d6
Implemented receiving other people's avatars via XEP-0084. Note that this code now includes a workaround for a non-spec incompatibility for the current ejabberd PEP implementation, and doesn't use the correct namespace due to Psi using the wrong one (outdated?). Works fine though, and the vcard-based approach is retained.
Andreas Monitzer <am@adiumx.com>
parents:
17787
diff
changeset
|
1485 | size_t size; |
|
17789
f75d542850e3
Turns out the example in XEP-0084 is wrong. Fixed my implementation to not try to work around an issue that isn't one.
Andreas Monitzer <am@adiumx.com>
parents:
17788
diff
changeset
|
1486 | if(!items) |
|
f75d542850e3
Turns out the example in XEP-0084 is wrong. Fixed my implementation to not try to work around an issue that isn't one.
Andreas Monitzer <am@adiumx.com>
parents:
17788
diff
changeset
|
1487 | return; |
|
f75d542850e3
Turns out the example in XEP-0084 is wrong. Fixed my implementation to not try to work around an issue that isn't one.
Andreas Monitzer <am@adiumx.com>
parents:
17788
diff
changeset
|
1488 | |
|
f75d542850e3
Turns out the example in XEP-0084 is wrong. Fixed my implementation to not try to work around an issue that isn't one.
Andreas Monitzer <am@adiumx.com>
parents:
17788
diff
changeset
|
1489 | item = xmlnode_get_child(items, "item"); |
|
17788
e6e381b0c7d6
Implemented receiving other people's avatars via XEP-0084. Note that this code now includes a workaround for a non-spec incompatibility for the current ejabberd PEP implementation, and doesn't use the correct namespace due to Psi using the wrong one (outdated?). Works fine though, and the vcard-based approach is retained.
Andreas Monitzer <am@adiumx.com>
parents:
17787
diff
changeset
|
1490 | if(!item) |
|
e6e381b0c7d6
Implemented receiving other people's avatars via XEP-0084. Note that this code now includes a workaround for a non-spec incompatibility for the current ejabberd PEP implementation, and doesn't use the correct namespace due to Psi using the wrong one (outdated?). Works fine though, and the vcard-based approach is retained.
Andreas Monitzer <am@adiumx.com>
parents:
17787
diff
changeset
|
1491 | return; |
|
e6e381b0c7d6
Implemented receiving other people's avatars via XEP-0084. Note that this code now includes a workaround for a non-spec incompatibility for the current ejabberd PEP implementation, and doesn't use the correct namespace due to Psi using the wrong one (outdated?). Works fine though, and the vcard-based approach is retained.
Andreas Monitzer <am@adiumx.com>
parents:
17787
diff
changeset
|
1492 | |
|
e6e381b0c7d6
Implemented receiving other people's avatars via XEP-0084. Note that this code now includes a workaround for a non-spec incompatibility for the current ejabberd PEP implementation, and doesn't use the correct namespace due to Psi using the wrong one (outdated?). Works fine though, and the vcard-based approach is retained.
Andreas Monitzer <am@adiumx.com>
parents:
17787
diff
changeset
|
1493 | data = xmlnode_get_child_with_namespace(item,"data",AVATARNAMESPACEDATA); |
|
e6e381b0c7d6
Implemented receiving other people's avatars via XEP-0084. Note that this code now includes a workaround for a non-spec incompatibility for the current ejabberd PEP implementation, and doesn't use the correct namespace due to Psi using the wrong one (outdated?). Works fine though, and the vcard-based approach is retained.
Andreas Monitzer <am@adiumx.com>
parents:
17787
diff
changeset
|
1494 | if(!data) |
|
e6e381b0c7d6
Implemented receiving other people's avatars via XEP-0084. Note that this code now includes a workaround for a non-spec incompatibility for the current ejabberd PEP implementation, and doesn't use the correct namespace due to Psi using the wrong one (outdated?). Works fine though, and the vcard-based approach is retained.
Andreas Monitzer <am@adiumx.com>
parents:
17787
diff
changeset
|
1495 | return; |
|
e6e381b0c7d6
Implemented receiving other people's avatars via XEP-0084. Note that this code now includes a workaround for a non-spec incompatibility for the current ejabberd PEP implementation, and doesn't use the correct namespace due to Psi using the wrong one (outdated?). Works fine though, and the vcard-based approach is retained.
Andreas Monitzer <am@adiumx.com>
parents:
17787
diff
changeset
|
1496 | |
|
e6e381b0c7d6
Implemented receiving other people's avatars via XEP-0084. Note that this code now includes a workaround for a non-spec incompatibility for the current ejabberd PEP implementation, and doesn't use the correct namespace due to Psi using the wrong one (outdated?). Works fine though, and the vcard-based approach is retained.
Andreas Monitzer <am@adiumx.com>
parents:
17787
diff
changeset
|
1497 | checksum = xmlnode_get_attrib(item,"id"); |
|
e6e381b0c7d6
Implemented receiving other people's avatars via XEP-0084. Note that this code now includes a workaround for a non-spec incompatibility for the current ejabberd PEP implementation, and doesn't use the correct namespace due to Psi using the wrong one (outdated?). Works fine though, and the vcard-based approach is retained.
Andreas Monitzer <am@adiumx.com>
parents:
17787
diff
changeset
|
1498 | if(!checksum) |
|
e6e381b0c7d6
Implemented receiving other people's avatars via XEP-0084. Note that this code now includes a workaround for a non-spec incompatibility for the current ejabberd PEP implementation, and doesn't use the correct namespace due to Psi using the wrong one (outdated?). Works fine though, and the vcard-based approach is retained.
Andreas Monitzer <am@adiumx.com>
parents:
17787
diff
changeset
|
1499 | return; |
|
e6e381b0c7d6
Implemented receiving other people's avatars via XEP-0084. Note that this code now includes a workaround for a non-spec incompatibility for the current ejabberd PEP implementation, and doesn't use the correct namespace due to Psi using the wrong one (outdated?). Works fine though, and the vcard-based approach is retained.
Andreas Monitzer <am@adiumx.com>
parents:
17787
diff
changeset
|
1500 | |
|
e6e381b0c7d6
Implemented receiving other people's avatars via XEP-0084. Note that this code now includes a workaround for a non-spec incompatibility for the current ejabberd PEP implementation, and doesn't use the correct namespace due to Psi using the wrong one (outdated?). Works fine though, and the vcard-based approach is retained.
Andreas Monitzer <am@adiumx.com>
parents:
17787
diff
changeset
|
1501 | b64data = xmlnode_get_data(data); |
|
e6e381b0c7d6
Implemented receiving other people's avatars via XEP-0084. Note that this code now includes a workaround for a non-spec incompatibility for the current ejabberd PEP implementation, and doesn't use the correct namespace due to Psi using the wrong one (outdated?). Works fine though, and the vcard-based approach is retained.
Andreas Monitzer <am@adiumx.com>
parents:
17787
diff
changeset
|
1502 | if(!b64data) |
|
e6e381b0c7d6
Implemented receiving other people's avatars via XEP-0084. Note that this code now includes a workaround for a non-spec incompatibility for the current ejabberd PEP implementation, and doesn't use the correct namespace due to Psi using the wrong one (outdated?). Works fine though, and the vcard-based approach is retained.
Andreas Monitzer <am@adiumx.com>
parents:
17787
diff
changeset
|
1503 | return; |
|
e6e381b0c7d6
Implemented receiving other people's avatars via XEP-0084. Note that this code now includes a workaround for a non-spec incompatibility for the current ejabberd PEP implementation, and doesn't use the correct namespace due to Psi using the wrong one (outdated?). Works fine though, and the vcard-based approach is retained.
Andreas Monitzer <am@adiumx.com>
parents:
17787
diff
changeset
|
1504 | |
|
e6e381b0c7d6
Implemented receiving other people's avatars via XEP-0084. Note that this code now includes a workaround for a non-spec incompatibility for the current ejabberd PEP implementation, and doesn't use the correct namespace due to Psi using the wrong one (outdated?). Works fine though, and the vcard-based approach is retained.
Andreas Monitzer <am@adiumx.com>
parents:
17787
diff
changeset
|
1505 | img = purple_base64_decode(b64data, &size); |
|
20320
6337e101f6ab
Plug some memory leaks.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
19963
diff
changeset
|
1506 | if(!img) { |
|
6337e101f6ab
Plug some memory leaks.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
19963
diff
changeset
|
1507 | g_free(b64data); |
|
17788
e6e381b0c7d6
Implemented receiving other people's avatars via XEP-0084. Note that this code now includes a workaround for a non-spec incompatibility for the current ejabberd PEP implementation, and doesn't use the correct namespace due to Psi using the wrong one (outdated?). Works fine though, and the vcard-based approach is retained.
Andreas Monitzer <am@adiumx.com>
parents:
17787
diff
changeset
|
1508 | return; |
|
20320
6337e101f6ab
Plug some memory leaks.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
19963
diff
changeset
|
1509 | } |
|
17788
e6e381b0c7d6
Implemented receiving other people's avatars via XEP-0084. Note that this code now includes a workaround for a non-spec incompatibility for the current ejabberd PEP implementation, and doesn't use the correct namespace due to Psi using the wrong one (outdated?). Works fine though, and the vcard-based approach is retained.
Andreas Monitzer <am@adiumx.com>
parents:
17787
diff
changeset
|
1510 | |
|
e6e381b0c7d6
Implemented receiving other people's avatars via XEP-0084. Note that this code now includes a workaround for a non-spec incompatibility for the current ejabberd PEP implementation, and doesn't use the correct namespace due to Psi using the wrong one (outdated?). Works fine though, and the vcard-based approach is retained.
Andreas Monitzer <am@adiumx.com>
parents:
17787
diff
changeset
|
1511 | purple_buddy_icons_set_for_user(purple_connection_get_account(js->gc), from, img, size, checksum); |
|
20320
6337e101f6ab
Plug some memory leaks.
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
19963
diff
changeset
|
1512 | g_free(b64data); |
|
17788
e6e381b0c7d6
Implemented receiving other people's avatars via XEP-0084. Note that this code now includes a workaround for a non-spec incompatibility for the current ejabberd PEP implementation, and doesn't use the correct namespace due to Psi using the wrong one (outdated?). Works fine though, and the vcard-based approach is retained.
Andreas Monitzer <am@adiumx.com>
parents:
17787
diff
changeset
|
1513 | } |
|
e6e381b0c7d6
Implemented receiving other people's avatars via XEP-0084. Note that this code now includes a workaround for a non-spec incompatibility for the current ejabberd PEP implementation, and doesn't use the correct namespace due to Psi using the wrong one (outdated?). Works fine though, and the vcard-based approach is retained.
Andreas Monitzer <am@adiumx.com>
parents:
17787
diff
changeset
|
1514 | |
|
17787
439329d20337
Added support for setting the avatar via XEP-0084. Receiving other people's avatar is up next.
Andreas Monitzer <am@adiumx.com>
parents:
17770
diff
changeset
|
1515 | void jabber_buddy_avatar_update_metadata(JabberStream *js, const char *from, xmlnode *items) { |
|
17788
e6e381b0c7d6
Implemented receiving other people's avatars via XEP-0084. Note that this code now includes a workaround for a non-spec incompatibility for the current ejabberd PEP implementation, and doesn't use the correct namespace due to Psi using the wrong one (outdated?). Works fine though, and the vcard-based approach is retained.
Andreas Monitzer <am@adiumx.com>
parents:
17787
diff
changeset
|
1516 | PurpleBuddy *buddy = purple_find_buddy(purple_connection_get_account(js->gc), from); |
|
e6e381b0c7d6
Implemented receiving other people's avatars via XEP-0084. Note that this code now includes a workaround for a non-spec incompatibility for the current ejabberd PEP implementation, and doesn't use the correct namespace due to Psi using the wrong one (outdated?). Works fine though, and the vcard-based approach is retained.
Andreas Monitzer <am@adiumx.com>
parents:
17787
diff
changeset
|
1517 | const char *checksum; |
|
e6e381b0c7d6
Implemented receiving other people's avatars via XEP-0084. Note that this code now includes a workaround for a non-spec incompatibility for the current ejabberd PEP implementation, and doesn't use the correct namespace due to Psi using the wrong one (outdated?). Works fine though, and the vcard-based approach is retained.
Andreas Monitzer <am@adiumx.com>
parents:
17787
diff
changeset
|
1518 | xmlnode *item, *metadata; |
|
e6e381b0c7d6
Implemented receiving other people's avatars via XEP-0084. Note that this code now includes a workaround for a non-spec incompatibility for the current ejabberd PEP implementation, and doesn't use the correct namespace due to Psi using the wrong one (outdated?). Works fine though, and the vcard-based approach is retained.
Andreas Monitzer <am@adiumx.com>
parents:
17787
diff
changeset
|
1519 | if(!buddy) |
|
e6e381b0c7d6
Implemented receiving other people's avatars via XEP-0084. Note that this code now includes a workaround for a non-spec incompatibility for the current ejabberd PEP implementation, and doesn't use the correct namespace due to Psi using the wrong one (outdated?). Works fine though, and the vcard-based approach is retained.
Andreas Monitzer <am@adiumx.com>
parents:
17787
diff
changeset
|
1520 | return; |
|
17787
439329d20337
Added support for setting the avatar via XEP-0084. Receiving other people's avatar is up next.
Andreas Monitzer <am@adiumx.com>
parents:
17770
diff
changeset
|
1521 | |
|
17788
e6e381b0c7d6
Implemented receiving other people's avatars via XEP-0084. Note that this code now includes a workaround for a non-spec incompatibility for the current ejabberd PEP implementation, and doesn't use the correct namespace due to Psi using the wrong one (outdated?). Works fine though, and the vcard-based approach is retained.
Andreas Monitzer <am@adiumx.com>
parents:
17787
diff
changeset
|
1522 | checksum = purple_buddy_icons_get_checksum_for_user(buddy); |
|
e6e381b0c7d6
Implemented receiving other people's avatars via XEP-0084. Note that this code now includes a workaround for a non-spec incompatibility for the current ejabberd PEP implementation, and doesn't use the correct namespace due to Psi using the wrong one (outdated?). Works fine though, and the vcard-based approach is retained.
Andreas Monitzer <am@adiumx.com>
parents:
17787
diff
changeset
|
1523 | item = xmlnode_get_child(items,"item"); |
|
e6e381b0c7d6
Implemented receiving other people's avatars via XEP-0084. Note that this code now includes a workaround for a non-spec incompatibility for the current ejabberd PEP implementation, and doesn't use the correct namespace due to Psi using the wrong one (outdated?). Works fine though, and the vcard-based approach is retained.
Andreas Monitzer <am@adiumx.com>
parents:
17787
diff
changeset
|
1524 | metadata = xmlnode_get_child_with_namespace(item, "metadata", AVATARNAMESPACEMETA); |
|
e6e381b0c7d6
Implemented receiving other people's avatars via XEP-0084. Note that this code now includes a workaround for a non-spec incompatibility for the current ejabberd PEP implementation, and doesn't use the correct namespace due to Psi using the wrong one (outdated?). Works fine though, and the vcard-based approach is retained.
Andreas Monitzer <am@adiumx.com>
parents:
17787
diff
changeset
|
1525 | if(!metadata) |
|
e6e381b0c7d6
Implemented receiving other people's avatars via XEP-0084. Note that this code now includes a workaround for a non-spec incompatibility for the current ejabberd PEP implementation, and doesn't use the correct namespace due to Psi using the wrong one (outdated?). Works fine though, and the vcard-based approach is retained.
Andreas Monitzer <am@adiumx.com>
parents:
17787
diff
changeset
|
1526 | return; |
|
e6e381b0c7d6
Implemented receiving other people's avatars via XEP-0084. Note that this code now includes a workaround for a non-spec incompatibility for the current ejabberd PEP implementation, and doesn't use the correct namespace due to Psi using the wrong one (outdated?). Works fine though, and the vcard-based approach is retained.
Andreas Monitzer <am@adiumx.com>
parents:
17787
diff
changeset
|
1527 | /* check if we have received a stop */ |
|
e6e381b0c7d6
Implemented receiving other people's avatars via XEP-0084. Note that this code now includes a workaround for a non-spec incompatibility for the current ejabberd PEP implementation, and doesn't use the correct namespace due to Psi using the wrong one (outdated?). Works fine though, and the vcard-based approach is retained.
Andreas Monitzer <am@adiumx.com>
parents:
17787
diff
changeset
|
1528 | if(xmlnode_get_child(metadata, "stop")) { |
|
e6e381b0c7d6
Implemented receiving other people's avatars via XEP-0084. Note that this code now includes a workaround for a non-spec incompatibility for the current ejabberd PEP implementation, and doesn't use the correct namespace due to Psi using the wrong one (outdated?). Works fine though, and the vcard-based approach is retained.
Andreas Monitzer <am@adiumx.com>
parents:
17787
diff
changeset
|
1529 | purple_buddy_icons_set_for_user(purple_connection_get_account(js->gc), from, NULL, 0, NULL); |
|
e6e381b0c7d6
Implemented receiving other people's avatars via XEP-0084. Note that this code now includes a workaround for a non-spec incompatibility for the current ejabberd PEP implementation, and doesn't use the correct namespace due to Psi using the wrong one (outdated?). Works fine though, and the vcard-based approach is retained.
Andreas Monitzer <am@adiumx.com>
parents:
17787
diff
changeset
|
1530 | } else { |
|
e6e381b0c7d6
Implemented receiving other people's avatars via XEP-0084. Note that this code now includes a workaround for a non-spec incompatibility for the current ejabberd PEP implementation, and doesn't use the correct namespace due to Psi using the wrong one (outdated?). Works fine though, and the vcard-based approach is retained.
Andreas Monitzer <am@adiumx.com>
parents:
17787
diff
changeset
|
1531 | xmlnode *info, *goodinfo = NULL; |
|
e6e381b0c7d6
Implemented receiving other people's avatars via XEP-0084. Note that this code now includes a workaround for a non-spec incompatibility for the current ejabberd PEP implementation, and doesn't use the correct namespace due to Psi using the wrong one (outdated?). Works fine though, and the vcard-based approach is retained.
Andreas Monitzer <am@adiumx.com>
parents:
17787
diff
changeset
|
1532 | |
|
e6e381b0c7d6
Implemented receiving other people's avatars via XEP-0084. Note that this code now includes a workaround for a non-spec incompatibility for the current ejabberd PEP implementation, and doesn't use the correct namespace due to Psi using the wrong one (outdated?). Works fine though, and the vcard-based approach is retained.
Andreas Monitzer <am@adiumx.com>
parents:
17787
diff
changeset
|
1533 | /* iterate over all info nodes to get one we can use */ |
|
e6e381b0c7d6
Implemented receiving other people's avatars via XEP-0084. Note that this code now includes a workaround for a non-spec incompatibility for the current ejabberd PEP implementation, and doesn't use the correct namespace due to Psi using the wrong one (outdated?). Works fine though, and the vcard-based approach is retained.
Andreas Monitzer <am@adiumx.com>
parents:
17787
diff
changeset
|
1534 | for(info = metadata->child; info; info = info->next) { |
|
e6e381b0c7d6
Implemented receiving other people's avatars via XEP-0084. Note that this code now includes a workaround for a non-spec incompatibility for the current ejabberd PEP implementation, and doesn't use the correct namespace due to Psi using the wrong one (outdated?). Works fine though, and the vcard-based approach is retained.
Andreas Monitzer <am@adiumx.com>
parents:
17787
diff
changeset
|
1535 | if(info->type == XMLNODE_TYPE_TAG && !strcmp(info->name,"info")) { |
|
e6e381b0c7d6
Implemented receiving other people's avatars via XEP-0084. Note that this code now includes a workaround for a non-spec incompatibility for the current ejabberd PEP implementation, and doesn't use the correct namespace due to Psi using the wrong one (outdated?). Works fine though, and the vcard-based approach is retained.
Andreas Monitzer <am@adiumx.com>
parents:
17787
diff
changeset
|
1536 | const char *type = xmlnode_get_attrib(info,"type"); |
|
e6e381b0c7d6
Implemented receiving other people's avatars via XEP-0084. Note that this code now includes a workaround for a non-spec incompatibility for the current ejabberd PEP implementation, and doesn't use the correct namespace due to Psi using the wrong one (outdated?). Works fine though, and the vcard-based approach is retained.
Andreas Monitzer <am@adiumx.com>
parents:
17787
diff
changeset
|
1537 | const char *id = xmlnode_get_attrib(info,"id"); |
|
e6e381b0c7d6
Implemented receiving other people's avatars via XEP-0084. Note that this code now includes a workaround for a non-spec incompatibility for the current ejabberd PEP implementation, and doesn't use the correct namespace due to Psi using the wrong one (outdated?). Works fine though, and the vcard-based approach is retained.
Andreas Monitzer <am@adiumx.com>
parents:
17787
diff
changeset
|
1538 | |
|
e6e381b0c7d6
Implemented receiving other people's avatars via XEP-0084. Note that this code now includes a workaround for a non-spec incompatibility for the current ejabberd PEP implementation, and doesn't use the correct namespace due to Psi using the wrong one (outdated?). Works fine though, and the vcard-based approach is retained.
Andreas Monitzer <am@adiumx.com>
parents:
17787
diff
changeset
|
1539 | if(checksum && id && !strcmp(id, checksum)) { |
|
e6e381b0c7d6
Implemented receiving other people's avatars via XEP-0084. Note that this code now includes a workaround for a non-spec incompatibility for the current ejabberd PEP implementation, and doesn't use the correct namespace due to Psi using the wrong one (outdated?). Works fine though, and the vcard-based approach is retained.
Andreas Monitzer <am@adiumx.com>
parents:
17787
diff
changeset
|
1540 | /* we already have that avatar, so we don't have to do anything */ |
|
e6e381b0c7d6
Implemented receiving other people's avatars via XEP-0084. Note that this code now includes a workaround for a non-spec incompatibility for the current ejabberd PEP implementation, and doesn't use the correct namespace due to Psi using the wrong one (outdated?). Works fine though, and the vcard-based approach is retained.
Andreas Monitzer <am@adiumx.com>
parents:
17787
diff
changeset
|
1541 | goodinfo = NULL; |
|
e6e381b0c7d6
Implemented receiving other people's avatars via XEP-0084. Note that this code now includes a workaround for a non-spec incompatibility for the current ejabberd PEP implementation, and doesn't use the correct namespace due to Psi using the wrong one (outdated?). Works fine though, and the vcard-based approach is retained.
Andreas Monitzer <am@adiumx.com>
parents:
17787
diff
changeset
|
1542 | break; |
|
e6e381b0c7d6
Implemented receiving other people's avatars via XEP-0084. Note that this code now includes a workaround for a non-spec incompatibility for the current ejabberd PEP implementation, and doesn't use the correct namespace due to Psi using the wrong one (outdated?). Works fine though, and the vcard-based approach is retained.
Andreas Monitzer <am@adiumx.com>
parents:
17787
diff
changeset
|
1543 | } |
|
e6e381b0c7d6
Implemented receiving other people's avatars via XEP-0084. Note that this code now includes a workaround for a non-spec incompatibility for the current ejabberd PEP implementation, and doesn't use the correct namespace due to Psi using the wrong one (outdated?). Works fine though, and the vcard-based approach is retained.
Andreas Monitzer <am@adiumx.com>
parents:
17787
diff
changeset
|
1544 | /* We'll only pick the png one for now. It's a very nice image format anyways. */ |
|
e6e381b0c7d6
Implemented receiving other people's avatars via XEP-0084. Note that this code now includes a workaround for a non-spec incompatibility for the current ejabberd PEP implementation, and doesn't use the correct namespace due to Psi using the wrong one (outdated?). Works fine though, and the vcard-based approach is retained.
Andreas Monitzer <am@adiumx.com>
parents:
17787
diff
changeset
|
1545 | if(type && id && !goodinfo && !strcmp(type, "image/png")) |
|
e6e381b0c7d6
Implemented receiving other people's avatars via XEP-0084. Note that this code now includes a workaround for a non-spec incompatibility for the current ejabberd PEP implementation, and doesn't use the correct namespace due to Psi using the wrong one (outdated?). Works fine though, and the vcard-based approach is retained.
Andreas Monitzer <am@adiumx.com>
parents:
17787
diff
changeset
|
1546 | goodinfo = info; |
|
e6e381b0c7d6
Implemented receiving other people's avatars via XEP-0084. Note that this code now includes a workaround for a non-spec incompatibility for the current ejabberd PEP implementation, and doesn't use the correct namespace due to Psi using the wrong one (outdated?). Works fine though, and the vcard-based approach is retained.
Andreas Monitzer <am@adiumx.com>
parents:
17787
diff
changeset
|
1547 | } |
|
e6e381b0c7d6
Implemented receiving other people's avatars via XEP-0084. Note that this code now includes a workaround for a non-spec incompatibility for the current ejabberd PEP implementation, and doesn't use the correct namespace due to Psi using the wrong one (outdated?). Works fine though, and the vcard-based approach is retained.
Andreas Monitzer <am@adiumx.com>
parents:
17787
diff
changeset
|
1548 | } |
|
e6e381b0c7d6
Implemented receiving other people's avatars via XEP-0084. Note that this code now includes a workaround for a non-spec incompatibility for the current ejabberd PEP implementation, and doesn't use the correct namespace due to Psi using the wrong one (outdated?). Works fine though, and the vcard-based approach is retained.
Andreas Monitzer <am@adiumx.com>
parents:
17787
diff
changeset
|
1549 | if(goodinfo) { |
|
e6e381b0c7d6
Implemented receiving other people's avatars via XEP-0084. Note that this code now includes a workaround for a non-spec incompatibility for the current ejabberd PEP implementation, and doesn't use the correct namespace due to Psi using the wrong one (outdated?). Works fine though, and the vcard-based approach is retained.
Andreas Monitzer <am@adiumx.com>
parents:
17787
diff
changeset
|
1550 | const char *url = xmlnode_get_attrib(goodinfo,"url"); |
|
e6e381b0c7d6
Implemented receiving other people's avatars via XEP-0084. Note that this code now includes a workaround for a non-spec incompatibility for the current ejabberd PEP implementation, and doesn't use the correct namespace due to Psi using the wrong one (outdated?). Works fine though, and the vcard-based approach is retained.
Andreas Monitzer <am@adiumx.com>
parents:
17787
diff
changeset
|
1551 | const char *id = xmlnode_get_attrib(goodinfo,"id"); |
|
e6e381b0c7d6
Implemented receiving other people's avatars via XEP-0084. Note that this code now includes a workaround for a non-spec incompatibility for the current ejabberd PEP implementation, and doesn't use the correct namespace due to Psi using the wrong one (outdated?). Works fine though, and the vcard-based approach is retained.
Andreas Monitzer <am@adiumx.com>
parents:
17787
diff
changeset
|
1552 | |
|
e6e381b0c7d6
Implemented receiving other people's avatars via XEP-0084. Note that this code now includes a workaround for a non-spec incompatibility for the current ejabberd PEP implementation, and doesn't use the correct namespace due to Psi using the wrong one (outdated?). Works fine though, and the vcard-based approach is retained.
Andreas Monitzer <am@adiumx.com>
parents:
17787
diff
changeset
|
1553 | /* the avatar might either be stored in a pep node, or on a HTTP/HTTPS URL */ |
|
e6e381b0c7d6
Implemented receiving other people's avatars via XEP-0084. Note that this code now includes a workaround for a non-spec incompatibility for the current ejabberd PEP implementation, and doesn't use the correct namespace due to Psi using the wrong one (outdated?). Works fine though, and the vcard-based approach is retained.
Andreas Monitzer <am@adiumx.com>
parents:
17787
diff
changeset
|
1554 | if(!url) |
|
e6e381b0c7d6
Implemented receiving other people's avatars via XEP-0084. Note that this code now includes a workaround for a non-spec incompatibility for the current ejabberd PEP implementation, and doesn't use the correct namespace due to Psi using the wrong one (outdated?). Works fine though, and the vcard-based approach is retained.
Andreas Monitzer <am@adiumx.com>
parents:
17787
diff
changeset
|
1555 | jabber_pep_request_item(js, from, AVATARNAMESPACEDATA, id, do_buddy_avatar_update_data); |
|
e6e381b0c7d6
Implemented receiving other people's avatars via XEP-0084. Note that this code now includes a workaround for a non-spec incompatibility for the current ejabberd PEP implementation, and doesn't use the correct namespace due to Psi using the wrong one (outdated?). Works fine though, and the vcard-based approach is retained.
Andreas Monitzer <am@adiumx.com>
parents:
17787
diff
changeset
|
1556 | else { |
|
e6e381b0c7d6
Implemented receiving other people's avatars via XEP-0084. Note that this code now includes a workaround for a non-spec incompatibility for the current ejabberd PEP implementation, and doesn't use the correct namespace due to Psi using the wrong one (outdated?). Works fine though, and the vcard-based approach is retained.
Andreas Monitzer <am@adiumx.com>
parents:
17787
diff
changeset
|
1557 | JabberBuddyAvatarUpdateURLInfo *info = g_new0(JabberBuddyAvatarUpdateURLInfo, 1); |
|
e6e381b0c7d6
Implemented receiving other people's avatars via XEP-0084. Note that this code now includes a workaround for a non-spec incompatibility for the current ejabberd PEP implementation, and doesn't use the correct namespace due to Psi using the wrong one (outdated?). Works fine though, and the vcard-based approach is retained.
Andreas Monitzer <am@adiumx.com>
parents:
17787
diff
changeset
|
1558 | info->js = js; |
|
e6e381b0c7d6
Implemented receiving other people's avatars via XEP-0084. Note that this code now includes a workaround for a non-spec incompatibility for the current ejabberd PEP implementation, and doesn't use the correct namespace due to Psi using the wrong one (outdated?). Works fine though, and the vcard-based approach is retained.
Andreas Monitzer <am@adiumx.com>
parents:
17787
diff
changeset
|
1559 | info->from = g_strdup(from); |
|
e6e381b0c7d6
Implemented receiving other people's avatars via XEP-0084. Note that this code now includes a workaround for a non-spec incompatibility for the current ejabberd PEP implementation, and doesn't use the correct namespace due to Psi using the wrong one (outdated?). Works fine though, and the vcard-based approach is retained.
Andreas Monitzer <am@adiumx.com>
parents:
17787
diff
changeset
|
1560 | info->id = g_strdup(id); |
|
e6e381b0c7d6
Implemented receiving other people's avatars via XEP-0084. Note that this code now includes a workaround for a non-spec incompatibility for the current ejabberd PEP implementation, and doesn't use the correct namespace due to Psi using the wrong one (outdated?). Works fine though, and the vcard-based approach is retained.
Andreas Monitzer <am@adiumx.com>
parents:
17787
diff
changeset
|
1561 | purple_util_fetch_url(url, TRUE, NULL, TRUE, do_buddy_avatar_update_fromurl, info); |
|
e6e381b0c7d6
Implemented receiving other people's avatars via XEP-0084. Note that this code now includes a workaround for a non-spec incompatibility for the current ejabberd PEP implementation, and doesn't use the correct namespace due to Psi using the wrong one (outdated?). Works fine though, and the vcard-based approach is retained.
Andreas Monitzer <am@adiumx.com>
parents:
17787
diff
changeset
|
1562 | } |
|
e6e381b0c7d6
Implemented receiving other people's avatars via XEP-0084. Note that this code now includes a workaround for a non-spec incompatibility for the current ejabberd PEP implementation, and doesn't use the correct namespace due to Psi using the wrong one (outdated?). Works fine though, and the vcard-based approach is retained.
Andreas Monitzer <am@adiumx.com>
parents:
17787
diff
changeset
|
1563 | } |
|
e6e381b0c7d6
Implemented receiving other people's avatars via XEP-0084. Note that this code now includes a workaround for a non-spec incompatibility for the current ejabberd PEP implementation, and doesn't use the correct namespace due to Psi using the wrong one (outdated?). Works fine though, and the vcard-based approach is retained.
Andreas Monitzer <am@adiumx.com>
parents:
17787
diff
changeset
|
1564 | } |
|
17787
439329d20337
Added support for setting the avatar via XEP-0084. Receiving other people's avatar is up next.
Andreas Monitzer <am@adiumx.com>
parents:
17770
diff
changeset
|
1565 | } |
| 8213 | 1566 | |
| 13794 | 1567 | static void jabber_buddy_info_resource_free(gpointer data) |
| 1568 | { | |
| 1569 | JabberBuddyInfoResource *jbri = data; | |
| 1570 | g_free(jbri); | |
| 1571 | } | |
| 1572 | ||
| 1573 | static void jabber_version_parse(JabberStream *js, xmlnode *packet, gpointer data) | |
| 1574 | { | |
| 1575 | JabberBuddyInfo *jbi = data; | |
| 1576 | const char *type, *id, *from; | |
| 1577 | xmlnode *query; | |
| 1578 | char *resource_name; | |
| 1579 | ||
| 1580 | g_return_if_fail(jbi != NULL); | |
| 1581 | ||
| 1582 | type = xmlnode_get_attrib(packet, "type"); | |
| 1583 | id = xmlnode_get_attrib(packet, "id"); | |
| 1584 | from = xmlnode_get_attrib(packet, "from"); | |
| 7014 | 1585 | |
| 13794 | 1586 | jabber_buddy_info_remove_id(jbi, id); |
| 1587 | ||
| 1588 | if(!from) | |
| 1589 | return; | |
| 1590 | ||
| 1591 | resource_name = jabber_get_resource(from); | |
| 1592 | ||
| 1593 | if(resource_name) { | |
| 1594 | if(type && !strcmp(type, "result")) { | |
| 1595 | if((query = xmlnode_get_child(packet, "query"))) { | |
| 1596 | JabberBuddyResource *jbr = jabber_buddy_find_resource(jbi->jb, resource_name); | |
| 1597 | if(jbr) { | |
| 1598 | xmlnode *node; | |
| 1599 | if((node = xmlnode_get_child(query, "name"))) { | |
| 1600 | jbr->client.name = xmlnode_get_data(node); | |
| 1601 | } | |
| 1602 | if((node = xmlnode_get_child(query, "version"))) { | |
| 1603 | jbr->client.version = xmlnode_get_data(node); | |
| 1604 | } | |
| 1605 | if((node = xmlnode_get_child(query, "os"))) { | |
| 1606 | jbr->client.os = xmlnode_get_data(node); | |
| 1607 | } | |
| 1608 | } | |
| 1609 | } | |
| 1610 | } | |
| 1611 | g_free(resource_name); | |
| 10189 | 1612 | } |
| 13794 | 1613 | |
| 1614 | jabber_buddy_info_show_if_ready(jbi); | |
| 7014 | 1615 | } |
| 1616 | ||
| 13794 | 1617 | static void jabber_last_parse(JabberStream *js, xmlnode *packet, gpointer data) |
| 1618 | { | |
| 1619 | JabberBuddyInfo *jbi = data; | |
| 1620 | xmlnode *query; | |
| 1621 | char *resource_name; | |
| 1622 | const char *type, *id, *from, *seconds; | |
| 1623 | ||
| 1624 | g_return_if_fail(jbi != NULL); | |
| 1625 | ||
| 1626 | type = xmlnode_get_attrib(packet, "type"); | |
| 1627 | id = xmlnode_get_attrib(packet, "id"); | |
| 1628 | from = xmlnode_get_attrib(packet, "from"); | |
| 1629 | ||
| 1630 | jabber_buddy_info_remove_id(jbi, id); | |
| 1631 | ||
| 1632 | if(!from) | |
| 1633 | return; | |
| 1634 | ||
| 1635 | resource_name = jabber_get_resource(from); | |
| 1636 | ||
| 1637 | if(resource_name) { | |
| 1638 | if(type && !strcmp(type, "result")) { | |
| 1639 | if((query = xmlnode_get_child(packet, "query"))) { | |
| 1640 | seconds = xmlnode_get_attrib(query, "seconds"); | |
| 1641 | if(seconds) { | |
| 1642 | char *end = NULL; | |
| 1643 | long sec = strtol(seconds, &end, 10); | |
| 1644 | if(end != seconds) { | |
| 1645 | JabberBuddyInfoResource *jbir = g_hash_table_lookup(jbi->resources, resource_name); | |
| 1646 | if(jbir) { | |
| 1647 | jbir->idle_seconds = sec; | |
| 1648 | } | |
| 1649 | } | |
| 1650 | } | |
| 1651 | } | |
| 1652 | } | |
| 1653 | g_free(resource_name); | |
| 1654 | } | |
| 1655 | ||
| 1656 | jabber_buddy_info_show_if_ready(jbi); | |
| 1657 | } | |
| 1658 | ||
|
15363
f6b9d1e3d0cb
[gaim-migrate @ 18092]
Evan Schoenberg <evands@pidgin.im>
parents:
15273
diff
changeset
|
1659 | void jabber_buddy_remove_all_pending_buddy_info_requests(JabberStream *js) |
|
f6b9d1e3d0cb
[gaim-migrate @ 18092]
Evan Schoenberg <evands@pidgin.im>
parents:
15273
diff
changeset
|
1660 | { |
|
f6b9d1e3d0cb
[gaim-migrate @ 18092]
Evan Schoenberg <evands@pidgin.im>
parents:
15273
diff
changeset
|
1661 | if (js->pending_buddy_info_requests) |
|
f6b9d1e3d0cb
[gaim-migrate @ 18092]
Evan Schoenberg <evands@pidgin.im>
parents:
15273
diff
changeset
|
1662 | { |
|
f6b9d1e3d0cb
[gaim-migrate @ 18092]
Evan Schoenberg <evands@pidgin.im>
parents:
15273
diff
changeset
|
1663 | JabberBuddyInfo *jbi; |
|
f6b9d1e3d0cb
[gaim-migrate @ 18092]
Evan Schoenberg <evands@pidgin.im>
parents:
15273
diff
changeset
|
1664 | GSList *l = js->pending_buddy_info_requests; |
|
f6b9d1e3d0cb
[gaim-migrate @ 18092]
Evan Schoenberg <evands@pidgin.im>
parents:
15273
diff
changeset
|
1665 | while (l) { |
|
f6b9d1e3d0cb
[gaim-migrate @ 18092]
Evan Schoenberg <evands@pidgin.im>
parents:
15273
diff
changeset
|
1666 | jbi = l->data; |
|
f6b9d1e3d0cb
[gaim-migrate @ 18092]
Evan Schoenberg <evands@pidgin.im>
parents:
15273
diff
changeset
|
1667 | |
|
f6b9d1e3d0cb
[gaim-migrate @ 18092]
Evan Schoenberg <evands@pidgin.im>
parents:
15273
diff
changeset
|
1668 | g_slist_free(jbi->ids); |
|
f6b9d1e3d0cb
[gaim-migrate @ 18092]
Evan Schoenberg <evands@pidgin.im>
parents:
15273
diff
changeset
|
1669 | jabber_buddy_info_destroy(jbi); |
|
f6b9d1e3d0cb
[gaim-migrate @ 18092]
Evan Schoenberg <evands@pidgin.im>
parents:
15273
diff
changeset
|
1670 | |
|
15727
0754583ceeae
Don't access the list element after it has been freed.
Daniel Atallah <datallah@pidgin.im>
parents:
15688
diff
changeset
|
1671 | l = l->next; |
|
15363
f6b9d1e3d0cb
[gaim-migrate @ 18092]
Evan Schoenberg <evands@pidgin.im>
parents:
15273
diff
changeset
|
1672 | } |
|
f6b9d1e3d0cb
[gaim-migrate @ 18092]
Evan Schoenberg <evands@pidgin.im>
parents:
15273
diff
changeset
|
1673 | |
|
f6b9d1e3d0cb
[gaim-migrate @ 18092]
Evan Schoenberg <evands@pidgin.im>
parents:
15273
diff
changeset
|
1674 | g_slist_free(js->pending_buddy_info_requests); |
|
f6b9d1e3d0cb
[gaim-migrate @ 18092]
Evan Schoenberg <evands@pidgin.im>
parents:
15273
diff
changeset
|
1675 | js->pending_buddy_info_requests = NULL; |
|
f6b9d1e3d0cb
[gaim-migrate @ 18092]
Evan Schoenberg <evands@pidgin.im>
parents:
15273
diff
changeset
|
1676 | } |
|
f6b9d1e3d0cb
[gaim-migrate @ 18092]
Evan Schoenberg <evands@pidgin.im>
parents:
15273
diff
changeset
|
1677 | } |
|
f6b9d1e3d0cb
[gaim-migrate @ 18092]
Evan Schoenberg <evands@pidgin.im>
parents:
15273
diff
changeset
|
1678 | |
| 13794 | 1679 | static gboolean jabber_buddy_get_info_timeout(gpointer data) |
| 1680 | { | |
| 1681 | JabberBuddyInfo *jbi = data; | |
| 1682 | ||
| 1683 | /* remove the pending callbacks */ | |
| 1684 | while(jbi->ids) { | |
| 1685 | char *id = jbi->ids->data; | |
| 1686 | jabber_iq_remove_callback_by_id(jbi->js, id); | |
|
15363
f6b9d1e3d0cb
[gaim-migrate @ 18092]
Evan Schoenberg <evands@pidgin.im>
parents:
15273
diff
changeset
|
1687 | jbi->ids = g_slist_remove(jbi->ids, id); |
| 13794 | 1688 | g_free(id); |
| 1689 | } | |
| 1690 | ||
|
15363
f6b9d1e3d0cb
[gaim-migrate @ 18092]
Evan Schoenberg <evands@pidgin.im>
parents:
15273
diff
changeset
|
1691 | jbi->js->pending_buddy_info_requests = g_slist_remove(jbi->js->pending_buddy_info_requests, jbi); |
| 13794 | 1692 | jbi->timeout_handle = 0; |
| 1693 | ||
| 1694 | jabber_buddy_info_show_if_ready(jbi); | |
| 1695 | ||
| 1696 | return FALSE; | |
| 1697 | } | |
| 1698 | ||
|
17029
dea59a003028
gross hack that will save me time in 30 second chunks
Nathan Walp <nwalp@pidgin.im>
parents:
17007
diff
changeset
|
1699 | static gboolean _client_is_blacklisted(JabberBuddyResource *jbr, const char *ns) |
|
dea59a003028
gross hack that will save me time in 30 second chunks
Nathan Walp <nwalp@pidgin.im>
parents:
17007
diff
changeset
|
1700 | { |
|
dea59a003028
gross hack that will save me time in 30 second chunks
Nathan Walp <nwalp@pidgin.im>
parents:
17007
diff
changeset
|
1701 | /* can't be blacklisted if we don't know what you're running yet */ |
|
dea59a003028
gross hack that will save me time in 30 second chunks
Nathan Walp <nwalp@pidgin.im>
parents:
17007
diff
changeset
|
1702 | if(!jbr->client.name) |
|
dea59a003028
gross hack that will save me time in 30 second chunks
Nathan Walp <nwalp@pidgin.im>
parents:
17007
diff
changeset
|
1703 | return FALSE; |
|
dea59a003028
gross hack that will save me time in 30 second chunks
Nathan Walp <nwalp@pidgin.im>
parents:
17007
diff
changeset
|
1704 | |
|
dea59a003028
gross hack that will save me time in 30 second chunks
Nathan Walp <nwalp@pidgin.im>
parents:
17007
diff
changeset
|
1705 | if(!strcmp(ns, "jabber:iq:last")) { |
|
dea59a003028
gross hack that will save me time in 30 second chunks
Nathan Walp <nwalp@pidgin.im>
parents:
17007
diff
changeset
|
1706 | if(!strcmp(jbr->client.name, "Trillian")) { |
|
20350
ae3f3561e698
another day, another irritating workaround
Nathan Walp <nwalp@pidgin.im>
parents:
20320
diff
changeset
|
1707 | /* verified by nwalp 2007/05/09 */ |
|
ae3f3561e698
another day, another irritating workaround
Nathan Walp <nwalp@pidgin.im>
parents:
20320
diff
changeset
|
1708 | if(!strcmp(jbr->client.version, "3.1.0.121") || |
|
ae3f3561e698
another day, another irritating workaround
Nathan Walp <nwalp@pidgin.im>
parents:
20320
diff
changeset
|
1709 | /* verified by nwalp 2007/09/19 */ |
|
ae3f3561e698
another day, another irritating workaround
Nathan Walp <nwalp@pidgin.im>
parents:
20320
diff
changeset
|
1710 | !strcmp(jbr->client.version, "3.1.7.0")) { |
|
17029
dea59a003028
gross hack that will save me time in 30 second chunks
Nathan Walp <nwalp@pidgin.im>
parents:
17007
diff
changeset
|
1711 | return TRUE; |
|
dea59a003028
gross hack that will save me time in 30 second chunks
Nathan Walp <nwalp@pidgin.im>
parents:
17007
diff
changeset
|
1712 | } |
|
dea59a003028
gross hack that will save me time in 30 second chunks
Nathan Walp <nwalp@pidgin.im>
parents:
17007
diff
changeset
|
1713 | } |
|
dea59a003028
gross hack that will save me time in 30 second chunks
Nathan Walp <nwalp@pidgin.im>
parents:
17007
diff
changeset
|
1714 | } |
|
dea59a003028
gross hack that will save me time in 30 second chunks
Nathan Walp <nwalp@pidgin.im>
parents:
17007
diff
changeset
|
1715 | |
|
dea59a003028
gross hack that will save me time in 30 second chunks
Nathan Walp <nwalp@pidgin.im>
parents:
17007
diff
changeset
|
1716 | return FALSE; |
|
dea59a003028
gross hack that will save me time in 30 second chunks
Nathan Walp <nwalp@pidgin.im>
parents:
17007
diff
changeset
|
1717 | } |
|
dea59a003028
gross hack that will save me time in 30 second chunks
Nathan Walp <nwalp@pidgin.im>
parents:
17007
diff
changeset
|
1718 | |
| 13794 | 1719 | static void jabber_buddy_get_info_for_jid(JabberStream *js, const char *jid) |
| 7014 | 1720 | { |
| 1721 | JabberIq *iq; | |
| 1722 | xmlnode *vcard; | |
| 13794 | 1723 | GList *resources; |
| 1724 | JabberBuddy *jb; | |
| 1725 | JabberBuddyInfo *jbi; | |
| 1726 | ||
| 1727 | jb = jabber_buddy_find(js, jid, TRUE); | |
| 1728 | ||
| 1729 | /* invalid JID */ | |
| 1730 | if(!jb) | |
| 1731 | return; | |
| 1732 | ||
| 1733 | jbi = g_new0(JabberBuddyInfo, 1); | |
| 1734 | jbi->jid = g_strdup(jid); | |
| 1735 | jbi->js = js; | |
| 1736 | jbi->jb = jb; | |
| 1737 | jbi->resources = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, jabber_buddy_info_resource_free); | |
| 7014 | 1738 | |
| 1739 | iq = jabber_iq_new(js, JABBER_IQ_GET); | |
| 1740 | ||
| 13794 | 1741 | xmlnode_set_attrib(iq->node, "to", jid); |
| 7014 | 1742 | vcard = xmlnode_new_child(iq->node, "vCard"); |
| 13808 | 1743 | xmlnode_set_namespace(vcard, "vcard-temp"); |
| 7014 | 1744 | |
| 13794 | 1745 | jabber_iq_set_callback(iq, jabber_vcard_parse, jbi); |
| 1746 | jbi->ids = g_slist_prepend(jbi->ids, g_strdup(iq->id)); | |
| 7014 | 1747 | |
| 1748 | jabber_iq_send(iq); | |
| 13794 | 1749 | |
| 1750 | for(resources = jb->resources; resources; resources = resources->next) | |
| 1751 | { | |
| 1752 | JabberBuddyResource *jbr = resources->data; | |
|
14164
d85f44e1fec1
[gaim-migrate @ 16732]
Mark Doliner <markdoliner@pidgin.im>
parents:
14155
diff
changeset
|
1753 | JabberBuddyInfoResource *jbir; |
| 13794 | 1754 | char *full_jid; |
|
14164
d85f44e1fec1
[gaim-migrate @ 16732]
Mark Doliner <markdoliner@pidgin.im>
parents:
14155
diff
changeset
|
1755 | |
|
d85f44e1fec1
[gaim-migrate @ 16732]
Mark Doliner <markdoliner@pidgin.im>
parents:
14155
diff
changeset
|
1756 | if ((strchr(jid, '/') == NULL) && (jbr->name != NULL)) { |
|
d85f44e1fec1
[gaim-migrate @ 16732]
Mark Doliner <markdoliner@pidgin.im>
parents:
14155
diff
changeset
|
1757 | full_jid = g_strdup_printf("%s/%s", jid, jbr->name); |
|
d85f44e1fec1
[gaim-migrate @ 16732]
Mark Doliner <markdoliner@pidgin.im>
parents:
14155
diff
changeset
|
1758 | } else { |
| 13794 | 1759 | full_jid = g_strdup(jid); |
| 1760 | } | |
| 1761 | ||
|
14164
d85f44e1fec1
[gaim-migrate @ 16732]
Mark Doliner <markdoliner@pidgin.im>
parents:
14155
diff
changeset
|
1762 | if (jbr->name != NULL) |
|
d85f44e1fec1
[gaim-migrate @ 16732]
Mark Doliner <markdoliner@pidgin.im>
parents:
14155
diff
changeset
|
1763 | { |
|
d85f44e1fec1
[gaim-migrate @ 16732]
Mark Doliner <markdoliner@pidgin.im>
parents:
14155
diff
changeset
|
1764 | jbir = g_new0(JabberBuddyInfoResource, 1); |
|
d85f44e1fec1
[gaim-migrate @ 16732]
Mark Doliner <markdoliner@pidgin.im>
parents:
14155
diff
changeset
|
1765 | g_hash_table_insert(jbi->resources, g_strdup(jbr->name), jbir); |
|
d85f44e1fec1
[gaim-migrate @ 16732]
Mark Doliner <markdoliner@pidgin.im>
parents:
14155
diff
changeset
|
1766 | } |
| 13794 | 1767 | |
| 1768 | if(!jbr->client.name) { | |
| 1769 | iq = jabber_iq_new_query(js, JABBER_IQ_GET, "jabber:iq:version"); | |
| 1770 | xmlnode_set_attrib(iq->node, "to", full_jid); | |
| 1771 | jabber_iq_set_callback(iq, jabber_version_parse, jbi); | |
| 1772 | jbi->ids = g_slist_prepend(jbi->ids, g_strdup(iq->id)); | |
| 1773 | jabber_iq_send(iq); | |
| 1774 | } | |
| 1775 | ||
|
17029
dea59a003028
gross hack that will save me time in 30 second chunks
Nathan Walp <nwalp@pidgin.im>
parents:
17007
diff
changeset
|
1776 | /* this is to fix the feeling of irritation I get when trying |
|
dea59a003028
gross hack that will save me time in 30 second chunks
Nathan Walp <nwalp@pidgin.im>
parents:
17007
diff
changeset
|
1777 | * to get info on a friend running Trillian, which doesn't |
| 17051 | 1778 | * respond (with an error or otherwise) to jabber:iq:last |
|
17029
dea59a003028
gross hack that will save me time in 30 second chunks
Nathan Walp <nwalp@pidgin.im>
parents:
17007
diff
changeset
|
1779 | * requests. There are a number of Trillian users in my |
|
dea59a003028
gross hack that will save me time in 30 second chunks
Nathan Walp <nwalp@pidgin.im>
parents:
17007
diff
changeset
|
1780 | * office. */ |
|
dea59a003028
gross hack that will save me time in 30 second chunks
Nathan Walp <nwalp@pidgin.im>
parents:
17007
diff
changeset
|
1781 | if(!_client_is_blacklisted(jbr, "jabber:iq:last")) { |
|
dea59a003028
gross hack that will save me time in 30 second chunks
Nathan Walp <nwalp@pidgin.im>
parents:
17007
diff
changeset
|
1782 | iq = jabber_iq_new_query(js, JABBER_IQ_GET, "jabber:iq:last"); |
|
dea59a003028
gross hack that will save me time in 30 second chunks
Nathan Walp <nwalp@pidgin.im>
parents:
17007
diff
changeset
|
1783 | xmlnode_set_attrib(iq->node, "to", full_jid); |
|
dea59a003028
gross hack that will save me time in 30 second chunks
Nathan Walp <nwalp@pidgin.im>
parents:
17007
diff
changeset
|
1784 | jabber_iq_set_callback(iq, jabber_last_parse, jbi); |
|
dea59a003028
gross hack that will save me time in 30 second chunks
Nathan Walp <nwalp@pidgin.im>
parents:
17007
diff
changeset
|
1785 | jbi->ids = g_slist_prepend(jbi->ids, g_strdup(iq->id)); |
|
dea59a003028
gross hack that will save me time in 30 second chunks
Nathan Walp <nwalp@pidgin.im>
parents:
17007
diff
changeset
|
1786 | jabber_iq_send(iq); |
|
dea59a003028
gross hack that will save me time in 30 second chunks
Nathan Walp <nwalp@pidgin.im>
parents:
17007
diff
changeset
|
1787 | } |
| 13794 | 1788 | |
| 1789 | g_free(full_jid); | |
| 1790 | } | |
| 1791 | ||
|
15363
f6b9d1e3d0cb
[gaim-migrate @ 18092]
Evan Schoenberg <evands@pidgin.im>
parents:
15273
diff
changeset
|
1792 | js->pending_buddy_info_requests = g_slist_prepend(js->pending_buddy_info_requests, jbi); |
| 15884 | 1793 | jbi->timeout_handle = purple_timeout_add(30000, jabber_buddy_get_info_timeout, jbi); |
| 7014 | 1794 | } |
| 1795 | ||
| 15884 | 1796 | void jabber_buddy_get_info(PurpleConnection *gc, const char *who) |
| 10189 | 1797 | { |
| 1798 | JabberStream *js = gc->proto_data; | |
| 1799 | char *bare_jid = jabber_get_bare_jid(who); | |
| 1800 | ||
| 1801 | if(bare_jid) { | |
| 1802 | jabber_buddy_get_info_for_jid(js, bare_jid); | |
| 1803 | g_free(bare_jid); | |
| 1804 | } | |
| 1805 | } | |
| 1806 | ||
| 15884 | 1807 | void jabber_buddy_get_info_chat(PurpleConnection *gc, int id, |
| 7014 | 1808 | const char *resource) |
| 1809 | { | |
| 1810 | JabberStream *js = gc->proto_data; | |
| 1811 | JabberChat *chat = jabber_chat_find_by_id(js, id); | |
| 1812 | char *full_jid; | |
| 1813 | ||
| 1814 | if(!chat) | |
| 1815 | return; | |
| 1816 | ||
| 1817 | full_jid = g_strdup_printf("%s@%s/%s", chat->room, chat->server, resource); | |
| 10189 | 1818 | jabber_buddy_get_info_for_jid(js, full_jid); |
| 7014 | 1819 | g_free(full_jid); |
| 1820 | } | |
| 1821 | ||
| 7395 | 1822 | |
| 7014 | 1823 | static void jabber_buddy_set_invisibility(JabberStream *js, const char *who, |
| 1824 | gboolean invisible) | |
| 1825 | { | |
| 15884 | 1826 | PurplePresence *gpresence; |
| 1827 | PurpleAccount *account; | |
| 1828 | PurpleStatus *status; | |
| 7014 | 1829 | JabberBuddy *jb = jabber_buddy_find(js, who, TRUE); |
| 1830 | xmlnode *presence; | |
| 9954 | 1831 | JabberBuddyState state; |
| 14525 | 1832 | char *msg; |
| 9954 | 1833 | int priority; |
| 7014 | 1834 | |
| 15884 | 1835 | account = purple_connection_get_account(js->gc); |
| 1836 | gpresence = purple_account_get_presence(account); | |
| 1837 | status = purple_presence_get_active_status(gpresence); | |
|
9944
71ef020ec4b0
[gaim-migrate @ 10838]
Christian Hammond <chipx86@chipx86.com>
parents:
9797
diff
changeset
|
1838 | |
| 15884 | 1839 | purple_status_to_jabber(status, &state, &msg, &priority); |
|
17770
e67998927a3c
Added the ability to define extensions to caps
Andreas Monitzer <am@adiumx.com>
parents:
17051
diff
changeset
|
1840 | presence = jabber_presence_create_js(js, state, msg, priority); |
| 9954 | 1841 | |
| 14525 | 1842 | g_free(msg); |
| 1843 | ||
| 7014 | 1844 | xmlnode_set_attrib(presence, "to", who); |
| 1845 | if(invisible) { | |
| 1846 | xmlnode_set_attrib(presence, "type", "invisible"); | |
| 1847 | jb->invisible |= JABBER_INVIS_BUDDY; | |
| 1848 | } else { | |
| 1849 | jb->invisible &= ~JABBER_INVIS_BUDDY; | |
| 1850 | } | |
| 1851 | ||
| 1852 | jabber_send(js, presence); | |
| 1853 | xmlnode_free(presence); | |
| 1854 | } | |
| 1855 | ||
| 15884 | 1856 | static void jabber_buddy_make_invisible(PurpleBlistNode *node, gpointer data) |
| 7014 | 1857 | { |
| 15884 | 1858 | PurpleBuddy *buddy; |
| 1859 | PurpleConnection *gc; | |
|
9030
7b574a641391
[gaim-migrate @ 9806]
Mark Doliner <markdoliner@pidgin.im>
parents:
9015
diff
changeset
|
1860 | JabberStream *js; |
|
7b574a641391
[gaim-migrate @ 9806]
Mark Doliner <markdoliner@pidgin.im>
parents:
9015
diff
changeset
|
1861 | |
| 15884 | 1862 | g_return_if_fail(PURPLE_BLIST_NODE_IS_BUDDY(node)); |
|
9030
7b574a641391
[gaim-migrate @ 9806]
Mark Doliner <markdoliner@pidgin.im>
parents:
9015
diff
changeset
|
1863 | |
| 15884 | 1864 | buddy = (PurpleBuddy *) node; |
| 1865 | gc = purple_account_get_connection(buddy->account); | |
|
9030
7b574a641391
[gaim-migrate @ 9806]
Mark Doliner <markdoliner@pidgin.im>
parents:
9015
diff
changeset
|
1866 | js = gc->proto_data; |
|
7b574a641391
[gaim-migrate @ 9806]
Mark Doliner <markdoliner@pidgin.im>
parents:
9015
diff
changeset
|
1867 | |
|
7b574a641391
[gaim-migrate @ 9806]
Mark Doliner <markdoliner@pidgin.im>
parents:
9015
diff
changeset
|
1868 | jabber_buddy_set_invisibility(js, buddy->name, TRUE); |
| 7014 | 1869 | } |
| 1870 | ||
| 15884 | 1871 | static void jabber_buddy_make_visible(PurpleBlistNode *node, gpointer data) |
| 7014 | 1872 | { |
| 15884 | 1873 | PurpleBuddy *buddy; |
| 1874 | PurpleConnection *gc; | |
|
9030
7b574a641391
[gaim-migrate @ 9806]
Mark Doliner <markdoliner@pidgin.im>
parents:
9015
diff
changeset
|
1875 | JabberStream *js; |
| 7014 | 1876 | |
| 15884 | 1877 | g_return_if_fail(PURPLE_BLIST_NODE_IS_BUDDY(node)); |
| 7014 | 1878 | |
| 15884 | 1879 | buddy = (PurpleBuddy *) node; |
| 1880 | gc = purple_account_get_connection(buddy->account); | |
|
9030
7b574a641391
[gaim-migrate @ 9806]
Mark Doliner <markdoliner@pidgin.im>
parents:
9015
diff
changeset
|
1881 | js = gc->proto_data; |
|
7b574a641391
[gaim-migrate @ 9806]
Mark Doliner <markdoliner@pidgin.im>
parents:
9015
diff
changeset
|
1882 | |
|
7b574a641391
[gaim-migrate @ 9806]
Mark Doliner <markdoliner@pidgin.im>
parents:
9015
diff
changeset
|
1883 | jabber_buddy_set_invisibility(js, buddy->name, FALSE); |
| 7014 | 1884 | } |
| 1885 | ||
| 15884 | 1886 | static void jabber_buddy_cancel_presence_notification(PurpleBlistNode *node, |
|
9030
7b574a641391
[gaim-migrate @ 9806]
Mark Doliner <markdoliner@pidgin.im>
parents:
9015
diff
changeset
|
1887 | gpointer data) |
| 7014 | 1888 | { |
| 15884 | 1889 | PurpleBuddy *buddy; |
| 1890 | PurpleConnection *gc; | |
|
9030
7b574a641391
[gaim-migrate @ 9806]
Mark Doliner <markdoliner@pidgin.im>
parents:
9015
diff
changeset
|
1891 | JabberStream *js; |
|
7b574a641391
[gaim-migrate @ 9806]
Mark Doliner <markdoliner@pidgin.im>
parents:
9015
diff
changeset
|
1892 | |
| 15884 | 1893 | g_return_if_fail(PURPLE_BLIST_NODE_IS_BUDDY(node)); |
| 7014 | 1894 | |
| 15884 | 1895 | buddy = (PurpleBuddy *) node; |
| 1896 | gc = purple_account_get_connection(buddy->account); | |
|
9030
7b574a641391
[gaim-migrate @ 9806]
Mark Doliner <markdoliner@pidgin.im>
parents:
9015
diff
changeset
|
1897 | js = gc->proto_data; |
|
7b574a641391
[gaim-migrate @ 9806]
Mark Doliner <markdoliner@pidgin.im>
parents:
9015
diff
changeset
|
1898 | |
|
7b574a641391
[gaim-migrate @ 9806]
Mark Doliner <markdoliner@pidgin.im>
parents:
9015
diff
changeset
|
1899 | /* I wonder if we should prompt the user before doing this */ |
|
7b574a641391
[gaim-migrate @ 9806]
Mark Doliner <markdoliner@pidgin.im>
parents:
9015
diff
changeset
|
1900 | jabber_presence_subscription_set(js, buddy->name, "unsubscribed"); |
| 7014 | 1901 | } |
| 1902 | ||
| 15884 | 1903 | static void jabber_buddy_rerequest_auth(PurpleBlistNode *node, gpointer data) |
| 7250 | 1904 | { |
| 15884 | 1905 | PurpleBuddy *buddy; |
| 1906 | PurpleConnection *gc; | |
|
9030
7b574a641391
[gaim-migrate @ 9806]
Mark Doliner <markdoliner@pidgin.im>
parents:
9015
diff
changeset
|
1907 | JabberStream *js; |
|
7b574a641391
[gaim-migrate @ 9806]
Mark Doliner <markdoliner@pidgin.im>
parents:
9015
diff
changeset
|
1908 | |
| 15884 | 1909 | g_return_if_fail(PURPLE_BLIST_NODE_IS_BUDDY(node)); |
| 7250 | 1910 | |
| 15884 | 1911 | buddy = (PurpleBuddy *) node; |
| 1912 | gc = purple_account_get_connection(buddy->account); | |
|
9030
7b574a641391
[gaim-migrate @ 9806]
Mark Doliner <markdoliner@pidgin.im>
parents:
9015
diff
changeset
|
1913 | js = gc->proto_data; |
|
7b574a641391
[gaim-migrate @ 9806]
Mark Doliner <markdoliner@pidgin.im>
parents:
9015
diff
changeset
|
1914 | |
|
7b574a641391
[gaim-migrate @ 9806]
Mark Doliner <markdoliner@pidgin.im>
parents:
9015
diff
changeset
|
1915 | jabber_presence_subscription_set(js, buddy->name, "subscribe"); |
| 7250 | 1916 | } |
| 1917 | ||
|
9030
7b574a641391
[gaim-migrate @ 9806]
Mark Doliner <markdoliner@pidgin.im>
parents:
9015
diff
changeset
|
1918 | |
| 15884 | 1919 | static void jabber_buddy_unsubscribe(PurpleBlistNode *node, gpointer data) |
| 7014 | 1920 | { |
| 15884 | 1921 | PurpleBuddy *buddy; |
| 1922 | PurpleConnection *gc; | |
|
9030
7b574a641391
[gaim-migrate @ 9806]
Mark Doliner <markdoliner@pidgin.im>
parents:
9015
diff
changeset
|
1923 | JabberStream *js; |
|
7b574a641391
[gaim-migrate @ 9806]
Mark Doliner <markdoliner@pidgin.im>
parents:
9015
diff
changeset
|
1924 | |
| 15884 | 1925 | g_return_if_fail(PURPLE_BLIST_NODE_IS_BUDDY(node)); |
|
9030
7b574a641391
[gaim-migrate @ 9806]
Mark Doliner <markdoliner@pidgin.im>
parents:
9015
diff
changeset
|
1926 | |
| 15884 | 1927 | buddy = (PurpleBuddy *) node; |
| 1928 | gc = purple_account_get_connection(buddy->account); | |
|
9030
7b574a641391
[gaim-migrate @ 9806]
Mark Doliner <markdoliner@pidgin.im>
parents:
9015
diff
changeset
|
1929 | js = gc->proto_data; |
|
7b574a641391
[gaim-migrate @ 9806]
Mark Doliner <markdoliner@pidgin.im>
parents:
9015
diff
changeset
|
1930 | |
|
7b574a641391
[gaim-migrate @ 9806]
Mark Doliner <markdoliner@pidgin.im>
parents:
9015
diff
changeset
|
1931 | jabber_presence_subscription_set(js, buddy->name, "unsubscribe"); |
|
7b574a641391
[gaim-migrate @ 9806]
Mark Doliner <markdoliner@pidgin.im>
parents:
9015
diff
changeset
|
1932 | } |
|
7b574a641391
[gaim-migrate @ 9806]
Mark Doliner <markdoliner@pidgin.im>
parents:
9015
diff
changeset
|
1933 | |
|
17808
9b9a78bf9a03
Implemented logging in/out of gateways, as explained in XEP-0100.
Andreas Monitzer <am@adiumx.com>
parents:
17807
diff
changeset
|
1934 | static void jabber_buddy_login(PurpleBlistNode *node, gpointer data) { |
|
9b9a78bf9a03
Implemented logging in/out of gateways, as explained in XEP-0100.
Andreas Monitzer <am@adiumx.com>
parents:
17807
diff
changeset
|
1935 | if(PURPLE_BLIST_NODE_IS_BUDDY(node)) { |
|
9b9a78bf9a03
Implemented logging in/out of gateways, as explained in XEP-0100.
Andreas Monitzer <am@adiumx.com>
parents:
17807
diff
changeset
|
1936 | /* simply create a directed presence of the current status */ |
|
9b9a78bf9a03
Implemented logging in/out of gateways, as explained in XEP-0100.
Andreas Monitzer <am@adiumx.com>
parents:
17807
diff
changeset
|
1937 | PurpleBuddy *buddy = (PurpleBuddy *) node; |
|
9b9a78bf9a03
Implemented logging in/out of gateways, as explained in XEP-0100.
Andreas Monitzer <am@adiumx.com>
parents:
17807
diff
changeset
|
1938 | PurpleConnection *gc = purple_account_get_connection(buddy->account); |
|
9b9a78bf9a03
Implemented logging in/out of gateways, as explained in XEP-0100.
Andreas Monitzer <am@adiumx.com>
parents:
17807
diff
changeset
|
1939 | JabberStream *js = gc->proto_data; |
|
9b9a78bf9a03
Implemented logging in/out of gateways, as explained in XEP-0100.
Andreas Monitzer <am@adiumx.com>
parents:
17807
diff
changeset
|
1940 | PurpleAccount *account = purple_connection_get_account(gc); |
|
9b9a78bf9a03
Implemented logging in/out of gateways, as explained in XEP-0100.
Andreas Monitzer <am@adiumx.com>
parents:
17807
diff
changeset
|
1941 | PurplePresence *gpresence = purple_account_get_presence(account); |
|
9b9a78bf9a03
Implemented logging in/out of gateways, as explained in XEP-0100.
Andreas Monitzer <am@adiumx.com>
parents:
17807
diff
changeset
|
1942 | PurpleStatus *status = purple_presence_get_active_status(gpresence); |
|
9b9a78bf9a03
Implemented logging in/out of gateways, as explained in XEP-0100.
Andreas Monitzer <am@adiumx.com>
parents:
17807
diff
changeset
|
1943 | xmlnode *presence; |
|
9b9a78bf9a03
Implemented logging in/out of gateways, as explained in XEP-0100.
Andreas Monitzer <am@adiumx.com>
parents:
17807
diff
changeset
|
1944 | JabberBuddyState state; |
|
9b9a78bf9a03
Implemented logging in/out of gateways, as explained in XEP-0100.
Andreas Monitzer <am@adiumx.com>
parents:
17807
diff
changeset
|
1945 | char *msg; |
|
9b9a78bf9a03
Implemented logging in/out of gateways, as explained in XEP-0100.
Andreas Monitzer <am@adiumx.com>
parents:
17807
diff
changeset
|
1946 | int priority; |
|
9b9a78bf9a03
Implemented logging in/out of gateways, as explained in XEP-0100.
Andreas Monitzer <am@adiumx.com>
parents:
17807
diff
changeset
|
1947 | |
|
9b9a78bf9a03
Implemented logging in/out of gateways, as explained in XEP-0100.
Andreas Monitzer <am@adiumx.com>
parents:
17807
diff
changeset
|
1948 | purple_status_to_jabber(status, &state, &msg, &priority); |
|
9b9a78bf9a03
Implemented logging in/out of gateways, as explained in XEP-0100.
Andreas Monitzer <am@adiumx.com>
parents:
17807
diff
changeset
|
1949 | presence = jabber_presence_create_js(js, state, msg, priority); |
|
9b9a78bf9a03
Implemented logging in/out of gateways, as explained in XEP-0100.
Andreas Monitzer <am@adiumx.com>
parents:
17807
diff
changeset
|
1950 | |
|
9b9a78bf9a03
Implemented logging in/out of gateways, as explained in XEP-0100.
Andreas Monitzer <am@adiumx.com>
parents:
17807
diff
changeset
|
1951 | g_free(msg); |
|
9b9a78bf9a03
Implemented logging in/out of gateways, as explained in XEP-0100.
Andreas Monitzer <am@adiumx.com>
parents:
17807
diff
changeset
|
1952 | |
|
9b9a78bf9a03
Implemented logging in/out of gateways, as explained in XEP-0100.
Andreas Monitzer <am@adiumx.com>
parents:
17807
diff
changeset
|
1953 | xmlnode_set_attrib(presence, "to", buddy->name); |
|
9b9a78bf9a03
Implemented logging in/out of gateways, as explained in XEP-0100.
Andreas Monitzer <am@adiumx.com>
parents:
17807
diff
changeset
|
1954 | |
|
9b9a78bf9a03
Implemented logging in/out of gateways, as explained in XEP-0100.
Andreas Monitzer <am@adiumx.com>
parents:
17807
diff
changeset
|
1955 | jabber_send(js, presence); |
|
9b9a78bf9a03
Implemented logging in/out of gateways, as explained in XEP-0100.
Andreas Monitzer <am@adiumx.com>
parents:
17807
diff
changeset
|
1956 | xmlnode_free(presence); |
|
9b9a78bf9a03
Implemented logging in/out of gateways, as explained in XEP-0100.
Andreas Monitzer <am@adiumx.com>
parents:
17807
diff
changeset
|
1957 | } |
|
9b9a78bf9a03
Implemented logging in/out of gateways, as explained in XEP-0100.
Andreas Monitzer <am@adiumx.com>
parents:
17807
diff
changeset
|
1958 | } |
|
9b9a78bf9a03
Implemented logging in/out of gateways, as explained in XEP-0100.
Andreas Monitzer <am@adiumx.com>
parents:
17807
diff
changeset
|
1959 | |
|
9b9a78bf9a03
Implemented logging in/out of gateways, as explained in XEP-0100.
Andreas Monitzer <am@adiumx.com>
parents:
17807
diff
changeset
|
1960 | static void jabber_buddy_logout(PurpleBlistNode *node, gpointer data) { |
|
9b9a78bf9a03
Implemented logging in/out of gateways, as explained in XEP-0100.
Andreas Monitzer <am@adiumx.com>
parents:
17807
diff
changeset
|
1961 | if(PURPLE_BLIST_NODE_IS_BUDDY(node)) { |
|
9b9a78bf9a03
Implemented logging in/out of gateways, as explained in XEP-0100.
Andreas Monitzer <am@adiumx.com>
parents:
17807
diff
changeset
|
1962 | /* simply create a directed unavailable presence */ |
|
9b9a78bf9a03
Implemented logging in/out of gateways, as explained in XEP-0100.
Andreas Monitzer <am@adiumx.com>
parents:
17807
diff
changeset
|
1963 | PurpleBuddy *buddy = (PurpleBuddy *) node; |
|
9b9a78bf9a03
Implemented logging in/out of gateways, as explained in XEP-0100.
Andreas Monitzer <am@adiumx.com>
parents:
17807
diff
changeset
|
1964 | JabberStream *js = purple_account_get_connection(buddy->account)->proto_data; |
|
9b9a78bf9a03
Implemented logging in/out of gateways, as explained in XEP-0100.
Andreas Monitzer <am@adiumx.com>
parents:
17807
diff
changeset
|
1965 | xmlnode *presence; |
|
9b9a78bf9a03
Implemented logging in/out of gateways, as explained in XEP-0100.
Andreas Monitzer <am@adiumx.com>
parents:
17807
diff
changeset
|
1966 | |
|
9b9a78bf9a03
Implemented logging in/out of gateways, as explained in XEP-0100.
Andreas Monitzer <am@adiumx.com>
parents:
17807
diff
changeset
|
1967 | presence = jabber_presence_create_js(js, JABBER_BUDDY_STATE_UNAVAILABLE, NULL, 0); |
|
9b9a78bf9a03
Implemented logging in/out of gateways, as explained in XEP-0100.
Andreas Monitzer <am@adiumx.com>
parents:
17807
diff
changeset
|
1968 | |
|
9b9a78bf9a03
Implemented logging in/out of gateways, as explained in XEP-0100.
Andreas Monitzer <am@adiumx.com>
parents:
17807
diff
changeset
|
1969 | xmlnode_set_attrib(presence, "to", buddy->name); |
|
9b9a78bf9a03
Implemented logging in/out of gateways, as explained in XEP-0100.
Andreas Monitzer <am@adiumx.com>
parents:
17807
diff
changeset
|
1970 | |
|
9b9a78bf9a03
Implemented logging in/out of gateways, as explained in XEP-0100.
Andreas Monitzer <am@adiumx.com>
parents:
17807
diff
changeset
|
1971 | jabber_send(js, presence); |
|
9b9a78bf9a03
Implemented logging in/out of gateways, as explained in XEP-0100.
Andreas Monitzer <am@adiumx.com>
parents:
17807
diff
changeset
|
1972 | xmlnode_free(presence); |
|
9b9a78bf9a03
Implemented logging in/out of gateways, as explained in XEP-0100.
Andreas Monitzer <am@adiumx.com>
parents:
17807
diff
changeset
|
1973 | } |
|
9b9a78bf9a03
Implemented logging in/out of gateways, as explained in XEP-0100.
Andreas Monitzer <am@adiumx.com>
parents:
17807
diff
changeset
|
1974 | } |
|
9030
7b574a641391
[gaim-migrate @ 9806]
Mark Doliner <markdoliner@pidgin.im>
parents:
9015
diff
changeset
|
1975 | |
| 15884 | 1976 | static GList *jabber_buddy_menu(PurpleBuddy *buddy) |
|
9030
7b574a641391
[gaim-migrate @ 9806]
Mark Doliner <markdoliner@pidgin.im>
parents:
9015
diff
changeset
|
1977 | { |
| 15884 | 1978 | PurpleConnection *gc = purple_account_get_connection(buddy->account); |
|
9030
7b574a641391
[gaim-migrate @ 9806]
Mark Doliner <markdoliner@pidgin.im>
parents:
9015
diff
changeset
|
1979 | JabberStream *js = gc->proto_data; |
|
7b574a641391
[gaim-migrate @ 9806]
Mark Doliner <markdoliner@pidgin.im>
parents:
9015
diff
changeset
|
1980 | JabberBuddy *jb = jabber_buddy_find(js, buddy->name, TRUE); |
|
17816
1b7362b4a7a2
Implemented ad-hoc commands for the buddy action menu (untested), implemented the receiving end of XEP-0115: Entity Capabilities. Note that this seems not to be reliable right now, since some clients seem to have a very broken [read: completely non-functional] implementation (most notably Gajim and the py-transports).
Andreas Monitzer <am@adiumx.com>
parents:
17808
diff
changeset
|
1981 | GList *jbrs; |
|
9030
7b574a641391
[gaim-migrate @ 9806]
Mark Doliner <markdoliner@pidgin.im>
parents:
9015
diff
changeset
|
1982 | |
| 7014 | 1983 | GList *m = NULL; |
| 15884 | 1984 | PurpleMenuAction *act; |
| 7395 | 1985 | |
| 1986 | if(!jb) | |
| 1987 | return m; | |
| 1988 | ||
| 8185 | 1989 | /* XXX: fix the NOT ME below */ |
| 1990 | ||
| 1991 | if(js->protocol_version == JABBER_PROTO_0_9 /* && NOT ME */) { | |
| 8166 | 1992 | if(jb->invisible & JABBER_INVIS_BUDDY) { |
| 15884 | 1993 | act = purple_menu_action_new(_("Un-hide From"), |
| 1994 | PURPLE_CALLBACK(jabber_buddy_make_visible), | |
| 12919 | 1995 | NULL, NULL); |
| 8166 | 1996 | } else { |
| 15884 | 1997 | act = purple_menu_action_new(_("Temporarily Hide From"), |
| 1998 | PURPLE_CALLBACK(jabber_buddy_make_invisible), | |
| 13019 | 1999 | NULL, NULL); |
| 8166 | 2000 | } |
|
9030
7b574a641391
[gaim-migrate @ 9806]
Mark Doliner <markdoliner@pidgin.im>
parents:
9015
diff
changeset
|
2001 | m = g_list_append(m, act); |
| 7014 | 2002 | } |
| 2003 | ||
| 8185 | 2004 | if(jb->subscription & JABBER_SUB_FROM /* && NOT ME */) { |
| 15884 | 2005 | act = purple_menu_action_new(_("Cancel Presence Notification"), |
| 2006 | PURPLE_CALLBACK(jabber_buddy_cancel_presence_notification), | |
| 12919 | 2007 | NULL, NULL); |
|
9030
7b574a641391
[gaim-migrate @ 9806]
Mark Doliner <markdoliner@pidgin.im>
parents:
9015
diff
changeset
|
2008 | m = g_list_append(m, act); |
| 7014 | 2009 | } |
| 2010 | ||
| 2011 | if(!(jb->subscription & JABBER_SUB_TO)) { | |
| 15884 | 2012 | act = purple_menu_action_new(_("(Re-)Request authorization"), |
| 2013 | PURPLE_CALLBACK(jabber_buddy_rerequest_auth), | |
| 12919 | 2014 | NULL, NULL); |
|
9030
7b574a641391
[gaim-migrate @ 9806]
Mark Doliner <markdoliner@pidgin.im>
parents:
9015
diff
changeset
|
2015 | m = g_list_append(m, act); |
|
7b574a641391
[gaim-migrate @ 9806]
Mark Doliner <markdoliner@pidgin.im>
parents:
9015
diff
changeset
|
2016 | |
| 8185 | 2017 | } else /* if(NOT ME) */{ |
|
9030
7b574a641391
[gaim-migrate @ 9806]
Mark Doliner <markdoliner@pidgin.im>
parents:
9015
diff
changeset
|
2018 | |
|
7b574a641391
[gaim-migrate @ 9806]
Mark Doliner <markdoliner@pidgin.im>
parents:
9015
diff
changeset
|
2019 | /* shouldn't this just happen automatically when the buddy is |
|
7b574a641391
[gaim-migrate @ 9806]
Mark Doliner <markdoliner@pidgin.im>
parents:
9015
diff
changeset
|
2020 | removed? */ |
| 15884 | 2021 | act = purple_menu_action_new(_("Unsubscribe"), |
| 2022 | PURPLE_CALLBACK(jabber_buddy_unsubscribe), | |
| 12919 | 2023 | NULL, NULL); |
|
9030
7b574a641391
[gaim-migrate @ 9806]
Mark Doliner <markdoliner@pidgin.im>
parents:
9015
diff
changeset
|
2024 | m = g_list_append(m, act); |
| 7014 | 2025 | } |
|
17808
9b9a78bf9a03
Implemented logging in/out of gateways, as explained in XEP-0100.
Andreas Monitzer <am@adiumx.com>
parents:
17807
diff
changeset
|
2026 | |
|
9b9a78bf9a03
Implemented logging in/out of gateways, as explained in XEP-0100.
Andreas Monitzer <am@adiumx.com>
parents:
17807
diff
changeset
|
2027 | /* |
|
9b9a78bf9a03
Implemented logging in/out of gateways, as explained in XEP-0100.
Andreas Monitzer <am@adiumx.com>
parents:
17807
diff
changeset
|
2028 | * This if-condition implements parts of XEP-0100: Gateway Interaction |
|
9b9a78bf9a03
Implemented logging in/out of gateways, as explained in XEP-0100.
Andreas Monitzer <am@adiumx.com>
parents:
17807
diff
changeset
|
2029 | * |
|
9b9a78bf9a03
Implemented logging in/out of gateways, as explained in XEP-0100.
Andreas Monitzer <am@adiumx.com>
parents:
17807
diff
changeset
|
2030 | * According to stpeter, there is no way to know if a jid on the roster is a gateway without sending a disco#info. |
|
9b9a78bf9a03
Implemented logging in/out of gateways, as explained in XEP-0100.
Andreas Monitzer <am@adiumx.com>
parents:
17807
diff
changeset
|
2031 | * However, since the gateway might appear offline to us, we cannot get that information. Therefore, I just assume |
|
9b9a78bf9a03
Implemented logging in/out of gateways, as explained in XEP-0100.
Andreas Monitzer <am@adiumx.com>
parents:
17807
diff
changeset
|
2032 | * that gateways on the roster can be identified by having no '@' in their jid. This is a faily safe assumption, since |
|
9b9a78bf9a03
Implemented logging in/out of gateways, as explained in XEP-0100.
Andreas Monitzer <am@adiumx.com>
parents:
17807
diff
changeset
|
2033 | * people don't tend to have a server or other service there. |
|
9b9a78bf9a03
Implemented logging in/out of gateways, as explained in XEP-0100.
Andreas Monitzer <am@adiumx.com>
parents:
17807
diff
changeset
|
2034 | */ |
|
9b9a78bf9a03
Implemented logging in/out of gateways, as explained in XEP-0100.
Andreas Monitzer <am@adiumx.com>
parents:
17807
diff
changeset
|
2035 | if (g_utf8_strchr(buddy->name, -1, '@') == NULL) { |
|
9b9a78bf9a03
Implemented logging in/out of gateways, as explained in XEP-0100.
Andreas Monitzer <am@adiumx.com>
parents:
17807
diff
changeset
|
2036 | act = purple_menu_action_new(_("Log In"), |
|
9b9a78bf9a03
Implemented logging in/out of gateways, as explained in XEP-0100.
Andreas Monitzer <am@adiumx.com>
parents:
17807
diff
changeset
|
2037 | PURPLE_CALLBACK(jabber_buddy_login), |
|
9b9a78bf9a03
Implemented logging in/out of gateways, as explained in XEP-0100.
Andreas Monitzer <am@adiumx.com>
parents:
17807
diff
changeset
|
2038 | NULL, NULL); |
|
9b9a78bf9a03
Implemented logging in/out of gateways, as explained in XEP-0100.
Andreas Monitzer <am@adiumx.com>
parents:
17807
diff
changeset
|
2039 | m = g_list_append(m, act); |
|
9b9a78bf9a03
Implemented logging in/out of gateways, as explained in XEP-0100.
Andreas Monitzer <am@adiumx.com>
parents:
17807
diff
changeset
|
2040 | act = purple_menu_action_new(_("Log Out"), |
|
9b9a78bf9a03
Implemented logging in/out of gateways, as explained in XEP-0100.
Andreas Monitzer <am@adiumx.com>
parents:
17807
diff
changeset
|
2041 | PURPLE_CALLBACK(jabber_buddy_logout), |
|
9b9a78bf9a03
Implemented logging in/out of gateways, as explained in XEP-0100.
Andreas Monitzer <am@adiumx.com>
parents:
17807
diff
changeset
|
2042 | NULL, NULL); |
|
9b9a78bf9a03
Implemented logging in/out of gateways, as explained in XEP-0100.
Andreas Monitzer <am@adiumx.com>
parents:
17807
diff
changeset
|
2043 | m = g_list_append(m, act); |
|
9b9a78bf9a03
Implemented logging in/out of gateways, as explained in XEP-0100.
Andreas Monitzer <am@adiumx.com>
parents:
17807
diff
changeset
|
2044 | } |
|
17816
1b7362b4a7a2
Implemented ad-hoc commands for the buddy action menu (untested), implemented the receiving end of XEP-0115: Entity Capabilities. Note that this seems not to be reliable right now, since some clients seem to have a very broken [read: completely non-functional] implementation (most notably Gajim and the py-transports).
Andreas Monitzer <am@adiumx.com>
parents:
17808
diff
changeset
|
2045 | |
|
1b7362b4a7a2
Implemented ad-hoc commands for the buddy action menu (untested), implemented the receiving end of XEP-0115: Entity Capabilities. Note that this seems not to be reliable right now, since some clients seem to have a very broken [read: completely non-functional] implementation (most notably Gajim and the py-transports).
Andreas Monitzer <am@adiumx.com>
parents:
17808
diff
changeset
|
2046 | /* add all ad hoc commands to the action menu */ |
|
1b7362b4a7a2
Implemented ad-hoc commands for the buddy action menu (untested), implemented the receiving end of XEP-0115: Entity Capabilities. Note that this seems not to be reliable right now, since some clients seem to have a very broken [read: completely non-functional] implementation (most notably Gajim and the py-transports).
Andreas Monitzer <am@adiumx.com>
parents:
17808
diff
changeset
|
2047 | for(jbrs = jb->resources; jbrs; jbrs = g_list_next(jbrs)) { |
|
1b7362b4a7a2
Implemented ad-hoc commands for the buddy action menu (untested), implemented the receiving end of XEP-0115: Entity Capabilities. Note that this seems not to be reliable right now, since some clients seem to have a very broken [read: completely non-functional] implementation (most notably Gajim and the py-transports).
Andreas Monitzer <am@adiumx.com>
parents:
17808
diff
changeset
|
2048 | JabberBuddyResource *jbr = jbrs->data; |
|
1b7362b4a7a2
Implemented ad-hoc commands for the buddy action menu (untested), implemented the receiving end of XEP-0115: Entity Capabilities. Note that this seems not to be reliable right now, since some clients seem to have a very broken [read: completely non-functional] implementation (most notably Gajim and the py-transports).
Andreas Monitzer <am@adiumx.com>
parents:
17808
diff
changeset
|
2049 | GList *commands; |
|
1b7362b4a7a2
Implemented ad-hoc commands for the buddy action menu (untested), implemented the receiving end of XEP-0115: Entity Capabilities. Note that this seems not to be reliable right now, since some clients seem to have a very broken [read: completely non-functional] implementation (most notably Gajim and the py-transports).
Andreas Monitzer <am@adiumx.com>
parents:
17808
diff
changeset
|
2050 | if (!jbr->commands) |
|
1b7362b4a7a2
Implemented ad-hoc commands for the buddy action menu (untested), implemented the receiving end of XEP-0115: Entity Capabilities. Note that this seems not to be reliable right now, since some clients seem to have a very broken [read: completely non-functional] implementation (most notably Gajim and the py-transports).
Andreas Monitzer <am@adiumx.com>
parents:
17808
diff
changeset
|
2051 | continue; |
|
1b7362b4a7a2
Implemented ad-hoc commands for the buddy action menu (untested), implemented the receiving end of XEP-0115: Entity Capabilities. Note that this seems not to be reliable right now, since some clients seem to have a very broken [read: completely non-functional] implementation (most notably Gajim and the py-transports).
Andreas Monitzer <am@adiumx.com>
parents:
17808
diff
changeset
|
2052 | for(commands = jbr->commands; commands; commands = g_list_next(commands)) { |
|
1b7362b4a7a2
Implemented ad-hoc commands for the buddy action menu (untested), implemented the receiving end of XEP-0115: Entity Capabilities. Note that this seems not to be reliable right now, since some clients seem to have a very broken [read: completely non-functional] implementation (most notably Gajim and the py-transports).
Andreas Monitzer <am@adiumx.com>
parents:
17808
diff
changeset
|
2053 | JabberAdHocCommands *cmd = commands->data; |
|
17818
ebd51078c0e6
Now all ad-hoc commands have to be sent through jabber_adhoc_execute to be properly executed (including the form steps). This cleans up the code a bit, and avoids DOS attacks by flooding the client with malicious ad-hoc command forms that were not requested.
Andreas Monitzer <am@adiumx.com>
parents:
17816
diff
changeset
|
2054 | act = purple_menu_action_new(cmd->name, PURPLE_CALLBACK(jabber_adhoc_execute_action), cmd, NULL); |
|
17816
1b7362b4a7a2
Implemented ad-hoc commands for the buddy action menu (untested), implemented the receiving end of XEP-0115: Entity Capabilities. Note that this seems not to be reliable right now, since some clients seem to have a very broken [read: completely non-functional] implementation (most notably Gajim and the py-transports).
Andreas Monitzer <am@adiumx.com>
parents:
17808
diff
changeset
|
2055 | m = g_list_append(m, act); |
|
1b7362b4a7a2
Implemented ad-hoc commands for the buddy action menu (untested), implemented the receiving end of XEP-0115: Entity Capabilities. Note that this seems not to be reliable right now, since some clients seem to have a very broken [read: completely non-functional] implementation (most notably Gajim and the py-transports).
Andreas Monitzer <am@adiumx.com>
parents:
17808
diff
changeset
|
2056 | } |
|
1b7362b4a7a2
Implemented ad-hoc commands for the buddy action menu (untested), implemented the receiving end of XEP-0115: Entity Capabilities. Note that this seems not to be reliable right now, since some clients seem to have a very broken [read: completely non-functional] implementation (most notably Gajim and the py-transports).
Andreas Monitzer <am@adiumx.com>
parents:
17808
diff
changeset
|
2057 | } |
| 7014 | 2058 | |
| 2059 | return m; | |
| 2060 | } | |
|
9030
7b574a641391
[gaim-migrate @ 9806]
Mark Doliner <markdoliner@pidgin.im>
parents:
9015
diff
changeset
|
2061 | |
|
7b574a641391
[gaim-migrate @ 9806]
Mark Doliner <markdoliner@pidgin.im>
parents:
9015
diff
changeset
|
2062 | GList * |
| 15884 | 2063 | jabber_blist_node_menu(PurpleBlistNode *node) |
|
9030
7b574a641391
[gaim-migrate @ 9806]
Mark Doliner <markdoliner@pidgin.im>
parents:
9015
diff
changeset
|
2064 | { |
| 15884 | 2065 | if(PURPLE_BLIST_NODE_IS_BUDDY(node)) { |
| 2066 | return jabber_buddy_menu((PurpleBuddy *) node); | |
|
9030
7b574a641391
[gaim-migrate @ 9806]
Mark Doliner <markdoliner@pidgin.im>
parents:
9015
diff
changeset
|
2067 | } else { |
|
7b574a641391
[gaim-migrate @ 9806]
Mark Doliner <markdoliner@pidgin.im>
parents:
9015
diff
changeset
|
2068 | return NULL; |
|
7b574a641391
[gaim-migrate @ 9806]
Mark Doliner <markdoliner@pidgin.im>
parents:
9015
diff
changeset
|
2069 | } |
|
7b574a641391
[gaim-migrate @ 9806]
Mark Doliner <markdoliner@pidgin.im>
parents:
9015
diff
changeset
|
2070 | } |
|
7b574a641391
[gaim-migrate @ 9806]
Mark Doliner <markdoliner@pidgin.im>
parents:
9015
diff
changeset
|
2071 | |
|
7b574a641391
[gaim-migrate @ 9806]
Mark Doliner <markdoliner@pidgin.im>
parents:
9015
diff
changeset
|
2072 | |
| 9954 | 2073 | const char * |
| 2074 | jabber_buddy_state_get_name(JabberBuddyState state) | |
| 2075 | { | |
| 2076 | switch(state) { | |
| 2077 | case JABBER_BUDDY_STATE_UNKNOWN: | |
| 2078 | return _("Unknown"); | |
| 2079 | case JABBER_BUDDY_STATE_ERROR: | |
| 2080 | return _("Error"); | |
| 2081 | case JABBER_BUDDY_STATE_UNAVAILABLE: | |
| 2082 | return _("Offline"); | |
| 2083 | case JABBER_BUDDY_STATE_ONLINE: | |
|
12467
94948d1eb8cf
[gaim-migrate @ 14777]
Richard Laager <rlaager@pidgin.im>
parents:
12323
diff
changeset
|
2084 | return _("Available"); |
| 9954 | 2085 | case JABBER_BUDDY_STATE_CHAT: |
| 2086 | return _("Chatty"); | |
| 2087 | case JABBER_BUDDY_STATE_AWAY: | |
| 2088 | return _("Away"); | |
| 2089 | case JABBER_BUDDY_STATE_XA: | |
| 2090 | return _("Extended Away"); | |
| 2091 | case JABBER_BUDDY_STATE_DND: | |
| 2092 | return _("Do Not Disturb"); | |
| 2093 | } | |
| 2094 | ||
| 2095 | return _("Unknown"); | |
| 2096 | } | |
| 2097 | ||
| 2098 | JabberBuddyState jabber_buddy_status_id_get_state(const char *id) { | |
| 2099 | if(!id) | |
| 2100 | return JABBER_BUDDY_STATE_UNKNOWN; | |
|
11540
ad0321374664
[gaim-migrate @ 13795]
Mark Doliner <markdoliner@pidgin.im>
parents:
11533
diff
changeset
|
2101 | if(!strcmp(id, "available")) |
| 9954 | 2102 | return JABBER_BUDDY_STATE_ONLINE; |
| 12683 | 2103 | if(!strcmp(id, "freeforchat")) |
| 2104 | return JABBER_BUDDY_STATE_CHAT; | |
| 2105 | if(!strcmp(id, "away")) | |
| 2106 | return JABBER_BUDDY_STATE_AWAY; | |
| 2107 | if(!strcmp(id, "extended_away")) | |
| 2108 | return JABBER_BUDDY_STATE_XA; | |
| 2109 | if(!strcmp(id, "dnd")) | |
| 2110 | return JABBER_BUDDY_STATE_DND; | |
| 2111 | if(!strcmp(id, "offline")) | |
| 2112 | return JABBER_BUDDY_STATE_UNAVAILABLE; | |
| 2113 | if(!strcmp(id, "error")) | |
| 2114 | return JABBER_BUDDY_STATE_ERROR; | |
| 2115 | ||
| 2116 | return JABBER_BUDDY_STATE_UNKNOWN; | |
| 2117 | } | |
| 2118 | ||
| 2119 | JabberBuddyState jabber_buddy_show_get_state(const char *id) { | |
| 2120 | if(!id) | |
| 2121 | return JABBER_BUDDY_STATE_UNKNOWN; | |
| 2122 | if(!strcmp(id, "available")) | |
| 2123 | return JABBER_BUDDY_STATE_ONLINE; | |
| 9954 | 2124 | if(!strcmp(id, "chat")) |
| 2125 | return JABBER_BUDDY_STATE_CHAT; | |
| 2126 | if(!strcmp(id, "away")) | |
| 2127 | return JABBER_BUDDY_STATE_AWAY; | |
| 2128 | if(!strcmp(id, "xa")) | |
| 2129 | return JABBER_BUDDY_STATE_XA; | |
| 2130 | if(!strcmp(id, "dnd")) | |
| 2131 | return JABBER_BUDDY_STATE_DND; | |
| 2132 | if(!strcmp(id, "offline")) | |
| 2133 | return JABBER_BUDDY_STATE_UNAVAILABLE; | |
| 2134 | if(!strcmp(id, "error")) | |
| 2135 | return JABBER_BUDDY_STATE_ERROR; | |
| 2136 | ||
| 2137 | return JABBER_BUDDY_STATE_UNKNOWN; | |
| 2138 | } | |
| 2139 | ||
| 12683 | 2140 | const char *jabber_buddy_state_get_show(JabberBuddyState state) { |
| 9954 | 2141 | switch(state) { |
| 2142 | case JABBER_BUDDY_STATE_CHAT: | |
| 2143 | return "chat"; | |
| 2144 | case JABBER_BUDDY_STATE_AWAY: | |
| 2145 | return "away"; | |
| 2146 | case JABBER_BUDDY_STATE_XA: | |
| 2147 | return "xa"; | |
| 2148 | case JABBER_BUDDY_STATE_DND: | |
| 2149 | return "dnd"; | |
| 2150 | case JABBER_BUDDY_STATE_ONLINE: | |
|
11540
ad0321374664
[gaim-migrate @ 13795]
Mark Doliner <markdoliner@pidgin.im>
parents:
11533
diff
changeset
|
2151 | return "available"; |
| 9954 | 2152 | case JABBER_BUDDY_STATE_UNKNOWN: |
| 2153 | case JABBER_BUDDY_STATE_ERROR: | |
| 2154 | return NULL; | |
| 2155 | case JABBER_BUDDY_STATE_UNAVAILABLE: | |
| 2156 | return "offline"; | |
| 2157 | } | |
| 2158 | return NULL; | |
| 2159 | } | |
| 11675 | 2160 | |
| 12683 | 2161 | const char *jabber_buddy_state_get_status_id(JabberBuddyState state) { |
| 2162 | switch(state) { | |
| 2163 | case JABBER_BUDDY_STATE_CHAT: | |
| 2164 | return "freeforchat"; | |
| 2165 | case JABBER_BUDDY_STATE_AWAY: | |
| 2166 | return "away"; | |
| 2167 | case JABBER_BUDDY_STATE_XA: | |
| 2168 | return "extended_away"; | |
| 2169 | case JABBER_BUDDY_STATE_DND: | |
| 2170 | return "dnd"; | |
| 2171 | case JABBER_BUDDY_STATE_ONLINE: | |
| 2172 | return "available"; | |
| 2173 | case JABBER_BUDDY_STATE_UNKNOWN: | |
| 13758 | 2174 | return "available"; |
| 12683 | 2175 | case JABBER_BUDDY_STATE_ERROR: |
| 13758 | 2176 | return "error"; |
| 12683 | 2177 | case JABBER_BUDDY_STATE_UNAVAILABLE: |
| 2178 | return "offline"; | |
| 2179 | } | |
| 2180 | return NULL; | |
| 2181 | } | |
| 2182 | ||
| 15884 | 2183 | static void user_search_result_add_buddy_cb(PurpleConnection *gc, GList *row, void *user_data) |
| 11675 | 2184 | { |
| 2185 | /* XXX find out the jid */ | |
| 15884 | 2186 | purple_blist_request_add_buddy(purple_connection_get_account(gc), |
| 11675 | 2187 | g_list_nth_data(row, 0), NULL, NULL); |
| 2188 | } | |
| 2189 | ||
| 2190 | static void user_search_result_cb(JabberStream *js, xmlnode *packet, gpointer data) | |
| 2191 | { | |
| 15884 | 2192 | PurpleNotifySearchResults *results; |
| 2193 | PurpleNotifySearchColumn *column; | |
| 11675 | 2194 | xmlnode *x, *query, *item, *field; |
| 2195 | ||
| 2196 | /* XXX error checking? */ | |
| 2197 | if(!(query = xmlnode_get_child(packet, "query"))) | |
| 2198 | return; | |
| 2199 | ||
| 15884 | 2200 | results = purple_notify_searchresults_new(); |
| 11675 | 2201 | if((x = xmlnode_get_child_with_namespace(query, "x", "jabber:x:data"))) { |
| 2202 | xmlnode *reported; | |
|
19963
46f23859d166
Fix the bug reported to the devel mailing list by Georgi Kirilov.
Mark Doliner <markdoliner@pidgin.im>
parents:
19931
diff
changeset
|
2203 | GSList *column_vars = NULL; |
|
46f23859d166
Fix the bug reported to the devel mailing list by Georgi Kirilov.
Mark Doliner <markdoliner@pidgin.im>
parents:
19931
diff
changeset
|
2204 | |
| 15884 | 2205 | purple_debug_info("jabber", "new-skool\n"); |
|
19963
46f23859d166
Fix the bug reported to the devel mailing list by Georgi Kirilov.
Mark Doliner <markdoliner@pidgin.im>
parents:
19931
diff
changeset
|
2206 | |
| 11675 | 2207 | if((reported = xmlnode_get_child(x, "reported"))) { |
| 2208 | xmlnode *field = xmlnode_get_child(reported, "field"); | |
| 2209 | while(field) { | |
| 2210 | const char *var = xmlnode_get_attrib(field, "var"); | |
| 2211 | const char *label = xmlnode_get_attrib(field, "label"); | |
| 2212 | if(var) { | |
| 15884 | 2213 | column = purple_notify_searchresults_column_new(label ? label : var); |
| 2214 | purple_notify_searchresults_column_add(results, column); | |
|
19963
46f23859d166
Fix the bug reported to the devel mailing list by Georgi Kirilov.
Mark Doliner <markdoliner@pidgin.im>
parents:
19931
diff
changeset
|
2215 | column_vars = g_slist_append(column_vars, (char *)var); |
| 11675 | 2216 | } |
| 2217 | field = xmlnode_get_next_twin(field); | |
| 2218 | } | |
| 2219 | } | |
|
19963
46f23859d166
Fix the bug reported to the devel mailing list by Georgi Kirilov.
Mark Doliner <markdoliner@pidgin.im>
parents:
19931
diff
changeset
|
2220 | |
| 11675 | 2221 | item = xmlnode_get_child(x, "item"); |
| 2222 | while(item) { | |
| 2223 | GList *row = NULL; | |
|
19963
46f23859d166
Fix the bug reported to the devel mailing list by Georgi Kirilov.
Mark Doliner <markdoliner@pidgin.im>
parents:
19931
diff
changeset
|
2224 | GSList *l; |
|
46f23859d166
Fix the bug reported to the devel mailing list by Georgi Kirilov.
Mark Doliner <markdoliner@pidgin.im>
parents:
19931
diff
changeset
|
2225 | xmlnode *valuenode; |
|
46f23859d166
Fix the bug reported to the devel mailing list by Georgi Kirilov.
Mark Doliner <markdoliner@pidgin.im>
parents:
19931
diff
changeset
|
2226 | const char *var; |
|
46f23859d166
Fix the bug reported to the devel mailing list by Georgi Kirilov.
Mark Doliner <markdoliner@pidgin.im>
parents:
19931
diff
changeset
|
2227 | |
|
46f23859d166
Fix the bug reported to the devel mailing list by Georgi Kirilov.
Mark Doliner <markdoliner@pidgin.im>
parents:
19931
diff
changeset
|
2228 | for (l = column_vars; l != NULL; l = l->next) { |
|
46f23859d166
Fix the bug reported to the devel mailing list by Georgi Kirilov.
Mark Doliner <markdoliner@pidgin.im>
parents:
19931
diff
changeset
|
2229 | /* |
|
46f23859d166
Fix the bug reported to the devel mailing list by Georgi Kirilov.
Mark Doliner <markdoliner@pidgin.im>
parents:
19931
diff
changeset
|
2230 | * Build a row containing the strings that correspond |
|
46f23859d166
Fix the bug reported to the devel mailing list by Georgi Kirilov.
Mark Doliner <markdoliner@pidgin.im>
parents:
19931
diff
changeset
|
2231 | * to each column of the search results. |
|
46f23859d166
Fix the bug reported to the devel mailing list by Georgi Kirilov.
Mark Doliner <markdoliner@pidgin.im>
parents:
19931
diff
changeset
|
2232 | */ |
|
46f23859d166
Fix the bug reported to the devel mailing list by Georgi Kirilov.
Mark Doliner <markdoliner@pidgin.im>
parents:
19931
diff
changeset
|
2233 | for (field = xmlnode_get_child(item, "field"); |
|
46f23859d166
Fix the bug reported to the devel mailing list by Georgi Kirilov.
Mark Doliner <markdoliner@pidgin.im>
parents:
19931
diff
changeset
|
2234 | field != NULL; |
|
46f23859d166
Fix the bug reported to the devel mailing list by Georgi Kirilov.
Mark Doliner <markdoliner@pidgin.im>
parents:
19931
diff
changeset
|
2235 | field = xmlnode_get_next_twin(field)) |
|
46f23859d166
Fix the bug reported to the devel mailing list by Georgi Kirilov.
Mark Doliner <markdoliner@pidgin.im>
parents:
19931
diff
changeset
|
2236 | { |
|
46f23859d166
Fix the bug reported to the devel mailing list by Georgi Kirilov.
Mark Doliner <markdoliner@pidgin.im>
parents:
19931
diff
changeset
|
2237 | if ((var = xmlnode_get_attrib(field, "var")) && |
|
46f23859d166
Fix the bug reported to the devel mailing list by Georgi Kirilov.
Mark Doliner <markdoliner@pidgin.im>
parents:
19931
diff
changeset
|
2238 | !strcmp(var, l->data) && |
|
46f23859d166
Fix the bug reported to the devel mailing list by Georgi Kirilov.
Mark Doliner <markdoliner@pidgin.im>
parents:
19931
diff
changeset
|
2239 | (valuenode = xmlnode_get_child(field, "value"))) |
|
46f23859d166
Fix the bug reported to the devel mailing list by Georgi Kirilov.
Mark Doliner <markdoliner@pidgin.im>
parents:
19931
diff
changeset
|
2240 | { |
|
46f23859d166
Fix the bug reported to the devel mailing list by Georgi Kirilov.
Mark Doliner <markdoliner@pidgin.im>
parents:
19931
diff
changeset
|
2241 | char *value = xmlnode_get_data(valuenode); |
|
46f23859d166
Fix the bug reported to the devel mailing list by Georgi Kirilov.
Mark Doliner <markdoliner@pidgin.im>
parents:
19931
diff
changeset
|
2242 | row = g_list_append(row, value); |
|
46f23859d166
Fix the bug reported to the devel mailing list by Georgi Kirilov.
Mark Doliner <markdoliner@pidgin.im>
parents:
19931
diff
changeset
|
2243 | break; |
|
46f23859d166
Fix the bug reported to the devel mailing list by Georgi Kirilov.
Mark Doliner <markdoliner@pidgin.im>
parents:
19931
diff
changeset
|
2244 | } |
| 11675 | 2245 | } |
|
19963
46f23859d166
Fix the bug reported to the devel mailing list by Georgi Kirilov.
Mark Doliner <markdoliner@pidgin.im>
parents:
19931
diff
changeset
|
2246 | if (field == NULL) |
|
46f23859d166
Fix the bug reported to the devel mailing list by Georgi Kirilov.
Mark Doliner <markdoliner@pidgin.im>
parents:
19931
diff
changeset
|
2247 | /* No data for this column */ |
|
46f23859d166
Fix the bug reported to the devel mailing list by Georgi Kirilov.
Mark Doliner <markdoliner@pidgin.im>
parents:
19931
diff
changeset
|
2248 | row = g_list_append(row, NULL); |
| 11675 | 2249 | } |
| 15884 | 2250 | purple_notify_searchresults_row_add(results, row); |
| 11675 | 2251 | item = xmlnode_get_next_twin(item); |
| 2252 | } | |
|
19963
46f23859d166
Fix the bug reported to the devel mailing list by Georgi Kirilov.
Mark Doliner <markdoliner@pidgin.im>
parents:
19931
diff
changeset
|
2253 | |
|
46f23859d166
Fix the bug reported to the devel mailing list by Georgi Kirilov.
Mark Doliner <markdoliner@pidgin.im>
parents:
19931
diff
changeset
|
2254 | g_slist_free(column_vars); |
| 11675 | 2255 | } else { |
| 2256 | /* old skool */ | |
| 15884 | 2257 | purple_debug_info("jabber", "old-skool\n"); |
| 11675 | 2258 | |
| 15884 | 2259 | column = purple_notify_searchresults_column_new(_("JID")); |
| 2260 | purple_notify_searchresults_column_add(results, column); | |
| 2261 | column = purple_notify_searchresults_column_new(_("First Name")); | |
| 2262 | purple_notify_searchresults_column_add(results, column); | |
| 2263 | column = purple_notify_searchresults_column_new(_("Last Name")); | |
| 2264 | purple_notify_searchresults_column_add(results, column); | |
| 2265 | column = purple_notify_searchresults_column_new(_("Nickname")); | |
| 2266 | purple_notify_searchresults_column_add(results, column); | |
| 2267 | column = purple_notify_searchresults_column_new(_("E-Mail")); | |
| 2268 | purple_notify_searchresults_column_add(results, column); | |
| 11675 | 2269 | |
| 2270 | for(item = xmlnode_get_child(query, "item"); item; item = xmlnode_get_next_twin(item)) { | |
| 2271 | const char *jid; | |
| 2272 | xmlnode *node; | |
| 2273 | GList *row = NULL; | |
| 2274 | ||
| 2275 | if(!(jid = xmlnode_get_attrib(item, "jid"))) | |
| 2276 | continue; | |
| 2277 | ||
| 2278 | row = g_list_append(row, g_strdup(jid)); | |
| 2279 | node = xmlnode_get_child(item, "first"); | |
| 2280 | row = g_list_append(row, node ? xmlnode_get_data(node) : NULL); | |
| 2281 | node = xmlnode_get_child(item, "last"); | |
| 2282 | row = g_list_append(row, node ? xmlnode_get_data(node) : NULL); | |
| 2283 | node = xmlnode_get_child(item, "nick"); | |
| 2284 | row = g_list_append(row, node ? xmlnode_get_data(node) : NULL); | |
| 2285 | node = xmlnode_get_child(item, "email"); | |
| 2286 | row = g_list_append(row, node ? xmlnode_get_data(node) : NULL); | |
|
22622
1ecb840b5101
Fix a bunch of compiler warnings caused by my addition of G_GNUC_PRINTF()
Mark Doliner <markdoliner@pidgin.im>
parents:
22586
diff
changeset
|
2287 | purple_debug_info("jabber", "row=%p\n", row); |
| 15884 | 2288 | purple_notify_searchresults_row_add(results, row); |
| 11675 | 2289 | } |
| 2290 | } | |
| 2291 | ||
| 15884 | 2292 | purple_notify_searchresults_button_add(results, PURPLE_NOTIFY_BUTTON_ADD, |
| 11675 | 2293 | user_search_result_add_buddy_cb); |
| 2294 | ||
| 15884 | 2295 | purple_notify_searchresults(js->gc, NULL, NULL, _("The following are the results of your search"), results, NULL, NULL); |
| 11675 | 2296 | } |
| 2297 | ||
| 2298 | static void user_search_x_data_cb(JabberStream *js, xmlnode *result, gpointer data) | |
| 2299 | { | |
| 2300 | xmlnode *query; | |
| 2301 | JabberIq *iq; | |
| 13345 | 2302 | char *dir_server = data; |
|
21388
108195e86aa3
don't send a canceled user query
Nathan Walp <nwalp@pidgin.im>
parents:
21381
diff
changeset
|
2303 | const char *type; |
|
108195e86aa3
don't send a canceled user query
Nathan Walp <nwalp@pidgin.im>
parents:
21381
diff
changeset
|
2304 | |
|
108195e86aa3
don't send a canceled user query
Nathan Walp <nwalp@pidgin.im>
parents:
21381
diff
changeset
|
2305 | /* if they've cancelled the search, we're |
|
108195e86aa3
don't send a canceled user query
Nathan Walp <nwalp@pidgin.im>
parents:
21381
diff
changeset
|
2306 | * just going to get an error if we send |
|
108195e86aa3
don't send a canceled user query
Nathan Walp <nwalp@pidgin.im>
parents:
21381
diff
changeset
|
2307 | * a cancel, so skip it */ |
|
108195e86aa3
don't send a canceled user query
Nathan Walp <nwalp@pidgin.im>
parents:
21381
diff
changeset
|
2308 | type = xmlnode_get_attrib(result, "type"); |
|
108195e86aa3
don't send a canceled user query
Nathan Walp <nwalp@pidgin.im>
parents:
21381
diff
changeset
|
2309 | if(type && !strcmp(type, "cancel")) { |
|
108195e86aa3
don't send a canceled user query
Nathan Walp <nwalp@pidgin.im>
parents:
21381
diff
changeset
|
2310 | g_free(dir_server); |
|
108195e86aa3
don't send a canceled user query
Nathan Walp <nwalp@pidgin.im>
parents:
21381
diff
changeset
|
2311 | return; |
|
108195e86aa3
don't send a canceled user query
Nathan Walp <nwalp@pidgin.im>
parents:
21381
diff
changeset
|
2312 | } |
| 11675 | 2313 | |
| 2314 | iq = jabber_iq_new_query(js, JABBER_IQ_SET, "jabber:iq:search"); | |
| 2315 | query = xmlnode_get_child(iq->node, "query"); | |
| 2316 | ||
| 2317 | xmlnode_insert_child(query, result); | |
| 2318 | ||
| 2319 | jabber_iq_set_callback(iq, user_search_result_cb, NULL); | |
| 13345 | 2320 | xmlnode_set_attrib(iq->node, "to", dir_server); |
| 11675 | 2321 | jabber_iq_send(iq); |
| 13345 | 2322 | g_free(dir_server); |
| 11675 | 2323 | } |
| 2324 | ||
| 2325 | struct user_search_info { | |
| 2326 | JabberStream *js; | |
| 2327 | char *directory_server; | |
| 2328 | }; | |
| 2329 | ||
| 15884 | 2330 | static void user_search_cancel_cb(struct user_search_info *usi, PurpleRequestFields *fields) |
| 11675 | 2331 | { |
| 2332 | g_free(usi->directory_server); | |
| 2333 | g_free(usi); | |
| 2334 | } | |
| 2335 | ||
| 15884 | 2336 | static void user_search_cb(struct user_search_info *usi, PurpleRequestFields *fields) |
| 11675 | 2337 | { |
| 2338 | JabberStream *js = usi->js; | |
| 2339 | JabberIq *iq; | |
| 2340 | xmlnode *query; | |
| 2341 | GList *groups, *flds; | |
| 2342 | ||
| 2343 | iq = jabber_iq_new_query(js, JABBER_IQ_SET, "jabber:iq:search"); | |
| 2344 | query = xmlnode_get_child(iq->node, "query"); | |
| 2345 | ||
| 15884 | 2346 | for(groups = purple_request_fields_get_groups(fields); groups; groups = groups->next) { |
| 2347 | for(flds = purple_request_field_group_get_fields(groups->data); | |
| 11675 | 2348 | flds; flds = flds->next) { |
| 15884 | 2349 | PurpleRequestField *field = flds->data; |
| 2350 | const char *id = purple_request_field_get_id(field); | |
| 2351 | const char *value = purple_request_field_string_get_value(field); | |
| 11675 | 2352 | |
| 2353 | if(value && (!strcmp(id, "first") || !strcmp(id, "last") || !strcmp(id, "nick") || !strcmp(id, "email"))) { | |
| 2354 | xmlnode *y = xmlnode_new_child(query, id); | |
| 2355 | xmlnode_insert_data(y, value, -1); | |
| 2356 | } | |
| 2357 | } | |
| 2358 | } | |
| 2359 | ||
| 2360 | jabber_iq_set_callback(iq, user_search_result_cb, NULL); | |
| 2361 | xmlnode_set_attrib(iq->node, "to", usi->directory_server); | |
| 2362 | jabber_iq_send(iq); | |
| 2363 | ||
| 2364 | g_free(usi->directory_server); | |
| 2365 | g_free(usi); | |
| 2366 | } | |
| 2367 | ||
|
13617
983b0c58fcae
[gaim-migrate @ 16002]
Björn Voigt <bjoern@cs.tu-berlin.de>
parents:
13574
diff
changeset
|
2368 | #if 0 |
|
983b0c58fcae
[gaim-migrate @ 16002]
Björn Voigt <bjoern@cs.tu-berlin.de>
parents:
13574
diff
changeset
|
2369 | /* This is for gettext only -- it will see this even though there's an #if 0. */ |
|
983b0c58fcae
[gaim-migrate @ 16002]
Björn Voigt <bjoern@cs.tu-berlin.de>
parents:
13574
diff
changeset
|
2370 | |
|
983b0c58fcae
[gaim-migrate @ 16002]
Björn Voigt <bjoern@cs.tu-berlin.de>
parents:
13574
diff
changeset
|
2371 | /* |
|
983b0c58fcae
[gaim-migrate @ 16002]
Björn Voigt <bjoern@cs.tu-berlin.de>
parents:
13574
diff
changeset
|
2372 | * An incomplete list of server generated original language search |
|
983b0c58fcae
[gaim-migrate @ 16002]
Björn Voigt <bjoern@cs.tu-berlin.de>
parents:
13574
diff
changeset
|
2373 | * comments for Jabber User Directories |
|
983b0c58fcae
[gaim-migrate @ 16002]
Björn Voigt <bjoern@cs.tu-berlin.de>
parents:
13574
diff
changeset
|
2374 | * |
|
983b0c58fcae
[gaim-migrate @ 16002]
Björn Voigt <bjoern@cs.tu-berlin.de>
parents:
13574
diff
changeset
|
2375 | * See discussion thread "Search comment for Jabber is not translatable" |
| 15884 | 2376 | * in purple-i18n@lists.sourceforge.net (March 2006) |
|
13617
983b0c58fcae
[gaim-migrate @ 16002]
Björn Voigt <bjoern@cs.tu-berlin.de>
parents:
13574
diff
changeset
|
2377 | */ |
|
983b0c58fcae
[gaim-migrate @ 16002]
Björn Voigt <bjoern@cs.tu-berlin.de>
parents:
13574
diff
changeset
|
2378 | static const char * jabber_user_dir_comments [] = { |
|
19894
b273d0db2bdd
Fixed code indenting, some spaces were still left and now replaced by tabs.
Andreas Monitzer <am@adiumx.com>
parents:
18798
diff
changeset
|
2379 | /* current comment from Jabber User Directory users.jabber.org */ |
|
b273d0db2bdd
Fixed code indenting, some spaces were still left and now replaced by tabs.
Andreas Monitzer <am@adiumx.com>
parents:
18798
diff
changeset
|
2380 | N_("Find a contact by entering the search criteria in the given fields. " |
|
b273d0db2bdd
Fixed code indenting, some spaces were still left and now replaced by tabs.
Andreas Monitzer <am@adiumx.com>
parents:
18798
diff
changeset
|
2381 | "Note: Each field supports wild card searches (%)"), |
|
b273d0db2bdd
Fixed code indenting, some spaces were still left and now replaced by tabs.
Andreas Monitzer <am@adiumx.com>
parents:
18798
diff
changeset
|
2382 | NULL |
|
13617
983b0c58fcae
[gaim-migrate @ 16002]
Björn Voigt <bjoern@cs.tu-berlin.de>
parents:
13574
diff
changeset
|
2383 | }; |
|
983b0c58fcae
[gaim-migrate @ 16002]
Björn Voigt <bjoern@cs.tu-berlin.de>
parents:
13574
diff
changeset
|
2384 | #endif |
|
983b0c58fcae
[gaim-migrate @ 16002]
Björn Voigt <bjoern@cs.tu-berlin.de>
parents:
13574
diff
changeset
|
2385 | |
| 11675 | 2386 | static void user_search_fields_result_cb(JabberStream *js, xmlnode *packet, gpointer data) |
| 2387 | { | |
| 2388 | xmlnode *query, *x; | |
| 13345 | 2389 | const char *from, *type; |
| 11675 | 2390 | |
| 12284 | 2391 | if(!(from = xmlnode_get_attrib(packet, "from"))) |
| 11675 | 2392 | return; |
| 2393 | ||
| 13345 | 2394 | if(!(type = xmlnode_get_attrib(packet, "type")) || !strcmp(type, "error")) { |
|
21150
bedd1215fb5e
Stop jabber setting wants_to_die itself. This involved plumbing disconnection
Will Thompson <resiak@pidgin.im>
parents:
20350
diff
changeset
|
2395 | char *msg = jabber_parse_error(js, packet, NULL); |
| 13794 | 2396 | |
|
13634
e9f9cef982d7
[gaim-migrate @ 16031]
Björn Voigt <bjoern@cs.tu-berlin.de>
parents:
13619
diff
changeset
|
2397 | if(!msg) |
|
e9f9cef982d7
[gaim-migrate @ 16031]
Björn Voigt <bjoern@cs.tu-berlin.de>
parents:
13619
diff
changeset
|
2398 | msg = g_strdup(_("Unknown error")); |
|
e9f9cef982d7
[gaim-migrate @ 16031]
Björn Voigt <bjoern@cs.tu-berlin.de>
parents:
13619
diff
changeset
|
2399 | |
| 15884 | 2400 | purple_notify_error(js->gc, _("Directory Query Failed"), |
|
13634
e9f9cef982d7
[gaim-migrate @ 16031]
Björn Voigt <bjoern@cs.tu-berlin.de>
parents:
13619
diff
changeset
|
2401 | _("Could not query the directory server."), msg); |
|
e9f9cef982d7
[gaim-migrate @ 16031]
Björn Voigt <bjoern@cs.tu-berlin.de>
parents:
13619
diff
changeset
|
2402 | g_free(msg); |
|
e9f9cef982d7
[gaim-migrate @ 16031]
Björn Voigt <bjoern@cs.tu-berlin.de>
parents:
13619
diff
changeset
|
2403 | |
| 13345 | 2404 | return; |
| 2405 | } | |
| 2406 | ||
| 11675 | 2407 | |
| 2408 | if(!(query = xmlnode_get_child(packet, "query"))) | |
| 2409 | return; | |
| 2410 | ||
| 13330 | 2411 | if((x = xmlnode_get_child_with_namespace(query, "x", "jabber:x:data"))) { |
| 13345 | 2412 | jabber_x_data_request(js, x, user_search_x_data_cb, g_strdup(from)); |
| 11675 | 2413 | return; |
| 2414 | } else { | |
| 2415 | struct user_search_info *usi; | |
| 2416 | xmlnode *instnode; | |
|
13617
983b0c58fcae
[gaim-migrate @ 16002]
Björn Voigt <bjoern@cs.tu-berlin.de>
parents:
13574
diff
changeset
|
2417 | char *instructions = NULL; |
| 15884 | 2418 | PurpleRequestFields *fields; |
| 2419 | PurpleRequestFieldGroup *group; | |
| 2420 | PurpleRequestField *field; | |
| 11675 | 2421 | |
| 2422 | /* old skool */ | |
| 15884 | 2423 | fields = purple_request_fields_new(); |
| 2424 | group = purple_request_field_group_new(NULL); | |
| 2425 | purple_request_fields_add_group(fields, group); | |
| 11675 | 2426 | |
| 2427 | if((instnode = xmlnode_get_child(query, "instructions"))) | |
|
13574
433001d94e3e
[gaim-migrate @ 15952]
Richard Laager <rlaager@pidgin.im>
parents:
13572
diff
changeset
|
2428 | { |
|
433001d94e3e
[gaim-migrate @ 15952]
Richard Laager <rlaager@pidgin.im>
parents:
13572
diff
changeset
|
2429 | char *tmp = xmlnode_get_data(instnode); |
| 13794 | 2430 | |
|
13617
983b0c58fcae
[gaim-migrate @ 16002]
Björn Voigt <bjoern@cs.tu-berlin.de>
parents:
13574
diff
changeset
|
2431 | if(tmp) |
|
983b0c58fcae
[gaim-migrate @ 16002]
Björn Voigt <bjoern@cs.tu-berlin.de>
parents:
13574
diff
changeset
|
2432 | { |
| 13794 | 2433 | /* Try to translate the message (see static message |
|
13617
983b0c58fcae
[gaim-migrate @ 16002]
Björn Voigt <bjoern@cs.tu-berlin.de>
parents:
13574
diff
changeset
|
2434 | list in jabber_user_dir_comments[]) */ |
|
983b0c58fcae
[gaim-migrate @ 16002]
Björn Voigt <bjoern@cs.tu-berlin.de>
parents:
13574
diff
changeset
|
2435 | instructions = g_strdup_printf(_("Server Instructions: %s"), _(tmp)); |
|
983b0c58fcae
[gaim-migrate @ 16002]
Björn Voigt <bjoern@cs.tu-berlin.de>
parents:
13574
diff
changeset
|
2436 | g_free(tmp); |
|
983b0c58fcae
[gaim-migrate @ 16002]
Björn Voigt <bjoern@cs.tu-berlin.de>
parents:
13574
diff
changeset
|
2437 | } |
|
13574
433001d94e3e
[gaim-migrate @ 15952]
Richard Laager <rlaager@pidgin.im>
parents:
13572
diff
changeset
|
2438 | } |
| 13794 | 2439 | |
|
13617
983b0c58fcae
[gaim-migrate @ 16002]
Björn Voigt <bjoern@cs.tu-berlin.de>
parents:
13574
diff
changeset
|
2440 | if(!instructions) |
|
983b0c58fcae
[gaim-migrate @ 16002]
Björn Voigt <bjoern@cs.tu-berlin.de>
parents:
13574
diff
changeset
|
2441 | { |
| 11675 | 2442 | instructions = g_strdup(_("Fill in one or more fields to search " |
|
16961
b6955f946f8f
s/Jabber/XMPP in user-visible places.
Richard Laager <rlaager@pidgin.im>
parents:
16799
diff
changeset
|
2443 | "for any matching XMPP users.")); |
|
13617
983b0c58fcae
[gaim-migrate @ 16002]
Björn Voigt <bjoern@cs.tu-berlin.de>
parents:
13574
diff
changeset
|
2444 | } |
| 11675 | 2445 | |
| 2446 | if(xmlnode_get_child(query, "first")) { | |
| 15884 | 2447 | field = purple_request_field_string_new("first", _("First Name"), |
| 11675 | 2448 | NULL, FALSE); |
| 15884 | 2449 | purple_request_field_group_add_field(group, field); |
| 11675 | 2450 | } |
| 2451 | if(xmlnode_get_child(query, "last")) { | |
| 15884 | 2452 | field = purple_request_field_string_new("last", _("Last Name"), |
| 11675 | 2453 | NULL, FALSE); |
| 15884 | 2454 | purple_request_field_group_add_field(group, field); |
| 11675 | 2455 | } |
| 2456 | if(xmlnode_get_child(query, "nick")) { | |
| 15884 | 2457 | field = purple_request_field_string_new("nick", _("Nickname"), |
| 11675 | 2458 | NULL, FALSE); |
| 15884 | 2459 | purple_request_field_group_add_field(group, field); |
| 11675 | 2460 | } |
| 2461 | if(xmlnode_get_child(query, "email")) { | |
| 15884 | 2462 | field = purple_request_field_string_new("email", _("E-Mail Address"), |
| 11675 | 2463 | NULL, FALSE); |
| 15884 | 2464 | purple_request_field_group_add_field(group, field); |
| 11675 | 2465 | } |
| 2466 | ||
| 2467 | usi = g_new0(struct user_search_info, 1); | |
| 2468 | usi->js = js; | |
| 2469 | usi->directory_server = g_strdup(from); | |
| 2470 | ||
|
21175
c6d76b49c206
disapproval of revision '8ba833993a115415727bb1b70362e0bd1603c169'
Richard Laager <rlaager@pidgin.im>
parents:
21174
diff
changeset
|
2471 | purple_request_fields(js->gc, _("Search for XMPP users"), |
|
16961
b6955f946f8f
s/Jabber/XMPP in user-visible places.
Richard Laager <rlaager@pidgin.im>
parents:
16799
diff
changeset
|
2472 | _("Search for XMPP users"), instructions, fields, |
| 11675 | 2473 | _("Search"), G_CALLBACK(user_search_cb), |
|
16490
68c22924d66b
Added account, who, and conversation parameters to the request API calls, and updated all code to match. I can't compile the Perl module, so I'd appreciate it if someone who knows it would verify that this doesn't break Perl.
Evan Schoenberg <evands@pidgin.im>
parents:
15884
diff
changeset
|
2474 | _("Cancel"), G_CALLBACK(user_search_cancel_cb), |
|
17798
45d377fdb3c3
Fixed weird bug that caused not supplying the account when searching for users.
Andreas Monitzer <am@adiumx.com>
parents:
17789
diff
changeset
|
2475 | purple_connection_get_account(js->gc), NULL, NULL, |
|
21175
c6d76b49c206
disapproval of revision '8ba833993a115415727bb1b70362e0bd1603c169'
Richard Laager <rlaager@pidgin.im>
parents:
21174
diff
changeset
|
2476 | usi); |
| 11675 | 2477 | |
| 2478 | g_free(instructions); | |
| 2479 | } | |
| 2480 | } | |
| 2481 | ||
|
17807
d98844d33c37
Exposed the user search function, so that directory searches can be performed directly when the jid is known.
Andreas Monitzer <am@adiumx.com>
parents:
17798
diff
changeset
|
2482 | void jabber_user_search(JabberStream *js, const char *directory) |
| 11675 | 2483 | { |
| 2484 | JabberIq *iq; | |
| 2485 | ||
| 2486 | /* XXX: should probably better validate the directory we're given */ | |
| 2487 | if(!directory || !*directory) { | |
| 15884 | 2488 | purple_notify_error(js->gc, _("Invalid Directory"), _("Invalid Directory"), NULL); |
| 11675 | 2489 | return; |
| 2490 | } | |
| 2491 | ||
| 2492 | iq = jabber_iq_new_query(js, JABBER_IQ_GET, "jabber:iq:search"); | |
| 2493 | xmlnode_set_attrib(iq->node, "to", directory); | |
| 2494 | ||
| 2495 | jabber_iq_set_callback(iq, user_search_fields_result_cb, NULL); | |
| 2496 | ||
| 2497 | jabber_iq_send(iq); | |
| 2498 | } | |
| 2499 | ||
| 15884 | 2500 | void jabber_user_search_begin(PurplePluginAction *action) |
| 11675 | 2501 | { |
| 15884 | 2502 | PurpleConnection *gc = (PurpleConnection *) action->context; |
| 11675 | 2503 | JabberStream *js = gc->proto_data; |
| 2504 | ||
|
21175
c6d76b49c206
disapproval of revision '8ba833993a115415727bb1b70362e0bd1603c169'
Richard Laager <rlaager@pidgin.im>
parents:
21174
diff
changeset
|
2505 | purple_request_input(gc, _("Enter a User Directory"), _("Enter a User Directory"), |
| 11675 | 2506 | _("Select a user directory to search"), |
|
17007
66c0fa6e5e2a
Removes 'jabber.org' defaults from XMPP. I think we had agreed this was a good idea.
Sean Egan <seanegan@pidgin.im>
parents:
16961
diff
changeset
|
2507 | js->user_directories ? js->user_directories->data : NULL, |
| 11675 | 2508 | FALSE, FALSE, NULL, |
|
17807
d98844d33c37
Exposed the user search function, so that directory searches can be performed directly when the jid is known.
Andreas Monitzer <am@adiumx.com>
parents:
17798
diff
changeset
|
2509 | _("Search Directory"), PURPLE_CALLBACK(jabber_user_search), |
|
16490
68c22924d66b
Added account, who, and conversation parameters to the request API calls, and updated all code to match. I can't compile the Perl module, so I'd appreciate it if someone who knows it would verify that this doesn't break Perl.
Evan Schoenberg <evands@pidgin.im>
parents:
15884
diff
changeset
|
2510 | _("Cancel"), NULL, |
|
68c22924d66b
Added account, who, and conversation parameters to the request API calls, and updated all code to match. I can't compile the Perl module, so I'd appreciate it if someone who knows it would verify that this doesn't break Perl.
Evan Schoenberg <evands@pidgin.im>
parents:
15884
diff
changeset
|
2511 | NULL, NULL, NULL, |
|
21175
c6d76b49c206
disapproval of revision '8ba833993a115415727bb1b70362e0bd1603c169'
Richard Laager <rlaager@pidgin.im>
parents:
21174
diff
changeset
|
2512 | js); |
| 11675 | 2513 | } |
| 13794 | 2514 | |
| 2515 | ||
| 2516 |