pidgin: ff9ae7b9: merge of '9db6cf3ac465ef3a7aca0eee0f47e0...

nosnilmot at pidgin.im nosnilmot at pidgin.im
Mon Aug 18 12:22:10 EDT 2008


-----------------------------------------------------------------
Revision: ff9ae7b9e0f956913e86b0c58d99cf7e540c23e1
Ancestor: 9db6cf3ac465ef3a7aca0eee0f47e02d3ea7b162
Ancestor: df9bd43dee8443645563807861da728cd7ae6e26
Author: nosnilmot at pidgin.im
Date: 2008-08-18T16:03:19
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/ff9ae7b9e0f956913e86b0c58d99cf7e540c23e1

Modified files:
        ChangeLog ChangeLog.API ChangeLog.win32 NEWS
        libpurple/protocols/oscar/family_oservice.c
        libpurple/protocols/oscar/oscar.c
        libpurple/protocols/oscar/oscar.h libpurple/sslconn.c
        pidgin/gtkconv.c
        pidgin/pixmaps/dialogs/16/scalable/error.svg
        pidgin/pixmaps/dialogs/16/scalable/info.svg
        pidgin/pixmaps/dialogs/16/scalable/mail.svg
        pidgin/pixmaps/dialogs/64/scalable/auth.svg
        pidgin/pixmaps/dialogs/64/scalable/cool.svg
        pidgin/pixmaps/dialogs/64/scalable/dialog.svg
        pidgin/pixmaps/dialogs/64/scalable/error.svg
        pidgin/pixmaps/dialogs/64/scalable/info.svg
        pidgin/pixmaps/dialogs/64/scalable/question.svg
        pidgin/pixmaps/dialogs/64/scalable/warning.svg
        pidgin/pixmaps/emblems/16/scalable/aol-client.svg
        pidgin/pixmaps/emblems/16/scalable/birthday.svg
        pidgin/pixmaps/emblems/16/scalable/blocked.svg
        pidgin/pixmaps/emblems/16/scalable/bot.svg
        pidgin/pixmaps/emblems/16/scalable/external.svg
        pidgin/pixmaps/emblems/16/scalable/female.svg
        pidgin/pixmaps/emblems/16/scalable/free-for-chat.svg
        pidgin/pixmaps/emblems/16/scalable/game.svg
        pidgin/pixmaps/emblems/16/scalable/male.svg
        pidgin/pixmaps/emblems/16/scalable/mobile.svg
        pidgin/pixmaps/emblems/16/scalable/music.svg
        pidgin/pixmaps/emblems/16/scalable/not-authorized.svg
        pidgin/pixmaps/emblems/16/scalable/qq-member.svg
        pidgin/pixmaps/emblems/16/scalable/secure.svg
        pidgin/pixmaps/emblems/16/scalable/unavailable.svg
        pidgin/pixmaps/emblems/16/scalable/video.svg
        pidgin/pixmaps/emblems/16/scalable/voice.svg
        pidgin/pixmaps/emotes/default/24/scalable/act-up.svg
        pidgin/pixmaps/emotes/default/24/scalable/airplane.svg
        pidgin/pixmaps/emotes/default/24/scalable/alien.svg
        pidgin/pixmaps/emotes/default/24/scalable/angel.svg
        pidgin/pixmaps/emotes/default/24/scalable/angry.svg
        pidgin/pixmaps/emotes/default/24/scalable/arrogant.svg
        pidgin/pixmaps/emotes/default/24/scalable/at-wits-end.svg
        pidgin/pixmaps/emotes/default/24/scalable/bad.svg
        pidgin/pixmaps/emotes/default/24/scalable/bashful.svg
        pidgin/pixmaps/emotes/default/24/scalable/beat-up.svg
        pidgin/pixmaps/emotes/default/24/scalable/beauty.svg
        pidgin/pixmaps/emotes/default/24/scalable/beer.svg
        pidgin/pixmaps/emotes/default/24/scalable/blowkiss.svg
        pidgin/pixmaps/emotes/default/24/scalable/bomb.svg
        pidgin/pixmaps/emotes/default/24/scalable/bowl.svg
        pidgin/pixmaps/emotes/default/24/scalable/boy.svg
        pidgin/pixmaps/emotes/default/24/scalable/brb.svg
        pidgin/pixmaps/emotes/default/24/scalable/bulgy-eyes.svg
        pidgin/pixmaps/emotes/default/24/scalable/bye.svg
        pidgin/pixmaps/emotes/default/24/scalable/cake.svg
        pidgin/pixmaps/emotes/default/24/scalable/call-me.svg
        pidgin/pixmaps/emotes/default/24/scalable/camera.svg
        pidgin/pixmaps/emotes/default/24/scalable/can.svg
        pidgin/pixmaps/emotes/default/24/scalable/car.svg
        pidgin/pixmaps/emotes/default/24/scalable/cat.svg
        pidgin/pixmaps/emotes/default/24/scalable/chicken.svg
        pidgin/pixmaps/emotes/default/24/scalable/cigarette.svg
        pidgin/pixmaps/emotes/default/24/scalable/clap.svg
        pidgin/pixmaps/emotes/default/24/scalable/clock.svg
        pidgin/pixmaps/emotes/default/24/scalable/cloudy.svg
        pidgin/pixmaps/emotes/default/24/scalable/clover.svg
        pidgin/pixmaps/emotes/default/24/scalable/clown.svg
        pidgin/pixmaps/emotes/default/24/scalable/coffee.svg
        pidgin/pixmaps/emotes/default/24/scalable/coins.svg
        pidgin/pixmaps/emotes/default/24/scalable/computer.svg
        pidgin/pixmaps/emotes/default/24/scalable/confused.svg
        pidgin/pixmaps/emotes/default/24/scalable/console.svg
        pidgin/pixmaps/emotes/default/24/scalable/cow.svg
        pidgin/pixmaps/emotes/default/24/scalable/cowboy.svg
        pidgin/pixmaps/emotes/default/24/scalable/crying.svg
        pidgin/pixmaps/emotes/default/24/scalable/curl-lip.svg
        pidgin/pixmaps/emotes/default/24/scalable/curse.svg
        pidgin/pixmaps/emotes/default/24/scalable/cute.svg
        pidgin/pixmaps/emotes/default/24/scalable/cyclops.svg
        pidgin/pixmaps/emotes/default/24/scalable/dance.svg
        pidgin/pixmaps/emotes/default/24/scalable/dazed.svg
        pidgin/pixmaps/emotes/default/24/scalable/desire.svg
        pidgin/pixmaps/emotes/default/24/scalable/devil.svg
        pidgin/pixmaps/emotes/default/24/scalable/disappointed.svg
        pidgin/pixmaps/emotes/default/24/scalable/disdain.svg
        pidgin/pixmaps/emotes/default/24/scalable/doctor.svg
        pidgin/pixmaps/emotes/default/24/scalable/dog.svg
        pidgin/pixmaps/emotes/default/24/scalable/doh.svg
        pidgin/pixmaps/emotes/default/24/scalable/dont-know.svg
        pidgin/pixmaps/emotes/default/24/scalable/drink.svg
        pidgin/pixmaps/emotes/default/24/scalable/drool.svg
        pidgin/pixmaps/emotes/default/24/scalable/eat.svg
        pidgin/pixmaps/emotes/default/24/scalable/embarrassed.svg
        pidgin/pixmaps/emotes/default/24/scalable/excruciating.svg
        pidgin/pixmaps/emotes/default/24/scalable/eyeroll.svg
        pidgin/pixmaps/emotes/default/24/scalable/female-fighter.svg
        pidgin/pixmaps/emotes/default/24/scalable/film.svg
        pidgin/pixmaps/emotes/default/24/scalable/fingers-crossed.svg
        pidgin/pixmaps/emotes/default/24/scalable/flag.svg
        pidgin/pixmaps/emotes/default/24/scalable/foot-in-mouth.svg
        pidgin/pixmaps/emotes/default/24/scalable/freaked-out.svg
        pidgin/pixmaps/emotes/default/24/scalable/ghost.svg
        pidgin/pixmaps/emotes/default/24/scalable/giggle.svg
        pidgin/pixmaps/emotes/default/24/scalable/girl.svg
        pidgin/pixmaps/emotes/default/24/scalable/glasses-cool.svg
        pidgin/pixmaps/emotes/default/24/scalable/glasses-nerdy.svg
        pidgin/pixmaps/emotes/default/24/scalable/go-away.svg
        pidgin/pixmaps/emotes/default/24/scalable/goat.svg
        pidgin/pixmaps/emotes/default/24/scalable/good.svg
        pidgin/pixmaps/emotes/default/24/scalable/hammer.svg
        pidgin/pixmaps/emotes/default/24/scalable/handcuffs.svg
        pidgin/pixmaps/emotes/default/24/scalable/handshake.svg
        pidgin/pixmaps/emotes/default/24/scalable/highfive.svg
        pidgin/pixmaps/emotes/default/24/scalable/hug-left.svg
        pidgin/pixmaps/emotes/default/24/scalable/hug-right.svg
        pidgin/pixmaps/emotes/default/24/scalable/hypnotized.svg
        pidgin/pixmaps/emotes/default/24/scalable/in-love.svg
        pidgin/pixmaps/emotes/default/24/scalable/island.svg
        pidgin/pixmaps/emotes/default/24/scalable/jump.svg
        pidgin/pixmaps/emotes/default/24/scalable/kiss.svg
        pidgin/pixmaps/emotes/default/24/scalable/kissed.svg
        pidgin/pixmaps/emotes/default/24/scalable/kissing.svg
        pidgin/pixmaps/emotes/default/24/scalable/knife.svg
        pidgin/pixmaps/emotes/default/24/scalable/lamp.svg
        pidgin/pixmaps/emotes/default/24/scalable/lashes.svg
        pidgin/pixmaps/emotes/default/24/scalable/laugh.svg
        pidgin/pixmaps/emotes/default/24/scalable/liquor.svg
        pidgin/pixmaps/emotes/default/24/scalable/loser.svg
        pidgin/pixmaps/emotes/default/24/scalable/love-over.svg
        pidgin/pixmaps/emotes/default/24/scalable/love.svg
        pidgin/pixmaps/emotes/default/24/scalable/lying.svg
        pidgin/pixmaps/emotes/default/24/scalable/madtongue.svg
        pidgin/pixmaps/emotes/default/24/scalable/mail.svg
        pidgin/pixmaps/emotes/default/24/scalable/male-fighter1.svg
        pidgin/pixmaps/emotes/default/24/scalable/male-fighter2.svg
        pidgin/pixmaps/emotes/default/24/scalable/mean.svg
        pidgin/pixmaps/emotes/default/24/scalable/meeting.svg
        pidgin/pixmaps/emotes/default/24/scalable/messed.svg
        pidgin/pixmaps/emotes/default/24/scalable/mobile.svg
        pidgin/pixmaps/emotes/default/24/scalable/mohawk.svg
        pidgin/pixmaps/emotes/default/24/scalable/moneymouth.svg
        pidgin/pixmaps/emotes/default/24/scalable/monkey.svg
        pidgin/pixmaps/emotes/default/24/scalable/moon.svg
        pidgin/pixmaps/emotes/default/24/scalable/msn-away.svg
        pidgin/pixmaps/emotes/default/24/scalable/msn-busy.svg
        pidgin/pixmaps/emotes/default/24/scalable/msn.svg
        pidgin/pixmaps/emotes/default/24/scalable/msn_online.svg
        pidgin/pixmaps/emotes/default/24/scalable/music.svg
        pidgin/pixmaps/emotes/default/24/scalable/musical-note.svg
        pidgin/pixmaps/emotes/default/24/scalable/nailbiting.svg
        pidgin/pixmaps/emotes/default/24/scalable/neutral.svg
        pidgin/pixmaps/emotes/default/24/scalable/on-the-phone.svg
        pidgin/pixmaps/emotes/default/24/scalable/party.svg
        pidgin/pixmaps/emotes/default/24/scalable/peace.svg
        pidgin/pixmaps/emotes/default/24/scalable/phone.svg
        pidgin/pixmaps/emotes/default/24/scalable/pig.svg
        pidgin/pixmaps/emotes/default/24/scalable/pill.svg
        pidgin/pixmaps/emotes/default/24/scalable/pirate.svg
        pidgin/pixmaps/emotes/default/24/scalable/pissed-off.svg
        pidgin/pixmaps/emotes/default/24/scalable/pizza.svg
        pidgin/pixmaps/emotes/default/24/scalable/plate.svg
        pidgin/pixmaps/emotes/default/24/scalable/poop.svg
        pidgin/pixmaps/emotes/default/24/scalable/pray.svg
        pidgin/pixmaps/emotes/default/24/scalable/present.svg
        pidgin/pixmaps/emotes/default/24/scalable/pumpkin.svg
        pidgin/pixmaps/emotes/default/24/scalable/qq.svg
        pidgin/pixmaps/emotes/default/24/scalable/question.svg
        pidgin/pixmaps/emotes/default/24/scalable/quiet.svg
        pidgin/pixmaps/emotes/default/24/scalable/rain.svg
        pidgin/pixmaps/emotes/default/24/scalable/rainbow.svg
        pidgin/pixmaps/emotes/default/24/scalable/rose-dead.svg
        pidgin/pixmaps/emotes/default/24/scalable/rose.svg
        pidgin/pixmaps/emotes/default/24/scalable/rotfl.svg
        pidgin/pixmaps/emotes/default/24/scalable/sad.svg
        pidgin/pixmaps/emotes/default/24/scalable/sarcastic.svg
        pidgin/pixmaps/emotes/default/24/scalable/search.svg
        pidgin/pixmaps/emotes/default/24/scalable/secret.svg
        pidgin/pixmaps/emotes/default/24/scalable/shame.svg
        pidgin/pixmaps/emotes/default/24/scalable/sheep.svg
        pidgin/pixmaps/emotes/default/24/scalable/shock.svg
        pidgin/pixmaps/emotes/default/24/scalable/shout.svg
        pidgin/pixmaps/emotes/default/24/scalable/shut-mouth.svg
        pidgin/pixmaps/emotes/default/24/scalable/sick.svg
        pidgin/pixmaps/emotes/default/24/scalable/sidefrown.svg
        pidgin/pixmaps/emotes/default/24/scalable/silly.svg
        pidgin/pixmaps/emotes/default/24/scalable/sinister.svg
        pidgin/pixmaps/emotes/default/24/scalable/skeleton.svg
        pidgin/pixmaps/emotes/default/24/scalable/skywalker.svg
        pidgin/pixmaps/emotes/default/24/scalable/sleepy.svg
        pidgin/pixmaps/emotes/default/24/scalable/smile-big.svg
        pidgin/pixmaps/emotes/default/24/scalable/smile.svg
        pidgin/pixmaps/emotes/default/24/scalable/smirk.svg
        pidgin/pixmaps/emotes/default/24/scalable/snail.svg
        pidgin/pixmaps/emotes/default/24/scalable/snicker.svg
        pidgin/pixmaps/emotes/default/24/scalable/snowman.svg
        pidgin/pixmaps/emotes/default/24/scalable/soccerball.svg
        pidgin/pixmaps/emotes/default/24/scalable/soldier.svg
        pidgin/pixmaps/emotes/default/24/scalable/star.svg
        pidgin/pixmaps/emotes/default/24/scalable/starving.svg
        pidgin/pixmaps/emotes/default/24/scalable/stop.svg
        pidgin/pixmaps/emotes/default/24/scalable/struggle.svg
        pidgin/pixmaps/emotes/default/24/scalable/sun.svg
        pidgin/pixmaps/emotes/default/24/scalable/sweat.svg
        pidgin/pixmaps/emotes/default/24/scalable/talktohand.svg
        pidgin/pixmaps/emotes/default/24/scalable/teeth.svg
        pidgin/pixmaps/emotes/default/24/scalable/terror.svg
        pidgin/pixmaps/emotes/default/24/scalable/thinking.svg
        pidgin/pixmaps/emotes/default/24/scalable/thunder.svg
        pidgin/pixmaps/emotes/default/24/scalable/time-out.svg
        pidgin/pixmaps/emotes/default/24/scalable/tongue.svg
        pidgin/pixmaps/emotes/default/24/scalable/tremble.svg
        pidgin/pixmaps/emotes/default/24/scalable/turtle.svg
        pidgin/pixmaps/emotes/default/24/scalable/tv.svg
        pidgin/pixmaps/emotes/default/24/scalable/umbrella.svg
        pidgin/pixmaps/emotes/default/24/scalable/vampire.svg
        pidgin/pixmaps/emotes/default/24/scalable/victory.svg
        pidgin/pixmaps/emotes/default/24/scalable/waiting.svg
        pidgin/pixmaps/emotes/default/24/scalable/watermelon.svg
        pidgin/pixmaps/emotes/default/24/scalable/waving.svg
        pidgin/pixmaps/emotes/default/24/scalable/weep.svg
        pidgin/pixmaps/emotes/default/24/scalable/wilt.svg
        pidgin/pixmaps/emotes/default/24/scalable/wink.svg
        pidgin/pixmaps/emotes/default/24/scalable/worship.svg
        pidgin/pixmaps/emotes/default/24/scalable/yawn.svg
        pidgin/pixmaps/emotes/default/24/scalable/yin-yang.svg
        pidgin/pixmaps/icons/hicolor/16x16/apps/scalable/pidgin.svg
        pidgin/pixmaps/icons/hicolor/24x24/apps/scalable/pidgin.svg
        pidgin/pixmaps/icons/hicolor/32x32/apps/scalable/pidgin.svg
        pidgin/pixmaps/icons/hicolor/48x48/apps/scalable/pidgin.svg
        pidgin/pixmaps/protocols/16/scalable/aim.svg
        pidgin/pixmaps/protocols/16/scalable/bonjour.svg
        pidgin/pixmaps/protocols/16/scalable/gadu-gadu.svg
        pidgin/pixmaps/protocols/16/scalable/icq.svg
        pidgin/pixmaps/protocols/16/scalable/irc.svg
        pidgin/pixmaps/protocols/16/scalable/jabber.svg
        pidgin/pixmaps/protocols/16/scalable/meanwhile.svg
        pidgin/pixmaps/protocols/16/scalable/msn.svg
        pidgin/pixmaps/protocols/16/scalable/novell.svg
        pidgin/pixmaps/protocols/16/scalable/qq.svg
        pidgin/pixmaps/protocols/16/scalable/silc.svg
        pidgin/pixmaps/protocols/16/scalable/simple.svg
        pidgin/pixmaps/protocols/16/scalable/yahoo.svg
        pidgin/pixmaps/protocols/16/scalable/zephyr.svg
        pidgin/pixmaps/protocols/22/scalable/aim.svg
        pidgin/pixmaps/protocols/22/scalable/bonjour.svg
        pidgin/pixmaps/protocols/22/scalable/gadu-gadu.svg
        pidgin/pixmaps/protocols/22/scalable/icq.svg
        pidgin/pixmaps/protocols/22/scalable/irc.svg
        pidgin/pixmaps/protocols/22/scalable/jabber.svg
        pidgin/pixmaps/protocols/22/scalable/meanwhile.svg
        pidgin/pixmaps/protocols/22/scalable/msn.svg
        pidgin/pixmaps/protocols/22/scalable/myspace.svg
        pidgin/pixmaps/protocols/22/scalable/novell.svg
        pidgin/pixmaps/protocols/22/scalable/qq.svg
        pidgin/pixmaps/protocols/22/scalable/silc.svg
        pidgin/pixmaps/protocols/22/scalable/simple.svg
        pidgin/pixmaps/protocols/22/scalable/yahoo.svg
        pidgin/pixmaps/protocols/22/scalable/zephyr.svg
        pidgin/pixmaps/protocols/48/scalable/aim.svg
        pidgin/pixmaps/protocols/48/scalable/bonjour.svg
        pidgin/pixmaps/protocols/48/scalable/gadu-gadu.svg
        pidgin/pixmaps/protocols/48/scalable/google-talk.svg
        pidgin/pixmaps/protocols/48/scalable/icq.svg
        pidgin/pixmaps/protocols/48/scalable/irc.svg
        pidgin/pixmaps/protocols/48/scalable/jabber.svg
        pidgin/pixmaps/protocols/48/scalable/meanwhile.svg
        pidgin/pixmaps/protocols/48/scalable/msn.svg
        pidgin/pixmaps/protocols/48/scalable/novell.svg
        pidgin/pixmaps/protocols/48/scalable/qq.svg
        pidgin/pixmaps/protocols/48/scalable/silc.svg
        pidgin/pixmaps/protocols/48/scalable/simple.svg
        pidgin/pixmaps/protocols/48/scalable/yahoo.svg
        pidgin/pixmaps/protocols/48/scalable/zephyr.svg
        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/extended-away.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/extended-away.svg
        pidgin/pixmaps/status/16/scalable/invisible.svg
        pidgin/pixmaps/status/16/scalable/message-pending.svg
        pidgin/pixmaps/status/16/scalable/person.svg
        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/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/tray-away.svg
        pidgin/pixmaps/tray/22/scalable/tray-busy.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

ChangeLog: 

merge of '9db6cf3ac465ef3a7aca0eee0f47e02d3ea7b162'
     and 'df9bd43dee8443645563807861da728cd7ae6e26'



More information about the Commits mailing list