pidgin.next.minor: 1ca0231d: explicit merge of '8c6ea3b255d94e0f2867f...

rlaager at pidgin.im rlaager at pidgin.im
Thu Nov 27 15:40:45 EST 2008 

-----------------------------------------------------------------
Revision: 1ca0231d066e176a833be6e44e4a933acf14963a
Ancestor: 5459c606fe645dac4dddd188eca62eb52a9f7745
Ancestor: 8c6ea3b255d94e0f2867fea830b1380415e6d47a
Author: rlaager at pidgin.im
Date: 2008-11-27T06:05:42
Branch: im.pidgin.pidgin.next.minor
URL: http://d.pidgin.im/viewmtn/revision/info/1ca0231d066e176a833be6e44e4a933acf14963a

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
        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
Added directories:
        pidgin/pixmaps/emotes/small pidgin/pixmaps/emotes/small/16
        pidgin/pixmaps/emotes/small/16/scalable
Modified files:
        .mtn-ignore ChangeLog.API Makefile.am configure.ac
        doc/funniest_home_convos.txt finch/gntblist.c
        finch/gntconv.c finch/gntlog.c finch/gntrequest.c
        finch/plugins/grouping.c libpurple/Makefile.am
        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/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/msn.c
        libpurple/protocols/msn/session.c
        libpurple/protocols/msn/user.c
        libpurple/protocols/msn/userlist.c
        libpurple/protocols/myspace/myspace.c
        libpurple/protocols/myspace/user.c
        libpurple/protocols/myspace/zap.c
        libpurple/protocols/novell/novell.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/request.c
        libpurple/request.h libpurple/server.c libpurple/sound.c
        libpurple/status.c libpurple/util.c libpurple/xmlnode.c
        libpurple/xmlnode.h pidgin/Makefile.am pidgin/gtkblist.c
        pidgin/gtkblist.h pidgin/gtkcellrendererexpander.c
        pidgin/gtkconv.c pidgin/gtkdialogs.c pidgin/gtklog.c
        pidgin/gtkprefs.c pidgin/gtkrequest.c pidgin/gtksound.c
        pidgin/gtksound.h pidgin/pidginstock.c pidgin/pidginstock.h
        pidgin/pixmaps/Makefile.am
        pidgin/pixmaps/emotes/default/24/Makefile.am
        pidgin/plugins/history.c pidgin/plugins/ticker/ticker.c
        po/POTFILES.in
Modified attrs:
        fix-casts.sh 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

ChangeLog: 

explicit merge of '8c6ea3b255d94e0f2867fea830b1380415e6d47a'
              and '5459c606fe645dac4dddd188eca62eb52a9f7745'
        to branch 'im.pidgin.pidgin.next.minor'

More information about the Commits mailing list