← Back to team overview

ayatana-commits team mailing list archive

[Merge] lp:~ken-vandine/indicator-me/indicator-me-624479 into lp:indicator-me

 

Ken VanDine has proposed merging lp:~ken-vandine/indicator-me/indicator-me-624479 into lp:indicator-me.

Requested reviews:
  Indicator Applet Developers (indicator-applet-developers)
Related bugs:
  #624479 rename panel status icons to include -panel suffix
  https://bugs.launchpad.net/bugs/624479


Use the -panel icons and rename hicolor icons included to -panel
-- 
https://code.launchpad.net/~ken-vandine/indicator-me/indicator-me-624479/+merge/33784
Your team ayatana-commits is subscribed to branch lp:indicator-me.
=== modified file 'data/icons/16x16/status/Makefile.am'
--- data/icons/16x16/status/Makefile.am	2010-03-25 20:25:31 +0000
+++ data/icons/16x16/status/Makefile.am	2010-08-26 14:02:38 +0000
@@ -2,11 +2,11 @@
 iconsdir = $(INDICATORICONSDIR)/hicolor/16x16/status
 
 icons_DATA =  \
-	user-indeterminate.png			\
-	user-available.png			\
-	user-offline.png		\
-	user-away.png			\
-	user-busy.png			\
-	user-invisible.png
+	user-indeterminate-panel.png			\
+	user-available-panel.png			\
+	user-offline-panel.png		\
+	user-away-panel.png			\
+	user-busy-panel.png			\
+	user-invisible-panel.png
 
 EXTRA_DIST = $(icons_DATA)

=== renamed file 'data/icons/16x16/status/user-available.png' => 'data/icons/16x16/status/user-available-panel.png'
=== renamed file 'data/icons/16x16/status/user-away.png' => 'data/icons/16x16/status/user-away-panel.png'
=== renamed file 'data/icons/16x16/status/user-busy.png' => 'data/icons/16x16/status/user-busy-panel.png'
=== renamed file 'data/icons/16x16/status/user-indeterminate.png' => 'data/icons/16x16/status/user-indeterminate-panel.png'
=== renamed file 'data/icons/16x16/status/user-invisible.png' => 'data/icons/16x16/status/user-invisible-panel.png'
=== renamed file 'data/icons/16x16/status/user-offline.png' => 'data/icons/16x16/status/user-offline-panel.png'
=== modified file 'data/icons/22x22/status/Makefile.am'
--- data/icons/22x22/status/Makefile.am	2010-03-25 20:25:31 +0000
+++ data/icons/22x22/status/Makefile.am	2010-08-26 14:02:38 +0000
@@ -2,11 +2,11 @@
 iconsdir = $(INDICATORICONSDIR)/hicolor/22x22/status
 
 icons_DATA =  \
-	user-indeterminate.png			\
-	user-available.png			\
-	user-offline.png		\
-	user-away.png			\
-	user-busy.png			\
-	user-invisible.png
+	user-indeterminate-panel.png	\
+	user-available-panel.png	\
+	user-offline-panel.png		\
+	user-away-panel.png		\
+	user-busy-panel.png		\
+	user-invisible-panel.png
 
 EXTRA_DIST = $(icons_DATA)

=== renamed file 'data/icons/22x22/status/user-available.png' => 'data/icons/22x22/status/user-available-panel.png'
=== renamed file 'data/icons/22x22/status/user-away.png' => 'data/icons/22x22/status/user-away-panel.png'
=== renamed file 'data/icons/22x22/status/user-busy.png' => 'data/icons/22x22/status/user-busy-panel.png'
=== renamed file 'data/icons/22x22/status/user-indeterminate.png' => 'data/icons/22x22/status/user-indeterminate-panel.png'
=== renamed file 'data/icons/22x22/status/user-invisible.png' => 'data/icons/22x22/status/user-invisible-panel.png'
=== renamed file 'data/icons/22x22/status/user-offline.png' => 'data/icons/22x22/status/user-offline-panel.png'
=== modified file 'data/icons/24x24/status/Makefile.am'
--- data/icons/24x24/status/Makefile.am	2010-03-25 20:25:31 +0000
+++ data/icons/24x24/status/Makefile.am	2010-08-26 14:02:38 +0000
@@ -2,11 +2,11 @@
 iconsdir = $(INDICATORICONSDIR)/hicolor/24x24/status
 
 icons_DATA =  \
-	user-indeterminate.png			\
-	user-available.png			\
-	user-offline.png		\
-	user-away.png			\
-	user-busy.png			\
-	user-invisible.png
+	user-indeterminate-panel.png	\
+	user-available-panel.png	\
+	user-offline-panel.png		\
+	user-away-panel.png		\
+	user-busy-panel.png		\
+	user-invisible-panel.png
 
 EXTRA_DIST = $(icons_DATA)

=== renamed file 'data/icons/24x24/status/user-available.png' => 'data/icons/24x24/status/user-available-panel.png'
=== renamed file 'data/icons/24x24/status/user-away.png' => 'data/icons/24x24/status/user-away-panel.png'
=== renamed file 'data/icons/24x24/status/user-busy.png' => 'data/icons/24x24/status/user-busy-panel.png'
=== renamed file 'data/icons/24x24/status/user-indeterminate.png' => 'data/icons/24x24/status/user-indeterminate-panel.png'
=== renamed file 'data/icons/24x24/status/user-invisible.png' => 'data/icons/24x24/status/user-invisible-panel.png'
=== renamed file 'data/icons/24x24/status/user-offline.png' => 'data/icons/24x24/status/user-offline-panel.png'
=== modified file 'data/icons/32x32/status/Makefile.am'
--- data/icons/32x32/status/Makefile.am	2010-03-25 20:25:31 +0000
+++ data/icons/32x32/status/Makefile.am	2010-08-26 14:02:38 +0000
@@ -2,11 +2,11 @@
 iconsdir = $(INDICATORICONSDIR)/hicolor/32x32/status
 
 icons_DATA =  \
-	user-indeterminate.png			\
-	user-available.png			\
-	user-offline.png		\
-	user-away.png			\
-	user-busy.png			\
-	user-invisible.png
+	user-indeterminate-panel.png	\
+	user-available-panel.png	\
+	user-offline-panel.png		\
+	user-away-panel.png		\
+	user-busy-panel.png		\
+	user-invisible-panel.png
 
 EXTRA_DIST = $(icons_DATA)

=== renamed file 'data/icons/32x32/status/user-available.png' => 'data/icons/32x32/status/user-available-panel.png'
=== renamed file 'data/icons/32x32/status/user-away.png' => 'data/icons/32x32/status/user-away-panel.png'
=== renamed file 'data/icons/32x32/status/user-busy.png' => 'data/icons/32x32/status/user-busy-panel.png'
=== renamed file 'data/icons/32x32/status/user-indeterminate.png' => 'data/icons/32x32/status/user-indeterminate-panel.png'
=== renamed file 'data/icons/32x32/status/user-invisible.png' => 'data/icons/32x32/status/user-invisible-panel.png'
=== renamed file 'data/icons/32x32/status/user-offline.png' => 'data/icons/32x32/status/user-offline-panel.png'
=== modified file 'data/icons/48x48/status/Makefile.am'
--- data/icons/48x48/status/Makefile.am	2010-03-25 20:25:31 +0000
+++ data/icons/48x48/status/Makefile.am	2010-08-26 14:02:38 +0000
@@ -2,11 +2,11 @@
 iconsdir = $(INDICATORICONSDIR)/hicolor/48x48/status
 
 icons_DATA =  \
-	user-indeterminate.png			\
-	user-available.png			\
-	user-offline.png		\
-	user-away.png			\
-	user-busy.png			\
-	user-invisible.png
+	user-indeterminate-panel.png	\
+	user-available-panel.png	\
+	user-offline-panel.png		\
+	user-away-panel.png		\
+	user-busy-panel.png		\
+	user-invisible-panel.png
 
 EXTRA_DIST = $(icons_DATA)

=== renamed file 'data/icons/48x48/status/user-available.png' => 'data/icons/48x48/status/user-available-panel.png'
=== renamed file 'data/icons/48x48/status/user-away.png' => 'data/icons/48x48/status/user-away-panel.png'
=== renamed file 'data/icons/48x48/status/user-busy.png' => 'data/icons/48x48/status/user-busy-panel.png'
=== renamed file 'data/icons/48x48/status/user-indeterminate.png' => 'data/icons/48x48/status/user-indeterminate-panel.png'
=== renamed file 'data/icons/48x48/status/user-invisible.png' => 'data/icons/48x48/status/user-invisible-panel.png'
=== renamed file 'data/icons/48x48/status/user-offline.png' => 'data/icons/48x48/status/user-offline-panel.png'
=== modified file 'data/icons/scalable/status/Makefile.am'
--- data/icons/scalable/status/Makefile.am	2010-03-25 20:25:31 +0000
+++ data/icons/scalable/status/Makefile.am	2010-08-26 14:02:38 +0000
@@ -2,11 +2,11 @@
 iconsdir = $(INDICATORICONSDIR)/hicolor/scalable/status
 
 icons_DATA =  \
-	user-indeterminate.svg			\
-	user-available.svg			\
-	user-offline.svg		\
-	user-away.svg			\
-	user-busy.svg			\
-	user-invisible.svg
+	user-indeterminate-panel.svg	\
+	user-available-panel.svg	\
+	user-offline-panel.svg		\
+	user-away-panel.svg		\
+	user-busy-panel.svg		\
+	user-invisible-panel.svg
 
 EXTRA_DIST = $(icons_DATA)

=== renamed file 'data/icons/scalable/status/user-available.svg' => 'data/icons/scalable/status/user-available-panel.svg'
=== renamed file 'data/icons/scalable/status/user-away.svg' => 'data/icons/scalable/status/user-away-panel.svg'
=== renamed file 'data/icons/scalable/status/user-busy.svg' => 'data/icons/scalable/status/user-busy-panel.svg'
=== renamed file 'data/icons/scalable/status/user-indeterminate.svg' => 'data/icons/scalable/status/user-indeterminate-panel.svg'
=== renamed file 'data/icons/scalable/status/user-invisible.svg' => 'data/icons/scalable/status/user-invisible-panel.svg'
=== renamed file 'data/icons/scalable/status/user-offline.svg' => 'data/icons/scalable/status/user-offline-panel.svg'

Follow ups