comparison libpurple/protocols/msn/slp.c @ 30430:351d07aefb09

Kill off many dead assignments and any useless remaining variables. I think some of those QQ ones were actual logic errors, too. Let me know if there were any side-effects that were cut.
author Elliott Sales de Andrade <qulogic@pidgin.im>
date Mon, 23 Aug 2010 00:52:24 +0000
parents 126317248aaa
children 943fce8ef142 6469c68fa093
comparison
equal deleted inserted replaced
30429:922c8c553758 30430:351d07aefb09
1261 purple_debug_info("msn", "Releasing buddy icon request\n"); 1261 purple_debug_info("msn", "Releasing buddy icon request\n");
1262 1262
1263 if (userlist->buddy_icon_window > 0) 1263 if (userlist->buddy_icon_window > 0)
1264 { 1264 {
1265 GQueue *queue; 1265 GQueue *queue;
1266 PurpleAccount *account;
1267 const char *username;
1268 1266
1269 queue = userlist->buddy_icon_requests; 1267 queue = userlist->buddy_icon_requests;
1270 1268
1271 if (g_queue_is_empty(userlist->buddy_icon_requests)) 1269 if (g_queue_is_empty(userlist->buddy_icon_requests))
1272 return; 1270 return;
1273 1271
1274 user = g_queue_pop_head(queue); 1272 user = g_queue_pop_head(queue);
1275
1276 account = userlist->session->account;
1277 username = user->passport;
1278 1273
1279 userlist->buddy_icon_window--; 1274 userlist->buddy_icon_window--;
1280 request_user_display(user); 1275 request_user_display(user);
1281 1276
1282 if (purple_debug_is_verbose()) 1277 if (purple_debug_is_verbose())
1345 1340
1346 static void 1341 static void
1347 got_user_display(MsnSlpCall *slpcall, 1342 got_user_display(MsnSlpCall *slpcall,
1348 const guchar *data, gsize size) 1343 const guchar *data, gsize size)
1349 { 1344 {
1350 MsnUserList *userlist; 1345 MsnSlpLink *slplink;
1351 const char *info; 1346 const char *info;
1352 PurpleAccount *account; 1347 PurpleAccount *account;
1353 1348
1354 g_return_if_fail(slpcall != NULL); 1349 g_return_if_fail(slpcall != NULL);
1350 slplink = slpcall->slplink;
1355 1351
1356 info = slpcall->data_info; 1352 info = slpcall->data_info;
1357 if (purple_debug_is_verbose()) 1353 if (purple_debug_is_verbose())
1358 purple_debug_info("msn", "Got User Display: %s\n", slpcall->slplink->remote_user); 1354 purple_debug_info("msn", "Got User Display: %s\n", slplink->remote_user);
1359 1355
1360 userlist = slpcall->slplink->session->userlist; 1356 account = slplink->session->account;
1361 account = slpcall->slplink->session->account; 1357
1362 1358 purple_buddy_icons_set_for_user(account, slplink->remote_user,
1363 purple_buddy_icons_set_for_user(account, slpcall->slplink->remote_user,
1364 g_memdup(data, size), size, info); 1359 g_memdup(data, size), size, info);
1365
1366 #if 0
1367 /* Free one window slot */
1368 userlist->buddy_icon_window++;
1369
1370 purple_debug_info("msn", "got_user_display(): buddy_icon_window++ yields =%d\n",
1371 userlist->buddy_icon_window);
1372
1373 msn_release_buddy_icon_request(userlist);
1374 #endif
1375 } 1360 }
1376 1361
1377 static void 1362 static void
1378 end_user_display(MsnSlpCall *slpcall, MsnSession *session) 1363 end_user_display(MsnSlpCall *slpcall, MsnSession *session)
1379 { 1364 {