gobjectification: 8e940b8c: explicit merge of '302c560990dbae6b00f9c...
qulogic at pidgin.im
qulogic at pidgin.im
Wed Jun 9 01:29:48 EDT 2010
-----------------------------------------------------------------
Revision: 8e940b8c1be28b550efcb06e59114b7d848f43ac
Ancestor: 302c560990dbae6b00f9ca0ef36b3c160b190bdb
Ancestor: d1dec79ed9aff395ebb3e4831791b26944292376
Author: qulogic at pidgin.im
Date: 2010-06-07T06:29:40
Branch: im.pidgin.gobjectification
URL: http://d.pidgin.im/viewmtn/revision/info/8e940b8c1be28b550efcb06e59114b7d848f43ac
Deleted entries:
pidgin/gtkcelllayout.c pidgin/gtkcelllayout.h
pidgin/gtkcellrendererprogress.c
pidgin/gtkcellrendererprogress.h pidgin/gtkcellview.c
pidgin/gtkcellview.h pidgin/gtkcellviewmenuitem.c
pidgin/gtkcellviewmenuitem.h pidgin/gtkexpander.c
pidgin/gtkexpander.h pidgin/pidgincombobox.c
pidgin/pidgincombobox.h pidgin/pixmaps/tray/22
pidgin/pixmaps/tray/32 pidgin/pixmaps/tray/48
Renamed entries:
pidgin/pixmaps/tray/16/tray-away.png to pidgin/pixmaps/tray/hicolor/16x16/status/pidgin-tray-away.png
pidgin/pixmaps/tray/16/tray-busy.png to pidgin/pixmaps/tray/hicolor/16x16/status/pidgin-tray-busy.png
pidgin/pixmaps/tray/16/tray-connecting.png to pidgin/pixmaps/tray/hicolor/16x16/status/pidgin-tray-connect.png
pidgin/pixmaps/tray/16/tray-extended-away.png to pidgin/pixmaps/tray/hicolor/16x16/status/pidgin-tray-xa.png
pidgin/pixmaps/tray/16/tray-invisible.png to pidgin/pixmaps/tray/hicolor/16x16/status/pidgin-tray-invisible.png
pidgin/pixmaps/tray/16/tray-message.png to pidgin/pixmaps/tray/hicolor/16x16/status/pidgin-tray-email.png
pidgin/pixmaps/tray/16/tray-new-im.png to pidgin/pixmaps/tray/hicolor/16x16/status/pidgin-tray-pending.png
pidgin/pixmaps/tray/16/tray-offline.png to pidgin/pixmaps/tray/hicolor/16x16/status/pidgin-tray-offline.png
pidgin/pixmaps/tray/16/tray-online.png to pidgin/pixmaps/tray/hicolor/16x16/status/pidgin-tray-available.png
pidgin/pixmaps/tray/22/tray-away.png to pidgin/pixmaps/tray/hicolor/22x22/status/pidgin-tray-away.png
pidgin/pixmaps/tray/22/tray-busy.png to pidgin/pixmaps/tray/hicolor/22x22/status/pidgin-tray-busy.png
pidgin/pixmaps/tray/22/tray-connecting.png to pidgin/pixmaps/tray/hicolor/22x22/status/pidgin-tray-connect.png
pidgin/pixmaps/tray/22/tray-extended-away.png to pidgin/pixmaps/tray/hicolor/22x22/status/pidgin-tray-xa.png
pidgin/pixmaps/tray/22/tray-invisible.png to pidgin/pixmaps/tray/hicolor/22x22/status/pidgin-tray-invisible.png
pidgin/pixmaps/tray/22/tray-message.png to pidgin/pixmaps/tray/hicolor/22x22/status/pidgin-tray-email.png
pidgin/pixmaps/tray/22/tray-new-im.png to pidgin/pixmaps/tray/hicolor/22x22/status/pidgin-tray-pending.png
pidgin/pixmaps/tray/22/tray-offline.png to pidgin/pixmaps/tray/hicolor/22x22/status/pidgin-tray-offline.png
pidgin/pixmaps/tray/22/tray-online.png to pidgin/pixmaps/tray/hicolor/22x22/status/pidgin-tray-available.png
pidgin/pixmaps/tray/32/tray-away.png to pidgin/pixmaps/tray/hicolor/32x32/status/pidgin-tray-away.png
pidgin/pixmaps/tray/32/tray-busy.png to pidgin/pixmaps/tray/hicolor/32x32/status/pidgin-tray-busy.png
pidgin/pixmaps/tray/32/tray-connecting.png to pidgin/pixmaps/tray/hicolor/32x32/status/pidgin-tray-connect.png
pidgin/pixmaps/tray/32/tray-extended-away.png to pidgin/pixmaps/tray/hicolor/32x32/status/pidgin-tray-xa.png
pidgin/pixmaps/tray/32/tray-invisible.png to pidgin/pixmaps/tray/hicolor/32x32/status/pidgin-tray-invisible.png
pidgin/pixmaps/tray/32/tray-message.png to pidgin/pixmaps/tray/hicolor/32x32/status/pidgin-tray-email.png
pidgin/pixmaps/tray/32/tray-new-im.png to pidgin/pixmaps/tray/hicolor/32x32/status/pidgin-tray-pending.png
pidgin/pixmaps/tray/32/tray-offline.png to pidgin/pixmaps/tray/hicolor/32x32/status/pidgin-tray-offline.png
pidgin/pixmaps/tray/32/tray-online.png to pidgin/pixmaps/tray/hicolor/32x32/status/pidgin-tray-available.png
pidgin/pixmaps/tray/48/tray-away.png to pidgin/pixmaps/tray/hicolor/48x48/status/pidgin-tray-away.png
pidgin/pixmaps/tray/48/tray-busy.png to pidgin/pixmaps/tray/hicolor/48x48/status/pidgin-tray-busy.png
pidgin/pixmaps/tray/48/tray-connecting.png to pidgin/pixmaps/tray/hicolor/48x48/status/pidgin-tray-connect.png
pidgin/pixmaps/tray/48/tray-extended-away.png to pidgin/pixmaps/tray/hicolor/48x48/status/pidgin-tray-xa.png
pidgin/pixmaps/tray/48/tray-invisible.png to pidgin/pixmaps/tray/hicolor/48x48/status/pidgin-tray-invisible.png
pidgin/pixmaps/tray/48/tray-message.png to pidgin/pixmaps/tray/hicolor/48x48/status/pidgin-tray-email.png
pidgin/pixmaps/tray/48/tray-new-im.png to pidgin/pixmaps/tray/hicolor/48x48/status/pidgin-tray-pending.png
pidgin/pixmaps/tray/48/tray-offline.png to pidgin/pixmaps/tray/hicolor/48x48/status/pidgin-tray-offline.png
pidgin/pixmaps/tray/48/tray-online.png to pidgin/pixmaps/tray/hicolor/48x48/status/pidgin-tray-available.png
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/media/backend-fs2.c libpurple/media/backend-fs2.h
libpurple/media/backend-iface.c
libpurple/media/backend-iface.h libpurple/media/candidate.c
libpurple/media/candidate.h libpurple/media/codec.c
libpurple/media/codec.h libpurple/media/enum-types.c
libpurple/media/enum-types.h
libpurple/plugins/perl/common/Hash.xs libpurple/pobject.c
libpurple/pobject.h libpurple/purple-2-uninstalled.pc.in
libpurple/purple-2.pc.in libpurple/rc4cipher.c
libpurple/rc4cipher.h libpurple/sha1cipher.c
libpurple/sha1cipher.h libpurple/sha256cipher.c
libpurple/sha256cipher.h pidgin/gtkdocklet-gtk.c
pidgin/pidgin-2-uninstalled.pc.in pidgin/pidgin-2.pc.in
pidgin/win32/nsis/available.lst
Added directories:
libpurple/media pidgin/pixmaps/tray/hicolor
pidgin/pixmaps/tray/hicolor/16x16
pidgin/pixmaps/tray/hicolor/16x16/status
pidgin/pixmaps/tray/hicolor/22x22
pidgin/pixmaps/tray/hicolor/22x22/status
pidgin/pixmaps/tray/hicolor/32x32
pidgin/pixmaps/tray/hicolor/32x32/status
pidgin/pixmaps/tray/hicolor/48x48
pidgin/pixmaps/tray/hicolor/48x48/status
Modified files:
COPYRIGHT ChangeLog ChangeLog.API ChangeLog.win32
Makefile.mingw acinclude.m4 configure.ac 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/configure.ac
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/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/example/nullclient.c libpurple/ft.c
libpurple/idle.c libpurple/internal.h libpurple/log.c
libpurple/marshallers.list libpurple/media.c
libpurple/media.h libpurple/mediamanager.c
libpurple/mediamanager.h 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/module.h
libpurple/plugins/perl/common/typemap
libpurple/plugins/perl/scripts/signals-test.pl
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/buddy.c
libpurple/protocols/bonjour/jabber.c
libpurple/protocols/bonjour/mdns_avahi.c
libpurple/protocols/bonjour/mdns_win32.c
libpurple/protocols/bonjour/parser.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/buddy.h
libpurple/protocols/jabber/caps.c
libpurple/protocols/jabber/caps.h
libpurple/protocols/jabber/chat.c
libpurple/protocols/jabber/chat.h
libpurple/protocols/jabber/disco.c
libpurple/protocols/jabber/google.c
libpurple/protocols/jabber/iq.c
libpurple/protocols/jabber/jabber.c
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/message.c
libpurple/protocols/jabber/oob.c
libpurple/protocols/jabber/parser.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/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/mxit/multimx.c
libpurple/protocols/mxit/mxit.c
libpurple/protocols/mxit/profile.c
libpurple/protocols/mxit/protocol.c
libpurple/protocols/mxit/protocol.h
libpurple/protocols/mxit/roster.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_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/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-uninstalled.pc.in libpurple/purple.h.in
libpurple/purple.pc.in libpurple/savedstatuses.c
libpurple/server.c libpurple/server.h libpurple/signals.c
libpurple/signals.h libpurple/sound.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
libpurple/win32/libc_interface.h
libpurple/win32/libc_internal.h
libpurple/win32/libpurplerc.rc.in libpurple/win32/win32dep.c
libpurple/xmlnode.c pidgin/Makefile.am pidgin/Makefile.mingw
pidgin/gtkaccount.c pidgin/gtkblist.c pidgin/gtkblist.h
pidgin/gtkcellrendererexpander.c pidgin/gtkconn.c
pidgin/gtkconv.c pidgin/gtkconv.h pidgin/gtkdebug.c
pidgin/gtkdialogs.c pidgin/gtkdialogs.h
pidgin/gtkdocklet-x11.c pidgin/gtkdocklet.c
pidgin/gtkdocklet.h pidgin/gtkft.c pidgin/gtkimhtml.c
pidgin/gtkimhtmltoolbar.c pidgin/gtkimhtmltoolbar.h
pidgin/gtklog.c pidgin/gtkmain.c pidgin/gtkmenutray.c
pidgin/gtknotify.c pidgin/gtkplugin.c pidgin/gtkpounce.c
pidgin/gtkprefs.c pidgin/gtkprivacy.c pidgin/gtkrequest.c
pidgin/gtkroomlist.c pidgin/gtksavedstatuses.c
pidgin/gtkscrollbook.c pidgin/gtksession.c pidgin/gtksound.c
pidgin/gtkstatusbox.c pidgin/gtkutils.c pidgin/gtkutils.h
pidgin/gtkwhiteboard.c pidgin/minidialog.c
pidgin/pidgin-uninstalled.pc.in pidgin/pidgin.h
pidgin/pidgin.pc.in pidgin/pidginstock.c
pidgin/pidginstock.h pidgin/pidgintooltip.c
pidgin/pixmaps/Makefile.am pidgin/plugins/cap/cap.c
pidgin/plugins/disco/xmppdisco.c
pidgin/plugins/gestures/gestures.c
pidgin/plugins/gevolution/assoc-buddy.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/perl/common/Makefile.mingw
pidgin/plugins/pidgininc.c pidgin/plugins/pidginrc.c
pidgin/plugins/raw.c pidgin/plugins/relnot.c
pidgin/plugins/spellchk.c pidgin/plugins/themeedit-icon.c
pidgin/plugins/themeedit.c pidgin/plugins/ticker/ticker.c
pidgin/plugins/xmppconsole.c pidgin/win32/gtkdocklet-win32.c
pidgin/win32/gtkwin32dep.c pidgin/win32/nsis/langmacros.nsh
pidgin/win32/nsis/pidgin-installer.nsi
pidgin/win32/nsis/translations/afrikaans.nsh
pidgin/win32/nsis/translations/albanian.nsh
pidgin/win32/nsis/translations/arabic.nsh
pidgin/win32/nsis/translations/basque.nsh
pidgin/win32/nsis/translations/bulgarian.nsh
pidgin/win32/nsis/translations/catalan.nsh
pidgin/win32/nsis/translations/czech.nsh
pidgin/win32/nsis/translations/danish.nsh
pidgin/win32/nsis/translations/dutch.nsh
pidgin/win32/nsis/translations/english.nsh
pidgin/win32/nsis/translations/finnish.nsh
pidgin/win32/nsis/translations/french.nsh
pidgin/win32/nsis/translations/galician.nsh
pidgin/win32/nsis/translations/german.nsh
pidgin/win32/nsis/translations/hebrew.nsh
pidgin/win32/nsis/translations/hungarian.nsh
pidgin/win32/nsis/translations/italian.nsh
pidgin/win32/nsis/translations/japanese.nsh
pidgin/win32/nsis/translations/korean.nsh
pidgin/win32/nsis/translations/kurdish.nsh
pidgin/win32/nsis/translations/lithuanian.nsh
pidgin/win32/nsis/translations/norwegian.nsh
pidgin/win32/nsis/translations/persian.nsh
pidgin/win32/nsis/translations/polish.nsh
pidgin/win32/nsis/translations/portuguese-br.nsh
pidgin/win32/nsis/translations/portuguese.nsh
pidgin/win32/nsis/translations/romanian.nsh
pidgin/win32/nsis/translations/russian.nsh
pidgin/win32/nsis/translations/serbian-latin.nsh
pidgin/win32/nsis/translations/simp-chinese.nsh
pidgin/win32/nsis/translations/slovak.nsh
pidgin/win32/nsis/translations/slovenian.nsh
pidgin/win32/nsis/translations/spanish.nsh
pidgin/win32/nsis/translations/swedish.nsh
pidgin/win32/nsis/translations/trad-chinese.nsh
pidgin/win32/nsis/translations/valencian.nsh
pidgin/win32/nsis/translations/vietnamese.nsh
pidgin/win32/pidgin_dll_rc.rc.in
pidgin/win32/pidgin_exe_rc.rc.in pidgin/win32/untar.c
pidgin/win32/winpidgin.c po/ChangeLog po/POTFILES.in
po/ca.po po/ca at valencia.po po/fi.po
ChangeLog:
explicit merge of '302c560990dbae6b00f9ca0ef36b3c160b190bdb'
and 'd1dec79ed9aff395ebb3e4831791b26944292376'
More information about the Commits
mailing list