soc.2007.remotelogging: 38401506: merge of '5e43b070de1b63b6136aaac4de9364...

hajo at h-yo.de hajo at h-yo.de
Thu Nov 13 03:25:05 EST 2008


-----------------------------------------------------------------
Revision: 384015069dc1f8f01cc536207e510005f98f316f
Ancestor: 5e43b070de1b63b6136aaac4de9364b9db5a44c5
Ancestor: f9b26c3b3b56e4047a36cc7f27b68b01b9f8727b
Author: hajo at h-yo.de
Date: 2007-12-12T17:40:50
Branch: im.pidgin.soc.2007.remotelogging
URL: http://d.pidgin.im/viewmtn/revision/info/384015069dc1f8f01cc536207e510005f98f316f

Deleted entries:
        libpurple/protocols/bonjour/mdns_howl.c
        libpurple/protocols/jabber/.todo
        libpurple/protocols/oscar/.todo
        pidgin/pixmaps/animations/16/Makefile.am
        pidgin/pixmaps/animations/16/Makefile.mingw
        pidgin/pixmaps/animations/Makefile.am
        pidgin/pixmaps/animations/Makefile.mingw
        pidgin/pixmaps/buddy_icons/Makefile.am
        pidgin/pixmaps/buddy_icons/Makefile.mingw
        pidgin/pixmaps/dialogs/16/Makefile.am
        pidgin/pixmaps/dialogs/16/Makefile.mingw
        pidgin/pixmaps/dialogs/16/scalable/Makefile.am
        pidgin/pixmaps/dialogs/64/Makefile.am
        pidgin/pixmaps/dialogs/64/Makefile.mingw
        pidgin/pixmaps/dialogs/64/scalable/Makefile.am
        pidgin/pixmaps/dialogs/Makefile.am
        pidgin/pixmaps/dialogs/Makefile.mingw
        pidgin/pixmaps/emblems/16/Makefile.am
        pidgin/pixmaps/emblems/16/Makefile.mingw
        pidgin/pixmaps/emblems/16/scalable/Makefile.am
        pidgin/pixmaps/emblems/Makefile.am
        pidgin/pixmaps/emblems/Makefile.mingw
        pidgin/pixmaps/emotes/Makefile.am
        pidgin/pixmaps/emotes/Makefile.mingw
        pidgin/pixmaps/emotes/default/24/scalable/Makefile.am
        pidgin/pixmaps/emotes/default/Makefile.am
        pidgin/pixmaps/emotes/default/Makefile.mingw
        pidgin/pixmaps/icons/16/Makefile.am
        pidgin/pixmaps/icons/16/Makefile.mingw
        pidgin/pixmaps/icons/16/scalable/Makefile.am
        pidgin/pixmaps/icons/22/Makefile.am
        pidgin/pixmaps/icons/22/scalable/Makefile.am
        pidgin/pixmaps/icons/24/Makefile.am
        pidgin/pixmaps/icons/24/Makefile.mingw
        pidgin/pixmaps/icons/24/scalable/Makefile.am
        pidgin/pixmaps/icons/32/Makefile.am
        pidgin/pixmaps/icons/32/Makefile.mingw
        pidgin/pixmaps/icons/32/scalable/Makefile.am
        pidgin/pixmaps/icons/48/Makefile.am
        pidgin/pixmaps/icons/48/Makefile.mingw
        pidgin/pixmaps/icons/48/scalable/Makefile.am
        pidgin/pixmaps/icons/Makefile.am
        pidgin/pixmaps/icons/Makefile.mingw
        pidgin/pixmaps/protocols/16/Makefile.am
        pidgin/pixmaps/protocols/16/Makefile.mingw
        pidgin/pixmaps/protocols/16/scalable/Makefile.am
        pidgin/pixmaps/protocols/22/Makefile.am
        pidgin/pixmaps/protocols/22/Makefile.mingw
        pidgin/pixmaps/protocols/22/scalable/Makefile.am
        pidgin/pixmaps/protocols/48/Makefile.am
        pidgin/pixmaps/protocols/48/Makefile.mingw
        pidgin/pixmaps/protocols/48/scalable/Makefile.am
        pidgin/pixmaps/protocols/Makefile.am
        pidgin/pixmaps/protocols/Makefile.mingw
        pidgin/pixmaps/status/11/Makefile.am
        pidgin/pixmaps/status/11/Makefile.mingw
        pidgin/pixmaps/status/11/rtl/Makefile.am
        pidgin/pixmaps/status/11/rtl/Makefile.mingw
        pidgin/pixmaps/status/11/scalable/Makefile.am
        pidgin/pixmaps/status/16/Makefile.am
        pidgin/pixmaps/status/16/Makefile.mingw
        pidgin/pixmaps/status/16/rtl/Makefile.am
        pidgin/pixmaps/status/16/rtl/Makefile.mingw
        pidgin/pixmaps/status/16/scalable/Makefile.am
        pidgin/pixmaps/status/22/Makefile.am
        pidgin/pixmaps/status/22/Makefile.mingw
        pidgin/pixmaps/status/22/rtl/Makefile.am
        pidgin/pixmaps/status/22/rtl/Makefile.mingw
        pidgin/pixmaps/status/22/scalable/Makefile.am
        pidgin/pixmaps/status/32/Makefile.am
        pidgin/pixmaps/status/32/Makefile.mingw
        pidgin/pixmaps/status/32/rtl/Makefile.am
        pidgin/pixmaps/status/32/rtl/Makefile.mingw
        pidgin/pixmaps/status/32/scalable/Makefile.am
        pidgin/pixmaps/status/48/Makefile.am
        pidgin/pixmaps/status/48/Makefile.mingw
        pidgin/pixmaps/status/48/rtl/Makefile.am
        pidgin/pixmaps/status/48/rtl/Makefile.mingw
        pidgin/pixmaps/status/Makefile.am
        pidgin/pixmaps/status/Makefile.mingw
        pidgin/pixmaps/toolbar/16/Makefile.am
        pidgin/pixmaps/toolbar/16/Makefile.mingw
        pidgin/pixmaps/toolbar/16/scalable/Makefile.am
        pidgin/pixmaps/toolbar/22/Makefile.am
        pidgin/pixmaps/toolbar/22/Makefile.mingw
        pidgin/pixmaps/toolbar/22/scalable/Makefile.am
        pidgin/pixmaps/toolbar/Makefile.am
        pidgin/pixmaps/toolbar/Makefile.mingw
        pidgin/pixmaps/tray/16/Makefile.am
        pidgin/pixmaps/tray/16/Makefile.mingw
        pidgin/pixmaps/tray/16/scalable/Makefile.am
        pidgin/pixmaps/tray/22/Makefile.am
        pidgin/pixmaps/tray/22/Makefile.mingw
        pidgin/pixmaps/tray/22/scalable/Makefile.am
        pidgin/pixmaps/tray/32/Makefile.am
        pidgin/pixmaps/tray/32/Makefile.mingw
        pidgin/pixmaps/tray/48/Makefile.am
        pidgin/pixmaps/tray/48/Makefile.mingw
        pidgin/pixmaps/tray/Makefile.am
        pidgin/pixmaps/tray/Makefile.mingw 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
        share/Makefile.am share/Makefile.mingw
