# HG changeset patch
# User Paul Aurich <paul@darkrain42.org>
# Date 1308013729 0
# Node ID 84152881ad5d042a2dc46231046b559adbd60c6f
# Parent  df7a22ec0bc30e61f5b68b52121b4ae53bd5b1fa# Parent  2d28bf68e63fda4c5ca94b1af699da1d4a5c44fa
merge of '6c48da37034a572986f08a85f9d99927f511b9d3'
     and 'b22fe1b183e37298da577f19bdca6f318b209324'

diff -r 2d28bf68e63f -r 84152881ad5d configure.ac
--- a/configure.ac	Mon Jun 13 22:29:48 2011 +0000
+++ b/configure.ac	Tue Jun 14 01:08:49 2011 +0000
@@ -571,7 +571,6 @@
 			evo_deps="libebook-1.0 libedata-book-1.0"
 			PKG_CHECK_MODULES(EVOLUTION_ADDRESSBOOK, $evo_deps, [
 				enable_gevolution="yes"
-			], [
 			])
 		fi
 		if test "x$enable_gevolution" = "xyes"; then
diff -r 2d28bf68e63f -r 84152881ad5d libpurple/Makefile.am
--- a/libpurple/Makefile.am	Mon Jun 13 22:29:48 2011 +0000
+++ b/libpurple/Makefile.am	Tue Jun 14 01:08:49 2011 +0000
@@ -156,7 +156,6 @@
 	theme-manager.h \
 	upnp.h \
 	util.h \
-	valgrind.h \
 	value.h \
 	xmlnode.h \
 	whiteboard.h
diff -r 2d28bf68e63f -r 84152881ad5d libpurple/protocols/gg/gg.c
--- a/libpurple/protocols/gg/gg.c	Mon Jun 13 22:29:48 2011 +0000
+++ b/libpurple/protocols/gg/gg.c	Tue Jun 14 01:08:49 2011 +0000
@@ -1914,6 +1914,17 @@
 				PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
 				_("Connection failed"));
 			break;
+		case GG_EVENT_MSG:
+			if (ev->event.msg.sender == 0)
+				/* system messages are mostly ads */
+				purple_debug_info("gg", "System message:\n%s\n",
+					ev->event.msg.message);
+			else
+				purple_debug_warning("gg", "GG_EVENT_MSG: message from user %u "
+					"unexpected while connecting:\n%s\n",
+					ev->event.msg.sender,
+					ev->event.msg.message);
+			break;
 		default:
 			purple_debug_error("gg", "strange event: %d\n", ev->type);
 			break;