gobjectification: d571c0ac: explicit merge of '428d1b9d1ec79fad43c32...

qulogic at pidgin.im qulogic at pidgin.im
Wed Jun 9 01:32:17 EDT 2010 

-----------------------------------------------------------------
Revision: d571c0ac2ae0f30ab9ad82097fc26921b97fa976
Ancestor: 1f1b7343bd021866e6857dca0404342741049452
Ancestor: 428d1b9d1ec79fad43c322588aa123858132666c
Author: qulogic at pidgin.im
Date: 2010-06-07T04:49:26
Branch: im.pidgin.gobjectification
URL: http://d.pidgin.im/viewmtn/revision/info/d571c0ac2ae0f30ab9ad82097fc26921b97fa976

Added files:
        doc/hierarchy.dot libpurple/accountmanager.c
        libpurple/accountmanager.h libpurple/blist-node.c
        libpurple/blist-node.h libpurple/buddy.c libpurple/buddy.h
        libpurple/chat.c libpurple/chat.h libpurple/contact.c
        libpurple/contact.h libpurple/des3cipher.c
        libpurple/des3cipher.h libpurple/descipher.c
        libpurple/descipher.h libpurple/ghash.c libpurple/ghash.h
        libpurple/group.c libpurple/group.h libpurple/gsignal.c
        libpurple/gsignal.h libpurple/hash.c libpurple/hash.h
        libpurple/hmaccipher.c libpurple/hmaccipher.h
        libpurple/md4hash.c libpurple/md4hash.h
        libpurple/md5cipher.c libpurple/md5cipher.h
        libpurple/plugins/perl/common/Hash.xs libpurple/pobject.c
        libpurple/pobject.h libpurple/protocols/jabber/auth_cyrus.c
        libpurple/protocols/jabber/auth_digest_md5.c
        libpurple/protocols/jabber/auth_plain.c
        libpurple/protocols/jabber/auth_scram.c
        libpurple/protocols/jabber/auth_scram.h
        libpurple/protocols/jabber/namespaces.h
        libpurple/protocols/mxit/Makefile.am
        libpurple/protocols/mxit/Makefile.mingw
        libpurple/protocols/mxit/actions.c
        libpurple/protocols/mxit/actions.h
        libpurple/protocols/mxit/aes.c
        libpurple/protocols/mxit/aes.h
        libpurple/protocols/mxit/chunk.c
        libpurple/protocols/mxit/chunk.h
        libpurple/protocols/mxit/cipher.c
        libpurple/protocols/mxit/cipher.h
        libpurple/protocols/mxit/filexfer.c
        libpurple/protocols/mxit/filexfer.h
        libpurple/protocols/mxit/formcmds.c
        libpurple/protocols/mxit/formcmds.h
        libpurple/protocols/mxit/http.c
        libpurple/protocols/mxit/http.h
        libpurple/protocols/mxit/login.c
        libpurple/protocols/mxit/login.h
        libpurple/protocols/mxit/markup.c
        libpurple/protocols/mxit/markup.h
        libpurple/protocols/mxit/multimx.c
        libpurple/protocols/mxit/multimx.h
        libpurple/protocols/mxit/mxit.c
        libpurple/protocols/mxit/mxit.h
        libpurple/protocols/mxit/profile.c
        libpurple/protocols/mxit/profile.h
        libpurple/protocols/mxit/protocol.c
        libpurple/protocols/mxit/protocol.h
        libpurple/protocols/mxit/roster.c
        libpurple/protocols/mxit/roster.h
        libpurple/protocols/mxit/splashscreen.c
        libpurple/protocols/mxit/splashscreen.h
        libpurple/rc4cipher.c libpurple/rc4cipher.h
        libpurple/sha1cipher.c libpurple/sha1cipher.h
        libpurple/sha256cipher.c libpurple/sha256cipher.h
        libpurple/tests/test_jabber_scram.c
        pidgin/pixmaps/protocols/16/mxit.png
        pidgin/pixmaps/protocols/22/mxit.png
        pidgin/pixmaps/protocols/48/mxit.png
        pidgin/pixmaps/protocols/scalable/mxit.svg po/ms_MY.po
