Wed, 18 Sep 2013 14:14:48 +0530
Merged soc.2013.gobjectification branch
--- a/libpurple/Makefile.mingw Wed Sep 18 13:32:19 2013 +0530 +++ b/libpurple/Makefile.mingw Wed Sep 18 14:14:48 2013 +0530 @@ -63,13 +63,15 @@ 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 @@ 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 @@ pluginpref.c \ pounce.c \ prefs.c \ - privacy.c \ + presence.c \ proxy.c \ prpl.c \ purple-socket.c \ @@ -130,6 +133,7 @@ util.c \ version.c \ whiteboard.c \ + xfer.c \ xmlnode.c \ win32/giowin32.c \ win32/libc_interface.c \
--- a/libpurple/plugins/perl/common/Makefile.mingw Wed Sep 18 13:32:19 2013 +0530 +++ b/libpurple/plugins/perl/common/Makefile.mingw Wed Sep 18 14:14:48 2013 +0530 @@ -72,8 +72,8 @@ Status.xs \ Stringref.xs \ Util.xs \ + Xfer.xs \ Whiteboard.xs \ - Xfer.xs \ XMLNode.xs #FALLBACKS = const-c.inc const-xs.inc
--- a/libpurple/protocols/gg/Makefile.mingw Wed Sep 18 13:32:19 2013 +0530 +++ b/libpurple/protocols/gg/Makefile.mingw Wed Sep 18 14:14:48 2013 +0530 @@ -47,7 +47,7 @@ C_SRC = \ account.c \ avatar.c \ - buddylist.c \ + blist.c \ chat.c \ deprecated.c \ edisc.c \
--- a/libpurple/protocols/msn/Makefile.mingw Wed Sep 18 13:32:19 2013 +0530 +++ b/libpurple/protocols/msn/Makefile.mingw Wed Sep 18 14:14:48 2013 +0530 @@ -42,6 +42,7 @@ contact.c\ directconn.c \ error.c \ + ft.c \ group.c \ history.c \ httpconn.c \ @@ -69,7 +70,6 @@ transaction.c \ user.c \ userlist.c \ - xfer.c \ msnutils.c OBJECTS = $(C_SRC:%.c=%.o)
--- a/pidgin/Makefile.mingw Wed Sep 18 13:32:19 2013 +0530 +++ b/pidgin/Makefile.mingw Wed Sep 18 14:14:48 2013 +0530 @@ -71,7 +71,6 @@ gtkdnd-hints.c \ gtkdocklet.c \ gtkeventloop.c \ - gtkft.c \ gtkicon-theme-loader.c \ gtkicon-theme.c \ gtkidle.c \ @@ -102,6 +101,7 @@ gtkwebview.c \ gtkwebviewtoolbar.c \ gtkwhiteboard.c \ + gtkxfer.c \ minidialog.c \ pidginstock.c \ pidgintooltip.c \