gobjectification: a3ce1c85: explicit merge of 'c07ebf2073bbd51862e77...
qulogic at pidgin.im
qulogic at pidgin.im
Tue Aug 12 00:58:27 EDT 2008
-----------------------------------------------------------------
Revision: a3ce1c85a2eab9b99e8f8f3c2269d13ddec3fda6
Ancestor: c07ebf2073bbd51862e773cab582fc75e97f3617
Ancestor: c0f5cd0dee6b7415c1b282c3623bf48ed91ef769
Author: qulogic at pidgin.im
Date: 2008-08-10T07:57:37
Branch: im.pidgin.gobjectification
URL: http://d.pidgin.im/viewmtn/revision/info/a3ce1c85a2eab9b99e8f8f3c2269d13ddec3fda6
Deleted entries:
libpurple/protocols/msn/slpsession.c
libpurple/protocols/msn/slpsession.h
libpurple/protocols/qq/buddy_status.c
libpurple/protocols/qq/buddy_status.h
libpurple/protocols/qq/keep_alive.c
libpurple/protocols/qq/keep_alive.h
libpurple/protocols/qq/login_logout.c
libpurple/protocols/qq/login_logout.h
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/pobject.c libpurple/pobject.h
libpurple/protocols/qq/qq_base.c
libpurple/protocols/qq/qq_base.h
libpurple/protocols/qq/qq_process.c
libpurple/protocols/qq/qq_process.h libpurple/rc4cipher.c
libpurple/rc4cipher.h libpurple/sha1cipher.c
libpurple/sha1cipher.h
pidgin/pixmaps/emblems/16/scalable/birthday.svg
pidgin/pixmaps/emotes/default/24/bunny.png
Modified files:
AUTHORS COPYRIGHT ChangeLog ChangeLog.win32 configure.ac
doc/connection-signals.dox doc/funniest_home_convos.txt
doc/pidgin.1.in 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/plugin.h
libpurple/plugins/Makefile.am libpurple/plugins/ciphertest.c
libpurple/plugins/filectl.c libpurple/plugins/idle.c
libpurple/plugins/log_reader.c
libpurple/plugins/perl/Makefile.mingw
libpurple/plugins/perl/common/Account.xs
libpurple/plugins/perl/common/Cipher.xs
libpurple/plugins/perl/common/Connection.xs
libpurple/plugins/perl/common/Makefile.mingw
libpurple/plugins/perl/common/Prefs.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/perl/perl-common.h
libpurple/plugins/perl/perl-handlers.c
libpurple/plugins/perl/perl-handlers.h
libpurple/plugins/perl/perl.c
libpurple/plugins/perl/scripts/plugin_pref.pl
libpurple/plugins/signals-test.c
libpurple/plugins/tcl/tcl_cmds.c
libpurple/plugins/tcl/tcl_signals.c libpurple/pounce.c
libpurple/protocols/Makefile.mingw
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/irc.h
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/jabber.h
libpurple/protocols/jabber/jutil.c
libpurple/protocols/jabber/libxmpp.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.am
libpurple/protocols/msn/Makefile.mingw
libpurple/protocols/msn/cmdproc.c
libpurple/protocols/msn/contact.c
libpurple/protocols/msn/dialog.c
libpurple/protocols/msn/error.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/oim.h
libpurple/protocols/msn/page.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/slpcall.h
libpurple/protocols/msn/slplink.c
libpurple/protocols/msn/slplink.h
libpurple/protocols/msn/slpmsg.h
libpurple/protocols/msn/soap.c
libpurple/protocols/msn/soap.h
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_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/oscar/oscar.h
libpurple/protocols/oscar/oscar_data.c
libpurple/protocols/qq/AUTHORS
libpurple/protocols/qq/ChangeLog
libpurple/protocols/qq/Makefile.am
libpurple/protocols/qq/Makefile.mingw
libpurple/protocols/qq/buddy_info.c
libpurple/protocols/qq/buddy_info.h
libpurple/protocols/qq/buddy_list.c
libpurple/protocols/qq/buddy_list.h
libpurple/protocols/qq/buddy_opt.c
libpurple/protocols/qq/char_conv.c
libpurple/protocols/qq/char_conv.h
libpurple/protocols/qq/crypt.c
libpurple/protocols/qq/crypt.h
libpurple/protocols/qq/file_trans.c
libpurple/protocols/qq/group.c
libpurple/protocols/qq/group_conv.c
libpurple/protocols/qq/group_find.c
libpurple/protocols/qq/group_free.c
libpurple/protocols/qq/group_im.c
libpurple/protocols/qq/group_info.c
libpurple/protocols/qq/group_info.h
libpurple/protocols/qq/group_internal.c
libpurple/protocols/qq/group_join.c
libpurple/protocols/qq/group_network.c
libpurple/protocols/qq/group_network.h
libpurple/protocols/qq/group_opt.c
libpurple/protocols/qq/group_search.c
libpurple/protocols/qq/header_info.c
libpurple/protocols/qq/header_info.h
libpurple/protocols/qq/im.c
libpurple/protocols/qq/packet_parse.c
libpurple/protocols/qq/packet_parse.h
libpurple/protocols/qq/qq.c libpurple/protocols/qq/qq.h
libpurple/protocols/qq/qq_network.c
libpurple/protocols/qq/qq_network.h
libpurple/protocols/qq/qq_trans.c
libpurple/protocols/qq/qq_trans.h
libpurple/protocols/qq/send_file.c
libpurple/protocols/qq/send_file.h
libpurple/protocols/qq/sys_msg.c
libpurple/protocols/qq/utils.c
libpurple/protocols/qq/utils.h
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/prpl.h 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/check_libpurple.c
libpurple/tests/test_cipher.c libpurple/util.c
libpurple/util.h libpurple/value.c libpurple/value.h
libpurple/win32/global.mak libpurple/win32/libc_interface.c
pidgin/Makefile.am pidgin/gtkaccount.c pidgin/gtkblist.c
pidgin/gtkconn.c pidgin/gtkconv.c pidgin/gtkdialogs.c
pidgin/gtkdocklet.c pidgin/gtkimhtml.c pidgin/gtkmain.c
pidgin/gtknotify.c pidgin/gtkpounce.c pidgin/gtkprefs.c
pidgin/gtkroomlist.c pidgin/gtksmiley.c pidgin/gtksound.c
pidgin/gtkstatusbox.c pidgin/gtkutils.c
pidgin/pidgintooltip.c
pidgin/pixmaps/emblems/16/birthday.png
pidgin/pixmaps/emotes/default/24/Makefile.am
pidgin/pixmaps/emotes/default/24/airplane.png
pidgin/pixmaps/emotes/default/24/bad.png
pidgin/pixmaps/emotes/default/24/beer.png
pidgin/pixmaps/emotes/default/24/bomb.png
pidgin/pixmaps/emotes/default/24/bowl.png
pidgin/pixmaps/emotes/default/24/boy.png
pidgin/pixmaps/emotes/default/24/brb.png
pidgin/pixmaps/emotes/default/24/cake.png
pidgin/pixmaps/emotes/default/24/camera.png
pidgin/pixmaps/emotes/default/24/car.png
pidgin/pixmaps/emotes/default/24/cat.png
pidgin/pixmaps/emotes/default/24/clock.png
pidgin/pixmaps/emotes/default/24/coffee.png
pidgin/pixmaps/emotes/default/24/coins.png
pidgin/pixmaps/emotes/default/24/console.png
pidgin/pixmaps/emotes/default/24/default.theme.in
pidgin/pixmaps/emotes/default/24/dog.png
pidgin/pixmaps/emotes/default/24/drink.png
pidgin/pixmaps/emotes/default/24/film.png
pidgin/pixmaps/emotes/default/24/girl.png
pidgin/pixmaps/emotes/default/24/goat.png
pidgin/pixmaps/emotes/default/24/good.png
pidgin/pixmaps/emotes/default/24/handcuffs.png
pidgin/pixmaps/emotes/default/24/lamp.png
pidgin/pixmaps/emotes/default/24/love-over.png
pidgin/pixmaps/emotes/default/24/love.png
pidgin/pixmaps/emotes/default/24/mail.png
pidgin/pixmaps/emotes/default/24/mobile.png
pidgin/pixmaps/emotes/default/24/moon.png
pidgin/pixmaps/emotes/default/24/msn.png
pidgin/pixmaps/emotes/default/24/musical-note.png
pidgin/pixmaps/emotes/default/24/phone.png
pidgin/pixmaps/emotes/default/24/pizza.png
pidgin/pixmaps/emotes/default/24/plate.png
pidgin/pixmaps/emotes/default/24/present.png
pidgin/pixmaps/emotes/default/24/rain.png
pidgin/pixmaps/emotes/default/24/rose-dead.png
pidgin/pixmaps/emotes/default/24/rose.png
pidgin/pixmaps/emotes/default/24/sheep.png
pidgin/pixmaps/emotes/default/24/soccerball.png
pidgin/pixmaps/emotes/default/24/star.png
pidgin/pixmaps/emotes/default/24/sun.png
pidgin/pixmaps/emotes/default/24/thunder.png
pidgin/pixmaps/emotes/default/24/turtle.png
pidgin/pixmaps/emotes/default/24/umbrella.png
pidgin/pixmaps/toolbar/16/emote-select.png
pidgin/pixmaps/toolbar/16/scalable/emote-select.svg
pidgin/pixmaps/tray/22/tray-away.png
pidgin/pixmaps/tray/22/tray-busy.png
pidgin/pixmaps/tray/22/tray-online.png
pidgin/plugins/cap/cap.c
pidgin/plugins/gevolution/gevo-util.c
pidgin/plugins/gevolution/gevolution.c
pidgin/plugins/mailchk.c
pidgin/plugins/perl/common/Makefile.mingw
pidgin/plugins/pidgininc.c pidgin/plugins/raw.c
pidgin/plugins/relnot.c pidgin/plugins/ticker/ticker.c
pidgin/plugins/xmppconsole.c
pidgin/win32/nsis/pidgin-installer.nsi
pidgin/win32/winpidgin.c po/POTFILES.in po/de.po po/fi.po
po/zh_CN.po po/zh_TW.po
Modified attrs:
pidgin/pixmaps/emotes/default/24/bunny.png
ChangeLog:
explicit merge of 'c07ebf2073bbd51862e773cab582fc75e97f3617'
and 'c0f5cd0dee6b7415c1b282c3623bf48ed91ef769'
More information about the Commits
mailing list