cpw.khc.msnp14.soap: a8cd841b: merge of '8b98876f03b683ae6805d673e713f3...

rlaager at pidgin.im rlaager at pidgin.im
Sat Nov 15 19:48:49 EST 2008


-----------------------------------------------------------------
Revision: a8cd841bcb25707847d12b7743eaf73cc27274af
Ancestor: 8b98876f03b683ae6805d673e713f30f16b7f6e9
Ancestor: c3fe9bf88d02997989374e7ecc80a3f2462ee462
Author: rlaager at pidgin.im
Date: 2008-11-15T23:47:18
Branch: im.pidgin.cpw.khc.msnp14.soap
URL: http://d.pidgin.im/viewmtn/revision/info/a8cd841bcb25707847d12b7743eaf73cc27274af

Deleted entries:
        pidgin/plugins/gevolution
        pidgin/plugins/gevolution/Makefile.am
        pidgin/plugins/gevolution/add_buddy_dialog.c
        pidgin/plugins/gevolution/assoc-buddy.c
        pidgin/plugins/gevolution/eds-utils.c
        pidgin/plugins/gevolution/gevo-util.c
        pidgin/plugins/gevolution/gevolution.c
        pidgin/plugins/gevolution/gevolution.h
        pidgin/plugins/gevolution/new_person_dialog.c po/sr at Latn.po
Added files:
        doxy2devhelp.xsl finch/finch.pc.in
        libpurple/protocols/bonjour/dns_sd_proxy.c
        pidgin/pixmaps/emblems/16/birthday.png
        pidgin/pixmaps/protocols/22/scalable/myspace.svg
        pidgin/pixmaps/status/11/log-in.png
        pidgin/pixmaps/status/11/log-out.png
        pidgin/pixmaps/toolbar/11/message-new.png
        pidgin/plugins/gevolution/Makefile.am
        pidgin/plugins/gevolution/add_buddy_dialog.c
        pidgin/plugins/gevolution/assoc-buddy.c
        pidgin/plugins/gevolution/eds-utils.c
        pidgin/plugins/gevolution/gevo-util.c
        pidgin/plugins/gevolution/gevolution.c
        pidgin/plugins/gevolution/gevolution.h
        pidgin/plugins/gevolution/new_person_dialog.c
        pidgin/win32/nsis/translations/arabic.nsh po/lo.po
        po/sr at latin.po
        share/ca-certs/Microsoft_Secure_Server_Authority.pem
Added directories:
        pidgin/pixmaps/toolbar/11 pidgin/plugins/gevolution
