Mercurial > pidgin.yaz
changeset 9989:e4d971338093
[gaim-migrate @ 10902]
(16:41:30) grim elite:
www.reaperworld.com/code/gaim/gaim-2.0.0cvs-account.c_fixups.diff
(16:41:48) LSchiere2: merging 2 functions?
(16:42:00) grim elite: merges the 2 definitions of
gaim_account_get_protocol_name
(16:42:05) LSchiere2: ah
committer: Tailor Script <tailor@pidgin.im>
| author | Luke Schierer <lschiere@pidgin.im> |
|---|---|
| date | Wed, 08 Sep 2004 20:43:41 +0000 |
| parents | d770673338f4 |
| children | bd5517471d99 |
| files | src/account.c |
| diffstat | 1 files changed, 1 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/src/account.c Wed Sep 08 19:36:04 2004 +0000 +++ b/src/account.c Wed Sep 08 20:43:41 2004 +0000 @@ -789,17 +789,7 @@ g_return_val_if_fail(account != NULL, NULL); - p = gaim_find_prpl(account->protocol_id); - - return ((p && p->info->name) ? _(p->info->name) : _("Unknown")); -} - -const char * -gaim_account_get_protocol_name(const GaimAccount *account) -{ - g_return_val_if_fail(account != NULL, NULL); - - GaimPlugin *p = gaim_find_prpl(gaim_account_get_protocol_id(account)); + p = gaim_find_prpl(gaim_account_get_protocol_id(account)); return ((p && p->info->name) ? _(p->info->name) : _("Unknown")); }