Wed, 06 Jun 2007 01:19:49 +0000
Added the ability to define extensions to caps
| 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 | |
| 18 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | |
| 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" |
| 7014 | 37 | |
| 13794 | 38 | typedef struct { |
| 39 | long idle_seconds; | |
| 40 | } JabberBuddyInfoResource; | |
| 41 | ||
| 42 | typedef struct { | |
| 43 | JabberStream *js; | |
| 44 | JabberBuddy *jb; | |
| 45 | char *jid; | |
| 46 | GSList *ids; | |
| 47 | GHashTable *resources; | |
| 48 | int timeout_handle; | |
| 49 | char *vcard_text; | |
| 50 | GSList *vcard_imgids; | |
| 51 | } JabberBuddyInfo; | |
| 52 | ||
| 7116 | 53 | void jabber_buddy_free(JabberBuddy *jb) |
| 54 | { | |
| 55 | g_return_if_fail(jb != NULL); | |
| 56 | ||
| 57 | if(jb->error_msg) | |
| 58 | g_free(jb->error_msg); | |
| 59 | while(jb->resources) | |
| 60 | jabber_buddy_resource_free(jb->resources->data); | |
| 61 | ||
| 62 | g_free(jb); | |
| 63 | } | |
| 64 | ||
| 7014 | 65 | JabberBuddy *jabber_buddy_find(JabberStream *js, const char *name, |
| 66 | gboolean create) | |
| 67 | { | |
| 68 | JabberBuddy *jb; | |
| 7445 | 69 | const char *realname; |
| 7014 | 70 | |
|
15143
37451143f5c4
[gaim-migrate @ 17867]
Mark Doliner <markdoliner@pidgin.im>
parents:
15092
diff
changeset
|
71 | if (js->buddies == NULL) |
|
37451143f5c4
[gaim-migrate @ 17867]
Mark Doliner <markdoliner@pidgin.im>
parents:
15092
diff
changeset
|
72 | return NULL; |
|
37451143f5c4
[gaim-migrate @ 17867]
Mark Doliner <markdoliner@pidgin.im>
parents:
15092
diff
changeset
|
73 | |
| 7445 | 74 | if(!(realname = jabber_normalize(js->gc->account, name))) |
| 7014 | 75 | return NULL; |
| 76 | ||
| 77 | jb = g_hash_table_lookup(js->buddies, realname); | |
| 78 | ||
| 79 | if(!jb && create) { | |
| 80 | jb = g_new0(JabberBuddy, 1); | |
| 81 | g_hash_table_insert(js->buddies, g_strdup(realname), jb); | |
| 82 | } | |
| 83 | ||
| 84 | return jb; | |
| 85 | } | |
| 86 | ||
| 87 | ||
| 88 | JabberBuddyResource *jabber_buddy_find_resource(JabberBuddy *jb, | |
| 89 | const char *resource) | |
| 90 | { | |
| 91 | JabberBuddyResource *jbr = NULL; | |
| 92 | GList *l; | |
| 93 | ||
| 94 | if(!jb) | |
| 95 | return NULL; | |
| 96 | ||
| 97 | for(l = jb->resources; l; l = l->next) | |
| 98 | { | |
| 99 | if(!jbr && !resource) { | |
| 100 | jbr = l->data; | |
| 101 | } else if(!resource) { | |
| 102 | if(((JabberBuddyResource *)l->data)->priority >= jbr->priority) | |
| 103 | jbr = l->data; | |
| 104 | } else if(((JabberBuddyResource *)l->data)->name) { | |
| 105 | if(!strcmp(((JabberBuddyResource *)l->data)->name, resource)) { | |
| 106 | jbr = l->data; | |
| 107 | break; | |
| 108 | } | |
| 109 | } | |
| 110 | } | |
| 111 | ||
| 112 | return jbr; | |
| 113 | } | |
| 114 | ||
| 9954 | 115 | JabberBuddyResource *jabber_buddy_track_resource(JabberBuddy *jb, const char *resource, |
| 116 | int priority, JabberBuddyState state, const char *status) | |
| 7014 | 117 | { |
| 118 | JabberBuddyResource *jbr = jabber_buddy_find_resource(jb, resource); | |
| 119 | ||
| 120 | if(!jbr) { | |
| 121 | jbr = g_new0(JabberBuddyResource, 1); | |
| 7116 | 122 | jbr->jb = jb; |
| 7014 | 123 | jbr->name = g_strdup(resource); |
| 124 | jbr->capabilities = JABBER_CAP_XHTML; | |
| 125 | jb->resources = g_list_append(jb->resources, jbr); | |
| 126 | } | |
| 127 | jbr->priority = priority; | |
| 128 | jbr->state = state; | |
| 129 | if(jbr->status) | |
| 130 | g_free(jbr->status); | |
| 13787 | 131 | if (status) |
| 132 | jbr->status = g_markup_escape_text(status, -1); | |
| 133 | else | |
| 134 | jbr->status = NULL; | |
| 9954 | 135 | |
| 136 | return jbr; | |
| 7014 | 137 | } |
| 138 | ||
| 7116 | 139 | void jabber_buddy_resource_free(JabberBuddyResource *jbr) |
| 140 | { | |
| 141 | g_return_if_fail(jbr != NULL); | |
| 142 | ||
| 143 | jbr->jb->resources = g_list_remove(jbr->jb->resources, jbr); | |
| 144 | ||
| 145 | g_free(jbr->name); | |
| 13794 | 146 | g_free(jbr->status); |
| 147 | g_free(jbr->thread_id); | |
| 148 | g_free(jbr->client.name); | |
| 149 | g_free(jbr->client.version); | |
| 150 | g_free(jbr->client.os); | |
| 7116 | 151 | g_free(jbr); |
| 152 | } | |
| 153 | ||
| 7014 | 154 | void jabber_buddy_remove_resource(JabberBuddy *jb, const char *resource) |
| 155 | { | |
| 156 | JabberBuddyResource *jbr = jabber_buddy_find_resource(jb, resource); | |
| 157 | ||
| 158 | if(!jbr) | |
| 159 | return; | |
| 160 | ||
| 7116 | 161 | jabber_buddy_resource_free(jbr); |
| 7014 | 162 | } |
| 163 | ||
| 164 | const char *jabber_buddy_get_status_msg(JabberBuddy *jb) | |
| 165 | { | |
| 166 | JabberBuddyResource *jbr; | |
| 167 | ||
| 168 | if(!jb) | |
| 169 | return NULL; | |
| 170 | ||
| 171 | jbr = jabber_buddy_find_resource(jb, NULL); | |
| 172 | ||
| 173 | if(!jbr) | |
| 174 | return NULL; | |
| 175 | ||
| 176 | return jbr->status; | |
| 177 | } | |
| 178 | ||
| 179 | /******* | |
| 180 | * This is the old vCard stuff taken from the old prpl. vCards, by definition | |
| 181 | * are a temporary thing until jabber can get its act together and come up | |
| 182 | * with a format for user information, hence the namespace of 'vcard-temp' | |
| 183 | * | |
| 184 | * Since I don't feel like putting that much work into something that's | |
| 185 | * _supposed_ to go away, i'm going to just copy the kludgy old code here, | |
| 186 | * and make it purdy when jabber comes up with a standards-track JEP to | |
| 187 | * replace vcard-temp | |
| 188 | * --Nathan | |
| 189 | *******/ | |
| 190 | ||
| 191 | /*---------------------------------------*/ | |
| 192 | /* Jabber "set info" (vCard) support */ | |
| 193 | /*---------------------------------------*/ | |
| 194 | ||
| 195 | /* | |
| 196 | * V-Card format: | |
| 197 | * | |
| 198 | * <vCard prodid='' version='' xmlns=''> | |
| 199 | * <FN></FN> | |
| 200 | * <N> | |
| 201 | * <FAMILY/> | |
| 202 | * <GIVEN/> | |
| 203 | * </N> | |
| 204 | * <NICKNAME/> | |
| 205 | * <URL/> | |
| 206 | * <ADR> | |
| 207 | * <STREET/> | |
| 208 | * <EXTADD/> | |
| 209 | * <LOCALITY/> | |
| 210 | * <REGION/> | |
| 211 | * <PCODE/> | |
| 212 | * <COUNTRY/> | |
| 213 | * </ADR> | |
| 214 | * <TEL/> | |
| 215 | * <EMAIL/> | |
| 216 | * <ORG> | |
| 217 | * <ORGNAME/> | |
| 218 | * <ORGUNIT/> | |
| 219 | * </ORG> | |
| 220 | * <TITLE/> | |
| 221 | * <ROLE/> | |
| 222 | * <DESC/> | |
| 223 | * <BDAY/> | |
| 224 | * </vCard> | |
| 225 | * | |
| 226 | * See also: | |
| 227 | * | |
| 228 | * http://docs.jabber.org/proto/html/vcard-temp.html | |
| 229 | * http://www.vcard-xml.org/dtd/vCard-XML-v2-20010520.dtd | |
| 230 | */ | |
| 231 | ||
| 232 | /* | |
| 233 | * Cross-reference user-friendly V-Card entry labels to vCard XML tags | |
| 234 | * and attributes. | |
| 235 | * | |
| 236 | * Order is (or should be) unimportant. For example: we have no way of | |
| 237 | * knowing in what order real data will arrive. | |
| 238 | * | |
| 239 | * Format: Label, Pre-set text, "visible" flag, "editable" flag, XML tag | |
| 240 | * name, XML tag's parent tag "path" (relative to vCard node). | |
| 241 | * | |
| 242 | * List is terminated by a NULL label pointer. | |
| 243 | * | |
| 244 | * Entries with no label text, but with XML tag and parent tag | |
| 245 | * entries, are used by V-Card XML construction routines to | |
| 246 | * "automagically" construct the appropriate XML node tree. | |
| 247 | * | |
| 248 | * Thoughts on future direction/expansion | |
| 249 | * | |
| 250 | * This is a "simple" vCard. | |
| 251 | * | |
| 252 | * It is possible for nodes other than the "vCard" node to have | |
| 253 | * attributes. Should that prove necessary/desirable, add an | |
| 254 | * "attributes" pointer to the vcard_template struct, create the | |
| 255 | * necessary tag_attr structs, and add 'em to the vcard_dflt_data | |
| 256 | * array. | |
| 257 | * | |
| 258 | * The above changes will (obviously) require changes to the vCard | |
| 259 | * construction routines. | |
| 260 | */ | |
| 261 | ||
| 262 | struct vcard_template { | |
| 263 | char *label; /* label text pointer */ | |
| 264 | char *text; /* entry text pointer */ | |
| 265 | int visible; /* should entry field be "visible?" */ | |
| 266 | int editable; /* should entry field be editable? */ | |
| 267 | char *tag; /* tag text */ | |
| 268 | char *ptag; /* parent tag "path" text */ | |
| 269 | char *url; /* vCard display format if URL */ | |
| 270 | } vcard_template_data[] = { | |
| 271 | {N_("Full Name"), NULL, TRUE, TRUE, "FN", NULL, NULL}, | |
| 272 | {N_("Family Name"), NULL, TRUE, TRUE, "FAMILY", "N", NULL}, | |
| 273 | {N_("Given Name"), NULL, TRUE, TRUE, "GIVEN", "N", NULL}, | |
| 274 | {N_("Nickname"), NULL, TRUE, TRUE, "NICKNAME", NULL, NULL}, | |
| 275 | {N_("URL"), NULL, TRUE, TRUE, "URL", NULL, "<A HREF=\"%s\">%s</A>"}, | |
| 276 | {N_("Street Address"), NULL, TRUE, TRUE, "STREET", "ADR", NULL}, | |
| 277 | {N_("Extended Address"), NULL, TRUE, TRUE, "EXTADD", "ADR", NULL}, | |
| 278 | {N_("Locality"), NULL, TRUE, TRUE, "LOCALITY", "ADR", NULL}, | |
| 279 | {N_("Region"), NULL, TRUE, TRUE, "REGION", "ADR", NULL}, | |
| 280 | {N_("Postal Code"), NULL, TRUE, TRUE, "PCODE", "ADR", NULL}, | |
| 13332 | 281 | {N_("Country"), NULL, TRUE, TRUE, "CTRY", "ADR", NULL}, |
| 11361 | 282 | {N_("Telephone"), NULL, TRUE, TRUE, "NUMBER", "TEL", NULL}, |
|
13546
0700f0c29e14
[gaim-migrate @ 15922]
Richard Laager <rlaager@pidgin.im>
parents:
13345
diff
changeset
|
283 | {N_("E-Mail"), NULL, TRUE, TRUE, "USERID", "EMAIL", "<A HREF=\"mailto:%s\">%s</A>"}, |
| 7014 | 284 | {N_("Organization Name"), NULL, TRUE, TRUE, "ORGNAME", "ORG", NULL}, |
| 285 | {N_("Organization Unit"), NULL, TRUE, TRUE, "ORGUNIT", "ORG", NULL}, | |
| 286 | {N_("Title"), NULL, TRUE, TRUE, "TITLE", NULL, NULL}, | |
| 287 | {N_("Role"), NULL, TRUE, TRUE, "ROLE", NULL, NULL}, | |
| 288 | {N_("Birthday"), NULL, TRUE, TRUE, "BDAY", NULL, NULL}, | |
| 289 | {N_("Description"), NULL, TRUE, TRUE, "DESC", NULL, NULL}, | |
| 290 | {"", NULL, TRUE, TRUE, "N", NULL, NULL}, | |
| 291 | {"", NULL, TRUE, TRUE, "ADR", NULL, NULL}, | |
| 292 | {"", NULL, TRUE, TRUE, "ORG", NULL, NULL}, | |
| 293 | {NULL, NULL, 0, 0, NULL, NULL, NULL} | |
| 294 | }; | |
| 295 | ||
| 296 | /* | |
|
8735
01248ea222d3
[gaim-migrate @ 9490]
Jonathan Champ <royanee@users.sourceforge.net>
parents:
8401
diff
changeset
|
297 | * The "vCard" tag's attribute list... |
| 7014 | 298 | */ |
| 299 | struct tag_attr { | |
| 300 | char *attr; | |
| 301 | char *value; | |
| 302 | } vcard_tag_attr_list[] = { | |
| 303 | {"prodid", "-//HandGen//NONSGML vGen v1.0//EN"}, | |
| 304 | {"version", "2.0", }, | |
| 305 | {"xmlns", "vcard-temp", }, | |
| 306 | {NULL, NULL}, | |
| 307 | }; | |
| 308 | ||
| 309 | ||
| 310 | /* | |
| 311 | * Insert a tag node into an xmlnode tree, recursively inserting parent tag | |
| 312 | * nodes as necessary | |
| 313 | * | |
| 314 | * Returns pointer to inserted node | |
| 315 | * | |
| 316 | * Note to hackers: this code is designed to be re-entrant (it's recursive--it | |
| 317 | * calls itself), so don't put any "static"s in here! | |
| 318 | */ | |
| 319 | static xmlnode *insert_tag_to_parent_tag(xmlnode *start, const char *parent_tag, const char *new_tag) | |
| 320 | { | |
| 321 | xmlnode *x = NULL; | |
| 322 | ||
| 323 | /* | |
| 324 | * If the parent tag wasn't specified, see if we can get it | |
| 325 | * from the vCard template struct. | |
| 326 | */ | |
| 327 | if(parent_tag == NULL) { | |
| 328 | struct vcard_template *vc_tp = vcard_template_data; | |
| 329 | ||
| 330 | while(vc_tp->label != NULL) { | |
| 331 | if(strcmp(vc_tp->tag, new_tag) == 0) { | |
| 332 | parent_tag = vc_tp->ptag; | |
| 333 | break; | |
| 334 | } | |
| 335 | ++vc_tp; | |
| 336 | } | |
| 337 | } | |
| 338 | ||
| 339 | /* | |
| 340 | * If we have a parent tag... | |
| 341 | */ | |
| 342 | if(parent_tag != NULL ) { | |
| 343 | /* | |
| 344 | * Try to get the parent node for a tag | |
| 345 | */ | |
| 346 | if((x = xmlnode_get_child(start, parent_tag)) == NULL) { | |
| 347 | /* | |
| 348 | * Descend? | |
| 349 | */ | |
| 350 | char *grand_parent = g_strdup(parent_tag); | |
| 351 | char *parent; | |
| 352 | ||
| 353 | if((parent = strrchr(grand_parent, '/')) != NULL) { | |
| 354 | *(parent++) = '\0'; | |
| 355 | x = insert_tag_to_parent_tag(start, grand_parent, parent); | |
| 356 | } else { | |
| 357 | x = xmlnode_new_child(start, grand_parent); | |
| 358 | } | |
| 359 | g_free(grand_parent); | |
| 360 | } else { | |
| 361 | /* | |
| 362 | * We found *something* to be the parent node. | |
| 363 | * Note: may be the "root" node! | |
| 364 | */ | |
| 365 | xmlnode *y; | |
| 366 | if((y = xmlnode_get_child(x, new_tag)) != NULL) { | |
| 367 | return(y); | |
| 368 | } | |
| 369 | } | |
| 370 | } | |
| 371 | ||
| 372 | /* | |
| 373 | * insert the new tag into its parent node | |
| 374 | */ | |
| 375 | return(xmlnode_new_child((x == NULL? start : x), new_tag)); | |
| 376 | } | |
| 377 | ||
| 378 | /* | |
| 379 | * Send vCard info to Jabber server | |
| 380 | */ | |
| 15884 | 381 | void jabber_set_info(PurpleConnection *gc, const char *info) |
| 7014 | 382 | { |
| 383 | JabberIq *iq; | |
| 384 | JabberStream *js = gc->proto_data; | |
| 385 | xmlnode *vc_node; | |
|
13693
a20847c5c46d
[gaim-migrate @ 16094]
Chris <cbanal@users.sourceforge.net>
parents:
13641
diff
changeset
|
386 | struct tag_attr *tag_attr; |
| 7014 | 387 | |
|
15273
a7838f939207
[gaim-migrate @ 18001]
Mark Doliner <markdoliner@pidgin.im>
parents:
15205
diff
changeset
|
388 | g_free(js->avatar_hash); |
| 10189 | 389 | js->avatar_hash = NULL; |
| 7014 | 390 | |
| 391 | /* | |
| 392 | * Send only if there's actually any *information* to send | |
| 393 | */ | |
| 11388 | 394 | vc_node = info ? xmlnode_from_str(info, -1) : NULL; |
| 10189 | 395 | |
|
15273
a7838f939207
[gaim-migrate @ 18001]
Mark Doliner <markdoliner@pidgin.im>
parents:
15205
diff
changeset
|
396 | if(!vc_node) { |
| 10189 | 397 | vc_node = xmlnode_new("vCard"); |
|
13693
a20847c5c46d
[gaim-migrate @ 16094]
Chris <cbanal@users.sourceforge.net>
parents:
13641
diff
changeset
|
398 | for(tag_attr = vcard_tag_attr_list; tag_attr->attr != NULL; ++tag_attr) |
|
a20847c5c46d
[gaim-migrate @ 16094]
Chris <cbanal@users.sourceforge.net>
parents:
13641
diff
changeset
|
399 | xmlnode_set_attrib(vc_node, tag_attr->attr, tag_attr->value); |
| 10189 | 400 | } |
| 7014 | 401 | |
|
15273
a7838f939207
[gaim-migrate @ 18001]
Mark Doliner <markdoliner@pidgin.im>
parents:
15205
diff
changeset
|
402 | if (vc_node->name && |
|
a7838f939207
[gaim-migrate @ 18001]
Mark Doliner <markdoliner@pidgin.im>
parents:
15205
diff
changeset
|
403 | !g_ascii_strncasecmp(vc_node->name, "vCard", 5)) { |
|
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
|
404 | PurpleStoredImage *img; |
| 10189 | 405 | |
|
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
|
406 | if ((img = purple_buddy_icons_find_account_icon(gc->account))) { |
|
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
|
407 | gconstpointer avatar_data; |
|
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
|
408 | gsize avatar_len; |
|
15273
a7838f939207
[gaim-migrate @ 18001]
Mark Doliner <markdoliner@pidgin.im>
parents:
15205
diff
changeset
|
409 | xmlnode *photo, *binval; |
|
a7838f939207
[gaim-migrate @ 18001]
Mark Doliner <markdoliner@pidgin.im>
parents:
15205
diff
changeset
|
410 | gchar *enc; |
|
a7838f939207
[gaim-migrate @ 18001]
Mark Doliner <markdoliner@pidgin.im>
parents:
15205
diff
changeset
|
411 | int i; |
|
a7838f939207
[gaim-migrate @ 18001]
Mark Doliner <markdoliner@pidgin.im>
parents:
15205
diff
changeset
|
412 | unsigned char hashval[20]; |
|
a7838f939207
[gaim-migrate @ 18001]
Mark Doliner <markdoliner@pidgin.im>
parents:
15205
diff
changeset
|
413 | char *p, hash[41]; |
| 10189 | 414 | |
|
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
|
415 | avatar_data = purple_imgstore_get_data(img); |
|
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
|
416 | avatar_len = purple_imgstore_get_size(img); |
|
15273
a7838f939207
[gaim-migrate @ 18001]
Mark Doliner <markdoliner@pidgin.im>
parents:
15205
diff
changeset
|
417 | photo = xmlnode_new_child(vc_node, "PHOTO"); |
|
a7838f939207
[gaim-migrate @ 18001]
Mark Doliner <markdoliner@pidgin.im>
parents:
15205
diff
changeset
|
418 | binval = xmlnode_new_child(photo, "BINVAL"); |
| 15884 | 419 | enc = purple_base64_encode(avatar_data, avatar_len); |
|
10684
0325b164a7eb
[gaim-migrate @ 12231]
Luke Schierer <lschiere@pidgin.im>
parents:
10662
diff
changeset
|
420 | |
|
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
|
421 | purple_cipher_digest_region("sha1", avatar_data, |
|
15273
a7838f939207
[gaim-migrate @ 18001]
Mark Doliner <markdoliner@pidgin.im>
parents:
15205
diff
changeset
|
422 | avatar_len, sizeof(hashval), |
|
a7838f939207
[gaim-migrate @ 18001]
Mark Doliner <markdoliner@pidgin.im>
parents:
15205
diff
changeset
|
423 | hashval, NULL); |
|
10684
0325b164a7eb
[gaim-migrate @ 12231]
Luke Schierer <lschiere@pidgin.im>
parents:
10662
diff
changeset
|
424 | |
|
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
|
425 | purple_imgstore_unref(img); |
|
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
|
426 | |
|
15273
a7838f939207
[gaim-migrate @ 18001]
Mark Doliner <markdoliner@pidgin.im>
parents:
15205
diff
changeset
|
427 | p = hash; |
|
a7838f939207
[gaim-migrate @ 18001]
Mark Doliner <markdoliner@pidgin.im>
parents:
15205
diff
changeset
|
428 | for(i=0; i<20; i++, p+=2) |
|
a7838f939207
[gaim-migrate @ 18001]
Mark Doliner <markdoliner@pidgin.im>
parents:
15205
diff
changeset
|
429 | snprintf(p, 3, "%02x", hashval[i]); |
|
a7838f939207
[gaim-migrate @ 18001]
Mark Doliner <markdoliner@pidgin.im>
parents:
15205
diff
changeset
|
430 | js->avatar_hash = g_strdup(hash); |
| 10189 | 431 | |
|
15273
a7838f939207
[gaim-migrate @ 18001]
Mark Doliner <markdoliner@pidgin.im>
parents:
15205
diff
changeset
|
432 | xmlnode_insert_data(binval, enc, -1); |
|
a7838f939207
[gaim-migrate @ 18001]
Mark Doliner <markdoliner@pidgin.im>
parents:
15205
diff
changeset
|
433 | g_free(enc); |
|
a7838f939207
[gaim-migrate @ 18001]
Mark Doliner <markdoliner@pidgin.im>
parents:
15205
diff
changeset
|
434 | } |
| 10189 | 435 | |
|
15273
a7838f939207
[gaim-migrate @ 18001]
Mark Doliner <markdoliner@pidgin.im>
parents:
15205
diff
changeset
|
436 | iq = jabber_iq_new(js, JABBER_IQ_SET); |
|
a7838f939207
[gaim-migrate @ 18001]
Mark Doliner <markdoliner@pidgin.im>
parents:
15205
diff
changeset
|
437 | xmlnode_insert_child(iq->node, vc_node); |
|
a7838f939207
[gaim-migrate @ 18001]
Mark Doliner <markdoliner@pidgin.im>
parents:
15205
diff
changeset
|
438 | jabber_iq_send(iq); |
|
a7838f939207
[gaim-migrate @ 18001]
Mark Doliner <markdoliner@pidgin.im>
parents:
15205
diff
changeset
|
439 | } else { |
|
a7838f939207
[gaim-migrate @ 18001]
Mark Doliner <markdoliner@pidgin.im>
parents:
15205
diff
changeset
|
440 | xmlnode_free(vc_node); |
| 7014 | 441 | } |
| 442 | } | |
| 443 | ||
|
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
|
444 | void jabber_set_buddy_icon(PurpleConnection *gc, PurpleStoredImage *img) |
| 10189 | 445 | { |
| 15884 | 446 | PurplePresence *gpresence; |
| 447 | PurpleStatus *status; | |
| 10189 | 448 | |
| 15884 | 449 | jabber_set_info(gc, purple_account_get_user_info(gc->account)); |
| 10189 | 450 | |
| 15884 | 451 | gpresence = purple_account_get_presence(gc->account); |
| 452 | status = purple_presence_get_active_status(gpresence); | |
| 10216 | 453 | jabber_presence_send(gc->account, status); |
| 10189 | 454 | } |
| 455 | ||
| 7014 | 456 | /* |
| 457 | * This is the callback from the "ok clicked" for "set vCard" | |
| 458 | * | |
| 459 | * Formats GSList data into XML-encoded string and returns a pointer | |
| 460 | * to said string. | |
| 461 | * | |
| 462 | * g_free()'ing the returned string space is the responsibility of | |
| 463 | * the caller. | |
| 464 | */ | |
| 465 | static void | |
| 15884 | 466 | jabber_format_info(PurpleConnection *gc, PurpleRequestFields *fields) |
| 7014 | 467 | { |
| 468 | xmlnode *vc_node; | |
| 15884 | 469 | PurpleRequestField *field; |
| 7014 | 470 | const char *text; |
| 471 | char *p; | |
| 472 | const struct vcard_template *vc_tp; | |
| 473 | struct tag_attr *tag_attr; | |
| 474 | ||
| 475 | vc_node = xmlnode_new("vCard"); | |
| 476 | ||
| 477 | for(tag_attr = vcard_tag_attr_list; tag_attr->attr != NULL; ++tag_attr) | |
| 478 | xmlnode_set_attrib(vc_node, tag_attr->attr, tag_attr->value); | |
| 479 | ||
| 480 | for (vc_tp = vcard_template_data; vc_tp->label != NULL; vc_tp++) { | |
| 481 | if (*vc_tp->label == '\0') | |
| 482 | continue; | |
| 483 | ||
| 15884 | 484 | field = purple_request_fields_get_field(fields, vc_tp->tag); |
| 485 | text = purple_request_field_string_get_value(field); | |
| 7014 | 486 | |
| 487 | ||
| 488 | if (text != NULL && *text != '\0') { | |
| 489 | xmlnode *xp; | |
| 490 | ||
| 15884 | 491 | purple_debug(PURPLE_DEBUG_INFO, "jabber", |
| 9339 | 492 | "Setting %s to '%s'\n", vc_tp->tag, text); |
| 493 | ||
| 7014 | 494 | if ((xp = insert_tag_to_parent_tag(vc_node, |
| 495 | NULL, vc_tp->tag)) != NULL) { | |
| 496 | ||
| 497 | xmlnode_insert_data(xp, text, -1); | |
| 498 | } | |
| 499 | } | |
| 500 | } | |
| 501 | ||
| 7642 | 502 | p = xmlnode_to_str(vc_node, NULL); |
| 7014 | 503 | xmlnode_free(vc_node); |
| 504 | ||
| 15884 | 505 | 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
|
506 | serv_set_info(gc, p); |
| 7014 | 507 | |
| 508 | g_free(p); | |
| 509 | } | |
| 510 | ||
| 511 | /* | |
| 512 | * This gets executed by the proto action | |
| 513 | * | |
| 15884 | 514 | * Creates a new PurpleRequestFields struct, gets the XML-formatted user_info |
| 7014 | 515 | * string (if any) into GSLists for the (multi-entry) edit dialog and |
| 516 | * calls the set_vcard dialog. | |
| 517 | */ | |
| 15884 | 518 | void jabber_setup_set_info(PurplePluginAction *action) |
| 7014 | 519 | { |
| 15884 | 520 | PurpleConnection *gc = (PurpleConnection *) action->context; |
| 521 | PurpleRequestFields *fields; | |
| 522 | PurpleRequestFieldGroup *group; | |
| 523 | PurpleRequestField *field; | |
| 7014 | 524 | const struct vcard_template *vc_tp; |
|
14129
70db31dfeeb1
[gaim-migrate @ 16688]
Daniel Atallah <datallah@pidgin.im>
parents:
13808
diff
changeset
|
525 | const char *user_info; |
|
14130
02a5f8dad9cf
[gaim-migrate @ 16689]
Daniel Atallah <datallah@pidgin.im>
parents:
14129
diff
changeset
|
526 | char *cdata = NULL; |
| 7014 | 527 | xmlnode *x_vc_data = NULL; |
| 528 | ||
| 15884 | 529 | fields = purple_request_fields_new(); |
| 530 | group = purple_request_field_group_new(NULL); | |
| 531 | purple_request_fields_add_group(fields, group); | |
| 7014 | 532 | |
| 533 | /* | |
| 534 | * Get existing, XML-formatted, user info | |
| 535 | */ | |
| 15884 | 536 | if((user_info = purple_account_get_user_info(gc->account)) != NULL) |
| 7014 | 537 | x_vc_data = xmlnode_from_str(user_info, -1); |
| 538 | ||
| 539 | /* | |
| 540 | * Set up GSLists for edit with labels from "template," data from user info | |
| 541 | */ | |
| 542 | for(vc_tp = vcard_template_data; vc_tp->label != NULL; ++vc_tp) { | |
| 543 | xmlnode *data_node; | |
| 544 | if((vc_tp->label)[0] == '\0') | |
| 545 | continue; | |
|
14129
70db31dfeeb1
[gaim-migrate @ 16688]
Daniel Atallah <datallah@pidgin.im>
parents:
13808
diff
changeset
|
546 | |
|
70db31dfeeb1
[gaim-migrate @ 16688]
Daniel Atallah <datallah@pidgin.im>
parents:
13808
diff
changeset
|
547 | if (x_vc_data != NULL) { |
|
70db31dfeeb1
[gaim-migrate @ 16688]
Daniel Atallah <datallah@pidgin.im>
parents:
13808
diff
changeset
|
548 | if(vc_tp->ptag == NULL) { |
|
70db31dfeeb1
[gaim-migrate @ 16688]
Daniel Atallah <datallah@pidgin.im>
parents:
13808
diff
changeset
|
549 | data_node = xmlnode_get_child(x_vc_data, vc_tp->tag); |
|
70db31dfeeb1
[gaim-migrate @ 16688]
Daniel Atallah <datallah@pidgin.im>
parents:
13808
diff
changeset
|
550 | } else { |
|
70db31dfeeb1
[gaim-migrate @ 16688]
Daniel Atallah <datallah@pidgin.im>
parents:
13808
diff
changeset
|
551 | 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
|
552 | data_node = xmlnode_get_child(x_vc_data, tag); |
|
70db31dfeeb1
[gaim-migrate @ 16688]
Daniel Atallah <datallah@pidgin.im>
parents:
13808
diff
changeset
|
553 | g_free(tag); |
|
70db31dfeeb1
[gaim-migrate @ 16688]
Daniel Atallah <datallah@pidgin.im>
parents:
13808
diff
changeset
|
554 | } |
|
70db31dfeeb1
[gaim-migrate @ 16688]
Daniel Atallah <datallah@pidgin.im>
parents:
13808
diff
changeset
|
555 | if(data_node) |
|
70db31dfeeb1
[gaim-migrate @ 16688]
Daniel Atallah <datallah@pidgin.im>
parents:
13808
diff
changeset
|
556 | cdata = xmlnode_get_data(data_node); |
|
14130
02a5f8dad9cf
[gaim-migrate @ 16689]
Daniel Atallah <datallah@pidgin.im>
parents:
14129
diff
changeset
|
557 | } |
| 7014 | 558 | |
| 559 | if(strcmp(vc_tp->tag, "DESC") == 0) { | |
| 15884 | 560 | field = purple_request_field_string_new(vc_tp->tag, |
| 7014 | 561 | _(vc_tp->label), cdata, |
| 562 | TRUE); | |
| 563 | } else { | |
| 15884 | 564 | field = purple_request_field_string_new(vc_tp->tag, |
| 7014 | 565 | _(vc_tp->label), cdata, |
| 566 | FALSE); | |
| 567 | } | |
| 568 | ||
|
14130
02a5f8dad9cf
[gaim-migrate @ 16689]
Daniel Atallah <datallah@pidgin.im>
parents:
14129
diff
changeset
|
569 | g_free(cdata); |
|
02a5f8dad9cf
[gaim-migrate @ 16689]
Daniel Atallah <datallah@pidgin.im>
parents:
14129
diff
changeset
|
570 | cdata = NULL; |
|
02a5f8dad9cf
[gaim-migrate @ 16689]
Daniel Atallah <datallah@pidgin.im>
parents:
14129
diff
changeset
|
571 | |
| 15884 | 572 | purple_request_field_group_add_field(group, field); |
| 7014 | 573 | } |
| 574 | ||
| 575 | if(x_vc_data != NULL) | |
| 576 | xmlnode_free(x_vc_data); | |
| 577 | ||
|
16961
b6955f946f8f
s/Jabber/XMPP in user-visible places.
Richard Laager <rlaager@pidgin.im>
parents:
16799
diff
changeset
|
578 | purple_request_fields(gc, _("Edit XMPP vCard"), |
|
b6955f946f8f
s/Jabber/XMPP in user-visible places.
Richard Laager <rlaager@pidgin.im>
parents:
16799
diff
changeset
|
579 | _("Edit XMPP vCard"), |
| 7014 | 580 | _("All items below are optional. Enter only the " |
| 581 | "information with which you feel comfortable."), | |
| 582 | fields, | |
| 583 | _("Save"), G_CALLBACK(jabber_format_info), | |
| 584 | _("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
|
585 | purple_connection_get_account(gc), NULL, NULL, |
| 7014 | 586 | gc); |
| 587 | } | |
| 588 | ||
| 589 | /*---------------------------------------*/ | |
| 590 | /* End Jabber "set info" (vCard) support */ | |
| 591 | /*---------------------------------------*/ | |
| 592 | ||
| 593 | /****** | |
| 594 | * end of that ancient crap that needs to die | |
| 595 | ******/ | |
| 596 | ||
|
15363
f6b9d1e3d0cb
[gaim-migrate @ 18092]
Evan Schoenberg <evands@pidgin.im>
parents:
15273
diff
changeset
|
597 | static void jabber_buddy_info_destroy(JabberBuddyInfo *jbi) |
|
f6b9d1e3d0cb
[gaim-migrate @ 18092]
Evan Schoenberg <evands@pidgin.im>
parents:
15273
diff
changeset
|
598 | { |
|
f6b9d1e3d0cb
[gaim-migrate @ 18092]
Evan Schoenberg <evands@pidgin.im>
parents:
15273
diff
changeset
|
599 | /* 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
|
600 | if (jbi->timeout_handle > 0) |
| 15884 | 601 | 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
|
602 | |
|
15363
f6b9d1e3d0cb
[gaim-migrate @ 18092]
Evan Schoenberg <evands@pidgin.im>
parents:
15273
diff
changeset
|
603 | g_free(jbi->jid); |
|
f6b9d1e3d0cb
[gaim-migrate @ 18092]
Evan Schoenberg <evands@pidgin.im>
parents:
15273
diff
changeset
|
604 | g_hash_table_destroy(jbi->resources); |
|
f6b9d1e3d0cb
[gaim-migrate @ 18092]
Evan Schoenberg <evands@pidgin.im>
parents:
15273
diff
changeset
|
605 | 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
|
606 | g_free(jbi); |
|
15363
f6b9d1e3d0cb
[gaim-migrate @ 18092]
Evan Schoenberg <evands@pidgin.im>
parents:
15273
diff
changeset
|
607 | } |
|
f6b9d1e3d0cb
[gaim-migrate @ 18092]
Evan Schoenberg <evands@pidgin.im>
parents:
15273
diff
changeset
|
608 | |
| 13794 | 609 | static void jabber_buddy_info_show_if_ready(JabberBuddyInfo *jbi) |
| 7014 | 610 | { |
|
15205
f642029b2f97
[gaim-migrate @ 17929]
Evan Schoenberg <evands@pidgin.im>
parents:
15143
diff
changeset
|
611 | char *resource_name, *tmp; |
| 13794 | 612 | JabberBuddyResource *jbr; |
|
15092
e7c5edee202e
[gaim-migrate @ 17813]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
14669
diff
changeset
|
613 | JabberBuddyInfoResource *jbir = NULL; |
| 13794 | 614 | GList *resources; |
| 15884 | 615 | PurpleNotifyUserInfo *user_info; |
| 7014 | 616 | |
| 13794 | 617 | /* not yet */ |
| 618 | if(jbi->ids) | |
| 11361 | 619 | return; |
| 620 | ||
| 15884 | 621 | user_info = purple_notify_user_info_new(); |
| 13794 | 622 | resource_name = jabber_get_resource(jbi->jid); |
| 7014 | 623 | |
| 624 | if(resource_name) { | |
| 13794 | 625 | jbr = jabber_buddy_find_resource(jbi->jb, resource_name); |
| 626 | jbir = g_hash_table_lookup(jbi->resources, resource_name); | |
| 7014 | 627 | if(jbr) { |
| 7145 | 628 | char *purdy = NULL; |
| 629 | if(jbr->status) | |
| 15884 | 630 | purdy = purple_strdup_withhtml(jbr->status); |
|
15205
f642029b2f97
[gaim-migrate @ 17929]
Evan Schoenberg <evands@pidgin.im>
parents:
15143
diff
changeset
|
631 | 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
|
632 | (purdy ? ": " : ""), |
|
f642029b2f97
[gaim-migrate @ 17929]
Evan Schoenberg <evands@pidgin.im>
parents:
15143
diff
changeset
|
633 | (purdy ? purdy : "")); |
| 15884 | 634 | purple_notify_user_info_add_pair(user_info, _("Status"), tmp); |
|
15205
f642029b2f97
[gaim-migrate @ 17929]
Evan Schoenberg <evands@pidgin.im>
parents:
15143
diff
changeset
|
635 | g_free(tmp); |
|
f642029b2f97
[gaim-migrate @ 17929]
Evan Schoenberg <evands@pidgin.im>
parents:
15143
diff
changeset
|
636 | g_free(purdy); |
| 7014 | 637 | } else { |
| 15884 | 638 | purple_notify_user_info_add_pair(user_info, _("Status"), _("Unknown")); |
| 7014 | 639 | } |
| 13794 | 640 | if(jbir) { |
| 641 | if(jbir->idle_seconds > 0) { | |
| 15884 | 642 | char *idle = purple_str_seconds_to_string(jbir->idle_seconds); |
| 643 | 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
|
644 | g_free(idle); |
| 13794 | 645 | } |
| 646 | } | |
| 647 | if(jbr && jbr->client.name) { | |
|
15205
f642029b2f97
[gaim-migrate @ 17929]
Evan Schoenberg <evands@pidgin.im>
parents:
15143
diff
changeset
|
648 | tmp = g_strdup_printf("%s%s%s", jbr->client.name, |
|
f642029b2f97
[gaim-migrate @ 17929]
Evan Schoenberg <evands@pidgin.im>
parents:
15143
diff
changeset
|
649 | (jbr->client.version ? " " : ""), |
|
f642029b2f97
[gaim-migrate @ 17929]
Evan Schoenberg <evands@pidgin.im>
parents:
15143
diff
changeset
|
650 | (jbr->client.version ? jbr->client.version : "")); |
| 15884 | 651 | purple_notify_user_info_add_pair(user_info, _("Client"), tmp); |
|
15205
f642029b2f97
[gaim-migrate @ 17929]
Evan Schoenberg <evands@pidgin.im>
parents:
15143
diff
changeset
|
652 | g_free(tmp); |
|
f642029b2f97
[gaim-migrate @ 17929]
Evan Schoenberg <evands@pidgin.im>
parents:
15143
diff
changeset
|
653 | |
| 13794 | 654 | if(jbr->client.os) { |
| 15884 | 655 | purple_notify_user_info_add_pair(user_info, _("Operating System"), jbr->client.os); |
| 13794 | 656 | } |
| 657 | } | |
| 7014 | 658 | } else { |
| 13794 | 659 | for(resources = jbi->jb->resources; resources; resources = resources->next) { |
| 7145 | 660 | char *purdy = NULL; |
| 7014 | 661 | jbr = resources->data; |
| 7145 | 662 | if(jbr->status) |
| 15884 | 663 | purdy = purple_strdup_withhtml(jbr->status); |
|
15092
e7c5edee202e
[gaim-migrate @ 17813]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
14669
diff
changeset
|
664 | if(jbr->name) |
| 15884 | 665 | 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
|
666 | tmp = g_strdup_printf("%d", jbr->priority); |
| 15884 | 667 | purple_notify_user_info_add_pair(user_info, _("Priority"), tmp); |
|
15205
f642029b2f97
[gaim-migrate @ 17929]
Evan Schoenberg <evands@pidgin.im>
parents:
15143
diff
changeset
|
668 | g_free(tmp); |
|
f642029b2f97
[gaim-migrate @ 17929]
Evan Schoenberg <evands@pidgin.im>
parents:
15143
diff
changeset
|
669 | |
|
f642029b2f97
[gaim-migrate @ 17929]
Evan Schoenberg <evands@pidgin.im>
parents:
15143
diff
changeset
|
670 | 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
|
671 | (purdy ? ": " : ""), |
|
f642029b2f97
[gaim-migrate @ 17929]
Evan Schoenberg <evands@pidgin.im>
parents:
15143
diff
changeset
|
672 | (purdy ? purdy : "")); |
| 15884 | 673 | purple_notify_user_info_add_pair(user_info, _("Status"), tmp); |
|
15205
f642029b2f97
[gaim-migrate @ 17929]
Evan Schoenberg <evands@pidgin.im>
parents:
15143
diff
changeset
|
674 | g_free(tmp); |
|
f642029b2f97
[gaim-migrate @ 17929]
Evan Schoenberg <evands@pidgin.im>
parents:
15143
diff
changeset
|
675 | g_free(purdy); |
| 13794 | 676 | |
|
15092
e7c5edee202e
[gaim-migrate @ 17813]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
14669
diff
changeset
|
677 | if(jbr->name) |
|
e7c5edee202e
[gaim-migrate @ 17813]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
14669
diff
changeset
|
678 | jbir = g_hash_table_lookup(jbi->resources, jbr->name); |
|
e7c5edee202e
[gaim-migrate @ 17813]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
14669
diff
changeset
|
679 | |
| 13794 | 680 | if(jbir) { |
| 681 | if(jbir->idle_seconds > 0) { | |
| 15884 | 682 | char *idle = purple_str_seconds_to_string(jbir->idle_seconds); |
| 683 | 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
|
684 | g_free(idle); |
| 13794 | 685 | } |
| 686 | } | |
|
15205
f642029b2f97
[gaim-migrate @ 17929]
Evan Schoenberg <evands@pidgin.im>
parents:
15143
diff
changeset
|
687 | if(jbr && jbr->client.name) { |
|
f642029b2f97
[gaim-migrate @ 17929]
Evan Schoenberg <evands@pidgin.im>
parents:
15143
diff
changeset
|
688 | tmp = g_strdup_printf("%s%s%s", jbr->client.name, |
|
f642029b2f97
[gaim-migrate @ 17929]
Evan Schoenberg <evands@pidgin.im>
parents:
15143
diff
changeset
|
689 | (jbr->client.version ? " " : ""), |
|
f642029b2f97
[gaim-migrate @ 17929]
Evan Schoenberg <evands@pidgin.im>
parents:
15143
diff
changeset
|
690 | (jbr->client.version ? jbr->client.version : "")); |
| 15884 | 691 | purple_notify_user_info_add_pair(user_info, |
|
15205
f642029b2f97
[gaim-migrate @ 17929]
Evan Schoenberg <evands@pidgin.im>
parents:
15143
diff
changeset
|
692 | _("Client"), tmp); |
|
f642029b2f97
[gaim-migrate @ 17929]
Evan Schoenberg <evands@pidgin.im>
parents:
15143
diff
changeset
|
693 | 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
|
694 | |
| 13794 | 695 | if(jbr->client.os) { |
| 15884 | 696 | purple_notify_user_info_add_pair(user_info, _("Operating System"), jbr->client.os); |
| 13794 | 697 | } |
| 698 | } | |
| 7014 | 699 | } |
| 700 | } | |
| 701 | ||
| 7306 | 702 | g_free(resource_name); |
| 703 | ||
|
15205
f642029b2f97
[gaim-migrate @ 17929]
Evan Schoenberg <evands@pidgin.im>
parents:
15143
diff
changeset
|
704 | if (jbi->vcard_text != NULL) { |
| 15884 | 705 | purple_notify_user_info_add_section_break(user_info); |
|
15205
f642029b2f97
[gaim-migrate @ 17929]
Evan Schoenberg <evands@pidgin.im>
parents:
15143
diff
changeset
|
706 | /* Should this have some sort of label? */ |
| 15884 | 707 | 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
|
708 | } |
| 13794 | 709 | |
| 15884 | 710 | purple_notify_userinfo(jbi->js->gc, jbi->jid, user_info, NULL, NULL); |
| 711 | purple_notify_user_info_destroy(user_info); | |
| 13794 | 712 | |
| 713 | 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
|
714 | purple_imgstore_unref_by_id(GPOINTER_TO_INT(jbi->vcard_imgids->data)); |
| 13794 | 715 | jbi->vcard_imgids = g_slist_delete_link(jbi->vcard_imgids, jbi->vcard_imgids); |
| 716 | } | |
| 717 | ||
|
15363
f6b9d1e3d0cb
[gaim-migrate @ 18092]
Evan Schoenberg <evands@pidgin.im>
parents:
15273
diff
changeset
|
718 | 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
|
719 | |
|
15363
f6b9d1e3d0cb
[gaim-migrate @ 18092]
Evan Schoenberg <evands@pidgin.im>
parents:
15273
diff
changeset
|
720 | jabber_buddy_info_destroy(jbi); |
| 13794 | 721 | } |
| 722 | ||
| 723 | static void jabber_buddy_info_remove_id(JabberBuddyInfo *jbi, const char *id) | |
| 724 | { | |
| 725 | 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
|
726 | char *comp_id; |
| 13794 | 727 | |
| 728 | if(!id) | |
| 729 | return; | |
| 730 | ||
| 731 | while(l) { | |
|
15727
0754583ceeae
Don't access the list element after it has been freed.
Daniel Atallah <datallah@pidgin.im>
parents:
15688
diff
changeset
|
732 | 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
|
733 | 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
|
734 | 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
|
735 | g_free(comp_id); |
| 13794 | 736 | return; |
| 737 | } | |
| 738 | l = l->next; | |
| 739 | } | |
| 740 | } | |
| 741 | ||
| 742 | static void jabber_vcard_parse(JabberStream *js, xmlnode *packet, gpointer data) | |
| 743 | { | |
|
14129
70db31dfeeb1
[gaim-migrate @ 16688]
Daniel Atallah <datallah@pidgin.im>
parents:
13808
diff
changeset
|
744 | const char *id, *from; |
| 13794 | 745 | GString *info_text; |
| 746 | char *bare_jid; | |
| 747 | char *text; | |
| 748 | xmlnode *vcard; | |
| 15884 | 749 | PurpleBuddy *b; |
| 13794 | 750 | JabberBuddyInfo *jbi = data; |
| 751 | ||
| 752 | from = xmlnode_get_attrib(packet, "from"); | |
| 753 | id = xmlnode_get_attrib(packet, "id"); | |
| 754 | ||
| 755 | if(!jbi) | |
| 756 | return; | |
| 757 | ||
|
14129
70db31dfeeb1
[gaim-migrate @ 16688]
Daniel Atallah <datallah@pidgin.im>
parents:
13808
diff
changeset
|
758 | jabber_buddy_info_remove_id(jbi, id); |
|
70db31dfeeb1
[gaim-migrate @ 16688]
Daniel Atallah <datallah@pidgin.im>
parents:
13808
diff
changeset
|
759 | |
| 13794 | 760 | if(!from) |
| 761 | return; | |
| 762 | ||
|
14129
70db31dfeeb1
[gaim-migrate @ 16688]
Daniel Atallah <datallah@pidgin.im>
parents:
13808
diff
changeset
|
763 | if(!jabber_buddy_find(js, from, FALSE)) |
| 13794 | 764 | return; |
| 765 | ||
| 766 | /* XXX: handle the error case */ | |
| 767 | ||
| 768 | bare_jid = jabber_get_bare_jid(from); | |
| 769 | ||
| 15884 | 770 | b = purple_find_buddy(js->gc->account, bare_jid); |
| 13794 | 771 | |
| 772 | info_text = g_string_new(""); | |
| 773 | ||
| 10189 | 774 | if((vcard = xmlnode_get_child(packet, "vCard")) || |
| 775 | (vcard = xmlnode_get_child_with_namespace(packet, "query", "vcard-temp"))) { | |
| 7014 | 776 | xmlnode *child; |
| 777 | for(child = vcard->child; child; child = child->next) | |
| 778 | { | |
| 779 | xmlnode *child2; | |
| 780 | ||
| 8135 | 781 | if(child->type != XMLNODE_TYPE_TAG) |
| 7014 | 782 | continue; |
| 783 | ||
| 784 | text = xmlnode_get_data(child); | |
| 785 | if(text && !strcmp(child->name, "FN")) { | |
| 8213 | 786 | g_string_append_printf(info_text, "<b>%s:</b> %s<br/>", |
| 7014 | 787 | _("Full Name"), text); |
| 788 | } else if(!strcmp(child->name, "N")) { | |
| 789 | for(child2 = child->child; child2; child2 = child2->next) | |
| 790 | { | |
| 791 | char *text2; | |
| 792 | ||
| 8135 | 793 | if(child2->type != XMLNODE_TYPE_TAG) |
| 7014 | 794 | continue; |
| 795 | ||
| 796 | text2 = xmlnode_get_data(child2); | |
| 797 | if(text2 && !strcmp(child2->name, "FAMILY")) { | |
| 798 | g_string_append_printf(info_text, | |
| 8213 | 799 | "<b>%s:</b> %s<br/>", |
| 7014 | 800 | _("Family Name"), text2); |
| 801 | } else if(text2 && !strcmp(child2->name, "GIVEN")) { | |
| 802 | g_string_append_printf(info_text, | |
| 8213 | 803 | "<b>%s:</b> %s<br/>", |
| 7014 | 804 | _("Given Name"), text2); |
| 805 | } else if(text2 && !strcmp(child2->name, "MIDDLE")) { | |
| 806 | g_string_append_printf(info_text, | |
| 8213 | 807 | "<b>%s:</b> %s<br/>", |
| 7014 | 808 | _("Middle Name"), text2); |
| 809 | } | |
| 810 | g_free(text2); | |
| 811 | } | |
| 812 | } else if(text && !strcmp(child->name, "NICKNAME")) { | |
| 813 | serv_got_alias(js->gc, from, text); | |
| 7955 | 814 | if(b) { |
| 15884 | 815 | purple_blist_node_set_string((PurpleBlistNode*)b, "servernick", text); |
| 7955 | 816 | } |
| 8213 | 817 | g_string_append_printf(info_text, "<b>%s:</b> %s<br/>", |
| 7014 | 818 | _("Nickname"), text); |
| 819 | } else if(text && !strcmp(child->name, "BDAY")) { | |
| 8213 | 820 | g_string_append_printf(info_text, "<b>%s:</b> %s<br/>", |
| 7014 | 821 | _("Birthday"), text); |
| 822 | } else if(!strcmp(child->name, "ADR")) { | |
|
12933
885970470a9b
[gaim-migrate @ 15286]
Richard Laager <rlaager@pidgin.im>
parents:
12919
diff
changeset
|
823 | gboolean address_line_added = FALSE; |
|
885970470a9b
[gaim-migrate @ 15286]
Richard Laager <rlaager@pidgin.im>
parents:
12919
diff
changeset
|
824 | |
| 7014 | 825 | for(child2 = child->child; child2; child2 = child2->next) |
| 826 | { | |
| 827 | char *text2; | |
| 828 | ||
| 8135 | 829 | if(child2->type != XMLNODE_TYPE_TAG) |
| 7014 | 830 | continue; |
| 831 | ||
| 832 | text2 = xmlnode_get_data(child2); | |
|
12933
885970470a9b
[gaim-migrate @ 15286]
Richard Laager <rlaager@pidgin.im>
parents:
12919
diff
changeset
|
833 | if (text2 == NULL) |
|
885970470a9b
[gaim-migrate @ 15286]
Richard Laager <rlaager@pidgin.im>
parents:
12919
diff
changeset
|
834 | continue; |
|
885970470a9b
[gaim-migrate @ 15286]
Richard Laager <rlaager@pidgin.im>
parents:
12919
diff
changeset
|
835 | |
|
885970470a9b
[gaim-migrate @ 15286]
Richard Laager <rlaager@pidgin.im>
parents:
12919
diff
changeset
|
836 | /* 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
|
837 | * elements are empty. */ |
|
885970470a9b
[gaim-migrate @ 15286]
Richard Laager <rlaager@pidgin.im>
parents:
12919
diff
changeset
|
838 | if (!address_line_added) |
|
885970470a9b
[gaim-migrate @ 15286]
Richard Laager <rlaager@pidgin.im>
parents:
12919
diff
changeset
|
839 | { |
|
885970470a9b
[gaim-migrate @ 15286]
Richard Laager <rlaager@pidgin.im>
parents:
12919
diff
changeset
|
840 | g_string_append_printf(info_text, "<b>%s:</b><br/>", |
|
885970470a9b
[gaim-migrate @ 15286]
Richard Laager <rlaager@pidgin.im>
parents:
12919
diff
changeset
|
841 | _("Address")); |
|
885970470a9b
[gaim-migrate @ 15286]
Richard Laager <rlaager@pidgin.im>
parents:
12919
diff
changeset
|
842 | address_line_added = TRUE; |
|
885970470a9b
[gaim-migrate @ 15286]
Richard Laager <rlaager@pidgin.im>
parents:
12919
diff
changeset
|
843 | } |
|
885970470a9b
[gaim-migrate @ 15286]
Richard Laager <rlaager@pidgin.im>
parents:
12919
diff
changeset
|
844 | |
|
885970470a9b
[gaim-migrate @ 15286]
Richard Laager <rlaager@pidgin.im>
parents:
12919
diff
changeset
|
845 | if(!strcmp(child2->name, "POBOX")) { |
| 7014 | 846 | g_string_append_printf(info_text, |
| 8213 | 847 | " <b>%s:</b> %s<br/>", |
| 7014 | 848 | _("P.O. Box"), text2); |
|
12933
885970470a9b
[gaim-migrate @ 15286]
Richard Laager <rlaager@pidgin.im>
parents:
12919
diff
changeset
|
849 | } else if(!strcmp(child2->name, "EXTADR")) { |
| 7014 | 850 | g_string_append_printf(info_text, |
| 8213 | 851 | " <b>%s:</b> %s<br/>", |
| 7014 | 852 | _("Extended Address"), text2); |
|
12933
885970470a9b
[gaim-migrate @ 15286]
Richard Laager <rlaager@pidgin.im>
parents:
12919
diff
changeset
|
853 | } else if(!strcmp(child2->name, "STREET")) { |
| 7014 | 854 | g_string_append_printf(info_text, |
| 8213 | 855 | " <b>%s:</b> %s<br/>", |
| 7014 | 856 | _("Street Address"), text2); |
|
12933
885970470a9b
[gaim-migrate @ 15286]
Richard Laager <rlaager@pidgin.im>
parents:
12919
diff
changeset
|
857 | } else if(!strcmp(child2->name, "LOCALITY")) { |
| 7014 | 858 | g_string_append_printf(info_text, |
| 8213 | 859 | " <b>%s:</b> %s<br/>", |
| 7014 | 860 | _("Locality"), text2); |
|
12933
885970470a9b
[gaim-migrate @ 15286]
Richard Laager <rlaager@pidgin.im>
parents:
12919
diff
changeset
|
861 | } else if(!strcmp(child2->name, "REGION")) { |
| 7014 | 862 | g_string_append_printf(info_text, |
| 8213 | 863 | " <b>%s:</b> %s<br/>", |
| 7014 | 864 | _("Region"), text2); |
|
12933
885970470a9b
[gaim-migrate @ 15286]
Richard Laager <rlaager@pidgin.im>
parents:
12919
diff
changeset
|
865 | } else if(!strcmp(child2->name, "PCODE")) { |
| 7014 | 866 | g_string_append_printf(info_text, |
| 8213 | 867 | " <b>%s:</b> %s<br/>", |
| 7014 | 868 | _("Postal Code"), text2); |
|
12933
885970470a9b
[gaim-migrate @ 15286]
Richard Laager <rlaager@pidgin.im>
parents:
12919
diff
changeset
|
869 | } else if(!strcmp(child2->name, "CTRY") |
|
885970470a9b
[gaim-migrate @ 15286]
Richard Laager <rlaager@pidgin.im>
parents:
12919
diff
changeset
|
870 | || !strcmp(child2->name, "COUNTRY")) { |
| 7014 | 871 | g_string_append_printf(info_text, |
| 8213 | 872 | " <b>%s:</b> %s<br/>", |
| 7014 | 873 | _("Country"), text2); |
| 874 | } | |
| 875 | g_free(text2); | |
| 876 | } | |
| 877 | } else if(!strcmp(child->name, "TEL")) { | |
| 878 | char *number; | |
| 879 | if((child2 = xmlnode_get_child(child, "NUMBER"))) { | |
| 880 | /* show what kind of number it is */ | |
| 881 | number = xmlnode_get_data(child2); | |
| 882 | if(number) { | |
| 883 | g_string_append_printf(info_text, | |
| 8213 | 884 | "<b>%s:</b> %s<br/>", _("Telephone"), number); |
| 7014 | 885 | g_free(number); |
| 886 | } | |
| 887 | } else if((number = xmlnode_get_data(child))) { | |
| 15884 | 888 | /* lots of clients (including purple) do this, but it's |
| 7014 | 889 | * out of spec */ |
| 890 | g_string_append_printf(info_text, | |
| 8213 | 891 | "<b>%s:</b> %s<br/>", _("Telephone"), number); |
| 7014 | 892 | g_free(number); |
| 893 | } | |
| 894 | } else if(!strcmp(child->name, "EMAIL")) { | |
| 895 | char *userid; | |
| 896 | if((child2 = xmlnode_get_child(child, "USERID"))) { | |
| 897 | /* show what kind of email it is */ | |
| 898 | userid = xmlnode_get_data(child2); | |
| 899 | if(userid) { | |
| 900 | g_string_append_printf(info_text, | |
| 8213 | 901 | "<b>%s:</b> <a href='mailto:%s'>%s</a><br/>", |
|
13546
0700f0c29e14
[gaim-migrate @ 15922]
Richard Laager <rlaager@pidgin.im>
parents:
13345
diff
changeset
|
902 | _("E-Mail"), userid, userid); |
| 7014 | 903 | g_free(userid); |
| 904 | } | |
| 905 | } else if((userid = xmlnode_get_data(child))) { | |
| 15884 | 906 | /* lots of clients (including purple) do this, but it's |
| 7014 | 907 | * out of spec */ |
| 908 | g_string_append_printf(info_text, | |
| 8213 | 909 | "<b>%s:</b> <a href='mailto:%s'>%s</a><br/>", |
|
13546
0700f0c29e14
[gaim-migrate @ 15922]
Richard Laager <rlaager@pidgin.im>
parents:
13345
diff
changeset
|
910 | _("E-Mail"), userid, userid); |
| 7014 | 911 | g_free(userid); |
| 912 | } | |
| 913 | } else if(!strcmp(child->name, "ORG")) { | |
| 914 | for(child2 = child->child; child2; child2 = child2->next) | |
| 915 | { | |
| 916 | char *text2; | |
| 917 | ||
| 8135 | 918 | if(child2->type != XMLNODE_TYPE_TAG) |
| 7014 | 919 | continue; |
| 920 | ||
| 921 | text2 = xmlnode_get_data(child2); | |
| 922 | if(text2 && !strcmp(child2->name, "ORGNAME")) { | |
| 923 | g_string_append_printf(info_text, | |
| 8213 | 924 | "<b>%s:</b> %s<br/>", |
| 7014 | 925 | _("Organization Name"), text2); |
| 926 | } else if(text2 && !strcmp(child2->name, "ORGUNIT")) { | |
| 927 | g_string_append_printf(info_text, | |
| 8213 | 928 | "<b>%s:</b> %s<br/>", |
| 7014 | 929 | _("Organization Unit"), text2); |
| 930 | } | |
| 931 | g_free(text2); | |
| 932 | } | |
| 933 | } else if(text && !strcmp(child->name, "TITLE")) { | |
| 8213 | 934 | g_string_append_printf(info_text, "<b>%s:</b> %s<br/>", |
| 7014 | 935 | _("Title"), text); |
| 936 | } else if(text && !strcmp(child->name, "ROLE")) { | |
| 8213 | 937 | g_string_append_printf(info_text, "<b>%s:</b> %s<br/>", |
| 7014 | 938 | _("Role"), text); |
| 939 | } else if(text && !strcmp(child->name, "DESC")) { | |
| 8213 | 940 | g_string_append_printf(info_text, "<b>%s:</b> %s<br/>", |
| 941 | _("Description"), text); | |
| 7076 | 942 | } else if(!strcmp(child->name, "PHOTO") || |
| 943 | !strcmp(child->name, "LOGO")) { | |
| 10941 | 944 | char *bintext = NULL; |
| 945 | xmlnode *binval; | |
| 11361 | 946 | |
| 947 | if( ((binval = xmlnode_get_child(child, "BINVAL")) && | |
| 948 | (bintext = xmlnode_get_data(binval))) || | |
| 949 | (bintext = xmlnode_get_data(child))) { | |
|
11127
5e539d9d26a4
[gaim-migrate @ 13183]
Mark Doliner <markdoliner@pidgin.im>
parents:
10941
diff
changeset
|
950 | gsize size; |
|
11137
cf40226ddff7
[gaim-migrate @ 13201]
Mark Doliner <markdoliner@pidgin.im>
parents:
11127
diff
changeset
|
951 | guchar *data; |
|
11127
5e539d9d26a4
[gaim-migrate @ 13183]
Mark Doliner <markdoliner@pidgin.im>
parents:
10941
diff
changeset
|
952 | int i; |
| 10941 | 953 | unsigned char hashval[20]; |
|
11127
5e539d9d26a4
[gaim-migrate @ 13183]
Mark Doliner <markdoliner@pidgin.im>
parents:
10941
diff
changeset
|
954 | char *p, hash[41]; |
| 10941 | 955 | gboolean photo = (strcmp(child->name, "PHOTO") == 0); |
| 10189 | 956 | |
| 15884 | 957 | data = purple_base64_decode(bintext, &size); |
|
16587
50de12a4b81b
disapproval of revision 'f95b376c0d2f066996620c5bb595dc71b5ee22d9'
Richard Laager <rlaager@pidgin.im>
parents:
16585
diff
changeset
|
958 | if (data) { |
|
50de12a4b81b
disapproval of revision 'f95b376c0d2f066996620c5bb595dc71b5ee22d9'
Richard Laager <rlaager@pidgin.im>
parents:
16585
diff
changeset
|
959 | 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
|
960 | g_string_append_printf(info_text, |
|
50de12a4b81b
disapproval of revision 'f95b376c0d2f066996620c5bb595dc71b5ee22d9'
Richard Laager <rlaager@pidgin.im>
parents:
16585
diff
changeset
|
961 | "<b>%s:</b> <img id='%d'><br/>", |
|
50de12a4b81b
disapproval of revision 'f95b376c0d2f066996620c5bb595dc71b5ee22d9'
Richard Laager <rlaager@pidgin.im>
parents:
16585
diff
changeset
|
962 | photo ? _("Photo") : _("Logo"), |
|
50de12a4b81b
disapproval of revision 'f95b376c0d2f066996620c5bb595dc71b5ee22d9'
Richard Laager <rlaager@pidgin.im>
parents:
16585
diff
changeset
|
963 | GPOINTER_TO_INT(jbi->vcard_imgids->data)); |
|
50de12a4b81b
disapproval of revision 'f95b376c0d2f066996620c5bb595dc71b5ee22d9'
Richard Laager <rlaager@pidgin.im>
parents:
16585
diff
changeset
|
964 | |
|
50de12a4b81b
disapproval of revision 'f95b376c0d2f066996620c5bb595dc71b5ee22d9'
Richard Laager <rlaager@pidgin.im>
parents:
16585
diff
changeset
|
965 | purple_cipher_digest_region("sha1", (guchar *)data, size, |
|
50de12a4b81b
disapproval of revision 'f95b376c0d2f066996620c5bb595dc71b5ee22d9'
Richard Laager <rlaager@pidgin.im>
parents:
16585
diff
changeset
|
966 | sizeof(hashval), hashval, NULL); |
|
50de12a4b81b
disapproval of revision 'f95b376c0d2f066996620c5bb595dc71b5ee22d9'
Richard Laager <rlaager@pidgin.im>
parents:
16585
diff
changeset
|
967 | p = hash; |
|
50de12a4b81b
disapproval of revision 'f95b376c0d2f066996620c5bb595dc71b5ee22d9'
Richard Laager <rlaager@pidgin.im>
parents:
16585
diff
changeset
|
968 | for(i=0; i<20; i++, p+=2) |
|
50de12a4b81b
disapproval of revision 'f95b376c0d2f066996620c5bb595dc71b5ee22d9'
Richard Laager <rlaager@pidgin.im>
parents:
16585
diff
changeset
|
969 | snprintf(p, 3, "%02x", hashval[i]); |
| 7076 | 970 | |
|
16587
50de12a4b81b
disapproval of revision 'f95b376c0d2f066996620c5bb595dc71b5ee22d9'
Richard Laager <rlaager@pidgin.im>
parents:
16585
diff
changeset
|
971 | 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
|
972 | data, size, hash); |
|
50de12a4b81b
disapproval of revision 'f95b376c0d2f066996620c5bb595dc71b5ee22d9'
Richard Laager <rlaager@pidgin.im>
parents:
16585
diff
changeset
|
973 | g_free(bintext); |
|
50de12a4b81b
disapproval of revision 'f95b376c0d2f066996620c5bb595dc71b5ee22d9'
Richard Laager <rlaager@pidgin.im>
parents:
16585
diff
changeset
|
974 | } |
| 10941 | 975 | } |
| 7014 | 976 | } |
| 977 | g_free(text); | |
| 978 | } | |
| 979 | } | |
| 980 | ||
| 15884 | 981 | jbi->vcard_text = purple_strdup_withhtml(info_text->str); |
| 13794 | 982 | g_string_free(info_text, TRUE); |
| 983 | g_free(bare_jid); | |
| 984 | ||
| 985 | jabber_buddy_info_show_if_ready(jbi); | |
| 986 | } | |
| 987 | ||
| 8213 | 988 | |
| 13794 | 989 | static void jabber_buddy_info_resource_free(gpointer data) |
| 990 | { | |
| 991 | JabberBuddyInfoResource *jbri = data; | |
| 992 | g_free(jbri); | |
| 993 | } | |
| 994 | ||
| 995 | static void jabber_version_parse(JabberStream *js, xmlnode *packet, gpointer data) | |
| 996 | { | |
| 997 | JabberBuddyInfo *jbi = data; | |
| 998 | const char *type, *id, *from; | |
| 999 | xmlnode *query; | |
| 1000 | char *resource_name; | |
| 1001 | ||
| 1002 | g_return_if_fail(jbi != NULL); | |
| 1003 | ||
| 1004 | type = xmlnode_get_attrib(packet, "type"); | |
| 1005 | id = xmlnode_get_attrib(packet, "id"); | |
| 1006 | from = xmlnode_get_attrib(packet, "from"); | |
| 7014 | 1007 | |
| 13794 | 1008 | jabber_buddy_info_remove_id(jbi, id); |
| 1009 | ||
| 1010 | if(!from) | |
| 1011 | return; | |
| 1012 | ||
| 1013 | resource_name = jabber_get_resource(from); | |
| 1014 | ||
| 1015 | if(resource_name) { | |
| 1016 | if(type && !strcmp(type, "result")) { | |
| 1017 | if((query = xmlnode_get_child(packet, "query"))) { | |
| 1018 | JabberBuddyResource *jbr = jabber_buddy_find_resource(jbi->jb, resource_name); | |
| 1019 | if(jbr) { | |
| 1020 | xmlnode *node; | |
| 1021 | if((node = xmlnode_get_child(query, "name"))) { | |
| 1022 | jbr->client.name = xmlnode_get_data(node); | |
| 1023 | } | |
| 1024 | if((node = xmlnode_get_child(query, "version"))) { | |
| 1025 | jbr->client.version = xmlnode_get_data(node); | |
| 1026 | } | |
| 1027 | if((node = xmlnode_get_child(query, "os"))) { | |
| 1028 | jbr->client.os = xmlnode_get_data(node); | |
| 1029 | } | |
| 1030 | } | |
| 1031 | } | |
| 1032 | } | |
| 1033 | g_free(resource_name); | |
| 10189 | 1034 | } |
| 13794 | 1035 | |
| 1036 | jabber_buddy_info_show_if_ready(jbi); | |
| 7014 | 1037 | } |
| 1038 | ||
| 13794 | 1039 | static void jabber_last_parse(JabberStream *js, xmlnode *packet, gpointer data) |
| 1040 | { | |
| 1041 | JabberBuddyInfo *jbi = data; | |
| 1042 | xmlnode *query; | |
| 1043 | char *resource_name; | |
| 1044 | const char *type, *id, *from, *seconds; | |
| 1045 | ||
| 1046 | g_return_if_fail(jbi != NULL); | |
| 1047 | ||
| 1048 | type = xmlnode_get_attrib(packet, "type"); | |
| 1049 | id = xmlnode_get_attrib(packet, "id"); | |
| 1050 | from = xmlnode_get_attrib(packet, "from"); | |
| 1051 | ||
| 1052 | jabber_buddy_info_remove_id(jbi, id); | |
| 1053 | ||
| 1054 | if(!from) | |
| 1055 | return; | |
| 1056 | ||
| 1057 | resource_name = jabber_get_resource(from); | |
| 1058 | ||
| 1059 | if(resource_name) { | |
| 1060 | if(type && !strcmp(type, "result")) { | |
| 1061 | if((query = xmlnode_get_child(packet, "query"))) { | |
| 1062 | seconds = xmlnode_get_attrib(query, "seconds"); | |
| 1063 | if(seconds) { | |
| 1064 | char *end = NULL; | |
| 1065 | long sec = strtol(seconds, &end, 10); | |
| 1066 | if(end != seconds) { | |
| 1067 | JabberBuddyInfoResource *jbir = g_hash_table_lookup(jbi->resources, resource_name); | |
| 1068 | if(jbir) { | |
| 1069 | jbir->idle_seconds = sec; | |
| 1070 | } | |
| 1071 | } | |
| 1072 | } | |
| 1073 | } | |
| 1074 | } | |
| 1075 | g_free(resource_name); | |
| 1076 | } | |
| 1077 | ||
| 1078 | jabber_buddy_info_show_if_ready(jbi); | |
| 1079 | } | |
| 1080 | ||
|
15363
f6b9d1e3d0cb
[gaim-migrate @ 18092]
Evan Schoenberg <evands@pidgin.im>
parents:
15273
diff
changeset
|
1081 | void jabber_buddy_remove_all_pending_buddy_info_requests(JabberStream *js) |
|
f6b9d1e3d0cb
[gaim-migrate @ 18092]
Evan Schoenberg <evands@pidgin.im>
parents:
15273
diff
changeset
|
1082 | { |
|
f6b9d1e3d0cb
[gaim-migrate @ 18092]
Evan Schoenberg <evands@pidgin.im>
parents:
15273
diff
changeset
|
1083 | if (js->pending_buddy_info_requests) |
|
f6b9d1e3d0cb
[gaim-migrate @ 18092]
Evan Schoenberg <evands@pidgin.im>
parents:
15273
diff
changeset
|
1084 | { |
|
f6b9d1e3d0cb
[gaim-migrate @ 18092]
Evan Schoenberg <evands@pidgin.im>
parents:
15273
diff
changeset
|
1085 | JabberBuddyInfo *jbi; |
|
f6b9d1e3d0cb
[gaim-migrate @ 18092]
Evan Schoenberg <evands@pidgin.im>
parents:
15273
diff
changeset
|
1086 | GSList *l = js->pending_buddy_info_requests; |
|
f6b9d1e3d0cb
[gaim-migrate @ 18092]
Evan Schoenberg <evands@pidgin.im>
parents:
15273
diff
changeset
|
1087 | while (l) { |
|
f6b9d1e3d0cb
[gaim-migrate @ 18092]
Evan Schoenberg <evands@pidgin.im>
parents:
15273
diff
changeset
|
1088 | jbi = l->data; |
|
f6b9d1e3d0cb
[gaim-migrate @ 18092]
Evan Schoenberg <evands@pidgin.im>
parents:
15273
diff
changeset
|
1089 | |
|
f6b9d1e3d0cb
[gaim-migrate @ 18092]
Evan Schoenberg <evands@pidgin.im>
parents:
15273
diff
changeset
|
1090 | g_slist_free(jbi->ids); |
|
f6b9d1e3d0cb
[gaim-migrate @ 18092]
Evan Schoenberg <evands@pidgin.im>
parents:
15273
diff
changeset
|
1091 | jabber_buddy_info_destroy(jbi); |
|
f6b9d1e3d0cb
[gaim-migrate @ 18092]
Evan Schoenberg <evands@pidgin.im>
parents:
15273
diff
changeset
|
1092 | |
|
15727
0754583ceeae
Don't access the list element after it has been freed.
Daniel Atallah <datallah@pidgin.im>
parents:
15688
diff
changeset
|
1093 | l = l->next; |
|
15363
f6b9d1e3d0cb
[gaim-migrate @ 18092]
Evan Schoenberg <evands@pidgin.im>
parents:
15273
diff
changeset
|
1094 | } |
|
f6b9d1e3d0cb
[gaim-migrate @ 18092]
Evan Schoenberg <evands@pidgin.im>
parents:
15273
diff
changeset
|
1095 | |
|
f6b9d1e3d0cb
[gaim-migrate @ 18092]
Evan Schoenberg <evands@pidgin.im>
parents:
15273
diff
changeset
|
1096 | g_slist_free(js->pending_buddy_info_requests); |
|
f6b9d1e3d0cb
[gaim-migrate @ 18092]
Evan Schoenberg <evands@pidgin.im>
parents:
15273
diff
changeset
|
1097 | js->pending_buddy_info_requests = NULL; |
|
f6b9d1e3d0cb
[gaim-migrate @ 18092]
Evan Schoenberg <evands@pidgin.im>
parents:
15273
diff
changeset
|
1098 | } |
|
f6b9d1e3d0cb
[gaim-migrate @ 18092]
Evan Schoenberg <evands@pidgin.im>
parents:
15273
diff
changeset
|
1099 | } |
|
f6b9d1e3d0cb
[gaim-migrate @ 18092]
Evan Schoenberg <evands@pidgin.im>
parents:
15273
diff
changeset
|
1100 | |
| 13794 | 1101 | static gboolean jabber_buddy_get_info_timeout(gpointer data) |
| 1102 | { | |
| 1103 | JabberBuddyInfo *jbi = data; | |
| 1104 | ||
| 1105 | /* remove the pending callbacks */ | |
| 1106 | while(jbi->ids) { | |
| 1107 | char *id = jbi->ids->data; | |
| 1108 | jabber_iq_remove_callback_by_id(jbi->js, id); | |
|
15363
f6b9d1e3d0cb
[gaim-migrate @ 18092]
Evan Schoenberg <evands@pidgin.im>
parents:
15273
diff
changeset
|
1109 | jbi->ids = g_slist_remove(jbi->ids, id); |
| 13794 | 1110 | g_free(id); |
| 1111 | } | |
| 1112 | ||
|
15363
f6b9d1e3d0cb
[gaim-migrate @ 18092]
Evan Schoenberg <evands@pidgin.im>
parents:
15273
diff
changeset
|
1113 | jbi->js->pending_buddy_info_requests = g_slist_remove(jbi->js->pending_buddy_info_requests, jbi); |
| 13794 | 1114 | jbi->timeout_handle = 0; |
| 1115 | ||
| 1116 | jabber_buddy_info_show_if_ready(jbi); | |
| 1117 | ||
| 1118 | return FALSE; | |
| 1119 | } | |
| 1120 | ||
|
17029
dea59a003028
gross hack that will save me time in 30 second chunks
Nathan Walp <nwalp@pidgin.im>
parents:
17007
diff
changeset
|
1121 | 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
|
1122 | { |
|
dea59a003028
gross hack that will save me time in 30 second chunks
Nathan Walp <nwalp@pidgin.im>
parents:
17007
diff
changeset
|
1123 | /* 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
|
1124 | 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
|
1125 | return FALSE; |
|
dea59a003028
gross hack that will save me time in 30 second chunks
Nathan Walp <nwalp@pidgin.im>
parents:
17007
diff
changeset
|
1126 | |
|
dea59a003028
gross hack that will save me time in 30 second chunks
Nathan Walp <nwalp@pidgin.im>
parents:
17007
diff
changeset
|
1127 | 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
|
1128 | if(!strcmp(jbr->client.name, "Trillian")) { |
|
dea59a003028
gross hack that will save me time in 30 second chunks
Nathan Walp <nwalp@pidgin.im>
parents:
17007
diff
changeset
|
1129 | if(!strcmp(jbr->client.version, "3.1.0.121")) { |
|
dea59a003028
gross hack that will save me time in 30 second chunks
Nathan Walp <nwalp@pidgin.im>
parents:
17007
diff
changeset
|
1130 | /* verified by nwalp 2007/05/09 */ |
|
dea59a003028
gross hack that will save me time in 30 second chunks
Nathan Walp <nwalp@pidgin.im>
parents:
17007
diff
changeset
|
1131 | return TRUE; |
|
dea59a003028
gross hack that will save me time in 30 second chunks
Nathan Walp <nwalp@pidgin.im>
parents:
17007
diff
changeset
|
1132 | } |
|
dea59a003028
gross hack that will save me time in 30 second chunks
Nathan Walp <nwalp@pidgin.im>
parents:
17007
diff
changeset
|
1133 | } |
|
dea59a003028
gross hack that will save me time in 30 second chunks
Nathan Walp <nwalp@pidgin.im>
parents:
17007
diff
changeset
|
1134 | } |
|
dea59a003028
gross hack that will save me time in 30 second chunks
Nathan Walp <nwalp@pidgin.im>
parents:
17007
diff
changeset
|
1135 | |
|
dea59a003028
gross hack that will save me time in 30 second chunks
Nathan Walp <nwalp@pidgin.im>
parents:
17007
diff
changeset
|
1136 | return FALSE; |
|
dea59a003028
gross hack that will save me time in 30 second chunks
Nathan Walp <nwalp@pidgin.im>
parents:
17007
diff
changeset
|
1137 | } |
|
dea59a003028
gross hack that will save me time in 30 second chunks
Nathan Walp <nwalp@pidgin.im>
parents:
17007
diff
changeset
|
1138 | |
| 13794 | 1139 | static void jabber_buddy_get_info_for_jid(JabberStream *js, const char *jid) |
| 7014 | 1140 | { |
| 1141 | JabberIq *iq; | |
| 1142 | xmlnode *vcard; | |
| 13794 | 1143 | GList *resources; |
| 1144 | JabberBuddy *jb; | |
| 1145 | JabberBuddyInfo *jbi; | |
| 1146 | ||
| 1147 | jb = jabber_buddy_find(js, jid, TRUE); | |
| 1148 | ||
| 1149 | /* invalid JID */ | |
| 1150 | if(!jb) | |
| 1151 | return; | |
| 1152 | ||
| 1153 | jbi = g_new0(JabberBuddyInfo, 1); | |
| 1154 | jbi->jid = g_strdup(jid); | |
| 1155 | jbi->js = js; | |
| 1156 | jbi->jb = jb; | |
| 1157 | jbi->resources = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, jabber_buddy_info_resource_free); | |
| 7014 | 1158 | |
| 1159 | iq = jabber_iq_new(js, JABBER_IQ_GET); | |
| 1160 | ||
| 13794 | 1161 | xmlnode_set_attrib(iq->node, "to", jid); |
| 7014 | 1162 | vcard = xmlnode_new_child(iq->node, "vCard"); |
| 13808 | 1163 | xmlnode_set_namespace(vcard, "vcard-temp"); |
| 7014 | 1164 | |
| 13794 | 1165 | jabber_iq_set_callback(iq, jabber_vcard_parse, jbi); |
| 1166 | jbi->ids = g_slist_prepend(jbi->ids, g_strdup(iq->id)); | |
| 7014 | 1167 | |
| 1168 | jabber_iq_send(iq); | |
| 13794 | 1169 | |
| 1170 | for(resources = jb->resources; resources; resources = resources->next) | |
| 1171 | { | |
| 1172 | JabberBuddyResource *jbr = resources->data; | |
|
14164
d85f44e1fec1
[gaim-migrate @ 16732]
Mark Doliner <markdoliner@pidgin.im>
parents:
14155
diff
changeset
|
1173 | JabberBuddyInfoResource *jbir; |
| 13794 | 1174 | char *full_jid; |
|
14164
d85f44e1fec1
[gaim-migrate @ 16732]
Mark Doliner <markdoliner@pidgin.im>
parents:
14155
diff
changeset
|
1175 | |
|
d85f44e1fec1
[gaim-migrate @ 16732]
Mark Doliner <markdoliner@pidgin.im>
parents:
14155
diff
changeset
|
1176 | if ((strchr(jid, '/') == NULL) && (jbr->name != NULL)) { |
|
d85f44e1fec1
[gaim-migrate @ 16732]
Mark Doliner <markdoliner@pidgin.im>
parents:
14155
diff
changeset
|
1177 | full_jid = g_strdup_printf("%s/%s", jid, jbr->name); |
|
d85f44e1fec1
[gaim-migrate @ 16732]
Mark Doliner <markdoliner@pidgin.im>
parents:
14155
diff
changeset
|
1178 | } else { |
| 13794 | 1179 | full_jid = g_strdup(jid); |
| 1180 | } | |
| 1181 | ||
|
14164
d85f44e1fec1
[gaim-migrate @ 16732]
Mark Doliner <markdoliner@pidgin.im>
parents:
14155
diff
changeset
|
1182 | if (jbr->name != NULL) |
|
d85f44e1fec1
[gaim-migrate @ 16732]
Mark Doliner <markdoliner@pidgin.im>
parents:
14155
diff
changeset
|
1183 | { |
|
d85f44e1fec1
[gaim-migrate @ 16732]
Mark Doliner <markdoliner@pidgin.im>
parents:
14155
diff
changeset
|
1184 | jbir = g_new0(JabberBuddyInfoResource, 1); |
|
d85f44e1fec1
[gaim-migrate @ 16732]
Mark Doliner <markdoliner@pidgin.im>
parents:
14155
diff
changeset
|
1185 | g_hash_table_insert(jbi->resources, g_strdup(jbr->name), jbir); |
|
d85f44e1fec1
[gaim-migrate @ 16732]
Mark Doliner <markdoliner@pidgin.im>
parents:
14155
diff
changeset
|
1186 | } |
| 13794 | 1187 | |
| 1188 | if(!jbr->client.name) { | |
| 1189 | iq = jabber_iq_new_query(js, JABBER_IQ_GET, "jabber:iq:version"); | |
| 1190 | xmlnode_set_attrib(iq->node, "to", full_jid); | |
| 1191 | jabber_iq_set_callback(iq, jabber_version_parse, jbi); | |
| 1192 | jbi->ids = g_slist_prepend(jbi->ids, g_strdup(iq->id)); | |
| 1193 | jabber_iq_send(iq); | |
| 1194 | } | |
| 1195 | ||
|
17029
dea59a003028
gross hack that will save me time in 30 second chunks
Nathan Walp <nwalp@pidgin.im>
parents:
17007
diff
changeset
|
1196 | /* 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
|
1197 | * to get info on a friend running Trillian, which doesn't |
| 17051 | 1198 | * 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
|
1199 | * 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
|
1200 | * office. */ |
|
dea59a003028
gross hack that will save me time in 30 second chunks
Nathan Walp <nwalp@pidgin.im>
parents:
17007
diff
changeset
|
1201 | 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
|
1202 | 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
|
1203 | 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
|
1204 | 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
|
1205 | 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
|
1206 | 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
|
1207 | } |
| 13794 | 1208 | |
| 1209 | g_free(full_jid); | |
| 1210 | } | |
| 1211 | ||
|
15363
f6b9d1e3d0cb
[gaim-migrate @ 18092]
Evan Schoenberg <evands@pidgin.im>
parents:
15273
diff
changeset
|
1212 | js->pending_buddy_info_requests = g_slist_prepend(js->pending_buddy_info_requests, jbi); |
| 15884 | 1213 | jbi->timeout_handle = purple_timeout_add(30000, jabber_buddy_get_info_timeout, jbi); |
| 7014 | 1214 | } |
| 1215 | ||
| 15884 | 1216 | void jabber_buddy_get_info(PurpleConnection *gc, const char *who) |
| 10189 | 1217 | { |
| 1218 | JabberStream *js = gc->proto_data; | |
| 1219 | char *bare_jid = jabber_get_bare_jid(who); | |
| 1220 | ||
| 1221 | if(bare_jid) { | |
| 1222 | jabber_buddy_get_info_for_jid(js, bare_jid); | |
| 1223 | g_free(bare_jid); | |
| 1224 | } | |
| 1225 | } | |
| 1226 | ||
| 15884 | 1227 | void jabber_buddy_get_info_chat(PurpleConnection *gc, int id, |
| 7014 | 1228 | const char *resource) |
| 1229 | { | |
| 1230 | JabberStream *js = gc->proto_data; | |
| 1231 | JabberChat *chat = jabber_chat_find_by_id(js, id); | |
| 1232 | char *full_jid; | |
| 1233 | ||
| 1234 | if(!chat) | |
| 1235 | return; | |
| 1236 | ||
| 1237 | full_jid = g_strdup_printf("%s@%s/%s", chat->room, chat->server, resource); | |
| 10189 | 1238 | jabber_buddy_get_info_for_jid(js, full_jid); |
| 7014 | 1239 | g_free(full_jid); |
| 1240 | } | |
| 1241 | ||
| 7395 | 1242 | |
| 7014 | 1243 | static void jabber_buddy_set_invisibility(JabberStream *js, const char *who, |
| 1244 | gboolean invisible) | |
| 1245 | { | |
| 15884 | 1246 | PurplePresence *gpresence; |
| 1247 | PurpleAccount *account; | |
| 1248 | PurpleStatus *status; | |
| 7014 | 1249 | JabberBuddy *jb = jabber_buddy_find(js, who, TRUE); |
| 1250 | xmlnode *presence; | |
| 9954 | 1251 | JabberBuddyState state; |
| 14525 | 1252 | char *msg; |
| 9954 | 1253 | int priority; |
| 7014 | 1254 | |
| 15884 | 1255 | account = purple_connection_get_account(js->gc); |
| 1256 | gpresence = purple_account_get_presence(account); | |
| 1257 | status = purple_presence_get_active_status(gpresence); | |
|
9944
71ef020ec4b0
[gaim-migrate @ 10838]
Christian Hammond <chipx86@chipx86.com>
parents:
9797
diff
changeset
|
1258 | |
| 15884 | 1259 | 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
|
1260 | presence = jabber_presence_create_js(js, state, msg, priority); |
| 9954 | 1261 | |
| 14525 | 1262 | g_free(msg); |
| 1263 | ||
| 7014 | 1264 | xmlnode_set_attrib(presence, "to", who); |
| 1265 | if(invisible) { | |
| 1266 | xmlnode_set_attrib(presence, "type", "invisible"); | |
| 1267 | jb->invisible |= JABBER_INVIS_BUDDY; | |
| 1268 | } else { | |
| 1269 | jb->invisible &= ~JABBER_INVIS_BUDDY; | |
| 1270 | } | |
| 1271 | ||
| 1272 | jabber_send(js, presence); | |
| 1273 | xmlnode_free(presence); | |
| 1274 | } | |
| 1275 | ||
| 15884 | 1276 | static void jabber_buddy_make_invisible(PurpleBlistNode *node, gpointer data) |
| 7014 | 1277 | { |
| 15884 | 1278 | PurpleBuddy *buddy; |
| 1279 | PurpleConnection *gc; | |
|
9030
7b574a641391
[gaim-migrate @ 9806]
Mark Doliner <markdoliner@pidgin.im>
parents:
9015
diff
changeset
|
1280 | JabberStream *js; |
|
7b574a641391
[gaim-migrate @ 9806]
Mark Doliner <markdoliner@pidgin.im>
parents:
9015
diff
changeset
|
1281 | |
| 15884 | 1282 | g_return_if_fail(PURPLE_BLIST_NODE_IS_BUDDY(node)); |
|
9030
7b574a641391
[gaim-migrate @ 9806]
Mark Doliner <markdoliner@pidgin.im>
parents:
9015
diff
changeset
|
1283 | |
| 15884 | 1284 | buddy = (PurpleBuddy *) node; |
| 1285 | gc = purple_account_get_connection(buddy->account); | |
|
9030
7b574a641391
[gaim-migrate @ 9806]
Mark Doliner <markdoliner@pidgin.im>
parents:
9015
diff
changeset
|
1286 | js = gc->proto_data; |
|
7b574a641391
[gaim-migrate @ 9806]
Mark Doliner <markdoliner@pidgin.im>
parents:
9015
diff
changeset
|
1287 | |
|
7b574a641391
[gaim-migrate @ 9806]
Mark Doliner <markdoliner@pidgin.im>
parents:
9015
diff
changeset
|
1288 | jabber_buddy_set_invisibility(js, buddy->name, TRUE); |
| 7014 | 1289 | } |
| 1290 | ||
| 15884 | 1291 | static void jabber_buddy_make_visible(PurpleBlistNode *node, gpointer data) |
| 7014 | 1292 | { |
| 15884 | 1293 | PurpleBuddy *buddy; |
| 1294 | PurpleConnection *gc; | |
|
9030
7b574a641391
[gaim-migrate @ 9806]
Mark Doliner <markdoliner@pidgin.im>
parents:
9015
diff
changeset
|
1295 | JabberStream *js; |
| 7014 | 1296 | |
| 15884 | 1297 | g_return_if_fail(PURPLE_BLIST_NODE_IS_BUDDY(node)); |
| 7014 | 1298 | |
| 15884 | 1299 | buddy = (PurpleBuddy *) node; |
| 1300 | gc = purple_account_get_connection(buddy->account); | |
|
9030
7b574a641391
[gaim-migrate @ 9806]
Mark Doliner <markdoliner@pidgin.im>
parents:
9015
diff
changeset
|
1301 | js = gc->proto_data; |
|
7b574a641391
[gaim-migrate @ 9806]
Mark Doliner <markdoliner@pidgin.im>
parents:
9015
diff
changeset
|
1302 | |
|
7b574a641391
[gaim-migrate @ 9806]
Mark Doliner <markdoliner@pidgin.im>
parents:
9015
diff
changeset
|
1303 | jabber_buddy_set_invisibility(js, buddy->name, FALSE); |
| 7014 | 1304 | } |
| 1305 | ||
| 15884 | 1306 | static void jabber_buddy_cancel_presence_notification(PurpleBlistNode *node, |
|
9030
7b574a641391
[gaim-migrate @ 9806]
Mark Doliner <markdoliner@pidgin.im>
parents:
9015
diff
changeset
|
1307 | gpointer data) |
| 7014 | 1308 | { |
| 15884 | 1309 | PurpleBuddy *buddy; |
| 1310 | PurpleConnection *gc; | |
|
9030
7b574a641391
[gaim-migrate @ 9806]
Mark Doliner <markdoliner@pidgin.im>
parents:
9015
diff
changeset
|
1311 | JabberStream *js; |
|
7b574a641391
[gaim-migrate @ 9806]
Mark Doliner <markdoliner@pidgin.im>
parents:
9015
diff
changeset
|
1312 | |
| 15884 | 1313 | g_return_if_fail(PURPLE_BLIST_NODE_IS_BUDDY(node)); |
| 7014 | 1314 | |
| 15884 | 1315 | buddy = (PurpleBuddy *) node; |
| 1316 | gc = purple_account_get_connection(buddy->account); | |
|
9030
7b574a641391
[gaim-migrate @ 9806]
Mark Doliner <markdoliner@pidgin.im>
parents:
9015
diff
changeset
|
1317 | js = gc->proto_data; |
|
7b574a641391
[gaim-migrate @ 9806]
Mark Doliner <markdoliner@pidgin.im>
parents:
9015
diff
changeset
|
1318 | |
|
7b574a641391
[gaim-migrate @ 9806]
Mark Doliner <markdoliner@pidgin.im>
parents:
9015
diff
changeset
|
1319 | /* I wonder if we should prompt the user before doing this */ |
|
7b574a641391
[gaim-migrate @ 9806]
Mark Doliner <markdoliner@pidgin.im>
parents:
9015
diff
changeset
|
1320 | jabber_presence_subscription_set(js, buddy->name, "unsubscribed"); |
| 7014 | 1321 | } |
| 1322 | ||
| 15884 | 1323 | static void jabber_buddy_rerequest_auth(PurpleBlistNode *node, gpointer data) |
| 7250 | 1324 | { |
| 15884 | 1325 | PurpleBuddy *buddy; |
| 1326 | PurpleConnection *gc; | |
|
9030
7b574a641391
[gaim-migrate @ 9806]
Mark Doliner <markdoliner@pidgin.im>
parents:
9015
diff
changeset
|
1327 | JabberStream *js; |
|
7b574a641391
[gaim-migrate @ 9806]
Mark Doliner <markdoliner@pidgin.im>
parents:
9015
diff
changeset
|
1328 | |
| 15884 | 1329 | g_return_if_fail(PURPLE_BLIST_NODE_IS_BUDDY(node)); |
| 7250 | 1330 | |
| 15884 | 1331 | buddy = (PurpleBuddy *) node; |
| 1332 | gc = purple_account_get_connection(buddy->account); | |
|
9030
7b574a641391
[gaim-migrate @ 9806]
Mark Doliner <markdoliner@pidgin.im>
parents:
9015
diff
changeset
|
1333 | js = gc->proto_data; |
|
7b574a641391
[gaim-migrate @ 9806]
Mark Doliner <markdoliner@pidgin.im>
parents:
9015
diff
changeset
|
1334 | |
|
7b574a641391
[gaim-migrate @ 9806]
Mark Doliner <markdoliner@pidgin.im>
parents:
9015
diff
changeset
|
1335 | jabber_presence_subscription_set(js, buddy->name, "subscribe"); |
| 7250 | 1336 | } |
| 1337 | ||
|
9030
7b574a641391
[gaim-migrate @ 9806]
Mark Doliner <markdoliner@pidgin.im>
parents:
9015
diff
changeset
|
1338 | |
| 15884 | 1339 | static void jabber_buddy_unsubscribe(PurpleBlistNode *node, gpointer data) |
| 7014 | 1340 | { |
| 15884 | 1341 | PurpleBuddy *buddy; |
| 1342 | PurpleConnection *gc; | |
|
9030
7b574a641391
[gaim-migrate @ 9806]
Mark Doliner <markdoliner@pidgin.im>
parents:
9015
diff
changeset
|
1343 | JabberStream *js; |
|
7b574a641391
[gaim-migrate @ 9806]
Mark Doliner <markdoliner@pidgin.im>
parents:
9015
diff
changeset
|
1344 | |
| 15884 | 1345 | g_return_if_fail(PURPLE_BLIST_NODE_IS_BUDDY(node)); |
|
9030
7b574a641391
[gaim-migrate @ 9806]
Mark Doliner <markdoliner@pidgin.im>
parents:
9015
diff
changeset
|
1346 | |
| 15884 | 1347 | buddy = (PurpleBuddy *) node; |
| 1348 | gc = purple_account_get_connection(buddy->account); | |
|
9030
7b574a641391
[gaim-migrate @ 9806]
Mark Doliner <markdoliner@pidgin.im>
parents:
9015
diff
changeset
|
1349 | js = gc->proto_data; |
|
7b574a641391
[gaim-migrate @ 9806]
Mark Doliner <markdoliner@pidgin.im>
parents:
9015
diff
changeset
|
1350 | |
|
7b574a641391
[gaim-migrate @ 9806]
Mark Doliner <markdoliner@pidgin.im>
parents:
9015
diff
changeset
|
1351 | jabber_presence_subscription_set(js, buddy->name, "unsubscribe"); |
|
7b574a641391
[gaim-migrate @ 9806]
Mark Doliner <markdoliner@pidgin.im>
parents:
9015
diff
changeset
|
1352 | } |
|
7b574a641391
[gaim-migrate @ 9806]
Mark Doliner <markdoliner@pidgin.im>
parents:
9015
diff
changeset
|
1353 | |
|
7b574a641391
[gaim-migrate @ 9806]
Mark Doliner <markdoliner@pidgin.im>
parents:
9015
diff
changeset
|
1354 | |
| 15884 | 1355 | static GList *jabber_buddy_menu(PurpleBuddy *buddy) |
|
9030
7b574a641391
[gaim-migrate @ 9806]
Mark Doliner <markdoliner@pidgin.im>
parents:
9015
diff
changeset
|
1356 | { |
| 15884 | 1357 | PurpleConnection *gc = purple_account_get_connection(buddy->account); |
|
9030
7b574a641391
[gaim-migrate @ 9806]
Mark Doliner <markdoliner@pidgin.im>
parents:
9015
diff
changeset
|
1358 | JabberStream *js = gc->proto_data; |
|
7b574a641391
[gaim-migrate @ 9806]
Mark Doliner <markdoliner@pidgin.im>
parents:
9015
diff
changeset
|
1359 | JabberBuddy *jb = jabber_buddy_find(js, buddy->name, TRUE); |
|
7b574a641391
[gaim-migrate @ 9806]
Mark Doliner <markdoliner@pidgin.im>
parents:
9015
diff
changeset
|
1360 | |
| 7014 | 1361 | GList *m = NULL; |
| 15884 | 1362 | PurpleMenuAction *act; |
| 7395 | 1363 | |
| 1364 | if(!jb) | |
| 1365 | return m; | |
| 1366 | ||
| 8185 | 1367 | /* XXX: fix the NOT ME below */ |
| 1368 | ||
| 1369 | if(js->protocol_version == JABBER_PROTO_0_9 /* && NOT ME */) { | |
| 8166 | 1370 | if(jb->invisible & JABBER_INVIS_BUDDY) { |
| 15884 | 1371 | act = purple_menu_action_new(_("Un-hide From"), |
| 1372 | PURPLE_CALLBACK(jabber_buddy_make_visible), | |
| 12919 | 1373 | NULL, NULL); |
| 8166 | 1374 | } else { |
| 15884 | 1375 | act = purple_menu_action_new(_("Temporarily Hide From"), |
| 1376 | PURPLE_CALLBACK(jabber_buddy_make_invisible), | |
| 13019 | 1377 | NULL, NULL); |
| 8166 | 1378 | } |
|
9030
7b574a641391
[gaim-migrate @ 9806]
Mark Doliner <markdoliner@pidgin.im>
parents:
9015
diff
changeset
|
1379 | m = g_list_append(m, act); |
| 7014 | 1380 | } |
| 1381 | ||
| 8185 | 1382 | if(jb->subscription & JABBER_SUB_FROM /* && NOT ME */) { |
| 15884 | 1383 | act = purple_menu_action_new(_("Cancel Presence Notification"), |
| 1384 | PURPLE_CALLBACK(jabber_buddy_cancel_presence_notification), | |
| 12919 | 1385 | NULL, NULL); |
|
9030
7b574a641391
[gaim-migrate @ 9806]
Mark Doliner <markdoliner@pidgin.im>
parents:
9015
diff
changeset
|
1386 | m = g_list_append(m, act); |
| 7014 | 1387 | } |
| 1388 | ||
| 1389 | if(!(jb->subscription & JABBER_SUB_TO)) { | |
| 15884 | 1390 | act = purple_menu_action_new(_("(Re-)Request authorization"), |
| 1391 | PURPLE_CALLBACK(jabber_buddy_rerequest_auth), | |
| 12919 | 1392 | NULL, NULL); |
|
9030
7b574a641391
[gaim-migrate @ 9806]
Mark Doliner <markdoliner@pidgin.im>
parents:
9015
diff
changeset
|
1393 | m = g_list_append(m, act); |
|
7b574a641391
[gaim-migrate @ 9806]
Mark Doliner <markdoliner@pidgin.im>
parents:
9015
diff
changeset
|
1394 | |
| 8185 | 1395 | } else /* if(NOT ME) */{ |
|
9030
7b574a641391
[gaim-migrate @ 9806]
Mark Doliner <markdoliner@pidgin.im>
parents:
9015
diff
changeset
|
1396 | |
|
7b574a641391
[gaim-migrate @ 9806]
Mark Doliner <markdoliner@pidgin.im>
parents:
9015
diff
changeset
|
1397 | /* shouldn't this just happen automatically when the buddy is |
|
7b574a641391
[gaim-migrate @ 9806]
Mark Doliner <markdoliner@pidgin.im>
parents:
9015
diff
changeset
|
1398 | removed? */ |
| 15884 | 1399 | act = purple_menu_action_new(_("Unsubscribe"), |
| 1400 | PURPLE_CALLBACK(jabber_buddy_unsubscribe), | |
| 12919 | 1401 | NULL, NULL); |
|
9030
7b574a641391
[gaim-migrate @ 9806]
Mark Doliner <markdoliner@pidgin.im>
parents:
9015
diff
changeset
|
1402 | m = g_list_append(m, act); |
| 7014 | 1403 | } |
| 1404 | ||
| 1405 | return m; | |
| 1406 | } | |
|
9030
7b574a641391
[gaim-migrate @ 9806]
Mark Doliner <markdoliner@pidgin.im>
parents:
9015
diff
changeset
|
1407 | |
|
7b574a641391
[gaim-migrate @ 9806]
Mark Doliner <markdoliner@pidgin.im>
parents:
9015
diff
changeset
|
1408 | GList * |
| 15884 | 1409 | jabber_blist_node_menu(PurpleBlistNode *node) |
|
9030
7b574a641391
[gaim-migrate @ 9806]
Mark Doliner <markdoliner@pidgin.im>
parents:
9015
diff
changeset
|
1410 | { |
| 15884 | 1411 | if(PURPLE_BLIST_NODE_IS_BUDDY(node)) { |
| 1412 | return jabber_buddy_menu((PurpleBuddy *) node); | |
|
9030
7b574a641391
[gaim-migrate @ 9806]
Mark Doliner <markdoliner@pidgin.im>
parents:
9015
diff
changeset
|
1413 | } else { |
|
7b574a641391
[gaim-migrate @ 9806]
Mark Doliner <markdoliner@pidgin.im>
parents:
9015
diff
changeset
|
1414 | return NULL; |
|
7b574a641391
[gaim-migrate @ 9806]
Mark Doliner <markdoliner@pidgin.im>
parents:
9015
diff
changeset
|
1415 | } |
|
7b574a641391
[gaim-migrate @ 9806]
Mark Doliner <markdoliner@pidgin.im>
parents:
9015
diff
changeset
|
1416 | } |
|
7b574a641391
[gaim-migrate @ 9806]
Mark Doliner <markdoliner@pidgin.im>
parents:
9015
diff
changeset
|
1417 | |
|
7b574a641391
[gaim-migrate @ 9806]
Mark Doliner <markdoliner@pidgin.im>
parents:
9015
diff
changeset
|
1418 | |
| 9954 | 1419 | const char * |
| 1420 | jabber_buddy_state_get_name(JabberBuddyState state) | |
| 1421 | { | |
| 1422 | switch(state) { | |
| 1423 | case JABBER_BUDDY_STATE_UNKNOWN: | |
| 1424 | return _("Unknown"); | |
| 1425 | case JABBER_BUDDY_STATE_ERROR: | |
| 1426 | return _("Error"); | |
| 1427 | case JABBER_BUDDY_STATE_UNAVAILABLE: | |
| 1428 | return _("Offline"); | |
| 1429 | case JABBER_BUDDY_STATE_ONLINE: | |
|
12467
94948d1eb8cf
[gaim-migrate @ 14777]
Richard Laager <rlaager@pidgin.im>
parents:
12323
diff
changeset
|
1430 | return _("Available"); |
| 9954 | 1431 | case JABBER_BUDDY_STATE_CHAT: |
| 1432 | return _("Chatty"); | |
| 1433 | case JABBER_BUDDY_STATE_AWAY: | |
| 1434 | return _("Away"); | |
| 1435 | case JABBER_BUDDY_STATE_XA: | |
| 1436 | return _("Extended Away"); | |
| 1437 | case JABBER_BUDDY_STATE_DND: | |
| 1438 | return _("Do Not Disturb"); | |
| 1439 | } | |
| 1440 | ||
| 1441 | return _("Unknown"); | |
| 1442 | } | |
| 1443 | ||
| 1444 | JabberBuddyState jabber_buddy_status_id_get_state(const char *id) { | |
| 1445 | if(!id) | |
| 1446 | return JABBER_BUDDY_STATE_UNKNOWN; | |
|
11540
ad0321374664
[gaim-migrate @ 13795]
Mark Doliner <markdoliner@pidgin.im>
parents:
11533
diff
changeset
|
1447 | if(!strcmp(id, "available")) |
| 9954 | 1448 | return JABBER_BUDDY_STATE_ONLINE; |
| 12683 | 1449 | if(!strcmp(id, "freeforchat")) |
| 1450 | return JABBER_BUDDY_STATE_CHAT; | |
| 1451 | if(!strcmp(id, "away")) | |
| 1452 | return JABBER_BUDDY_STATE_AWAY; | |
| 1453 | if(!strcmp(id, "extended_away")) | |
| 1454 | return JABBER_BUDDY_STATE_XA; | |
| 1455 | if(!strcmp(id, "dnd")) | |
| 1456 | return JABBER_BUDDY_STATE_DND; | |
| 1457 | if(!strcmp(id, "offline")) | |
| 1458 | return JABBER_BUDDY_STATE_UNAVAILABLE; | |
| 1459 | if(!strcmp(id, "error")) | |
| 1460 | return JABBER_BUDDY_STATE_ERROR; | |
| 1461 | ||
| 1462 | return JABBER_BUDDY_STATE_UNKNOWN; | |
| 1463 | } | |
| 1464 | ||
| 1465 | JabberBuddyState jabber_buddy_show_get_state(const char *id) { | |
| 1466 | if(!id) | |
| 1467 | return JABBER_BUDDY_STATE_UNKNOWN; | |
| 1468 | if(!strcmp(id, "available")) | |
| 1469 | return JABBER_BUDDY_STATE_ONLINE; | |
| 9954 | 1470 | if(!strcmp(id, "chat")) |
| 1471 | return JABBER_BUDDY_STATE_CHAT; | |
| 1472 | if(!strcmp(id, "away")) | |
| 1473 | return JABBER_BUDDY_STATE_AWAY; | |
| 1474 | if(!strcmp(id, "xa")) | |
| 1475 | return JABBER_BUDDY_STATE_XA; | |
| 1476 | if(!strcmp(id, "dnd")) | |
| 1477 | return JABBER_BUDDY_STATE_DND; | |
| 1478 | if(!strcmp(id, "offline")) | |
| 1479 | return JABBER_BUDDY_STATE_UNAVAILABLE; | |
| 1480 | if(!strcmp(id, "error")) | |
| 1481 | return JABBER_BUDDY_STATE_ERROR; | |
| 1482 | ||
| 1483 | return JABBER_BUDDY_STATE_UNKNOWN; | |
| 1484 | } | |
| 1485 | ||
| 12683 | 1486 | const char *jabber_buddy_state_get_show(JabberBuddyState state) { |
| 9954 | 1487 | switch(state) { |
| 1488 | case JABBER_BUDDY_STATE_CHAT: | |
| 1489 | return "chat"; | |
| 1490 | case JABBER_BUDDY_STATE_AWAY: | |
| 1491 | return "away"; | |
| 1492 | case JABBER_BUDDY_STATE_XA: | |
| 1493 | return "xa"; | |
| 1494 | case JABBER_BUDDY_STATE_DND: | |
| 1495 | return "dnd"; | |
| 1496 | case JABBER_BUDDY_STATE_ONLINE: | |
|
11540
ad0321374664
[gaim-migrate @ 13795]
Mark Doliner <markdoliner@pidgin.im>
parents:
11533
diff
changeset
|
1497 | return "available"; |
| 9954 | 1498 | case JABBER_BUDDY_STATE_UNKNOWN: |
| 1499 | case JABBER_BUDDY_STATE_ERROR: | |
| 1500 | return NULL; | |
| 1501 | case JABBER_BUDDY_STATE_UNAVAILABLE: | |
| 1502 | return "offline"; | |
| 1503 | } | |
| 1504 | return NULL; | |
| 1505 | } | |
| 11675 | 1506 | |
| 12683 | 1507 | const char *jabber_buddy_state_get_status_id(JabberBuddyState state) { |
| 1508 | switch(state) { | |
| 1509 | case JABBER_BUDDY_STATE_CHAT: | |
| 1510 | return "freeforchat"; | |
| 1511 | case JABBER_BUDDY_STATE_AWAY: | |
| 1512 | return "away"; | |
| 1513 | case JABBER_BUDDY_STATE_XA: | |
| 1514 | return "extended_away"; | |
| 1515 | case JABBER_BUDDY_STATE_DND: | |
| 1516 | return "dnd"; | |
| 1517 | case JABBER_BUDDY_STATE_ONLINE: | |
| 1518 | return "available"; | |
| 1519 | case JABBER_BUDDY_STATE_UNKNOWN: | |
| 13758 | 1520 | return "available"; |
| 12683 | 1521 | case JABBER_BUDDY_STATE_ERROR: |
| 13758 | 1522 | return "error"; |
| 12683 | 1523 | case JABBER_BUDDY_STATE_UNAVAILABLE: |
| 1524 | return "offline"; | |
| 1525 | } | |
| 1526 | return NULL; | |
| 1527 | } | |
| 1528 | ||
| 15884 | 1529 | static void user_search_result_add_buddy_cb(PurpleConnection *gc, GList *row, void *user_data) |
| 11675 | 1530 | { |
| 1531 | /* XXX find out the jid */ | |
| 15884 | 1532 | purple_blist_request_add_buddy(purple_connection_get_account(gc), |
| 11675 | 1533 | g_list_nth_data(row, 0), NULL, NULL); |
| 1534 | } | |
| 1535 | ||
| 1536 | static void user_search_result_cb(JabberStream *js, xmlnode *packet, gpointer data) | |
| 1537 | { | |
| 15884 | 1538 | PurpleNotifySearchResults *results; |
| 1539 | PurpleNotifySearchColumn *column; | |
| 11675 | 1540 | xmlnode *x, *query, *item, *field; |
| 1541 | ||
| 1542 | /* XXX error checking? */ | |
| 1543 | if(!(query = xmlnode_get_child(packet, "query"))) | |
| 1544 | return; | |
| 1545 | ||
| 15884 | 1546 | results = purple_notify_searchresults_new(); |
| 11675 | 1547 | if((x = xmlnode_get_child_with_namespace(query, "x", "jabber:x:data"))) { |
| 1548 | xmlnode *reported; | |
| 15884 | 1549 | purple_debug_info("jabber", "new-skool\n"); |
| 11675 | 1550 | if((reported = xmlnode_get_child(x, "reported"))) { |
| 1551 | xmlnode *field = xmlnode_get_child(reported, "field"); | |
| 1552 | while(field) { | |
| 1553 | /* XXX keep track of this order, use it below */ | |
| 1554 | const char *var = xmlnode_get_attrib(field, "var"); | |
| 1555 | const char *label = xmlnode_get_attrib(field, "label"); | |
| 1556 | if(var) { | |
| 15884 | 1557 | column = purple_notify_searchresults_column_new(label ? label : var); |
| 1558 | purple_notify_searchresults_column_add(results, column); | |
| 11675 | 1559 | } |
| 1560 | field = xmlnode_get_next_twin(field); | |
| 1561 | } | |
| 1562 | } | |
| 1563 | item = xmlnode_get_child(x, "item"); | |
| 1564 | while(item) { | |
| 1565 | GList *row = NULL; | |
| 1566 | field = xmlnode_get_child(item, "field"); | |
| 1567 | while(field) { | |
| 13345 | 1568 | xmlnode *valuenode = xmlnode_get_child(field, "value"); |
| 11675 | 1569 | if(valuenode) { |
| 1570 | char *value = xmlnode_get_data(valuenode); | |
| 1571 | row = g_list_append(row, value); | |
| 1572 | } | |
| 1573 | field = xmlnode_get_next_twin(field); | |
| 1574 | } | |
| 15884 | 1575 | purple_notify_searchresults_row_add(results, row); |
| 11675 | 1576 | |
| 1577 | item = xmlnode_get_next_twin(item); | |
| 1578 | } | |
| 1579 | } else { | |
| 1580 | /* old skool */ | |
| 15884 | 1581 | purple_debug_info("jabber", "old-skool\n"); |
| 11675 | 1582 | |
| 15884 | 1583 | column = purple_notify_searchresults_column_new(_("JID")); |
| 1584 | purple_notify_searchresults_column_add(results, column); | |
| 1585 | column = purple_notify_searchresults_column_new(_("First Name")); | |
| 1586 | purple_notify_searchresults_column_add(results, column); | |
| 1587 | column = purple_notify_searchresults_column_new(_("Last Name")); | |
| 1588 | purple_notify_searchresults_column_add(results, column); | |
| 1589 | column = purple_notify_searchresults_column_new(_("Nickname")); | |
| 1590 | purple_notify_searchresults_column_add(results, column); | |
| 1591 | column = purple_notify_searchresults_column_new(_("E-Mail")); | |
| 1592 | purple_notify_searchresults_column_add(results, column); | |
| 11675 | 1593 | |
| 1594 | for(item = xmlnode_get_child(query, "item"); item; item = xmlnode_get_next_twin(item)) { | |
| 1595 | const char *jid; | |
| 1596 | xmlnode *node; | |
| 1597 | GList *row = NULL; | |
| 1598 | ||
| 1599 | if(!(jid = xmlnode_get_attrib(item, "jid"))) | |
| 1600 | continue; | |
| 1601 | ||
| 1602 | row = g_list_append(row, g_strdup(jid)); | |
| 1603 | node = xmlnode_get_child(item, "first"); | |
| 1604 | row = g_list_append(row, node ? xmlnode_get_data(node) : NULL); | |
| 1605 | node = xmlnode_get_child(item, "last"); | |
| 1606 | row = g_list_append(row, node ? xmlnode_get_data(node) : NULL); | |
| 1607 | node = xmlnode_get_child(item, "nick"); | |
| 1608 | row = g_list_append(row, node ? xmlnode_get_data(node) : NULL); | |
| 1609 | node = xmlnode_get_child(item, "email"); | |
| 1610 | row = g_list_append(row, node ? xmlnode_get_data(node) : NULL); | |
| 15884 | 1611 | purple_debug_info("jabber", "row=%d\n", row); |
| 1612 | purple_notify_searchresults_row_add(results, row); | |
| 11675 | 1613 | } |
| 1614 | } | |
| 1615 | ||
| 15884 | 1616 | purple_notify_searchresults_button_add(results, PURPLE_NOTIFY_BUTTON_ADD, |
| 11675 | 1617 | user_search_result_add_buddy_cb); |
| 1618 | ||
| 15884 | 1619 | purple_notify_searchresults(js->gc, NULL, NULL, _("The following are the results of your search"), results, NULL, NULL); |
| 11675 | 1620 | } |
| 1621 | ||
| 1622 | static void user_search_x_data_cb(JabberStream *js, xmlnode *result, gpointer data) | |
| 1623 | { | |
| 1624 | xmlnode *query; | |
| 1625 | JabberIq *iq; | |
| 13345 | 1626 | char *dir_server = data; |
| 11675 | 1627 | |
| 1628 | iq = jabber_iq_new_query(js, JABBER_IQ_SET, "jabber:iq:search"); | |
| 1629 | query = xmlnode_get_child(iq->node, "query"); | |
| 1630 | ||
| 1631 | xmlnode_insert_child(query, result); | |
| 1632 | ||
| 1633 | jabber_iq_set_callback(iq, user_search_result_cb, NULL); | |
| 13345 | 1634 | xmlnode_set_attrib(iq->node, "to", dir_server); |
| 11675 | 1635 | jabber_iq_send(iq); |
| 13345 | 1636 | g_free(dir_server); |
| 11675 | 1637 | } |
| 1638 | ||
| 1639 | struct user_search_info { | |
| 1640 | JabberStream *js; | |
| 1641 | char *directory_server; | |
| 1642 | }; | |
| 1643 | ||
| 15884 | 1644 | static void user_search_cancel_cb(struct user_search_info *usi, PurpleRequestFields *fields) |
| 11675 | 1645 | { |
| 1646 | g_free(usi->directory_server); | |
| 1647 | g_free(usi); | |
| 1648 | } | |
| 1649 | ||
| 15884 | 1650 | static void user_search_cb(struct user_search_info *usi, PurpleRequestFields *fields) |
| 11675 | 1651 | { |
| 1652 | JabberStream *js = usi->js; | |
| 1653 | JabberIq *iq; | |
| 1654 | xmlnode *query; | |
| 1655 | GList *groups, *flds; | |
| 1656 | ||
| 1657 | iq = jabber_iq_new_query(js, JABBER_IQ_SET, "jabber:iq:search"); | |
| 1658 | query = xmlnode_get_child(iq->node, "query"); | |
| 1659 | ||
| 15884 | 1660 | for(groups = purple_request_fields_get_groups(fields); groups; groups = groups->next) { |
| 1661 | for(flds = purple_request_field_group_get_fields(groups->data); | |
| 11675 | 1662 | flds; flds = flds->next) { |
| 15884 | 1663 | PurpleRequestField *field = flds->data; |
| 1664 | const char *id = purple_request_field_get_id(field); | |
| 1665 | const char *value = purple_request_field_string_get_value(field); | |
| 11675 | 1666 | |
| 1667 | if(value && (!strcmp(id, "first") || !strcmp(id, "last") || !strcmp(id, "nick") || !strcmp(id, "email"))) { | |
| 1668 | xmlnode *y = xmlnode_new_child(query, id); | |
| 1669 | xmlnode_insert_data(y, value, -1); | |
| 1670 | } | |
| 1671 | } | |
| 1672 | } | |
| 1673 | ||
| 1674 | jabber_iq_set_callback(iq, user_search_result_cb, NULL); | |
| 1675 | xmlnode_set_attrib(iq->node, "to", usi->directory_server); | |
| 1676 | jabber_iq_send(iq); | |
| 1677 | ||
| 1678 | g_free(usi->directory_server); | |
| 1679 | g_free(usi); | |
| 1680 | } | |
| 1681 | ||
|
13617
983b0c58fcae
[gaim-migrate @ 16002]
Björn Voigt <bjoern@cs.tu-berlin.de>
parents:
13574
diff
changeset
|
1682 | #if 0 |
|
983b0c58fcae
[gaim-migrate @ 16002]
Björn Voigt <bjoern@cs.tu-berlin.de>
parents:
13574
diff
changeset
|
1683 | /* 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
|
1684 | |
|
983b0c58fcae
[gaim-migrate @ 16002]
Björn Voigt <bjoern@cs.tu-berlin.de>
parents:
13574
diff
changeset
|
1685 | /* |
|
983b0c58fcae
[gaim-migrate @ 16002]
Björn Voigt <bjoern@cs.tu-berlin.de>
parents:
13574
diff
changeset
|
1686 | * 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
|
1687 | * comments for Jabber User Directories |
|
983b0c58fcae
[gaim-migrate @ 16002]
Björn Voigt <bjoern@cs.tu-berlin.de>
parents:
13574
diff
changeset
|
1688 | * |
|
983b0c58fcae
[gaim-migrate @ 16002]
Björn Voigt <bjoern@cs.tu-berlin.de>
parents:
13574
diff
changeset
|
1689 | * See discussion thread "Search comment for Jabber is not translatable" |
| 15884 | 1690 | * 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
|
1691 | */ |
|
983b0c58fcae
[gaim-migrate @ 16002]
Björn Voigt <bjoern@cs.tu-berlin.de>
parents:
13574
diff
changeset
|
1692 | static const char * jabber_user_dir_comments [] = { |
|
983b0c58fcae
[gaim-migrate @ 16002]
Björn Voigt <bjoern@cs.tu-berlin.de>
parents:
13574
diff
changeset
|
1693 | /* current comment from Jabber User Directory users.jabber.org */ |
|
983b0c58fcae
[gaim-migrate @ 16002]
Björn Voigt <bjoern@cs.tu-berlin.de>
parents:
13574
diff
changeset
|
1694 | N_("Find a contact by entering the search criteria in the given fields. " |
|
983b0c58fcae
[gaim-migrate @ 16002]
Björn Voigt <bjoern@cs.tu-berlin.de>
parents:
13574
diff
changeset
|
1695 | "Note: Each field supports wild card searches (%)"), |
|
983b0c58fcae
[gaim-migrate @ 16002]
Björn Voigt <bjoern@cs.tu-berlin.de>
parents:
13574
diff
changeset
|
1696 | NULL |
|
983b0c58fcae
[gaim-migrate @ 16002]
Björn Voigt <bjoern@cs.tu-berlin.de>
parents:
13574
diff
changeset
|
1697 | }; |
|
983b0c58fcae
[gaim-migrate @ 16002]
Björn Voigt <bjoern@cs.tu-berlin.de>
parents:
13574
diff
changeset
|
1698 | #endif |
|
983b0c58fcae
[gaim-migrate @ 16002]
Björn Voigt <bjoern@cs.tu-berlin.de>
parents:
13574
diff
changeset
|
1699 | |
| 11675 | 1700 | static void user_search_fields_result_cb(JabberStream *js, xmlnode *packet, gpointer data) |
| 1701 | { | |
| 1702 | xmlnode *query, *x; | |
| 13345 | 1703 | const char *from, *type; |
| 11675 | 1704 | |
| 12284 | 1705 | if(!(from = xmlnode_get_attrib(packet, "from"))) |
| 11675 | 1706 | return; |
| 1707 | ||
| 13345 | 1708 | if(!(type = xmlnode_get_attrib(packet, "type")) || !strcmp(type, "error")) { |
|
13634
e9f9cef982d7
[gaim-migrate @ 16031]
Björn Voigt <bjoern@cs.tu-berlin.de>
parents:
13619
diff
changeset
|
1709 | char *msg = jabber_parse_error(js, packet); |
| 13794 | 1710 | |
|
13634
e9f9cef982d7
[gaim-migrate @ 16031]
Björn Voigt <bjoern@cs.tu-berlin.de>
parents:
13619
diff
changeset
|
1711 | if(!msg) |
|
e9f9cef982d7
[gaim-migrate @ 16031]
Björn Voigt <bjoern@cs.tu-berlin.de>
parents:
13619
diff
changeset
|
1712 | msg = g_strdup(_("Unknown error")); |
|
e9f9cef982d7
[gaim-migrate @ 16031]
Björn Voigt <bjoern@cs.tu-berlin.de>
parents:
13619
diff
changeset
|
1713 | |
| 15884 | 1714 | 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
|
1715 | _("Could not query the directory server."), msg); |
|
e9f9cef982d7
[gaim-migrate @ 16031]
Björn Voigt <bjoern@cs.tu-berlin.de>
parents:
13619
diff
changeset
|
1716 | g_free(msg); |
|
e9f9cef982d7
[gaim-migrate @ 16031]
Björn Voigt <bjoern@cs.tu-berlin.de>
parents:
13619
diff
changeset
|
1717 | |
| 13345 | 1718 | return; |
| 1719 | } | |
| 1720 | ||
| 11675 | 1721 | |
| 1722 | if(!(query = xmlnode_get_child(packet, "query"))) | |
| 1723 | return; | |
| 1724 | ||
| 13330 | 1725 | if((x = xmlnode_get_child_with_namespace(query, "x", "jabber:x:data"))) { |
| 13345 | 1726 | jabber_x_data_request(js, x, user_search_x_data_cb, g_strdup(from)); |
| 11675 | 1727 | return; |
| 1728 | } else { | |
| 1729 | struct user_search_info *usi; | |
| 1730 | xmlnode *instnode; | |
|
13617
983b0c58fcae
[gaim-migrate @ 16002]
Björn Voigt <bjoern@cs.tu-berlin.de>
parents:
13574
diff
changeset
|
1731 | char *instructions = NULL; |
| 15884 | 1732 | PurpleRequestFields *fields; |
| 1733 | PurpleRequestFieldGroup *group; | |
| 1734 | PurpleRequestField *field; | |
| 11675 | 1735 | |
| 1736 | /* old skool */ | |
| 15884 | 1737 | fields = purple_request_fields_new(); |
| 1738 | group = purple_request_field_group_new(NULL); | |
| 1739 | purple_request_fields_add_group(fields, group); | |
| 11675 | 1740 | |
| 1741 | if((instnode = xmlnode_get_child(query, "instructions"))) | |
|
13574
433001d94e3e
[gaim-migrate @ 15952]
Richard Laager <rlaager@pidgin.im>
parents:
13572
diff
changeset
|
1742 | { |
|
433001d94e3e
[gaim-migrate @ 15952]
Richard Laager <rlaager@pidgin.im>
parents:
13572
diff
changeset
|
1743 | char *tmp = xmlnode_get_data(instnode); |
| 13794 | 1744 | |
|
13617
983b0c58fcae
[gaim-migrate @ 16002]
Björn Voigt <bjoern@cs.tu-berlin.de>
parents:
13574
diff
changeset
|
1745 | if(tmp) |
|
983b0c58fcae
[gaim-migrate @ 16002]
Björn Voigt <bjoern@cs.tu-berlin.de>
parents:
13574
diff
changeset
|
1746 | { |
| 13794 | 1747 | /* 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
|
1748 | list in jabber_user_dir_comments[]) */ |
|
983b0c58fcae
[gaim-migrate @ 16002]
Björn Voigt <bjoern@cs.tu-berlin.de>
parents:
13574
diff
changeset
|
1749 | instructions = g_strdup_printf(_("Server Instructions: %s"), _(tmp)); |
|
983b0c58fcae
[gaim-migrate @ 16002]
Björn Voigt <bjoern@cs.tu-berlin.de>
parents:
13574
diff
changeset
|
1750 | g_free(tmp); |
|
983b0c58fcae
[gaim-migrate @ 16002]
Björn Voigt <bjoern@cs.tu-berlin.de>
parents:
13574
diff
changeset
|
1751 | } |
|
13574
433001d94e3e
[gaim-migrate @ 15952]
Richard Laager <rlaager@pidgin.im>
parents:
13572
diff
changeset
|
1752 | } |
| 13794 | 1753 | |
|
13617
983b0c58fcae
[gaim-migrate @ 16002]
Björn Voigt <bjoern@cs.tu-berlin.de>
parents:
13574
diff
changeset
|
1754 | if(!instructions) |
|
983b0c58fcae
[gaim-migrate @ 16002]
Björn Voigt <bjoern@cs.tu-berlin.de>
parents:
13574
diff
changeset
|
1755 | { |
| 11675 | 1756 | 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
|
1757 | "for any matching XMPP users.")); |
|
13617
983b0c58fcae
[gaim-migrate @ 16002]
Björn Voigt <bjoern@cs.tu-berlin.de>
parents:
13574
diff
changeset
|
1758 | } |
| 11675 | 1759 | |
| 1760 | if(xmlnode_get_child(query, "first")) { | |
| 15884 | 1761 | field = purple_request_field_string_new("first", _("First Name"), |
| 11675 | 1762 | NULL, FALSE); |
| 15884 | 1763 | purple_request_field_group_add_field(group, field); |
| 11675 | 1764 | } |
| 1765 | if(xmlnode_get_child(query, "last")) { | |
| 15884 | 1766 | field = purple_request_field_string_new("last", _("Last Name"), |
| 11675 | 1767 | NULL, FALSE); |
| 15884 | 1768 | purple_request_field_group_add_field(group, field); |
| 11675 | 1769 | } |
| 1770 | if(xmlnode_get_child(query, "nick")) { | |
| 15884 | 1771 | field = purple_request_field_string_new("nick", _("Nickname"), |
| 11675 | 1772 | NULL, FALSE); |
| 15884 | 1773 | purple_request_field_group_add_field(group, field); |
| 11675 | 1774 | } |
| 1775 | if(xmlnode_get_child(query, "email")) { | |
| 15884 | 1776 | field = purple_request_field_string_new("email", _("E-Mail Address"), |
| 11675 | 1777 | NULL, FALSE); |
| 15884 | 1778 | purple_request_field_group_add_field(group, field); |
| 11675 | 1779 | } |
| 1780 | ||
| 1781 | usi = g_new0(struct user_search_info, 1); | |
| 1782 | usi->js = js; | |
| 1783 | usi->directory_server = g_strdup(from); | |
| 1784 | ||
|
16961
b6955f946f8f
s/Jabber/XMPP in user-visible places.
Richard Laager <rlaager@pidgin.im>
parents:
16799
diff
changeset
|
1785 | purple_request_fields(js->gc, _("Search for XMPP users"), |
|
b6955f946f8f
s/Jabber/XMPP in user-visible places.
Richard Laager <rlaager@pidgin.im>
parents:
16799
diff
changeset
|
1786 | _("Search for XMPP users"), instructions, fields, |
| 11675 | 1787 | _("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
|
1788 | _("Cancel"), G_CALLBACK(user_search_cancel_cb), |
|
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
|
1789 | NULL, NULL, 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
|
1790 | usi); |
| 11675 | 1791 | |
| 1792 | g_free(instructions); | |
| 1793 | } | |
| 1794 | } | |
| 1795 | ||
| 1796 | static void jabber_user_search_ok(JabberStream *js, const char *directory) | |
| 1797 | { | |
| 1798 | JabberIq *iq; | |
| 1799 | ||
| 1800 | /* XXX: should probably better validate the directory we're given */ | |
| 1801 | if(!directory || !*directory) { | |
| 15884 | 1802 | purple_notify_error(js->gc, _("Invalid Directory"), _("Invalid Directory"), NULL); |
| 11675 | 1803 | return; |
| 1804 | } | |
| 1805 | ||
| 1806 | iq = jabber_iq_new_query(js, JABBER_IQ_GET, "jabber:iq:search"); | |
| 1807 | xmlnode_set_attrib(iq->node, "to", directory); | |
| 1808 | ||
| 1809 | jabber_iq_set_callback(iq, user_search_fields_result_cb, NULL); | |
| 1810 | ||
| 1811 | jabber_iq_send(iq); | |
| 1812 | } | |
| 1813 | ||
| 15884 | 1814 | void jabber_user_search_begin(PurplePluginAction *action) |
| 11675 | 1815 | { |
| 15884 | 1816 | PurpleConnection *gc = (PurpleConnection *) action->context; |
| 11675 | 1817 | JabberStream *js = gc->proto_data; |
| 1818 | ||
| 15884 | 1819 | purple_request_input(gc, _("Enter a User Directory"), _("Enter a User Directory"), |
| 11675 | 1820 | _("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
|
1821 | js->user_directories ? js->user_directories->data : NULL, |
| 11675 | 1822 | FALSE, FALSE, NULL, |
| 15884 | 1823 | _("Search Directory"), PURPLE_CALLBACK(jabber_user_search_ok), |
|
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
|
1824 | _("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
|
1825 | NULL, NULL, 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
|
1826 | js); |
| 11675 | 1827 | } |
| 13794 | 1828 | |
| 1829 | ||
| 1830 |