/soc/2013/ankitkv/gobjectification: 90151831111f: Merged soc.201...

[Ankit Vani]

Changeset: 90151831111fee5450fb268a51da8c6c4808f717
Author:	 Ankit Vani <a at nevitus.org>
Date:	 2013-09-18 14:14 +0530
Branch:	 soc.2013.gobjectification.plugins
URL: https://hg.pidgin.im/soc/2013/ankitkv/gobjectification/rev/90151831111f

Description:

Merged soc.2013.gobjectification branch

diffstat:

 libpurple/Makefile.mingw                     |  12 ++++++++----
 libpurple/plugins/perl/common/Makefile.mingw |   2 +-
 libpurple/protocols/gg/Makefile.mingw        |   2 +-
 libpurple/protocols/msn/Makefile.mingw       |   2 +-
 pidgin/Makefile.mingw                        |   2 +-
 5 files changed, 12 insertions(+), 8 deletions(-)

diffs (117 lines):

diff --git a/libpurple/Makefile.mingw b/libpurple/Makefile.mingw
--- a/libpurple/Makefile.mingw
+++ b/libpurple/Makefile.mingw
@@ -63,13 +63,15 @@ C_SRC =	\
 			account.c \
 			accounts.c \
 			accountopt.c \
-			blist.c \
+			blistnode.c \
+			blistnodetypes.c \
+			buddylist.c \
 			buddyicon.c \
 			certificate.c \
 			cipher.c \
 			ciphers/aescipher.c \
+			ciphers/descipher.c \
 			ciphers/des3cipher.c \
-			ciphers/descipher.c \
 			ciphers/hmaccipher.c \
 			ciphers/md4hash.c \
 			ciphers/md5hash.c \
@@ -81,13 +83,14 @@ C_SRC =	\
 			cmds.c \
 			connection.c \
 			conversation.c \
+			conversationtypes.c \
 			conversations.c \
 			core.c \
 			debug.c \
 			dnsquery.c \
 			dnssrv.c \
 			eventloop.c \
-			ft.c \
+			hash.c \
 			http.c \
 			idle.c \
 			imgstore.c \
@@ -106,7 +109,7 @@ C_SRC =	\
 			pluginpref.c \
 			pounce.c \
 			prefs.c \
-			privacy.c \
+			presence.c \
 			proxy.c \
 			prpl.c \
 			purple-socket.c \
@@ -130,6 +133,7 @@ C_SRC =	\
 			util.c \
 			version.c \
 			whiteboard.c \
+			xfer.c \
 			xmlnode.c \
 			win32/giowin32.c \
 			win32/libc_interface.c \
diff --git a/libpurple/plugins/perl/common/Makefile.mingw b/libpurple/plugins/perl/common/Makefile.mingw
--- a/libpurple/plugins/perl/common/Makefile.mingw
+++ b/libpurple/plugins/perl/common/Makefile.mingw
@@ -72,8 +72,8 @@ XS_FILES =		Account.xs \
 				Status.xs \
 				Stringref.xs \
 				Util.xs \
+				Xfer.xs \
 				Whiteboard.xs \
-				Xfer.xs \
 				XMLNode.xs
 
 #FALLBACKS =	const-c.inc const-xs.inc
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
@@ -47,7 +47,7 @@ LIB_PATHS += \
 C_SRC =	\
 	account.c \
 	avatar.c \
-	buddylist.c \
+	blist.c \
 	chat.c \
 	deprecated.c \
 	edisc.c \
diff --git a/libpurple/protocols/msn/Makefile.mingw b/libpurple/protocols/msn/Makefile.mingw
--- a/libpurple/protocols/msn/Makefile.mingw
+++ b/libpurple/protocols/msn/Makefile.mingw
@@ -42,6 +42,7 @@ C_SRC =			cmdproc.c \
 			contact.c\
 			directconn.c \
 			error.c \
+			ft.c \
 			group.c \
 			history.c \
 			httpconn.c \
@@ -69,7 +70,6 @@ C_SRC =			cmdproc.c \
 			transaction.c \
 			user.c \
 			userlist.c \
-			xfer.c \
 			msnutils.c
 
 OBJECTS = $(C_SRC:%.c=%.o)
diff --git a/pidgin/Makefile.mingw b/pidgin/Makefile.mingw
--- a/pidgin/Makefile.mingw
+++ b/pidgin/Makefile.mingw
@@ -71,7 +71,6 @@ PIDGIN_C_SRC =	\
 			gtkdnd-hints.c \
 			gtkdocklet.c \
 			gtkeventloop.c \
-			gtkft.c \
 			gtkicon-theme-loader.c \
 			gtkicon-theme.c \
 			gtkidle.c \
@@ -102,6 +101,7 @@ PIDGIN_C_SRC =	\
 			gtkwebview.c \
 			gtkwebviewtoolbar.c \
 			gtkwhiteboard.c \
+			gtkxfer.c \
 			minidialog.c \
 			pidginstock.c \
 			pidgintooltip.c \