Mercurial > pidgin
changeset 15472:4222b5790e0b
merge of 'c2ca8d77fad6142251001c2545c83a2f56eb3660'
and 'df9e73e952c29bcf2bf3d2f7c6e1f89e622fc8dc'
| author | Nathan Walp <nwalp@pidgin.im> |
|---|---|
| date | Wed, 31 Jan 2007 04:53:52 +0000 |
| parents | 8fc14c228ca8 (current diff) ce0cd7474b64 (diff) |
| children | 7c20c9ab7985 |
| files | pidgin/pixmaps/emotes/default/scalable/Makefile.am pidgin/pixmaps/emotes/default/scalable/Makefile.mingw pidgin/pixmaps/emotes/default/scalable/act-up.svg pidgin/pixmaps/emotes/default/scalable/airplane.svg pidgin/pixmaps/emotes/default/scalable/alien.svg pidgin/pixmaps/emotes/default/scalable/angel.svg pidgin/pixmaps/emotes/default/scalable/angry.svg pidgin/pixmaps/emotes/default/scalable/arrogant.svg pidgin/pixmaps/emotes/default/scalable/bad.svg pidgin/pixmaps/emotes/default/scalable/bashful.svg pidgin/pixmaps/emotes/default/scalable/beat-up.svg pidgin/pixmaps/emotes/default/scalable/beauty.svg pidgin/pixmaps/emotes/default/scalable/beer.svg pidgin/pixmaps/emotes/default/scalable/blowkiss.svg pidgin/pixmaps/emotes/default/scalable/bomb.svg pidgin/pixmaps/emotes/default/scalable/bowl.svg pidgin/pixmaps/emotes/default/scalable/boy.svg pidgin/pixmaps/emotes/default/scalable/brb.svg pidgin/pixmaps/emotes/default/scalable/bye.svg pidgin/pixmaps/emotes/default/scalable/cake.svg pidgin/pixmaps/emotes/default/scalable/camera.svg pidgin/pixmaps/emotes/default/scalable/can.svg pidgin/pixmaps/emotes/default/scalable/car.svg pidgin/pixmaps/emotes/default/scalable/cat.svg pidgin/pixmaps/emotes/default/scalable/chicken.svg pidgin/pixmaps/emotes/default/scalable/clap.svg pidgin/pixmaps/emotes/default/scalable/clock.svg pidgin/pixmaps/emotes/default/scalable/cloudy.svg pidgin/pixmaps/emotes/default/scalable/clover.svg pidgin/pixmaps/emotes/default/scalable/clown.svg pidgin/pixmaps/emotes/default/scalable/coffee.svg pidgin/pixmaps/emotes/default/scalable/coins.svg pidgin/pixmaps/emotes/default/scalable/computer.svg pidgin/pixmaps/emotes/default/scalable/confused.svg pidgin/pixmaps/emotes/default/scalable/console.svg pidgin/pixmaps/emotes/default/scalable/cow.svg pidgin/pixmaps/emotes/default/scalable/crying.svg pidgin/pixmaps/emotes/default/scalable/curl-lip.svg pidgin/pixmaps/emotes/default/scalable/curse.svg pidgin/pixmaps/emotes/default/scalable/cute.svg pidgin/pixmaps/emotes/default/scalable/dance.svg pidgin/pixmaps/emotes/default/scalable/dazed.svg pidgin/pixmaps/emotes/default/scalable/desire.svg pidgin/pixmaps/emotes/default/scalable/devil.svg pidgin/pixmaps/emotes/default/scalable/disapointed.svg pidgin/pixmaps/emotes/default/scalable/disdain.svg pidgin/pixmaps/emotes/default/scalable/doctor.svg pidgin/pixmaps/emotes/default/scalable/dog.svg pidgin/pixmaps/emotes/default/scalable/doh.svg pidgin/pixmaps/emotes/default/scalable/dont-know.svg pidgin/pixmaps/emotes/default/scalable/drink.svg pidgin/pixmaps/emotes/default/scalable/drool.svg pidgin/pixmaps/emotes/default/scalable/eat.svg pidgin/pixmaps/emotes/default/scalable/embarrassed.svg pidgin/pixmaps/emotes/default/scalable/excruciating.svg pidgin/pixmaps/emotes/default/scalable/eyeroll.svg pidgin/pixmaps/emotes/default/scalable/film.svg pidgin/pixmaps/emotes/default/scalable/fingers-crossed.svg pidgin/pixmaps/emotes/default/scalable/flag.svg pidgin/pixmaps/emotes/default/scalable/foot-in-mouth.svg pidgin/pixmaps/emotes/default/scalable/freaked-out.svg pidgin/pixmaps/emotes/default/scalable/ghost.svg pidgin/pixmaps/emotes/default/scalable/girl.svg pidgin/pixmaps/emotes/default/scalable/glasses-cool.svg pidgin/pixmaps/emotes/default/scalable/glasses-nerdy.svg pidgin/pixmaps/emotes/default/scalable/go-away.svg pidgin/pixmaps/emotes/default/scalable/good.svg pidgin/pixmaps/emotes/default/scalable/hammer.svg pidgin/pixmaps/emotes/default/scalable/handcuffs.svg pidgin/pixmaps/emotes/default/scalable/handshake.svg pidgin/pixmaps/emotes/default/scalable/highfive.svg pidgin/pixmaps/emotes/default/scalable/hug-left.svg pidgin/pixmaps/emotes/default/scalable/hug-right.svg pidgin/pixmaps/emotes/default/scalable/hypnotized.svg pidgin/pixmaps/emotes/default/scalable/in-love.svg pidgin/pixmaps/emotes/default/scalable/island.svg pidgin/pixmaps/emotes/default/scalable/jump.svg pidgin/pixmaps/emotes/default/scalable/knife.svg pidgin/pixmaps/emotes/default/scalable/lamp.svg pidgin/pixmaps/emotes/default/scalable/lashes.svg pidgin/pixmaps/emotes/default/scalable/laugh.svg pidgin/pixmaps/emotes/default/scalable/liquor.svg pidgin/pixmaps/emotes/default/scalable/love-over.svg pidgin/pixmaps/emotes/default/scalable/love.svg pidgin/pixmaps/emotes/default/scalable/lying.svg pidgin/pixmaps/emotes/default/scalable/mail.svg pidgin/pixmaps/emotes/default/scalable/mean.svg pidgin/pixmaps/emotes/default/scalable/meeting.svg pidgin/pixmaps/emotes/default/scalable/mobile.svg pidgin/pixmaps/emotes/default/scalable/moneymouth.svg pidgin/pixmaps/emotes/default/scalable/monkey.svg pidgin/pixmaps/emotes/default/scalable/moon.svg pidgin/pixmaps/emotes/default/scalable/msn-away.svg pidgin/pixmaps/emotes/default/scalable/msn-busy.svg pidgin/pixmaps/emotes/default/scalable/msn.svg pidgin/pixmaps/emotes/default/scalable/msn_online.svg pidgin/pixmaps/emotes/default/scalable/musical-note.svg pidgin/pixmaps/emotes/default/scalable/neutral.svg pidgin/pixmaps/emotes/default/scalable/party.svg pidgin/pixmaps/emotes/default/scalable/peace.svg pidgin/pixmaps/emotes/default/scalable/phone.svg pidgin/pixmaps/emotes/default/scalable/pig.svg pidgin/pixmaps/emotes/default/scalable/pill.svg pidgin/pixmaps/emotes/default/scalable/pissed-off.svg pidgin/pixmaps/emotes/default/scalable/pizza.svg pidgin/pixmaps/emotes/default/scalable/plate.svg pidgin/pixmaps/emotes/default/scalable/poop.svg pidgin/pixmaps/emotes/default/scalable/pray.svg pidgin/pixmaps/emotes/default/scalable/present.svg pidgin/pixmaps/emotes/default/scalable/question.svg pidgin/pixmaps/emotes/default/scalable/quiet.svg pidgin/pixmaps/emotes/default/scalable/rain.svg pidgin/pixmaps/emotes/default/scalable/rainbow.svg pidgin/pixmaps/emotes/default/scalable/rose-dead.svg pidgin/pixmaps/emotes/default/scalable/rose.svg pidgin/pixmaps/emotes/default/scalable/sad.svg pidgin/pixmaps/emotes/default/scalable/sarcastic.svg pidgin/pixmaps/emotes/default/scalable/search.svg pidgin/pixmaps/emotes/default/scalable/secret.svg pidgin/pixmaps/emotes/default/scalable/shame.svg pidgin/pixmaps/emotes/default/scalable/sheep.svg pidgin/pixmaps/emotes/default/scalable/shock.svg pidgin/pixmaps/emotes/default/scalable/shut-mouth.svg pidgin/pixmaps/emotes/default/scalable/sick.svg pidgin/pixmaps/emotes/default/scalable/sigarette.svg pidgin/pixmaps/emotes/default/scalable/silly.svg pidgin/pixmaps/emotes/default/scalable/skeleton.svg pidgin/pixmaps/emotes/default/scalable/sleepy.svg pidgin/pixmaps/emotes/default/scalable/smile-big.svg pidgin/pixmaps/emotes/default/scalable/smile.svg pidgin/pixmaps/emotes/default/scalable/smirk.svg pidgin/pixmaps/emotes/default/scalable/snail.svg pidgin/pixmaps/emotes/default/scalable/snicker.svg pidgin/pixmaps/emotes/default/scalable/snowman.svg pidgin/pixmaps/emotes/default/scalable/soccerball.svg pidgin/pixmaps/emotes/default/scalable/soldier.svg pidgin/pixmaps/emotes/default/scalable/star.svg pidgin/pixmaps/emotes/default/scalable/starving.svg pidgin/pixmaps/emotes/default/scalable/struggle.svg pidgin/pixmaps/emotes/default/scalable/sun.svg pidgin/pixmaps/emotes/default/scalable/sweat.svg pidgin/pixmaps/emotes/default/scalable/teeth.svg pidgin/pixmaps/emotes/default/scalable/terror.svg pidgin/pixmaps/emotes/default/scalable/thinking.svg pidgin/pixmaps/emotes/default/scalable/thunder.svg pidgin/pixmaps/emotes/default/scalable/tongue.svg pidgin/pixmaps/emotes/default/scalable/tremble.svg pidgin/pixmaps/emotes/default/scalable/turtle.svg pidgin/pixmaps/emotes/default/scalable/tv.svg pidgin/pixmaps/emotes/default/scalable/umbrella.svg pidgin/pixmaps/emotes/default/scalable/vampire.svg pidgin/pixmaps/emotes/default/scalable/victory.svg pidgin/pixmaps/emotes/default/scalable/watermelon.svg pidgin/pixmaps/emotes/default/scalable/weep.svg pidgin/pixmaps/emotes/default/scalable/wilt.svg pidgin/pixmaps/emotes/default/scalable/wink.svg pidgin/pixmaps/emotes/default/scalable/yawn.svg pidgin/pixmaps/emotes/default/scalable/yin-yang.svg pidgin/pixmaps/gaim_auth.png pidgin/pixmaps/gaim_cool.png pidgin/pixmaps/gaim_error.png pidgin/pixmaps/gaim_info.png pidgin/pixmaps/gaim_question.png pidgin/pixmaps/gaim_warning.png pidgin/pixmaps/status/22/scalable/busy22.svg pidgin/pixmaps/status/22/scalable/offline22.svg |
| diffstat | 1 files changed, 5 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/pidgin/plugins/convcolors.c Wed Jan 31 04:53:48 2007 +0000 +++ b/pidgin/plugins/convcolors.c Wed Jan 31 04:53:52 2007 +0000 @@ -124,6 +124,11 @@ t = *displaying; *displaying = gaim_markup_strip_html(t); g_free(t); + + t = *displaying; + *displaying = g_markup_escape_text(t, -1); + g_free(t); + /* Restore the links */ t = *displaying; *displaying = gaim_markup_linkify(t);