Mercurial > pidgin.yaz

comparison pidgin/gtkaccount.c @ 31076:bbf7096ae66c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge of '598ef461d4de936afef7298e55152cc7ecaa9b70' and 'b4c65c273f2934560d9e643a124b31ac2d2328f2'
author ivan.komarov@soc.pidgin.im
date Wed, 27 Oct 2010 18:26:14 +0000
parents a1964c506f29
children 695b6e57e255
comparison
equal deleted inserted replaced
31074:e7365705f151 31076:bbf7096ae66c
2466 char *buffer; 2466 char *buffer;
2467 PurpleConnection *gc; 2467 PurpleConnection *gc;
2468 GtkWidget *alert; 2468 GtkWidget *alert;
2469 GdkPixbuf *prpl_icon; 2469 GdkPixbuf *prpl_icon;
2470 struct auth_request *aa; 2470 struct auth_request *aa;
2471 gboolean have_valid_alias = alias && *alias;
2471 2472
2472 gc = purple_account_get_connection(account); 2473 gc = purple_account_get_connection(account);
2473 if (message != NULL && *message == '\0') 2474 if (message != NULL && *message == '\0')
2474 message = NULL; 2475 message = NULL;
2475 2476
2476 buffer = g_strdup_printf(_("%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"), 2477 buffer = g_strdup_printf(_("%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"),
2477 remote_user, 2478 remote_user,
2478 (alias != NULL ? " (" : ""), 2479 (have_valid_alias ? " (" : ""),
2479 (alias != NULL ? alias : ""), 2480 (have_valid_alias ? alias : ""),
2480 (alias != NULL ? ")" : ""), 2481 (have_valid_alias ? ")" : ""),
2481 (id != NULL 2482 (id != NULL
2482 ? id 2483 ? id
2483 : (purple_connection_get_display_name(gc) != NULL 2484 : (purple_connection_get_display_name(gc) != NULL
2484 ? purple_connection_get_display_name(gc) 2485 ? purple_connection_get_display_name(gc)
2485 : purple_account_get_username(account))), 2486 : purple_account_get_username(account))),