Changeset 9fae35c for protocols/jabber/jabber.c
- Timestamp:
- 2006-01-23T23:28:13Z (18 years ago)
- Branches:
- master
- Children:
- ec3e411
- Parents:
- 7308b63 (diff), 68c7c14 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the(diff)
links above to see all the changes relative to each parent. - File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
protocols/jabber/jabber.c
r7308b63 r9fae35c 413 413 if (jd->die) 414 414 signoff(GJ_GC(gjc)); 415 } else if (len < 0 || errno != EAGAIN) {415 } else if (len == 0 || (len < 0 && (!sockerr_again() || gjc->ssl))) { 416 416 STATE_EVT(JCONN_STATE_OFF) 417 417 } … … 1249 1249 gjab_auth(gjc); 1250 1250 } else { 1251 gjab_reqroster(gjc); 1251 1252 account_online(GJ_GC(gjc)); 1252 1253 if (bud_list_cache_exists(GJ_GC(gjc))) 1254 do_import(GJ_GC(gjc), NULL); 1255 1253 1256 1254 ((struct jabber_data *)GJ_GC(gjc)->proto_data)->did_import = TRUE; 1257 1258 gjab_reqroster(gjc);1259 1255 } 1260 1256 } else { … … 1860 1856 xmlnode_insert_cdata(y, "away", -1); 1861 1857 y = xmlnode_insert_tag(x, "status"); 1862 { 1863 char *utf8 = str_to_utf8(message); 1864 xmlnode_insert_cdata(y, utf8, -1); 1865 g_free(utf8); 1866 } 1858 xmlnode_insert_cdata(y, message, -1); 1867 1859 gc->away = ""; 1868 1860 } else {
Note: See TracChangeset
for help on using the changeset viewer.