comparison pidgin/gtkblist.c @ 26048:25e2ab1fff1d

propagate from branch 'im.pidgin.pidgin' (head dd7a36be12180dba9663c2b740553e89711d7644) to branch 'im.pidgin.pidgin.vv' (head 2149cf9a6d4604f6e78ed9a2bdb0bbc3d6041a36)
author Mike Ruprecht <maiku@soc.pidgin.im>
date Sat, 06 Dec 2008 02:23:20 +0000
parents adf153852bcf f10aba5592c6
children 68f4edb42f39
comparison
equal deleted inserted replaced
26046:99055b8db16b 26048:25e2ab1fff1d
3375 char *tmp; 3375 char *tmp;
3376 3376
3377 if (PURPLE_BLIST_NODE_IS_CHAT(node)) 3377 if (PURPLE_BLIST_NODE_IS_CHAT(node))
3378 { 3378 {
3379 PurpleChat *chat; 3379 PurpleChat *chat;
3380 GList *connections;
3380 GList *cur; 3381 GList *cur;
3381 struct proto_chat_entry *pce; 3382 struct proto_chat_entry *pce;
3382 char *name, *value; 3383 char *name, *value;
3383 PurpleConversation *conv; 3384 PurpleConversation *conv;
3384 PidginBlistNode *bnode = node->ui_data; 3385 PidginBlistNode *bnode = node->ui_data;
3385 3386
3386 chat = (PurpleChat *)node; 3387 chat = (PurpleChat *)node;
3387 prpl = purple_find_prpl(purple_account_get_protocol_id(chat->account)); 3388 prpl = purple_find_prpl(purple_account_get_protocol_id(chat->account));
3388 prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(prpl); 3389 prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(prpl);
3389 3390
3390 if (g_list_length(purple_connections_get_all()) > 1) 3391 connections = purple_connections_get_all();
3392 if (connections && connections->next)
3391 { 3393 {
3392 tmp = g_markup_escape_text(chat->account->username, -1); 3394 tmp = g_markup_escape_text(chat->account->username, -1);
3393 g_string_append_printf(str, _("<b>Account:</b> %s"), tmp); 3395 g_string_append_printf(str, _("<b>Account:</b> %s"), tmp);
3394 g_free(tmp); 3396 g_free(tmp);
3395 } 3397 }
3455 */ 3457 */
3456 PurpleContact *c; 3458 PurpleContact *c;
3457 PurpleBuddy *b; 3459 PurpleBuddy *b;
3458 PurplePresence *presence; 3460 PurplePresence *presence;
3459 PurpleNotifyUserInfo *user_info; 3461 PurpleNotifyUserInfo *user_info;
3462 GList *connections;
3460 char *tmp; 3463 char *tmp;
3461 time_t idle_secs, signon; 3464 time_t idle_secs, signon;
3462 3465
3463 if (PURPLE_BLIST_NODE_IS_CONTACT(node)) 3466 if (PURPLE_BLIST_NODE_IS_CONTACT(node))
3464 { 3467 {
3476 3479
3477 presence = purple_buddy_get_presence(b); 3480 presence = purple_buddy_get_presence(b);
3478 user_info = purple_notify_user_info_new(); 3481 user_info = purple_notify_user_info_new();
3479 3482
3480 /* Account */ 3483 /* Account */
3481 if (full && g_list_length(purple_connections_get_all()) > 1) 3484 connections = purple_connections_get_all();
3485 if (full && connections && connections->next)
3482 { 3486 {
3483 tmp = g_markup_escape_text(purple_account_get_username( 3487 tmp = g_markup_escape_text(purple_account_get_username(
3484 purple_buddy_get_account(b)), -1); 3488 purple_buddy_get_account(b)), -1);
3485 purple_notify_user_info_add_pair(user_info, _("Account"), tmp); 3489 purple_notify_user_info_add_pair(user_info, _("Account"), tmp);
3486 g_free(tmp); 3490 g_free(tmp);