gobjectification: f58c43bc: explicit merge of '972457aa8f4a246318025...

grim at pidgin.im grim at pidgin.im
Mon Jun 8 01:57:03 EDT 2009


-----------------------------------------------------------------
Revision: f58c43bc3f1d4381df7db22f0b5aaab65193fc17
Ancestor: 972457aa8f4a246318025cf2c479a57e1bb70848
Ancestor: aca46cdd74370d21d1332a18c403c088c32a25d7
Author: grim at pidgin.im
Date: 2009-06-07T19:52:48
Branch: im.pidgin.gobjectification
URL: http://d.pidgin.im/viewmtn/revision/info/f58c43bc3f1d4381df7db22f0b5aaab65193fc17

Added files:
        doc/hierarchy.dot 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/plugins/one_time_password.c libpurple/pobject.c
        libpurple/pobject.h libpurple/protocols/jabber/ibb.c
        libpurple/protocols/jabber/ibb.h libpurple/rc4cipher.c
        libpurple/rc4cipher.h libpurple/sha1cipher.c
        libpurple/sha1cipher.h
Modified files:
        COPYRIGHT ChangeLog ChangeLog.win32 acinclude.m4
        configure.ac doc/funniest_home_convos.txt finch/gntaccount.c
        finch/gntblist.c finch/gntconn.c finch/gntconv.c
        finch/gntpounce.c finch/gntsound.c finch/gntui.c
        libpurple/Makefile.am libpurple/Makefile.mingw
        libpurple/account.c libpurple/account.h libpurple/blist.c
        libpurple/blist.h libpurple/cipher.c libpurple/cipher.h
        libpurple/connection.c libpurple/connection.h
        libpurple/conversation.c libpurple/core.c
        libpurple/dbus-analyze-functions.py libpurple/dbus-server.c
        libpurple/dbus-useful.c libpurple/example/nullclient.c
        libpurple/idle.c libpurple/internal.h libpurple/log.c
        libpurple/network.c libpurple/ntlm.c
        libpurple/plugins/Makefile.am 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/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/signals-test.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/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/Makefile.mingw
        libpurple/protocols/jabber/adhoccommands.c
        libpurple/protocols/jabber/auth.c
        libpurple/protocols/jabber/buddy.c
        libpurple/protocols/jabber/caps.c
        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/iq.c
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/jabber/jabber.h
        libpurple/protocols/jabber/jutil.c
        libpurple/protocols/jabber/libxmpp.c
        libpurple/protocols/jabber/message.c
        libpurple/protocols/jabber/message.h
        libpurple/protocols/jabber/oob.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/si.h
        libpurple/protocols/jabber/usermood.c
        libpurple/protocols/jabber/usernick.c
        libpurple/protocols/jabber/usertune.c
        libpurple/protocols/jabber/xdata.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/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_icbm.c
        libpurple/protocols/oscar/family_oservice.c
        libpurple/protocols/oscar/flap_connection.c
        libpurple/protocols/oscar/oscar.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/prpl.c libpurple/purple-url-handler
        libpurple/purple.h.in libpurple/savedstatuses.c
        libpurple/server.c libpurple/signals.c libpurple/signals.h
        libpurple/status.c libpurple/status.h
        libpurple/tests/check_libpurple.c
        libpurple/tests/test_cipher.c libpurple/util.c
        libpurple/util.h libpurple/value.c libpurple/value.h
        libpurple/win32/global.mak pidgin/Makefile.am
        pidgin/gtkaccount.c pidgin/gtkblist.c pidgin/gtkconn.c
        pidgin/gtkconv.c pidgin/gtkdocklet.c pidgin/gtkimhtml.c
        pidgin/gtkmain.c pidgin/gtknotify.c pidgin/gtkpounce.c
        pidgin/gtkprefs.c pidgin/gtkroomlist.c pidgin/gtksound.c
        pidgin/gtkstatusbox.c pidgin/gtkutils.c
        pidgin/plugins/cap/cap.c
        pidgin/plugins/gevolution/gevo-util.c
        pidgin/plugins/gevolution/gevolution.c
        pidgin/plugins/mailchk.c pidgin/plugins/pidgininc.c
        pidgin/plugins/raw.c pidgin/plugins/relnot.c
        pidgin/plugins/ticker/ticker.c pidgin/plugins/xmppconsole.c
        po/POTFILES.in

ChangeLog: 

explicit merge of '972457aa8f4a246318025cf2c479a57e1bb70848'
              and 'aca46cdd74370d21d1332a18c403c088c32a25d7'



More information about the Commits mailing list