gobjectification: aca46cdd: explicit merge of '5aebbb01c9a3408a2dd4f...

grim at pidgin.im grim at pidgin.im
Mon Jun 8 01:56:48 EDT 2009


-----------------------------------------------------------------
Revision: aca46cdd74370d21d1332a18c403c088c32a25d7
Ancestor: 546f5383f33600bb913bd9fe20559f24a371e881
Ancestor: 5aebbb01c9a3408a2dd4f9d94203330bcd9e6057
Author: grim at pidgin.im
Date: 2009-06-06T00:47:53
Branch: im.pidgin.gobjectification
URL: http://d.pidgin.im/viewmtn/revision/info/aca46cdd74370d21d1332a18c403c088c32a25d7

Deleted entries:
        .todo
Added files:
        doc/hierarchy.dot fix-casts.sh 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/marshallers.list
        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
        libpurple/sound-theme-loader.c
        libpurple/sound-theme-loader.h libpurple/sound-theme.c
        libpurple/sound-theme.h libpurple/theme-loader.c
        libpurple/theme-loader.h libpurple/theme-manager.c
        libpurple/theme-manager.h libpurple/theme.c
        libpurple/theme.h pidgin/gtkblist-theme-loader.c
        pidgin/gtkblist-theme-loader.h pidgin/gtkblist-theme.c
        pidgin/gtkblist-theme.h pidgin/gtkicon-theme-loader.c
        pidgin/gtkicon-theme-loader.h pidgin/gtkicon-theme.c
        pidgin/gtkicon-theme.h pidgin/gtkstatus-icon-theme.c
        pidgin/gtkstatus-icon-theme.h
