adium: 3171769c: propagate from branch 'im.pidgin.pidgin'...

darkrain42 at pidgin.im darkrain42 at pidgin.im
Thu Feb 18 12:01:50 EST 2010


-----------------------------------------------------------------
Revision: 3171769c37ae8760750c72030e11ddfb20d05ca4
Ancestor: 624bba8bd37445c496620c94bfe6da7da8af2ee4
Ancestor: a64b3ed8ac6c82ec1217bddd04603cc0338c8494
Author: darkrain42 at pidgin.im
Date: 2010-02-18T16:33:09
Branch: im.pidgin.adium
URL: http://d.pidgin.im/viewmtn/revision/info/3171769c37ae8760750c72030e11ddfb20d05ca4

Deleted entries:
        pidgin/gtkcelllayout.c pidgin/gtkcelllayout.h
        pidgin/gtkcellrendererprogress.c
        pidgin/gtkcellrendererprogress.h pidgin/gtkcellview.c
        pidgin/gtkcellview.h pidgin/gtkcellviewmenuitem.c
        pidgin/gtkcellviewmenuitem.h pidgin/gtkexpander.c
        pidgin/gtkexpander.h pidgin/pidgincombobox.c
        pidgin/pidgincombobox.h pidgin/pixmaps/tray/22
        pidgin/pixmaps/tray/32 pidgin/pixmaps/tray/48
