pidgin: 432b9234: merge of '10ea019ecb33303883a9a34e547d2c...
qulogic at pidgin.im
qulogic at pidgin.im
Sun Dec 14 23:13:52 EST 2008
-----------------------------------------------------------------
Revision: 432b9234960650e65a0878859cf3713c68f614b5
Ancestor: 10ea019ecb33303883a9a34e547d2c04b8267a3d
Ancestor: 5c2262ac6439fb7a5cfdd91a6c350095bbd5d707
Author: qulogic at pidgin.im
Date: 2008-12-15T03:59:30
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/432b9234960650e65a0878859cf3713c68f614b5
Deleted entries:
libpurple/protocols/myspace/CHANGES
libpurple/protocols/myspace/ChangeLog
libpurple/protocols/myspace/LICENSE
libpurple/protocols/myspace/release.sh
libpurple/protocols/qq/group_conv.c
libpurple/protocols/qq/group_conv.h
libpurple/protocols/qq/group_find.c
libpurple/protocols/qq/group_find.h
libpurple/protocols/qq/group_free.c
libpurple/protocols/qq/group_free.h
libpurple/protocols/qq/group_search.c
libpurple/protocols/qq/group_search.h
libpurple/protocols/qq/sys_msg.c
libpurple/protocols/qq/sys_msg.h
pidgin/pidginstock-artwork.c
pidgin/pixmaps/protocols/16/facebook.png
pidgin/pixmaps/protocols/22/facebook.png
pidgin/pixmaps/protocols/48/facebook.png
pidgin/pixmaps/status/48/log-in.png
pidgin/pixmaps/status/48/log-out.png
Renamed entries:
libpurple/protocols/qq/header_info.c to libpurple/protocols/qq/qq_define.c
libpurple/protocols/qq/header_info.h to libpurple/protocols/qq/qq_define.h
pidgin/pixmaps/status/48/rtl/login.png to pidgin/pixmaps/status/48/rtl/log-in.png
pidgin/pixmaps/status/48/rtl/logout.png to pidgin/pixmaps/status/48/rtl/log-out.png
Added files:
finch/libgnt/gntinternal.h
pidgin/pixmaps/emotes/small/16/Makefile.am
pidgin/pixmaps/emotes/small/16/Makefile.mingw
pidgin/pixmaps/emotes/small/16/TODO
pidgin/pixmaps/emotes/small/16/angel.png
pidgin/pixmaps/emotes/small/16/angry.png
pidgin/pixmaps/emotes/small/16/beer.png
pidgin/pixmaps/emotes/small/16/camera.png
pidgin/pixmaps/emotes/small/16/cigarette.png
pidgin/pixmaps/emotes/small/16/coffee.png
pidgin/pixmaps/emotes/small/16/confused.png
pidgin/pixmaps/emotes/small/16/console.png
pidgin/pixmaps/emotes/small/16/cool.png
pidgin/pixmaps/emotes/small/16/cross.png
pidgin/pixmaps/emotes/small/16/crying.png
pidgin/pixmaps/emotes/small/16/devil.png
pidgin/pixmaps/emotes/small/16/dont-know.png
pidgin/pixmaps/emotes/small/16/grin.png
pidgin/pixmaps/emotes/small/16/hug-left.png
pidgin/pixmaps/emotes/small/16/hug-right.png
pidgin/pixmaps/emotes/small/16/kiss.png
pidgin/pixmaps/emotes/small/16/love.png
pidgin/pixmaps/emotes/small/16/meeting.png
pidgin/pixmaps/emotes/small/16/musical-note.png
pidgin/pixmaps/emotes/small/16/nerdy.png
pidgin/pixmaps/emotes/small/16/neutral.png
pidgin/pixmaps/emotes/small/16/party.png
pidgin/pixmaps/emotes/small/16/phone.png
pidgin/pixmaps/emotes/small/16/plate.png
pidgin/pixmaps/emotes/small/16/question.png
pidgin/pixmaps/emotes/small/16/sad.png
pidgin/pixmaps/emotes/small/16/scalable/pidgin-emotes.svg
pidgin/pixmaps/emotes/small/16/search.png
pidgin/pixmaps/emotes/small/16/shame.png
pidgin/pixmaps/emotes/small/16/shock.png
pidgin/pixmaps/emotes/small/16/sick.png
pidgin/pixmaps/emotes/small/16/silent.png
pidgin/pixmaps/emotes/small/16/sleepy.png
pidgin/pixmaps/emotes/small/16/small.theme.in
pidgin/pixmaps/emotes/small/16/smile-big.png
pidgin/pixmaps/emotes/small/16/smile.png
pidgin/pixmaps/emotes/small/16/thinking.png
pidgin/pixmaps/emotes/small/16/tongue.png
pidgin/pixmaps/emotes/small/16/tv.png
pidgin/pixmaps/emotes/small/16/uhm-yeah.png
pidgin/pixmaps/emotes/small/16/wink.png
pidgin/pixmaps/emotes/small/16/yawn.png
pidgin/pixmaps/status/11/rtl/log-in.png
pidgin/pixmaps/status/11/rtl/log-out.png
pidgin/pixmaps/status/48/invisible.png
pidgin/pixmaps/status/48/log-in.png
pidgin/pixmaps/status/48/log-out.png po/mn.po
share/ca-certs/Microsoft_Internet_Authority.pem
Added directories:
pidgin/pixmaps/emotes/small pidgin/pixmaps/emotes/small/16
pidgin/pixmaps/emotes/small/16/scalable
Modified files:
.mtn-ignore COPYING COPYRIGHT ChangeLog ChangeLog.win32
Makefile.am NEWS autogen.sh configure.ac doc/TCL-HOWTO.dox
doc/funniest_home_convos.txt finch/gntaccount.c
finch/gntblist.c finch/gntconv.c finch/gntdebug.c
finch/gntroomlist.c finch/libgnt/Makefile.am
finch/libgnt/gntbindable.c finch/libgnt/gntcolors.c
finch/libgnt/gntentry.c finch/libgnt/gntfilesel.c
finch/libgnt/gntkeys.c finch/libgnt/gntmain.c
finch/libgnt/gntstyle.c finch/libgnt/gnttextview.c
finch/libgnt/gntutils.c finch/libgnt/gntwm.c
finch/libgnt/wms/irssi.c libpurple/account.c
libpurple/blist.c libpurple/blist.h libpurple/buddyicon.c
libpurple/buddyicon.h libpurple/certificate.c
libpurple/circbuffer.c libpurple/cmds.h
libpurple/connection.c libpurple/connection.h
libpurple/conversation.h libpurple/core.c
libpurple/dbus-analyze-functions.py libpurple/dbus-server.c
libpurple/dnsquery.c libpurple/internal.h
libpurple/network.c libpurple/network.h libpurple/notify.c
libpurple/notify.h libpurple/plugin.c libpurple/plugin.h
libpurple/plugins/autoaccept.c
libpurple/plugins/log_reader.c
libpurple/plugins/perl/common/Account.xs
libpurple/plugins/perl/common/AccountOpts.xs
libpurple/plugins/perl/common/BuddyList.xs
libpurple/plugins/perl/common/Certificate.xs
libpurple/plugins/perl/common/Conversation.xs
libpurple/plugins/perl/common/Notify.xs
libpurple/plugins/perl/common/Prefs.xs
libpurple/plugins/perl/common/Roomlist.xs
libpurple/plugins/perl/common/Status.xs
libpurple/plugins/perl/common/module.h
libpurple/plugins/signals-test.c
libpurple/plugins/ssl/Makefile.am
libpurple/plugins/ssl/ssl-gnutls.c
libpurple/plugins/ssl/ssl-nss.c
libpurple/plugins/statenotify.c
libpurple/plugins/tcl/tcl_cmd.c
libpurple/plugins/tcl/tcl_cmds.c
libpurple/plugins/tcl/tcl_signals.c
libpurple/protocols/bonjour/Makefile.am
libpurple/protocols/bonjour/bonjour.c
libpurple/protocols/bonjour/bonjour_ft.c
libpurple/protocols/bonjour/bonjour_ft.h
libpurple/protocols/bonjour/buddy.c
libpurple/protocols/bonjour/jabber.c
libpurple/protocols/bonjour/jabber.h
libpurple/protocols/bonjour/mdns_common.c
libpurple/protocols/gg/Makefile.am
libpurple/protocols/gg/buddylist.c
libpurple/protocols/gg/gg.c libpurple/protocols/gg/gg.h
libpurple/protocols/irc/Makefile.am
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.am
libpurple/protocols/jabber/auth.c
libpurple/protocols/jabber/buddy.c
libpurple/protocols/jabber/iq.c
libpurple/protocols/jabber/jabber.c
libpurple/protocols/jabber/jutil.c
libpurple/protocols/jabber/jutil.h
libpurple/protocols/jabber/libxmpp.c
libpurple/protocols/jabber/message.c
libpurple/protocols/jabber/parser.c
libpurple/protocols/jabber/pep.c
libpurple/protocols/jabber/presence.c
libpurple/protocols/jabber/si.c
libpurple/protocols/msn/Makefile.am
libpurple/protocols/msn/command.h
libpurple/protocols/msn/contact.c
libpurple/protocols/msn/contact.h
libpurple/protocols/msn/httpconn.c
libpurple/protocols/msn/msg.c libpurple/protocols/msn/msg.h
libpurple/protocols/msn/msn.c libpurple/protocols/msn/msn.h
libpurple/protocols/msn/notification.c
libpurple/protocols/msn/notification.h
libpurple/protocols/msn/oim.c
libpurple/protocols/msn/servconn.c
libpurple/protocols/msn/servconn.h
libpurple/protocols/msn/session.c
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.c
libpurple/protocols/msn/soap.c
libpurple/protocols/msn/soap.h
libpurple/protocols/msn/state.c
libpurple/protocols/msn/switchboard.c
libpurple/protocols/msn/switchboard.h
libpurple/protocols/msn/transaction.c
libpurple/protocols/msn/user.c
libpurple/protocols/msn/user.h
libpurple/protocols/msn/userlist.c
libpurple/protocols/msn/userlist.h
libpurple/protocols/msnp9/Makefile.am
libpurple/protocols/myspace/Makefile.am
libpurple/protocols/myspace/README
libpurple/protocols/myspace/markup.c
libpurple/protocols/myspace/message.c
libpurple/protocols/myspace/myspace.c
libpurple/protocols/myspace/myspace.h
libpurple/protocols/myspace/user.c
libpurple/protocols/myspace/user.h
libpurple/protocols/novell/Makefile.am
libpurple/protocols/null/Makefile.am
libpurple/protocols/null/nullprpl.c
libpurple/protocols/oscar/Makefile.am
libpurple/protocols/oscar/bstream.c
libpurple/protocols/oscar/family_auth.c
libpurple/protocols/oscar/family_icbm.c
libpurple/protocols/oscar/family_icq.c
libpurple/protocols/oscar/family_locate.c
libpurple/protocols/oscar/flap_connection.c
libpurple/protocols/oscar/oscar.c
libpurple/protocols/oscar/oscar.h
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/buddy_opt.h
libpurple/protocols/qq/char_conv.c
libpurple/protocols/qq/char_conv.h
libpurple/protocols/qq/file_trans.c
libpurple/protocols/qq/group.c
libpurple/protocols/qq/group.h
libpurple/protocols/qq/group_im.c
libpurple/protocols/qq/group_im.h
libpurple/protocols/qq/group_info.c
libpurple/protocols/qq/group_info.h
libpurple/protocols/qq/group_internal.c
libpurple/protocols/qq/group_internal.h
libpurple/protocols/qq/group_join.c
libpurple/protocols/qq/group_join.h
libpurple/protocols/qq/group_opt.c
libpurple/protocols/qq/group_opt.h
libpurple/protocols/qq/im.c libpurple/protocols/qq/im.h
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_base.c
libpurple/protocols/qq/qq_base.h
libpurple/protocols/qq/qq_define.c
libpurple/protocols/qq/qq_define.h
libpurple/protocols/qq/qq_network.c
libpurple/protocols/qq/qq_network.h
libpurple/protocols/qq/qq_process.c
libpurple/protocols/qq/qq_process.h
libpurple/protocols/qq/qq_trans.c
libpurple/protocols/qq/send_file.c
libpurple/protocols/qq/utils.c
libpurple/protocols/qq/utils.h
libpurple/protocols/sametime/Makefile.am
libpurple/protocols/sametime/sametime.c
libpurple/protocols/silc/Makefile.am
libpurple/protocols/silc10/Makefile.am
libpurple/protocols/silc10/wb.c
libpurple/protocols/simple/Makefile.am
libpurple/protocols/simple/simple.c
libpurple/protocols/simple/sipmsg.c
libpurple/protocols/toc/Makefile.am
libpurple/protocols/yahoo/Makefile.am
libpurple/protocols/yahoo/yahoo.c
libpurple/protocols/yahoo/yahoo.h
libpurple/protocols/yahoo/yahoo_aliases.c
libpurple/protocols/yahoo/yahoo_filexfer.c
libpurple/protocols/yahoo/yahoo_picture.c
libpurple/protocols/yahoo/yahoo_profile.c
libpurple/protocols/yahoo/yahoochat.c
libpurple/protocols/yahoo/ycht.h
libpurple/protocols/zephyr/Makefile.am
libpurple/protocols/zephyr/zephyr.c libpurple/proxy.c
libpurple/prpl.c libpurple/prpl.h libpurple/purple-remote
libpurple/request.c libpurple/roomlist.c libpurple/server.c
libpurple/smiley.c libpurple/sslconn.c libpurple/sslconn.h
libpurple/util.c libpurple/win32/global.mak
libpurple/win32/libc_interface.c libpurple/win32/targets.mak
libpurple/xmlnode.c pidgin/Makefile.am pidgin/gtkaccount.c
pidgin/gtkblist.c pidgin/gtkconn.c pidgin/gtkconv.c
pidgin/gtkconv.h pidgin/gtkdialogs.c pidgin/gtkdialogs.h
pidgin/gtkimhtml.c pidgin/gtkimhtml.h pidgin/gtkmain.c
pidgin/gtknotify.c pidgin/gtkpounce.c pidgin/gtkprefs.c
pidgin/gtkrequest.c pidgin/gtkroomlist.c
pidgin/gtksavedstatuses.c pidgin/gtksmiley.c
pidgin/gtksound.c pidgin/gtkstatusbox.c
pidgin/gtkstatusbox.h pidgin/gtkthemes.c pidgin/gtkutils.c
pidgin/gtkutils.h pidgin/pidginstock.c pidgin/pidginstock.h
pidgin/pidgintooltip.c pidgin/pixmaps/Makefile.am
pidgin/pixmaps/emotes/default/24/Makefile.am
pidgin/pixmaps/emotes/default/24/default.theme.in
pidgin/plugins/history.c pidgin/plugins/markerline.c
pidgin/plugins/notify.c
pidgin/plugins/perl/common/GtkIMHtml.xs
pidgin/plugins/perl/common/gtkmodule.h
pidgin/plugins/relnot.c pidgin/plugins/sendbutton.c
pidgin/win32/nsis/translations/finnish.nsh
pidgin/win32/winpidgin.c pidgin.spec.in po/ChangeLog
po/POTFILES.in po/af.po po/am.po po/ar.po po/az.po
po/be at latin.po po/bg.po po/bn.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/id.po po/it.po po/ja.po po/ka.po po/kn.po po/ko.po
po/ku.po po/lo.po po/lt.po po/mk.po po/my_MM.po po/nb.po
po/ne.po po/nl.po po/nn.po po/oc.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/stats.pl po/sv.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 share/ca-certs/Makefile.am
share/ca-certs/Microsoft_Secure_Server_Authority.pem
Modified attrs:
pidgin/pixmaps/emotes/small/16/angel.png
pidgin/pixmaps/emotes/small/16/angry.png
pidgin/pixmaps/emotes/small/16/beer.png
pidgin/pixmaps/emotes/small/16/camera.png
pidgin/pixmaps/emotes/small/16/cigarette.png
pidgin/pixmaps/emotes/small/16/coffee.png
pidgin/pixmaps/emotes/small/16/confused.png
pidgin/pixmaps/emotes/small/16/console.png
pidgin/pixmaps/emotes/small/16/cool.png
pidgin/pixmaps/emotes/small/16/cross.png
pidgin/pixmaps/emotes/small/16/crying.png
pidgin/pixmaps/emotes/small/16/devil.png
pidgin/pixmaps/emotes/small/16/dont-know.png
pidgin/pixmaps/emotes/small/16/grin.png
pidgin/pixmaps/emotes/small/16/hug-left.png
pidgin/pixmaps/emotes/small/16/hug-right.png
pidgin/pixmaps/emotes/small/16/kiss.png
pidgin/pixmaps/emotes/small/16/love.png
pidgin/pixmaps/emotes/small/16/meeting.png
pidgin/pixmaps/emotes/small/16/musical-note.png
pidgin/pixmaps/emotes/small/16/nerdy.png
pidgin/pixmaps/emotes/small/16/neutral.png
pidgin/pixmaps/emotes/small/16/party.png
pidgin/pixmaps/emotes/small/16/phone.png
pidgin/pixmaps/emotes/small/16/plate.png
pidgin/pixmaps/emotes/small/16/question.png
pidgin/pixmaps/emotes/small/16/sad.png
pidgin/pixmaps/emotes/small/16/search.png
pidgin/pixmaps/emotes/small/16/shame.png
pidgin/pixmaps/emotes/small/16/shock.png
pidgin/pixmaps/emotes/small/16/sick.png
pidgin/pixmaps/emotes/small/16/silent.png
pidgin/pixmaps/emotes/small/16/sleepy.png
pidgin/pixmaps/emotes/small/16/smile-big.png
pidgin/pixmaps/emotes/small/16/smile.png
pidgin/pixmaps/emotes/small/16/thinking.png
pidgin/pixmaps/emotes/small/16/tongue.png
pidgin/pixmaps/emotes/small/16/tv.png
pidgin/pixmaps/emotes/small/16/uhm-yeah.png
pidgin/pixmaps/emotes/small/16/wink.png
pidgin/pixmaps/emotes/small/16/yawn.png
pidgin/pixmaps/status/11/rtl/log-in.png
pidgin/pixmaps/status/11/rtl/log-out.png
pidgin/pixmaps/status/48/invisible.png
pidgin/pixmaps/status/48/log-in.png
pidgin/pixmaps/status/48/log-out.png
ChangeLog:
merge of '10ea019ecb33303883a9a34e547d2c04b8267a3d'
and '5c2262ac6439fb7a5cfdd91a6c350095bbd5d707'
More information about the Commits
mailing list