gobjectification: 13269c68: explicit merge of '3a4ee0bcf0b04e522012a...

grim at pidgin.im grim at pidgin.im
Mon Jun 8 01:55:41 EDT 2009


-----------------------------------------------------------------
Revision: 13269c688ba457f61d5799c9bd2800b91d65b833
Ancestor: 3a4ee0bcf0b04e522012ac6dcfc72e1c6da34032
Ancestor: 805d22215e004886db5864e0da521823573f3fff
Author: grim at pidgin.im
Date: 2009-06-08T02:01:15
Branch: im.pidgin.gobjectification
URL: http://d.pidgin.im/viewmtn/revision/info/13269c688ba457f61d5799c9bd2800b91d65b833

Deleted entries:
        libpurple/protocols/toc
Added files:
        doc/hierarchy.dot finch/libgnt/gntprogressbar.c
        finch/libgnt/gntprogressbar.h finch/plugins/gnttinyurl.c
        libpurple/accountmanager.c libpurple/accountmanager.h
        libpurple/des3cipher.c libpurple/des3cipher.h
        libpurple/descipher.c libpurple/descipher.h
        libpurple/hmaccipher.c libpurple/hmaccipher.h
        libpurple/md4cipher.c libpurple/md4cipher.h
        libpurple/md5cipher.c libpurple/md5cipher.h
        libpurple/pobject.c libpurple/pobject.h
        libpurple/rc4cipher.c libpurple/rc4cipher.h
        libpurple/sha1cipher.c libpurple/sha1cipher.h
        pidgin/plugins/themeedit-icon.c
        pidgin/plugins/themeedit-icon.h pidgin/plugins/themeedit.c