Renamed entries:
        libpurple/protocols/msn/msn-utils.c to libpurple/protocols/msn/msnutils.c
        libpurple/protocols/msn/msn-utils.h to libpurple/protocols/msn/msnutils.h
        pidgin/pixmaps/icons/16 to pidgin/pixmaps/icons/hicolor/16x16/apps
        pidgin/pixmaps/icons/22 to pidgin/pixmaps/icons/hicolor/22x22/apps
        pidgin/pixmaps/icons/24 to pidgin/pixmaps/icons/hicolor/24x24/apps
        pidgin/pixmaps/icons/32 to pidgin/pixmaps/icons/hicolor/32x32/apps
        pidgin/pixmaps/icons/48 to pidgin/pixmaps/icons/hicolor/48x48/apps
Added files:
        doxy2devhelp.xsl finch/finch.pc.in
        libpurple/plugins/debug_example.c
        libpurple/plugins/helloworld.c
        libpurple/plugins/notify_example.c
        libpurple/protocols/bonjour/bonjour_ft.c
        libpurple/protocols/bonjour/bonjour_ft.h
        libpurple/protocols/bonjour/dns_sd_proxy.c
        libpurple/protocols/jabber/adhoccommands.c
        libpurple/protocols/jabber/adhoccommands.h
        libpurple/protocols/jabber/caps.c
        libpurple/protocols/jabber/caps.h
        libpurple/protocols/jabber/pep.c
        libpurple/protocols/jabber/pep.h
        libpurple/protocols/jabber/ping.c
        libpurple/protocols/jabber/ping.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/msn/README
        libpurple/protocols/msn/contact.c
        libpurple/protocols/msn/contact.h
        libpurple/protocols/msn/oim.c libpurple/protocols/msn/oim.h
        libpurple/protocols/msn/soap.c
        libpurple/protocols/msn/soap.h
        libpurple/protocols/msn/soap2.c
        libpurple/protocols/msn/soap2.h
        libpurple/protocols/msnp9/Makefile.am
        libpurple/protocols/msnp9/Makefile.mingw
        libpurple/protocols/msnp9/cmdproc.c
        libpurple/protocols/msnp9/cmdproc.h
        libpurple/protocols/msnp9/command.c
        libpurple/protocols/msnp9/command.h
        libpurple/protocols/msnp9/dialog.c
        libpurple/protocols/msnp9/dialog.h
        libpurple/protocols/msnp9/directconn.c
        libpurple/protocols/msnp9/directconn.h
        libpurple/protocols/msnp9/error.c
        libpurple/protocols/msnp9/error.h
        libpurple/protocols/msnp9/group.c
        libpurple/protocols/msnp9/group.h
        libpurple/protocols/msnp9/history.c
        libpurple/protocols/msnp9/history.h
        libpurple/protocols/msnp9/httpconn.c
        libpurple/protocols/msnp9/httpconn.h
        libpurple/protocols/msnp9/msg.c
        libpurple/protocols/msnp9/msg.h
        libpurple/protocols/msnp9/msn-utils.c
        libpurple/protocols/msnp9/msn-utils.h
        libpurple/protocols/msnp9/msn.c
        libpurple/protocols/msnp9/msn.h
        libpurple/protocols/msnp9/nexus.c
        libpurple/protocols/msnp9/nexus.h
        libpurple/protocols/msnp9/notification.c
        libpurple/protocols/msnp9/notification.h
        libpurple/protocols/msnp9/object.c
        libpurple/protocols/msnp9/object.h
        libpurple/protocols/msnp9/page.c
        libpurple/protocols/msnp9/page.h
        libpurple/protocols/msnp9/servconn.c
        libpurple/protocols/msnp9/servconn.h
        libpurple/protocols/msnp9/session.c
        libpurple/protocols/msnp9/session.h
        libpurple/protocols/msnp9/slp.c
        libpurple/protocols/msnp9/slp.h
        libpurple/protocols/msnp9/slpcall.c
        libpurple/protocols/msnp9/slpcall.h
        libpurple/protocols/msnp9/slplink.c
        libpurple/protocols/msnp9/slplink.h
        libpurple/protocols/msnp9/slpmsg.c
        libpurple/protocols/msnp9/slpmsg.h
        libpurple/protocols/msnp9/slpsession.c
        libpurple/protocols/msnp9/slpsession.h
        libpurple/protocols/msnp9/state.c
        libpurple/protocols/msnp9/state.h
        libpurple/protocols/msnp9/switchboard.c
        libpurple/protocols/msnp9/switchboard.h
        libpurple/protocols/msnp9/sync.c
        libpurple/protocols/msnp9/sync.h
        libpurple/protocols/msnp9/table.c
        libpurple/protocols/msnp9/table.h
        libpurple/protocols/msnp9/transaction.c
        libpurple/protocols/msnp9/transaction.h
        libpurple/protocols/msnp9/user.c
        libpurple/protocols/msnp9/user.h
        libpurple/protocols/msnp9/userlist.c
        libpurple/protocols/msnp9/userlist.h libpurple/purple.h.in
        pidgin/minidialog.c pidgin/minidialog.h
        pidgin/pixmaps/emblems/16/birthday.png
        pidgin/pixmaps/emblems/16/music.png
        pidgin/pixmaps/emblems/16/scalable/music.svg
        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
        pidgin/win32/nsis/translations/basque.nsh po/be at latin.po
        po/lo.po po/sr at latin.po po/ur.po
        share/ca-certs/Microsoft_Secure_Server_Authority.pem
