pidgin.next.minor: 333ea7e7: merge of '1529fa495883d559527375c0d8b7fb...
darkrain42 at pidgin.im
darkrain42 at pidgin.im
Fri Jan 8 21:06:08 EST 2010
-----------------------------------------------------------------
Revision: 333ea7e7967112c873bb329a58bc6289ab5588c4
Ancestor: 1529fa495883d559527375c0d8b7fbe68cf019c2
Ancestor: 3e607deb45a1ba0c62a1b8f376d94b2751ec8343
Author: darkrain42 at pidgin.im
Date: 2010-01-09T02:00:18
Branch: im.pidgin.pidgin.next.minor
URL: http://d.pidgin.im/viewmtn/revision/info/333ea7e7967112c873bb329a58bc6289ab5588c4
Deleted entries:
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-connecting.png
pidgin/pixmaps/tray/16/tray-extended-away.png to pidgin/pixmaps/tray/hicolor/16x16/status/pidgin-tray-extended-away.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-message.png
pidgin/pixmaps/tray/16/tray-new-im.png to pidgin/pixmaps/tray/hicolor/16x16/status/pidgin-tray-new-im.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-online.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-connecting.png
pidgin/pixmaps/tray/22/tray-extended-away.png to pidgin/pixmaps/tray/hicolor/22x22/status/pidgin-tray-extended-away.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-message.png
pidgin/pixmaps/tray/22/tray-new-im.png to pidgin/pixmaps/tray/hicolor/22x22/status/pidgin-tray-new-im.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-online.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-connecting.png
pidgin/pixmaps/tray/32/tray-extended-away.png to pidgin/pixmaps/tray/hicolor/32x32/status/pidgin-tray-extended-away.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-message.png
pidgin/pixmaps/tray/32/tray-new-im.png to pidgin/pixmaps/tray/hicolor/32x32/status/pidgin-tray-new-im.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-online.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-connecting.png
pidgin/pixmaps/tray/48/tray-extended-away.png to pidgin/pixmaps/tray/hicolor/48x48/status/pidgin-tray-extended-away.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-message.png
pidgin/pixmaps/tray/48/tray-new-im.png to pidgin/pixmaps/tray/hicolor/48x48/status/pidgin-tray-new-im.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-online.png
Added files:
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/protocols/jabber/namespaces.h
libpurple/purple-2-uninstalled.pc.in
libpurple/purple-2.pc.in libpurple/tests/test_jabber_scram.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/ms_MY.po
Added directories:
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:
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/gntbox.c
finch/libgnt/gntbutton.c finch/libgnt/gntcheckbox.c
finch/libgnt/gntcombobox.c finch/libgnt/gntentry.c
finch/libgnt/gntinternal.h finch/libgnt/gntkeys.h
finch/libgnt/gntlabel.c finch/libgnt/gntmain.c
finch/libgnt/gntmenu.c finch/libgnt/gnttextview.c
finch/libgnt/gnttree.c finch/libgnt/gntutils.c
finch/libgnt/gntws.c finch/libgnt/wms/s.c libpurple/blist.c
libpurple/blist.h libpurple/certificate.c libpurple/cmds.c
libpurple/conversation.h libpurple/dbus-server.c
libpurple/debug.c libpurple/desktopitem.c
libpurple/eventloop.c libpurple/ft.c libpurple/ft.h
libpurple/imgstore.c libpurple/media/backend-fs2.c
libpurple/media/codec.h libpurple/media/media.c
libpurple/mime.c libpurple/nat-pmp.c libpurple/ntlm.c
libpurple/plugins/log_reader.c
libpurple/plugins/signals-test.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/jabber/Makefile.am
libpurple/protocols/jabber/Makefile.mingw
libpurple/protocols/jabber/adhoccommands.c
libpurple/protocols/jabber/auth.c
libpurple/protocols/jabber/auth.h
libpurple/protocols/jabber/bosh.c
libpurple/protocols/jabber/buddy.c
libpurple/protocols/jabber/caps.c
libpurple/protocols/jabber/chat.c
libpurple/protocols/jabber/data.c
libpurple/protocols/jabber/data.h
libpurple/protocols/jabber/disco.c
libpurple/protocols/jabber/google.c
libpurple/protocols/jabber/google.h
libpurple/protocols/jabber/ibb.c
libpurple/protocols/jabber/ibb.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/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/message.h
libpurple/protocols/jabber/oob.c
libpurple/protocols/jabber/parser.c
libpurple/protocols/jabber/ping.c
libpurple/protocols/jabber/presence.c
libpurple/protocols/jabber/roster.c
libpurple/protocols/jabber/si.c
libpurple/protocols/jabber/useravatar.h
libpurple/protocols/jabber/usermood.c
libpurple/protocols/msn/contact.c
libpurple/protocols/msn/msn.c libpurple/protocols/msn/msn.h
libpurple/protocols/msn/notification.c
libpurple/protocols/msn/object.c
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/switchboard.c
libpurple/protocols/msn/userlist.c
libpurple/protocols/mxit/actions.c
libpurple/protocols/mxit/chunk.c
libpurple/protocols/mxit/chunk.h
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/mxit.h
libpurple/protocols/mxit/profile.c
libpurple/protocols/mxit/protocol.c
libpurple/protocols/mxit/roster.c
libpurple/protocols/mxit/splashscreen.c
libpurple/protocols/mxit/splashscreen.h
libpurple/protocols/myspace/myspace.h
libpurple/protocols/myspace/user.c
libpurple/protocols/myspace/user.h
libpurple/protocols/novell/nmuser.c
libpurple/protocols/oscar/clientlogin.c
libpurple/protocols/oscar/family_auth.c
libpurple/protocols/oscar/odc.c
libpurple/protocols/oscar/oscar.c
libpurple/protocols/oscar/oscar.h
libpurple/protocols/oscar/oscarcommon.h
libpurple/protocols/qq/buddy_list.c
libpurple/protocols/qq/buddy_memo.c
libpurple/protocols/qq/buddy_opt.c
libpurple/protocols/qq/char_conv.c
libpurple/protocols/qq/qq.h libpurple/protocols/qq/qq_base.c
libpurple/protocols/qq/qq_network.c
libpurple/protocols/qq/qq_process.c
libpurple/protocols/qq/utils.c
libpurple/protocols/sametime/sametime.c
libpurple/protocols/silc/buddy.c
libpurple/protocols/silc/chat.c
libpurple/protocols/silc/ft.c libpurple/protocols/silc/ops.c
libpurple/protocols/silc/pk.c
libpurple/protocols/silc/silc.c
libpurple/protocols/silc/util.c
libpurple/protocols/silc/wb.c
libpurple/protocols/yahoo/util.c
libpurple/protocols/yahoo/ycht.c libpurple/prpl.c
libpurple/prpl.h libpurple/purple-uninstalled.pc.in
libpurple/purple.pc.in libpurple/roomlist.c
libpurple/server.h libpurple/tests/Makefile.am
libpurple/tests/check_libpurple.c
libpurple/tests/test_cipher.c
libpurple/tests/test_jabber_jutil.c
libpurple/tests/test_yahoo_util.c libpurple/tests/tests.h
libpurple/theme-manager.c libpurple/theme.c
libpurple/whiteboard.c libpurple/xmlnode.c pidgin/gtkblist.c
pidgin/gtkblist.h pidgin/gtkcertmgr.c pidgin/gtkconv.c
pidgin/gtkconv.h pidgin/gtkdialogs.c pidgin/gtkdocklet-gtk.c
pidgin/gtkft.c pidgin/gtkimhtml.c pidgin/gtkimhtmltoolbar.c
pidgin/gtkmain.c pidgin/gtkmedia.c pidgin/gtkprefs.c
pidgin/gtksavedstatuses.c pidgin/gtkwhiteboard.c
pidgin/pidgin-uninstalled.pc.in pidgin/pidgin.pc.in
pidgin/pixmaps/Makefile.am pidgin/plugins/disco/gtkdisco.c
pidgin/plugins/gtk-signals-test.c
pidgin/win32/nsis/pidgin-installer.nsi po/ChangeLog
po/POTFILES.in po/af.po po/ca.po po/ca at valencia.po po/cs.po
po/de.po po/fr.po po/he.po po/hu.po po/nn.po po/pl.po
po/ru.po po/sl.po po/stats.pl po/uk.po po/zh_CN.po
po/zh_HK.po po/zh_TW.po
ChangeLog:
merge of '1529fa495883d559527375c0d8b7fbe68cf019c2'
and '3e607deb45a1ba0c62a1b8f376d94b2751ec8343'
More information about the Commits
mailing list