/pidgin/main: 83610e0823fb: Win32: fix compilation

[Tomasz Wasilczyk]

Changeset: 83610e0823fbfe133f33f6d09927206cbc3751c4
Author:	 Tomasz Wasilczyk <twasilczyk at pidgin.im>
Date:	 2013-09-16 13:09 +0200
Branch:	 default
URL: https://hg.pidgin.im/pidgin/main/rev/83610e0823fb

Description:

Win32: fix compilation

diffstat:

 libpurple/Makefile.mingw                |   1 +
 libpurple/protocols/gg/Makefile.mingw   |  11 +++++++++--
 libpurple/protocols/jabber/auth_cyrus.c |   2 +-
 3 files changed, 11 insertions(+), 3 deletions(-)

diffs (73 lines):

diff --git a/libpurple/Makefile.mingw b/libpurple/Makefile.mingw
--- a/libpurple/Makefile.mingw
+++ b/libpurple/Makefile.mingw
@@ -152,6 +152,7 @@ LIBS =	\
 		-lnss3 \
 		-lnspr4 \
 		-lgnutls \
+		-lz \
 		$(VV_LIBS)
 
 include $(PIDGIN_COMMON_RULES)
diff --git a/libpurple/protocols/gg/Makefile.mingw b/libpurple/protocols/gg/Makefile.mingw
--- a/libpurple/protocols/gg/Makefile.mingw
+++ b/libpurple/protocols/gg/Makefile.mingw
@@ -32,11 +32,13 @@ INCLUDE_PATHS +=\
 			-I$(GTK_TOP)/include \
 			-I$(GTK_TOP)/include/glib-2.0 \
 			-I$(GTK_TOP)/lib/glib-2.0/include \
-			-I$(GNUTLS_TOP)/include
+			-I$(GNUTLS_TOP)/include \
+			-I$(JSON_GLIB_TOP)/include/json-glib-1.0
 
 LIB_PATHS += \
 			-L$(GTK_TOP)/lib \
 			-L$(GNUTLS_TOP)/lib \
+			-L$(JSON_GLIB_TOP)/lib \
 			-L$(PURPLE_TOP)
 
 ##
@@ -46,9 +48,11 @@ C_SRC =	\
 	account.c \
 	avatar.c \
 	buddylist.c \
-	confer.c \
+	chat.c \
 	deprecated.c \
+	edisc.c \
 	gg.c \
+	html.c \
 	image.c \
 	lib/common.c \
 	lib/dcc.c \
@@ -68,6 +72,7 @@ C_SRC =	\
 	lib/sha1.c \
 	libgadu-events.c \
 	libgaduw.c \
+	message-prpl.c \
 	multilogon.c \
 	oauth/oauth.c \
 	oauth/oauth-parameter.c \
@@ -90,8 +95,10 @@ OBJECTS = $(C_SRC:%.c=%.o)
 ##
 LIBS =	\
 			-lglib-2.0 \
+			-lgobject-2.0 \
 			-lgnutls \
 			-lintl \
+			-ljson-glib-1.0 \
 			-lpurple \
 			-lws2_32 \
 			-lz
diff --git a/libpurple/protocols/jabber/auth_cyrus.c b/libpurple/protocols/jabber/auth_cyrus.c
--- a/libpurple/protocols/jabber/auth_cyrus.c
+++ b/libpurple/protocols/jabber/auth_cyrus.c
@@ -262,7 +262,7 @@ jabber_auth_start_cyrus(JabberStream *js
 					purple_request_yes_no(js->gc, _("Plaintext Authentication"),
 							_("Plaintext Authentication"),
 							msg,
-							1, account, NULL, NULL, account,
+							1, purple_request_cpar_from_account(account), account,
 							allow_cyrus_plaintext_auth,
 							disallow_plaintext_auth);
 					g_free(msg);