Mercurial > pidgin
comparison libpurple/protocols/oscar/libicq.c @ 28504:bb923bcae9de
merge of '661db628ce40c3548058f062ea72d9687654d53a'
and '8a71ac6c6bfac72c7077754c4d8178b77f14b18f'
| author | Mark Doliner <mark@kingant.net> |
|---|---|
| date | Wed, 04 Nov 2009 22:16:51 +0000 |
| parents | a990da4540d3 |
| children | a538cb73f897 |
comparison
equal
deleted
inserted
replaced
| 28503:86ff30fb8ae3 | 28504:bb923bcae9de |
|---|---|
| 151 static void | 151 static void |
| 152 init_plugin(PurplePlugin *plugin) | 152 init_plugin(PurplePlugin *plugin) |
| 153 { | 153 { |
| 154 PurpleAccountOption *option; | 154 PurpleAccountOption *option; |
| 155 | 155 |
| 156 oscar_init(PURPLE_PLUGIN_PROTOCOL_INFO(plugin)); | 156 oscar_init(plugin); |
| 157 | 157 |
| 158 option = purple_account_option_string_new(_("Encoding"), "encoding", OSCAR_DEFAULT_CUSTOM_ENCODING); | 158 option = purple_account_option_string_new(_("Encoding"), "encoding", OSCAR_DEFAULT_CUSTOM_ENCODING); |
| 159 prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option); | 159 prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option); |
| 160 } | 160 } |
| 161 | 161 |