gobjectification: 8d4ee102: explicit merge of '915eb72db575b96b63275...
qulogic at pidgin.im
qulogic at pidgin.im
Wed Jun 9 01:29:42 EDT 2010
-----------------------------------------------------------------
Revision: 8d4ee1027315fea460b5522ad554aacba6382c88
Ancestor: 4f618a5001238453816cfce8f7e80005343fbe58
Ancestor: 915eb72db575b96b63275f0f1d857378adbf3420
Author: qulogic at pidgin.im
Date: 2010-06-08T08:12:00
Branch: im.pidgin.gobjectification
URL: http://d.pidgin.im/viewmtn/revision/info/8d4ee1027315fea460b5522ad554aacba6382c88
Deleted entries:
pidgin/win32/nsis/langmacros.nsh
pidgin/win32/nsis/translations
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/norwegian_nynorsk.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
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/rc4cipher.c
libpurple/rc4cipher.h libpurple/sha1cipher.c
libpurple/sha1cipher.h libpurple/sha256cipher.c
libpurple/sha256cipher.h
pidgin/pixmaps/emotes/default/24/chilli.png
pidgin/pixmaps/emotes/default/24/mrgreen.png
pidgin/pixmaps/emotes/small/16/grumpy.png
pidgin/pixmaps/emotes/small/16/invincible.png
pidgin/pixmaps/tray/hicolor/index.theme
pidgin/win32/nsis/create_nsis_translations.pl
pidgin/win32/nsis/nsis_translations.desktop.in
pidgin/win32/nsis/rpm2zip.sh
Modified files:
.mtn-ignore COPYRIGHT ChangeLog ChangeLog.API
ChangeLog.win32 Makefile.am Makefile.mingw NEWS acinclude.m4
configure.ac 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/gntpounce.c finch/gntrequest.c finch/gntsound.c
finch/gntui.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/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/gconf/Makefile.am
libpurple/idle.c libpurple/internal.h libpurple/log.c
libpurple/marshallers.list libpurple/media/backend-fs2.h
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/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/common.c
libpurple/protocols/gg/lib/libgadu-internal.h
libpurple/protocols/gg/lib/libgadu.h
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/adhoccommands.c
libpurple/protocols/jabber/auth.c
libpurple/protocols/jabber/auth_cyrus.c
libpurple/protocols/jabber/auth_scram.c
libpurple/protocols/jabber/buddy.c
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/jabber.c
libpurple/protocols/jabber/jutil.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/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/contact.c
libpurple/protocols/msn/dialog.c
libpurple/protocols/msn/directconn.c
libpurple/protocols/msn/directconn.h
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/slp.h
libpurple/protocols/msn/slpcall.h
libpurple/protocols/msn/slplink.c
libpurple/protocols/msn/slplink.h
libpurple/protocols/msn/slpmsg.c
libpurple/protocols/msn/state.c
libpurple/protocols/msn/switchboard.c
libpurple/protocols/msn/sync.c
libpurple/protocols/msn/user.c
libpurple/protocols/msn/userlist.c
libpurple/protocols/mxit/actions.c
libpurple/protocols/mxit/chunk.h
libpurple/protocols/mxit/formcmds.c
libpurple/protocols/mxit/login.c
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/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_chatnav.c
libpurple/protocols/oscar/family_icbm.c
libpurple/protocols/oscar/family_locate.c
libpurple/protocols/oscar/family_oservice.c
libpurple/protocols/oscar/flap_connection.c
libpurple/protocols/oscar/misc.c
libpurple/protocols/oscar/oscar.c
libpurple/protocols/oscar/oscar.h
libpurple/protocols/oscar/snac.c
libpurple/protocols/oscar/util.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/purple.h.in libpurple/roomlist.h
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/upnp.c
libpurple/util.c libpurple/util.h libpurple/value.c
libpurple/value.h libpurple/win32/global.mak
libpurple/win32/rules.mak pidgin/Makefile.am
pidgin/gtkaccount.c pidgin/gtkblist.c pidgin/gtkblist.h
pidgin/gtkconn.c pidgin/gtkconv.c pidgin/gtkdialogs.c
pidgin/gtkdocklet-gtk.c pidgin/gtkdocklet.c
pidgin/gtkimhtml.c pidgin/gtklog.c pidgin/gtkmain.c
pidgin/gtknotify.c pidgin/gtkpounce.c pidgin/gtkprefs.c
pidgin/gtkprivacy.c pidgin/gtkroomlist.c pidgin/gtksession.c
pidgin/gtksound.c pidgin/gtkstatusbox.c pidgin/gtkutils.c
pidgin/pixmaps/Makefile.am pidgin/pixmaps/Makefile.mingw
pidgin/pixmaps/emotes/default/24/Makefile.am
pidgin/pixmaps/emotes/default/24/default.theme.in
pidgin/pixmaps/emotes/small/16/Makefile.am
pidgin/pixmaps/emotes/small/16/hot.png
pidgin/plugins/cap/cap.c pidgin/plugins/disco/xmppdisco.c
pidgin/plugins/gevolution/add_buddy_dialog.c
pidgin/plugins/gevolution/gevolution.c
pidgin/plugins/gevolution/new_person_dialog.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/gtkwin32dep.c
pidgin/win32/nsis/generate_gtk_zip.sh
pidgin/win32/nsis/pidgin-installer.nsi pidgin.spec.in
po/ChangeLog po/POTFILES.in po/af.po po/am.po po/ar.po
po/as.po po/az.po po/be at latin.po po/bg.po po/bn.po
po/bn_IN.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/ml.po po/mn.po po/mr.po po/ms_MY.po
po/my_MM.po po/nb.po po/ne.po po/nl.po po/nn.po po/oc.po
po/or.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/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/emotes/default/24/chilli.png
pidgin/pixmaps/emotes/default/24/mrgreen.png
pidgin/pixmaps/emotes/small/16/grumpy.png
pidgin/pixmaps/emotes/small/16/invincible.png
pidgin/win32/nsis/rpm2zip.sh
ChangeLog:
explicit merge of '915eb72db575b96b63275f0f1d857378adbf3420'
and '4f618a5001238453816cfce8f7e80005343fbe58'
More information about the Commits
mailing list