# HG changeset patch
# User Evan Schoenberg <evan.s@dreskin.net>
# Date 1177385529 0
# Node ID 2a575756340a84e0efefa7f7fd003bc992834702
# Parent  2cf8383a806f7024e6fff4e440a3280460de716c# Parent  1f50acd0e7e169bda04dd75bd84ab37faf333d31
merge of 'ed8e54275ef886f687084411cbb9280b8a2e3111'
     and 'fada40b291356ece697cf6bf0fff3e833ea736ad'

diff -r 1f50acd0e7e1 -r 2a575756340a libpurple/plugins/mono/api/Makefile.am
diff -r 1f50acd0e7e1 -r 2a575756340a libpurple/plugins/mono/loader/Makefile.am
diff -r 1f50acd0e7e1 -r 2a575756340a libpurple/plugins/tcl/tcl_ref.c
--- a/libpurple/plugins/tcl/tcl_ref.c	Tue Apr 24 02:51:54 2007 +0000
+++ b/libpurple/plugins/tcl/tcl_ref.c	Tue Apr 24 03:32:09 2007 +0000
@@ -114,16 +114,17 @@
 	char *ptr;
 	PurpleStringref *type;
 	void *value;
+	int magicnumber = strlen("purple-");
 
-	if (strlen(bytes) < 7
-	    || strncmp(bytes, "purple-", 7)
+	if (strlen(bytes) < magicnumber
+	    || strncmp(bytes, "purple-", magicnumber)
 	    || (ptr = strchr(bytes, ':')) == NULL
-	    || (ptr - bytes) == 7)
+	    || (ptr - bytes) == magicnumber)
 		goto badobject;
 
 	/* Bad Ethan */
 	*ptr = '\0';
-	type = purple_stringref_new(bytes + 7);
+	type = purple_stringref_new(bytes + magicnumber);
 	*ptr = ':';
 	ptr++;