adium: f7775e8a: propagate from branch 'im.pidgin.pidgin'...
thijsalkemade at gmail.com
thijsalkemade at gmail.com
Tue Jun 7 05:51:01 EDT 2011
----------------------------------------------------------------------
Revision: f7775e8a6facd4c188a8c4610fa2974a6055f6b5
Parent: 32a55bbc4f1e8d632d205d040fa3e814559e1c95
Parent: ab088877a85248be87a95a3b3357c96f79865806
Author: thijsalkemade at gmail.com
Date: 06/07/11 05:44:00
Branch: im.pidgin.adium
URL: http://d.pidgin.im/viewmtn/revision/info/f7775e8a6facd4c188a8c4610fa2974a6055f6b5
Changelog:
propagate from branch 'im.pidgin.pidgin' (head 32a55bbc4f1e8d632d205d040fa3e814559e1c95)
to branch 'im.pidgin.adium' (head ab088877a85248be87a95a3b3357c96f79865806)
Changes against parent 32a55bbc4f1e8d632d205d040fa3e814559e1c95
added libpurple/protocols/facebook
added libpurple/protocols/facebook/COPYING
added libpurple/protocols/facebook/COPYRIGHT
added libpurple/protocols/facebook/Makefile.am
added libpurple/protocols/facebook/facebook.nsi
added libpurple/protocols/facebook/facebook16.png
added libpurple/protocols/facebook/facebook22.png
added libpurple/protocols/facebook/facebook48.png
added libpurple/protocols/facebook/fb_blist.c
added libpurple/protocols/facebook/fb_blist.h
added libpurple/protocols/facebook/fb_connection.c
added libpurple/protocols/facebook/fb_connection.h
added libpurple/protocols/facebook/fb_conversation.c
added libpurple/protocols/facebook/fb_conversation.h
added libpurple/protocols/facebook/fb_friendlist.c
added libpurple/protocols/facebook/fb_friendlist.h
added libpurple/protocols/facebook/fb_info.c
added libpurple/protocols/facebook/fb_info.h
added libpurple/protocols/facebook/fb_json.c
added libpurple/protocols/facebook/fb_json.h
added libpurple/protocols/facebook/fb_managefriends.c
added libpurple/protocols/facebook/fb_managefriends.h
added libpurple/protocols/facebook/fb_messages.c
added libpurple/protocols/facebook/fb_messages.h
added libpurple/protocols/facebook/fb_notifications.c
added libpurple/protocols/facebook/fb_notifications.h
added libpurple/protocols/facebook/fb_search.c
added libpurple/protocols/facebook/fb_search.h
added libpurple/protocols/facebook/fb_util.c
added libpurple/protocols/facebook/fb_util.h
added libpurple/protocols/facebook/libfacebook.c
added libpurple/protocols/facebook/libfacebook.h
added libpurple/protocols/facebook/login.facebook.com.pem
added libpurple/protocols/facebook/pidgin-facebookchat.rc
added libpurple/protocols/facebook/rss.xml
patched configure.ac
patched libpurple/Makefile.am
patched libpurple/account.c
patched libpurple/blist.c
patched libpurple/conversation.c
patched libpurple/conversation.h
patched libpurple/protocols/jabber/auth_cyrus.c
patched libpurple/protocols/jabber/parser.c
patched libpurple/protocols/jabber/roster.c
patched libpurple/protocols/oscar/peer.c
patched libpurple/protocols/yahoo/libymsg.c
patched po/POTFILES.in
attr on libpurple/protocols/facebook/facebook16.png
set mtn:manual_merge
to true
attr on libpurple/protocols/facebook/facebook22.png
set mtn:manual_merge
to true
attr on libpurple/protocols/facebook/facebook48.png
set mtn:manual_merge
to true
attr on libpurple/protocols/facebook/fb_util.c
set mtn:execute
to true
attr on libpurple/protocols/facebook/fb_util.h
set mtn:execute
to true
Changes against parent ab088877a85248be87a95a3b3357c96f79865806
dropped libpurple/protocols/qq
dropped libpurple/protocols/qq/AUTHORS
dropped libpurple/protocols/qq/ChangeLog
dropped libpurple/protocols/qq/Makefile.am
dropped libpurple/protocols/qq/Makefile.mingw
dropped libpurple/protocols/qq/buddy_info.c
dropped libpurple/protocols/qq/buddy_info.h
dropped libpurple/protocols/qq/buddy_list.c
dropped libpurple/protocols/qq/buddy_list.h
dropped libpurple/protocols/qq/buddy_memo.c
dropped libpurple/protocols/qq/buddy_memo.h
dropped libpurple/protocols/qq/buddy_opt.c
dropped libpurple/protocols/qq/buddy_opt.h
dropped libpurple/protocols/qq/char_conv.c
dropped libpurple/protocols/qq/char_conv.h
dropped libpurple/protocols/qq/file_trans.c
dropped libpurple/protocols/qq/file_trans.h
dropped libpurple/protocols/qq/group.c
dropped libpurple/protocols/qq/group.h
dropped libpurple/protocols/qq/group_im.c
dropped libpurple/protocols/qq/group_im.h
dropped libpurple/protocols/qq/group_info.c
dropped libpurple/protocols/qq/group_info.h
dropped libpurple/protocols/qq/group_internal.c
dropped libpurple/protocols/qq/group_internal.h
dropped libpurple/protocols/qq/group_join.c
dropped libpurple/protocols/qq/group_join.h
dropped libpurple/protocols/qq/group_opt.c
dropped libpurple/protocols/qq/group_opt.h
dropped libpurple/protocols/qq/im.c
dropped libpurple/protocols/qq/im.h
dropped libpurple/protocols/qq/packet_parse.c
dropped libpurple/protocols/qq/packet_parse.h
dropped libpurple/protocols/qq/qq.c
dropped libpurple/protocols/qq/qq.h
dropped libpurple/protocols/qq/qq_base.c
dropped libpurple/protocols/qq/qq_base.h
dropped libpurple/protocols/qq/qq_crypt.c
dropped libpurple/protocols/qq/qq_crypt.h
dropped libpurple/protocols/qq/qq_define.c
dropped libpurple/protocols/qq/qq_define.h
dropped libpurple/protocols/qq/qq_network.c
dropped libpurple/protocols/qq/qq_network.h
dropped libpurple/protocols/qq/qq_process.c
dropped libpurple/protocols/qq/qq_process.h
dropped libpurple/protocols/qq/qq_trans.c
dropped libpurple/protocols/qq/qq_trans.h
dropped libpurple/protocols/qq/send_file.c
dropped libpurple/protocols/qq/send_file.h
dropped libpurple/protocols/qq/utils.c
dropped libpurple/protocols/qq/utils.h
dropped libpurple/tests/test_qq.c
dropped pidgin/pixmaps/emblems/16/qq-member.png
dropped pidgin/pixmaps/emblems/scalable/qq-member.svg
dropped pidgin/pixmaps/emotes/default/24/qq.png
dropped pidgin/pixmaps/emotes/default/24/scalable/qq.svg
dropped pidgin/pixmaps/protocols/16/qq.png
dropped pidgin/pixmaps/protocols/16/scalable/qq.svg
dropped pidgin/pixmaps/protocols/22/qq.png
dropped pidgin/pixmaps/protocols/22/scalable/qq.svg
dropped pidgin/pixmaps/protocols/48/qq.png
dropped pidgin/pixmaps/protocols/scalable/qq.svg
added libpurple/protocols/gg/lib/debug.c
added libpurple/protocols/gg/lib/deflate.c
added libpurple/protocols/gg/lib/deflate.h
added libpurple/protocols/gg/lib/encoding.c
added libpurple/protocols/gg/lib/encoding.h
added libpurple/protocols/gg/lib/handlers.c
added libpurple/protocols/gg/lib/libgadu-debug.h
added libpurple/protocols/gg/lib/message.c
added libpurple/protocols/gg/lib/message.h
added libpurple/protocols/gg/lib/session.h
added po/hr.po
added share/ca-certs/DigiCertHighAssuranceCA-3.pem
patched .mtn-ignore
patched AUTHORS
patched COPYRIGHT
patched ChangeLog
patched ChangeLog.API
patched Doxyfile.in
patched Makefile.am
patched NEWS
patched configure.ac
patched doc/account-signals.dox
patched doc/conversation-signals.dox
patched finch/gntblist.c
patched finch/gntconv.c
patched finch/gntnotify.c
patched finch/libgnt/gntcolors.c
patched finch/libgnt/gntwm.c
patched libpurple/account.c
patched libpurple/account.h
patched libpurple/blist.c
patched libpurple/ciphers/des.c
patched libpurple/ciphers/gchecksum.c
patched libpurple/ciphers/hmac.c
patched libpurple/ciphers/md4.c
patched libpurple/ciphers/md5.c
patched libpurple/ciphers/rc4.c
patched libpurple/ciphers/sha1.c
patched libpurple/ciphers/sha256.c
patched libpurple/conversation.c
patched libpurple/conversation.h
patched libpurple/dnsquery.c
patched libpurple/dnsquery.h
patched libpurple/dnssrv.c
patched libpurple/dnssrv.h
patched libpurple/ft.c
patched libpurple/gaim-compat.h
patched libpurple/log.c
patched libpurple/media/backend-fs2.c
patched libpurple/media/backend-iface.c
patched libpurple/media/backend-iface.h
patched libpurple/media-gst.h
patched libpurple/media.c
patched libpurple/media.h
patched libpurple/mediamanager.c
patched libpurple/network.c
patched libpurple/notify.c
patched libpurple/notify.h
patched libpurple/plugins/fortuneprofile.pl
patched libpurple/pounce.c
patched libpurple/pounce.h
patched libpurple/protocols/Makefile.am
patched libpurple/protocols/Makefile.mingw
patched libpurple/protocols/bonjour/bonjour.c
patched libpurple/protocols/bonjour/bonjour_ft.c
patched libpurple/protocols/bonjour/jabber.c
patched libpurple/protocols/bonjour/jabber.h
patched libpurple/protocols/gg/Makefile.am
patched libpurple/protocols/gg/Makefile.mingw
patched libpurple/protocols/gg/gg.c
patched libpurple/protocols/gg/gg.h
patched libpurple/protocols/gg/lib/COPYING
patched libpurple/protocols/gg/lib/common.c
patched libpurple/protocols/gg/lib/dcc.c
patched libpurple/protocols/gg/lib/dcc7.c
patched libpurple/protocols/gg/lib/events.c
patched libpurple/protocols/gg/lib/http.c
patched libpurple/protocols/gg/lib/libgadu-config.h
patched libpurple/protocols/gg/lib/libgadu-internal.h
patched libpurple/protocols/gg/lib/libgadu.c
patched libpurple/protocols/gg/lib/libgadu.h
patched libpurple/protocols/gg/lib/obsolete.c
patched libpurple/protocols/gg/lib/protocol.h
patched libpurple/protocols/gg/lib/pubdir.c
patched libpurple/protocols/gg/lib/pubdir50.c
patched libpurple/protocols/gg/lib/resolver.c
patched libpurple/protocols/gg/lib/resolver.h
patched libpurple/protocols/gg/lib/sha1.c
patched libpurple/protocols/irc/irc.c
patched libpurple/protocols/irc/parse.c
patched libpurple/protocols/jabber/auth_cyrus.c
patched libpurple/protocols/jabber/bosh.c
patched libpurple/protocols/jabber/buddy.c
patched libpurple/protocols/jabber/caps.c
patched libpurple/protocols/jabber/disco.c
patched libpurple/protocols/jabber/google/jingleinfo.c
patched libpurple/protocols/jabber/jabber.c
patched libpurple/protocols/jabber/jabber.h
patched libpurple/protocols/jabber/libxmpp.c
patched libpurple/protocols/jabber/presence.c
patched libpurple/protocols/jabber/roster.c
patched libpurple/protocols/jabber/si.c
patched libpurple/protocols/msn/directconn.c
patched libpurple/protocols/msn/httpconn.c
patched libpurple/protocols/msn/msg.c
patched libpurple/protocols/msn/msg.h
patched libpurple/protocols/msn/msn.c
patched libpurple/protocols/msn/nexus.c
patched libpurple/protocols/msn/nexus.h
patched libpurple/protocols/msn/notification.c
patched libpurple/protocols/msn/oim.c
patched libpurple/protocols/msn/p2p.c
patched libpurple/protocols/msn/p2p.h
patched libpurple/protocols/msn/slpcall.c
patched libpurple/protocols/msn/slpcall.h
patched libpurple/protocols/msn/slplink.c
patched libpurple/protocols/msn/slplink.h
patched libpurple/protocols/msn/slpmsg.c
patched libpurple/protocols/msn/slpmsg.h
patched libpurple/protocols/msn/slpmsg_part.c
patched libpurple/protocols/msn/slpmsg_part.h
patched libpurple/protocols/msn/switchboard.c
patched libpurple/protocols/msn/tlv.c
patched libpurple/protocols/msn/tlv.h
patched libpurple/protocols/mxit/actions.c
patched libpurple/protocols/mxit/chunk.c
patched libpurple/protocols/mxit/chunk.h
patched libpurple/protocols/mxit/formcmds.c
patched libpurple/protocols/mxit/login.c
patched libpurple/protocols/mxit/markup.c
patched libpurple/protocols/mxit/multimx.c
patched libpurple/protocols/mxit/mxit.c
patched libpurple/protocols/mxit/mxit.h
patched libpurple/protocols/mxit/profile.c
patched libpurple/protocols/mxit/profile.h
patched libpurple/protocols/mxit/protocol.c
patched libpurple/protocols/mxit/protocol.h
patched libpurple/protocols/mxit/roster.c
patched libpurple/protocols/mxit/roster.h
patched libpurple/protocols/mxit/voicevideo.c
patched libpurple/protocols/myspace/markup.c
patched libpurple/protocols/myspace/myspace.c
patched libpurple/protocols/myspace/user.c
patched libpurple/protocols/novell/novell.c
patched libpurple/protocols/null/nullprpl.c
patched libpurple/protocols/oscar/authorization.c
patched libpurple/protocols/oscar/encoding.c
patched libpurple/protocols/oscar/family_feedbag.c
patched libpurple/protocols/oscar/libaim.c
patched libpurple/protocols/oscar/libicq.c
patched libpurple/protocols/oscar/oscar.c
patched libpurple/protocols/oscar/oscar.h
patched libpurple/protocols/oscar/oscarcommon.h
patched libpurple/protocols/oscar/userinfo.c
patched libpurple/protocols/silc/chat.c
patched libpurple/protocols/silc/silc.c
patched libpurple/protocols/silc10/silc.c
patched libpurple/protocols/simple/simple.c
patched libpurple/protocols/simple/simple.h
patched libpurple/protocols/yahoo/libyahoo.c
patched libpurple/protocols/yahoo/libyahoojp.c
patched libpurple/protocols/yahoo/libymsg.c
patched libpurple/protocols/yahoo/yahoo_filexfer.c
patched libpurple/protocols/yahoo/yahoo_profile.c
patched libpurple/protocols/zephyr/zephyr.c
patched libpurple/proxy.c
patched libpurple/proxy.h
patched libpurple/prpl.h
patched libpurple/purple-url-handler
patched libpurple/signals.c
patched libpurple/signals.h
patched libpurple/stun.c
patched libpurple/tests/Makefile.am
patched libpurple/tests/check_libpurple.c
patched libpurple/tests/tests.h
patched libpurple/util.c
patched libpurple/xmlnode.c
patched pidgin/gtkaccount.c
patched pidgin/gtkblist.c
patched pidgin/gtkcertmgr.c
patched pidgin/gtkconv.c
patched pidgin/gtkconv.h
patched pidgin/gtkdialogs.c
patched pidgin/gtkft.c
patched pidgin/gtkimhtmltoolbar.c
patched pidgin/gtklog.c
patched pidgin/gtkmedia.c
patched pidgin/gtknotify.c
patched pidgin/gtkplugin.c
patched pidgin/gtkpounce.c
patched pidgin/gtkprefs.c
patched pidgin/gtkprivacy.c
patched pidgin/gtkrequest.c
patched pidgin/gtkroomlist.c
patched pidgin/gtksavedstatuses.c
patched pidgin/gtksmiley.c
patched pidgin/gtkstatusbox.c
patched pidgin/gtkutils.c
patched pidgin/gtkutils.h
patched pidgin/minidialog.c
patched pidgin/minidialog.h
patched pidgin/pidgintooltip.c
patched pidgin/pixmaps/Makefile.am
patched pidgin/pixmaps/emotes/default/24/Makefile.am
patched pidgin/plugins/disco/gtkdisco.c
patched pidgin/plugins/gevolution/add_buddy_dialog.c
patched pidgin/plugins/gevolution/assoc-buddy.c
patched pidgin/plugins/gevolution/gevolution.c
patched pidgin/plugins/spellchk.c
patched pidgin/plugins/vvconfig.c
patched pidgin/plugins/xmppconsole.c
patched pidgin/win32/nsis/pidgin-installer.nsi
patched po/ChangeLog
patched po/POTFILES.in
patched po/bn.po
patched po/ca.po
patched po/cs.po
patched po/de.po
patched po/en_CA.po
patched po/fr.po
patched po/he.po
patched po/hu.po
patched po/ja.po
patched po/l10n.xsl
patched po/ms_MY.po
patched po/nl.po
patched po/nn.po
patched po/pa.po
patched po/pl.po
patched po/ro.po
patched po/ru.po
patched po/sq.po
patched po/uk.po
patched po/zh_HK.po
patched po/zh_TW.po
patched share/ca-certs/Makefile.am
More information about the Commits
mailing list