cpw.malu.xmpp.jingle_ft: 468cf307: propagate from branch 'im.pidgin.pidgin'...

malu at pidgin.im malu at pidgin.im
Tue Jul 28 16:56:21 EDT 2009


-----------------------------------------------------------------
Revision: 468cf307eee309836b031e57280c68e533048a01
Ancestor: 46ae10a850bb3c3ce9a3bb47a7de9edd4becdb93
Ancestor: cf45a19dae7c1016bda443d2e8f1f884e2dca2ef
Author: malu at pidgin.im
Date: 2009-07-28T20:51:09
Branch: im.pidgin.cpw.malu.xmpp.jingle_ft
URL: http://d.pidgin.im/viewmtn/revision/info/468cf307eee309836b031e57280c68e533048a01

Deleted entries:
        pidgin/pixmaps/icons/hicolor/48x48/apps/scalable
        pidgin/pixmaps/status/11/invisible.png
        pidgin/pixmaps/status/16/invisible.png
        pidgin/pixmaps/status/22/invisible.png
        pidgin/pixmaps/status/32/invisible.png
        pidgin/pixmaps/status/48/invisible.png
Renamed entries:
        pidgin/pixmaps/dialogs/64/scalable to pidgin/pixmaps/dialogs/scalable
        pidgin/pixmaps/emblems/16/scalable to pidgin/pixmaps/emblems/scalable
        pidgin/pixmaps/icons/hicolor/48x48/apps/scalable/pidgin.svg to pidgin/pixmaps/icons/hicolor/scalable/apps/pidgin.svg
        pidgin/pixmaps/logo.png to pidgin/pixmaps/logo-nonvv.png
        pidgin/pixmaps/protocols/48/scalable to pidgin/pixmaps/protocols/scalable
        pidgin/pixmaps/status/11/offline.png to pidgin/pixmaps/status/11/invisible.png
        pidgin/pixmaps/status/16/offline.png to pidgin/pixmaps/status/16/invisible.png
        pidgin/pixmaps/status/22/offline.png to pidgin/pixmaps/status/22/invisible.png
        pidgin/pixmaps/status/32/offline.png to pidgin/pixmaps/status/32/invisible.png
        pidgin/pixmaps/status/48/offline.png to pidgin/pixmaps/status/48/invisible.png
Added files:
        libpurple/protocols/jabber/jingle/file-transfer.c
        libpurple/protocols/jabber/jingle/file-transfer.h
        libpurple/protocols/jabber/jingle/ibbs.c
        libpurple/protocols/jabber/jingle/ibbs.h
        libpurple/protocols/jabber/jingle/s5b.c
        libpurple/protocols/jabber/jingle/s5b.h
        libpurple/protocols/jabber/xfer.c
        libpurple/protocols/jabber/xfer.h libpurple/valgrind.h
        pidgin/pixmaps/logo.png pidgin/pixmaps/logo.svg
        pidgin/pixmaps/status/11/offline.png
        pidgin/pixmaps/status/16/offline.png
        pidgin/pixmaps/status/22/offline.png
        pidgin/pixmaps/status/32/offline.png
        pidgin/pixmaps/status/48/offline.png
        pidgin/pixmaps/status/svg/status.svg
        pidgin/pixmaps/toolbar/22/scalable/video-call.svg
        pidgin/pixmaps/toolbar/22/scalable/voice-call.svg
        pidgin/pixmaps/toolbar/22/video-call.png
        pidgin/pixmaps/toolbar/22/voice-call.png
        pidgin/pixmaps/toolbar/32/scalable/video-call.svg
        pidgin/pixmaps/toolbar/32/scalable/voice-call.svg
        pidgin/pixmaps/toolbar/32/video-call.png
        pidgin/pixmaps/toolbar/32/voice-call.png
        pidgin/pixmaps/toolbar/48/scalable/video-call.svg
        pidgin/pixmaps/toolbar/48/scalable/voice-call.svg
        pidgin/pixmaps/toolbar/48/video-call.png
        pidgin/pixmaps/toolbar/48/voice-call.png
Added directories:
        pidgin/pixmaps/icons/hicolor/scalable
        pidgin/pixmaps/icons/hicolor/scalable/apps
        pidgin/pixmaps/toolbar/32 pidgin/pixmaps/toolbar/32/scalable
        pidgin/pixmaps/toolbar/48 pidgin/pixmaps/toolbar/48/scalable