Modified files:
        .mtn-ignore COPYRIGHT ChangeLog ChangeLog.API
        ChangeLog.win32 Doxyfile.in INSTALL Makefile.am
        Makefile.mingw NEWS autogen.sh configure.ac doc/C-HOWTO.dox
        doc/account-signals.dox doc/blist-signals.dox
        doc/certificate-signals.dox doc/cipher-signals.dox
        doc/connection-signals.dox doc/conversation-signals.dox
        doc/core-signals.dox doc/dbus-server-signals.dox
        doc/finch.1.in doc/funniest_home_convos.txt
        doc/gtkaccount-signals.dox doc/gtkblist-signals.dox
        doc/gtkconv-signals.dox doc/gtkimhtml-signals.dox
        doc/gtklog-signals.dox doc/imgstore-signals.dox
        doc/log-signals.dox doc/notify-signals.dox doc/pidgin.1.in
        doc/plugin-ids.dox doc/plugin-signals.dox
        doc/savedstatus-signals.dox doc/sound-signals.dox
        doc/xfer-signals.dox finch/Makefile.am finch/finch.c
        finch/gntaccount.h finch/gntblist.c finch/gntblist.h
        finch/gntconv.c finch/gntdebug.c finch/gntnotify.c
        finch/gntplugin.c finch/gntpounce.c finch/gntrequest.c
        finch/gntsound.h finch/libgnt/gnt.h
        finch/libgnt/gntbindable.h finch/libgnt/gntbutton.h
        finch/libgnt/gntcheckbox.h finch/libgnt/gntclipboard.c
        finch/libgnt/gntclipboard.h finch/libgnt/gntcolors.h
        finch/libgnt/gntcombobox.h finch/libgnt/gntentry.c
        finch/libgnt/gntentry.h finch/libgnt/gntfilesel.c
        finch/libgnt/gntmain.c finch/libgnt/gntslider.h
        finch/libgnt/gntstyle.c finch/libgnt/gntstyle.h
        finch/libgnt/gnttextview.h finch/libgnt/gnttree.c
        finch/libgnt/gnttree.h finch/libgnt/gntutils.h
        finch/libgnt/gntwm.c finch/libgnt/gntws.h
        finch/libgnt/pygnt/gntmodule.c
        finch/libgnt/pygnt/gnttree.override
        finch/libgnt/test/Makefile finch/plugins/lastlog.c
        libpurple/account.c libpurple/account.h libpurple/blist.c
        libpurple/blist.h libpurple/buddyicon.c
        libpurple/certificate.c libpurple/certificate.h
        libpurple/cipher.h libpurple/cmds.h libpurple/connection.h
        libpurple/conversation.c libpurple/conversation.h
        libpurple/core.h libpurple/dbus-server.c
        libpurple/dbus-server.h libpurple/dnsquery.c
        libpurple/dnsquery.h libpurple/dnssrv.c
        libpurple/eventloop.h libpurple/ft.c libpurple/ft.h
        libpurple/gaim-compat.h libpurple/imgstore.h libpurple/log.h
        libpurple/network.c libpurple/notify.c libpurple/notify.h
        libpurple/plugin.c libpurple/plugin.h libpurple/pluginpref.h
        libpurple/plugins/debug_example.c
        libpurple/plugins/helloworld.c
        libpurple/plugins/log_reader.c
        libpurple/plugins/notify_example.c
        libpurple/plugins/ssl/ssl-gnutls.c
        libpurple/plugins/ssl/ssl-nss.c libpurple/plugins/tcl/tcl.c
        libpurple/plugins/tcl/tcl_cmds.c
        libpurple/plugins/tcl/tcl_purple.h libpurple/pounce.h
        libpurple/prefs.c libpurple/prefs.h
        libpurple/protocols/bonjour/Makefile.am
        libpurple/protocols/bonjour/Makefile.mingw
        libpurple/protocols/bonjour/bonjour.c
        libpurple/protocols/bonjour/buddy.c
        libpurple/protocols/bonjour/buddy.h
        libpurple/protocols/bonjour/dns_sd_proxy.h
        libpurple/protocols/bonjour/jabber.c
        libpurple/protocols/bonjour/mdns_win32.c
        libpurple/protocols/bonjour/parser.c
        libpurple/protocols/gg/buddylist.c
        libpurple/protocols/irc/irc.h libpurple/protocols/irc/msgs.c
        libpurple/protocols/irc/parse.c
        libpurple/protocols/jabber/auth.c
        libpurple/protocols/jabber/buddy.c
        libpurple/protocols/jabber/chat.c
        libpurple/protocols/jabber/google.c
        libpurple/protocols/jabber/iq.c
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/jabber/jabber.h
        libpurple/protocols/jabber/jutil.h
        libpurple/protocols/jabber/libxmpp.c
        libpurple/protocols/jabber/message.c
        libpurple/protocols/jabber/parser.c
        libpurple/protocols/jabber/presence.c
        libpurple/protocols/jabber/roster.c
        libpurple/protocols/jabber/usermood.c
        libpurple/protocols/msn/command.c
        libpurple/protocols/msn/contact.c
        libpurple/protocols/msn/contact.h
        libpurple/protocols/msn/directconn.c
        libpurple/protocols/msn/group.c
        libpurple/protocols/msn/httpconn.c
        libpurple/protocols/msn/msg.c libpurple/protocols/msn/msn.c
        libpurple/protocols/msn/msnutils.c
        libpurple/protocols/msn/nexus.c
        libpurple/protocols/msn/notification.c
        libpurple/protocols/msn/object.c
        libpurple/protocols/msn/oim.c libpurple/protocols/msn/page.c
        libpurple/protocols/msn/servconn.c
        libpurple/protocols/msn/session.c
        libpurple/protocols/msn/slp.c
        libpurple/protocols/msn/slplink.c
        libpurple/protocols/msn/soap.c
        libpurple/protocols/msn/soap.h
        libpurple/protocols/msn/state.c
        libpurple/protocols/msn/switchboard.c
        libpurple/protocols/msn/user.c
        libpurple/protocols/msn/userlist.c
        libpurple/protocols/msn/userlist.h
        libpurple/protocols/myspace/markup.c
        libpurple/protocols/myspace/markup.h
        libpurple/protocols/myspace/message.c
        libpurple/protocols/myspace/myspace.c
        libpurple/protocols/myspace/myspace.h
        libpurple/protocols/myspace/session.c
        libpurple/protocols/myspace/session.h
        libpurple/protocols/myspace/user.c
        libpurple/protocols/myspace/user.h
        libpurple/protocols/myspace/zap.c
        libpurple/protocols/myspace/zap.h
        libpurple/protocols/novell/novell.c
        libpurple/protocols/oscar/AUTHORS
        libpurple/protocols/oscar/family_auth.c
        libpurple/protocols/oscar/family_feedbag.c
        libpurple/protocols/oscar/flap_connection.c
        libpurple/protocols/oscar/odc.c
        libpurple/protocols/oscar/oscar.c
        libpurple/protocols/oscar/oscar.h
        libpurple/protocols/oscar/peer.c
        libpurple/protocols/oscar/util.c
        libpurple/protocols/qq/buddy_info.c
        libpurple/protocols/qq/login_logout.c
        libpurple/protocols/qq/qq_proxy.c
        libpurple/protocols/qq/udp_proxy_s5.c
        libpurple/protocols/sametime/sametime.c
        libpurple/protocols/simple/simple.c
        libpurple/protocols/yahoo/yahoo.c
        libpurple/protocols/yahoo/yahoo_aliases.c
        libpurple/protocols/yahoo/yahoo_doodle.c
        libpurple/protocols/yahoo/yahoo_doodle.h
        libpurple/protocols/yahoo/yahoo_filexfer.c libpurple/proxy.c
        libpurple/prpl.c libpurple/prpl.h libpurple/purple-remote
        libpurple/request.h libpurple/savedstatuses.c
        libpurple/savedstatuses.h libpurple/server.c
        libpurple/sound.h libpurple/sslconn.h libpurple/status.c
        libpurple/status.h libpurple/tests/test_cipher.c
        libpurple/upnp.c 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/win32dep.c
        libpurple/xmlnode.c pidgin/Makefile.am pidgin/eggtrayicon.c
        pidgin/gtkaccount.c pidgin/gtkaccount.h pidgin/gtkblist.c
        pidgin/gtkblist.h pidgin/gtkconn.c pidgin/gtkconv.c
        pidgin/gtkconv.h pidgin/gtkdialogs.c pidgin/gtkdocklet.c
        pidgin/gtkft.c pidgin/gtkimhtml.c pidgin/gtkimhtml.h
        pidgin/gtkimhtmltoolbar.c pidgin/gtklog.c pidgin/gtklog.h
        pidgin/gtkmain.c pidgin/gtknotify.c pidgin/gtkpounce.c
        pidgin/gtksavedstatuses.c pidgin/gtksession.c
        pidgin/gtksound.c pidgin/gtkstatusbox.c pidgin/gtkutils.c
        pidgin/gtkutils.h pidgin/pidgin.h pidgin/pidginstock.c
        pidgin/pixmaps/dialogs/64/cool.png
        pidgin/pixmaps/dialogs/64/error.png
        pidgin/pixmaps/dialogs/64/info.png
        pidgin/pixmaps/dialogs/64/mail.png
        pidgin/pixmaps/dialogs/64/question.png
        pidgin/pixmaps/dialogs/64/scalable/cool.svg
        pidgin/pixmaps/dialogs/64/scalable/error.svg
        pidgin/pixmaps/dialogs/64/scalable/info.svg
        pidgin/pixmaps/dialogs/64/scalable/question.svg
        pidgin/pixmaps/dialogs/64/scalable/warning.svg
        pidgin/pixmaps/dialogs/64/warning.png
        pidgin/pixmaps/emblems/16/Makefile.am
        pidgin/pixmaps/emotes/default/24/default.theme.in
        pidgin/pixmaps/logo.png
        pidgin/pixmaps/protocols/16/myspace.png
        pidgin/pixmaps/protocols/22/myspace.png
        pidgin/pixmaps/protocols/48/myspace.png
        pidgin/pixmaps/status/11/Makefile.am
        pidgin/pixmaps/status/16/available.png
        pidgin/pixmaps/status/16/away.png
        pidgin/pixmaps/status/16/busy.png
        pidgin/pixmaps/status/16/extended-away.png
        pidgin/pixmaps/status/16/offline.png
        pidgin/pixmaps/status/16/rtl/extended-away.png
        pidgin/pixmaps/status/16/scalable/available.svg
        pidgin/pixmaps/status/16/scalable/away.svg
        pidgin/pixmaps/status/16/scalable/busy.svg
        pidgin/pixmaps/status/16/scalable/extended-away.svg
        pidgin/pixmaps/status/16/scalable/offline.svg
        pidgin/pixmaps/toolbar/16/emote-select.png
        pidgin/pixmaps/toolbar/16/insert.png
        pidgin/pixmaps/toolbar/16/send-file.png
        pidgin/pixmaps/toolbar/Makefile.am
        pidgin/plugins/gestures/stroke-draw.c
        pidgin/plugins/gtkbuddynote.c pidgin/plugins/history.c
        pidgin/plugins/ticker/ticker.c
        pidgin/plugins/win32/transparency/win2ktrans.c
        pidgin/plugins/win32/winprefs/gtkappbar.c
        pidgin/win32/gtkdocklet-win32.c pidgin/win32/gtkwin32dep.c
        pidgin/win32/nsis/pidgin-installer.nsi
        pidgin/win32/nsis/pixmaps/pidgin-intro.bmp
        pidgin/win32/winpidgin.c pidgin.spec.in po/ChangeLog
        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/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/kn.po po/ko.po po/ku.po
        po/lt.po po/mk.po po/my_MM.po po/nb.po po/ne.po po/nl.po
        po/nn.po po/pa.po po/pl.po po/ps.po po/pt.po po/pt_BR.po
        po/ro.po po/ru.po po/sk.po po/sl.po po/sq.po po/sr.po
        po/stats.pl po/sv.po po/ta.po po/te.po po/th.po po/tr.po
        po/uk.po po/vi.po po/xh.po po/zh_CN.po po/zh_HK.po
        po/zh_TW.po share/ca-certs/Makefile.am
Modified attrs:
        pidgin/pixmaps/emblems/16/birthday.png
        pidgin/pixmaps/status/11/log-in.png
        pidgin/pixmaps/status/11/log-out.png
        pidgin/pixmaps/toolbar/11/message-new.png

ChangeLog: 

merge of '8b98876f03b683ae6805d673e713f30f16b7f6e9'
     and 'c3fe9bf88d02997989374e7ecc80a3f2462ee462'



More information about the Commits mailing list