gobjectification: e4d0f77a: explicit merge of '8bda533c345d2ba17bad8...
qulogic at pidgin.im
qulogic at pidgin.im
Wed Jun 9 01:33:10 EDT 2010
-----------------------------------------------------------------
Revision: e4d0f77a96e74fce51ffa66001fd267673e02b1b
Ancestor: 74fba26cf88362a10729c3849697ff78c77f0d43
Ancestor: 8bda533c345d2ba17bad84253644895a9cf788df
Author: qulogic at pidgin.im
Date: 2010-06-06T00:51:48
Branch: im.pidgin.gobjectification
URL: http://d.pidgin.im/viewmtn/revision/info/e4d0f77a96e74fce51ffa66001fd267673e02b1b
Added files:
doc/hierarchy.dot doc/jabber-signals.dox
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/rc4cipher.c libpurple/rc4cipher.h
libpurple/sha1cipher.c libpurple/sha1cipher.h
libpurple/sha256cipher.c libpurple/sha256cipher.h
libpurple/tests/test_yahoo_util.c libpurple/valgrind.h
share/ca-certs/Thawte_Premium_Server_CA.pem
Modified files:
COPYRIGHT ChangeLog ChangeLog.API ChangeLog.win32 INSTALL
Makefile.mingw NEWS acinclude.m4 configure.ac
doc/Makefile.am doc/core-signals.dox
doc/funniest_home_convos.txt finch/finch.c finch/finch.h
finch/gntaccount.c finch/gntblist.c finch/gntconn.c
finch/gntconv.c finch/gntlog.c finch/gntmedia.c
finch/gntpounce.c finch/gntrequest.c finch/gntsound.c
finch/gntui.c finch/libgnt/gntkeys.c
finch/plugins/gnthistory.c finch/plugins/grouping.c
libpurple/Makefile.am libpurple/Makefile.mingw
libpurple/account.c libpurple/account.h
libpurple/accountopt.c libpurple/blist.c libpurple/blist.h
libpurple/buddyicon.c libpurple/certificate.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-define-api.h libpurple/dbus-server.c
libpurple/dbus-useful.c libpurple/dbus-useful.h
libpurple/desktopitem.c libpurple/example/nullclient.c
libpurple/ft.c libpurple/ft.h libpurple/idle.c
libpurple/internal.h libpurple/log.c
libpurple/marshallers.list libpurple/media.c
libpurple/media.h libpurple/mediamanager.c
libpurple/network.c libpurple/network.h libpurple/ntlm.c
libpurple/plugin.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/XMLNode.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/prefs.c 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/lib/libgadu.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/irc.h
libpurple/protocols/irc/msgs.c
libpurple/protocols/irc/parse.c
libpurple/protocols/jabber/adhoccommands.c
libpurple/protocols/jabber/auth.c
libpurple/protocols/jabber/bosh.c
libpurple/protocols/jabber/bosh.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/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/jingle/rtp.c
libpurple/protocols/jabber/jutil.c
libpurple/protocols/jabber/libxmpp.c
libpurple/protocols/jabber/message.c
libpurple/protocols/jabber/oob.c
libpurple/protocols/jabber/presence.c
libpurple/protocols/jabber/roster.c
libpurple/protocols/jabber/si.c
libpurple/protocols/jabber/useravatar.c
libpurple/protocols/jabber/usermood.c
libpurple/protocols/jabber/usernick.c
libpurple/protocols/jabber/usertune.c
libpurple/protocols/msn/Makefile.mingw
libpurple/protocols/msn/cmdproc.c
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/session.h
libpurple/protocols/msn/slp.c
libpurple/protocols/msn/slpcall.c
libpurple/protocols/msn/slplink.c
libpurple/protocols/msn/slpmsg.h
libpurple/protocols/msn/soap.c
libpurple/protocols/msn/switchboard.c
libpurple/protocols/msn/sync.c
libpurple/protocols/msn/sync.h
libpurple/protocols/msn/user.c
libpurple/protocols/msn/userlist.c
libpurple/protocols/msn/userlist.h
libpurple/protocols/msnp9/Makefile.mingw
libpurple/protocols/msnp9/dialog.c
libpurple/protocols/msnp9/directconn.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/slplink.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/clientlogin.c
libpurple/protocols/oscar/family_auth.c
libpurple/protocols/oscar/family_icq.c
libpurple/protocols/oscar/family_locate.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_memo.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/libyahoo.c
libpurple/protocols/yahoo/libyahoojp.c
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_packet.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/internal.h
libpurple/protocols/zephyr/zephyr.c libpurple/proxy.c
libpurple/prpl.c libpurple/purple-send
libpurple/purple-send-async libpurple/purple.h.in
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/tests.h
libpurple/util.c libpurple/util.h libpurple/value.c
libpurple/value.h libpurple/win32/global.mak
libpurple/win32/targets.mak libpurple/xmlnode.h
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/gtkft.c pidgin/gtkimhtml.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/gtksound.c pidgin/gtkstatusbox.c
pidgin/gtkthemes.c pidgin/gtkutils.c pidgin/gtkwhiteboard.c
pidgin/pixmaps/emotes/default/24/default.theme.in
pidgin/pixmaps/emotes/small/16/small.theme.in
pidgin/plugins/cap/cap.c pidgin/plugins/crazychat/glm.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/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
pidgin/win32/nsis/translations/italian.nsh pidgin.spec.in
po/ChangeLog po/POTFILES.in po/af.po po/ca at valencia.po
po/de.po po/eo.po po/es.po po/eu.po po/he.po po/hu.po
po/it.po po/lt.po po/nn.po po/ro.po po/ru.po po/sk.po
po/sl.po po/sv.po po/zh_HK.po po/zh_TW.po
share/ca-certs/Makefile.am
ChangeLog:
explicit merge of '8bda533c345d2ba17bad84253644895a9cf788df'
and '74fba26cf88362a10729c3849697ff78c77f0d43'
More information about the Commits
mailing list