diff options
| -rwxr-xr-x | configure | 12 | ||||
| -rw-r--r-- | protocols/purple/purple.c | 8 |
2 files changed, 10 insertions, 10 deletions
@@ -816,13 +816,13 @@ EOF protoobjs=$protoobjs'purple_mod.o ' # only disable these if the user didn't enable them explicitly - [ "$msn" = "default-on" ] && msn=0 - [ "$jabber" = "default-on" ] && jabber=0 - [ "$oscar" = "default-on" ] && oscar=0 - [ "$yahoo" = "default-on" ] && yahoo=0 + #[ "$msn" = "default-on" ] && msn=0 + #[ "$jabber" = "default-on" ] && jabber=0 + #[ "$oscar" = "default-on" ] && oscar=0 + #[ "$yahoo" = "default-on" ] && yahoo=0 - echo '#undef PACKAGE' >> config.h - echo '#define PACKAGE "BitlBee-LIBPURPLE"' >> config.h + #echo '#undef PACKAGE' >> config.h + #echo '#define PACKAGE "BitlBee-LIBPURPLE"' >> config.h if [ "$events" = "libevent" ]; then echo 'Warning: Some libpurple modules (including msn-pecan) do their event handling' diff --git a/protocols/purple/purple.c b/protocols/purple/purple.c index d0e8ec40..11a7eac6 100644 --- a/protocols/purple/purple.c +++ b/protocols/purple/purple.c @@ -1532,8 +1532,8 @@ void purple_initmodule() ret = g_memdup(&funcs, sizeof(funcs)); ret->name = ret->data = prot->info->id; - if (strncmp(ret->name, "prpl-", 5) == 0) { - ret->name += 5; + if (strncmp(ret->name, "prpl-", 5) != 0) { + ret->name = g_strdup_printf("prpl-%s", ret->name); } register_protocol(ret); @@ -1541,12 +1541,12 @@ void purple_initmodule() /* libpurple doesn't define a protocol called OSCAR, but we need it to be compatible with normal BitlBee. */ - if (g_strcasecmp(prot->info->id, "prpl-aim") == 0) { + /*if (g_strcasecmp(prot->info->id, "prpl-aim") == 0) { ret = g_memdup(&funcs, sizeof(funcs)); ret->name = "oscar"; ret->data = prot->info->id; register_protocol(ret); - } + }*/ } g_string_append(help, "\n\nFor used protocols, more information about available " |