Mercurial > pidgin.yaz
comparison libpurple/account.c @ 19618:a38ee5d9eedf
merge of 'bf68a58b8bbc1d43f4ebe7b94bd47282cb66f26e'
and 'daa5fcdfa800915c5bed0df9809e1b367f6b56da'
| author | Ka-Hing Cheung <khc@hxbc.us> |
|---|---|
| date | Mon, 03 Sep 2007 21:04:02 +0000 |
| parents | e6364b0679b0 |
| children | 44b4e8bd759b 1d2002a5735e |
comparison
equal
deleted
inserted
replaced
| 19583:66882abaf8f1 | 19618:a38ee5d9eedf |
|---|---|
| 1718 | 1718 |
| 1719 const char * | 1719 const char * |
| 1720 purple_account_get_protocol_id(const PurpleAccount *account) | 1720 purple_account_get_protocol_id(const PurpleAccount *account) |
| 1721 { | 1721 { |
| 1722 g_return_val_if_fail(account != NULL, NULL); | 1722 g_return_val_if_fail(account != NULL, NULL); |
| 1723 /* | |
| 1724 * HACK by Seanegan | |
| 1725 */ | |
| 1726 if (!strcmp(account->protocol_id, "prpl-oscar")) { | |
| 1727 if (isdigit(account->username[0])) | |
| 1728 return "prpl-icq"; | |
| 1729 else | |
| 1730 return "prpl-aim"; | |
| 1731 } | |
| 1732 return account->protocol_id; | 1723 return account->protocol_id; |
| 1733 } | 1724 } |
| 1734 | 1725 |
| 1735 const char * | 1726 const char * |
| 1736 purple_account_get_protocol_name(const PurpleAccount *account) | 1727 purple_account_get_protocol_name(const PurpleAccount *account) |