Merge lp:~ted/indicator-messages/default-panel-icons into lp:indicator-messages/0.5

Proposed by Ted Gould
Status: Merged
Merged at revision: not available
Proposed branch: lp:~ted/indicator-messages/default-panel-icons
Merge into: lp:indicator-messages/0.5
Diff against target: 1037 lines (+857/-12)
17 files modified
configure.ac (+4/-0)
data/icons/16x16/Makefile.am (+1/-1)
data/icons/16x16/categories/Makefile.am (+10/-0)
data/icons/22x22/Makefile.am (+1/-1)
data/icons/22x22/categories/Makefile.am (+8/-0)
data/icons/32x32/Makefile.am (+1/-1)
data/icons/32x32/categories/Makefile.am (+9/-0)
data/icons/scalable/Makefile.am (+1/-1)
data/icons/scalable/categories/Makefile.am (+9/-0)
data/icons/scalable/categories/applications-chat-panel.svg (+303/-0)
data/icons/scalable/categories/applications-email-panel.svg (+354/-0)
po/POTFILES.in (+1/-0)
src/Makefile.am (+2/-0)
src/app-menu-item.c (+17/-6)
src/default-applications.c (+91/-0)
src/default-applications.h (+30/-0)
src/launcher-menu-item.c (+15/-2)
To merge this branch: bzr merge lp:~ted/indicator-messages/default-panel-icons
Reviewer Review Type Date Requested Status
Indicator Applet Developers Pending
Review via email: mp+20698@code.launchpad.net

Description of the change

