Mercurial > pidgin
changeset 29425:5f8fc6e7466a
Use a movie camera icon from N3fr0n instead of the photo camera emoticon to
more closely match ICQ6. Also, change the description of this icon to
"Watching a movie."
| author | Richard Laager <rlaager@wiktel.com> |
|---|---|
| date | Sun, 16 Nov 2008 08:44:14 +0000 |
| parents | 2c95b7c57ebb |
| children | 245f3432a5ab |
| files | .mtn-ignore libpurple/protocols/oscar/family_locate.c pidgin/pixmaps/Makefile.am pidgin/pixmaps/emblems/16/xstatus_cinema.png |
| diffstat | 4 files changed, 2 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/.mtn-ignore Sun Nov 16 08:39:34 2008 +0000 +++ b/.mtn-ignore Sun Nov 16 08:44:14 2008 +0000 @@ -40,7 +40,6 @@ pidgin/pixmaps/emblems/16/angry.png pidgin/pixmaps/emblems/16/beer.png pidgin/pixmaps/emblems/16/busy.png -pidgin/pixmaps/emblems/16/camera.png pidgin/pixmaps/emblems/16/cigarette.png pidgin/pixmaps/emblems/16/coffee.png pidgin/pixmaps/emblems/16/console.png
--- a/libpurple/protocols/oscar/family_locate.c Sun Nov 16 08:39:34 2008 +0000 +++ b/libpurple/protocols/oscar/family_locate.c Sun Nov 16 08:44:14 2008 +0000 @@ -294,8 +294,7 @@ {0xf8, 0xe8, 0xd7, 0xb2, 0x82, 0xc4, 0x41, 0x42, 0x90, 0xf8, 0x10, 0xc6, 0xce, 0x0a, 0x89, 0xa6}}, - /* Shooting Film (or Pictures) */ - {"camera", N_("Shooting"), + {"xstatus_cinema", N_("Watching a movie"), {0x10, 0x7a, 0x9a, 0x18, 0x12, 0x32, 0x4d, 0xa4, 0xb6, 0xcd, 0x08, 0x79, 0xdb, 0x78, 0x0f, 0x09}},
--- a/pidgin/pixmaps/Makefile.am Sun Nov 16 08:39:34 2008 +0000 +++ b/pidgin/pixmaps/Makefile.am Sun Nov 16 08:44:14 2008 +0000 @@ -125,7 +125,6 @@ emblems/16/angry.png \ emblems/16/busy.png \ emblems/16/beer.png \ - emblems/16/camera.png \ emblems/16/cigarette.png \ emblems/16/coffee.png \ emblems/16/console.png \ @@ -173,6 +172,7 @@ emblems/16/video.png \ emblems/16/voice.png \ emblems/16/xstatus_bathing.png \ + emblems/16/xstatus_cinema.png \ emblems/16/xstatus_internet.png \ emblems/16/xstatus_restroom.png \ emblems/16/xstatus_shopping.png \