Mercurial > pidgin.yaz
comparison libpurple/protocols/silc/buddy.c @ 29852:a538cb73f897
propagate from branch 'im.pidgin.pidgin' (head b0098e2250f135d121960d8152e144e7e344125e)
to branch 'im.pidgin.cpw.rekkanoryo.icqxstatus' (head dcd3ab65d5cfcd79b00a7b95ab5fe788da64c112)
| author | Marcus Lundblad <ml@update.uu.se> |
|---|---|
| date | Sun, 07 Feb 2010 19:31:56 +0000 |
| parents | f1437342cc0e 5391094529c6 |
| children | 3322201b446f |
comparison
equal
deleted
inserted
replaced
| 29372:791606778223 | 29852:a538cb73f897 |
|---|---|
| 1181 g_snprintf(tmp, sizeof(tmp), "%s - %s (%s@%s)%s", | 1181 g_snprintf(tmp, sizeof(tmp), "%s - %s (%s@%s)%s", |
| 1182 client_entry->realname, client_entry->nickname, | 1182 client_entry->realname, client_entry->nickname, |
| 1183 client_entry->username, *client_entry->hostname ? | 1183 client_entry->username, *client_entry->hostname ? |
| 1184 client_entry->hostname : "", | 1184 client_entry->hostname : "", |
| 1185 fingerprint ? tmp2 : ""); | 1185 fingerprint ? tmp2 : ""); |
| 1186 purple_request_field_list_add(f, tmp, client_entry); | 1186 purple_request_field_list_add_icon(f, tmp, NULL, client_entry); |
| 1187 silc_free(fingerprint); | 1187 silc_free(fingerprint); |
| 1188 } | 1188 } |
| 1189 | 1189 |
| 1190 purple_request_fields(r->client->application, _("Add Buddy"), | 1190 purple_request_fields(r->client->application, _("Add Buddy"), |
| 1191 _("Select correct user"), | 1191 _("Select correct user"), |