adium.1-4: ff3da8fd: explicit merge of 'fc3d5c2a3920e0875ac23...
darkrain42 at pidgin.im
darkrain42 at pidgin.im
Thu Feb 18 12:10:51 EST 2010
-----------------------------------------------------------------
Revision: ff3da8fd8e6ab001379876193c616508d8724025
Ancestor: 202724e8b2db59bbf4315c9e0a48069cf24b6881
Ancestor: fc3d5c2a3920e0875ac235415cea9fc7f5ed780c
Author: darkrain42 at pidgin.im
Date: 2010-02-18T17:03:22
Branch: im.pidgin.adium.1-4
URL: http://d.pidgin.im/viewmtn/revision/info/ff3da8fd8e6ab001379876193c616508d8724025
Added files:
libpurple/protocols/facebook/COPYING
libpurple/protocols/facebook/COPYRIGHT
libpurple/protocols/facebook/Makefile.am
libpurple/protocols/facebook/facebook.nsi
libpurple/protocols/facebook/facebook16.png
libpurple/protocols/facebook/facebook22.png
libpurple/protocols/facebook/facebook48.png
libpurple/protocols/facebook/fb_blist.c
libpurple/protocols/facebook/fb_blist.h
libpurple/protocols/facebook/fb_connection.c
libpurple/protocols/facebook/fb_connection.h
libpurple/protocols/facebook/fb_conversation.c
libpurple/protocols/facebook/fb_conversation.h
libpurple/protocols/facebook/fb_friendlist.c
libpurple/protocols/facebook/fb_friendlist.h
libpurple/protocols/facebook/fb_info.c
libpurple/protocols/facebook/fb_info.h
libpurple/protocols/facebook/fb_json.c
libpurple/protocols/facebook/fb_json.h
libpurple/protocols/facebook/fb_managefriends.c
libpurple/protocols/facebook/fb_managefriends.h
libpurple/protocols/facebook/fb_messages.c
libpurple/protocols/facebook/fb_messages.h
libpurple/protocols/facebook/fb_notifications.c
libpurple/protocols/facebook/fb_notifications.h
libpurple/protocols/facebook/fb_search.c
libpurple/protocols/facebook/fb_search.h
libpurple/protocols/facebook/fb_util.c
libpurple/protocols/facebook/fb_util.h
libpurple/protocols/facebook/libfacebook.c
libpurple/protocols/facebook/libfacebook.h
libpurple/protocols/facebook/login.facebook.com.pem
libpurple/protocols/facebook/pidgin-facebookchat.rc
libpurple/protocols/facebook/rss.xml
libpurple/protocols/jabber/auth_cyrus.c
libpurple/protocols/jabber/auth_digest_md5.c
libpurple/protocols/jabber/auth_plain.c
libpurple/protocols/jabber/auth_scram.c
libpurple/protocols/jabber/auth_scram.h
libpurple/tests/test_jabber_scram.c
pidgin/win32/nsis/translations/norwegian_nynorsk.nsh
po/mr.po po/or.po
Added directories:
libpurple/protocols/facebook
Modified files:
COPYRIGHT ChangeLog ChangeLog.API ChangeLog.win32 NEWS
configure.ac doc/finch.1.in finch/finch.c finch/gntaccount.c
finch/gntblist.c finch/gntcertmgr.c finch/gntconn.c
finch/gntconv.c finch/gntdebug.c finch/gntft.c
finch/gntlog.c finch/gntmedia.c finch/gntnotify.c
finch/gntplugin.c finch/gntpounce.c finch/libgnt/gntkeys.h
finch/libgnt/gnttree.c finch/libgnt/gntutils.c
finch/libgnt/gntwm.c finch/libgnt/wms/irssi.c
finch/libgnt/wms/s.c libpurple/Makefile.am
libpurple/account.c libpurple/blist.c libpurple/buddyicon.c
libpurple/conversation.c libpurple/conversation.h
libpurple/dbus-server.c libpurple/dnssrv.c libpurple/ft.c
libpurple/media.c libpurple/media.h libpurple/network.h
libpurple/plugins/perl/common/Log.xs
libpurple/plugins/perl/common/Proxy.xs
libpurple/plugins/perl/perl-common.c
libpurple/plugins/perl/perl-common.h
libpurple/plugins/perl/perl-handlers.c
libpurple/plugins/signals-test.c libpurple/prefs.h
libpurple/protocols/Makefile.am
libpurple/protocols/bonjour/bonjour.c
libpurple/protocols/bonjour/parser.c
libpurple/protocols/gg/gg.c
libpurple/protocols/gg/lib/common.c
libpurple/protocols/gg/lib/dcc.c
libpurple/protocols/gg/lib/events.c
libpurple/protocols/gg/lib/http.c
libpurple/protocols/gg/lib/libgadu.c
libpurple/protocols/gg/lib/pubdir.c
libpurple/protocols/gg/lib/pubdir50.c
libpurple/protocols/irc/irc.c libpurple/protocols/irc/irc.h
libpurple/protocols/irc/msgs.c
libpurple/protocols/irc/parse.c
libpurple/protocols/jabber/Makefile.am
libpurple/protocols/jabber/Makefile.mingw
libpurple/protocols/jabber/auth.c
libpurple/protocols/jabber/auth.h
libpurple/protocols/jabber/bosh.c
libpurple/protocols/jabber/buddy.c
libpurple/protocols/jabber/data.h
libpurple/protocols/jabber/disco.c
libpurple/protocols/jabber/google.c
libpurple/protocols/jabber/google.h
libpurple/protocols/jabber/iq.c
libpurple/protocols/jabber/jabber.c
libpurple/protocols/jabber/jabber.h
libpurple/protocols/jabber/jingle/jingle.c
libpurple/protocols/jabber/jutil.c
libpurple/protocols/jabber/jutil.h
libpurple/protocols/jabber/libxmpp.c
libpurple/protocols/jabber/message.c
libpurple/protocols/jabber/namespaces.h
libpurple/protocols/jabber/parser.c
libpurple/protocols/jabber/presence.c
libpurple/protocols/jabber/roster.c
libpurple/protocols/jabber/si.c
libpurple/protocols/msn/cmdproc.h
libpurple/protocols/msn/command.h
libpurple/protocols/msn/contact.c
libpurple/protocols/msn/contact.h
libpurple/protocols/msn/dialog.h
libpurple/protocols/msn/directconn.h
libpurple/protocols/msn/error.h
libpurple/protocols/msn/group.h
libpurple/protocols/msn/history.h
libpurple/protocols/msn/httpconn.h
libpurple/protocols/msn/msg.h libpurple/protocols/msn/msn.c
libpurple/protocols/msn/msn.h
libpurple/protocols/msn/msnutils.h
libpurple/protocols/msn/nexus.h
libpurple/protocols/msn/notification.c
libpurple/protocols/msn/notification.h
libpurple/protocols/msn/object.h
libpurple/protocols/msn/oim.h libpurple/protocols/msn/page.h
libpurple/protocols/msn/servconn.h
libpurple/protocols/msn/session.h
libpurple/protocols/msn/slp.c libpurple/protocols/msn/slp.h
libpurple/protocols/msn/slpcall.c
libpurple/protocols/msn/slpcall.h
libpurple/protocols/msn/slplink.c
libpurple/protocols/msn/slplink.h
libpurple/protocols/msn/slpmsg.c
libpurple/protocols/msn/slpmsg.h
libpurple/protocols/msn/soap.h
libpurple/protocols/msn/state.c
libpurple/protocols/msn/state.h
libpurple/protocols/msn/switchboard.c
libpurple/protocols/msn/switchboard.h
libpurple/protocols/msn/sync.h
libpurple/protocols/msn/table.h
libpurple/protocols/msn/transaction.h
libpurple/protocols/msn/user.c
libpurple/protocols/msn/user.h
libpurple/protocols/msn/userlist.c
libpurple/protocols/msn/userlist.h
libpurple/protocols/mxit/actions.c
libpurple/protocols/mxit/chunk.c
libpurple/protocols/mxit/cipher.c
libpurple/protocols/mxit/filexfer.c
libpurple/protocols/mxit/formcmds.c
libpurple/protocols/mxit/http.c
libpurple/protocols/mxit/login.c
libpurple/protocols/mxit/markup.c
libpurple/protocols/mxit/multimx.c
libpurple/protocols/mxit/mxit.c
libpurple/protocols/mxit/profile.c
libpurple/protocols/mxit/protocol.c
libpurple/protocols/mxit/roster.c
libpurple/protocols/mxit/splashscreen.c
libpurple/protocols/myspace/myspace.c
libpurple/protocols/myspace/session.c
libpurple/protocols/myspace/session.h
libpurple/protocols/myspace/user.c
libpurple/protocols/oscar/clientlogin.c
libpurple/protocols/oscar/family_auth.c
libpurple/protocols/oscar/family_oservice.c
libpurple/protocols/oscar/flap_connection.c
libpurple/protocols/oscar/libaim.c
libpurple/protocols/oscar/oscar.c
libpurple/protocols/oscar/oscar.h
libpurple/protocols/oscar/oscarcommon.h
libpurple/protocols/oscar/peer.c
libpurple/protocols/qq/Makefile.am
libpurple/protocols/yahoo/libymsg.c
libpurple/protocols/yahoo/libymsg.h
libpurple/protocols/yahoo/util.c
libpurple/protocols/yahoo/yahoo_friend.c
libpurple/protocols/yahoo/ycht.c libpurple/proxy.c
libpurple/purple-uninstalled.pc.in
libpurple/tests/Makefile.am
libpurple/tests/check_libpurple.c
libpurple/tests/test_cipher.c libpurple/tests/test_util.c
libpurple/tests/tests.h libpurple/util.c libpurple/util.h
libpurple/win32/targets.mak libpurple/xmlnode.c
pidgin/gtkaccount.c pidgin/gtkblist-theme-loader.c
pidgin/gtkblist-theme.c pidgin/gtkblist.c pidgin/gtkconv.c
pidgin/gtkdebug.c pidgin/gtkdialogs.c pidgin/gtkft.c
pidgin/gtkimhtml.c pidgin/gtkpounce.c pidgin/gtkprefs.c
pidgin/gtkrequest.c pidgin/gtksmiley.c pidgin/gtksmiley.h
pidgin/gtkstatusbox.c pidgin/gtkthemes.c pidgin/gtkutils.c
pidgin/gtkwhiteboard.c pidgin/pidgin-uninstalled.pc.in
pidgin/plugins/timestamp.c pidgin/win32/gtkwin32dep.c
pidgin/win32/nsis/pidgin-installer.nsi
pidgin/win32/nsis/translations/polish.nsh po/ChangeLog
po/POTFILES.in po/af.po po/bn.po po/cs.po po/de.po po/es.po
po/fr.po po/gu.po po/he.po po/kn.po po/nb.po po/nn.po
po/pa.po po/pl.po po/ru.po po/sk.po po/sl.po po/sq.po
po/sv.po po/ta.po po/uk.po po/zh_CN.po po/zh_HK.po
po/zh_TW.po
Modified attrs:
libpurple/protocols/facebook/facebook16.png
libpurple/protocols/facebook/facebook22.png
libpurple/protocols/facebook/facebook48.png
libpurple/protocols/facebook/fb_util.c
libpurple/protocols/facebook/fb_util.h
ChangeLog:
explicit merge of 'fc3d5c2a3920e0875ac235415cea9fc7f5ed780c'
and '202724e8b2db59bbf4315c9e0a48069cf24b6881'
to branch 'im.pidgin.adium-1.4'
More information about the Commits
mailing list