# HG changeset patch # User Christian Hammond # Date 1062903341 0 # Node ID 4a88120d18d638860e7a0e19988931687da2b138 # Parent d6b8bf263903dd52c7b8f409fb17acb41428cab5 [gaim-migrate @ 7306] Added MSN 6 smileys, and cleaned up the Makefile.am a bit. committer: Tailor Script diff -r d6b8bf263903 -r 4a88120d18d6 ChangeLog --- a/ChangeLog Sun Sep 07 02:14:54 2003 +0000 +++ b/ChangeLog Sun Sep 07 02:55:41 2003 +0000 @@ -3,6 +3,7 @@ version 0.69 * Contact (aka Person, aka Meta-Contact, aka Buddy Merging, etc) Support * Updated MSN support to the MSN Protocol version 9. + * Added MSN 6 smileys. * Jabber now supports SSL * Yahoo now shows people using the java chat client (Tim Ringenbach) * Yahoo chat and conference (Tim Rigenbach) diff -r d6b8bf263903 -r 4a88120d18d6 pixmaps/smileys/default/Makefile.am --- a/pixmaps/smileys/default/Makefile.am Sun Sep 07 02:14:54 2003 +0000 +++ b/pixmaps/smileys/default/Makefile.am Sun Sep 07 02:55:41 2003 +0000 @@ -1,268 +1,169 @@ -EXTRA_DIST = angel.png \ - bigsmile.png \ - burp.png \ - cool.png \ - crazy.png \ - crossedlips.png \ - cry.png \ - download.png \ - embarrassed.png \ - farted.png \ - kiss.png \ - luke.png \ - moneymouth.png \ - mrt.png \ - msn_angel.png \ - msn_angry.png \ - msn_away.png \ - msn_bat.png \ - msn_beer.png \ - msn_boy.png \ - msn_brheart.png \ - msn_cake.png \ - msn_cat.png \ - msn_clock.png \ - msn_coffee.png \ - msn_cry.png \ - msn_deadflower.png \ - msn_devil.png \ - msn_dog.png \ - msn_drink.png \ - msn_email.png \ - msn_embarrassed.png \ - msn_film.png \ - msn_flower.png \ - msn_gift.png \ - msn_girl.png \ - msn_handcuffs.png \ - msn_heart.png \ - msn_hot.png \ - msn_icon.png \ - msn_idea.png \ - msn_kiss.png \ - msn_laugh.png \ - msn_neutral.png \ - msn_note.png \ - msn_occ.png \ - msn_online.png \ - msn_ooooh.png \ - msn_phone.png \ - msn_photo.png \ - msn_question.png \ - msn_rainbow.png \ - msn_run.png \ - msn_runback.png \ - msn_sad.png \ - msn_sleep.png \ - msn_smiley.png \ - msn_star.png \ - msn_sun.png \ - msn_thumbdown.png \ - msn_thumbup.png \ - msn_tongue.png \ - msn_weird.png \ - msn_wink.png \ - oneeye.png \ - sad.png \ - scream.png \ - smile.png \ - theme \ - think.png \ - tongue.png \ - wink.png \ - yahoo_alien.gif \ - yahoo_alien2.gif \ - yahoo_angel.gif \ - yahoo_angry.gif \ - yahoo_batting.gif \ - yahoo_beatup.gif \ - yahoo_bigsmile.gif \ - yahoo_blush.gif \ - yahoo_bye.gif \ - yahoo_chicken.gif \ - yahoo_clap.gif \ - yahoo_clown.gif \ - yahoo_coffee.gif \ - yahoo_cow.gif \ - yahoo_cowboy.gif \ - yahoo_cry.gif \ - yahoo_dance.gif \ - yahoo_devil.gif \ - yahoo_doh.gif \ - yahoo_drool.gif \ - yahoo_eyebrow.gif \ - yahoo_eyeroll.gif \ - yahoo_flag.gif \ - yahoo_flower.gif \ - yahoo_frustrated.gif \ - yahoo_ghost.gif \ - yahoo_glasses.gif \ - yahoo_huggs.gif \ - yahoo_hypnotized.gif \ - yahoo_idea.gif \ - yahoo_kiss.gif \ - yahoo_laughloud.gif \ - yahoo_liar.gif \ - yahoo_love.gif \ - yahoo_mean.gif \ - yahoo_moneyeyes.gif \ - yahoo_monkey.gif \ - yahoo_neutral.gif \ - yahoo_ooooh.gif \ - yahoo_peace.gif \ - yahoo_pig.gif \ - yahoo_pray.gif \ - yahoo_pumpkin.gif \ - yahoo_question.gif \ - yahoo_sad.gif \ - yahoo_shame.gif \ - yahoo_shamrock.gif \ - yahoo_shhhh.gif \ - yahoo_sick.gif \ - yahoo_silent.gif \ - yahoo_silly.gif \ - yahoo_sleep.gif \ - yahoo_smiley.gif \ - yahoo_sunglas.gif \ - yahoo_think.gif \ - yahoo_tired.gif \ - yahoo_tongue.gif \ - yahoo_whistling.gif \ - yahoo_wink.gif \ - yahoo_worried.gif \ - yell.png +AIM_SMILEYS = \ + angel.png \ + bigsmile.png \ + burp.png \ + cool.png \ + crazy.png \ + crossedlips.png \ + cry.png \ + download.png \ + embarrassed.png \ + farted.png \ + kiss.png \ + luke.png \ + moneymouth.png \ + mrt.png \ + oneeye.png \ + sad.png \ + scream.png \ + smile.png \ + theme \ + think.png \ + tongue.png \ + wink.png \ + yell.png + +MSN_SMILEYS = \ + msn_angel.png \ + msn_angry.png \ + msn_away.png \ + msn_bat.png \ + msn_beer.png \ + msn_boy.png \ + msn_brheart.png \ + msn_cake.png \ + msn_car.png \ + msn_cat.png \ + msn_cellphone.png \ + msn_clock.png \ + msn_coffee.png \ + msn_coins.png \ + msn_computer.png \ + msn_cry.png \ + msn_deadflower.png \ + msn_devil.png \ + msn_dog.png \ + msn_donttell.png \ + msn_drink.png \ + msn_email.png \ + msn_embarrassed.png \ + msn_eyeroll.png \ + msn_film.png \ + msn_flower.png \ + msn_gift.png \ + msn_girl.png \ + msn_handcuffs.png \ + msn_heart.png \ + msn_hot.png \ + msn_icon.png \ + msn_idea.png \ + msn_island.png \ + msn_kiss.png \ + msn_laugh.png \ + msn_nerd.png \ + msn_neutral.png \ + msn_note.png \ + msn_occ.png \ + msn_online.png \ + msn_ooooh.png \ + msn_party.png \ + msn_phone.png \ + msn_photo.png \ + msn_pizza.png \ + msn_plane.png \ + msn_question.png \ + msn_rainbow.png \ + msn_run.png \ + msn_runback.png \ + msn_sad.png \ + msn_sarcastic.png \ + msn_secret.png \ + msn_sheep.png \ + msn_sick.png \ + msn_sleep.png \ + msn_sleepy.png \ + msn_smiley.png \ + msn_snail.png \ + msn_soccer.png \ + msn_star.png \ + msn_sun.png \ + msn_sunglasses.png \ + msn_teeth.png \ + msn_think.png \ + msn_thumbdown.png \ + msn_thumbup.png \ + msn_tongue.png \ + msn_umbrella.png \ + msn_weird.png \ + msn_wink.png + +YAHOO_SMILEYS = \ + yahoo_alien.gif \ + yahoo_alien2.gif \ + yahoo_angel.gif \ + yahoo_angry.gif \ + yahoo_batting.gif \ + yahoo_beatup.gif \ + yahoo_bigsmile.gif \ + yahoo_blush.gif \ + yahoo_bye.gif \ + yahoo_chicken.gif \ + yahoo_clap.gif \ + yahoo_clown.gif \ + yahoo_coffee.gif \ + yahoo_cow.gif \ + yahoo_cowboy.gif \ + yahoo_cry.gif \ + yahoo_dance.gif \ + yahoo_devil.gif \ + yahoo_doh.gif \ + yahoo_drool.gif \ + yahoo_eyebrow.gif \ + yahoo_eyeroll.gif \ + yahoo_flag.gif \ + yahoo_flower.gif \ + yahoo_frustrated.gif \ + yahoo_ghost.gif \ + yahoo_glasses.gif \ + yahoo_huggs.gif \ + yahoo_hypnotized.gif \ + yahoo_idea.gif \ + yahoo_kiss.gif \ + yahoo_laughloud.gif \ + yahoo_liar.gif \ + yahoo_love.gif \ + yahoo_mean.gif \ + yahoo_moneyeyes.gif \ + yahoo_monkey.gif \ + yahoo_neutral.gif \ + yahoo_ooooh.gif \ + yahoo_peace.gif \ + yahoo_pig.gif \ + yahoo_pray.gif \ + yahoo_pumpkin.gif \ + yahoo_question.gif \ + yahoo_sad.gif \ + yahoo_shame.gif \ + yahoo_shamrock.gif \ + yahoo_shhhh.gif \ + yahoo_sick.gif \ + yahoo_silent.gif \ + yahoo_silly.gif \ + yahoo_sleep.gif \ + yahoo_smiley.gif \ + yahoo_sunglas.gif \ + yahoo_think.gif \ + yahoo_tired.gif \ + yahoo_tongue.gif \ + yahoo_whistling.gif \ + yahoo_wink.gif \ + yahoo_worried.gif gaimsmileypixdir = $(datadir)/pixmaps/gaim/smileys/default -gaimsmileypix_DATA = angel.png \ - bigsmile.png \ - burp.png \ - cool.png \ - crazy.png \ - crossedlips.png \ - cry.png \ - download.png \ - embarrassed.png \ - farted.png \ - kiss.png \ - luke.png \ - moneymouth.png \ - mrt.png \ - msn_angel.png \ - msn_angry.png \ - msn_away.png \ - msn_bat.png \ - msn_beer.png \ - msn_boy.png \ - msn_brheart.png \ - msn_cake.png \ - msn_cat.png \ - msn_clock.png \ - msn_coffee.png \ - msn_cry.png \ - msn_deadflower.png \ - msn_devil.png \ - msn_dog.png \ - msn_drink.png \ - msn_email.png \ - msn_embarrassed.png \ - msn_film.png \ - msn_flower.png \ - msn_gift.png \ - msn_girl.png \ - msn_handcuffs.png \ - msn_heart.png \ - msn_hot.png \ - msn_icon.png \ - msn_idea.png \ - msn_kiss.png \ - msn_laugh.png \ - msn_neutral.png \ - msn_note.png \ - msn_occ.png \ - msn_online.png \ - msn_ooooh.png \ - msn_phone.png \ - msn_photo.png \ - msn_question.png \ - msn_rainbow.png \ - msn_run.png \ - msn_runback.png \ - msn_sad.png \ - msn_sleep.png \ - msn_smiley.png \ - msn_star.png \ - msn_sun.png \ - msn_thumbdown.png \ - msn_thumbup.png \ - msn_tongue.png \ - msn_weird.png \ - msn_wink.png \ - oneeye.png \ - sad.png \ - scream.png \ - smile.png \ - theme \ - think.png \ - tongue.png \ - wink.png \ - yahoo_alien.gif \ - yahoo_alien2.gif \ - yahoo_angel.gif \ - yahoo_angry.gif \ - yahoo_batting.gif \ - yahoo_beatup.gif \ - yahoo_bigsmile.gif \ - yahoo_blush.gif \ - yahoo_bye.gif \ - yahoo_chicken.gif \ - yahoo_clap.gif \ - yahoo_clown.gif \ - yahoo_coffee.gif \ - yahoo_cow.gif \ - yahoo_cowboy.gif \ - yahoo_cry.gif \ - yahoo_dance.gif \ - yahoo_devil.gif \ - yahoo_doh.gif \ - yahoo_drool.gif \ - yahoo_eyebrow.gif \ - yahoo_eyeroll.gif \ - yahoo_flag.gif \ - yahoo_flower.gif \ - yahoo_frustrated.gif \ - yahoo_ghost.gif \ - yahoo_glasses.gif \ - yahoo_huggs.gif \ - yahoo_hypnotized.gif \ - yahoo_idea.gif \ - yahoo_kiss.gif \ - yahoo_laughloud.gif \ - yahoo_liar.gif \ - yahoo_love.gif \ - yahoo_mean.gif \ - yahoo_moneyeyes.gif \ - yahoo_monkey.gif \ - yahoo_neutral.gif \ - yahoo_ooooh.gif \ - yahoo_peace.gif \ - yahoo_pig.gif \ - yahoo_pray.gif \ - yahoo_pumpkin.gif \ - yahoo_question.gif \ - yahoo_sad.gif \ - yahoo_shame.gif \ - yahoo_shamrock.gif \ - yahoo_shhhh.gif \ - yahoo_sick.gif \ - yahoo_silent.gif \ - yahoo_silly.gif \ - yahoo_sleep.gif \ - yahoo_smiley.gif \ - yahoo_sunglas.gif \ - yahoo_think.gif \ - yahoo_tired.gif \ - yahoo_tongue.gif \ - yahoo_whistling.gif \ - yahoo_wink.gif \ - yahoo_worried.gif \ - yell.png +gaimsmileypix_DATA = \ + $(AIM_SMILEYS) \ + $(MSN_SMILEYS) \ + $(YAHOO_SMILEYS) \ + theme + +EXTRA_DIST = $(gaimsmileypix_DATA) diff -r d6b8bf263903 -r 4a88120d18d6 pixmaps/smileys/default/msn_brheart.png Binary file pixmaps/smileys/default/msn_brheart.png has changed diff -r d6b8bf263903 -r 4a88120d18d6 pixmaps/smileys/default/msn_car.png Binary file pixmaps/smileys/default/msn_car.png has changed diff -r d6b8bf263903 -r 4a88120d18d6 pixmaps/smileys/default/msn_cat.png Binary file pixmaps/smileys/default/msn_cat.png has changed diff -r d6b8bf263903 -r 4a88120d18d6 pixmaps/smileys/default/msn_cellphone.png Binary file pixmaps/smileys/default/msn_cellphone.png has changed diff -r d6b8bf263903 -r 4a88120d18d6 pixmaps/smileys/default/msn_coins.png Binary file pixmaps/smileys/default/msn_coins.png has changed diff -r d6b8bf263903 -r 4a88120d18d6 pixmaps/smileys/default/msn_computer.png Binary file pixmaps/smileys/default/msn_computer.png has changed diff -r d6b8bf263903 -r 4a88120d18d6 pixmaps/smileys/default/msn_cry.png Binary file pixmaps/smileys/default/msn_cry.png has changed diff -r d6b8bf263903 -r 4a88120d18d6 pixmaps/smileys/default/msn_deadflower.png Binary file pixmaps/smileys/default/msn_deadflower.png has changed diff -r d6b8bf263903 -r 4a88120d18d6 pixmaps/smileys/default/msn_dog.png Binary file pixmaps/smileys/default/msn_dog.png has changed diff -r d6b8bf263903 -r 4a88120d18d6 pixmaps/smileys/default/msn_donttell.png Binary file pixmaps/smileys/default/msn_donttell.png has changed diff -r d6b8bf263903 -r 4a88120d18d6 pixmaps/smileys/default/msn_email.png Binary file pixmaps/smileys/default/msn_email.png has changed diff -r d6b8bf263903 -r 4a88120d18d6 pixmaps/smileys/default/msn_eyeroll.png Binary file pixmaps/smileys/default/msn_eyeroll.png has changed diff -r d6b8bf263903 -r 4a88120d18d6 pixmaps/smileys/default/msn_gift.png Binary file pixmaps/smileys/default/msn_gift.png has changed diff -r d6b8bf263903 -r 4a88120d18d6 pixmaps/smileys/default/msn_heart.png Binary file pixmaps/smileys/default/msn_heart.png has changed diff -r d6b8bf263903 -r 4a88120d18d6 pixmaps/smileys/default/msn_icon.png Binary file pixmaps/smileys/default/msn_icon.png has changed diff -r d6b8bf263903 -r 4a88120d18d6 pixmaps/smileys/default/msn_idea.png Binary file pixmaps/smileys/default/msn_idea.png has changed diff -r d6b8bf263903 -r 4a88120d18d6 pixmaps/smileys/default/msn_island.png Binary file pixmaps/smileys/default/msn_island.png has changed diff -r d6b8bf263903 -r 4a88120d18d6 pixmaps/smileys/default/msn_kiss.png Binary file pixmaps/smileys/default/msn_kiss.png has changed diff -r d6b8bf263903 -r 4a88120d18d6 pixmaps/smileys/default/msn_nerd.png Binary file pixmaps/smileys/default/msn_nerd.png has changed diff -r d6b8bf263903 -r 4a88120d18d6 pixmaps/smileys/default/msn_party.png Binary file pixmaps/smileys/default/msn_party.png has changed diff -r d6b8bf263903 -r 4a88120d18d6 pixmaps/smileys/default/msn_pizza.png Binary file pixmaps/smileys/default/msn_pizza.png has changed diff -r d6b8bf263903 -r 4a88120d18d6 pixmaps/smileys/default/msn_plane.png Binary file pixmaps/smileys/default/msn_plane.png has changed diff -r d6b8bf263903 -r 4a88120d18d6 pixmaps/smileys/default/msn_rainbow.png Binary file pixmaps/smileys/default/msn_rainbow.png has changed diff -r d6b8bf263903 -r 4a88120d18d6 pixmaps/smileys/default/msn_sarcastic.png Binary file pixmaps/smileys/default/msn_sarcastic.png has changed diff -r d6b8bf263903 -r 4a88120d18d6 pixmaps/smileys/default/msn_secret.png Binary file pixmaps/smileys/default/msn_secret.png has changed diff -r d6b8bf263903 -r 4a88120d18d6 pixmaps/smileys/default/msn_sheep.png Binary file pixmaps/smileys/default/msn_sheep.png has changed diff -r d6b8bf263903 -r 4a88120d18d6 pixmaps/smileys/default/msn_sick.png Binary file pixmaps/smileys/default/msn_sick.png has changed diff -r d6b8bf263903 -r 4a88120d18d6 pixmaps/smileys/default/msn_sleep.png Binary file pixmaps/smileys/default/msn_sleep.png has changed diff -r d6b8bf263903 -r 4a88120d18d6 pixmaps/smileys/default/msn_sleepy.png Binary file pixmaps/smileys/default/msn_sleepy.png has changed diff -r d6b8bf263903 -r 4a88120d18d6 pixmaps/smileys/default/msn_snail.png Binary file pixmaps/smileys/default/msn_snail.png has changed diff -r d6b8bf263903 -r 4a88120d18d6 pixmaps/smileys/default/msn_soccer.png Binary file pixmaps/smileys/default/msn_soccer.png has changed diff -r d6b8bf263903 -r 4a88120d18d6 pixmaps/smileys/default/msn_sunglasses.png Binary file pixmaps/smileys/default/msn_sunglasses.png has changed diff -r d6b8bf263903 -r 4a88120d18d6 pixmaps/smileys/default/msn_teeth.png Binary file pixmaps/smileys/default/msn_teeth.png has changed diff -r d6b8bf263903 -r 4a88120d18d6 pixmaps/smileys/default/msn_think.png Binary file pixmaps/smileys/default/msn_think.png has changed diff -r d6b8bf263903 -r 4a88120d18d6 pixmaps/smileys/default/msn_umbrella.png Binary file pixmaps/smileys/default/msn_umbrella.png has changed diff -r d6b8bf263903 -r 4a88120d18d6 pixmaps/smileys/default/theme --- a/pixmaps/smileys/default/theme Sun Sep 07 02:14:54 2003 +0000 +++ b/pixmaps/smileys/default/theme Sun Sep 07 02:55:41 2003 +0000 @@ -34,16 +34,23 @@ msn_beer.png (B) (b) msn_boy.png (Z) (z) msn_brheart.png (U) (u) +msn_cake.png (^) +msn_car.png (car) msn_cat.png (@) -msn_cake.png (^) +msn_cellphone.png (mp) msn_clock.png (o) (O) msn_coffee.png (C) (c) +msn_coins.png (mo) +msn_computer.png (co) msn_cry.png :'( :`( msn_deadflower.png (W) (w) msn_devil.png (6) msn_dog.png (&) +msn_donttell.png :-# msn_drink.png (D) (d) msn_email.png (e) (E) +msn_embarrassed.png :$ :-$ +msn_eyeroll.png 8-) msn_film.png (~) msn_flower.png (F) (f) msn_gift.png (g) (G) @@ -53,28 +60,42 @@ msn_hot.png (H) (h) msn_icon.png (M) (m) msn_idea.png (I) (i) +msn_island.png (ip) msn_kiss.png (K) (k) msn_laugh.png :-D :-d :d :D :-> :> +msn_nerd.png 8-| msn_neutral.png :-| :| msn_note.png (8) msn_ooooh.png :-O :O :-o :o +msn_party.png <:o) <:O) msn_phone.png (T) (t) msn_photo.png (P) (p) +msn_pizza.png (pi) +msn_plane.png (ap) msn_question.png (?) msn_rainbow.png (r) (R) msn_run.png ({) msn_runback.png (}) msn_sad.png :-( :( :-< +msn_sarcastic.png ^o) ^O) +msn_secret.png :-* +msn_sheep.png (bah) +msn_sick.png +o( +O( msn_sleep.png (S) (s) +msn_sleepy.png |-) msn_smiley.png :-) :) +msn_snail.png (sn) +msn_soccer.png (so) msn_star.png (*) msn_sun.png (#) +msn_teeth.png 8o|8O| +msn_think.png *-) msn_thumbdown.png (N) (n) msn_thumbup.png (Y) (y) msn_tongue.png :-P :P :-p :p +msn_umbrella.png (um) msn_weird.png :-S :-s :s :S msn_wink.png ;) ;-) :S- -msn_embarrassed.png :$ :-$ [Yahoo] yahoo_angel.gif o:) o:-) O:-) O:) 0:-)