summaryrefslogtreecommitdiff
path: root/libpurple/protocols/qq
diff options
context:
space:
mode:
authorSadrul Habib Chowdhury <sadrul@pidgin.im>2008-05-27 06:27:46 +0000
committerSadrul Habib Chowdhury <sadrul@pidgin.im>2008-05-27 06:27:46 +0000
commit860fbfe532321b2f82107ddbbcbf2edec545a165 (patch)
tree7465d7fd294ec7a70911699e5fd2e9be03a463d1 /libpurple/protocols/qq
parentbc31f75f47f50077ed20fb9aff03266eee21c086 (diff)
parentd6829a4e25e7bd3d16006653bac0d55e04541942 (diff)
downloadpidgin-860fbfe532321b2f82107ddbbcbf2edec545a165.tar.gz
propagate from branch 'im.pidgin.pidgin' (head bd5f7f61d9349053ee4738efc0d17453f0574057)
to branch 'im.pidgin.pidgin.vv' (head 1049b744d8c8ceabaa3758f6dac78ed12a4a7e8e)
Diffstat (limited to 'libpurple/protocols/qq')
-rw-r--r--libpurple/protocols/qq/Makefile.am6
-rw-r--r--libpurple/protocols/qq/qq.c12
2 files changed, 11 insertions, 7 deletions
diff --git a/libpurple/protocols/qq/Makefile.am b/libpurple/protocols/qq/Makefile.am
index 30bd6eaed7..23f2f6d235 100644
--- a/libpurple/protocols/qq/Makefile.am
+++ b/libpurple/protocols/qq/Makefile.am
@@ -94,4 +94,8 @@ AM_CPPFLAGS = \
-I$(top_builddir)/libpurple \
-DQQ_BUDDY_ICON_DIR=\"$(datadir)/pixmaps/purple/buddy_icons/qq\" \
$(DEBUG_CFLAGS) \
- $(GLIB_CFLAGS)
+ $(FARSIGHT_CFLAGS) \
+ $(GLIB_CFLAGS) \
+ $(GSTREAMER_CFLAGS) \
+ $(LIBXML_CFLAGS)
+
diff --git a/libpurple/protocols/qq/qq.c b/libpurple/protocols/qq/qq.c
index 6fa761aca0..97ef8b3944 100644
--- a/libpurple/protocols/qq/qq.c
+++ b/libpurple/protocols/qq/qq.c
@@ -701,13 +701,13 @@ static PurplePluginProtocolInfo prpl_info = {
NULL, /* PurpleWhiteboardPrplOps */
NULL, /* send_raw */
NULL, /* roomlist_room_serialize */
-
- /* padding */
- NULL,
- NULL,
- NULL,
+ NULL, /* unregister_user */
+ NULL, /* send_attention */
+ NULL, /* get_attention_types */
sizeof(PurplePluginProtocolInfo), /* struct_size */
- NULL
+ NULL, /* get_account_text_table */
+ NULL, /* initiate_media */
+ NULL /* can_do_media */
};
static PurplePluginInfo info = {