Mercurial > pidgin
changeset 21577:ea34884fd5c3
merge of '7740233c9fca04206ee36d5c66bc83674db5dd9f'
and '9ae8e6f2ee9e7fe80c45209b4ba9d96b9122e936'
| author | Stu Tomlinson <stu@nosnilmot.com> |
|---|---|
| date | Sat, 17 Nov 2007 19:58:00 +0000 |
| parents | dee0c2dc1a85 (diff) 8fd977cd39dc (current diff) |
| children | e26890a63ff6 b582549d18c2 |
| files | |
| diffstat | 4 files changed, 2 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/Makefile.am Sat Nov 17 19:41:12 2007 +0000 +++ b/libpurple/Makefile.am Sat Nov 17 19:58:00 2007 +0000 @@ -237,8 +237,6 @@ $(LIBXML_LIBS) \ $(LIBNM_LIBS) \ $(INTLLIBS) \ - $(SASL_LIBS) \ - $(MEANWHILE_LIBS) \ -lm AM_CPPFLAGS = \
--- a/libpurple/protocols/msnp9/msn.c Sat Nov 17 19:41:12 2007 +0000 +++ b/libpurple/protocols/msnp9/msn.c Sat Nov 17 19:58:00 2007 +0000 @@ -2218,4 +2218,4 @@ PURPLE_CALLBACK(msn_uri_handler), NULL); } -PURPLE_INIT_PLUGIN(msnp9, init_plugin, info); +PURPLE_INIT_PLUGIN(msn, init_plugin, info);
--- a/libpurple/protocols/myspace/myspace.h Sat Nov 17 19:41:12 2007 +0000 +++ b/libpurple/protocols/myspace/myspace.h Sat Nov 17 19:58:00 2007 +0000 @@ -41,7 +41,7 @@ #include "notify.h" #include "plugin.h" #include "accountopt.h" -#include "libpurple/version.h" +#include "version.h" #include "cipher.h" /* for SHA-1 */ #include "util.h" /* for base64 */ #include "debug.h" /* for purple_debug_info */
--- a/libpurple/signals.c Sat Nov 17 19:41:12 2007 +0000 +++ b/libpurple/signals.c Sat Nov 17 19:58:00 2007 +0000 @@ -450,13 +450,6 @@ instance_data = (PurpleInstanceData *)g_hash_table_lookup(instance_table, instance); - if (instance_data == NULL) - { - purple_debug(PURPLE_DEBUG_ERROR, "signals", - "Instance data for %s not found!\n", signal); - return; - } - g_return_if_fail(instance_data != NULL); signal_data =