Mercurial > pidgin
comparison libpurple/protocols/bonjour/jabber.c @ 25878:9f000fb8664e
Fix up the propagate from im.pidgin.pidgin
author | Richard Laager <rlaager@wiktel.com> |
---|---|
date | Fri, 12 Dec 2008 20:24:24 +0000 |
parents | 1260a3fb60f4 |
children | be87547aa431 |
comparison
equal
deleted
inserted
replaced
25877:1260a3fb60f4 | 25878:9f000fb8664e |
---|---|
377 xep_iq_parse(packet, pb); | 377 xep_iq_parse(packet, pb); |
378 else | 378 else |
379 purple_debug_warning("bonjour", "Unknown packet: %s\n", packet->name ? packet->name : "(null)"); | 379 purple_debug_warning("bonjour", "Unknown packet: %s\n", packet->name ? packet->name : "(null)"); |
380 } | 380 } |
381 | 381 |
382 static void bonjour_jabber_stream_ended(BonjourJabberConversation *bconv) { | |
383 const gchar *name = NULL; | |
384 BonjourBuddy *bb = NULL; | |
385 | |
386 if(bconv->pb != NULL) { | |
387 name = purple_buddy_get_name(bconv->pb); | |
388 bb = purple_buddy_get_protocol_data(bconv->pb); | |
389 } | |
390 | |
391 purple_debug_info("bonjour", "Recieved conversation close notification from %s.\n", name ? name : "(unknown)"); | |
392 | |
393 /* Close the socket, clear the watcher and free memory */ | |
394 bonjour_jabber_close_conversation(bconv); | |
395 | |
396 if(bb) | |
397 bb->conversation = NULL; | |
398 } | |
382 | 399 |
383 static void | 400 static void |
384 _client_socket_handler(gpointer data, gint socket, PurpleInputCondition condition) | 401 _client_socket_handler(gpointer data, gint socket, PurpleInputCondition condition) |
385 { | 402 { |
386 BonjourJabberConversation *bconv = data; | 403 BonjourJabberConversation *bconv = data; |
423 } | 440 } |
424 | 441 |
425 purple_debug_info("bonjour", "Receive: -%s- %d bytes\n", message, len); | 442 purple_debug_info("bonjour", "Receive: -%s- %d bytes\n", message, len); |
426 | 443 |
427 bonjour_parser_process(bconv, message, message_length); | 444 bonjour_parser_process(bconv, message, message_length); |
428 } | |
429 | |
430 static void bonjour_jabber_stream_ended(BonjourJabberConversation *bconv) { | |
431 const gchar *name = NULL; | |
432 BonjourBuddy *bb = NULL; | |
433 | |
434 if(bconv->pb != NULL) { | |
435 name = purple_buddy_get_name(bconv->pb); | |
436 bb = purple_buddy_get_protocol_data(bconv->pb); | |
437 } | |
438 | |
439 purple_debug_info("bonjour", "Recieved conversation close notification from %s.\n", name ? name : "(unknown)"); | |
440 | |
441 /* Close the socket, clear the watcher and free memory */ | |
442 bonjour_jabber_close_conversation(bconv); | |
443 | |
444 if(bb) | |
445 bb->conversation = NULL; | |
446 } | 445 } |
447 | 446 |
448 struct _stream_start_data { | 447 struct _stream_start_data { |
449 char *msg; | 448 char *msg; |
450 }; | 449 }; |