Mercurial > pidgin.yaz
comparison libpurple/protocols/oscar/oscar.c @ 20336:b93e7be3847b
applied changes from 9d35dde0c779cca73548172223ba557f27d61882
through cd26f6af7f8ee75ef909ae08b06ad5a1978051d9
| author | Luke Schierer <lschiere@pidgin.im> |
|---|---|
| date | Sat, 20 Oct 2007 15:57:22 +0000 |
| parents | 233c423d40d3 |
| children | 0484600ac434 |
comparison
equal
deleted
inserted
replaced
| 20335:5defb0546059 | 20336:b93e7be3847b |
|---|---|
| 1126 static int id = 1; | 1126 static int id = 1; |
| 1127 | 1127 |
| 1128 aim_clientready(od, conn); | 1128 aim_clientready(od, conn); |
| 1129 | 1129 |
| 1130 chatcon = find_oscar_chat_by_conn(gc, conn); | 1130 chatcon = find_oscar_chat_by_conn(gc, conn); |
| 1131 chatcon->id = id; | 1131 if (chatcon) { |
| 1132 chatcon->conv = serv_got_joined_chat(gc, id++, chatcon->show); | 1132 chatcon->id = id; |
| 1133 chatcon->conv = serv_got_joined_chat(gc, id++, chatcon->show); | |
| 1134 } | |
| 1133 } | 1135 } |
| 1134 | 1136 |
| 1135 static void | 1137 static void |
| 1136 flap_connection_established_chatnav(OscarData *od, FlapConnection *conn) | 1138 flap_connection_established_chatnav(OscarData *od, FlapConnection *conn) |
| 1137 { | 1139 { |