Adds a set of default icons for the default entires. And uses them.
The icons are take from the GNOME set assuming that they'll be
overridden in most cases.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'configure.ac'
2--- configure.ac 2010-02-18 18:15:43 +0000
3+++ configure.ac 2010-03-04 20:55:23 +0000
4@@ -111,16 +111,20 @@
5 data/icons/Makefile
6 data/icons/16x16/Makefile
7 data/icons/16x16/status/Makefile
8+data/icons/16x16/categories/Makefile
9 data/icons/22x22/Makefile
10 data/icons/22x22/status/Makefile
11+data/icons/22x22/categories/Makefile
12 data/icons/24x24/Makefile
13 data/icons/24x24/status/Makefile
14 data/icons/32x32/Makefile
15 data/icons/32x32/status/Makefile
16+data/icons/32x32/categories/Makefile
17 data/icons/48x48/Makefile
18 data/icons/48x48/status/Makefile
19 data/icons/scalable/Makefile
20 data/icons/scalable/status/Makefile
21+data/icons/scalable/categories/Makefile
22 po/Makefile.in
23 ])
24
25
26=== modified file 'data/icons/16x16/Makefile.am'
27--- data/icons/16x16/Makefile.am 2009-02-04 16:01:51 +0000
28+++ data/icons/16x16/Makefile.am 2010-03-04 20:55:23 +0000
29@@ -1,1 +1,1 @@
30-SUBDIRS = status
31+SUBDIRS = status categories
32
33=== added directory 'data/icons/16x16/categories'
34=== added file 'data/icons/16x16/categories/Makefile.am'
35--- data/icons/16x16/categories/Makefile.am 1970-01-01 00:00:00 +0000
36+++ data/icons/16x16/categories/Makefile.am 2010-03-04 20:55:23 +0000
37@@ -0,0 +1,10 @@
38+
39+iconsdir = $(INDICATORICONSDIR)/hicolor/16x16/categories
40+
41+icons_DATA = \
42+ applications-email-panel.png \
43+ applications-chat-panel.png \
44+ applications-microblogging-panel.png
45+
46+EXTRA_DIST = $(icons_DATA)
47+
48
49=== added file 'data/icons/16x16/categories/applications-chat-panel.png'
50Binary files data/icons/16x16/categories/applications-chat-panel.png 1970-01-01 00:00:00 +0000 and data/icons/16x16/categories/applications-chat-panel.png 2010-03-04 20:55:23 +0000 differ
51=== added file 'data/icons/16x16/categories/applications-email-panel.png'
52Binary files data/icons/16x16/categories/applications-email-panel.png 1970-01-01 00:00:00 +0000 and data/icons/16x16/categories/applications-email-panel.png 2010-03-04 20:55:23 +0000 differ
53=== added file 'data/icons/16x16/categories/applications-microblogging-panel.png'
54Binary files data/icons/16x16/categories/applications-microblogging-panel.png 1970-01-01 00:00:00 +0000 and data/icons/16x16/categories/applications-microblogging-panel.png 2010-03-04 20:55:23 +0000 differ
55=== modified file 'data/icons/22x22/Makefile.am'
56--- data/icons/22x22/Makefile.am 2009-02-04 16:01:51 +0000
57+++ data/icons/22x22/Makefile.am 2010-03-04 20:55:23 +0000
58@@ -1,1 +1,1 @@
59-SUBDIRS = status
60+SUBDIRS = status categories
61
62=== added directory 'data/icons/22x22/categories'
63=== added file 'data/icons/22x22/categories/Makefile.am'
64--- data/icons/22x22/categories/Makefile.am 1970-01-01 00:00:00 +0000
65+++ data/icons/22x22/categories/Makefile.am 2010-03-04 20:55:23 +0000
66@@ -0,0 +1,8 @@
67+
68+iconsdir = $(INDICATORICONSDIR)/hicolor/22x22/categories
69+
70+icons_DATA = \
71+ applications-email-panel.png
72+
73+EXTRA_DIST = $(icons_DATA)
74+
75
76=== added file 'data/icons/22x22/categories/applications-email-panel.png'
77Binary files data/icons/22x22/categories/applications-email-panel.png 1970-01-01 00:00:00 +0000 and data/icons/22x22/categories/applications-email-panel.png 2010-03-04 20:55:23 +0000 differ
78=== modified file 'data/icons/32x32/Makefile.am'
79--- data/icons/32x32/Makefile.am 2009-02-04 16:01:51 +0000
80+++ data/icons/32x32/Makefile.am 2010-03-04 20:55:23 +0000
81@@ -1,1 +1,1 @@
82-SUBDIRS = status
83+SUBDIRS = status categories
84
85=== added directory 'data/icons/32x32/categories'
86=== added file 'data/icons/32x32/categories/Makefile.am'
87--- data/icons/32x32/categories/Makefile.am 1970-01-01 00:00:00 +0000
88+++ data/icons/32x32/categories/Makefile.am 2010-03-04 20:55:23 +0000
89@@ -0,0 +1,9 @@
90+
91+iconsdir = $(INDICATORICONSDIR)/hicolor/32x32/categories
92+
93+icons_DATA = \
94+ applications-email-panel.png \
95+ applications-chat-panel.png
96+
97+EXTRA_DIST = $(icons_DATA)
98+
99
100=== added file 'data/icons/32x32/categories/applications-chat-panel.png'
101Binary files data/icons/32x32/categories/applications-chat-panel.png 1970-01-01 00:00:00 +0000 and data/icons/32x32/categories/applications-chat-panel.png 2010-03-04 20:55:23 +0000 differ
102=== added file 'data/icons/32x32/categories/applications-email-panel.png'
103Binary files data/icons/32x32/categories/applications-email-panel.png 1970-01-01 00:00:00 +0000 and data/icons/32x32/categories/applications-email-panel.png 2010-03-04 20:55:23 +0000 differ
104=== modified file 'data/icons/scalable/Makefile.am'
105--- data/icons/scalable/Makefile.am 2009-02-04 16:01:51 +0000
106+++ data/icons/scalable/Makefile.am 2010-03-04 20:55:23 +0000
107@@ -1,1 +1,1 @@
108-SUBDIRS = status
109+SUBDIRS = status categories
110
111=== added directory 'data/icons/scalable/categories'
112=== added file 'data/icons/scalable/categories/Makefile.am'
113--- data/icons/scalable/categories/Makefile.am 1970-01-01 00:00:00 +0000
114+++ data/icons/scalable/categories/Makefile.am 2010-03-04 20:55:23 +0000
115@@ -0,0 +1,9 @@
116+
117+iconsdir = $(INDICATORICONSDIR)/hicolor/scalable/categories
118+
119+icons_DATA = \
120+ applications-email-panel.svg \
121+ applications-chat-panel.svg
122+
123+EXTRA_DIST = $(icons_DATA)
124+
125
126=== added file 'data/icons/scalable/categories/applications-chat-panel.svg'
127--- data/icons/scalable/categories/applications-chat-panel.svg 1970-01-01 00:00:00 +0000
128+++ data/icons/scalable/categories/applications-chat-panel.svg 2010-03-04 20:55:23 +0000
129@@ -0,0 +1,303 @@
130+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
131+<!-- Created with Inkscape (http://www.inkscape.org/) -->
132+<svg
133+ xmlns:dc="http://purl.org/dc/elements/1.1/"
134+ xmlns:cc="http://web.resource.org/cc/"
135+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
136+ xmlns:svg="http://www.w3.org/2000/svg"
137+ xmlns="http://www.w3.org/2000/svg"
138+ xmlns:xlink="http://www.w3.org/1999/xlink"
139+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
140+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
141+ width="48px"
142+ height="48px"
143+ id="svg2108"
144+ sodipodi:version="0.32"
145+ inkscape:version="0.45"
146+ sodipodi:docbase="/home/dobey/Projects/gnome-icon-theme/scalable/stock/generic"
147+ sodipodi:docname="stock_person.svg"
148+ inkscape:export-filename="/home/jimmac/src/cvs/gnome/gnome-icon-theme/48x48/stock/generic/stock_person.png"
149+ inkscape:export-xdpi="90"
150+ inkscape:export-ydpi="90"
151+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
152+ <defs
153+ id="defs3">
154+ <linearGradient
155+ id="linearGradient4562">
156+ <stop
157+ style="stop-color:#ffffff;stop-opacity:1;"
158+ offset="0"
159+ id="stop4564" />
160+ <stop
161+ style="stop-color:#d6d6d2;stop-opacity:1;"
162+ offset="1"
163+ id="stop4566" />
164+ </linearGradient>
165+ <linearGradient
166+ inkscape:collect="always"
167+ id="linearGradient4356">
168+ <stop
169+ style="stop-color:#000000;stop-opacity:1;"
170+ offset="0"
171+ id="stop4358" />
172+ <stop
173+ style="stop-color:#000000;stop-opacity:0;"
174+ offset="1"
175+ id="stop4360" />
176+ </linearGradient>
177+ <linearGradient
178+ id="linearGradient3824">
179+ <stop
180+ style="stop-color:#ffffff;stop-opacity:1;"
181+ offset="0"
182+ id="stop3826" />
183+ <stop
184+ style="stop-color:#c9c9c9;stop-opacity:1.0000000;"
185+ offset="1.0000000"
186+ id="stop3828" />
187+ </linearGradient>
188+ <linearGradient
189+ inkscape:collect="always"
190+ id="linearGradient3816">
191+ <stop
192+ style="stop-color:#000000;stop-opacity:1;"
193+ offset="0"
194+ id="stop3818" />
195+ <stop
196+ style="stop-color:#000000;stop-opacity:0;"
197+ offset="1"
198+ id="stop3820" />
199+ </linearGradient>
200+ <radialGradient
201+ inkscape:collect="always"
202+ xlink:href="#linearGradient3816"
203+ id="radialGradient3822"
204+ cx="31.112698"
205+ cy="19.008621"
206+ fx="31.112698"
207+ fy="19.008621"
208+ r="8.6620579"
209+ gradientUnits="userSpaceOnUse" />
210+ <linearGradient
211+ inkscape:collect="always"
212+ xlink:href="#linearGradient4356"
213+ id="linearGradient4362"
214+ x1="20.661695"
215+ y1="35.817974"
216+ x2="22.626925"
217+ y2="36.217758"
218+ gradientUnits="userSpaceOnUse"
219+ gradientTransform="matrix(1.3161,0.243028,-0.243028,1.3161,-9.262129,-16.07396)" />
220+ <linearGradient
221+ inkscape:collect="always"
222+ xlink:href="#linearGradient4356"
223+ id="linearGradient4366"
224+ gradientUnits="userSpaceOnUse"
225+ x1="22.686766"
226+ y1="36.390400"
227+ x2="21.408455"
228+ y2="35.739632"
229+ gradientTransform="matrix(-1.308485,0.281154,0.281154,1.308485,57.41196,-17.2385)" />
230+ <linearGradient
231+ inkscape:collect="always"
232+ xlink:href="#linearGradient4356"
233+ id="linearGradient1366"
234+ gradientUnits="userSpaceOnUse"
235+ gradientTransform="matrix(-1.308485,0.281154,0.281154,1.308485,39.09106,-26.21225)"
236+ x1="22.686766"
237+ y1="36.390400"
238+ x2="21.408455"
239+ y2="35.739632" />
240+ <linearGradient
241+ inkscape:collect="always"
242+ xlink:href="#linearGradient3824"
243+ id="linearGradient1372"
244+ gradientUnits="userSpaceOnUse"
245+ gradientTransform="matrix(1.338350,0.000000,0.000000,1.338350,-33.47918,-20.70004)"
246+ x1="30.935921"
247+ y1="29.553486"
248+ x2="30.935921"
249+ y2="35.803486" />
250+ <radialGradient
251+ inkscape:collect="always"
252+ xlink:href="#linearGradient4562"
253+ id="radialGradient4568"
254+ cx="24.753788"
255+ cy="26.814409"
256+ fx="24.753788"
257+ fy="26.814409"
258+ r="17.986024"
259+ gradientTransform="matrix(1.354517,4.451877e-16,-3.340511e-8,1.366395,-8.947464,-9.871365)"
260+ gradientUnits="userSpaceOnUse" />
261+ <radialGradient
262+ inkscape:collect="always"
263+ xlink:href="#linearGradient4562"
264+ id="radialGradient3816"
265+ gradientUnits="userSpaceOnUse"
266+ gradientTransform="matrix(0.558489,1.477485e-16,-1.377346e-8,0.563387,14.87134,4.364123)"
267+ cx="29.922075"
268+ cy="17.727694"
269+ fx="29.922075"
270+ fy="17.727694"
271+ r="17.986024" />
272+ <filter
273+ inkscape:collect="always"
274+ x="-0.076111111"
275+ width="1.1522222"
276+ y="-0.28344828"
277+ height="1.5668966"
278+ id="filter5655">
279+ <feGaussianBlur
280+ inkscape:collect="always"
281+ stdDeviation="1.4531044"
282+ id="feGaussianBlur5657" />
283+ </filter>
284+ </defs>
285+ <sodipodi:namedview
286+ inkscape:showpageshadow="false"
287+ id="base"
288+ pagecolor="#ffffff"
289+ bordercolor="#666666"
290+ borderopacity="0.16862745"
291+ inkscape:pageopacity="0.0"
292+ inkscape:pageshadow="2"
293+ inkscape:zoom="1"
294+ inkscape:cx="31.500535"
295+ inkscape:cy="28.945566"
296+ inkscape:current-layer="layer2"
297+ showgrid="false"
298+ inkscape:grid-bbox="true"
299+ inkscape:document-units="px"
300+ fill="#9db029"
301+ stroke="#727e0a"
302+ inkscape:window-width="872"
303+ inkscape:window-height="815"
304+ inkscape:window-x="202"
305+ inkscape:window-y="68" />
306+ <metadata
307+ id="metadata4">
308+ <rdf:RDF>
309+ <cc:Work
310+ rdf:about="">
311+ <dc:format>image/svg+xml</dc:format>
312+ <dc:type
313+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
314+ <dc:title>Person</dc:title>
315+ <dc:creator>
316+ <cc:Agent>
317+ <dc:title>Jakub Steiner</dc:title>
318+ </cc:Agent>
319+ </dc:creator>
320+ <dc:source>http://jimmac.musichall.cz</dc:source>
321+ <dc:subject>
322+ <rdf:Bag>
323+ <rdf:li>user</rdf:li>
324+ <rdf:li>person</rdf:li>
325+ </rdf:Bag>
326+ </dc:subject>
327+ <cc:license
328+ rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" />
329+ </cc:Work>
330+ <cc:License
331+ rdf:about="http://creativecommons.org/licenses/GPL/2.0/">
332+ <cc:permits
333+ rdf:resource="http://web.resource.org/cc/Reproduction" />
334+ <cc:permits
335+ rdf:resource="http://web.resource.org/cc/Distribution" />
336+ <cc:requires
337+ rdf:resource="http://web.resource.org/cc/Notice" />
338+ <cc:permits
339+ rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
340+ <cc:requires
341+ rdf:resource="http://web.resource.org/cc/ShareAlike" />
342+ <cc:requires
343+ rdf:resource="http://web.resource.org/cc/SourceCode" />
344+ </cc:License>
345+ </rdf:RDF>
346+ </metadata>
347+ <g
348+ id="layer1"
349+ inkscape:label="cipek"
350+ inkscape:groupmode="layer"
351+ style="display:inline">
352+ <path
353+ style="opacity:1;color:#000000;fill:url(#linearGradient1372);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;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"
354+ d="M 13.365469,24.850231 L 19.043607,24.850231 L 15.731361,21.774572 L 15.021593,22.720929 L 14.311825,22.011162 L 13.365469,24.850231 z "
355+ id="path4173" />
356+ <path
357+ sodipodi:nodetypes="cccc"
358+ id="path4370"
359+ d="M 19.882923,32.490544 C 21.530768,31.712992 22.297815,29.810737 22.297815,29.810737 C 21.014177,24.39981 16.976336,20.652646 16.976336,20.652646 C 16.976336,20.652646 20.274824,29.141269 19.882923,32.490544 z "
360+ style="opacity:0.22784807;color:#000000;fill:url(#linearGradient1366);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;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" />
361+ </g>
362+ <g
363+ inkscape:groupmode="layer"
364+ id="layer2"
365+ inkscape:label="dalsi cipek"
366+ style="display:inline">
367+ <rect
368+ style="opacity:0.34857143;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.30000001;stroke-linecap:butt;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:block;overflow:visible;filter:url(#filter5655);enable-background:accumulate"
369+ id="rect4608"
370+ width="38.183765"
371+ height="10.253048"
372+ x="5.3033009"
373+ y="35.448853"
374+ rx="5.126524"
375+ ry="5.126524"
376+ transform="matrix(0.9351852,0,0,0.9351852,1.5811694,2.2763322)" />
377+ <path
378+ style="opacity:1;color:#000000;fill:url(#radialGradient4568);fill-opacity:1.0;fill-rule:evenodd;stroke:#888a85;stroke-width:0.99999982px;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"
379+ d="M 17.918908,43.517006 L 32.114254,43.517006 C 36.136269,43.517006 40.118235,42.042236 41.577816,37.838868 C 42.963864,33.847271 41.814406,26.246002 32.824021,20.094686 L 16.026195,20.094686 C 7.0358098,25.772823 5.9122958,33.538186 7.9821665,38.075456 C 10.090864,42.697836 13.660304,43.517006 17.918908,43.517006 z "
380+ id="path4308"
381+ sodipodi:nodetypes="cczcczc" />
382+ <path
383+ sodipodi:nodetypes="cccc"
384+ id="path4364"
385+ d="M 38.203826,41.464292 C 39.851671,40.68674 40.618718,38.784486 40.618718,38.784486 C 39.33508,33.373558 35.297238,29.626395 35.297238,29.626395 C 35.297238,29.626395 38.595727,38.115017 38.203826,41.464292 z "
386+ style="opacity:0.29120878;color:#000000;fill:url(#linearGradient4366);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;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"
387+ inkscape:r_cx="true"
388+ inkscape:r_cy="true" />
389+ <path
390+ style="opacity:0.54945056;color:#000000;fill:url(#linearGradient4362);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;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"
391+ d="M 11.642995,42.046125 C 9.9732599,41.316765 9.2259419,39.559099 9.2259419,39.559099 C 10.351871,34.11317 14.204505,30.128795 14.204505,30.128795 C 14.204505,30.128795 11.153975,38.709646 11.642995,42.046125 z "
392+ id="path4354"
393+ sodipodi:nodetypes="cccc"
394+ inkscape:r_cx="true"
395+ inkscape:r_cy="true" />
396+ <path
397+ sodipodi:nodetypes="cczcczc"
398+ id="path4314"
399+ d="M 17.593144,42.482789 L 32.120832,42.452196 C 35.775407,42.452196 39.393589,41.112158 40.719828,37.292799 C 41.97925,33.665864 40.58869,26.759027 32.419643,21.169679 L 16.464198,20.833163 C 8.295151,25.99256 6.714018,33.0485 8.6253819,37.507773 C 10.536748,41.967046 13.325894,42.452196 17.593144,42.482789 z "
400+ style="opacity:0.64285714;color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.99999988px;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" />
401+ <path
402+ d="M 39.774755 19.008621 A 8.6620579 8.6620579 0 1 1 22.45064,19.008621 A 8.6620579 8.6620579 0 1 1 39.774755 19.008621 z"
403+ sodipodi:ry="8.6620579"
404+ sodipodi:rx="8.6620579"
405+ sodipodi:cy="19.008621"
406+ sodipodi:cx="31.112698"
407+ id="path4318"
408+ style="opacity:1;color:#000000;fill:url(#radialGradient3822);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;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"
409+ sodipodi:type="arc"
410+ transform="matrix(1.338350,0.000000,0.000000,1.338350,-17.02698,-7.522361)" />
411+ <path
412+ sodipodi:type="arc"
413+ style="opacity:1;color:#000000;fill:url(#radialGradient3816);fill-opacity:1;fill-rule:evenodd;stroke:#888a85;stroke-width:0.74718857px;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"
414+ id="path4320"
415+ sodipodi:cx="31.112698"
416+ sodipodi:cy="19.008621"
417+ sodipodi:rx="8.6620579"
418+ sodipodi:ry="8.6620579"
419+ d="M 39.774755 19.008621 A 8.6620579 8.6620579 0 1 1 22.45064,19.008621 A 8.6620579 8.6620579 0 1 1 39.774755 19.008621 z"
420+ transform="matrix(1.338350,0.000000,0.000000,1.338350,-16.85969,-12.20659)" />
421+ <path
422+ d="M 39.774755 19.008621 A 8.6620579 8.6620579 0 1 1 22.45064,19.008621 A 8.6620579 8.6620579 0 1 1 39.774755 19.008621 z"
423+ sodipodi:ry="8.6620579"
424+ sodipodi:rx="8.6620579"
425+ sodipodi:cy="19.008621"
426+ sodipodi:cx="31.112698"
427+ id="path4322"
428+ style="opacity:0.19620254;color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.82296228px;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"
429+ sodipodi:type="arc"
430+ transform="matrix(1.215123,0.000000,0.000000,1.215123,-13.02574,-9.864199)" />
431+ </g>
432+</svg>
433
434=== added file 'data/icons/scalable/categories/applications-email-panel.svg'
435--- data/icons/scalable/categories/applications-email-panel.svg 1970-01-01 00:00:00 +0000
436+++ data/icons/scalable/categories/applications-email-panel.svg 2010-03-04 20:55:23 +0000
437@@ -0,0 +1,354 @@
438+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
439+<!-- Created with Inkscape (http://www.inkscape.org/) -->
440+<svg
441+ xmlns:dc="http://purl.org/dc/elements/1.1/"
442+ xmlns:cc="http://web.resource.org/cc/"
443+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
444+ xmlns:svg="http://www.w3.org/2000/svg"
445+ xmlns="http://www.w3.org/2000/svg"
446+ xmlns:xlink="http://www.w3.org/1999/xlink"
447+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
448+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
449+ sodipodi:docname="emblem-mail.svg"
450+ sodipodi:docbase="/home/dobey/Projects/gnome-icon-theme/scalable/emblems"
451+ inkscape:version="0.45"
452+ sodipodi:version="0.32"
453+ id="svg2"
454+ height="48"
455+ width="48"
456+ inkscape:output_extension="org.inkscape.output.svg.inkscape"
457+ version="1.0">
458+ <defs
459+ id="defs3">
460+ <linearGradient
461+ inkscape:collect="always"
462+ id="linearGradient5060">
463+ <stop
464+ style="stop-color:black;stop-opacity:1;"
465+ offset="0"
466+ id="stop5062" />
467+ <stop
468+ style="stop-color:black;stop-opacity:0;"
469+ offset="1"
470+ id="stop5064" />
471+ </linearGradient>
472+ <linearGradient
473+ id="linearGradient5048">
474+ <stop
475+ style="stop-color:black;stop-opacity:0;"
476+ offset="0"
477+ id="stop5050" />
478+ <stop
479+ id="stop5056"
480+ offset="0.5"
481+ style="stop-color:black;stop-opacity:1;" />
482+ <stop
483+ style="stop-color:black;stop-opacity:0;"
484+ offset="1"
485+ id="stop5052" />
486+ </linearGradient>
487+ <linearGradient
488+ id="linearGradient6932"
489+ inkscape:collect="always">
490+ <stop
491+ id="stop6934"
492+ offset="0"
493+ style="stop-color:#000000;stop-opacity:1;" />
494+ <stop
495+ id="stop6936"
496+ offset="1"
497+ style="stop-color:#000000;stop-opacity:0;" />
498+ </linearGradient>
499+ <linearGradient
500+ id="linearGradient6945"
501+ inkscape:collect="always">
502+ <stop
503+ id="stop6947"
504+ offset="0"
505+ style="stop-color:#ffffff;stop-opacity:1" />
506+ <stop
507+ id="stop6949"
508+ offset="1"
509+ style="stop-color:#d3d7cf;stop-opacity:1" />
510+ </linearGradient>
511+ <linearGradient
512+ id="linearGradient6984"
513+ inkscape:collect="always">
514+ <stop
515+ id="stop6986"
516+ offset="0"
517+ style="stop-color:#babdb6;stop-opacity:1;" />
518+ <stop
519+ id="stop6988"
520+ offset="1"
521+ style="stop-color:#babdb6;stop-opacity:0;" />
522+ </linearGradient>
523+ <linearGradient
524+ inkscape:collect="always"
525+ xlink:href="#linearGradient6984"
526+ id="linearGradient4867"
527+ gradientUnits="userSpaceOnUse"
528+ gradientTransform="matrix(1.0547771,0,0,1.1085444,-1.2858005,-43.733935)"
529+ x1="14.125"
530+ y1="79.81311"
531+ x2="14.125"
532+ y2="76.624176" />
533+ <radialGradient
534+ inkscape:collect="always"
535+ xlink:href="#linearGradient6945"
536+ id="radialGradient4870"
537+ gradientUnits="userSpaceOnUse"
538+ gradientTransform="matrix(2.7512006,0,0,2.39991,-28.648174,-124.78848)"
539+ cx="13.107393"
540+ cy="61.48016"
541+ fx="13.107393"
542+ fy="61.48016"
543+ r="18.5" />
544+ <radialGradient
545+ inkscape:collect="always"
546+ xlink:href="#linearGradient6945"
547+ id="radialGradient4892"
548+ gradientUnits="userSpaceOnUse"
549+ gradientTransform="matrix(-2.7512006,0,0,0.7364784,75.651099,-1.4630379)"
550+ cx="19.371983"
551+ cy="41.331757"
552+ fx="19.371983"
553+ fy="41.331757"
554+ r="18.5" />
555+ <linearGradient
556+ inkscape:collect="always"
557+ xlink:href="#linearGradient5048"
558+ id="linearGradient4903"
559+ gradientUnits="userSpaceOnUse"
560+ gradientTransform="matrix(2.774389,0,0,1.969706,-1892.179,-872.8854)"
561+ x1="302.85715"
562+ y1="366.64789"
563+ x2="302.85715"
564+ y2="609.50507" />
565+ <radialGradient
566+ inkscape:collect="always"
567+ xlink:href="#linearGradient5060"
568+ id="radialGradient4905"
569+ gradientUnits="userSpaceOnUse"
570+ gradientTransform="matrix(2.774389,0,0,1.969706,-1891.633,-872.8854)"
571+ cx="605.71429"
572+ cy="486.64789"
573+ fx="605.71429"
574+ fy="486.64789"
575+ r="117.14286" />
576+ <radialGradient
577+ inkscape:collect="always"
578+ xlink:href="#linearGradient5060"
579+ id="radialGradient4907"
580+ gradientUnits="userSpaceOnUse"
581+ gradientTransform="matrix(-2.774389,0,0,1.969706,112.7623,-872.8854)"
582+ cx="605.71429"
583+ cy="486.64789"
584+ fx="605.71429"
585+ fy="486.64789"
586+ r="117.14286" />
587+ <linearGradient
588+ inkscape:collect="always"
589+ xlink:href="#linearGradient6932"
590+ id="linearGradient5499"
591+ gradientUnits="userSpaceOnUse"
592+ x1="32.625"
593+ y1="68.4375"
594+ x2="32.625"
595+ y2="63.498707" />
596+ </defs>
597+ <sodipodi:namedview
598+ inkscape:window-y="102"
599+ inkscape:window-x="130"
600+ inkscape:window-height="960"
601+ inkscape:window-width="957"
602+ inkscape:guide-bbox="true"
603+ showguides="true"
604+ showgrid="false"
605+ inkscape:current-layer="layer1"
606+ inkscape:document-units="px"
607+ inkscape:cy="17.921325"
608+ inkscape:cx="30.097753"
609+ inkscape:zoom="1"
610+ inkscape:pageshadow="2"
611+ inkscape:pageopacity="0.0"
612+ borderopacity="1"
613+ bordercolor="#dedede"
614+ pagecolor="#ffffff"
615+ id="base"
616+ width="48px"
617+ height="48px"
618+ borderlayer="true"
619+ inkscape:showpageshadow="false">
620+ <inkscape:grid
621+ type="xygrid"
622+ id="grid4899" />
623+ </sodipodi:namedview>
624+ <metadata
625+ id="metadata4">
626+ <rdf:RDF>
627+ <cc:Work
628+ rdf:about="">
629+ <dc:format>image/svg+xml</dc:format>
630+ <dc:type
631+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
632+ <dc:title>Mail Emblem</dc:title>
633+ <dc:date>2005-02-19</dc:date>
634+ <dc:creator>
635+ <cc:Agent>
636+ <dc:title>Lapo Calamandrei</dc:title>
637+ </cc:Agent>
638+ </dc:creator>
639+ <dc:description>Mail emblem</dc:description>
640+ <dc:contributor>
641+ <cc:Agent>
642+ <dc:title>Jakub Steiner
643+Andreas Nilsson</dc:title>
644+ </cc:Agent>
645+ </dc:contributor>
646+ <cc:license
647+ rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" />
648+ <dc:subject>
649+ <rdf:Bag>
650+ <rdf:li>mail</rdf:li>
651+ <rdf:li>message</rdf:li>
652+ <rdf:li>e-mail</rdf:li>
653+ </rdf:Bag>
654+ </dc:subject>
655+ <dc:rights>
656+ <cc:Agent>
657+ <dc:title>Lapo Calamandrei, Andreas Nilsson, Novell Inc.</dc:title>
658+ </cc:Agent>
659+ </dc:rights>
660+ </cc:Work>
661+ <cc:License
662+ rdf:about="http://creativecommons.org/licenses/GPL/2.0/">
663+ <cc:permits
664+ rdf:resource="http://web.resource.org/cc/Reproduction" />
665+ <cc:permits
666+ rdf:resource="http://web.resource.org/cc/Distribution" />
667+ <cc:requires
668+ rdf:resource="http://web.resource.org/cc/Notice" />
669+ <cc:permits
670+ rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
671+ <cc:requires
672+ rdf:resource="http://web.resource.org/cc/ShareAlike" />
673+ <cc:requires
674+ rdf:resource="http://web.resource.org/cc/SourceCode" />
675+ </cc:License>
676+ </rdf:RDF>
677+ </metadata>
678+ <g
679+ id="layer1"
680+ inkscape:groupmode="layer"
681+ inkscape:label="Layer 1">
682+ <g
683+ style="opacity:0.7;display:inline"
684+ id="g6055"
685+ transform="matrix(2.2855337e-2,0,0,1.7811354e-2,43.828349,41.602703)">
686+ <rect
687+ y="-150.69685"
688+ x="-1559.2523"
689+ height="478.35718"
690+ width="1339.6335"
691+ id="rect6057"
692+ style="opacity:0.39195981;color:#000000;fill:url(#linearGradient4903);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;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" />
693+ <path
694+ sodipodi:nodetypes="cccc"
695+ id="path6059"
696+ d="M -219.61876,-150.68038 C -219.61876,-150.68038 -219.61876,327.65041 -219.61876,327.65041 C -76.744594,328.55086 125.78146,220.48075 125.78138,88.454235 C 125.78138,-43.572302 -33.655436,-150.68036 -219.61876,-150.68038 z"
697+ style="opacity:0.40206185;color:#000000;fill:url(#radialGradient4905);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;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" />
698+ <path
699+ style="opacity:0.40206185;color:#000000;fill:url(#radialGradient4907);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;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"
700+ d="M -1559.2523,-150.68038 C -1559.2523,-150.68038 -1559.2523,327.65041 -1559.2523,327.65041 C -1702.1265,328.55086 -1904.6525,220.48075 -1904.6525,88.454235 C -1904.6525,-43.572302 -1745.2157,-150.68036 -1559.2523,-150.68038 z"
701+ id="path6061"
702+ sodipodi:nodetypes="cccc" />
703+ </g>
704+ <path
705+ style="fill:url(#radialGradient4892);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.99999987999999995;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:0.69999992000000000;stroke-opacity:0.99236641999999997"
706+ d="M 23.501461,2.3751864 C 17.676241,2.3751864 17.172799,3.4805995 16.118021,4.5860168 L 4.5154734,16.745584 L 4.5154734,18.300075 L 4.5154734,18.507341 L 4.5154734,42.826475 C 4.5154734,43.69254 5.1723632,44.380967 5.9987537,44.380966 L 41.004168,44.380966 C 41.830559,44.380966 42.487448,43.692539 42.487448,42.826475 L 42.487448,18.507341 L 42.487448,18.300075 L 42.487448,16.745584 L 30.884901,4.5860168 C 29.830123,3.4806017 29.302735,2.3751842 23.501461,2.3751864 z"
707+ id="rect5931" />
708+ <path
709+ style="opacity:1;color:#000000;fill:#f2f2f0;fill-opacity:1;fill-rule:evenodd;stroke:#aeaeae;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;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;enable-background:accumulate"
710+ d="M 8.3085047,25.792 L 34.029514,14.743457 L 40.305087,30.034641 L 11.667262,35.42633 L 8.3085047,25.792 z"
711+ id="path4909" />
712+ <path
713+ style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#888a85;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:0.69999992;stroke-opacity:0.99236642"
714+ d="M 42.487448,19.612755 L 42.487448,16.787167 L 30.884901,4.8039527 C 29.830123,3.7145696 29.302735,2.6251842 23.501461,2.6251864 C 17.676241,2.6251864 17.172799,3.7145674 16.118022,4.8039527 L 4.5154734,16.787167 L 4.5154734,19.612755"
715+ id="path7161"
716+ sodipodi:nodetypes="ccccccc" />
717+ <path
718+ style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
719+ d="M 5.13251,21.443598 L 15.661218,34.259506 C 16.152156,34.778168 16.638266,35.458613 17.721182,35.917629 C 18.804098,36.376645 20.424347,36.643057 23.345212,36.643057 C 26.25433,36.643059 27.884085,36.376203 28.969243,35.917629 C 30.0544,35.459055 30.53687,34.779645 31.029207,34.259506 L 41.525217,21.581775 L 31.029207,32.601383 C 30.53687,33.121522 30.0544,33.800932 28.969243,34.259506 C 27.884085,34.71808 26.25433,34.984936 23.345212,34.984935 C 20.424347,34.984935 18.804098,34.718522 17.721182,34.259506 C 16.638266,33.80049 16.152156,33.120045 15.661218,32.601383 L 5.13251,21.443598 z"
720+ id="path7112"
721+ sodipodi:nodetypes="ccssscccssscc" />
722+ <path
723+ sodipodi:type="inkscape:offset"
724+ inkscape:radius="0.5"
725+ inkscape:original="M 6.90625 55.5 C 6.1227756 55.5 5.5 56.122774 5.5 56.90625 L 5.5 58.5 L 16.5 69.5 C 17.5 70.500002 17.977297 71.5 23.5 71.5 C 29 71.500002 29.5 70.5 30.5 69.5 L 41.5 58.5 L 41.5 56.90625 C 41.5 56.122776 40.877226 55.5 40.09375 55.5 L 6.90625 55.5 z "
726+ style="opacity:0.16791047000000001;fill:url(#linearGradient5499);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
727+ id="path6930"
728+ d="M 6.90625,55 C 5.8578131,55 5,55.857811 5,56.90625 L 5,58.5 C 5.0051575,58.6306 5.0612439,58.75399 5.15625,58.84375 L 16.15625,69.84375 C 16.62545,70.312951 17.090035,70.928507 18.125,71.34375 C 19.159965,71.758993 20.70847,72 23.5,72 C 26.280303,72.000001 27.837893,71.758593 28.875,71.34375 C 29.912107,70.928907 30.373213,70.314287 30.84375,69.84375 L 41.84375,58.84375 C 41.938756,58.75399 41.994842,58.6306 42,58.5 L 42,56.90625 C 42,55.857813 41.142189,55 40.09375,55 L 6.90625,55 z"
729+ transform="matrix(1.0463312,0,0,1.1054152,-1.3060708,-44.54246)" />
730+ <path
731+ style="opacity:1;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;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;enable-background:accumulate"
732+ d="M 33.6875,15.4375 L 9.5,25.75 L 10,26.3125 L 33.25,17.0625 L 37.25,26.0625 L 37.8125,25.5 L 33.6875,15.4375 z"
733+ id="path5492" />
734+ <path
735+ style="opacity:1;fill:#abaca9;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
736+ d="M 5.13251,21.443598 L 15.661218,31.298676 C 16.152156,31.817337 16.638266,32.497782 17.721182,32.956798 C 18.804098,33.415814 20.424347,33.682227 23.345212,33.682227 C 26.25433,33.682228 27.884085,33.415372 28.969243,32.956798 C 30.0544,32.498225 30.53687,31.818814 31.029207,31.298676 L 41.525217,21.581775 L 31.029207,32.601383 C 30.53687,33.121522 30.0544,33.800932 28.969243,34.259506 C 27.884085,34.71808 26.25433,34.984936 23.345212,34.984935 C 20.424347,34.984935 18.804098,34.718522 17.721182,34.259506 C 16.638266,33.80049 16.152156,33.120045 15.661218,32.601383 L 5.13251,21.443598 z"
737+ id="path7128"
738+ sodipodi:nodetypes="ccssscccssscc" />
739+ <path
740+ style="fill:url(#radialGradient4870);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.89999998;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
741+ d="M 23.501461,30.010568 C 18.227575,30.010568 17.172799,31.092185 16.118021,32.173804 L 4.9439766,43.632199 C 5.2135977,43.90868 5.5855575,44.071605 5.9987537,44.071607 L 41.004168,44.071607 C 41.417363,44.071607 41.789323,43.90868 42.058945,43.632199 L 30.884901,32.173804 C 29.830123,31.092185 28.775346,30.010568 23.501461,30.010568 z"
742+ id="path6902" />
743+ <path
744+ style="opacity:0.55597014;fill:url(#linearGradient4867);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.99999988;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:0.69999992;stroke-opacity:0.99236642"
745+ d="M 5.042862,39.302964 L 5.042862,42.836449 C 5.042862,43.414008 5.4492052,43.841067 5.9987537,43.841067 L 41.004168,43.841067 C 41.553715,43.841067 41.960059,43.414008 41.960059,42.836449 L 41.960059,39.302964 L 5.042862,39.302964 z"
746+ id="path6980"
747+ sodipodi:nodetypes="ccccccc" />
748+ <path
749+ style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#888a85;stroke-width:0.99999988;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:0.69999992;stroke-opacity:0.99236642"
750+ d="M 4.5154734,18.507341 L 4.5154734,42.984035 C 4.5154734,43.855712 5.1723633,44.548599 5.9987537,44.548597 L 41.004168,44.548597 C 41.830559,44.548597 42.487448,43.855711 42.487448,42.984035 L 42.487448,18.507341"
751+ id="path7174"
752+ sodipodi:nodetypes="cccccc" />
753+ <path
754+ style="opacity:1;color:#000000;fill:#e8eae6;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;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;enable-background:accumulate"
755+ d="M 41.807689,21.410272 L 32.095694,32.864146 L 41.807689,43.330583 L 41.807689,21.410272 z"
756+ id="path5488"
757+ sodipodi:nodetypes="cccc" />
758+ <path
759+ id="path5490"
760+ d="M 5.100505,21.597772 L 15,33.176646 L 5.100505,43.830583 L 5.100505,21.597772 z"
761+ style="opacity:1;color:#000000;fill:#e8eae6;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;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;enable-background:accumulate"
762+ sodipodi:nodetypes="cccc" />
763+ <g
764+ id="g6320"
765+ transform="matrix(1.0547769,0,0,1.1115624,-61.671781,-2.8573157)">
766+ <path
767+ sodipodi:nodetypes="ccssscccccc"
768+ id="path7039"
769+ d="M 63.25,41.970971 L 73.40625,30.627221 C 73.875623,30.157847 74.3406,29.542237 75.375,29.127221 C 76.4094,28.712205 77.95864,28.470971 80.75,28.470971 C 83.530132,28.47097 85.088454,28.712602 86.125,29.127221 C 87.161546,29.54184 87.623047,30.156518 88.09375,30.627221 L 98.25,41.970971 L 88.103408,32.175118 C 86.059401,30.205524 83.585161,29.902961 80.759658,30.018868 C 78.088808,30.068408 75.295355,30.018538 73.415908,32.175118 L 63.25,41.970971 z"
770+ style="fill:#abaca9;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.89999998000000003;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
771+ <path
772+ sodipodi:nodetypes="ccccccccc"
773+ id="path7049"
774+ d="M 63.25,41.99247 L 73.415908,33.404596 C 75.295355,31.286609 78.088808,31.335586 80.759658,31.286933 C 83.585161,31.1731 86.059401,31.470249 88.103408,33.404596 L 98.25,41.99247 L 88.09375,31.833825 C 86.049743,29.899478 83.575503,29.60233 80.75,29.716162 C 78.07915,29.764816 75.285697,29.715838 73.40625,31.833825 L 63.25,41.99247 z"
775+ style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.89999998;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
776+ </g>
777+ <path
778+ style="opacity:0.594697;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:0.69999992;stroke-opacity:0.99236642"
779+ d="M 5.9526019,42.29695 C 5.9526019,42.837853 6.1023378,43.137859 6.3723002,43.137856 L 40.658427,43.137856 C 40.92839,43.137856 41.078125,42.83785 41.078125,42.29695"
780+ id="path7293"
781+ sodipodi:nodetypes="cccc" />
782+ <path
783+ sodipodi:type="inkscape:offset"
784+ inkscape:radius="-0.98534405"
785+ inkscape:original="M 24.5 4.5 C 18.977297 4.5 18.5 5.499998 17.5 6.5 L 6.5 17.5 L 6.5 18.90625 L 6.5 19.09375 L 6.5 41.09375 C 6.5 41.877225 7.1227756 42.500002 7.90625 42.5 L 41.09375 42.5 C 41.877224 42.5 42.5 41.877224 42.5 41.09375 L 42.5 19.09375 L 42.5 18.90625 L 42.5 17.5 L 31.5 6.5 C 30.5 5.5 30 4.499998 24.5 4.5 z "
786+ style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.92304754;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:0.69999992;stroke-opacity:0.99236642"
787+ id="path6064"
788+ d="M 24.5,5.5 C 21.798121,5.5 20.393246,5.7355566 19.65625,6.03125 C 18.919254,6.3269434 18.748198,6.6268011 18.1875,7.1875 L 7.5,17.875 L 7.5,18.90625 L 7.5,19.09375 L 7.5,41.09375 C 7.5,41.355066 7.6449379,41.500001 7.90625,41.5 L 41.09375,41.5 C 41.355064,41.5 41.5,41.355064 41.5,41.09375 L 41.5,19.09375 L 41.5,18.90625 L 41.5,17.875 L 30.8125,7.1875 C 30.254438,6.6294378 30.053706,6.3277326 29.3125,6.03125 C 28.571294,5.7347674 27.190282,5.499999 24.5,5.5 z"
789+ transform="matrix(1.0606772,0,0,1.1065437,-2.5163795,-2.4843841)" />
790+ </g>
791+</svg>
792
793=== modified file 'po/POTFILES.in'
794--- po/POTFILES.in 2009-09-15 21:13:51 +0000
795+++ po/POTFILES.in 2010-03-04 20:55:23 +0000
796@@ -2,6 +2,7 @@
797 src/messages-service-dbus.c
798 src/indicator-messages.c
799 src/messages-service.c
800+src/default-applications.c
801 src/launcher-menu-item.c
802 src/im-menu-item.c
803 src/app-menu-item.c
804
805=== modified file 'src/Makefile.am'
806--- src/Makefile.am 2009-09-09 14:52:36 +0000
807+++ src/Makefile.am 2010-03-04 20:55:23 +0000
808@@ -20,6 +20,8 @@
809 ######################################
810
811 indicator_messages_service_SOURCES = \
812+ default-applications.h \
813+ default-applications.c \
814 messages-service.c \
815 messages-service-server.h \
816 messages-service-dbus.c \
817
818=== modified file 'src/app-menu-item.c'
819--- src/app-menu-item.c 2010-02-18 17:23:29 +0000
820+++ src/app-menu-item.c 2010-03-04 20:55:23 +0000
821@@ -30,6 +30,7 @@
822 #include <libdbusmenu-glib/menuitem-proxy.h>
823 #include "app-menu-item.h"
824 #include "dbus-data.h"
825+#include "default-applications.h"
826
827 enum {
828 COUNT_CHANGED,
829@@ -233,15 +234,20 @@
830 update_label (AppMenuItem * self)
831 {
832 AppMenuItemPrivate * priv = APP_MENU_ITEM_GET_PRIVATE(self);
833+ const gchar * name = get_default_name(priv->desktop);
834+
835+ if (name == NULL) {
836+ name = app_menu_item_get_name(self);
837+ }
838
839 if (priv->unreadcount > 0) {
840 /* TRANSLATORS: This is the name of the program and the number of indicators. So it
841 would read something like "Mail Client (5)" */
842- gchar * label = g_strdup_printf(_("%s (%d)"), app_menu_item_get_name(self), priv->unreadcount);
843+ gchar * label = g_strdup_printf(_("%s (%d)"), _(name), priv->unreadcount);
844 dbusmenu_menuitem_property_set(DBUSMENU_MENUITEM(self), DBUSMENU_MENUITEM_PROP_LABEL, label);
845 g_free(label);
846 } else {
847- dbusmenu_menuitem_property_set(DBUSMENU_MENUITEM(self), DBUSMENU_MENUITEM_PROP_LABEL, app_menu_item_get_name(self));
848+ dbusmenu_menuitem_property_set(DBUSMENU_MENUITEM(self), DBUSMENU_MENUITEM_PROP_LABEL, _(name));
849 }
850
851 return;
852@@ -308,10 +314,15 @@
853
854 update_label(self);
855
856- GIcon * icon = g_app_info_get_icon(priv->appinfo);
857- gchar * iconstr = g_icon_to_string(icon);
858- dbusmenu_menuitem_property_set(DBUSMENU_MENUITEM(self), DBUSMENU_MENUITEM_PROP_ICON_NAME, iconstr);
859- g_free(iconstr);
860+ const gchar * def_icon = get_default_icon(priv->desktop);
861+ if (def_icon == NULL) {
862+ GIcon * icon = g_app_info_get_icon(priv->appinfo);
863+ gchar * iconstr = g_icon_to_string(icon);
864+ dbusmenu_menuitem_property_set(DBUSMENU_MENUITEM(self), DBUSMENU_MENUITEM_PROP_ICON_NAME, iconstr);
865+ g_free(iconstr);
866+ } else {
867+ dbusmenu_menuitem_property_set(DBUSMENU_MENUITEM(self), DBUSMENU_MENUITEM_PROP_ICON_NAME, def_icon);
868+ }
869
870 g_signal_emit(G_OBJECT(self), signals[NAME_CHANGED], 0, app_menu_item_get_name(self), TRUE);
871
872
873=== added file 'src/default-applications.c'
874--- src/default-applications.c 1970-01-01 00:00:00 +0000
875+++ src/default-applications.c 2010-03-04 20:55:23 +0000
876@@ -0,0 +1,91 @@
877+/*
878+Looking for the default applications. A quick lookup.
879+
880+Copyright 2010 Canonical Ltd.
881+
882+Authors:
883+ Ted Gould <ted@canonical.com>
884+
885+This program is free software: you can redistribute it and/or modify it
886+under the terms of the GNU General Public License version 3, as published
887+by the Free Software Foundation.
888+
889+This program is distributed in the hope that it will be useful, but
890+WITHOUT ANY WARRANTY; without even the implied warranties of
891+MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
892+PURPOSE. See the GNU General Public License for more details.
893+
894+You should have received a copy of the GNU General Public License along
895+with this program. If not, see <http://www.gnu.org/licenses/>.
896+*/
897+
898+#include <glib.h>
899+#include <glib/gi18n.h>
900+#include "default-applications.h"
901+
902+struct default_db_t {
903+ const gchar * desktop_file;
904+ const gchar * name;
905+ const gchar * setupname;
906+ const gchar * icon;
907+};
908+
909+struct default_db_t default_db[] = {
910+ {"evolution.desktop", N_("Mail"), N_("Set Up Mail..."), "applications-email-panel"},
911+ {"empathy.desktop", N_("Chat"), N_("Set Up Chat..."), "applications-chat-panel"},
912+ {"gwibber.desktop", N_("Microblogging"), N_("Set Up Microblogging..."), "applications-microblogging-panel"},
913+ {NULL, NULL}
914+};
915+
916+static struct default_db_t *
917+get_default_helper (const gchar * desktop_path)
918+{
919+ g_return_val_if_fail(desktop_path != NULL, NULL);
920+ gchar * basename = g_path_get_basename(desktop_path);
921+ g_return_val_if_fail(basename != NULL, NULL);
922+
923+ gint i;
924+ for (i = 0; default_db[i].desktop_file != NULL; i++) {
925+ if (g_strcmp0(default_db[i].desktop_file, basename) == 0) {
926+ break;
927+ }
928+ }
929+
930+ g_free(basename);
931+
932+ if (default_db[i].desktop_file != NULL) {
933+ return &default_db[i];
934+ }
935+
936+ return NULL;
937+}
938+
939+const gchar *
940+get_default_name (const gchar * desktop_path)
941+{
942+ struct default_db_t * db = get_default_helper(desktop_path);
943+
944+ if (db == NULL)
945+ return NULL;
946+ return db->name;
947+}
948+
949+const gchar *
950+get_default_setup (const gchar * desktop_path)
951+{
952+ struct default_db_t * db = get_default_helper(desktop_path);
953+
954+ if (db == NULL)
955+ return NULL;
956+ return db->setupname;
957+}
958+
959+const gchar *
960+get_default_icon (const gchar * desktop_path)
961+{
962+ struct default_db_t * db = get_default_helper(desktop_path);
963+
964+ if (db == NULL)
965+ return NULL;
966+ return db->icon;
967+}
968
969=== added file 'src/default-applications.h'
970--- src/default-applications.h 1970-01-01 00:00:00 +0000
971+++ src/default-applications.h 2010-03-04 20:55:23 +0000
972@@ -0,0 +1,30 @@
973+/*
974+Looking for the default applications. A quick lookup.
975+
976+Copyright 2010 Canonical Ltd.
977+
978+Authors:
979+ Ted Gould <ted@canonical.com>
980+
981+This program is free software: you can redistribute it and/or modify it
982+under the terms of the GNU General Public License version 3, as published
983+by the Free Software Foundation.
984+
985+This program is distributed in the hope that it will be useful, but
986+WITHOUT ANY WARRANTY; without even the implied warranties of
987+MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
988+PURPOSE. See the GNU General Public License for more details.
989+
990+You should have received a copy of the GNU General Public License along
991+with this program. If not, see <http://www.gnu.org/licenses/>.
992+*/
993+
994+#ifndef DEFAULT_APPLICATIONS_H__
995+#define DEFAULT_APPLICATIONS_H__ 1
996+
997+const gchar * get_default_name (const gchar * desktop_path);
998+const gchar * get_default_setup (const gchar * desktop_path);
999+const gchar * get_default_icon (const gchar * desktop_path);
1000+
1001+#endif /* DEFAULT_APPLICATIONS_H__ */
1002+
1003
1004=== modified file 'src/launcher-menu-item.c'
1005--- src/launcher-menu-item.c 2010-02-18 17:23:29 +0000
1006+++ src/launcher-menu-item.c 2010-03-04 20:55:23 +0000
1007@@ -30,6 +30,7 @@
1008 #include <libindicator/indicator-desktop-shortcuts.h>
1009 #include "launcher-menu-item.h"
1010 #include "dbus-data.h"
1011+#include "default-applications.h"
1012
1013 enum {
1014 NAME_CHANGED,
1015@@ -161,8 +162,20 @@
1016 /* Set the appropriate values on this menu item based on the
1017 app info that we've parsed */
1018 g_debug("\tName: %s", launcher_menu_item_get_name(self));
1019- dbusmenu_menuitem_property_set(DBUSMENU_MENUITEM(self), DBUSMENU_MENUITEM_PROP_LABEL, launcher_menu_item_get_name(self));
1020- gchar * iconstr = launcher_menu_item_get_icon(self);
1021+
1022+ const gchar * default_name = get_default_name(desktop_file);
1023+ if (default_name == NULL) {
1024+ dbusmenu_menuitem_property_set(DBUSMENU_MENUITEM(self), DBUSMENU_MENUITEM_PROP_LABEL, launcher_menu_item_get_name(self));
1025+ } else {
1026+ dbusmenu_menuitem_property_set(DBUSMENU_MENUITEM(self), DBUSMENU_MENUITEM_PROP_LABEL, default_name);
1027+ }
1028+
1029+ gchar * iconstr;
1030+ if (default_name == NULL) {
1031+ iconstr = launcher_menu_item_get_icon(self);
1032+ } else {
1033+ iconstr = g_strdup(get_default_icon(desktop_file));
1034+ }
1035 dbusmenu_menuitem_property_set(DBUSMENU_MENUITEM(self), DBUSMENU_MENUITEM_PROP_ICON_NAME, iconstr);
1036 g_free(iconstr);
1037 dbusmenu_menuitem_property_set_bool(DBUSMENU_MENUITEM(self), DBUSMENU_MENUITEM_PROP_VISIBLE, TRUE);

Subscribers

People subscribed via source and target branches

to all changes: