← Back to team overview

ayatana-commits team mailing list archive

[Merge] lp:~ted/indicator-session/available into lp:indicator-session

 

Ted Gould has proposed merging lp:~ted/indicator-session/available into lp:indicator-session.

Requested reviews:
    Indicator Applet Developers (indicator-applet-developers)

Changing the icon name to the proper one in the updated icon-naming spec.
-- 
https://code.launchpad.net/~ted/indicator-session/available/+merge/11932
Your team ayatana-commits is subscribed to branch lp:indicator-session.
=== modified file 'data/icons/16x16/status/Makefile.am'
--- data/icons/16x16/status/Makefile.am	2009-08-13 04:47:41 +0000
+++ data/icons/16x16/status/Makefile.am	2009-09-16 20:59:37 +0000
@@ -2,7 +2,7 @@
 iconsdir = $(INDICATORICONSDIR)/hicolor/16x16/status
 
 icons_DATA =  \
-	user-online.png			\
+	user-available.png			\
 	user-offline.png		\
 	user-away.png			\
 	user-busy.png			\

=== renamed file 'data/icons/16x16/status/user-online.png' => 'data/icons/16x16/status/user-available.png'
=== modified file 'data/icons/22x22/status/Makefile.am'
--- data/icons/22x22/status/Makefile.am	2009-08-13 04:47:41 +0000
+++ data/icons/22x22/status/Makefile.am	2009-09-16 20:59:37 +0000
@@ -2,7 +2,7 @@
 iconsdir = $(INDICATORICONSDIR)/hicolor/22x22/status
 
 icons_DATA =  \
-	user-online.png			\
+	user-available.png			\
 	user-offline.png		\
 	user-away.png			\
 	user-busy.png			\

=== renamed file 'data/icons/22x22/status/user-online.png' => 'data/icons/22x22/status/user-available.png'
=== modified file 'data/icons/24x24/status/Makefile.am'
--- data/icons/24x24/status/Makefile.am	2009-08-13 04:47:41 +0000
+++ data/icons/24x24/status/Makefile.am	2009-09-16 20:59:37 +0000
@@ -2,7 +2,7 @@
 iconsdir = $(INDICATORICONSDIR)/hicolor/24x24/status
 
 icons_DATA =  \
-	user-online.png			\
+	user-available.png			\
 	user-offline.png		\
 	user-away.png			\
 	user-busy.png			\

=== renamed file 'data/icons/24x24/status/user-online.png' => 'data/icons/24x24/status/user-available.png'
=== modified file 'data/icons/32x32/status/Makefile.am'
--- data/icons/32x32/status/Makefile.am	2009-08-13 04:47:41 +0000
+++ data/icons/32x32/status/Makefile.am	2009-09-16 20:59:37 +0000
@@ -2,7 +2,7 @@
 iconsdir = $(INDICATORICONSDIR)/hicolor/32x32/status
 
 icons_DATA =  \
-	user-online.png			\
+	user-available.png			\
 	user-offline.png		\
 	user-away.png			\
 	user-busy.png			\

=== renamed file 'data/icons/32x32/status/user-online.png' => 'data/icons/32x32/status/user-available.png'
=== modified file 'data/icons/48x48/status/Makefile.am'
--- data/icons/48x48/status/Makefile.am	2009-08-13 04:47:41 +0000
+++ data/icons/48x48/status/Makefile.am	2009-09-16 20:59:37 +0000
@@ -2,7 +2,7 @@
 iconsdir = $(INDICATORICONSDIR)/hicolor/48x48/status
 
 icons_DATA =  \
-	user-online.png			\
+	user-available.png			\
 	user-offline.png		\
 	user-away.png			\
 	user-busy.png			\

=== renamed file 'data/icons/48x48/status/user-online.png' => 'data/icons/48x48/status/user-available.png'
=== modified file 'data/icons/scalable/status/Makefile.am'
--- data/icons/scalable/status/Makefile.am	2009-08-13 04:47:41 +0000
+++ data/icons/scalable/status/Makefile.am	2009-09-16 20:59:37 +0000
@@ -2,7 +2,7 @@
 iconsdir = $(INDICATORICONSDIR)/hicolor/scalable/status
 
 icons_DATA =  \
-	user-online.svg			\
+	user-available.svg			\
 	user-offline.svg		\
 	user-away.svg			\
 	user-busy.svg			\

=== renamed file 'data/icons/scalable/status/user-online.svg' => 'data/icons/scalable/status/user-available.svg'
=== modified file 'src/status-service.c'
--- src/status-service.c	2009-09-16 16:34:26 +0000
+++ src/status-service.c	2009-09-16 21:00:17 +0000
@@ -61,7 +61,7 @@
 };
 
 static const gchar * status_icons[STATUS_PROVIDER_STATUS_LAST] = {
-  /* STATUS_PROVIDER_STATUS_ONLINE, */     "user-online",
+  /* STATUS_PROVIDER_STATUS_ONLINE, */     "user-available",
   /* STATUS_PROVIDER_STATUS_AWAY, */       "user-away",
   /* STATUS_PROVIDER_STATUS_DND, */        "user-busy",
   /* STATUS_PROVIDER_STATUS_INVISIBLE, */  "user-invisible",


Follow ups