Mercurial > pidgin
changeset 31666:84152881ad5d
merge of '6c48da37034a572986f08a85f9d99927f511b9d3'
and 'b22fe1b183e37298da577f19bdca6f318b209324'
| author | Paul Aurich <paul@darkrain42.org> |
|---|---|
| date | Tue, 14 Jun 2011 01:08:49 +0000 |
| parents | df7a22ec0bc3 (diff) 2d28bf68e63f (current diff) |
| children | 17f7badf147e |
| files | |
| diffstat | 3 files changed, 11 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- 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
--- 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;