Mercurial > pidgin.yaz
diff libpurple/protocols/oscar/oscar.c @ 20892:bbcc9e206c43
propagate from branch 'im.pidgin.pidgin' (head f33ba0034c79d8e37a70d664ec534356fa361608)
to branch 'im.pidgin.cpw.resiak.disconnectreason' (head b3c8182bd741b961775afed0768fbecdc47dc828)
| author | Will Thompson <will.thompson@collabora.co.uk> |
|---|---|
| date | Fri, 12 Oct 2007 00:19:12 +0000 |
| parents | efa448405f3d 9bdc5144bd96 |
| children | ba41f2a60253 |
line wrap: on
line diff
--- a/libpurple/protocols/oscar/oscar.c Thu Oct 11 23:55:13 2007 +0000 +++ b/libpurple/protocols/oscar/oscar.c Fri Oct 12 00:19:12 2007 +0000 @@ -1128,8 +1128,10 @@ aim_clientready(od, conn); chatcon = find_oscar_chat_by_conn(gc, conn); - chatcon->id = id; - chatcon->conv = serv_got_joined_chat(gc, id++, chatcon->show); + if (chatcon) { + chatcon->id = id; + chatcon->conv = serv_got_joined_chat(gc, id++, chatcon->show); + } } static void @@ -1715,7 +1717,6 @@ { PurpleConnection *gc; PurpleAccount *account; - PurplePresence *presence; struct buddyinfo *bi; time_t time_idle = 0, signon = 0; int type = 0; @@ -1728,7 +1729,6 @@ gc = od->gc; account = purple_connection_get_account(gc); - presence = purple_account_get_presence(account); va_start(ap, fr); info = va_arg(ap, aim_userinfo_t *);