Mercurial > pidgin.yaz
diff libpurple/protocols/qq/qq.c @ 24046:bcfc98c7a55f
merge of '546bf87105ac5b97c3962c083dfab015d37d9b05'
and 'e21702f98a100a93853bc53855b25488f2f9dbf7'
author | Daniel Atallah <daniel.atallah@gmail.com> |
---|---|
date | Mon, 15 Sep 2008 03:06:03 +0000 |
parents | 69c218fd5d54 225e0e9e1055 |
children | d57928c9dd8f 16734635febf 4d752d07a126 |
line wrap: on
line diff
--- a/libpurple/protocols/qq/qq.c Mon Sep 15 03:03:11 2008 +0000 +++ b/libpurple/protocols/qq/qq.c Mon Sep 15 03:06:03 2008 +0000 @@ -716,8 +716,8 @@ return chat_name_to_purple_name(who); } -PurplePlugin *my_protocol = NULL; -static PurplePluginProtocolInfo prpl_info = { +static PurplePluginProtocolInfo prpl_info = +{ OPT_PROTO_CHAT_TOPIC | OPT_PROTO_USE_POINTSIZE, NULL, /* user_splits */ NULL, /* protocol_options */ @@ -780,11 +780,11 @@ NULL, /* PurpleWhiteboardPrplOps */ NULL, /* send_raw */ NULL, /* roomlist_room_serialize */ + NULL, /* unregister_user */ + NULL, /* send_attention */ + NULL, /* get attention_types */ - /* padding */ - NULL, - NULL, - NULL, + sizeof(PurplePluginProtocolInfo), /* struct_size */ NULL }; @@ -873,8 +873,6 @@ option = purple_account_option_int_new(_("Update interval(s)"), "update_interval", 300); prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option); - my_protocol = plugin; - purple_prefs_add_none("/plugins/prpl/qq"); purple_prefs_add_bool("/plugins/prpl/qq/show_status_by_icon", TRUE); purple_prefs_add_bool("/plugins/prpl/qq/show_fake_video", FALSE);