Drop xstatus_ from the icon names.

12 files changed, 12 insertions, 12 deletions

diff --git a/libpurple/protocols/oscar/family_locate.c b/libpurple/protocols/oscar/family_locate.c
index e9bd254d23..3f7c3b2a9a 100644
--- a/libpurple/protocols/oscar/family_locate.c
+++ b/libpurple/protocols/oscar/family_locate.c
@@ -272,13 +272,13 @@ static const struct {
 	 {0x48, 0x8e, 0x14, 0x89, 0x8a, 0xca, 0x4a, 0x08,
 	  0x82, 0xaa, 0x77, 0xce, 0x7a, 0x16, 0x52, 0x08}},
 
-	{"xstatus_shopping", N_("Shopping"),
+	{"shopping", N_("Shopping"),
 	 {0x63, 0x62, 0x73, 0x37, 0xa0, 0x3f, 0x49, 0xff,
 	  0x80, 0xe5, 0xf7, 0x09, 0xcd, 0xe0, 0xa4, 0xee}},
 
 	/* This was in the original patch, but isn't what the official client
 	 * (ICQ 6) sets when you choose its typewriter icon. */
-	{"xstatus_typing", NULL,
+	{"typing", NULL,
 	 {0x63, 0x4f, 0x6b, 0xd8 ,0xad, 0xd2, 0x4a, 0xa1,
 	  0xaa, 0xb9, 0x11, 0x5b, 0xc2, 0x6d, 0x05, 0xa1}},
 
@@ -294,7 +294,7 @@ static const struct {
 	 {0xf8, 0xe8, 0xd7, 0xb2, 0x82, 0xc4, 0x41, 0x42,
 	  0x90, 0xf8, 0x10, 0xc6, 0xce, 0x0a, 0x89, 0xa6}},
 
-	{"xstatus_cinema", N_("Watching a movie"),
+	{"cinema", N_("Watching a movie"),
 	 {0x10, 0x7a, 0x9a, 0x18, 0x12, 0x32, 0x4d, 0xa4,
 	  0xb6, 0xcd, 0x08, 0x79, 0xdb, 0x78, 0x0f, 0x09}},
 
@@ -302,15 +302,15 @@ static const struct {
 	 {0x1f, 0x7a, 0x40, 0x71, 0xbf, 0x3b, 0x4e, 0x60,
 	  0xbc, 0x32, 0x4c, 0x57, 0x87, 0xb0, 0x4c, 0xf1}},
 
-	{"xstatus_typing", N_("Typing"),
+	{"typing", N_("Typing"),
 	 {0x2c, 0xe0, 0xe4, 0xe5, 0x7c, 0x64, 0x43, 0x70,
 	  0x9c, 0x3a, 0x7a, 0x1c, 0xe8, 0x78, 0xa7, 0xdc}},
 
-	{"xstatus_suit", N_("At the office"),
+	{"suit", N_("At the office"),
 	 {0xb7, 0x08, 0x67, 0xf5, 0x38, 0x25, 0x43, 0x27,
 	  0xa1, 0xff, 0xcf, 0x4c, 0xc1, 0x93, 0x97, 0x97}},
 
-	{"xstatus_bathing", N_("Taking a bath"),
+	{"bathing", N_("Taking a bath"),
 	 {0x5a, 0x58, 0x1e, 0xa1, 0xe5, 0x80, 0x43, 0x0c,
 	  0xa0, 0x6f, 0x61, 0x22, 0x98, 0xb7, 0xe4, 0xc7}},
 
@@ -347,7 +347,7 @@ static const struct {
 	 {0x12, 0x92, 0xe5, 0x50, 0x1b, 0x64, 0x4f, 0x66,
 	  0xb2, 0x06, 0xb2, 0x9a, 0xf3, 0x78, 0xe4, 0x8d}},
 
-	{"xstatus_surfing", N_("Surfing"),
+	{"surfing", N_("Surfing"),
 	 {0xa6, 0xed, 0x55, 0x7e, 0x6b, 0xf7, 0x44, 0xd4,
 	  0xa5, 0xd4, 0xd2, 0xe7, 0xd9, 0x5c, 0xe8, 0x1f}},
 
@@ -373,7 +373,7 @@ static const struct {
 	 {0xd4, 0xa6, 0x11, 0xd0, 0x8f, 0x01, 0x4e, 0xc0,
 	  0x92, 0x23, 0xc5, 0xb6, 0xbe, 0xc6, 0xcc, 0xf0}},
 
-	{"xstatus_internet", N_("Browsing the web"),
+	{"internet", N_("Browsing the web"),
 	 {0x12, 0xd0, 0x7e, 0x3e, 0xf8, 0x85, 0x48, 0x9e,
 	  0x8e, 0x97, 0xa7, 0x2a, 0x65, 0x51, 0xe5, 0x8d}},
 
@@ -381,7 +381,7 @@ static const struct {
 	 {0x64, 0x43, 0xc6, 0xaf, 0x22, 0x60, 0x45, 0x17,
 	  0xb5, 0x8c, 0xd7, 0xdf, 0x8e, 0x29, 0x03, 0x52}},
 
-	{"xstatus_writing", N_("Writing"),
+	{"writing", N_("Writing"),
 	 {0x00, 0x72, 0xd9, 0x08, 0x4a, 0xd1, 0x43, 0xdd,
 	  0x91, 0x99, 0x6f, 0x02, 0x69, 0x66, 0x02, 0x6f}},
 
@@ -394,15 +394,15 @@ static const struct {
 	 {0x61, 0xbe, 0xe0, 0xdd, 0x8b, 0xdd, 0x47, 0x5d,
 	  0x8d, 0xee, 0x5f, 0x4b, 0xaa, 0xcf, 0x19, 0xa7}},
 
-	{"xstatus_studying", N_("Studying"),
+	{"studying", N_("Studying"),
 	 {0x60, 0x9d, 0x52, 0xf8, 0xa2, 0x9a, 0x49, 0xa6,
 	  0xb2, 0xa0, 0x25, 0x24, 0xc5, 0xe9, 0xd2, 0x60}},
 
-	{"xstatus_working", N_("Working"),
+	{"working", N_("Working"),
 	 {0xba, 0x74, 0xdb, 0x3e, 0x9e, 0x24, 0x43, 0x4b,
 	  0x87, 0xb6, 0x2f, 0x6b, 0x8d, 0xfe, 0xe5, 0x0f}},
 
-	{"xstatus_restroom", N_("In the restroom"),
+	{"restroom", N_("In the restroom"),
 	 {0x16, 0xf5, 0xb7, 0x6f, 0xa9, 0xd2, 0x40, 0x35,
 	  0x8c, 0xc5, 0xc0, 0x84, 0x70, 0x3c, 0x98, 0xfa}}
 };
diff --git a/pidgin/pixmaps/emblems/16/xstatus_bathing.png b/pidgin/pixmaps/emblems/16/bathing.png
index 662eb2ac97..662eb2ac97 100644
--- a/pidgin/pixmaps/emblems/16/xstatus_bathing.png
+++ b/pidgin/pixmaps/emblems/16/bathing.png
diff --git a/pidgin/pixmaps/emblems/16/xstatus_cinema.png b/pidgin/pixmaps/emblems/16/cinema.png
index e561cb0791..e561cb0791 100644
--- a/pidgin/pixmaps/emblems/16/xstatus_cinema.png
+++ b/pidgin/pixmaps/emblems/16/cinema.png
diff --git a/pidgin/pixmaps/emblems/16/xstatus_internet.png b/pidgin/pixmaps/emblems/16/internet.png
index 9281221f98..9281221f98 100644
--- a/pidgin/pixmaps/emblems/16/xstatus_internet.png
+++ b/pidgin/pixmaps/emblems/16/internet.png
diff --git a/pidgin/pixmaps/emblems/16/xstatus_restroom.png b/pidgin/pixmaps/emblems/16/restroom.png
index a642e7d53c..a642e7d53c 100644
--- a/pidgin/pixmaps/emblems/16/xstatus_restroom.png
+++ b/pidgin/pixmaps/emblems/16/restroom.png
diff --git a/pidgin/pixmaps/emblems/16/xstatus_shopping.png b/pidgin/pixmaps/emblems/16/shopping.png
index 291107ae64..291107ae64 100644
--- a/pidgin/pixmaps/emblems/16/xstatus_shopping.png
+++ b/pidgin/pixmaps/emblems/16/shopping.png
diff --git a/pidgin/pixmaps/emblems/16/xstatus_studying.png b/pidgin/pixmaps/emblems/16/studying.png
index 0a6053f86c..0a6053f86c 100644
--- a/pidgin/pixmaps/emblems/16/xstatus_studying.png
+++ b/pidgin/pixmaps/emblems/16/studying.png
diff --git a/pidgin/pixmaps/emblems/16/xstatus_suit.png b/pidgin/pixmaps/emblems/16/suit.png
index 3c0080f0dd..3c0080f0dd 100644
--- a/pidgin/pixmaps/emblems/16/xstatus_suit.png
+++ b/pidgin/pixmaps/emblems/16/suit.png
diff --git a/pidgin/pixmaps/emblems/16/xstatus_surfing.png b/pidgin/pixmaps/emblems/16/surfing.png
index 727b352f72..727b352f72 100644
--- a/pidgin/pixmaps/emblems/16/xstatus_surfing.png
+++ b/pidgin/pixmaps/emblems/16/surfing.png
diff --git a/pidgin/pixmaps/emblems/16/xstatus_typing.png b/pidgin/pixmaps/emblems/16/typing.png
index 7f60b0a25e..7f60b0a25e 100644
--- a/pidgin/pixmaps/emblems/16/xstatus_typing.png
+++ b/pidgin/pixmaps/emblems/16/typing.png
diff --git a/pidgin/pixmaps/emblems/16/xstatus_working.png b/pidgin/pixmaps/emblems/16/working.png
index cc90d637df..cc90d637df 100644
--- a/pidgin/pixmaps/emblems/16/xstatus_working.png
+++ b/pidgin/pixmaps/emblems/16/working.png
diff --git a/pidgin/pixmaps/emblems/16/xstatus_writing.png b/pidgin/pixmaps/emblems/16/writing.png
index e8b5d0d53e..e8b5d0d53e 100644
--- a/pidgin/pixmaps/emblems/16/xstatus_writing.png
+++ b/pidgin/pixmaps/emblems/16/writing.png