pidgin: b5d22aba: merge of '34ebad1a339cefdab142795e0b3a04...

charkins at pidgin.im charkins at pidgin.im
Thu Jun 26 20:11:51 EDT 2008


-----------------------------------------------------------------
Revision: b5d22abac579cbb2742419d7d2d7ea33caa56e39
Ancestor: 34ebad1a339cefdab142795e0b3a045ad7016658
Ancestor: 868098fbe53290a8abcc3307c6fec2c6054a5e00
Author: charkins at pidgin.im
Date: 2008-06-27T00:01:59
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/b5d22abac579cbb2742419d7d2d7ea33caa56e39

Deleted entries:
        libpurple/protocols/qq/qq_proxy.c
        libpurple/protocols/qq/qq_proxy.h
        libpurple/protocols/qq/recv_core.c
        libpurple/protocols/qq/recv_core.h
        libpurple/protocols/qq/send_core.c
        libpurple/protocols/qq/send_core.h
        libpurple/protocols/qq/sendqueue.c
        libpurple/protocols/qq/sendqueue.h
        libpurple/protocols/qq/udp_proxy_s5.c
        libpurple/protocols/qq/udp_proxy_s5.h
Renamed entries:
        libpurple/protocols/zephyr/zephyr.h to libpurple/protocols/zephyr/zephyr_internal.h
Added files:
        libpurple/plugins/perl/common/Smiley.xs
        libpurple/protocols/qq/ChangeLog
        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/smiley.c
        libpurple/smiley.h pidgin/gtksmiley.c pidgin/gtksmiley.h
        pidgin/pixmaps/toolbar/16/transfer.png po/oc.po
