Session Menu

Merge lp:~mterry/indicator-session/no-greeter-icons into lp:indicator-session/13.04

  1. no-greeter-icons
  2. Merge into trunk.13.04
Proposed by Michael Terry
Status: Merged
Approved by: Charles Kerr
Approved revision: 368
Merged at revision: 368
Proposed branch: lp:~mterry/indicator-session/no-greeter-icons
Merge into: lp:indicator-session/13.04
Diff against target: 369 lines (+5/-273)
7 files modified
data/icons/16x16/actions/Makefile.am (+0/-1)
data/icons/22x22/actions/Makefile.am (+0/-1)
data/icons/24x24/actions/Makefile.am (+0/-1)
data/icons/scalable/actions/Makefile.am (+0/-1)
data/icons/scalable/actions/system-shutdown-panel.svg (+0/-247)
src/indicator-session.c (+5/-19)
src/shared-names.h (+0/-3)
To merge this branch: bzr merge lp:~mterry/indicator-session/no-greeter-icons
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Needs Fixing
Charles Kerr (community) Approve
Review via email: mp+130879@code.launchpad.net

Commit message

The Design team wants the same icons in the greeter as in the user session (bug 1049244). This branch does that, and now that those greeter icons are not used anywhere, deletes them completely.

Description of the change

The Design team wants the same icons in the greeter as in the user session (bug 1049244). This branch does that, and now that those greeter icons are not used anywhere, deletes them completely.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:368
http://jenkins.qa.ubuntu.com/job/indicator-session-ci/20/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-session-ci/./label=quantal/20/console

review: Approve (continuous-integration)
Revision history for this message
Charles Kerr (charlesk) wrote :

Looks great, I love negative-linecount patches like this :)

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Autolanding.
No commit message was specified.
http://jenkins.qa.ubuntu.com/job/indicator-session-autolanding/19/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-session-autolanding/./label=quantal/19/console

