# HG changeset patch
# User Evan Schoenberg <evan.s@dreskin.net>
# Date 1195328458 0
# Node ID 54b99216888873c24120096bd313531220e43e33
# Parent  c797c101b3580daccaeb6879704e86fb3556dc1e# Parent  e3bad210e005130cf772e886e56a89e9b46bba00
merge of '451870242251136bbe412d57d396a243cdcba188'
     and 'e98859404f9599f2db1a5ebea2a0b340ad4701b8'

diff -r c797c101b358 -r 54b992168888 libpurple/Makefile.am
--- a/libpurple/Makefile.am	Sat Nov 17 17:44:21 2007 +0000
+++ b/libpurple/Makefile.am	Sat Nov 17 19:40:58 2007 +0000
@@ -237,6 +237,8 @@
 	$(LIBXML_LIBS) \
 	$(LIBNM_LIBS) \
 	$(INTLLIBS) \
+	$(SASL_LIBS) \
+	$(MEANWHILE_LIBS) \
 	-lm
 
 AM_CPPFLAGS = \
diff -r c797c101b358 -r 54b992168888 libpurple/protocols/msnp9/msn.c
--- a/libpurple/protocols/msnp9/msn.c	Sat Nov 17 17:44:21 2007 +0000
+++ b/libpurple/protocols/msnp9/msn.c	Sat Nov 17 19:40:58 2007 +0000
@@ -2218,4 +2218,4 @@
 		PURPLE_CALLBACK(msn_uri_handler), NULL);
 }
 
-PURPLE_INIT_PLUGIN(msn, init_plugin, info);
+PURPLE_INIT_PLUGIN(msnp9, init_plugin, info);
diff -r c797c101b358 -r 54b992168888 libpurple/protocols/myspace/myspace.h
--- a/libpurple/protocols/myspace/myspace.h	Sat Nov 17 17:44:21 2007 +0000
+++ b/libpurple/protocols/myspace/myspace.h	Sat Nov 17 19:40:58 2007 +0000
@@ -41,7 +41,7 @@
 #include "notify.h"
 #include "plugin.h"
 #include "accountopt.h"
-#include "version.h"
+#include "libpurple/version.h"
 #include "cipher.h"     /* for SHA-1 */
 #include "util.h"       /* for base64 */
 #include "debug.h"      /* for purple_debug_info */
diff -r c797c101b358 -r 54b992168888 libpurple/signals.c
--- a/libpurple/signals.c	Sat Nov 17 17:44:21 2007 +0000
+++ b/libpurple/signals.c	Sat Nov 17 19:40:58 2007 +0000
@@ -450,6 +450,13 @@
 	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 =