adium: 5d38559f: propagate from branch 'im.pidgin.pidgin'...

rekkanoryo at pidgin.im rekkanoryo at pidgin.im
Sat Mar 13 23:08:41 EST 2010


-----------------------------------------------------------------
Revision: 5d38559f56795c5ef121bcd671c0b9609360b907
Ancestor: 6ad3ad43bd53f2084c3880eef72a5fd10c85c234
Ancestor: 84e3b61cfdd1d5370d0ef286179e6bfa70eee8c2
Author: rekkanoryo at pidgin.im
Date: 2010-03-14T03:59:06
Branch: im.pidgin.adium
URL: http://d.pidgin.im/viewmtn/revision/info/5d38559f56795c5ef121bcd671c0b9609360b907

Deleted entries:
        libpurple/protocols/msnp9
        libpurple/protocols/msnp9/Makefile.am
        libpurple/protocols/msnp9/Makefile.mingw
        libpurple/protocols/msnp9/cmdproc.c
        libpurple/protocols/msnp9/cmdproc.h
        libpurple/protocols/msnp9/command.c
        libpurple/protocols/msnp9/command.h
        libpurple/protocols/msnp9/dialog.c
        libpurple/protocols/msnp9/dialog.h
        libpurple/protocols/msnp9/directconn.c
        libpurple/protocols/msnp9/directconn.h
        libpurple/protocols/msnp9/error.c
        libpurple/protocols/msnp9/error.h
        libpurple/protocols/msnp9/group.c
        libpurple/protocols/msnp9/group.h
        libpurple/protocols/msnp9/history.c
        libpurple/protocols/msnp9/history.h
        libpurple/protocols/msnp9/httpconn.c
        libpurple/protocols/msnp9/httpconn.h
        libpurple/protocols/msnp9/msg.c
        libpurple/protocols/msnp9/msg.h
        libpurple/protocols/msnp9/msn-utils.c
        libpurple/protocols/msnp9/msn-utils.h
        libpurple/protocols/msnp9/msn.c
        libpurple/protocols/msnp9/msn.h
        libpurple/protocols/msnp9/nexus.c
        libpurple/protocols/msnp9/nexus.h
        libpurple/protocols/msnp9/notification.c
        libpurple/protocols/msnp9/notification.h
        libpurple/protocols/msnp9/object.c
        libpurple/protocols/msnp9/object.h
        libpurple/protocols/msnp9/page.c
        libpurple/protocols/msnp9/page.h
        libpurple/protocols/msnp9/servconn.c
        libpurple/protocols/msnp9/servconn.h
        libpurple/protocols/msnp9/session.c
        libpurple/protocols/msnp9/session.h
        libpurple/protocols/msnp9/slp.c
        libpurple/protocols/msnp9/slp.h
        libpurple/protocols/msnp9/slpcall.c
        libpurple/protocols/msnp9/slpcall.h
        libpurple/protocols/msnp9/slplink.c
        libpurple/protocols/msnp9/slplink.h
        libpurple/protocols/msnp9/slpmsg.c
        libpurple/protocols/msnp9/slpmsg.h
        libpurple/protocols/msnp9/slpsession.c
        libpurple/protocols/msnp9/slpsession.h
        libpurple/protocols/msnp9/state.c
        libpurple/protocols/msnp9/state.h
        libpurple/protocols/msnp9/switchboard.c
        libpurple/protocols/msnp9/switchboard.h
        libpurple/protocols/msnp9/sync.c
        libpurple/protocols/msnp9/sync.h
        libpurple/protocols/msnp9/table.c
        libpurple/protocols/msnp9/table.h
        libpurple/protocols/msnp9/transaction.c
        libpurple/protocols/msnp9/transaction.h
        libpurple/protocols/msnp9/user.c
        libpurple/protocols/msnp9/user.h
        libpurple/protocols/msnp9/userlist.c
        libpurple/protocols/msnp9/userlist.h pidgin/gtkdocklet-x11.c