review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/icons/16x16/actions/Makefile.am'
2--- data/icons/16x16/actions/Makefile.am 2009-10-06 22:51:09 +0000
3+++ data/icons/16x16/actions/Makefile.am 2012-10-22 19:09:26 +0000
4@@ -2,7 +2,6 @@
5 iconsdir = $(INDICATORICONSDIR)/hicolor/16x16/actions
6
7 icons_DATA = \
8- system-shutdown-panel.png \
9 system-shutdown.png \
10 system-restart.png \
11 system-log-out.png
12
13=== removed file 'data/icons/16x16/actions/system-shutdown-panel.png'
14Binary files data/icons/16x16/actions/system-shutdown-panel.png 2009-10-06 22:51:09 +0000 and data/icons/16x16/actions/system-shutdown-panel.png 1970-01-01 00:00:00 +0000 differ
15=== modified file 'data/icons/22x22/actions/Makefile.am'
16--- data/icons/22x22/actions/Makefile.am 2009-10-06 22:51:09 +0000
17+++ data/icons/22x22/actions/Makefile.am 2012-10-22 19:09:26 +0000
18@@ -2,7 +2,6 @@
19 iconsdir = $(INDICATORICONSDIR)/hicolor/22x22/actions
20
21 icons_DATA = \
22- system-shutdown-panel.png \
23 system-shutdown.png \
24 system-restart.png \
25 system-log-out.png
26
27=== removed file 'data/icons/22x22/actions/system-shutdown-panel.png'
28Binary files data/icons/22x22/actions/system-shutdown-panel.png 2009-10-06 22:51:09 +0000 and data/icons/22x22/actions/system-shutdown-panel.png 1970-01-01 00:00:00 +0000 differ
29=== modified file 'data/icons/24x24/actions/Makefile.am'
30--- data/icons/24x24/actions/Makefile.am 2009-10-06 22:51:09 +0000
31+++ data/icons/24x24/actions/Makefile.am 2012-10-22 19:09:26 +0000
32@@ -2,7 +2,6 @@
33 iconsdir = $(INDICATORICONSDIR)/hicolor/24x24/actions
34
35 icons_DATA = \
36- system-shutdown-panel.png \
37 system-shutdown.png \
38 system-restart.png \
39 system-log-out.png
40
41=== removed file 'data/icons/24x24/actions/system-shutdown-panel.png'
42Binary files data/icons/24x24/actions/system-shutdown-panel.png 2009-10-06 22:51:09 +0000 and data/icons/24x24/actions/system-shutdown-panel.png 1970-01-01 00:00:00 +0000 differ
43=== modified file 'data/icons/scalable/actions/Makefile.am'
44--- data/icons/scalable/actions/Makefile.am 2009-10-06 22:51:09 +0000
45+++ data/icons/scalable/actions/Makefile.am 2012-10-22 19:09:26 +0000
46@@ -2,7 +2,6 @@
47 iconsdir = $(INDICATORICONSDIR)/hicolor/scalable/actions
48
49 icons_DATA = \
50- system-shutdown-panel.svg \
51 system-restart.svg \
52 system-log-out.svg \
53 system-shutdown.svg
54
55=== removed file 'data/icons/scalable/actions/system-shutdown-panel.svg'
56--- data/icons/scalable/actions/system-shutdown-panel.svg 2009-10-06 22:51:09 +0000
57+++ data/icons/scalable/actions/system-shutdown-panel.svg 1970-01-01 00:00:00 +0000
58@@ -1,247 +0,0 @@
59-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
60-<!-- Created with Inkscape (http://www.inkscape.org/) -->
61-<svg
62- xmlns:dc="http://purl.org/dc/elements/1.1/"
63- xmlns:cc="http://web.resource.org/cc/"
64- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
65- xmlns:svg="http://www.w3.org/2000/svg"
66- xmlns="http://www.w3.org/2000/svg"
67- xmlns:xlink="http://www.w3.org/1999/xlink"
68- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
69- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
70- sodipodi:docname="gnome-shutdown.svg"
71- sodipodi:docbase="/home/dobey/Projects/gnome-icon-theme/scalable/apps"
72- inkscape:version="0.45"
73- sodipodi:version="0.32"
74- id="svg11142"
75- height="48"
76- width="48"
77- version="1.0"
78- inkscape:output_extension="org.inkscape.output.svg.inkscape">
79- <defs
80- id="defs3">
81- <linearGradient
82- id="linearGradient4749">
83- <stop
84- id="stop4751"
85- offset="0"
86- style="stop-color:#ffffff;stop-opacity:1;" />
87- <stop
88- style="stop-color:#ffffff;stop-opacity:0.0000000;"
89- offset="0.50000000"
90- id="stop4757" />
91- <stop
92- id="stop4753"
93- offset="1.0000000"
94- style="stop-color:#ffffff;stop-opacity:1.0000000;" />
95- </linearGradient>
96- <linearGradient
97- id="linearGradient11264"
98- inkscape:collect="always">
99- <stop
100- id="stop11266"
101- offset="0"
102- style="stop-color:#000000;stop-opacity:1;" />
103- <stop
104- id="stop11268"
105- offset="1"
106- style="stop-color:#000000;stop-opacity:0;" />
107- </linearGradient>
108- <linearGradient
109- id="linearGradient11178">
110- <stop
111- style="stop-color:#d1d1cc;stop-opacity:1.0000000;"
112- offset="0.0000000"
113- id="stop11180" />
114- <stop
115- id="stop4735"
116- offset="0.50000000"
117- style="stop-color:#d1d1d1;stop-opacity:1.0000000;" />
118- <stop
119- style="stop-color:#b9b9b9;stop-opacity:1.0000000;"
120- offset="1.0000000"
121- id="stop11188" />
122- </linearGradient>
123- <linearGradient
124- id="linearGradient11164">
125- <stop
126- id="stop11166"
127- offset="0"
128- style="stop-color:#eeeeec;stop-opacity:1;" />
129- <stop
130- style="stop-color:#c6c6bf;stop-opacity:1.0000000;"
131- offset="0.26988637"
132- id="stop11172" />
133- <stop
134- id="stop11176"
135- offset="0.37900311"
136- style="stop-color:#f9f9f8;stop-opacity:1.0000000;" />
137- <stop
138- id="stop11174"
139- offset="0.75000000"
140- style="stop-color:#c8c8c2;stop-opacity:1.0000000;" />
141- <stop
142- id="stop11168"
143- offset="1.0000000"
144- style="stop-color:#eeeeec;stop-opacity:1.0000000;" />
145- </linearGradient>
146- <linearGradient
147- gradientUnits="userSpaceOnUse"
148- y2="23.071428"
149- x2="42.471249"
150- y1="23.071428"
151- x1="7.1433797"
152- id="linearGradient11170"
153- xlink:href="#linearGradient11164"
154- inkscape:collect="always" />
155- <radialGradient
156- gradientTransform="matrix(1.364252,-9.115392e-17,9.115392e-17,1.364252,-9.47947,-5.618016)"
157- gradientUnits="userSpaceOnUse"
158- r="18.672388"
159- fy="17.224812"
160- fx="24.673435"
161- cy="17.224812"
162- cx="24.673435"
163- id="radialGradient11234"
164- xlink:href="#linearGradient11178"
165- inkscape:collect="always" />
166- <radialGradient
167- gradientUnits="userSpaceOnUse"
168- r="18.214285"
169- fy="23.071428"
170- fx="25.785715"
171- cy="23.071428"
172- cx="25.785715"
173- id="radialGradient11270"
174- xlink:href="#linearGradient11264"
175- inkscape:collect="always" />
176- <linearGradient
177- gradientUnits="userSpaceOnUse"
178- y2="8.5882788"
179- x2="25.785715"
180- y1="21.978363"
181- x1="25.785715"
182- id="linearGradient4755"
183- xlink:href="#linearGradient4749"
184- inkscape:collect="always" />
185- </defs>
186- <sodipodi:namedview
187- inkscape:window-y="423"
188- inkscape:window-x="840"
189- inkscape:window-height="606"
190- inkscape:window-width="750"
191- stroke="#555753"
192- fill="#edd400"
193- inkscape:showpageshadow="false"
194- inkscape:document-units="px"
195- inkscape:grid-bbox="true"
196- showgrid="false"
197- inkscape:current-layer="layer1"
198- inkscape:cy="-10.815272"
199- inkscape:cx="85.353158"
200- inkscape:zoom="1"
201- inkscape:pageshadow="2"
202- inkscape:pageopacity="0.0"
203- borderopacity="0.32941176"
204- bordercolor="#666666"
205- pagecolor="#ffffff"
206- id="base"
207- showguides="true"
208- inkscape:guide-bbox="true" />
209- <metadata
210- id="metadata4">
211- <rdf:RDF>
212- <cc:Work
213- rdf:about="">
214- <dc:format>image/svg+xml</dc:format>
215- <dc:type
216- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
217- <dc:title>Shutdown</dc:title>
218- <dc:creator>
219- <cc:Agent>
220- <dc:title>Jakub Steiner</dc:title>
221- </cc:Agent>
222- </dc:creator>
223- <cc:license
224- rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" />
225- <dc:source>http://jimmac.musichall.cz</dc:source>
226- <dc:subject>
227- <rdf:Bag>
228- <rdf:li>lock</rdf:li>
229- <rdf:li>key</rdf:li>
230- <rdf:li>secure</rdf:li>
231- </rdf:Bag>
232- </dc:subject>
233- </cc:Work>
234- <cc:License
235- rdf:about="http://creativecommons.org/licenses/GPL/2.0/">
236- <cc:permits
237- rdf:resource="http://web.resource.org/cc/Reproduction" />
238- <cc:permits
239- rdf:resource="http://web.resource.org/cc/Distribution" />
240- <cc:requires
241- rdf:resource="http://web.resource.org/cc/Notice" />
242- <cc:permits
243- rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
244- <cc:requires
245- rdf:resource="http://web.resource.org/cc/ShareAlike" />
246- <cc:requires
247- rdf:resource="http://web.resource.org/cc/SourceCode" />
248- </cc:License>
249- </rdf:RDF>
250- </metadata>
251- <g
252- inkscape:groupmode="layer"
253- inkscape:label="Layer 1"
254- id="layer1">
255- <path
256- sodipodi:type="arc"
257- style="opacity:1;color:#000000;fill:url(#radialGradient11270);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.8505457;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
258- id="path11262"
259- sodipodi:cx="25.785715"
260- sodipodi:cy="23.071428"
261- sodipodi:rx="18.214285"
262- sodipodi:ry="18.214285"
263- d="M 44 23.071428 A 18.214285 18.214285 0 1 1 7.5714302,23.071428 A 18.214285 18.214285 0 1 1 44 23.071428 z"
264- transform="matrix(1.269833,0,0,1.269833,-9.24356,-4.225444)" />
265- <path
266- transform="matrix(1.175715,0,0,1.175715,-6.816669,-3.911156)"
267- d="M 44 23.071428 A 18.214285 18.214285 0 1 1 7.5714302,23.071428 A 18.214285 18.214285 0 1 1 44 23.071428 z"
268- sodipodi:ry="18.214285"
269- sodipodi:rx="18.214285"
270- sodipodi:cy="23.071428"
271- sodipodi:cx="25.785715"
272- id="path11152"
273- style="opacity:1;color:#000000;fill:url(#linearGradient11170);fill-opacity:1;fill-rule:evenodd;stroke:#74796e;stroke-width:0.8505457;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
274- sodipodi:type="arc" />
275- <path
276- sodipodi:type="arc"
277- style="opacity:1;color:#000000;fill:url(#radialGradient11234);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.93590021;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
278- id="path11154"
279- sodipodi:cx="25.785715"
280- sodipodi:cy="23.071428"
281- sodipodi:rx="18.214285"
282- sodipodi:ry="18.214285"
283- d="M 44 23.071428 A 18.214285 18.214285 0 1 1 7.5714302,23.071428 A 18.214285 18.214285 0 1 1 44 23.071428 z"
284- transform="matrix(1.06849,0,0,1.06849,-4.051771,-2.437299)" />
285- <path
286- sodipodi:nodetypes="czs"
287- id="path4743"
288- d="M 19.1468,14.674063 C 12.154448,18.486901 15.316371,29.412893 23.310313,29.412893 C 31.220984,29.412893 34.766419,19.054547 27.473824,14.674063"
289- style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#555753;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
290- <path
291- id="path4745"
292- d="M 23.364832,19.364034 L 23.364832,11.95091"
293- style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#555753;stroke-width:2.99999905;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
294- <path
295- transform="matrix(1.04555,0,0,1.04555,-3.460245,-1.908039)"
296- d="M 44 23.071428 A 18.214285 18.214285 0 1 1 7.5714302,23.071428 A 18.214285 18.214285 0 1 1 44 23.071428 z"
297- sodipodi:ry="18.214285"
298- sodipodi:rx="18.214285"
299- sodipodi:cy="23.071428"
300- sodipodi:cx="25.785715"
301- id="path4747"
302- style="opacity:0.88235294;color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4755);stroke-width:0.95643449;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
303- sodipodi:type="arc" />
304- </g>
305-</svg>
306
307=== modified file 'src/indicator-session.c'
308--- src/indicator-session.c 2012-10-05 21:01:57 +0000
309+++ src/indicator-session.c 2012-10-22 19:09:26 +0000
310@@ -67,8 +67,6 @@
311 GtkIconTheme * icon_theme;
312 };
313
314-static gboolean greeter_mode;
315-
316 GType indicator_session_get_type (void);
317
318 /* Indicator stuff */
319@@ -126,8 +124,6 @@
320 INDICATOR_SERVICE_MANAGER_SIGNAL_CONNECTION_CHANGE,
321 G_CALLBACK(service_connection_cb), self);
322
323- greeter_mode = !g_strcmp0(g_getenv("INDICATOR_GREETER_MODE"), "1");
324-
325 self->entry.name_hint = PACKAGE;
326 self->entry.label = GTK_LABEL (gtk_label_new ("User Name"));
327 self->entry.image = GTK_IMAGE (gtk_image_new());
328@@ -405,22 +401,12 @@
329 {
330 const gchar * icon;
331
332- if (greeter_mode)
333- {
334- if (disposition == DISPOSITION_NORMAL)
335- icon = GREETER_ICON_DEFAULT;
336- else
337- icon = GREETER_ICON_RESTART;
338- }
339+ if (disposition == DISPOSITION_NORMAL)
340+ icon = ICON_DEFAULT;
341+ else if (disposition == DISPOSITION_INFO)
342+ icon = ICON_INFO;
343 else
344- {
345- if (disposition == DISPOSITION_NORMAL)
346- icon = ICON_DEFAULT;
347- else if (disposition == DISPOSITION_INFO)
348- icon = ICON_INFO;
349- else
350- icon = ICON_ALERT;
351- }
352+ icon = ICON_ALERT;
353
354 if (gtk_icon_theme_has_icon (indicator->icon_theme, icon) == FALSE)
355 icon = "gtk-missing-image";
356
357=== modified file 'src/shared-names.h'
358--- src/shared-names.h 2012-09-28 20:37:44 +0000
359+++ src/shared-names.h 2012-10-22 19:09:26 +0000
360@@ -40,9 +40,6 @@
361 #define ICON_INFO "system-devices-panel-information"
362 #define ICON_ALERT "system-devices-panel-alert"
363
364-#define GREETER_ICON_DEFAULT "system-shutdown-panel"
365-#define GREETER_ICON_RESTART "system-shutdown-panel-restart"
366-
367 /* the session indicator's settings */
368 #define SESSION_SCHEMA "com.canonical.indicator.session"
369 #define SUPPRESS_KEY "suppress-logout-restart-shutdown"

Subscribers

People subscribed via source and target branches