Modified files:
        AUTHORS COPYRIGHT ChangeLog ChangeLog.API acinclude.m4
        configure.ac doc/TCL-HOWTO.dox doc/account-signals.dox
        doc/finch.1.in doc/pidgin.1.in finch/gntaccount.c
        finch/gntblist.c finch/gntconn.c finch/gntconv.c
        finch/gntmedia.c finch/gntnotify.c finch/gntpounce.c
        finch/gntsound.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/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/account.h libpurple/blist.c
        libpurple/blist.h libpurple/buddyicon.c libpurple/cipher.c
        libpurple/cipher.h libpurple/connection.c
        libpurple/connection.h libpurple/conversation.c
        libpurple/conversation.h libpurple/core.c
        libpurple/dbus-analyze-functions.py libpurple/dbus-server.c
        libpurple/dbus-useful.c libpurple/example/nullclient.c
        libpurple/ft.c libpurple/idle.c libpurple/internal.h
        libpurple/log.c libpurple/marshallers.list
        libpurple/media-gst.h libpurple/media.c libpurple/media.h
        libpurple/mediamanager.c libpurple/mediamanager.h
        libpurple/mime.c libpurple/mime.h libpurple/network.c
        libpurple/network.h libpurple/ntlm.c libpurple/plugin.c
        libpurple/plugin.h libpurple/plugins/Makefile.am
        libpurple/plugins/ciphertest.c libpurple/plugins/filectl.c
        libpurple/plugins/idle.c libpurple/plugins/joinpart.c
        libpurple/plugins/log_reader.c
        libpurple/plugins/perl/common/Account.xs
        libpurple/plugins/perl/common/Certificate.xs
        libpurple/plugins/perl/common/Cipher.xs
        libpurple/plugins/perl/common/Connection.xs
        libpurple/plugins/perl/common/Prpl.xs
        libpurple/plugins/perl/common/Status.xs
        libpurple/plugins/perl/common/Util.xs
        libpurple/plugins/perl/common/module.h
        libpurple/plugins/perl/common/typemap
        libpurple/plugins/perl/perl-common.c
        libpurple/plugins/signals-test.c
        libpurple/plugins/statenotify.c
        libpurple/plugins/tcl/tcl_cmds.c
        libpurple/plugins/tcl/tcl_signals.c libpurple/pounce.c
        libpurple/protocols/bonjour/Makefile.mingw
        libpurple/protocols/bonjour/bonjour.c
        libpurple/protocols/bonjour/bonjour_ft.c
        libpurple/protocols/bonjour/jabber.c
        libpurple/protocols/bonjour/mdns_avahi.c
        libpurple/protocols/bonjour/mdns_win32.c
        libpurple/protocols/bonjour/parser.c
        libpurple/protocols/gg/Makefile.mingw
        libpurple/protocols/gg/buddylist.c
        libpurple/protocols/gg/confer.c libpurple/protocols/gg/gg.c
        libpurple/protocols/gg/search.c
        libpurple/protocols/irc/Makefile.mingw
        libpurple/protocols/irc/cmds.c
        libpurple/protocols/irc/dcc_send.c
        libpurple/protocols/irc/irc.c libpurple/protocols/irc/msgs.c
        libpurple/protocols/irc/parse.c
        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/jingle/content.c
        libpurple/protocols/jabber/jingle/content.h
        libpurple/protocols/jabber/jingle/iceudp.h
        libpurple/protocols/jabber/jingle/jingle.c
        libpurple/protocols/jabber/jingle/jingle.h
        libpurple/protocols/jabber/jingle/rawudp.h
        libpurple/protocols/jabber/jingle/rtp.c
        libpurple/protocols/jabber/jingle/rtp.h
        libpurple/protocols/jabber/jingle/session.h
        libpurple/protocols/jabber/jingle/transport.h
        libpurple/protocols/jabber/jutil.c
        libpurple/protocols/jabber/jutil.h
        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/Makefile.mingw
        libpurple/protocols/msn/contact.c
        libpurple/protocols/msn/dialog.c
        libpurple/protocols/msn/error.c
        libpurple/protocols/msn/httpconn.c
        libpurple/protocols/msn/msg.c libpurple/protocols/msn/msn.c
        libpurple/protocols/msn/msn.h
        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/servconn.c
        libpurple/protocols/msn/session.c
        libpurple/protocols/msn/slp.c
        libpurple/protocols/msn/slplink.c
        libpurple/protocols/msn/switchboard.c
        libpurple/protocols/msn/sync.c
        libpurple/protocols/msn/user.c
        libpurple/protocols/msn/userlist.c
        libpurple/protocols/msnp9/Makefile.mingw
        libpurple/protocols/msnp9/dialog.c
        libpurple/protocols/msnp9/error.c
        libpurple/protocols/msnp9/httpconn.c
        libpurple/protocols/msnp9/msn.c
        libpurple/protocols/msnp9/msn.h
        libpurple/protocols/msnp9/nexus.c
        libpurple/protocols/msnp9/notification.c
        libpurple/protocols/msnp9/object.c
        libpurple/protocols/msnp9/servconn.c
        libpurple/protocols/msnp9/session.c
        libpurple/protocols/msnp9/slp.c
        libpurple/protocols/msnp9/slpcall.c
        libpurple/protocols/msnp9/slpcall.h
        libpurple/protocols/msnp9/switchboard.c
        libpurple/protocols/msnp9/sync.c
        libpurple/protocols/msnp9/transaction.c
        libpurple/protocols/msnp9/userlist.c
        libpurple/protocols/myspace/Makefile.mingw
        libpurple/protocols/myspace/myspace.c
        libpurple/protocols/myspace/myspace.h
        libpurple/protocols/myspace/user.c
        libpurple/protocols/myspace/zap.c
        libpurple/protocols/novell/Makefile.mingw
        libpurple/protocols/novell/novell.c
        libpurple/protocols/null/Makefile.mingw
        libpurple/protocols/null/nullprpl.c
        libpurple/protocols/oscar/Makefile.mingw
        libpurple/protocols/oscar/family_auth.c
        libpurple/protocols/oscar/family_oservice.c
        libpurple/protocols/oscar/flap_connection.c
        libpurple/protocols/oscar/oscar.c
        libpurple/protocols/oscar/peer.c
        libpurple/protocols/qq/ChangeLog
        libpurple/protocols/qq/Makefile.mingw
        libpurple/protocols/qq/buddy_info.c
        libpurple/protocols/qq/buddy_list.c
        libpurple/protocols/qq/buddy_opt.c
        libpurple/protocols/qq/file_trans.c
        libpurple/protocols/qq/group.c
        libpurple/protocols/qq/group_im.c
        libpurple/protocols/qq/group_info.c
        libpurple/protocols/qq/group_internal.c
        libpurple/protocols/qq/group_join.c
        libpurple/protocols/qq/group_opt.c
        libpurple/protocols/qq/im.c libpurple/protocols/qq/qq.c
        libpurple/protocols/qq/qq_base.c
        libpurple/protocols/qq/qq_network.c
        libpurple/protocols/qq/qq_process.c
        libpurple/protocols/qq/qq_trans.c
        libpurple/protocols/qq/send_file.c
        libpurple/protocols/qq/utils.c
        libpurple/protocols/sametime/Makefile.mingw
        libpurple/protocols/sametime/sametime.c
        libpurple/protocols/silc/Makefile.mingw
        libpurple/protocols/silc/buddy.c
        libpurple/protocols/silc/chat.c
        libpurple/protocols/silc/ft.c libpurple/protocols/silc/ops.c
        libpurple/protocols/silc/pk.c
        libpurple/protocols/silc/silc.c
        libpurple/protocols/silc/util.c
        libpurple/protocols/silc/wb.c
        libpurple/protocols/silc10/buddy.c
        libpurple/protocols/silc10/chat.c
        libpurple/protocols/silc10/ft.c
        libpurple/protocols/silc10/ops.c
        libpurple/protocols/silc10/silc.c
        libpurple/protocols/silc10/util.c
        libpurple/protocols/simple/Makefile.mingw
        libpurple/protocols/simple/simple.c
        libpurple/protocols/yahoo/Makefile.mingw
        libpurple/protocols/yahoo/util.c
        libpurple/protocols/yahoo/yahoo.c
        libpurple/protocols/yahoo/yahoo_aliases.c
        libpurple/protocols/yahoo/yahoo_crypt.c
        libpurple/protocols/yahoo/yahoo_doodle.c
        libpurple/protocols/yahoo/yahoo_filexfer.c
        libpurple/protocols/yahoo/yahoo_friend.c
        libpurple/protocols/yahoo/yahoo_picture.c
        libpurple/protocols/yahoo/yahoo_profile.c
        libpurple/protocols/yahoo/yahoochat.c
        libpurple/protocols/yahoo/ycht.c
        libpurple/protocols/zephyr/ZVariables.c
        libpurple/protocols/zephyr/zephyr.c libpurple/proxy.c
        libpurple/prpl.c libpurple/prpl.h libpurple/purple.h.in
        libpurple/savedstatuses.c libpurple/server.c
        libpurple/signals.c libpurple/signals.h libpurple/smiley.h
        libpurple/sound-theme.h libpurple/status.c
        libpurple/status.h libpurple/stun.c
        libpurple/tests/check_libpurple.c
        libpurple/tests/test_cipher.c libpurple/theme-loader.h
        libpurple/theme-manager.c libpurple/theme-manager.h
        libpurple/util.c libpurple/util.h libpurple/value.c
        libpurple/value.h libpurple/win32/global.mak
        libpurple/win32/win32dep.c libpurple/xmlnode.c
        libpurple/xmlnode.h pidgin/Makefile.am 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/gtkconn.c
        pidgin/gtkconv.c pidgin/gtkconv.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/gtkmedia.c pidgin/gtkmedia.h
        pidgin/gtkmenutray.c pidgin/gtkmenutray.h pidgin/gtknotify.c
        pidgin/gtknotify.h pidgin/gtkplugin.c pidgin/gtkpounce.c
        pidgin/gtkprefs.c pidgin/gtkprefs.h pidgin/gtkroomlist.c
        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/plugins/Makefile.am
        pidgin/plugins/cap/cap.c pidgin/plugins/contact_priority.c
        pidgin/plugins/gevolution/gevo-util.c
        pidgin/plugins/gevolution/gevolution.c
        pidgin/plugins/mailchk.c pidgin/plugins/markerline.c
        pidgin/plugins/musicmessaging/musicmessaging.c
        pidgin/plugins/pidgininc.c pidgin/plugins/raw.c
        pidgin/plugins/relnot.c pidgin/plugins/ticker/gtkticker.c
        pidgin/plugins/ticker/gtkticker.h
        pidgin/plugins/ticker/ticker.c
        pidgin/plugins/win32/transparency/win2ktrans.c
        pidgin/plugins/xmppconsole.c
        pidgin/win32/nsis/pidgin-installer.nsi po/POTFILES.in
        po/de.po po/fi.po

ChangeLog: 

explicit merge of '3a4ee0bcf0b04e522012ac6dcfc72e1c6da34032'
              and '805d22215e004886db5864e0da521823573f3fff'



More information about the Commits mailing list