Modified files:
        AUTHORS COPYRIGHT ChangeLog ChangeLog.API ChangeLog.win32
        Doxyfile.in NEWS README.MTN autogen.sh configure.ac
        doc/C-HOWTO.dox doc/conversation-signals.dox doc/finch.1.in
        doc/gtkrc-2.0 doc/pidgin.1.in finch/gntaccount.c
        finch/gntblist.c finch/gntblist.h finch/gntconv.c
        finch/gntft.c finch/gntlog.c finch/gntlog.h
        finch/gntnotify.c finch/gntrequest.c finch/gntsound.c
        finch/libgnt/configure.ac finch/libgnt/gntbindable.c
        finch/libgnt/gntbindable.h finch/libgnt/gntbox.c
        finch/libgnt/gntcolors.c finch/libgnt/gntcolors.h
        finch/libgnt/gntentry.c finch/libgnt/gntmenu.c
        finch/libgnt/gnttree.c finch/libgnt/gntwm.c
        finch/libgnt/wms/irssi.c libpurple/Makefile.am
        libpurple/Makefile.mingw libpurple/blist.c libpurple/blist.h
        libpurple/buddyicon.c libpurple/buddyicon.h
        libpurple/certificate.c libpurple/cmds.h
        libpurple/connection.h libpurple/conversation.c
        libpurple/conversation.h libpurple/core.c libpurple/core.h
        libpurple/dbus-analyze-functions.py libpurple/dbus-maybe.h
        libpurple/dbus-server.c libpurple/dnsquery.c
        libpurple/dnssrv.c libpurple/eventloop.h libpurple/idle.c
        libpurple/imgstore.c libpurple/imgstore.h
        libpurple/internal.h libpurple/log.c libpurple/nat-pmp.c
        libpurple/network.c libpurple/notify.c libpurple/notify.h
        libpurple/plugin.c libpurple/plugins/perl/Makefile.am
        libpurple/plugins/perl/common/MANIFEST
        libpurple/plugins/perl/common/Makefile.mingw
        libpurple/plugins/perl/common/Purple.xs
        libpurple/plugins/perl/common/module.h
        libpurple/plugins/perl/common/typemap
        libpurple/plugins/perl/perl-handlers.c
        libpurple/plugins/ssl/ssl-gnutls.c libpurple/prefs.h
        libpurple/privacy.c libpurple/protocols/bonjour/bonjour.c
        libpurple/protocols/bonjour/bonjour_ft.c
        libpurple/protocols/bonjour/buddy.c
        libpurple/protocols/bonjour/buddy.h
        libpurple/protocols/bonjour/dns_sd_proxy.h
        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/gg.c libpurple/protocols/gg/search.h
        libpurple/protocols/irc/cmds.c libpurple/protocols/irc/irc.c
        libpurple/protocols/irc/irc.h libpurple/protocols/irc/msgs.c
        libpurple/protocols/irc/parse.c
        libpurple/protocols/jabber/auth.c
        libpurple/protocols/jabber/buddy.c
        libpurple/protocols/jabber/buddy.h
        libpurple/protocols/jabber/chat.c
        libpurple/protocols/jabber/chat.h
        libpurple/protocols/jabber/iq.c
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/jabber/libxmpp.c
        libpurple/protocols/jabber/message.c
        libpurple/protocols/jabber/parser.c
        libpurple/protocols/jabber/pep.h
        libpurple/protocols/jabber/presence.c
        libpurple/protocols/jabber/si.c
        libpurple/protocols/jabber/win32/posix.uname.c
        libpurple/protocols/jabber/win32/utsname.h
        libpurple/protocols/jabber/xdata.c
        libpurple/protocols/msn/cmdproc.c
        libpurple/protocols/msn/contact.c
        libpurple/protocols/msn/contact.h
        libpurple/protocols/msn/dialog.c
        libpurple/protocols/msn/error.c
        libpurple/protocols/msn/httpconn.c
        libpurple/protocols/msn/httpconn.h
        libpurple/protocols/msn/msg.c libpurple/protocols/msn/msn.c
        libpurple/protocols/msn/msnutils.c
        libpurple/protocols/msn/notification.c
        libpurple/protocols/msn/notification.h
        libpurple/protocols/msn/object.c
        libpurple/protocols/msn/object.h
        libpurple/protocols/msn/oim.c libpurple/protocols/msn/oim.h
        libpurple/protocols/msn/servconn.c
        libpurple/protocols/msn/servconn.h
        libpurple/protocols/msn/session.c
        libpurple/protocols/msn/session.h
        libpurple/protocols/msn/slp.c
        libpurple/protocols/msn/slplink.c
        libpurple/protocols/msn/slplink.h
        libpurple/protocols/msn/soap.c
        libpurple/protocols/msn/soap.h
        libpurple/protocols/msn/soap2.c
        libpurple/protocols/msn/state.c
        libpurple/protocols/msn/transaction.h
        libpurple/protocols/msn/user.c
        libpurple/protocols/msn/user.h
        libpurple/protocols/msn/userlist.c
        libpurple/protocols/msn/userlist.h
        libpurple/protocols/msnp9/cmdproc.c
        libpurple/protocols/msnp9/error.c
        libpurple/protocols/msnp9/msg.c
        libpurple/protocols/msnp9/msn.c
        libpurple/protocols/msnp9/notification.c
        libpurple/protocols/msnp9/object.c
        libpurple/protocols/msnp9/object.h
        libpurple/protocols/msnp9/session.c
        libpurple/protocols/msnp9/slp.c
        libpurple/protocols/msnp9/slplink.c
        libpurple/protocols/msnp9/user.c
        libpurple/protocols/myspace/myspace.c
        libpurple/protocols/myspace/user.c
        libpurple/protocols/novell/novell.c
        libpurple/protocols/oscar/family_admin.c
        libpurple/protocols/oscar/family_advert.c
        libpurple/protocols/oscar/family_alert.c
        libpurple/protocols/oscar/family_auth.c
        libpurple/protocols/oscar/family_bart.c
        libpurple/protocols/oscar/family_bos.c
        libpurple/protocols/oscar/family_buddy.c
        libpurple/protocols/oscar/family_chat.c
        libpurple/protocols/oscar/family_chatnav.c
        libpurple/protocols/oscar/family_feedbag.c
        libpurple/protocols/oscar/family_icbm.c
        libpurple/protocols/oscar/family_icq.c
        libpurple/protocols/oscar/family_invite.c
        libpurple/protocols/oscar/family_locate.c
        libpurple/protocols/oscar/family_odir.c
        libpurple/protocols/oscar/family_oservice.c
        libpurple/protocols/oscar/family_popup.c
        libpurple/protocols/oscar/family_stats.c
        libpurple/protocols/oscar/family_translate.c
        libpurple/protocols/oscar/family_userlookup.c
        libpurple/protocols/oscar/flap_connection.c
        libpurple/protocols/oscar/libaim.c
        libpurple/protocols/oscar/libicq.c
        libpurple/protocols/oscar/msgcookie.c
        libpurple/protocols/oscar/odc.c
        libpurple/protocols/oscar/oscar.c
        libpurple/protocols/oscar/oscar.h
        libpurple/protocols/oscar/oscarcommon.h
        libpurple/protocols/oscar/peer.c
        libpurple/protocols/oscar/peer.h
        libpurple/protocols/oscar/peer_proxy.c
        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_opt.c
        libpurple/protocols/qq/buddy_status.c
        libpurple/protocols/qq/buddy_status.h
        libpurple/protocols/qq/char_conv.c
        libpurple/protocols/qq/crypt.c
        libpurple/protocols/qq/crypt.h
        libpurple/protocols/qq/file_trans.c
        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_join.c
        libpurple/protocols/qq/group_join.h
        libpurple/protocols/qq/group_network.c
        libpurple/protocols/qq/group_opt.c
        libpurple/protocols/qq/group_opt.h
        libpurple/protocols/qq/group_search.c
        libpurple/protocols/qq/group_search.h
        libpurple/protocols/qq/im.c
        libpurple/protocols/qq/keep_alive.c
        libpurple/protocols/qq/login_logout.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/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/silc/buddy.c
        libpurple/protocols/silc/chat.c
        libpurple/protocols/silc/ops.c
        libpurple/protocols/silc/silc.c
        libpurple/protocols/silc/util.c
        libpurple/protocols/silc10/buddy.c
        libpurple/protocols/silc10/chat.c
        libpurple/protocols/silc10/ops.c
        libpurple/protocols/silc10/silc.c
        libpurple/protocols/silc10/util.c
        libpurple/protocols/simple/simple.c
        libpurple/protocols/toc/toc.c
        libpurple/protocols/yahoo/util.c
        libpurple/protocols/yahoo/yahoo.c
        libpurple/protocols/yahoo/yahoo_aliases.c
        libpurple/protocols/yahoo/yahoo_picture.c
        libpurple/protocols/yahoo/yahoo_profile.c
        libpurple/protocols/yahoo/yahoochat.c
        libpurple/protocols/zephyr/Makefile.am
        libpurple/protocols/zephyr/internal.h
        libpurple/protocols/zephyr/zephyr.c libpurple/proxy.c
        libpurple/proxy.h libpurple/prpl.h libpurple/purple-remote
        libpurple/purple-url-handler libpurple/roomlist.h
        libpurple/server.c libpurple/server.h libpurple/sound.h
        libpurple/status.c libpurple/tests/check_libpurple.c
        libpurple/util.c libpurple/util.h libpurple/win32/global.mak
        pidgin/Makefile.am pidgin/Makefile.mingw pidgin/gtkaccount.c
        pidgin/gtkblist.c pidgin/gtkconn.c pidgin/gtkconv.c
        pidgin/gtkdialogs.c pidgin/gtkdocklet.c
        pidgin/gtkeventloop.c pidgin/gtkft.c pidgin/gtkimhtml.c
        pidgin/gtkimhtml.h pidgin/gtkimhtmltoolbar.c
        pidgin/gtkmain.c pidgin/gtkmenutray.c pidgin/gtknotify.c
        pidgin/gtkplugin.c pidgin/gtkpounce.c pidgin/gtkprefs.c
        pidgin/gtksavedstatuses.c pidgin/gtksound.c
        pidgin/gtkstatusbox.c pidgin/gtkthemes.c pidgin/gtkthemes.h
        pidgin/gtkutils.c pidgin/gtkutils.h pidgin/pidginstock.c
        pidgin/pidginstock.h pidgin/pixmaps/Makefile.am
        pidgin/pixmaps/logo.png
        pidgin/pixmaps/status/16/available.png
        pidgin/pixmaps/status/16/away.png
        pidgin/pixmaps/status/16/busy.png
        pidgin/pixmaps/status/16/chat.png
        pidgin/pixmaps/status/16/offline.png
        pidgin/pixmaps/status/16/person.png
        pidgin/pixmaps/status/16/scalable/available.svg
        pidgin/pixmaps/status/16/scalable/away.svg
        pidgin/pixmaps/status/16/scalable/busy.svg
        pidgin/pixmaps/status/16/scalable/chat.svg
        pidgin/pixmaps/status/16/scalable/offline.svg
        pidgin/pixmaps/status/16/scalable/person.svg
        pidgin/pixmaps/toolbar/16/send-file.png
        pidgin/plugins/Makefile.mingw pidgin/plugins/cap/cap.c
        pidgin/plugins/gevolution/gevolution.c
        pidgin/plugins/gevolution/new_person_dialog.c
        pidgin/plugins/history.c pidgin/plugins/spellchk.c
        pidgin/win32/nsis/pidgin-installer.nsi
        pidgin/win32/nsis/translations/lithuanian.nsh 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/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/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/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/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/Makefile.mingw
Modified attrs:
        pidgin/pixmaps/toolbar/16/transfer.png

ChangeLog: 

merge of '34ebad1a339cefdab142795e0b3a045ad7016658'
     and '868098fbe53290a8abcc3307c6fec2c6054a5e00'



More information about the Commits mailing list