Renamed entries:
        pidgin/pixmaps/emblems/16/mobile.png to pidgin/pixmaps/emotes/small/16/mobile.png
        pidgin/pixmaps/emblems/16/music.png to pidgin/pixmaps/emotes/small/16/music.png
        pidgin/pixmaps/emblems/scalable/mobile.svg to pidgin/pixmaps/emotes/small/16/scalable/mobile.svg
        pidgin/pixmaps/emblems/scalable/music.svg to pidgin/pixmaps/emotes/small/16/scalable/music.svg
        pidgin/pixmaps/emotes/default/24/eat.png to pidgin/pixmaps/emotes/default/24/hungry.png
        pidgin/pixmaps/emotes/default/24/in-love.png to pidgin/pixmaps/emotes/default/24/amorous.png
        pidgin/pixmaps/emotes/default/24/love.png to pidgin/pixmaps/emotes/default/24/in_love.png
        pidgin/pixmaps/emotes/default/24/nailbiting.png to pidgin/pixmaps/emotes/default/24/nervous.png
        pidgin/pixmaps/emotes/default/24/shock.png to pidgin/pixmaps/emotes/default/24/shocked.png
        pidgin/pixmaps/emotes/default/24/sleepy.png to pidgin/pixmaps/emotes/default/24/sleeping.png
        pidgin/pixmaps/emotes/default/24/smile-big.png to pidgin/pixmaps/emotes/default/24/excited.png
        pidgin/pixmaps/emotes/default/24/smile.png to pidgin/pixmaps/emotes/default/24/happy.png
        pidgin/pixmaps/emotes/default/24/sweat.png to pidgin/pixmaps/emotes/default/24/hot.png
        pidgin/pixmaps/emotes/default/24/tremble.png to pidgin/pixmaps/emotes/default/24/afraid.png
        pidgin/pixmaps/emotes/default/24/yawn.png to pidgin/pixmaps/emotes/default/24/sleepy.png
        pidgin/pixmaps/emotes/small/16/love.png to pidgin/pixmaps/emotes/small/16/in_love.png
        pidgin/pixmaps/emotes/small/16/shock.png to pidgin/pixmaps/emotes/small/16/shocked.png
        pidgin/pixmaps/emotes/small/16/sleepy.png to pidgin/pixmaps/emotes/small/16/sleeping.png
        pidgin/pixmaps/emotes/small/16/smile-big.png to pidgin/pixmaps/emotes/small/16/excited.png
        pidgin/pixmaps/emotes/small/16/smile.png to pidgin/pixmaps/emotes/small/16/happy.png
        pidgin/pixmaps/emotes/small/16/yawn.png to pidgin/pixmaps/emotes/small/16/sleepy.png
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/gg/lib/dcc7.c
        libpurple/protocols/gg/lib/libgadu-internal.h
        libpurple/protocols/gg/lib/protocol.h
        libpurple/protocols/gg/lib/resolver.c
        libpurple/protocols/gg/lib/resolver.h
        libpurple/protocols/gg/lib/sha1.c
        pidgin/pixmaps/emotes/small/16/afraid.png
        pidgin/pixmaps/emotes/small/16/amorous.png
        pidgin/pixmaps/emotes/small/16/bathing.png
        pidgin/pixmaps/emotes/small/16/cinema.png
        pidgin/pixmaps/emotes/small/16/disappointed.png
        pidgin/pixmaps/emotes/small/16/embarrassed.png
        pidgin/pixmaps/emotes/small/16/hot.png
        pidgin/pixmaps/emotes/small/16/hungry.png
        pidgin/pixmaps/emotes/small/16/internet.png
        pidgin/pixmaps/emotes/small/16/mean.png
        pidgin/pixmaps/emotes/small/16/nervous.png
        pidgin/pixmaps/emotes/small/16/restroom.png
        pidgin/pixmaps/emotes/small/16/sarcastic.png
        pidgin/pixmaps/emotes/small/16/shopping.png
        pidgin/pixmaps/emotes/small/16/studying.png
        pidgin/pixmaps/emotes/small/16/suit.png
        pidgin/pixmaps/emotes/small/16/surfing.png
        pidgin/pixmaps/emotes/small/16/typing.png
        pidgin/pixmaps/emotes/small/16/working.png
        pidgin/pixmaps/emotes/small/16/writing.png
        pidgin/win32/nsis/generate_gtk_zip.sh
Added directories:
        libpurple/protocols/facebook
