pidgin: b1192abb: merge of '40d000364c4c9c5b0a3971fbe7bb48...
deryni at pidgin.im
deryni at pidgin.im
Sun Jul 5 11:18:52 EDT 2009
-----------------------------------------------------------------
Revision: b1192abb31d9669ac64142933275b0ef0640c6bf
Ancestor: 40d000364c4c9c5b0a3971fbe7bb4878e3737202
Ancestor: 6a6409370fa50e23bc8fdedcef230220fa680a36
Author: deryni at pidgin.im
Date: 2009-05-18T02:47:21
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/b1192abb31d9669ac64142933275b0ef0640c6bf
Deleted entries:
libpurple/protocols/toc
libpurple/protocols/yahoo/yahoo_auth.c
libpurple/protocols/yahoo/yahoo_auth.h
libpurple/protocols/yahoo/yahoo_crypt.c
libpurple/protocols/yahoo/yahoo_crypt.h
Added files:
finch/gntmedia.c finch/gntmedia.h
finch/libgnt/gntprogressbar.c finch/libgnt/gntprogressbar.h
finch/plugins/gnttinyurl.c libpurple/marshallers.list
libpurple/media-gst.h libpurple/media.c libpurple/media.h
libpurple/mediamanager.c libpurple/mediamanager.h
libpurple/protocols/jabber/bosh.c
libpurple/protocols/jabber/bosh.h
libpurple/protocols/jabber/jingle/content.c
libpurple/protocols/jabber/jingle/content.h
libpurple/protocols/jabber/jingle/iceudp.c
libpurple/protocols/jabber/jingle/iceudp.h
libpurple/protocols/jabber/jingle/jingle.c
libpurple/protocols/jabber/jingle/jingle.h
libpurple/protocols/jabber/jingle/rawudp.c
libpurple/protocols/jabber/jingle/rawudp.h
libpurple/protocols/jabber/jingle/rtp.c
libpurple/protocols/jabber/jingle/rtp.h
libpurple/protocols/jabber/jingle/session.c
libpurple/protocols/jabber/jingle/session.h
libpurple/protocols/jabber/jingle/transport.c
libpurple/protocols/jabber/jingle/transport.h
libpurple/protocols/jabber/useravatar.c
libpurple/protocols/jabber/useravatar.h pidgin/gtkmedia.c
pidgin/gtkmedia.h pidgin/pixmaps/toolbar/16/audio-call.png
pidgin/pixmaps/toolbar/16/video-call.png
pidgin/plugins/themeedit-icon.c
pidgin/plugins/themeedit-icon.h pidgin/plugins/themeedit.c
Added directories:
libpurple/protocols/jabber/jingle
Modified files:
.mtn-ignore AUTHORS COPYRIGHT ChangeLog ChangeLog.API
Makefile.mingw configure.ac doc/TCL-HOWTO.dox
doc/account-signals.dox doc/blist-signals.dox doc/finch.1.in
doc/notify-signals.dox doc/pidgin.1.in finch/Makefile.am
finch/gntaccount.c finch/gntblist.c finch/gntconv.c
finch/gntnotify.c finch/gntui.c finch/libgnt/Makefile.am
finch/libgnt/gnt.h finch/libgnt/gntbox.c
finch/libgnt/gntcheckbox.c finch/libgnt/gntcombobox.c
finch/libgnt/gntentry.c finch/libgnt/gntkeys.h
finch/libgnt/gnttextview.c finch/libgnt/gnttree.c
finch/libgnt/gntwm.c finch/plugins/Makefile.am
finch/plugins/gntgf.c libpurple/Makefile.am
libpurple/Makefile.mingw libpurple/account.c
libpurple/blist.c libpurple/blist.h libpurple/buddyicon.c
libpurple/conversation.c libpurple/conversation.h
libpurple/core.c libpurple/dbus-analyze-functions.py
libpurple/dnsquery.c libpurple/dnssrv.c libpurple/dnssrv.h
libpurple/ft.c libpurple/idle.c libpurple/internal.h
libpurple/mime.c libpurple/mime.h libpurple/nat-pmp.c
libpurple/network.c libpurple/network.h libpurple/ntlm.c
libpurple/plugin.c libpurple/plugin.h
libpurple/plugins/filectl.c libpurple/plugins/joinpart.c
libpurple/plugins/perl/perl-common.c
libpurple/plugins/perl/perl-handlers.c
libpurple/plugins/signals-test.c
libpurple/plugins/statenotify.c
libpurple/plugins/tcl/tcl_cmds.c libpurple/prefs.c
libpurple/protocols/bonjour/bonjour.c
libpurple/protocols/bonjour/jabber.c
libpurple/protocols/bonjour/parser.c
libpurple/protocols/gg/gg.c libpurple/protocols/irc/irc.c
libpurple/protocols/irc/irc.h libpurple/protocols/irc/msgs.c
libpurple/protocols/jabber/Makefile.am
libpurple/protocols/jabber/Makefile.mingw
libpurple/protocols/jabber/adhoccommands.c
libpurple/protocols/jabber/adhoccommands.h
libpurple/protocols/jabber/auth.c
libpurple/protocols/jabber/auth.h
libpurple/protocols/jabber/buddy.c
libpurple/protocols/jabber/buddy.h
libpurple/protocols/jabber/caps.c
libpurple/protocols/jabber/caps.h
libpurple/protocols/jabber/chat.c
libpurple/protocols/jabber/chat.h
libpurple/protocols/jabber/data.c
libpurple/protocols/jabber/data.h
libpurple/protocols/jabber/disco.c
libpurple/protocols/jabber/disco.h
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/iq.h
libpurple/protocols/jabber/jabber.c
libpurple/protocols/jabber/jabber.h
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/oob.h
libpurple/protocols/jabber/parser.c
libpurple/protocols/jabber/parser.h
libpurple/protocols/jabber/pep.c
libpurple/protocols/jabber/pep.h
libpurple/protocols/jabber/ping.c
libpurple/protocols/jabber/ping.h
libpurple/protocols/jabber/presence.c
libpurple/protocols/jabber/presence.h
libpurple/protocols/jabber/roster.c
libpurple/protocols/jabber/roster.h
libpurple/protocols/jabber/si.c
libpurple/protocols/jabber/si.h
libpurple/protocols/jabber/usermood.c
libpurple/protocols/jabber/usermood.h
libpurple/protocols/jabber/usernick.c
libpurple/protocols/jabber/usernick.h
libpurple/protocols/jabber/usertune.c
libpurple/protocols/jabber/usertune.h
libpurple/protocols/jabber/xdata.h
libpurple/protocols/msn/contact.c
libpurple/protocols/msn/httpconn.c
libpurple/protocols/msn/msg.c libpurple/protocols/msn/msn.c
libpurple/protocols/msn/msn.h
libpurple/protocols/msn/notification.c
libpurple/protocols/msn/oim.c
libpurple/protocols/msn/session.c
libpurple/protocols/msn/session.h
libpurple/protocols/msn/slp.c
libpurple/protocols/msn/slplink.c
libpurple/protocols/msn/soap.c
libpurple/protocols/msn/switchboard.c
libpurple/protocols/msn/userlist.c
libpurple/protocols/msnp9/httpconn.c
libpurple/protocols/msnp9/msn.c
libpurple/protocols/msnp9/notification.c
libpurple/protocols/msnp9/slp.c
libpurple/protocols/msnp9/slpcall.c
libpurple/protocols/msnp9/slpcall.h
libpurple/protocols/msnp9/slplink.c
libpurple/protocols/msnp9/transaction.c
libpurple/protocols/myspace/myspace.c
libpurple/protocols/myspace/myspace.h
libpurple/protocols/novell/novell.c
libpurple/protocols/null/nullprpl.c
libpurple/protocols/oscar/family_chatnav.c
libpurple/protocols/oscar/family_locate.c
libpurple/protocols/oscar/family_oservice.c
libpurple/protocols/oscar/libaim.c
libpurple/protocols/oscar/libicq.c
libpurple/protocols/oscar/oscar.c
libpurple/protocols/oscar/oscar.h
libpurple/protocols/oscar/peer.c
libpurple/protocols/qq/ChangeLog
libpurple/protocols/qq/buddy_info.c
libpurple/protocols/qq/qq.c
libpurple/protocols/qq/qq_crypt.c
libpurple/protocols/qq/utils.c
libpurple/protocols/sametime/sametime.c
libpurple/protocols/silc/silc.c
libpurple/protocols/silc10/silc.c
libpurple/protocols/simple/simple.c
libpurple/protocols/yahoo/Makefile.am
libpurple/protocols/yahoo/Makefile.mingw
libpurple/protocols/yahoo/yahoo.c
libpurple/protocols/yahoo/yahoo.h
libpurple/protocols/yahoo/yahoo_aliases.c
libpurple/protocols/yahoo/yahoo_doodle.c
libpurple/protocols/yahoo/yahoo_filexfer.c
libpurple/protocols/yahoo/yahoo_packet.h
libpurple/protocols/yahoo/yahoo_picture.c
libpurple/protocols/zephyr/ZVariables.c
libpurple/protocols/zephyr/zephyr.c libpurple/prpl.c
libpurple/prpl.h libpurple/savedstatuses.c
libpurple/server.c libpurple/smiley.h
libpurple/sound-theme.h libpurple/stun.c
libpurple/theme-loader.h libpurple/theme-manager.c
libpurple/theme-manager.h libpurple/upnp.c libpurple/util.c
libpurple/util.h libpurple/win32/global.mak
libpurple/win32/win32dep.c libpurple/xmlnode.c
libpurple/xmlnode.h pidgin/Makefile.am pidgin/Makefile.mingw
pidgin/eggtrayicon.h pidgin/gtkaccount.c
pidgin/gtkblist-theme-loader.c
pidgin/gtkblist-theme-loader.h pidgin/gtkblist-theme.c
pidgin/gtkblist-theme.h pidgin/gtkblist.c
pidgin/gtkcellrendererexpander.c
pidgin/gtkcellrendererexpander.h
pidgin/gtkcellrendererprogress.h pidgin/gtkconv.c
pidgin/gtkconv.h pidgin/gtkconvwin.h pidgin/gtkdebug.c
pidgin/gtkdialogs.c pidgin/gtkdnd-hints.h
pidgin/gtkdocklet.c pidgin/gtkicon-theme-loader.h
pidgin/gtkicon-theme.h pidgin/gtkimhtml.c pidgin/gtkimhtml.h
pidgin/gtkimhtmltoolbar.c pidgin/gtkimhtmltoolbar.h
pidgin/gtkmain.c pidgin/gtkmenutray.c pidgin/gtkmenutray.h
pidgin/gtknotify.c pidgin/gtknotify.h pidgin/gtkplugin.c
pidgin/gtkprefs.c pidgin/gtkprefs.h
pidgin/gtksavedstatuses.c pidgin/gtksmiley.c
pidgin/gtksound.c pidgin/gtksourceiter.h
pidgin/gtksourceundomanager.h pidgin/gtkstatus-icon-theme.h
pidgin/gtkstatusbox.c pidgin/gtkstatusbox.h
pidgin/gtkutils.c pidgin/gtkutils.h pidgin/gtkwhiteboard.c
pidgin/minidialog.c pidgin/minidialog.h pidgin/pidginstock.c
pidgin/pidginstock.h pidgin/pixmaps/Makefile.am
pidgin/pixmaps/emotes/default/24/default.theme.in
pidgin/pixmaps/emotes/small/16/small.theme.in
pidgin/plugins/Makefile.am pidgin/plugins/cap/cap.c
pidgin/plugins/contact_priority.c pidgin/plugins/mailchk.c
pidgin/plugins/markerline.c
pidgin/plugins/musicmessaging/musicmessaging.c
pidgin/plugins/ticker/gtkticker.c
pidgin/plugins/ticker/gtkticker.h
pidgin/plugins/ticker/ticker.c
pidgin/plugins/win32/transparency/win2ktrans.c
pidgin/win32/nsis/pidgin-installer.nsi
pidgin/win32/pidgin_dll_rc.rc.in
pidgin/win32/pidgin_exe_rc.rc.in pidgin/win32/winpidgin.c
po/POTFILES.in po/af.po po/am.po po/ar.po po/az.po
po/be at latin.po po/bg.po po/bn.po po/bs.po po/ca.po
po/ca at valencia.po po/cs.po po/da.po po/de.po po/dz.po
po/el.po po/en_AU.po po/en_CA.po po/en_GB.po po/eo.po
po/es.po po/et.po po/eu.po po/fa.po po/fi.po po/fr.po
po/ga.po po/gl.po po/gu.po po/he.po po/hi.po po/hu.po
po/id.po po/it.po po/ja.po po/ka.po po/km.po po/kn.po
po/ko.po po/ku.po po/lo.po po/lt.po po/mk.po po/mn.po
po/my_MM.po po/nb.po po/ne.po po/nl.po po/nn.po po/oc.po
po/pa.po po/pl.po po/ps.po po/pt.po po/pt_BR.po po/ro.po
po/ru.po po/si.po po/sk.po po/sl.po po/sq.po po/sr.po
po/sr at latin.po po/sv.po po/ta.po po/te.po po/th.po po/tr.po
po/uk.po po/ur.po po/vi.po po/xh.po po/zh_CN.po po/zh_HK.po
po/zh_TW.po
Modified attrs:
pidgin/pixmaps/toolbar/16/audio-call.png
pidgin/pixmaps/toolbar/16/video-call.png
ChangeLog:
merge of '40d000364c4c9c5b0a3971fbe7bb4878e3737202'
and '6a6409370fa50e23bc8fdedcef230220fa680a36'
More information about the Commits
mailing list