pidgin: ebf438e4: merge of '8a14c1d90381baa3c31adeedee7f67...

rlaager at pidgin.im rlaager at pidgin.im
Sat Oct 25 15:11:50 EDT 2008


-----------------------------------------------------------------
Revision: ebf438e4b37e38e352d72cc913664188c9ec3ecf
Ancestor: 8a14c1d90381baa3c31adeedee7f673d58d66304
Ancestor: a466d13b3d95f820b89489b1b33af51c6b71eae5
Author: rlaager at pidgin.im
Date: 2008-10-25T18:33:25
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/ebf438e4b37e38e352d72cc913664188c9ec3ecf

Deleted entries:
        pidgin/pixmaps/buddy_icons pidgin/pixmaps/buddy_icons/qq
        pidgin/pixmaps/buddy_icons/qq/Makefile.am
        pidgin/pixmaps/buddy_icons/qq/Makefile.mingw
        pidgin/pixmaps/buddy_icons/qq/qq_1.png
        pidgin/pixmaps/buddy_icons/qq/qq_10.png
        pidgin/pixmaps/buddy_icons/qq/qq_100.png
        pidgin/pixmaps/buddy_icons/qq/qq_11.png
        pidgin/pixmaps/buddy_icons/qq/qq_12.png
        pidgin/pixmaps/buddy_icons/qq/qq_13.png
        pidgin/pixmaps/buddy_icons/qq/qq_14.png
        pidgin/pixmaps/buddy_icons/qq/qq_15.png
        pidgin/pixmaps/buddy_icons/qq/qq_16.png
        pidgin/pixmaps/buddy_icons/qq/qq_17.png
        pidgin/pixmaps/buddy_icons/qq/qq_18.png
        pidgin/pixmaps/buddy_icons/qq/qq_19.png
        pidgin/pixmaps/buddy_icons/qq/qq_2.png
        pidgin/pixmaps/buddy_icons/qq/qq_20.png
        pidgin/pixmaps/buddy_icons/qq/qq_21.png
        pidgin/pixmaps/buddy_icons/qq/qq_22.png
        pidgin/pixmaps/buddy_icons/qq/qq_23.png
        pidgin/pixmaps/buddy_icons/qq/qq_24.png
        pidgin/pixmaps/buddy_icons/qq/qq_25.png
        pidgin/pixmaps/buddy_icons/qq/qq_26.png
        pidgin/pixmaps/buddy_icons/qq/qq_27.png
        pidgin/pixmaps/buddy_icons/qq/qq_28.png
        pidgin/pixmaps/buddy_icons/qq/qq_29.png
        pidgin/pixmaps/buddy_icons/qq/qq_3.png
        pidgin/pixmaps/buddy_icons/qq/qq_30.png
        pidgin/pixmaps/buddy_icons/qq/qq_31.png
        pidgin/pixmaps/buddy_icons/qq/qq_32.png
        pidgin/pixmaps/buddy_icons/qq/qq_33.png
        pidgin/pixmaps/buddy_icons/qq/qq_34.png
        pidgin/pixmaps/buddy_icons/qq/qq_35.png
        pidgin/pixmaps/buddy_icons/qq/qq_36.png
        pidgin/pixmaps/buddy_icons/qq/qq_37.png
        pidgin/pixmaps/buddy_icons/qq/qq_38.png
        pidgin/pixmaps/buddy_icons/qq/qq_39.png
        pidgin/pixmaps/buddy_icons/qq/qq_4.png
        pidgin/pixmaps/buddy_icons/qq/qq_40.png
        pidgin/pixmaps/buddy_icons/qq/qq_41.png
        pidgin/pixmaps/buddy_icons/qq/qq_42.png
        pidgin/pixmaps/buddy_icons/qq/qq_43.png
        pidgin/pixmaps/buddy_icons/qq/qq_44.png
        pidgin/pixmaps/buddy_icons/qq/qq_45.png
        pidgin/pixmaps/buddy_icons/qq/qq_46.png
        pidgin/pixmaps/buddy_icons/qq/qq_47.png
        pidgin/pixmaps/buddy_icons/qq/qq_48.png
        pidgin/pixmaps/buddy_icons/qq/qq_49.png
        pidgin/pixmaps/buddy_icons/qq/qq_5.png
        pidgin/pixmaps/buddy_icons/qq/qq_50.png
        pidgin/pixmaps/buddy_icons/qq/qq_51.png
        pidgin/pixmaps/buddy_icons/qq/qq_52.png
        pidgin/pixmaps/buddy_icons/qq/qq_53.png
        pidgin/pixmaps/buddy_icons/qq/qq_54.png
        pidgin/pixmaps/buddy_icons/qq/qq_55.png
        pidgin/pixmaps/buddy_icons/qq/qq_56.png
        pidgin/pixmaps/buddy_icons/qq/qq_57.png
        pidgin/pixmaps/buddy_icons/qq/qq_58.png
        pidgin/pixmaps/buddy_icons/qq/qq_59.png
        pidgin/pixmaps/buddy_icons/qq/qq_6.png
        pidgin/pixmaps/buddy_icons/qq/qq_60.png
        pidgin/pixmaps/buddy_icons/qq/qq_61.png
        pidgin/pixmaps/buddy_icons/qq/qq_62.png
        pidgin/pixmaps/buddy_icons/qq/qq_63.png
        pidgin/pixmaps/buddy_icons/qq/qq_64.png
        pidgin/pixmaps/buddy_icons/qq/qq_65.png
        pidgin/pixmaps/buddy_icons/qq/qq_66.png
        pidgin/pixmaps/buddy_icons/qq/qq_67.png
        pidgin/pixmaps/buddy_icons/qq/qq_68.png
        pidgin/pixmaps/buddy_icons/qq/qq_69.png
        pidgin/pixmaps/buddy_icons/qq/qq_7.png
        pidgin/pixmaps/buddy_icons/qq/qq_70.png
        pidgin/pixmaps/buddy_icons/qq/qq_71.png
        pidgin/pixmaps/buddy_icons/qq/qq_72.png
        pidgin/pixmaps/buddy_icons/qq/qq_73.png
        pidgin/pixmaps/buddy_icons/qq/qq_74.png
        pidgin/pixmaps/buddy_icons/qq/qq_75.png
        pidgin/pixmaps/buddy_icons/qq/qq_76.png
        pidgin/pixmaps/buddy_icons/qq/qq_77.png
        pidgin/pixmaps/buddy_icons/qq/qq_78.png
        pidgin/pixmaps/buddy_icons/qq/qq_79.png
        pidgin/pixmaps/buddy_icons/qq/qq_8.png
        pidgin/pixmaps/buddy_icons/qq/qq_80.png
        pidgin/pixmaps/buddy_icons/qq/qq_81.png
        pidgin/pixmaps/buddy_icons/qq/qq_82.png
        pidgin/pixmaps/buddy_icons/qq/qq_83.png
        pidgin/pixmaps/buddy_icons/qq/qq_84.png
        pidgin/pixmaps/buddy_icons/qq/qq_85.png
        pidgin/pixmaps/buddy_icons/qq/qq_86.png
        pidgin/pixmaps/buddy_icons/qq/qq_87.png
        pidgin/pixmaps/buddy_icons/qq/qq_88.png
        pidgin/pixmaps/buddy_icons/qq/qq_89.png
        pidgin/pixmaps/buddy_icons/qq/qq_9.png
        pidgin/pixmaps/buddy_icons/qq/qq_90.png
        pidgin/pixmaps/buddy_icons/qq/qq_91.png
        pidgin/pixmaps/buddy_icons/qq/qq_92.png
        pidgin/pixmaps/buddy_icons/qq/qq_93.png
        pidgin/pixmaps/buddy_icons/qq/qq_94.png
        pidgin/pixmaps/buddy_icons/qq/qq_95.png
        pidgin/pixmaps/buddy_icons/qq/qq_96.png
        pidgin/pixmaps/buddy_icons/qq/qq_97.png
        pidgin/pixmaps/buddy_icons/qq/qq_98.png
        pidgin/pixmaps/buddy_icons/qq/qq_99.png
        pidgin/pixmaps/status/11/scalable
        pidgin/pixmaps/status/11/scalable/available.svg
        pidgin/pixmaps/status/11/scalable/away.svg
        pidgin/pixmaps/status/11/scalable/busy.svg
        pidgin/pixmaps/status/11/scalable/chat.svg
        pidgin/pixmaps/status/11/scalable/extended-away.svg
        pidgin/pixmaps/status/11/scalable/invisible.svg
        pidgin/pixmaps/status/11/scalable/offline.svg
        pidgin/pixmaps/status/11/scalable/person.svg
        pidgin/pixmaps/status/16/scalable
        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/extended-away.svg
        pidgin/pixmaps/status/16/scalable/invisible.svg
        pidgin/pixmaps/status/16/scalable/log-in.svg
        pidgin/pixmaps/status/16/scalable/log-out.svg
        pidgin/pixmaps/status/16/scalable/message-pending.svg
        pidgin/pixmaps/status/16/scalable/offline.svg
        pidgin/pixmaps/status/16/scalable/person.svg
        pidgin/pixmaps/status/22/scalable
        pidgin/pixmaps/status/22/scalable/available.svg
        pidgin/pixmaps/status/22/scalable/away.svg
        pidgin/pixmaps/status/22/scalable/busy.svg
        pidgin/pixmaps/status/22/scalable/chat.svg
        pidgin/pixmaps/status/22/scalable/extended-away.svg
        pidgin/pixmaps/status/22/scalable/log-in.svg
        pidgin/pixmaps/status/22/scalable/log-out.svg
        pidgin/pixmaps/status/22/scalable/offline.svg
        pidgin/pixmaps/status/22/scalable/person.svg
        pidgin/pixmaps/status/22/scalable/sign-off.svg
        pidgin/pixmaps/status/22/scalable/sign-on.svg
        pidgin/pixmaps/status/32/scalable
        pidgin/pixmaps/status/32/scalable/available.svg
        pidgin/pixmaps/status/32/scalable/away.svg
        pidgin/pixmaps/status/32/scalable/busy.svg
        pidgin/pixmaps/status/32/scalable/chat.svg
        pidgin/pixmaps/status/32/scalable/extended-away.svg
        pidgin/pixmaps/status/32/scalable/log-in.svg
        pidgin/pixmaps/status/32/scalable/log-out.svg
        pidgin/pixmaps/status/32/scalable/offline.svg
        pidgin/pixmaps/status/32/scalable/person.svg
        pidgin/pixmaps/tray/16/scalable
        pidgin/pixmaps/tray/16/scalable/tray-away.svg
        pidgin/pixmaps/tray/16/scalable/tray-busy.svg
        pidgin/pixmaps/tray/16/scalable/tray-connecting.svg
        pidgin/pixmaps/tray/16/scalable/tray-extended-away.svg
        pidgin/pixmaps/tray/16/scalable/tray-invisible.svg
        pidgin/pixmaps/tray/16/scalable/tray-message.svg
        pidgin/pixmaps/tray/16/scalable/tray-offline.svg
        pidgin/pixmaps/tray/16/scalable/tray-online.svg
        pidgin/pixmaps/tray/22/scalable
        pidgin/pixmaps/tray/22/scalable/tray-away.svg
        pidgin/pixmaps/tray/22/scalable/tray-busy.svg
        pidgin/pixmaps/tray/22/scalable/tray-extended-away.svg
        pidgin/pixmaps/tray/22/scalable/tray-invisible.svg
        pidgin/pixmaps/tray/22/scalable/tray-message-new.svg
        pidgin/pixmaps/tray/22/scalable/tray-offline.svg
        pidgin/pixmaps/tray/22/scalable/tray-online.svg
        pidgin/pixmaps/tray/32/scalable
        pidgin/pixmaps/tray/48/scalable
