cpw.rekkanoryo.icqxstatus: f8f682f0: Use a movie camera icon from N3fr0n inst...

[rlaager at pidgin.im]

-----------------------------------------------------------------
Revision: f8f682f0531fbab4d74ce9a2782782b782506177
Ancestor: b5fd6f2fadbb5d67222c4f3930f6b50932dffd86
Author: rlaager at pidgin.im
Date: 2008-11-16T08:44:14
Branch: im.pidgin.cpw.rekkanoryo.icqxstatus
URL: http://d.pidgin.im/viewmtn/revision/info/f8f682f0531fbab4d74ce9a2782782b782506177

Added files:
        pidgin/pixmaps/emblems/16/xstatus_cinema.png
Modified files:
        .mtn-ignore libpurple/protocols/oscar/family_locate.c
        pidgin/pixmaps/Makefile.am
Modified attrs:
        pidgin/pixmaps/emblems/16/xstatus_cinema.png

ChangeLog: 

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."

-------------- next part --------------
============================================================
# pidgin/pixmaps/emblems/16/xstatus_cinema.png is binary
============================================================
--- .mtn-ignore	02e4c734f42a2870e926c5bae6ded092df294806
+++ .mtn-ignore	0aba084458555394bc62ed9f395f62b36266c65a
@@ -40,7 +40,6 @@ pidgin/pixmaps/emblems/16/busy.png
 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
============================================================
--- libpurple/protocols/oscar/family_locate.c	4e744868e8766368455c0b5bfe45f7b0f8789651
+++ libpurple/protocols/oscar/family_locate.c	4a13de021675c640f2250bae426143a0aed3a994
@@ -294,8 +294,7 @@ static const struct {
 	 {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}},
 
============================================================
--- pidgin/pixmaps/Makefile.am	9ed76469cc10aaf63d22e9e93b2498d97ed4ce95
+++ pidgin/pixmaps/Makefile.am	45a4338c6c7a4535175ed279e8c2a372792dc77a
@@ -125,7 +125,6 @@ EMBLEMS_16_COPIED = \
 		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 = \
 		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 \