The Me Menu

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

  1. indicator-me-624479
  2. Merge into trunk
Proposed by Ken VanDine
Status: Merged
Merged at revision: 101
Proposed branch: lp:~ken-vandine/indicator-me/indicator-me-624479
Merge into: lp:indicator-me
Diff against target: 168 lines (+36/-36)
6 files modified
data/icons/16x16/status/Makefile.am (+6/-6)
data/icons/22x22/status/Makefile.am (+6/-6)
data/icons/24x24/status/Makefile.am (+6/-6)
data/icons/32x32/status/Makefile.am (+6/-6)
data/icons/48x48/status/Makefile.am (+6/-6)
data/icons/scalable/status/Makefile.am (+6/-6)
To merge this branch: bzr merge lp:~ken-vandine/indicator-me/indicator-me-624479
Reviewer Review Type Date Requested Status
David Barth Approve
Review via email: mp+33784@code.launchpad.net

Description of the change

Use the -panel icons and rename hicolor icons included to -panel

To post a comment you must log in.
Revision history for this message
David Barth (dbarth) wrote :

Thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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:41 +0000
@@ -2,11 +2,11 @@
2iconsdir = $(INDICATORICONSDIR)/hicolor/16x16/status2iconsdir = $(INDICATORICONSDIR)/hicolor/16x16/status
33
4icons_DATA = \4icons_DATA = \
5 user-indeterminate.png \5 user-indeterminate-panel.png \
6 user-available.png \6 user-available-panel.png \
7 user-offline.png \7 user-offline-panel.png \
8 user-away.png \8 user-away-panel.png \
9 user-busy.png \9 user-busy-panel.png \
10 user-invisible.png10 user-invisible-panel.png
1111
12EXTRA_DIST = $(icons_DATA)12EXTRA_DIST = $(icons_DATA)
1313
=== 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:41 +0000
@@ -2,11 +2,11 @@
2iconsdir = $(INDICATORICONSDIR)/hicolor/22x22/status2iconsdir = $(INDICATORICONSDIR)/hicolor/22x22/status
33
4icons_DATA = \4icons_DATA = \
5 user-indeterminate.png \5 user-indeterminate-panel.png \
6 user-available.png \6 user-available-panel.png \
7 user-offline.png \7 user-offline-panel.png \
8 user-away.png \8 user-away-panel.png \
9 user-busy.png \9 user-busy-panel.png \
10 user-invisible.png10 user-invisible-panel.png
1111
12EXTRA_DIST = $(icons_DATA)12EXTRA_DIST = $(icons_DATA)
1313
=== 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:41 +0000
@@ -2,11 +2,11 @@
2iconsdir = $(INDICATORICONSDIR)/hicolor/24x24/status2iconsdir = $(INDICATORICONSDIR)/hicolor/24x24/status
33
4icons_DATA = \4icons_DATA = \
5 user-indeterminate.png \5 user-indeterminate-panel.png \
6 user-available.png \6 user-available-panel.png \
7 user-offline.png \7 user-offline-panel.png \
8 user-away.png \8 user-away-panel.png \
9 user-busy.png \9 user-busy-panel.png \
10 user-invisible.png10 user-invisible-panel.png
1111
12EXTRA_DIST = $(icons_DATA)12EXTRA_DIST = $(icons_DATA)
1313
=== 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:41 +0000
@@ -2,11 +2,11 @@
2iconsdir = $(INDICATORICONSDIR)/hicolor/32x32/status2iconsdir = $(INDICATORICONSDIR)/hicolor/32x32/status
33
4icons_DATA = \4icons_DATA = \
5 user-indeterminate.png \5 user-indeterminate-panel.png \
6 user-available.png \6 user-available-panel.png \
7 user-offline.png \7 user-offline-panel.png \
8 user-away.png \8 user-away-panel.png \
9 user-busy.png \9 user-busy-panel.png \
10 user-invisible.png10 user-invisible-panel.png
1111
12EXTRA_DIST = $(icons_DATA)12EXTRA_DIST = $(icons_DATA)
1313
=== 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:41 +0000
@@ -2,11 +2,11 @@
2iconsdir = $(INDICATORICONSDIR)/hicolor/48x48/status2iconsdir = $(INDICATORICONSDIR)/hicolor/48x48/status
33
4icons_DATA = \4icons_DATA = \
5 user-indeterminate.png \5 user-indeterminate-panel.png \
6 user-available.png \6 user-available-panel.png \
7 user-offline.png \7 user-offline-panel.png \
8 user-away.png \8 user-away-panel.png \
9 user-busy.png \9 user-busy-panel.png \
10 user-invisible.png10 user-invisible-panel.png
1111
12EXTRA_DIST = $(icons_DATA)12EXTRA_DIST = $(icons_DATA)
1313
=== 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:41 +0000
@@ -2,11 +2,11 @@
2iconsdir = $(INDICATORICONSDIR)/hicolor/scalable/status2iconsdir = $(INDICATORICONSDIR)/hicolor/scalable/status
33
4icons_DATA = \4icons_DATA = \
5 user-indeterminate.svg \5 user-indeterminate-panel.svg \
6 user-available.svg \6 user-available-panel.svg \
7 user-offline.svg \7 user-offline-panel.svg \
8 user-away.svg \8 user-away-panel.svg \
9 user-busy.svg \9 user-busy-panel.svg \
10 user-invisible.svg10 user-invisible-panel.svg
1111
12EXTRA_DIST = $(icons_DATA)12EXTRA_DIST = $(icons_DATA)
1313
=== 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'

Subscribers

People subscribed via source and target branches