Modified files:
        .mtn-ignore COPYRIGHT ChangeLog ChangeLog.API
        ChangeLog.win32 Makefile.am Makefile.mingw acinclude.m4
        configure.ac doc/TCL-HOWTO.dox doc/notify-signals.dox
        doc/pidgin.1.in finch/gntaccount.c finch/gntblist.c
        finch/gntconn.c finch/gntconv.c finch/gntlog.c
        finch/gntlog.h finch/gntpounce.c finch/gntrequest.c
        finch/gntsound.c finch/gntui.c finch/plugins/grouping.c
        libpurple/Makefile.am libpurple/Makefile.mingw
        libpurple/account.c libpurple/account.h libpurple/blist.c
        libpurple/blist.h libpurple/buddyicon.c
        libpurple/certificate.c libpurple/certificate.h
        libpurple/cipher.c libpurple/cipher.h libpurple/circbuffer.c
        libpurple/cmds.c 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/dbus-useful.c
        libpurple/desktopitem.c libpurple/desktopitem.h
        libpurple/eventloop.h libpurple/example/nullclient.c
        libpurple/idle.c libpurple/internal.h libpurple/log.c
        libpurple/log.h libpurple/nat-pmp.c 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/plugins/Makefile.am
        libpurple/plugins/Makefile.mingw
        libpurple/plugins/autoaccept.c
        libpurple/plugins/ciphertest.c libpurple/plugins/filectl.c
        libpurple/plugins/idle.c libpurple/plugins/log_reader.c
        libpurple/plugins/perl/common/Account.xs
        libpurple/plugins/perl/common/BuddyList.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/Request.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/signals-test.c
        libpurple/plugins/statenotify.c
        libpurple/plugins/tcl/tcl_cmds.c
        libpurple/plugins/tcl/tcl_signals.c libpurple/pounce.c
        libpurple/prefs.c libpurple/prefs.h libpurple/privacy.c
        libpurple/privacy.h libpurple/protocols/Makefile.mingw
        libpurple/protocols/bonjour/Makefile.mingw
        libpurple/protocols/bonjour/bonjour.c
        libpurple/protocols/bonjour/bonjour_ft.c
        libpurple/protocols/bonjour/buddy.c
        libpurple/protocols/bonjour/jabber.c
        libpurple/protocols/bonjour/mdns_avahi.c
        libpurple/protocols/bonjour/mdns_win32.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/Makefile.mingw
        libpurple/protocols/jabber/adhoccommands.c
        libpurple/protocols/jabber/auth.c
        libpurple/protocols/jabber/buddy.c
        libpurple/protocols/jabber/chat.c
        libpurple/protocols/jabber/disco.c
        libpurple/protocols/jabber/google.c
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/jabber/jutil.c
        libpurple/protocols/jabber/message.c
        libpurple/protocols/jabber/oob.c
        libpurple/protocols/jabber/ping.c
        libpurple/protocols/jabber/presence.c
        libpurple/protocols/jabber/roster.c
        libpurple/protocols/jabber/si.c
        libpurple/protocols/jabber/usermood.c
        libpurple/protocols/jabber/usernick.c
        libpurple/protocols/jabber/usertune.c
        libpurple/protocols/msn/Makefile.mingw
        libpurple/protocols/msn/contact.c
        libpurple/protocols/msn/dialog.c
        libpurple/protocols/msn/directconn.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/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/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/switchboard.c
        libpurple/protocols/msnp9/sync.c
        libpurple/protocols/msnp9/userlist.c
        libpurple/protocols/myspace/Makefile.mingw
        libpurple/protocols/myspace/README
        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/README
        libpurple/protocols/null/nullprpl.c
        libpurple/protocols/oscar/Makefile.mingw
        libpurple/protocols/oscar/family_admin.c
        libpurple/protocols/oscar/family_alert.c
        libpurple/protocols/oscar/family_auth.c
        libpurple/protocols/oscar/family_bart.c
        libpurple/protocols/oscar/family_bos.c
        libpurple/protocols/oscar/family_buddy.c
        libpurple/protocols/oscar/family_feedbag.c
        libpurple/protocols/oscar/family_icbm.c
        libpurple/protocols/oscar/family_locate.c
        libpurple/protocols/oscar/family_odir.c
        libpurple/protocols/oscar/family_oservice.c
        libpurple/protocols/oscar/flap_connection.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/peer.h
        libpurple/protocols/oscar/peer_proxy.c
        libpurple/protocols/oscar/snactypes.h
        libpurple/protocols/oscar/util.c
        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/toc/toc.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/zephyr.c libpurple/proxy.c
        libpurple/proxy.h libpurple/prpl.c libpurple/prpl.h
        libpurple/purple-send-async libpurple/purple.h.in
        libpurple/request.c libpurple/request.h
        libpurple/savedstatuses.c libpurple/server.c
        libpurple/server.h libpurple/signals.c libpurple/signals.h
        libpurple/smiley.c libpurple/sound.c libpurple/sslconn.c
        libpurple/sslconn.h libpurple/status.c libpurple/status.h
        libpurple/stun.c libpurple/tests/check_libpurple.c
        libpurple/tests/test_cipher.c libpurple/upnp.c
        libpurple/util.c libpurple/util.h libpurple/value.c
        libpurple/value.h libpurple/whiteboard.c
        libpurple/win32/global.mak libpurple/xmlnode.c
        libpurple/xmlnode.h pidgin/Makefile.am pidgin/Makefile.mingw
        pidgin/eggtrayicon.c pidgin/eggtrayicon.h pidgin/getopt.c
        pidgin/getopt1.c pidgin/gtkaccount.c pidgin/gtkblist.c
        pidgin/gtkblist.h pidgin/gtkcellrendererexpander.c
        pidgin/gtkcellrendererexpander.h
        pidgin/gtkcellrendererprogress.c
        pidgin/gtkcellrendererprogress.h pidgin/gtkcellview.c
        pidgin/gtkconn.c pidgin/gtkconv.c pidgin/gtkdebug.c
        pidgin/gtkdialogs.c pidgin/gtkdnd-hints.c
        pidgin/gtkdocklet-x11.c pidgin/gtkdocklet.c
        pidgin/gtkdocklet.h pidgin/gtkexpander.c pidgin/gtkimhtml.c
        pidgin/gtkimhtml.h pidgin/gtkimhtmltoolbar.c pidgin/gtklog.c
        pidgin/gtklog.h pidgin/gtkmain.c pidgin/gtknotify.c
        pidgin/gtkpluginpref.c pidgin/gtkpounce.c pidgin/gtkpounce.h
        pidgin/gtkprefs.c pidgin/gtkprefs.h pidgin/gtkrequest.c
        pidgin/gtkroomlist.c pidgin/gtksavedstatuses.c
        pidgin/gtkscrollbook.h pidgin/gtksession.c
        pidgin/gtksmiley.c pidgin/gtksmiley.h pidgin/gtksound.c
        pidgin/gtksound.h pidgin/gtksourceiter.c
        pidgin/gtksourceiter.h pidgin/gtksourceundomanager.c
        pidgin/gtksourceundomanager.h pidgin/gtkstatusbox.c
        pidgin/gtkthemes.c pidgin/gtkutils.c pidgin/gtkutils.h
        pidgin/gtkwhiteboard.c pidgin/pidgincombobox.c
        pidgin/pidginstock.c pidgin/pidginstock.h
        pidgin/pixmaps/Makefile.am pidgin/plugins/cap/cap.c
        pidgin/plugins/gevolution/gevo-util.c
        pidgin/plugins/gevolution/gevolution.c
        pidgin/plugins/gevolution/new_person_dialog.c
        pidgin/plugins/history.c pidgin/plugins/mailchk.c
        pidgin/plugins/perl/common/GtkLog.xs
        pidgin/plugins/pidgininc.c pidgin/plugins/raw.c
        pidgin/plugins/relnot.c pidgin/plugins/ticker/ticker.c
        pidgin/plugins/win32/winprefs/gtkappbar.c
        pidgin/plugins/xmppconsole.c po/ChangeLog po/POTFILES.in
        po/README po/et.po
Modified attrs:
        fix-casts.sh
        pidgin/pixmaps/art-tools/clean-svg-definitions.sh

ChangeLog: 

explicit merge of '5aebbb01c9a3408a2dd4f9d94203330bcd9e6057'
              and '546f5383f33600bb913bd9fe20559f24a371e881'



More information about the Commits mailing list