Mercurial > pidgin.yaz
comparison pidgin/gtkblist.c @ 24616:fdd9fd5c2086
merge of '68a2ccd3df34ca17e6d788cfcbaf96a605bea2e5'
and 'bff50ecd56f0f881f81b5d087f566ecbf74aa4cd'
author | Sadrul Habib Chowdhury <imadil@gmail.com> |
---|---|
date | Tue, 09 Dec 2008 15:45:15 +0000 |
parents | e344426d7c28 f10aba5592c6 |
children | fbfbebc9197e 401f548e3544 65cfc59858cf 68f4edb42f39 a959b17ffc57 |
comparison
equal
deleted
inserted
replaced
24460:f1936abe1616 | 24616:fdd9fd5c2086 |
---|---|
3318 char *tmp; | 3318 char *tmp; |
3319 | 3319 |
3320 if (PURPLE_BLIST_NODE_IS_CHAT(node)) | 3320 if (PURPLE_BLIST_NODE_IS_CHAT(node)) |
3321 { | 3321 { |
3322 PurpleChat *chat; | 3322 PurpleChat *chat; |
3323 GList *connections; | |
3323 GList *cur; | 3324 GList *cur; |
3324 struct proto_chat_entry *pce; | 3325 struct proto_chat_entry *pce; |
3325 char *name, *value; | 3326 char *name, *value; |
3326 PurpleConversation *conv; | 3327 PurpleConversation *conv; |
3327 PidginBlistNode *bnode = node->ui_data; | 3328 PidginBlistNode *bnode = node->ui_data; |
3328 | 3329 |
3329 chat = (PurpleChat *)node; | 3330 chat = (PurpleChat *)node; |
3330 prpl = purple_find_prpl(purple_account_get_protocol_id(chat->account)); | 3331 prpl = purple_find_prpl(purple_account_get_protocol_id(chat->account)); |
3331 prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(prpl); | 3332 prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(prpl); |
3332 | 3333 |
3333 if (g_list_length(purple_connections_get_all()) > 1) | 3334 connections = purple_connections_get_all(); |
3335 if (connections && connections->next) | |
3334 { | 3336 { |
3335 tmp = g_markup_escape_text(chat->account->username, -1); | 3337 tmp = g_markup_escape_text(chat->account->username, -1); |
3336 g_string_append_printf(str, _("<b>Account:</b> %s"), tmp); | 3338 g_string_append_printf(str, _("<b>Account:</b> %s"), tmp); |
3337 g_free(tmp); | 3339 g_free(tmp); |
3338 } | 3340 } |
3398 */ | 3400 */ |
3399 PurpleContact *c; | 3401 PurpleContact *c; |
3400 PurpleBuddy *b; | 3402 PurpleBuddy *b; |
3401 PurplePresence *presence; | 3403 PurplePresence *presence; |
3402 PurpleNotifyUserInfo *user_info; | 3404 PurpleNotifyUserInfo *user_info; |
3405 GList *connections; | |
3403 char *tmp; | 3406 char *tmp; |
3404 time_t idle_secs, signon; | 3407 time_t idle_secs, signon; |
3405 | 3408 |
3406 if (PURPLE_BLIST_NODE_IS_CONTACT(node)) | 3409 if (PURPLE_BLIST_NODE_IS_CONTACT(node)) |
3407 { | 3410 { |
3419 | 3422 |
3420 presence = purple_buddy_get_presence(b); | 3423 presence = purple_buddy_get_presence(b); |
3421 user_info = purple_notify_user_info_new(); | 3424 user_info = purple_notify_user_info_new(); |
3422 | 3425 |
3423 /* Account */ | 3426 /* Account */ |
3424 if (full && g_list_length(purple_connections_get_all()) > 1) | 3427 connections = purple_connections_get_all(); |
3428 if (full && connections && connections->next) | |
3425 { | 3429 { |
3426 tmp = g_markup_escape_text(purple_account_get_username( | 3430 tmp = g_markup_escape_text(purple_account_get_username( |
3427 purple_buddy_get_account(b)), -1); | 3431 purple_buddy_get_account(b)), -1); |
3428 purple_notify_user_info_add_pair(user_info, _("Account"), tmp); | 3432 purple_notify_user_info_add_pair(user_info, _("Account"), tmp); |
3429 g_free(tmp); | 3433 g_free(tmp); |