Added directories:
        libpurple/protocols/mxit
Modified files:
        COPYRIGHT ChangeLog ChangeLog.API ChangeLog.win32 NEWS
        acinclude.m4 configure.ac doc/finch.1.in finch/finch.c
        finch/finch.h finch/gntaccount.c finch/gntblist.c
        finch/gntconn.c finch/gntconv.c finch/gntlog.c
        finch/gntpounce.c finch/gntrequest.c finch/gntsound.c
        finch/gntui.c finch/libgnt/gntbox.c finch/libgnt/gntbutton.c
        finch/libgnt/gntcheckbox.c finch/libgnt/gntcombobox.c
        finch/libgnt/gntentry.c finch/libgnt/gntinternal.h
        finch/libgnt/gntlabel.c finch/libgnt/gntmain.c
        finch/libgnt/gntmenu.c finch/libgnt/gnttextview.c
        finch/libgnt/gnttree.c finch/libgnt/gntws.c
        finch/plugins/gnthistory.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/cipher.c
        libpurple/cipher.h libpurple/cmds.c libpurple/connection.c
        libpurple/connection.h libpurple/conversation.c
        libpurple/conversation.h libpurple/core.c
        libpurple/dbus-analyze-functions.py
        libpurple/dbus-define-api.h libpurple/dbus-server.c
        libpurple/dbus-useful.c libpurple/dbus-useful.h
        libpurple/debug.c libpurple/desktopitem.c
        libpurple/eventloop.c libpurple/example/nullclient.c
        libpurple/ft.c libpurple/ft.h libpurple/idle.c
        libpurple/imgstore.c libpurple/internal.h libpurple/log.c
        libpurple/marshallers.list libpurple/media.c
        libpurple/mime.c libpurple/nat-pmp.c libpurple/network.c
        libpurple/ntlm.c libpurple/plugins/Makefile.am
        libpurple/plugins/autoaccept.c
        libpurple/plugins/ciphertest.c libpurple/plugins/filectl.c
        libpurple/plugins/idle.c libpurple/plugins/log_reader.c
        libpurple/plugins/one_time_password.c
        libpurple/plugins/perl/common/Account.xs
        libpurple/plugins/perl/common/BuddyList.xs
        libpurple/plugins/perl/common/Cipher.xs
        libpurple/plugins/perl/common/Connection.xs
        libpurple/plugins/perl/common/MANIFEST
        libpurple/plugins/perl/common/Makefile.mingw
        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/signals-test.c
        libpurple/plugins/tcl/tcl_cmds.c
        libpurple/plugins/tcl/tcl_signals.c libpurple/pounce.c
        libpurple/protocols/Makefile.am
        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.am
        libpurple/protocols/jabber/adhoccommands.c
        libpurple/protocols/jabber/auth.c
        libpurple/protocols/jabber/auth.h
        libpurple/protocols/jabber/bosh.c
        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/data.c
        libpurple/protocols/jabber/data.h
        libpurple/protocols/jabber/disco.c
        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/jabber.c
        libpurple/protocols/jabber/jabber.h
        libpurple/protocols/jabber/jingle/rtp.c
        libpurple/protocols/jabber/jingle/session.c
        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/parser.c
        libpurple/protocols/jabber/pep.c
        libpurple/protocols/jabber/ping.c
        libpurple/protocols/jabber/presence.c
        libpurple/protocols/jabber/roster.c
        libpurple/protocols/jabber/si.c
        libpurple/protocols/jabber/useravatar.c
        libpurple/protocols/jabber/useravatar.h
        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/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/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/nmuser.c
        libpurple/protocols/novell/novell.c
        libpurple/protocols/null/Makefile.mingw
        libpurple/protocols/null/nullprpl.c
        libpurple/protocols/oscar/Makefile.mingw
        libpurple/protocols/oscar/clientlogin.c
        libpurple/protocols/oscar/family_auth.c
        libpurple/protocols/oscar/family_oservice.c
        libpurple/protocols/oscar/flap_connection.c
        libpurple/protocols/oscar/odc.c
        libpurple/protocols/oscar/oscar.c
        libpurple/protocols/oscar/oscar.h
        libpurple/protocols/qq/Makefile.mingw
        libpurple/protocols/qq/buddy_info.c
        libpurple/protocols/qq/buddy_list.c
        libpurple/protocols/qq/buddy_memo.c
        libpurple/protocols/qq/buddy_opt.c
        libpurple/protocols/qq/char_conv.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.h 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/libymsg.c
        libpurple/protocols/yahoo/util.c
        libpurple/protocols/yahoo/yahoo_aliases.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/prpl.c libpurple/prpl.h libpurple/purple.h.in
        libpurple/roomlist.c libpurple/savedstatuses.c
        libpurple/server.c libpurple/server.h libpurple/signals.c
        libpurple/signals.h libpurple/status.c libpurple/status.h
        libpurple/tests/Makefile.am
        libpurple/tests/check_libpurple.c
        libpurple/tests/test_cipher.c
        libpurple/tests/test_jabber_jutil.c
        libpurple/tests/test_yahoo_util.c libpurple/tests/tests.h
        libpurple/theme-manager.c libpurple/theme.c libpurple/util.c
        libpurple/util.h libpurple/value.c libpurple/value.h
        libpurple/whiteboard.c libpurple/win32/global.mak
        libpurple/xmlnode.c pidgin/Makefile.am pidgin/gtkaccount.c
        pidgin/gtkblist.c pidgin/gtkblist.h pidgin/gtkcertmgr.c
        pidgin/gtkconn.c pidgin/gtkconv.c pidgin/gtkdialogs.c
        pidgin/gtkdocklet.c pidgin/gtkimhtml.c
        pidgin/gtkimhtmltoolbar.c pidgin/gtklog.c pidgin/gtkmain.c
        pidgin/gtkmedia.c pidgin/gtknotify.c pidgin/gtkpounce.c
        pidgin/gtkprefs.c pidgin/gtkprivacy.c pidgin/gtkroomlist.c
        pidgin/gtksavedstatuses.c pidgin/gtksound.c
        pidgin/gtkstatusbox.c pidgin/gtkutils.c
        pidgin/gtkwhiteboard.c pidgin/pixmaps/Makefile.am
        pidgin/plugins/cap/cap.c pidgin/plugins/disco/gtkdisco.c
        pidgin/plugins/disco/xmppdisco.c
        pidgin/plugins/gevolution/gevo-util.c
        pidgin/plugins/gevolution/gevolution.c
        pidgin/plugins/gtk-signals-test.c pidgin/plugins/history.c
        pidgin/plugins/mailchk.c
        pidgin/plugins/perl/common/GtkBlist.xs
        pidgin/plugins/pidgininc.c pidgin/plugins/pidginrc.c
        pidgin/plugins/raw.c pidgin/plugins/relnot.c
        pidgin/plugins/themeedit-icon.c pidgin/plugins/themeedit.c
        pidgin/plugins/ticker/ticker.c pidgin/plugins/xmppconsole.c
        pidgin/win32/nsis/pidgin-installer.nsi 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/ga.po po/gl.po po/gu.po po/he.po po/hi.po po/hu.po
        po/hy.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/stats.pl po/sv.po po/sw.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/protocols/16/mxit.png
        pidgin/pixmaps/protocols/22/mxit.png
        pidgin/pixmaps/protocols/48/mxit.png

ChangeLog: 

explicit merge of '428d1b9d1ec79fad43c322588aa123858132666c'
              and '1f1b7343bd021866e6857dca0404342741049452'

More information about the Commits mailing list