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
1=== modified file 'data/icons/16x16/status/Makefile.am'
2--- data/icons/16x16/status/Makefile.am 2010-03-25 20:25:31 +0000
3+++ data/icons/16x16/status/Makefile.am 2010-08-26 14:02:41 +0000
4@@ -2,11 +2,11 @@
5 iconsdir = $(INDICATORICONSDIR)/hicolor/16x16/status
6
7 icons_DATA = \
8- user-indeterminate.png \
9- user-available.png \
10- user-offline.png \
11- user-away.png \
12- user-busy.png \
13- user-invisible.png
14+ user-indeterminate-panel.png \
15+ user-available-panel.png \
16+ user-offline-panel.png \
17+ user-away-panel.png \
18+ user-busy-panel.png \
19+ user-invisible-panel.png
20
21 EXTRA_DIST = $(icons_DATA)
22
23=== renamed file 'data/icons/16x16/status/user-available.png' => 'data/icons/16x16/status/user-available-panel.png'
24=== renamed file 'data/icons/16x16/status/user-away.png' => 'data/icons/16x16/status/user-away-panel.png'
25=== renamed file 'data/icons/16x16/status/user-busy.png' => 'data/icons/16x16/status/user-busy-panel.png'
26=== renamed file 'data/icons/16x16/status/user-indeterminate.png' => 'data/icons/16x16/status/user-indeterminate-panel.png'
27=== renamed file 'data/icons/16x16/status/user-invisible.png' => 'data/icons/16x16/status/user-invisible-panel.png'
28=== renamed file 'data/icons/16x16/status/user-offline.png' => 'data/icons/16x16/status/user-offline-panel.png'
29=== modified file 'data/icons/22x22/status/Makefile.am'
30--- data/icons/22x22/status/Makefile.am 2010-03-25 20:25:31 +0000
31+++ data/icons/22x22/status/Makefile.am 2010-08-26 14:02:41 +0000
32@@ -2,11 +2,11 @@
33 iconsdir = $(INDICATORICONSDIR)/hicolor/22x22/status
34
35 icons_DATA = \
36- user-indeterminate.png \
37- user-available.png \
38- user-offline.png \
39- user-away.png \
40- user-busy.png \
41- user-invisible.png
42+ user-indeterminate-panel.png \
43+ user-available-panel.png \
44+ user-offline-panel.png \
45+ user-away-panel.png \
46+ user-busy-panel.png \
47+ user-invisible-panel.png
48
49 EXTRA_DIST = $(icons_DATA)
50
51=== renamed file 'data/icons/22x22/status/user-available.png' => 'data/icons/22x22/status/user-available-panel.png'
52=== renamed file 'data/icons/22x22/status/user-away.png' => 'data/icons/22x22/status/user-away-panel.png'
53=== renamed file 'data/icons/22x22/status/user-busy.png' => 'data/icons/22x22/status/user-busy-panel.png'
54=== renamed file 'data/icons/22x22/status/user-indeterminate.png' => 'data/icons/22x22/status/user-indeterminate-panel.png'
55=== renamed file 'data/icons/22x22/status/user-invisible.png' => 'data/icons/22x22/status/user-invisible-panel.png'
56=== renamed file 'data/icons/22x22/status/user-offline.png' => 'data/icons/22x22/status/user-offline-panel.png'
57=== modified file 'data/icons/24x24/status/Makefile.am'
58--- data/icons/24x24/status/Makefile.am 2010-03-25 20:25:31 +0000
59+++ data/icons/24x24/status/Makefile.am 2010-08-26 14:02:41 +0000
60@@ -2,11 +2,11 @@
61 iconsdir = $(INDICATORICONSDIR)/hicolor/24x24/status
62
63 icons_DATA = \
64- user-indeterminate.png \
65- user-available.png \
66- user-offline.png \
67- user-away.png \
68- user-busy.png \
69- user-invisible.png
70+ user-indeterminate-panel.png \
71+ user-available-panel.png \
72+ user-offline-panel.png \
73+ user-away-panel.png \
74+ user-busy-panel.png \
75+ user-invisible-panel.png
76
77 EXTRA_DIST = $(icons_DATA)
78
79=== renamed file 'data/icons/24x24/status/user-available.png' => 'data/icons/24x24/status/user-available-panel.png'
80=== renamed file 'data/icons/24x24/status/user-away.png' => 'data/icons/24x24/status/user-away-panel.png'
81=== renamed file 'data/icons/24x24/status/user-busy.png' => 'data/icons/24x24/status/user-busy-panel.png'
82=== renamed file 'data/icons/24x24/status/user-indeterminate.png' => 'data/icons/24x24/status/user-indeterminate-panel.png'
83=== renamed file 'data/icons/24x24/status/user-invisible.png' => 'data/icons/24x24/status/user-invisible-panel.png'
84=== renamed file 'data/icons/24x24/status/user-offline.png' => 'data/icons/24x24/status/user-offline-panel.png'
85=== modified file 'data/icons/32x32/status/Makefile.am'
86--- data/icons/32x32/status/Makefile.am 2010-03-25 20:25:31 +0000
87+++ data/icons/32x32/status/Makefile.am 2010-08-26 14:02:41 +0000
88@@ -2,11 +2,11 @@
89 iconsdir = $(INDICATORICONSDIR)/hicolor/32x32/status
90
91 icons_DATA = \
92- user-indeterminate.png \
93- user-available.png \
94- user-offline.png \
95- user-away.png \
96- user-busy.png \
97- user-invisible.png
98+ user-indeterminate-panel.png \
99+ user-available-panel.png \
100+ user-offline-panel.png \
101+ user-away-panel.png \
102+ user-busy-panel.png \
103+ user-invisible-panel.png
104
105 EXTRA_DIST = $(icons_DATA)
106
107=== renamed file 'data/icons/32x32/status/user-available.png' => 'data/icons/32x32/status/user-available-panel.png'
108=== renamed file 'data/icons/32x32/status/user-away.png' => 'data/icons/32x32/status/user-away-panel.png'
109=== renamed file 'data/icons/32x32/status/user-busy.png' => 'data/icons/32x32/status/user-busy-panel.png'
110=== renamed file 'data/icons/32x32/status/user-indeterminate.png' => 'data/icons/32x32/status/user-indeterminate-panel.png'
111=== renamed file 'data/icons/32x32/status/user-invisible.png' => 'data/icons/32x32/status/user-invisible-panel.png'
112=== renamed file 'data/icons/32x32/status/user-offline.png' => 'data/icons/32x32/status/user-offline-panel.png'
113=== modified file 'data/icons/48x48/status/Makefile.am'
114--- data/icons/48x48/status/Makefile.am 2010-03-25 20:25:31 +0000
115+++ data/icons/48x48/status/Makefile.am 2010-08-26 14:02:41 +0000
116@@ -2,11 +2,11 @@
117 iconsdir = $(INDICATORICONSDIR)/hicolor/48x48/status
118
119 icons_DATA = \
120- user-indeterminate.png \
121- user-available.png \
122- user-offline.png \
123- user-away.png \
124- user-busy.png \
125- user-invisible.png
126+ user-indeterminate-panel.png \
127+ user-available-panel.png \
128+ user-offline-panel.png \
129+ user-away-panel.png \
130+ user-busy-panel.png \
131+ user-invisible-panel.png
132
133 EXTRA_DIST = $(icons_DATA)
134
135=== renamed file 'data/icons/48x48/status/user-available.png' => 'data/icons/48x48/status/user-available-panel.png'
136=== renamed file 'data/icons/48x48/status/user-away.png' => 'data/icons/48x48/status/user-away-panel.png'
137=== renamed file 'data/icons/48x48/status/user-busy.png' => 'data/icons/48x48/status/user-busy-panel.png'
138=== renamed file 'data/icons/48x48/status/user-indeterminate.png' => 'data/icons/48x48/status/user-indeterminate-panel.png'
139=== renamed file 'data/icons/48x48/status/user-invisible.png' => 'data/icons/48x48/status/user-invisible-panel.png'
140=== renamed file 'data/icons/48x48/status/user-offline.png' => 'data/icons/48x48/status/user-offline-panel.png'
141=== modified file 'data/icons/scalable/status/Makefile.am'
142--- data/icons/scalable/status/Makefile.am 2010-03-25 20:25:31 +0000
143+++ data/icons/scalable/status/Makefile.am 2010-08-26 14:02:41 +0000
144@@ -2,11 +2,11 @@
145 iconsdir = $(INDICATORICONSDIR)/hicolor/scalable/status
146
147 icons_DATA = \
148- user-indeterminate.svg \
149- user-available.svg \
150- user-offline.svg \
151- user-away.svg \
152- user-busy.svg \
153- user-invisible.svg
154+ user-indeterminate-panel.svg \
155+ user-available-panel.svg \
156+ user-offline-panel.svg \
157+ user-away-panel.svg \
158+ user-busy-panel.svg \
159+ user-invisible-panel.svg
160
161 EXTRA_DIST = $(icons_DATA)
162
163=== renamed file 'data/icons/scalable/status/user-available.svg' => 'data/icons/scalable/status/user-available-panel.svg'
164=== renamed file 'data/icons/scalable/status/user-away.svg' => 'data/icons/scalable/status/user-away-panel.svg'
165=== renamed file 'data/icons/scalable/status/user-busy.svg' => 'data/icons/scalable/status/user-busy-panel.svg'
166=== renamed file 'data/icons/scalable/status/user-indeterminate.svg' => 'data/icons/scalable/status/user-indeterminate-panel.svg'
167=== renamed file 'data/icons/scalable/status/user-invisible.svg' => 'data/icons/scalable/status/user-invisible-panel.svg'
168=== 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