diff options
| -rwxr-xr-x | configure | 3 | ||||
| -rw-r--r-- | protocols/purple/purple.c | 5 |
2 files changed, 6 insertions, 2 deletions
@@ -600,13 +600,12 @@ EOF jabber=0 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 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 ) |