Renamed entries:
        pidgin/pixmaps/tray/16/tray-away.png to pidgin/pixmaps/tray/hicolor/16x16/status/pidgin-tray-away.png
        pidgin/pixmaps/tray/16/tray-busy.png to pidgin/pixmaps/tray/hicolor/16x16/status/pidgin-tray-busy.png
        pidgin/pixmaps/tray/16/tray-connecting.png to pidgin/pixmaps/tray/hicolor/16x16/status/pidgin-tray-connect.png
        pidgin/pixmaps/tray/16/tray-extended-away.png to pidgin/pixmaps/tray/hicolor/16x16/status/pidgin-tray-xa.png
        pidgin/pixmaps/tray/16/tray-invisible.png to pidgin/pixmaps/tray/hicolor/16x16/status/pidgin-tray-invisible.png
        pidgin/pixmaps/tray/16/tray-message.png to pidgin/pixmaps/tray/hicolor/16x16/status/pidgin-tray-email.png
        pidgin/pixmaps/tray/16/tray-new-im.png to pidgin/pixmaps/tray/hicolor/16x16/status/pidgin-tray-pending.png
        pidgin/pixmaps/tray/16/tray-offline.png to pidgin/pixmaps/tray/hicolor/16x16/status/pidgin-tray-offline.png
        pidgin/pixmaps/tray/16/tray-online.png to pidgin/pixmaps/tray/hicolor/16x16/status/pidgin-tray-available.png
        pidgin/pixmaps/tray/22/tray-away.png to pidgin/pixmaps/tray/hicolor/22x22/status/pidgin-tray-away.png
        pidgin/pixmaps/tray/22/tray-busy.png to pidgin/pixmaps/tray/hicolor/22x22/status/pidgin-tray-busy.png
        pidgin/pixmaps/tray/22/tray-connecting.png to pidgin/pixmaps/tray/hicolor/22x22/status/pidgin-tray-connect.png
        pidgin/pixmaps/tray/22/tray-extended-away.png to pidgin/pixmaps/tray/hicolor/22x22/status/pidgin-tray-xa.png
        pidgin/pixmaps/tray/22/tray-invisible.png to pidgin/pixmaps/tray/hicolor/22x22/status/pidgin-tray-invisible.png
        pidgin/pixmaps/tray/22/tray-message.png to pidgin/pixmaps/tray/hicolor/22x22/status/pidgin-tray-email.png
        pidgin/pixmaps/tray/22/tray-new-im.png to pidgin/pixmaps/tray/hicolor/22x22/status/pidgin-tray-pending.png
        pidgin/pixmaps/tray/22/tray-offline.png to pidgin/pixmaps/tray/hicolor/22x22/status/pidgin-tray-offline.png
        pidgin/pixmaps/tray/22/tray-online.png to pidgin/pixmaps/tray/hicolor/22x22/status/pidgin-tray-available.png
        pidgin/pixmaps/tray/32/tray-away.png to pidgin/pixmaps/tray/hicolor/32x32/status/pidgin-tray-away.png
        pidgin/pixmaps/tray/32/tray-busy.png to pidgin/pixmaps/tray/hicolor/32x32/status/pidgin-tray-busy.png
        pidgin/pixmaps/tray/32/tray-connecting.png to pidgin/pixmaps/tray/hicolor/32x32/status/pidgin-tray-connect.png
        pidgin/pixmaps/tray/32/tray-extended-away.png to pidgin/pixmaps/tray/hicolor/32x32/status/pidgin-tray-xa.png
        pidgin/pixmaps/tray/32/tray-invisible.png to pidgin/pixmaps/tray/hicolor/32x32/status/pidgin-tray-invisible.png
        pidgin/pixmaps/tray/32/tray-message.png to pidgin/pixmaps/tray/hicolor/32x32/status/pidgin-tray-email.png
        pidgin/pixmaps/tray/32/tray-new-im.png to pidgin/pixmaps/tray/hicolor/32x32/status/pidgin-tray-pending.png
        pidgin/pixmaps/tray/32/tray-offline.png to pidgin/pixmaps/tray/hicolor/32x32/status/pidgin-tray-offline.png
        pidgin/pixmaps/tray/32/tray-online.png to pidgin/pixmaps/tray/hicolor/32x32/status/pidgin-tray-available.png
        pidgin/pixmaps/tray/48/tray-away.png to pidgin/pixmaps/tray/hicolor/48x48/status/pidgin-tray-away.png
        pidgin/pixmaps/tray/48/tray-busy.png to pidgin/pixmaps/tray/hicolor/48x48/status/pidgin-tray-busy.png
        pidgin/pixmaps/tray/48/tray-connecting.png to pidgin/pixmaps/tray/hicolor/48x48/status/pidgin-tray-connect.png
        pidgin/pixmaps/tray/48/tray-extended-away.png to pidgin/pixmaps/tray/hicolor/48x48/status/pidgin-tray-xa.png
        pidgin/pixmaps/tray/48/tray-invisible.png to pidgin/pixmaps/tray/hicolor/48x48/status/pidgin-tray-invisible.png
        pidgin/pixmaps/tray/48/tray-message.png to pidgin/pixmaps/tray/hicolor/48x48/status/pidgin-tray-email.png
        pidgin/pixmaps/tray/48/tray-new-im.png to pidgin/pixmaps/tray/hicolor/48x48/status/pidgin-tray-pending.png
        pidgin/pixmaps/tray/48/tray-offline.png to pidgin/pixmaps/tray/hicolor/48x48/status/pidgin-tray-offline.png
        pidgin/pixmaps/tray/48/tray-online.png to pidgin/pixmaps/tray/hicolor/48x48/status/pidgin-tray-available.png
Added files:
        libpurple/media/backend-fs2.c libpurple/media/backend-fs2.h
        libpurple/media/backend-iface.c
        libpurple/media/backend-iface.h libpurple/media/candidate.c
        libpurple/media/candidate.h libpurple/media/codec.c
        libpurple/media/codec.h libpurple/media/enum-types.c
        libpurple/media/enum-types.h
        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/purple-2-uninstalled.pc.in
        libpurple/purple-2.pc.in libpurple/tests/test_jabber_scram.c
        pidgin/gtkdocklet-gtk.c pidgin/pidgin-2-uninstalled.pc.in
        pidgin/pidgin-2.pc.in pidgin/win32/nsis/available.lst
        pidgin/win32/nsis/translations/norwegian_nynorsk.nsh
        po/mr.po po/or.po
