pidgin: 4e796a51: merge of '0303e2072e9df6a3ea825f996a260a...
markdoliner at pidgin.im
markdoliner at pidgin.im
Thu Mar 4 04:28:37 EST 2010
-----------------------------------------------------------------
Revision: 4e796a513d5ffdab72249b7e88425b41d820a05f
Ancestor: 0303e2072e9df6a3ea825f996a260acd80f12da7
Ancestor: 67de3fff150c538c01ca66706c29a8f19cbfeff1
Author: markdoliner at pidgin.im
Date: 2010-03-04T09:23:19
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/4e796a513d5ffdab72249b7e88425b41d820a05f
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/gtkdocklet-x11.c
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/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
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/purple-2-uninstalled.pc.in
libpurple/purple-2.pc.in pidgin/gtkdocklet-gtk.c
pidgin/pidgin-2-uninstalled.pc.in pidgin/pidgin-2.pc.in
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/available.lst
pidgin/win32/nsis/generate_gtk_zip.sh
Added directories:
libpurple/media 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:
.mtn-ignore COPYRIGHT ChangeLog ChangeLog.API
ChangeLog.win32 Makefile.mingw NEWS configure.ac
finch/finch.c finch/gntconv.c finch/gntplugin.c
finch/gntprefs.c finch/gntsound.c finch/libgnt/configure.ac
finch/libgnt/gnttree.c finch/plugins/gnthistory.c
libpurple/Makefile.am libpurple/Makefile.mingw
libpurple/account.c libpurple/account.h libpurple/blist.c
libpurple/blist.h libpurple/certificate.c
libpurple/connection.h libpurple/conversation.c
libpurple/conversation.h libpurple/core.c
libpurple/example/nullclient.c libpurple/ft.c
libpurple/internal.h libpurple/log.c
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/log_reader.c
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/perl/scripts/signals-test.pl
libpurple/plugins/ssl/Makefile.mingw
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/bonjour/parser.c
libpurple/protocols/gg/gg.c libpurple/protocols/irc/irc.c
libpurple/protocols/jabber/Makefile.mingw
libpurple/protocols/jabber/buddy.c
libpurple/protocols/jabber/buddy.h
libpurple/protocols/jabber/chat.c
libpurple/protocols/jabber/chat.h
libpurple/protocols/jabber/google.c
libpurple/protocols/jabber/iq.c
libpurple/protocols/jabber/jabber.c
libpurple/protocols/jabber/jabber.h
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/parser.c
libpurple/protocols/jabber/pep.c
libpurple/protocols/jabber/presence.c
libpurple/protocols/jabber/roster.c
libpurple/protocols/jabber/si.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/msg.c libpurple/protocols/msn/msn.c
libpurple/protocols/msn/nexus.c
libpurple/protocols/msn/notification.c
libpurple/protocols/msn/slp.c libpurple/protocols/msn/slp.h
libpurple/protocols/msn/slpcall.c
libpurple/protocols/msn/slplink.c
libpurple/protocols/msn/slpmsg.h
libpurple/protocols/msnp9/msn.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/protocol.h
libpurple/protocols/mxit/roster.c
libpurple/protocols/myspace/myspace.c
libpurple/protocols/myspace/user.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/tlv.c
libpurple/protocols/qq/buddy_memo.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/yahoo_filexfer.c
libpurple/protocols/zephyr/zephyr.c libpurple/proxy.c
libpurple/prpl.c libpurple/prpl.h
libpurple/purple-uninstalled.pc.in libpurple/purple.pc.in
libpurple/request.c libpurple/request.h libpurple/sound.h
libpurple/status.c libpurple/status.h libpurple/util.c
libpurple/util.h libpurple/win32/global.mak
libpurple/win32/libc_interface.c
libpurple/win32/libc_interface.h
libpurple/win32/libc_internal.h
libpurple/win32/libpurplerc.rc.in
libpurple/win32/targets.mak libpurple/win32/win32dep.c
libpurple/xmlnode.c pidgin/Makefile.am pidgin/Makefile.mingw
pidgin/gtkaccount.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.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/gtkprivacy.c
pidgin/gtkrequest.c pidgin/gtksavedstatuses.c
pidgin/gtkscrollbook.c pidgin/gtksession.c pidgin/gtksound.c
pidgin/gtkstatusbox.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/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/pidginrc.c pidgin/plugins/spellchk.c
pidgin/plugins/win32/transparency/win2ktrans.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/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/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/pidgin_dll_rc.rc.in
pidgin/win32/pidgin_exe_rc.rc.in pidgin/win32/untar.c
pidgin/win32/winpidgin.c pidgin/win32/wspell.c po/ChangeLog
po/POTFILES.in 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/mr.po po/nb.po po/nn.po po/or.po po/pl.po
po/sk.po po/sl.po po/uk.po po/zh_HK.po po/zh_TW.po
Modified attrs:
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:
merge of '0303e2072e9df6a3ea825f996a260acd80f12da7'
and '67de3fff150c538c01ca66706c29a8f19cbfeff1'
More information about the Commits
mailing list