Added files:
        libpurple/protocols/jabber/data.c
        libpurple/protocols/jabber/data.h
        pidgin/pidginstock-artwork.c
        pidgin/pixmaps/status/svg/pidgin-status.svg po/ga.po
        po/mn.po share/ca-certs/Microsoft_Internet_Authority.pem
        share/ca-certs/VeriSign_Class_3_Public_Primary_Certification_Authority_-_G5.pem
Added directories:
        pidgin/pixmaps/status/svg
Modified files:
        .mtn-ignore AUTHORS COPYRIGHT ChangeLog ChangeLog.win32
        Makefile.am Makefile.mingw NEWS configure.ac
        doc/funniest_home_convos.txt doc/pidgin.1.in
        finch/gntaccount.c finch/gntblist.c finch/gntconv.c
        finch/gntnotify.c finch/gntpounce.c finch/libgnt/gntkeys.c
        finch/libgnt/gntmenu.c finch/libgnt/wms/Makefile.am
        finch/libgnt/wms/irssi.c finch/plugins/Makefile.am
        finch/plugins/grouping.c libpurple/account.c
        libpurple/buddyicon.c libpurple/buddyicon.h
        libpurple/certificate.c libpurple/circbuffer.c
        libpurple/conversation.h libpurple/core.c
        libpurple/dbus-maybe.h libpurple/dnsquery.c libpurple/log.c
        libpurple/plugins/Makefile.am libpurple/plugins/autoaccept.c
        libpurple/plugins/log_reader.c libpurple/plugins/perl/perl.c
        libpurple/plugins/ssl/Makefile.am
        libpurple/plugins/ssl/ssl-gnutls.c
        libpurple/plugins/ssl/ssl-nss.c
        libpurple/protocols/bonjour/jabber.c
        libpurple/protocols/bonjour/mdns_common.c
        libpurple/protocols/irc/msgs.c
        libpurple/protocols/jabber/Makefile.am
        libpurple/protocols/jabber/Makefile.mingw
        libpurple/protocols/jabber/buddy.c
        libpurple/protocols/jabber/buddy.h
        libpurple/protocols/jabber/chat.c
        libpurple/protocols/jabber/iq.c
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/jabber/libxmpp.c
        libpurple/protocols/jabber/message.c
        libpurple/protocols/jabber/message.h
        libpurple/protocols/jabber/roster.c
        libpurple/protocols/msn/command.h
        libpurple/protocols/msn/contact.c
        libpurple/protocols/msn/contact.h
        libpurple/protocols/msn/error.c
        libpurple/protocols/msn/group.h
        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/servconn.c
        libpurple/protocols/msn/soap.c
        libpurple/protocols/msn/switchboard.c
        libpurple/protocols/msn/switchboard.h
        libpurple/protocols/msn/user.c
        libpurple/protocols/msn/userlist.c
        libpurple/protocols/null/nullprpl.c
        libpurple/protocols/oscar/flap_connection.c
        libpurple/protocols/oscar/libicq.c
        libpurple/protocols/oscar/oscar.c
        libpurple/protocols/qq/AUTHORS
        libpurple/protocols/qq/ChangeLog
        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/file_trans.c
        libpurple/protocols/qq/group.c
        libpurple/protocols/qq/group.h
        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_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/group_search.c
        libpurple/protocols/qq/header_info.c
        libpurple/protocols/qq/header_info.h
        libpurple/protocols/qq/im.c libpurple/protocols/qq/im.h
        libpurple/protocols/qq/packet_parse.c
        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_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/qq_trans.h
        libpurple/protocols/qq/send_file.c
        libpurple/protocols/qq/sys_msg.c
        libpurple/protocols/qq/utils.c
        libpurple/protocols/qq/utils.h
        libpurple/protocols/yahoo/util.c
        libpurple/protocols/yahoo/yahoo.c
        libpurple/protocols/yahoo/yahoo.h
        libpurple/protocols/yahoo/yahoo_aliases.c
        libpurple/protocols/yahoo/yahoo_auth.c
        libpurple/protocols/yahoo/yahoo_auth.h
        libpurple/protocols/yahoo/yahoo_packet.h
        libpurple/protocols/yahoo/yahoo_picture.c
        libpurple/protocols/yahoo/yahoo_profile.c
        libpurple/protocols/yahoo/yahoochat.c libpurple/proxy.c
        libpurple/sslconn.h libpurple/util.c
        libpurple/win32/giowin32.c libpurple/win32/libc_interface.h
        libpurple/win32/libc_internal.h libpurple/win32/win32dep.c
        libpurple/win32/win32dep.h pidgin/Makefile.am
        pidgin/gtkaccount.c pidgin/gtkblist.c pidgin/gtkconn.c
        pidgin/gtkconv.c pidgin/gtkdialogs.c pidgin/gtkimhtml.c
        pidgin/gtkimhtmltoolbar.c pidgin/gtkmenutray.c
        pidgin/gtknotify.c pidgin/gtkprefs.c pidgin/gtksmiley.c
        pidgin/gtkstatusbox.c pidgin/gtkstatusbox.h
        pidgin/pidginstock.c pidgin/pixmaps/Makefile.am
        pidgin/pixmaps/Makefile.mingw
        pidgin/pixmaps/dialogs/64/question.png
        pidgin/pixmaps/dialogs/64/scalable/question.svg
        pidgin/pixmaps/emotes/default/24/Makefile.mingw
        pidgin/pixmaps/emotes/none/Makefile.mingw
        pidgin/pixmaps/status/11/chat.png
        pidgin/pixmaps/status/11/log-in.png
        pidgin/pixmaps/status/11/log-out.png
        pidgin/pixmaps/status/11/person.png
        pidgin/plugins/Makefile.am pidgin/plugins/Makefile.mingw
        pidgin/plugins/notify.c pidgin/plugins/pidginrc.c
        pidgin/plugins/relnot.c
        pidgin/win32/nsis/pidgin-installer.nsi
        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/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/Makefile.mingw
        share/ca-certs/Microsoft_Secure_Server_Authority.pem

ChangeLog: 

merge of '8a14c1d90381baa3c31adeedee7f673d58d66304'
     and 'a466d13b3d95f820b89489b1b33af51c6b71eae5'



More information about the Commits mailing list