pidgin.next.minor: 65a6b2bf: explicit merge of '82e4edbe06cb0ef0fa59f...

[rlaager at pidgin.im]

-----------------------------------------------------------------
Revision: 65a6b2bf1ab03c791a4444120e325ce42d9471f2
Ancestor: 82e4edbe06cb0ef0fa59f70db44a289bb91e1343
Ancestor: 8edc2ac791e936a5d9eddd85e451d25e1afa5ba6
Author: rlaager at pidgin.im
Date: 2009-01-02T22:23:19
Branch: im.pidgin.pidgin.next.minor
URL: http://d.pidgin.im/viewmtn/revision/info/65a6b2bf1ab03c791a4444120e325ce42d9471f2

Added files:
        fix-casts.sh libpurple/sound-theme-loader.c
        libpurple/sound-theme-loader.h libpurple/sound-theme.c
        libpurple/sound-theme.h libpurple/theme-loader.c
        libpurple/theme-loader.h libpurple/theme-manager.c
        libpurple/theme-manager.h libpurple/theme.c
        libpurple/theme.h pidgin/gtkblist-theme-loader.c
        pidgin/gtkblist-theme-loader.h pidgin/gtkblist-theme.c
        pidgin/gtkblist-theme.h pidgin/gtkicon-theme-loader.c
        pidgin/gtkicon-theme-loader.h pidgin/gtkicon-theme.c
        pidgin/gtkicon-theme.h pidgin/gtkstatus-icon-theme.c
        pidgin/gtkstatus-icon-theme.h
Modified files:
        .mtn-ignore ChangeLog ChangeLog.API Makefile.am configure.ac
        finch/gntblist.c finch/gntconv.c finch/gntlog.c
        finch/gntrequest.c finch/plugins/grouping.c
        libpurple/Makefile.am libpurple/Makefile.mingw
        libpurple/account.c libpurple/blist.c libpurple/blist.h
        libpurple/buddyicon.c libpurple/connection.c
        libpurple/connection.h libpurple/conversation.c
        libpurple/core.c libpurple/log.c libpurple/network.c
        libpurple/network.h libpurple/plugins/autoaccept.c
        libpurple/plugins/tcl/tcl_cmds.c libpurple/pounce.c
        libpurple/privacy.c 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/gg/buddylist.c
        libpurple/protocols/gg/gg.c libpurple/protocols/irc/irc.c
        libpurple/protocols/irc/msgs.c
        libpurple/protocols/jabber/adhoccommands.c
        libpurple/protocols/jabber/buddy.c
        libpurple/protocols/jabber/google.c
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/jabber/roster.c
        libpurple/protocols/msn/directconn.c
        libpurple/protocols/msn/msn.c
        libpurple/protocols/msn/session.c
        libpurple/protocols/msn/user.c
        libpurple/protocols/msn/userlist.c
        libpurple/protocols/myspace/markup.c
        libpurple/protocols/myspace/message.c
        libpurple/protocols/myspace/message.h
        libpurple/protocols/myspace/myspace.c
        libpurple/protocols/myspace/persist.h
        libpurple/protocols/myspace/user.c
        libpurple/protocols/myspace/user.h
        libpurple/protocols/myspace/zap.c
        libpurple/protocols/novell/novell.c
        libpurple/protocols/null/README
        libpurple/protocols/null/nullprpl.c
        libpurple/protocols/oscar/oscar.c
        libpurple/protocols/qq/buddy_info.c
        libpurple/protocols/qq/buddy_list.c
        libpurple/protocols/qq/buddy_opt.c
        libpurple/protocols/qq/group_internal.c
        libpurple/protocols/qq/im.c libpurple/protocols/qq/qq.c
        libpurple/protocols/qq/send_file.c
        libpurple/protocols/sametime/sametime.c
        libpurple/protocols/silc/buddy.c
        libpurple/protocols/silc/chat.c
        libpurple/protocols/silc/ops.c
        libpurple/protocols/simple/simple.c
        libpurple/protocols/yahoo/yahoo.c
        libpurple/protocols/yahoo/yahoo_profile.c
        libpurple/protocols/yahoo/yahoochat.c
        libpurple/protocols/zephyr/zephyr.c libpurple/prpl.h
        libpurple/request.c libpurple/request.h libpurple/server.c
        libpurple/sound.c libpurple/sslconn.c libpurple/status.c
        libpurple/status.h libpurple/util.c libpurple/xmlnode.c
        libpurple/xmlnode.h pidgin/Makefile.am pidgin/Makefile.mingw
        pidgin/gtkblist.c pidgin/gtkblist.h
        pidgin/gtkcellrendererexpander.c pidgin/gtkconv.c
        pidgin/gtkdialogs.c pidgin/gtkimhtml.c pidgin/gtkimhtml.h
        pidgin/gtklog.c pidgin/gtkmain.c pidgin/gtkprefs.c
        pidgin/gtkrequest.c pidgin/gtksound.c pidgin/gtksound.h
        pidgin/gtkutils.c pidgin/gtkutils.h pidgin/pidginstock.c
        pidgin/pidginstock.h pidgin/pixmaps/Makefile.am
        pidgin/plugins/history.c pidgin/plugins/ticker/ticker.c
        po/POTFILES.in po/ca.po po/ca at valencia.po
Modified attrs:
        fix-casts.sh
        pidgin/pixmaps/art-tools/clean-svg-definitions.sh

ChangeLog: 

explicit merge of '82e4edbe06cb0ef0fa59f70db44a289bb91e1343'
              and '8edc2ac791e936a5d9eddd85e451d25e1afa5ba6'