Modified files:
        .mtn-ignore ChangeLog ChangeLog.API Makefile.am
        Makefile.mingw configure.ac finch/finch.c finch/finch.h
        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/gntprefs.c finch/gntrequest.c finch/gntroomlist.c
        finch/gntsound.c finch/gntstatus.c finch/gntui.c
        libpurple/Makefile.am libpurple/account.c
        libpurple/accountopt.c libpurple/blist.c libpurple/blist.h
        libpurple/certificate.c libpurple/certificate.h
        libpurple/conversation.c libpurple/dnsquery.c
        libpurple/dnssrv.c libpurple/ft.c libpurple/media.c
        libpurple/mediamanager.c libpurple/network.c
        libpurple/network.h libpurple/plugin.c
        libpurple/plugins/Makefile.am
        libpurple/plugins/ssl/ssl-gnutls.c
        libpurple/plugins/ssl/ssl-nss.c libpurple/privacy.c
        libpurple/protocols/jabber/Makefile.am
        libpurple/protocols/jabber/Makefile.mingw
        libpurple/protocols/jabber/buddy.c
        libpurple/protocols/jabber/google.c
        libpurple/protocols/jabber/ibb.c
        libpurple/protocols/jabber/ibb.h
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/jabber/jingle/jingle.c
        libpurple/protocols/jabber/jingle/jingle.h
        libpurple/protocols/jabber/jingle/rtp.c
        libpurple/protocols/jabber/jutil.c
        libpurple/protocols/jabber/libxmpp.c
        libpurple/protocols/jabber/message.c
        libpurple/protocols/jabber/presence.c
        libpurple/protocols/jabber/si.c
        libpurple/protocols/msn/httpconn.c
        libpurple/protocols/msn/msg.c
        libpurple/protocols/msn/servconn.c
        libpurple/protocols/msn/servconn.h
        libpurple/protocols/msn/switchboard.c
        libpurple/protocols/oscar/family_icbm.c
        libpurple/protocols/oscar/peer.c
        libpurple/protocols/silc/silc.c
        libpurple/protocols/yahoo/libymsg.c
        libpurple/protocols/yahoo/libymsg.h
        libpurple/protocols/yahoo/util.c
        libpurple/protocols/yahoo/yahoo_aliases.c
        libpurple/protocols/yahoo/yahoo_doodle.c
        libpurple/protocols/yahoo/yahoo_filexfer.c
        libpurple/protocols/yahoo/yahoo_friend.c
        libpurple/protocols/yahoo/yahoo_packet.c
        libpurple/protocols/yahoo/yahoo_packet.h
        libpurple/protocols/yahoo/yahoo_picture.c
        libpurple/protocols/yahoo/yahoo_profile.c
        libpurple/protocols/yahoo/yahoochat.c
        libpurple/protocols/yahoo/yahoochat.h
        libpurple/protocols/yahoo/ycht.c libpurple/proxy.c
        libpurple/tests/test_jabber_jutil.c libpurple/util.c
        libpurple/win32/global.mak libpurple/win32/libc_internal.h
        libpurple/win32/targets.mak pidgin/gtkblist.c
        pidgin/gtkdialogs.c pidgin/gtkft.c pidgin/gtkmedia.c
        pidgin/gtksound.c pidgin/pidginstock.c
        pidgin/pixmaps/Makefile.am
        pidgin/pixmaps/status/16/available.png
        pidgin/pixmaps/status/16/away.png
        pidgin/pixmaps/status/16/busy.png
        pidgin/pixmaps/status/16/invisible.png
        pidgin/pixmaps/status/22/available.png
        pidgin/pixmaps/status/22/away.png
        pidgin/pixmaps/status/22/busy.png
        pidgin/pixmaps/status/22/invisible.png
        pidgin/pixmaps/status/32/available.png
        pidgin/pixmaps/status/32/away.png
        pidgin/pixmaps/status/32/busy.png
        pidgin/pixmaps/status/32/invisible.png
        pidgin/pixmaps/status/48/available.png
        pidgin/pixmaps/status/48/away.png
        pidgin/pixmaps/status/48/busy.png
        pidgin/pixmaps/status/48/invisible.png
        pidgin/plugins/Makefile.am pidgin/plugins/cap/cap.c
        pidgin/plugins/notify.c pidgin.desktop.in po/ChangeLog
        po/bn.po po/ca.po po/cs.po po/de.po po/el.po po/en_GB.po
        po/fr.po po/gl.po po/he.po po/km.po po/lt.po po/nl.po
        po/pa.po po/pt_BR.po
Modified attrs:
        pidgin/pixmaps/logo.png pidgin/pixmaps/status/11/offline.png
        pidgin/pixmaps/status/16/offline.png
        pidgin/pixmaps/status/22/offline.png
        pidgin/pixmaps/status/32/offline.png
        pidgin/pixmaps/status/48/offline.png
        pidgin/pixmaps/toolbar/22/video-call.png
        pidgin/pixmaps/toolbar/22/voice-call.png
        pidgin/pixmaps/toolbar/32/video-call.png
        pidgin/pixmaps/toolbar/32/voice-call.png
        pidgin/pixmaps/toolbar/48/video-call.png
        pidgin/pixmaps/toolbar/48/voice-call.png

ChangeLog: 

propagate from branch 'im.pidgin.pidgin' (head 46ae10a850bb3c3ce9a3bb47a7de9edd4becdb93)
            to branch 'im.pidgin.cpw.malu.xmpp.jingle_ft' (head cf45a19dae7c1016bda443d2e8f1f884e2dca2ef)



More information about the Commits mailing list