summaryrefslogtreecommitdiff
path: root/libpurple/protocols/qq
diff options
context:
space:
mode:
authorMichael Ruprecht <maiku@pidgin.im>2008-08-18 06:31:08 +0000
committerMichael Ruprecht <maiku@pidgin.im>2008-08-18 06:31:08 +0000
commitfb451942b8a98b8fd76491bcd87ac9c2b63c0d28 (patch)
tree8c44527315eb56ba91f9f6e9a538ec1fa49578b3 /libpurple/protocols/qq
parent6b49bd36084f4b7bb2006bb80e61e57d371d97bc (diff)
parentdc75a564b3193636de1848a2fe8b8442ac7d66f3 (diff)
downloadpidgin-fb451942b8a98b8fd76491bcd87ac9c2b63c0d28.tar.gz
propagate from branch 'im.pidgin.pidgin' (head e9d99eb2fc24b21c30a6956d81d8c9b81dc70d79)
to branch 'im.pidgin.soc.2008.vv' (head 41f7d454556672156e373e3019b5a8dca4864a78)
Diffstat (limited to 'libpurple/protocols/qq')
-rw-r--r--libpurple/protocols/qq/Makefile.am6
-rw-r--r--libpurple/protocols/qq/qq.c4
2 files changed, 8 insertions, 2 deletions
diff --git a/libpurple/protocols/qq/Makefile.am b/libpurple/protocols/qq/Makefile.am
index 6bc8fa3314..2b6f34a934 100644
--- a/libpurple/protocols/qq/Makefile.am
+++ b/libpurple/protocols/qq/Makefile.am
@@ -84,4 +84,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 1107242bd3..0e7a591267 100644
--- a/libpurple/protocols/qq/qq.c
+++ b/libpurple/protocols/qq/qq.c
@@ -757,7 +757,9 @@ static PurplePluginProtocolInfo prpl_info =
NULL, /* get attention_types */
sizeof(PurplePluginProtocolInfo), /* struct_size */
- NULL
+ NULL, /* get_account_text_table */
+ NULL, /* initiate_media */
+ NULL /* can_do_media */
};
static PurplePluginInfo info = {