Mercurial > pidgin
comparison src/account.c @ 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 | c892b6dbc341 |
comparison
equal
deleted
inserted
replaced
| 9988:d770673338f4 | 9989:e4d971338093 |
|---|---|
| 787 { | 787 { |
| 788 GaimPlugin *p; | 788 GaimPlugin *p; |
| 789 | 789 |
| 790 g_return_val_if_fail(account != NULL, NULL); | 790 g_return_val_if_fail(account != NULL, NULL); |
| 791 | 791 |
| 792 p = gaim_find_prpl(account->protocol_id); | 792 p = gaim_find_prpl(gaim_account_get_protocol_id(account)); |
| 793 | |
| 794 return ((p && p->info->name) ? _(p->info->name) : _("Unknown")); | |
| 795 } | |
| 796 | |
| 797 const char * | |
| 798 gaim_account_get_protocol_name(const GaimAccount *account) | |
| 799 { | |
| 800 g_return_val_if_fail(account != NULL, NULL); | |
| 801 | |
| 802 GaimPlugin *p = gaim_find_prpl(gaim_account_get_protocol_id(account)); | |
| 803 | 793 |
| 804 return ((p && p->info->name) ? _(p->info->name) : _("Unknown")); | 794 return ((p && p->info->name) ? _(p->info->name) : _("Unknown")); |
| 805 } | 795 } |
| 806 | 796 |
| 807 GaimConnection * | 797 GaimConnection * |