comparison libpurple/protocols/oscar/oscar.c @ 21085:7821fa7b22db

propagate from branch 'im.pidgin.pidgin' (head ef97aa9259d77504bb07c2dff5ec0750d498e847) to branch 'org.maemo.garage.pidgin.pidgin.request-with-ui-hint' (head e8b5729ce3e73070299b06e0fba894a819d5cbb4)
author Gabriel Schulhof <nix@go-nix.ca>
date Wed, 10 Oct 2007 23:20:18 +0000
parents 488796f5ba33 9bdc5144bd96
children 84b9b98070e5
comparison
equal deleted inserted replaced
21084:3a00e048578c 21085:7821fa7b22db
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 {