comparison: pidgin/pidginaccountchooser.c
pidgin/pidginaccountchooser.c
- changeset 41962
- f802660eaef2
- parent 41864
- 6f490dec468f
- child 41971
- b03ca9889e90
equal
deleted
inserted
replaced
| 41961:0da91f053305 | 41962:f802660eaef2 |
|---|---|
| 65 pidgin_account_chooser_label_cb(G_GNUC_UNUSED GObject *self, | 65 pidgin_account_chooser_label_cb(G_GNUC_UNUSED GObject *self, |
| 66 PurpleAccount *account, | 66 PurpleAccount *account, |
| 67 G_GNUC_UNUSED gpointer data) | 67 G_GNUC_UNUSED gpointer data) |
| 68 { | 68 { |
| 69 gchar *markup = NULL; | 69 gchar *markup = NULL; |
| 70 const gchar *alias = NULL; | 70 const char *alias = NULL; |
| 71 const char *protocol_name = NULL; | |
| 72 const char *username = NULL; | |
| 71 | 73 |
| 72 if(!PURPLE_IS_ACCOUNT(account)) { | 74 if(!PURPLE_IS_ACCOUNT(account)) { |
| 73 return NULL; | 75 return NULL; |
| 74 } | 76 } |
| 75 | 77 |
| 76 alias = purple_account_get_private_alias(account); | 78 alias = purple_account_get_private_alias(account); |
| 79 protocol_name = purple_account_get_protocol_name(account); | |
| 80 username = purple_contact_info_get_username(PURPLE_CONTACT_INFO(account)); | |
| 81 | |
| 77 if(alias != NULL) { | 82 if(alias != NULL) { |
| 78 markup = g_strdup_printf(_("%s (%s) (%s)"), | 83 markup = g_strdup_printf(_("%s (%s) (%s)"), username, alias, |
| 79 purple_account_get_username(account), | 84 protocol_name); |
| 80 alias, | |
| 81 purple_account_get_protocol_name(account)); | |
| 82 } else { | 85 } else { |
| 83 markup = g_strdup_printf(_("%s (%s)"), | 86 markup = g_strdup_printf(_("%s (%s)"), username, protocol_name); |
| 84 purple_account_get_username(account), | |
| 85 purple_account_get_protocol_name(account)); | |
| 86 } | 87 } |
| 87 | 88 |
| 88 return markup; | 89 return markup; |
| 89 } | 90 } |
| 90 | 91 |
