From c775a58faa7d5905b06e2f8900db7337082d5165 Mon Sep 17 00:00:00 2001 From: Wilmer van der Gaast Date: Tue, 7 Dec 2010 23:41:49 +0000 Subject: At least don't disable Twitter anymore for libpurple builds. libpurple doesn't have Twitter support by default and it's unlikely that someone will prefer libpurple-twitter over BitlBee's Twitter code anyway. Also automatically disable libpurple protocol modules if a native variant is already set up. The linking conflict works the other way around (libpurple modules may break if native modules for the same protocol are compiled in) so this should mostly resolve the linking conflict problem. --- protocols/purple/purple.c | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'protocols') diff --git a/protocols/purple/purple.c b/protocols/purple/purple.c index 07f385ff..d2e85554 100644 --- a/protocols/purple/purple.c +++ b/protocols/purple/purple.c @@ -1286,6 +1286,11 @@ void purple_initmodule() PurplePlugin *prot = prots->data; struct prpl *ret; + /* If we already have this one (as a native module), don't + add a libpurple duplicate. */ + if( find_protocol( prot->info->id ) ) + continue; + ret = g_memdup( &funcs, sizeof( funcs ) ); ret->name = ret->data = prot->info->id; if( strncmp( ret->name, "prpl-", 5 ) == 0 ) -- cgit v1.2.3