Added directories:
        libpurple/protocols/msnp9 pidgin/pixmaps/icons/hicolor
        pidgin/pixmaps/icons/hicolor/16x16
        pidgin/pixmaps/icons/hicolor/22x22
        pidgin/pixmaps/icons/hicolor/24x24
        pidgin/pixmaps/icons/hicolor/32x32
        pidgin/pixmaps/icons/hicolor/48x48 pidgin/pixmaps/toolbar/11
        pidgin/plugins/gevolution
Modified files:
        .mtn-ignore AUTHORS COPYRIGHT ChangeLog ChangeLog.API
        ChangeLog.win32 Doxyfile.in INSTALL Makefile.am
        Makefile.mingw NEWS config.h.mingw configure.ac
        doc/C-HOWTO.dox doc/SIGNAL-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-i18n.dox
        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/finch.h finch/gntaccount.c finch/gntaccount.h
        finch/gntblist.c finch/gntblist.h finch/gntcertmgr.c
        finch/gntcertmgr.h finch/gntconn.c finch/gntconn.h
        finch/gntconv.c finch/gntconv.h finch/gntdebug.c
        finch/gntdebug.h finch/gntft.c finch/gntft.h finch/gntidle.h
        finch/gntnotify.c finch/gntnotify.h finch/gntplugin.c
        finch/gntplugin.h finch/gntpounce.c finch/gntpounce.h
        finch/gntprefs.c finch/gntprefs.h finch/gntrequest.c
        finch/gntrequest.h finch/gntsound.c finch/gntsound.h
        finch/gntstatus.c finch/gntstatus.h finch/libgnt/Makefile.am
        finch/libgnt/configure.ac finch/libgnt/gnt.h
        finch/libgnt/gntbindable.h finch/libgnt/gntbox.c
        finch/libgnt/gntbutton.c finch/libgnt/gntbutton.h
        finch/libgnt/gntcheckbox.c finch/libgnt/gntcheckbox.h
        finch/libgnt/gntclipboard.c finch/libgnt/gntclipboard.h
        finch/libgnt/gntcolors.c finch/libgnt/gntcolors.h
        finch/libgnt/gntcombobox.c finch/libgnt/gntcombobox.h
        finch/libgnt/gntentry.c finch/libgnt/gntentry.h
        finch/libgnt/gntfilesel.c finch/libgnt/gntfilesel.h
        finch/libgnt/gntkeys.h finch/libgnt/gntlabel.c
        finch/libgnt/gntlabel.h finch/libgnt/gntline.c
        finch/libgnt/gntline.h finch/libgnt/gntmain.c
        finch/libgnt/gntmenu.c finch/libgnt/gntmenu.h
        finch/libgnt/gntmenuitem.c finch/libgnt/gntmenuitem.h
        finch/libgnt/gntmenuitemcheck.h finch/libgnt/gntslider.c
        finch/libgnt/gntslider.h finch/libgnt/gntstyle.c
        finch/libgnt/gntstyle.h finch/libgnt/gnttextview.c
        finch/libgnt/gnttextview.h finch/libgnt/gnttree.c
        finch/libgnt/gnttree.h finch/libgnt/gntutils.h
        finch/libgnt/gntwidget.c finch/libgnt/gntwidget.h
        finch/libgnt/gntwindow.c finch/libgnt/gntwindow.h
        finch/libgnt/gntwm.c finch/libgnt/gntwm.h
        finch/libgnt/gntws.c finch/libgnt/gntws.h
        finch/libgnt/pygnt/example/rss/gntrss-ui.py
        finch/libgnt/pygnt/example/rss/gntrss.py
        finch/libgnt/pygnt/gntmodule.c
        finch/libgnt/pygnt/gnttree.override
        finch/libgnt/pygnt/test.py finch/libgnt/test/Makefile
        finch/libgnt/test/tv.c finch/plugins/gntclipboard.c
        finch/plugins/gntgf.c finch/plugins/gnthistory.c
        finch/plugins/lastlog.c libpurple/Makefile.am
        libpurple/Makefile.mingw libpurple/account.c
        libpurple/account.h libpurple/accountopt.c
        libpurple/accountopt.h libpurple/blist.c libpurple/blist.h
        libpurple/buddyicon.c libpurple/buddyicon.h
        libpurple/certificate.c libpurple/certificate.h
        libpurple/cipher.c libpurple/cipher.h libpurple/circbuffer.c
        libpurple/circbuffer.h libpurple/cmds.c libpurple/cmds.h
        libpurple/connection.c libpurple/connection.h
        libpurple/conversation.c libpurple/conversation.h
        libpurple/core.c libpurple/core.h
        libpurple/dbus-analyze-functions.py
        libpurple/dbus-bindings.h libpurple/dbus-server.c
        libpurple/dbus-server.h libpurple/debug.c libpurple/debug.h
        libpurple/desktopitem.c libpurple/desktopitem.h
        libpurple/dnsquery.c libpurple/dnsquery.h libpurple/dnssrv.c
        libpurple/dnssrv.h libpurple/eventloop.c
        libpurple/eventloop.h libpurple/example/nullclient.c
        libpurple/ft.c libpurple/ft.h libpurple/gaim-compat.h
        libpurple/idle.h libpurple/imgstore.c libpurple/imgstore.h
        libpurple/internal.h libpurple/log.c libpurple/log.h
        libpurple/nat-pmp.c libpurple/nat-pmp.h libpurple/network.c
        libpurple/network.h libpurple/notify.c libpurple/notify.h
        libpurple/ntlm.c libpurple/ntlm.h libpurple/plugin.c
        libpurple/plugin.h libpurple/pluginpref.h
        libpurple/plugins/Makefile.am
        libpurple/plugins/Makefile.mingw
        libpurple/plugins/autoaccept.c libpurple/plugins/buddynote.c
        libpurple/plugins/ciphertest.c
        libpurple/plugins/database_logger.c
        libpurple/plugins/dbus-example.c libpurple/plugins/filectl.c
        libpurple/plugins/idle.c libpurple/plugins/ipc-test-client.c
        libpurple/plugins/ipc-test-server.c
        libpurple/plugins/joinpart.c libpurple/plugins/log_reader.c
        libpurple/plugins/mono/loader/mono.c
        libpurple/plugins/newline.c libpurple/plugins/offlinemsg.c
        libpurple/plugins/perl/common/BuddyList.xs
        libpurple/plugins/perl/common/Cmds.xs
        libpurple/plugins/perl/common/Conversation.xs
        libpurple/plugins/perl/common/Log.xs
        libpurple/plugins/perl/common/PluginPref.xs
        libpurple/plugins/perl/common/Pounce.xs
        libpurple/plugins/perl/common/Prefs.xs
        libpurple/plugins/perl/common/Prpl.xs
        libpurple/plugins/perl/common/SavedStatuses.xs
        libpurple/plugins/perl/common/Status.xs
        libpurple/plugins/perl/common/module.h
        libpurple/plugins/perl/common/typemap
        libpurple/plugins/perl/perl.c
        libpurple/plugins/pluginpref_example.c
        libpurple/plugins/psychic.c libpurple/plugins/signals-test.c
        libpurple/plugins/simple.c
        libpurple/plugins/ssl/ssl-gnutls.c
        libpurple/plugins/ssl/ssl-nss.c libpurple/plugins/ssl/ssl.c
        libpurple/plugins/statenotify.c libpurple/plugins/tcl/tcl.c
        libpurple/plugins/tcl/tcl_cmds.c
        libpurple/plugins/tcl/tcl_purple.h libpurple/pounce.c
        libpurple/pounce.h libpurple/prefs.c libpurple/prefs.h
        libpurple/privacy.h libpurple/protocols/Makefile.am
        libpurple/protocols/Makefile.mingw
        libpurple/protocols/bonjour/Makefile.am
        libpurple/protocols/bonjour/Makefile.mingw
        libpurple/protocols/bonjour/bonjour.c
        libpurple/protocols/bonjour/bonjour.h
        libpurple/protocols/bonjour/buddy.c
        libpurple/protocols/bonjour/buddy.h
        libpurple/protocols/bonjour/dns_sd_proxy.h
        libpurple/protocols/bonjour/issues.txt
        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/buddylist.c
        libpurple/protocols/gg/gg-utils.c
        libpurple/protocols/gg/gg-utils.h
        libpurple/protocols/gg/gg.c libpurple/protocols/irc/cmds.c
        libpurple/protocols/irc/dcc_send.c
        libpurple/protocols/irc/irc.c libpurple/protocols/irc/irc.h
        libpurple/protocols/irc/msgs.c
        libpurple/protocols/irc/parse.c
        libpurple/protocols/jabber/Makefile.am
        libpurple/protocols/jabber/Makefile.mingw
        libpurple/protocols/jabber/auth.c
        libpurple/protocols/jabber/buddy.c
        libpurple/protocols/jabber/buddy.h
        libpurple/protocols/jabber/chat.c
        libpurple/protocols/jabber/disco.c
        libpurple/protocols/jabber/google.c
        libpurple/protocols/jabber/google.h
        libpurple/protocols/jabber/iq.c
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/jabber/jabber.h
        libpurple/protocols/jabber/libxmpp.c
        libpurple/protocols/jabber/message.c
        libpurple/protocols/jabber/message.h
        libpurple/protocols/jabber/parser.c
        libpurple/protocols/jabber/parser.h
        libpurple/protocols/jabber/presence.c
        libpurple/protocols/jabber/presence.h
        libpurple/protocols/jabber/roster.c
        libpurple/protocols/jabber/si.c
        libpurple/protocols/jabber/xdata.c
        libpurple/protocols/jabber/xdata.h
        libpurple/protocols/msn/Makefile.am
        libpurple/protocols/msn/Makefile.mingw
        libpurple/protocols/msn/cmdproc.c
        libpurple/protocols/msn/command.c
        libpurple/protocols/msn/dialog.c
        libpurple/protocols/msn/directconn.c
        libpurple/protocols/msn/directconn.h
        libpurple/protocols/msn/group.c
        libpurple/protocols/msn/group.h
        libpurple/protocols/msn/history.c
        libpurple/protocols/msn/httpconn.c
        libpurple/protocols/msn/msg.c libpurple/protocols/msn/msg.h
        libpurple/protocols/msn/msn.c libpurple/protocols/msn/msn.h
        libpurple/protocols/msn/msnutils.c
        libpurple/protocols/msn/msnutils.h
        libpurple/protocols/msn/nexus.c
        libpurple/protocols/msn/nexus.h
        libpurple/protocols/msn/notification.c
        libpurple/protocols/msn/notification.h
        libpurple/protocols/msn/object.c
        libpurple/protocols/msn/page.c
        libpurple/protocols/msn/servconn.c
        libpurple/protocols/msn/session.c
        libpurple/protocols/msn/session.h
        libpurple/protocols/msn/slp.c
        libpurple/protocols/msn/slpcall.c
        libpurple/protocols/msn/slplink.c
        libpurple/protocols/msn/state.c
        libpurple/protocols/msn/state.h
        libpurple/protocols/msn/switchboard.c
        libpurple/protocols/msn/sync.c
        libpurple/protocols/msn/user.c
        libpurple/protocols/msn/user.h
        libpurple/protocols/msn/userlist.c
        libpurple/protocols/msn/userlist.h
        libpurple/protocols/myspace/Makefile.am
        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_chatnav.c
        libpurple/protocols/oscar/family_feedbag.c
        libpurple/protocols/oscar/family_icbm.c
        libpurple/protocols/oscar/flap_connection.c
        libpurple/protocols/oscar/libaim.c
        libpurple/protocols/oscar/libicq.c
        libpurple/protocols/oscar/odc.c
        libpurple/protocols/oscar/oft.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/header_info.h
        libpurple/protocols/qq/keep_alive.c
        libpurple/protocols/qq/login_logout.c
        libpurple/protocols/qq/packet_parse.h
        libpurple/protocols/qq/qq.c
        libpurple/protocols/qq/qq_proxy.c
        libpurple/protocols/qq/recv_core.c
        libpurple/protocols/qq/sendqueue.c
        libpurple/protocols/qq/udp_proxy_s5.c
        libpurple/protocols/sametime/sametime.c
        libpurple/protocols/silc/buddy.c
        libpurple/protocols/silc/chat.c
        libpurple/protocols/silc/ops.c libpurple/protocols/silc/pk.c
        libpurple/protocols/silc/silc.c
        libpurple/protocols/silc/silcpurple.h
        libpurple/protocols/silc/util.c
        libpurple/protocols/silc/wb.c
        libpurple/protocols/silc10/buddy.c
        libpurple/protocols/silc10/silc.c
        libpurple/protocols/silc10/util.c
        libpurple/protocols/silc10/wb.c
        libpurple/protocols/simple/simple.c
        libpurple/protocols/simple/simple.h
        libpurple/protocols/simple/sipmsg.c
        libpurple/protocols/simple/sipmsg.h
        libpurple/protocols/toc/toc.c
        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_doodle.h
        libpurple/protocols/yahoo/yahoo_filexfer.c
        libpurple/protocols/yahoo/yahoo_filexfer.h
        libpurple/protocols/yahoo/yahoo_packet.c
        libpurple/protocols/yahoo/yahoo_packet.h
        libpurple/protocols/yahoo/ycht.c
        libpurple/protocols/zephyr/zephyr.c libpurple/proxy.c
        libpurple/proxy.h libpurple/prpl.c libpurple/prpl.h
        libpurple/purple-remote libpurple/purple-uninstalled.pc.in
        libpurple/purple.pc.in libpurple/request.c
        libpurple/request.h libpurple/roomlist.c
        libpurple/roomlist.h libpurple/savedstatuses.c
        libpurple/savedstatuses.h libpurple/server.c
        libpurple/server.h libpurple/signals.c libpurple/signals.h
        libpurple/sound.h libpurple/sslconn.c libpurple/sslconn.h
        libpurple/status.c libpurple/status.h libpurple/stringref.c
        libpurple/stringref.h libpurple/stun.c libpurple/stun.h
        libpurple/tests/Makefile.am
        libpurple/tests/check_libpurple.c
        libpurple/tests/test_cipher.c libpurple/tests/test_util.c
        libpurple/tests/tests.h libpurple/upnp.c libpurple/upnp.h
        libpurple/util.c libpurple/util.h libpurple/value.c
        libpurple/value.h libpurple/version.c libpurple/whiteboard.h
        libpurple/win32/global.mak libpurple/win32/libc_interface.c
        libpurple/win32/libc_interface.h
        libpurple/win32/libc_internal.h libpurple/win32/targets.mak
        libpurple/win32/win32dep.c libpurple/win32/win32dep.h
        libpurple/xmlnode.c libpurple/xmlnode.h pidgin/Makefile.am
        pidgin/Makefile.mingw pidgin/eggtrayicon.c
        pidgin/gtkaccount.c pidgin/gtkaccount.h pidgin/gtkblist.c
        pidgin/gtkblist.h pidgin/gtkcellrendererexpander.c
        pidgin/gtkcellrendererprogress.c pidgin/gtkcertmgr.c
        pidgin/gtkconn.c pidgin/gtkconn.h pidgin/gtkconv.c
        pidgin/gtkconv.h pidgin/gtkconvwin.h pidgin/gtkdebug.c
        pidgin/gtkdebug.h pidgin/gtkdialogs.c pidgin/gtkdialogs.h
        pidgin/gtkdnd-hints.c pidgin/gtkdnd-hints.h
        pidgin/gtkdocklet.c pidgin/gtkeventloop.c
        pidgin/gtkeventloop.h pidgin/gtkft.c pidgin/gtkft.h
        pidgin/gtkgaim-compat.h pidgin/gtkidle.h pidgin/gtkimhtml.c
        pidgin/gtkimhtml.h pidgin/gtkimhtmltoolbar.c pidgin/gtklog.c
        pidgin/gtklog.h pidgin/gtkmain.c pidgin/gtkmenutray.h
        pidgin/gtknickcolors.h pidgin/gtknotify.c pidgin/gtknotify.h
        pidgin/gtkplugin.c pidgin/gtkplugin.h pidgin/gtkpluginpref.c
        pidgin/gtkpluginpref.h pidgin/gtkpounce.c pidgin/gtkpounce.h
        pidgin/gtkprefs.c pidgin/gtkprefs.h pidgin/gtkprivacy.c
        pidgin/gtkprivacy.h pidgin/gtkrequest.c pidgin/gtkrequest.h
        pidgin/gtkroomlist.c pidgin/gtkroomlist.h
        pidgin/gtksavedstatuses.c pidgin/gtksavedstatuses.h
        pidgin/gtkscrollbook.c pidgin/gtkscrollbook.h
        pidgin/gtksession.c pidgin/gtksession.h pidgin/gtksound.c
        pidgin/gtksound.h pidgin/gtkstatusbox.c
        pidgin/gtkstatusbox.h pidgin/gtkthemes.h pidgin/gtkutils.c
        pidgin/gtkutils.h pidgin/gtkwhiteboard.h
        pidgin/pidgin-uninstalled.pc.in pidgin/pidgin.h
        pidgin/pidgin.pc.in pidgin/pidginstock.c
        pidgin/pidginstock.h pidgin/pixmaps/Makefile.am
        pidgin/pixmaps/Makefile.mingw
        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/emotes/default/24/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/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/plugins/cap/cap.c pidgin/plugins/cap/cap.h
        pidgin/plugins/contact_priority.c
        pidgin/plugins/convcolors.c
        pidgin/plugins/crazychat/cc_features.c
        pidgin/plugins/crazychat/cc_pidgin_plugin.c
        pidgin/plugins/extplacement.c
        pidgin/plugins/gestures/gestures.c
        pidgin/plugins/gestures/stroke-draw.c
        pidgin/plugins/gtk-signals-test.c
        pidgin/plugins/gtkbuddynote.c pidgin/plugins/history.c
        pidgin/plugins/iconaway.c pidgin/plugins/mailchk.c
        pidgin/plugins/markerline.c
        pidgin/plugins/musicmessaging/musicmessaging.c
        pidgin/plugins/notify.c pidgin/plugins/pidgininc.c
        pidgin/plugins/pidginrc.c pidgin/plugins/raw.c
        pidgin/plugins/relnot.c pidgin/plugins/spellchk.c
        pidgin/plugins/ticker/ticker.c pidgin/plugins/timestamp.c
        pidgin/plugins/timestamp_format.c
        pidgin/plugins/win32/transparency/win2ktrans.c
        pidgin/plugins/win32/winprefs/gtkappbar.c
        pidgin/plugins/win32/winprefs/winprefs.c
        pidgin/plugins/xmppconsole.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/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/emblems/16/music.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 '5e43b070de1b63b6136aaac4de9364b9db5a44c5'
     and 'f9b26c3b3b56e4047a36cc7f27b68b01b9f8727b'



More information about the Commits mailing list