Added directories:
        libpurple/media libpurple/protocols/facebook
        pidgin/pixmaps/tray/hicolor
        pidgin/pixmaps/tray/hicolor/16x16
        pidgin/pixmaps/tray/hicolor/16x16/status
        pidgin/pixmaps/tray/hicolor/22x22
        pidgin/pixmaps/tray/hicolor/22x22/status
        pidgin/pixmaps/tray/hicolor/32x32
        pidgin/pixmaps/tray/hicolor/32x32/status
        pidgin/pixmaps/tray/hicolor/48x48
        pidgin/pixmaps/tray/hicolor/48x48/status
Modified files:
        COPYRIGHT ChangeLog ChangeLog.API ChangeLog.win32
        Makefile.mingw 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/gntidle.c
        finch/gntlog.c finch/gntmedia.c finch/gntnotify.c
        finch/gntplugin.c finch/gntpounce.c finch/gntrequest.c
        finch/gntsound.c finch/gntstatus.c finch/libgnt/configure.ac
        finch/libgnt/gntinternal.h finch/libgnt/gntkeys.h
        finch/libgnt/gntline.c finch/libgnt/gntmenuitem.c
        finch/libgnt/gntmenuitemcheck.c
        finch/libgnt/gntprogressbar.c finch/libgnt/gntslider.c
        finch/libgnt/gnttree.c finch/libgnt/gntutils.c
        finch/libgnt/gntwidget.c finch/libgnt/gntwindow.c
        finch/libgnt/gntwm.c finch/libgnt/wms/irssi.c
        finch/libgnt/wms/s.c libpurple/Makefile.am
        libpurple/Makefile.mingw libpurple/account.c
        libpurple/account.h libpurple/blist.c libpurple/blist.h
        libpurple/buddyicon.c libpurple/certificate.c
        libpurple/connection.h libpurple/conversation.c
        libpurple/conversation.h libpurple/core.c
        libpurple/dbus-server.c libpurple/dnssrv.c libpurple/ft.c
        libpurple/internal.h libpurple/marshallers.list
        libpurple/media.c libpurple/media.h libpurple/mediamanager.c
        libpurple/mediamanager.h libpurple/network.c
        libpurple/network.h libpurple/plugin.c
        libpurple/plugins/autoaccept.c
        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/buddy.h
        libpurple/protocols/jabber/chat.c
        libpurple/protocols/jabber/chat.h
        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/jingle/rtp.c
        libpurple/protocols/jabber/jingle/session.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.c libpurple/protocols/msn/msg.h
        libpurple/protocols/msn/msn.c libpurple/protocols/msn/msn.h
        libpurple/protocols/msn/msnutils.h
        libpurple/protocols/msn/nexus.c
        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/msnp9/msn.c
        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/protocol.h
        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/myspace/user.h
        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/qq/buddy_memo.c
        libpurple/protocols/yahoo/libymsg.c
        libpurple/protocols/yahoo/libymsg.h
        libpurple/protocols/yahoo/util.c
        libpurple/protocols/yahoo/yahoo_filexfer.c
        libpurple/protocols/yahoo/yahoo_friend.c
        libpurple/protocols/yahoo/ycht.c libpurple/proxy.c
        libpurple/prpl.c libpurple/prpl.h
        libpurple/purple-uninstalled.pc.in libpurple/purple.pc.in
        libpurple/sound.h 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/libc_interface.c
        libpurple/win32/libc_interface.h
        libpurple/win32/libc_internal.h libpurple/win32/targets.mak
        libpurple/win32/win32dep.c libpurple/xmlnode.c
        pidgin/Makefile.am pidgin/Makefile.mingw pidgin/gtkaccount.c
        pidgin/gtkblist-theme-loader.c pidgin/gtkblist-theme.c
        pidgin/gtkblist.c pidgin/gtkblist.h
        pidgin/gtkcellrendererexpander.c pidgin/gtkconv.c
        pidgin/gtkconv.h pidgin/gtkdebug.c pidgin/gtkdialogs.c
        pidgin/gtkdialogs.h pidgin/gtkdocklet-x11.c
        pidgin/gtkdocklet.h pidgin/gtkft.c pidgin/gtkimhtml.c
        pidgin/gtkimhtmltoolbar.c pidgin/gtkimhtmltoolbar.h
        pidgin/gtklog.c pidgin/gtkmain.c pidgin/gtkmenutray.c
        pidgin/gtknotify.c pidgin/gtkplugin.c pidgin/gtkpounce.c
        pidgin/gtkprefs.c pidgin/gtkrequest.c
        pidgin/gtksavedstatuses.c pidgin/gtkscrollbook.c
        pidgin/gtksession.c pidgin/gtksmiley.c pidgin/gtksmiley.h
        pidgin/gtksound.c pidgin/gtkstatusbox.c pidgin/gtkthemes.c
        pidgin/gtkutils.c pidgin/gtkutils.h pidgin/gtkwhiteboard.c
        pidgin/minidialog.c pidgin/pidgin-uninstalled.pc.in
        pidgin/pidgin.h pidgin/pidgin.pc.in pidgin/pidginstock.c
        pidgin/pidginstock.h pidgin/pidgintooltip.c
        pidgin/pixmaps/Makefile.am
        pidgin/plugins/gestures/gestures.c
        pidgin/plugins/perl/common/Makefile.mingw
        pidgin/plugins/pidginrc.c pidgin/plugins/spellchk.c
        pidgin/plugins/timestamp.c pidgin/plugins/xmppconsole.c
        pidgin/win32/gtkdocklet-win32.c pidgin/win32/gtkwin32dep.c
        pidgin/win32/nsis/langmacros.nsh
        pidgin/win32/nsis/pidgin-installer.nsi
        pidgin/win32/nsis/translations/afrikaans.nsh
        pidgin/win32/nsis/translations/albanian.nsh
        pidgin/win32/nsis/translations/arabic.nsh
        pidgin/win32/nsis/translations/basque.nsh
        pidgin/win32/nsis/translations/bulgarian.nsh
        pidgin/win32/nsis/translations/catalan.nsh
        pidgin/win32/nsis/translations/czech.nsh
        pidgin/win32/nsis/translations/danish.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/galician.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/korean.nsh
        pidgin/win32/nsis/translations/kurdish.nsh
        pidgin/win32/nsis/translations/lithuanian.nsh
        pidgin/win32/nsis/translations/norwegian.nsh
        pidgin/win32/nsis/translations/persian.nsh
        pidgin/win32/nsis/translations/polish.nsh
        pidgin/win32/nsis/translations/portuguese-br.nsh
        pidgin/win32/nsis/translations/portuguese.nsh
        pidgin/win32/nsis/translations/romanian.nsh
        pidgin/win32/nsis/translations/russian.nsh
        pidgin/win32/nsis/translations/serbian-latin.nsh
        pidgin/win32/nsis/translations/simp-chinese.nsh
        pidgin/win32/nsis/translations/slovak.nsh
        pidgin/win32/nsis/translations/slovenian.nsh
        pidgin/win32/nsis/translations/spanish.nsh
        pidgin/win32/nsis/translations/swedish.nsh
        pidgin/win32/nsis/translations/trad-chinese.nsh
        pidgin/win32/nsis/translations/valencian.nsh
        pidgin/win32/nsis/translations/vietnamese.nsh
        pidgin/win32/untar.c pidgin/win32/winpidgin.c po/ChangeLog
        po/POTFILES.in po/af.po po/bn.po po/ca.po po/ca at valencia.po
        po/cs.po po/de.po po/es.po po/fi.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: 

propagate from branch 'im.pidgin.pidgin' (head 624bba8bd37445c496620c94bfe6da7da8af2ee4)
            to branch 'im.pidgin.adium' (head a64b3ed8ac6c82ec1217bddd04603cc0338c8494)


Requested because my changes are the merge conflict here



More information about the Commits mailing list