comparison libgaim/protocols/jabber/jabber.c @ 14638:459dafda90af

[gaim-migrate @ 17384] GtkCellRendererExpander draws an expander in a renderer to avoid a large, needless margin. The approach is a bit hacky, but it's a good job. - RTL fix in GtkStatusBox - Drag-and-drop image into the global buddy icon selector to set a buddy icon committer: Tailor Script <tailor@pidgin.im>
author Sean Egan <seanegan@gmail.com>
date Wed, 27 Sep 2006 17:28:44 +0000
parents ba12c5e9d7e7
children 118fd0dc5b6e
comparison
equal deleted inserted replaced
14637:c811cfc944d1 14638:459dafda90af
405 unsigned int olen; 405 unsigned int olen;
406 sasl_decode(js->sasl, buf, len, &out, &olen); 406 sasl_decode(js->sasl, buf, len, &out, &olen);
407 if (olen>0) { 407 if (olen>0) {
408 gaim_debug(GAIM_DEBUG_INFO, "jabber", "RecvSASL (%u): %s\n", olen, out); 408 gaim_debug(GAIM_DEBUG_INFO, "jabber", "RecvSASL (%u): %s\n", olen, out);
409 jabber_parser_process(js,out,olen); 409 jabber_parser_process(js,out,olen);
410 if(js->reinit)
411 jabber_stream_init(js);
410 } 412 }
411 return; 413 return;
412 } 414 }
413 #endif 415 #endif
414 buf[len] = '\0'; 416 buf[len] = '\0';
415 gaim_debug(GAIM_DEBUG_INFO, "jabber", "Recv (%d): %s\n", len, buf); 417 gaim_debug(GAIM_DEBUG_INFO, "jabber", "Recv (%d): %s\n", len, buf);
416 jabber_parser_process(js, buf, len); 418 jabber_parser_process(js, buf, len);
419 if(js->reinit)
420 jabber_stream_init(js);
417 } else if(errno == EAGAIN) { 421 } else if(errno == EAGAIN) {
418 return; 422 return;
419 } else { 423 } else {
420 gaim_connection_error(gc, _("Read Error")); 424 gaim_connection_error(gc, _("Read Error"));
421 } 425 }
1020 } 1024 }
1021 break; 1025 break;
1022 case JABBER_STREAM_REINITIALIZING: 1026 case JABBER_STREAM_REINITIALIZING:
1023 gaim_connection_update_progress(js->gc, _("Re-initializing Stream"), 1027 gaim_connection_update_progress(js->gc, _("Re-initializing Stream"),
1024 (js->gsc ? 7 : 4), JABBER_CONNECT_STEPS); 1028 (js->gsc ? 7 : 4), JABBER_CONNECT_STEPS);
1025 if (js->gsc) { 1029
1026 /* The stream will be reinitialized later, in jabber_recv_cb_ssl() */ 1030 /* The stream will be reinitialized later, in jabber_recv_cb_ssl() */
1027 js->reinit = TRUE; 1031 js->reinit = TRUE;
1028 } else { 1032
1029 jabber_stream_init(js);
1030 }
1031 break; 1033 break;
1032 case JABBER_STREAM_CONNECTED: 1034 case JABBER_STREAM_CONNECTED:
1033 jabber_roster_request(js); 1035 jabber_roster_request(js);
1034 gpresence = gaim_account_get_presence(js->gc->account); 1036 gpresence = gaim_account_get_presence(js->gc->account);
1035 status = gaim_presence_get_active_status(gpresence); 1037 status = gaim_presence_get_active_status(gpresence);