← Back to branch summary

~micahg/ubuntu/natty/pidgin/2.7.9-2

« back to all changes in this revision

Viewing changes to libpurple/protocols/bonjour/jabber.c

  • Committer: Bazaar Package Importer
  • Author(s): Sebastien Bacher
  • Date: 2010-11-05 19:44:21 UTC
  • mfrom: (62.1.1 maverick-security) (2.3.12 sid)
  • Revision ID: james.westby@ubuntu.com-20101105194421-8r8o4pzw2m5j4hiy
Tags: 1:2.7.5-1ubuntu1
Resync on Debian

Show diffs side-by-side

added added

removed removed

Lines of Context:
libpurple/protocols/bonjour/jabber.c
425
425
                        bonjour_jabber_close_conversation(bconv);
426
426
                        if (bconv->pb != NULL) {
427
427
                                BonjourBuddy *bb = purple_buddy_get_protocol_data(bconv->pb);
428
 
                                
 
428
 
429
429
                                if(bb != NULL)
430
430
                                        bb->conversation = NULL;
431
431
                        }
534
534
        if (bname == NULL)
535
535
                bname = "";
536
536
 
537
 
        stream_start = g_strdup_printf(DOCTYPE, purple_account_get_username(bconv->account), bname);
 
537
        stream_start = g_strdup_printf(DOCTYPE, bonjour_get_jid(bconv->account), bname);
538
538
        len = strlen(stream_start);
539
539
 
540
540
        bconv->sent_stream_start = PARTIALLY_SENT;
774
774
#ifdef PF_INET6
775
775
        if (jdata->socket6 != -1) {
776
776
                struct sockaddr_in6 addr6;
 
777
#ifdef IPV6_V6ONLY
 
778
                int on = 1;
 
779
                setsockopt(jdata->socket6, IPPROTO_IPV6, IPV6_V6ONLY, &on, sizeof(on));
 
780
#endif
777
781
                memset(&addr6, 0, sizeof(addr6));
778
782
                addr6.sin6_family = AF_INET6;
779
783
                addr6.sin6_port = htons(jdata->port);
1044
1048
 
1045
1049
        message_node = xmlnode_new("message");
1046
1050
        xmlnode_set_attrib(message_node, "to", bb->name);
1047
 
        xmlnode_set_attrib(message_node, "from", purple_account_get_username(jdata->account));
 
1051
        xmlnode_set_attrib(message_node, "from", bonjour_get_jid(jdata->account));
1048
1052
        xmlnode_set_attrib(message_node, "type", "chat");
1049
1053
 
1050
1054
        /* Enclose the message from the UI within a "font" node */
1259
1263
 
1260
1264
        for(l = acc->deny; l != NULL; l = l->next) {
1261
1265
                const gchar *name = purple_buddy_get_name(pb);
1262
 
                const gchar *username = purple_account_get_username(acc);
 
1266
                const gchar *username = bonjour_get_jid(acc);
1263
1267
 
1264
1268
                if(!purple_utf8_strcasecmp(name, (char *)l->data)) {
1265
1269
                        purple_debug_info("bonjour", "%s has been blocked by %s.\n", name, username);
1273
1277
static void
1274
1278
xep_iq_parse(xmlnode *packet, PurpleBuddy *pb)
1275
1279
{
1276
 
        xmlnode *child;
1277
1280
        PurpleAccount *account;
1278
1281
        PurpleConnection *gc;
1279
1282
 
1283
1286
                account = purple_buddy_get_account(pb);
1284
1287
                gc = purple_account_get_connection(account);
1285
1288
 
1286
 
        if ((child = xmlnode_get_child(packet, "si")) || (child = xmlnode_get_child(packet, "error")))
 
1289
        if (xmlnode_get_child(packet, "si") != NULL || xmlnode_get_child(packet, "error") != NULL)
1287
1290
                xep_si_parse(gc, packet, pb);
1288
1291
        else
1289
1292
                xep_bytestreams_parse(gc, packet, pb);