Modified files:
        .mtn-ignore COPYRIGHT ChangeLog ChangeLog.API
        ChangeLog.win32 Makefile.mingw configure.ac
        finch/gntplugin.c finch/gntprefs.c
        finch/plugins/gnthistory.c libpurple/Makefile.am
        libpurple/Makefile.mingw libpurple/account.c
        libpurple/blist.c libpurple/connection.h
        libpurple/conversation.c libpurple/conversation.h
        libpurple/example/nullclient.c libpurple/ft.c
        libpurple/log.c libpurple/plugins/log_reader.c
        libpurple/plugins/perl/common/Makefile.mingw
        libpurple/plugins/perl/common/Request.xs
        libpurple/plugins/perl/common/module.h
        libpurple/plugins/perl/perl-common.c
        libpurple/plugins/perl/perl-common.h
        libpurple/plugins/perl/perl-handlers.c
        libpurple/plugins/ssl/Makefile.mingw
        libpurple/protocols/Makefile.am
        libpurple/protocols/bonjour/Makefile.mingw
        libpurple/protocols/bonjour/bonjour.c
        libpurple/protocols/bonjour/bonjour_ft.c
        libpurple/protocols/bonjour/jabber.c
        libpurple/protocols/bonjour/jabber.h
        libpurple/protocols/bonjour/mdns_avahi.c
        libpurple/protocols/bonjour/mdns_win32.c
        libpurple/protocols/gg/Makefile.am
        libpurple/protocols/gg/Makefile.mingw
        libpurple/protocols/gg/buddylist.c
        libpurple/protocols/gg/gg.c
        libpurple/protocols/gg/lib/common.c
        libpurple/protocols/gg/lib/compat.h
        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/libgadu.h
        libpurple/protocols/gg/lib/obsolete.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.mingw
        libpurple/protocols/jabber/auth_cyrus.c
        libpurple/protocols/jabber/bosh.c
        libpurple/protocols/jabber/buddy.c
        libpurple/protocols/jabber/data.c
        libpurple/protocols/jabber/disco.c
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/jabber/jabber.h
        libpurple/protocols/jabber/jutil.c
        libpurple/protocols/jabber/libxmpp.c
        libpurple/protocols/jabber/message.c
        libpurple/protocols/jabber/parser.c
        libpurple/protocols/jabber/pep.c
        libpurple/protocols/jabber/presence.c
        libpurple/protocols/jabber/presence.h
        libpurple/protocols/jabber/roster.c
        libpurple/protocols/jabber/useravatar.c
        libpurple/protocols/jabber/usermood.c
        libpurple/protocols/jabber/usermood.h
        libpurple/protocols/jabber/usernick.c
        libpurple/protocols/jabber/xdata.c
        libpurple/protocols/msn/msn.c libpurple/protocols/msn/slp.c
        libpurple/protocols/msn/slp.h
        libpurple/protocols/msn/slplink.c
        libpurple/protocols/mxit/mxit.c
        libpurple/protocols/mxit/mxit.h
        libpurple/protocols/myspace/myspace.c
        libpurple/protocols/novell/novell.c
        libpurple/protocols/null/nullprpl.c
        libpurple/protocols/oscar/clientlogin.c
        libpurple/protocols/oscar/family_buddy.c
        libpurple/protocols/oscar/family_icbm.c
        libpurple/protocols/oscar/family_locate.c
        libpurple/protocols/oscar/flap_connection.c
        libpurple/protocols/oscar/libaim.c
        libpurple/protocols/oscar/libicq.c
        libpurple/protocols/oscar/oscar.c
        libpurple/protocols/oscar/oscar.h
        libpurple/protocols/oscar/oscarcommon.h
        libpurple/protocols/oscar/peer.c
        libpurple/protocols/oscar/tlv.c libpurple/protocols/qq/qq.c
        libpurple/protocols/sametime/sametime.c
        libpurple/protocols/silc/buddy.c
        libpurple/protocols/silc/chat.c
        libpurple/protocols/silc/silc.c
        libpurple/protocols/silc10/buddy.c
        libpurple/protocols/silc10/chat.c
        libpurple/protocols/simple/simple.c
        libpurple/protocols/yahoo/libyahoo.c
        libpurple/protocols/yahoo/libyahoojp.c
        libpurple/protocols/yahoo/libymsg.c
        libpurple/protocols/yahoo/libymsg.h
        libpurple/protocols/zephyr/zephyr.c libpurple/prpl.h
        libpurple/request.c libpurple/request.h libpurple/signals.c
        libpurple/signals.h libpurple/status.c libpurple/status.h
        libpurple/upnp.c libpurple/win32/global.mak
        libpurple/win32/libc_interface.c
        libpurple/win32/libc_interface.h libpurple/win32/rules.mak
        libpurple/win32/win32dep.c pidgin/Makefile.am
        pidgin/Makefile.mingw pidgin/gtkblist.c pidgin/gtkdebug.c
        pidgin/gtkdialogs.c pidgin/gtkdocklet-gtk.c pidgin/gtkft.c
        pidgin/gtkimhtml.c pidgin/gtkprefs.c pidgin/gtkprivacy.c
        pidgin/gtkrequest.c pidgin/gtksavedstatuses.c
        pidgin/gtkutils.c pidgin/pidginstock.c
        pidgin/pixmaps/Makefile.am
        pidgin/pixmaps/emotes/default/24/Makefile.am
        pidgin/pixmaps/emotes/default/24/default.theme.in
        pidgin/pixmaps/emotes/small/16/Makefile.am
        pidgin/pixmaps/emotes/small/16/TODO
        pidgin/pixmaps/emotes/small/16/small.theme.in
        pidgin/plugins/gestures/gestures.c
        pidgin/plugins/gevolution/assoc-buddy.c
        pidgin/plugins/gtkbuddynote.c
        pidgin/plugins/perl/common/Makefile.mingw
        pidgin/plugins/win32/transparency/win2ktrans.c
        pidgin/plugins/xmppconsole.c pidgin/win32/gtkdocklet-win32.c
        pidgin/win32/gtkwin32dep.c pidgin/win32/nsis/available.lst
        pidgin/win32/nsis/langmacros.nsh
        pidgin/win32/nsis/pidgin-installer.nsi
        pidgin/win32/nsis/translations/afrikaans.nsh
        pidgin/win32/nsis/translations/arabic.nsh
        pidgin/win32/nsis/translations/basque.nsh
        pidgin/win32/nsis/translations/catalan.nsh
        pidgin/win32/nsis/translations/dutch.nsh
        pidgin/win32/nsis/translations/english.nsh
        pidgin/win32/nsis/translations/finnish.nsh
        pidgin/win32/nsis/translations/french.nsh
        pidgin/win32/nsis/translations/german.nsh
        pidgin/win32/nsis/translations/hebrew.nsh
        pidgin/win32/nsis/translations/hungarian.nsh
        pidgin/win32/nsis/translations/italian.nsh
        pidgin/win32/nsis/translations/japanese.nsh
        pidgin/win32/nsis/translations/kurdish.nsh
        pidgin/win32/nsis/translations/lithuanian.nsh
        pidgin/win32/nsis/translations/norwegian.nsh
        pidgin/win32/nsis/translations/norwegian_nynorsk.nsh
        pidgin/win32/nsis/translations/persian.nsh
        pidgin/win32/nsis/translations/polish.nsh
        pidgin/win32/nsis/translations/portuguese-br.nsh
        pidgin/win32/nsis/translations/simp-chinese.nsh
        pidgin/win32/nsis/translations/slovak.nsh
        pidgin/win32/nsis/translations/slovenian.nsh
        pidgin/win32/nsis/translations/swedish.nsh
        pidgin/win32/nsis/translations/trad-chinese.nsh
        pidgin/win32/nsis/translations/valencian.nsh
        pidgin/win32/winpidgin.c pidgin/win32/wspell.c
        po/POTFILES.in
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
        pidgin/pixmaps/emotes/small/16/afraid.png
        pidgin/pixmaps/emotes/small/16/amorous.png
        pidgin/pixmaps/emotes/small/16/bathing.png
        pidgin/pixmaps/emotes/small/16/cinema.png
        pidgin/pixmaps/emotes/small/16/disappointed.png
        pidgin/pixmaps/emotes/small/16/embarrassed.png
        pidgin/pixmaps/emotes/small/16/hot.png
        pidgin/pixmaps/emotes/small/16/hungry.png
        pidgin/pixmaps/emotes/small/16/internet.png
        pidgin/pixmaps/emotes/small/16/mean.png
        pidgin/pixmaps/emotes/small/16/nervous.png
        pidgin/pixmaps/emotes/small/16/restroom.png
        pidgin/pixmaps/emotes/small/16/sarcastic.png
        pidgin/pixmaps/emotes/small/16/shopping.png
        pidgin/pixmaps/emotes/small/16/studying.png
        pidgin/pixmaps/emotes/small/16/suit.png
        pidgin/pixmaps/emotes/small/16/surfing.png
        pidgin/pixmaps/emotes/small/16/typing.png
        pidgin/pixmaps/emotes/small/16/working.png
        pidgin/pixmaps/emotes/small/16/writing.png
        pidgin/win32/nsis/generate_gtk_zip.sh

ChangeLog: 

propagate from branch 'im.pidgin.pidgin' (head 84e3b61cfdd1d5370d0ef286179e6bfa70eee8c2)
            to branch 'im.pidgin.adium' (head 6ad3ad43bd53f2084c3880eef72a5fd10c85c234)



More information about the Commits mailing list