Mercurial > pidgin
comparison libpurple/protocols/bonjour/jabber.c @ 29960:815bd8b41638
I before E, except after C
author | Stu Tomlinson <stu@nosnilmot.com> |
---|---|
date | Mon, 17 May 2010 01:01:13 +0000 |
parents | 55913ed2a229 |
children | 7c871249318b |
comparison
equal
deleted
inserted
replaced
29959:3057fd96be81 | 29960:815bd8b41638 |
---|---|
384 | 384 |
385 /* Inform the user that the conversation has been closed */ | 385 /* Inform the user that the conversation has been closed */ |
386 BonjourBuddy *bb = NULL; | 386 BonjourBuddy *bb = NULL; |
387 const gchar *name = bconv->pb ? purple_buddy_get_name(bconv->pb) : "(unknown)"; | 387 const gchar *name = bconv->pb ? purple_buddy_get_name(bconv->pb) : "(unknown)"; |
388 | 388 |
389 purple_debug_info("bonjour", "Recieved conversation close notification from %s.\n", name); | 389 purple_debug_info("bonjour", "Received conversation close notification from %s.\n", name); |
390 | 390 |
391 if(bconv->pb != NULL) | 391 if(bconv->pb != NULL) |
392 bb = purple_buddy_get_protocol_data(bconv->pb); | 392 bb = purple_buddy_get_protocol_data(bconv->pb); |
393 #if 0 | 393 #if 0 |
394 if(bconv->pb != NULL) { | 394 if(bconv->pb != NULL) { |
580 | 580 |
581 return TRUE; | 581 return TRUE; |
582 } | 582 } |
583 | 583 |
584 /* This gets called when we've successfully sent our <stream:stream /> | 584 /* This gets called when we've successfully sent our <stream:stream /> |
585 * AND when we've recieved a <stream:stream /> */ | 585 * AND when we've received a <stream:stream /> */ |
586 void bonjour_jabber_stream_started(BonjourJabberConversation *bconv) { | 586 void bonjour_jabber_stream_started(BonjourJabberConversation *bconv) { |
587 | 587 |
588 if (bconv->sent_stream_start == NOT_SENT && !bonjour_jabber_send_stream_init(bconv, bconv->socket)) { | 588 if (bconv->sent_stream_start == NOT_SENT && !bonjour_jabber_send_stream_init(bconv, bconv->socket)) { |
589 const char *err = g_strerror(errno); | 589 const char *err = g_strerror(errno); |
590 const char *bname = bconv->buddy_name; | 590 const char *bname = bconv->buddy_name; |