Changeset c775a58

Timestamp:

2010-12-07T23:41:49Z (13 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

76c89dc7

Parents:

83f1bd1d

Message:

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.

Files:

• configure (modified) (1 diff)
• protocols/purple/purple.c (modified) (1 diff)

configure

@@ -601 +601 @@
         oscar=0
         yahoo=0
-        twitter=0
         
         if [ "$events" = "libevent" ]; then
-                echo
                 echo 'Warning: Some libpurple modules (including msn-pecan) do their event handling'
                 echo 'outside libpurple, talking to GLib directly. At least for now the combination'
                 echo 'libpurple + libevent is *not* recommended!'
+                echo
         fi
 fi

protocols/purple/purple.c

@@ -1287 +1287 @@
                 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;