Gwibber

Merge lp:~ken-vandine/gwibber/lens_icons into lp:gwibber

  1. lens_icons
  2. Merge into trunk
Proposed by Ken VanDine
Status: Merged
Merged at revision: 1340
Proposed branch: lp:~ken-vandine/gwibber/lens_icons
Merge into: lp:gwibber
Diff against target: 265 lines (+151/-9)
12 files modified
NEWS (+12/-0)
configure.ac (+2/-1)
data/icons/hicolor/scalable/Makefile.am (+1/-1)
data/icons/hicolor/scalable/places/Makefile.am (+11/-0)
data/icons/hicolor/scalable/places/group-images.svg (+21/-0)
data/icons/hicolor/scalable/places/group-links.svg (+19/-0)
data/icons/hicolor/scalable/places/group-messages.svg (+8/-0)
data/icons/hicolor/scalable/places/group-private.svg (+12/-0)
data/icons/hicolor/scalable/places/group-public.svg (+16/-0)
data/icons/hicolor/scalable/places/group-replies.svg (+27/-0)
data/icons/hicolor/scalable/places/group-videos.svg (+12/-0)
lens/src/daemon.vala (+10/-7)
To merge this branch: bzr merge lp:~ken-vandine/gwibber/lens_icons
Reviewer Review Type Date Requested Status
Michael Terry (community) Approve
Review via email: mp+103519@code.launchpad.net

Description of the change

This adds icons for the categories display in the unity lens, matching the icons in the other lenses.

To post a comment you must log in.
Revision history for this message
Michael Terry (mterry) wrote :

Sure, looks fine. Though I do like themability. :)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'NEWS'
2--- NEWS 2012-04-03 21:04:27 +0000
3+++ NEWS 2012-04-25 17:16:21 +0000
4@@ -1,3 +1,15 @@
5+NEW in 3.4.1 (UNRELEASED)
6+============
7+ * Use matching icons for unity lens categories
8+ * catch GLib.GError instead of GLib.Error (LP: #940182)
9+ * fallback to displaying full sender's name if the nickname is empty,
10+ even if show-fullname is false (LP: #985801)
11+ * foursquare: Don't crash on unicode characters in a users fullname, thanks
12+ to Raza Sayed (LP: #975437)
13+ * Defer calling unset on the seen HashMap until after we are done iterating
14+ it, it will resize making the iterator invalid. (LP: #959068)
15+ This is fixed in the 0.7 series of libgee
16+
17 NEW in 3.4.0 (04/03/2012)
18 ============
19 * Check shorten-urls setting in the dispatcher before attempting to
20
21=== modified file 'configure.ac'
22--- configure.ac 2012-03-27 15:50:39 +0000
23+++ configure.ac 2012-04-25 17:16:21 +0000
24@@ -1,6 +1,6 @@
25 m4_define([gwibber_major], [3])
26 m4_define([gwibber_minor], [4])
27-m4_define([gwibber_micro], [0])
28+m4_define([gwibber_micro], [1])
29 m4_define([gwibber_version],
30 [gwibber_major.gwibber_minor.gwibber_micro])
31
32@@ -311,6 +311,7 @@
33 data/icons/hicolor/48x48/places/Makefile
34 data/icons/hicolor/scalable/Makefile
35 data/icons/hicolor/scalable/apps/Makefile
36+ data/icons/hicolor/scalable/places/Makefile
37 data/icons/streams/Makefile
38 data/icons/streams/16x16/Makefile
39 data/icons/streams/24x24/Makefile
40
41=== modified file 'data/icons/hicolor/scalable/Makefile.am'
42--- data/icons/hicolor/scalable/Makefile.am 2012-02-13 22:20:12 +0000
43+++ data/icons/hicolor/scalable/Makefile.am 2012-04-25 17:16:21 +0000
44@@ -1,1 +1,1 @@
45-SUBDIRS = apps
46+SUBDIRS = apps places
47
48=== added directory 'data/icons/hicolor/scalable/places'
49=== added file 'data/icons/hicolor/scalable/places/Makefile.am'
50--- data/icons/hicolor/scalable/places/Makefile.am 1970-01-01 00:00:00 +0000
51+++ data/icons/hicolor/scalable/places/Makefile.am 2012-04-25 17:16:21 +0000
52@@ -0,0 +1,11 @@
53+icondir = $(pkgdatadir)/ui/icons/hicolor/scalable/places
54+icon_DATA = group-images.svg \
55+ group-links.svg \
56+ group-messages.svg \
57+ group-private.svg \
58+ group-public.svg \
59+ group-replies.svg \
60+ group-videos.svg
61+
62+EXTRA_DIST = \
63+ $(icon_DATA)
64
65=== added file 'data/icons/hicolor/scalable/places/group-images.svg'
66--- data/icons/hicolor/scalable/places/group-images.svg 1970-01-01 00:00:00 +0000
67+++ data/icons/hicolor/scalable/places/group-images.svg 2012-04-25 17:16:21 +0000
68@@ -0,0 +1,21 @@
69+<?xml version="1.0" encoding="utf-8"?>
70+<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
71+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
72+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
73+ width="22px" height="22px" viewBox="0 0 22 22" enable-background="new 0 0 22 22" xml:space="preserve">
74+<g>
75+ <g>
76+ <path fill="#FFFFFF" d="M19,7.007h-1.8l-5.88-4.9c-0.186-0.154-0.455-0.154-0.641,0l-5.88,4.9H3c-0.552,0-1,0.447-1,1v11
77+ c0,0.553,0.448,1,1,1h16c0.552,0,1-0.447,1-1v-11C20,7.455,19.552,7.007,19,7.007z M11,3.142l4.639,3.866H6.361L11,3.142z
78+ M3.5,9.007c-0.276,0-0.5-0.224-0.5-0.5c0-0.276,0.224-0.5,0.5-0.5S4,8.23,4,8.507C4,8.785,3.776,9.007,3.5,9.007z M6.008,19.009
79+ c0-1.548,0.116-2.14,2.046-3.129c1.325-0.68,1.454-1.177,1.454-1.584c0-0.272-0.184-0.694-0.357-0.897
80+ c-0.171-0.199-0.426-0.301-0.545-0.521c-0.197-0.365-0.301-1.092-0.24-1.412c0.043-0.228,0.24-0.25,0.24-0.454
81+ c0-0.183-0.043-0.479-0.043-0.979c0-0.705,0.261-1.115,0.545-1.342c0.212-0.17,0.458-0.205,0.61-0.228
82+ c0.11-0.137,0.371-0.335,0.765-0.409c0.158-0.03,0.347-0.046,0.523-0.046c0.828,0,1.482,0.318,1.811,0.614
83+ c0.363,0.328,0.635,0.705,0.635,1.41c0,0.5-0.047,0.796-0.047,0.979c0,0.204,0.197,0.227,0.242,0.454
84+ c0.062,0.32-0.045,1.046-0.242,1.412c-0.117,0.223-0.371,0.322-0.545,0.521c-0.174,0.205-0.354,0.627-0.354,0.898
85+ c0,0.407,0.127,0.904,1.449,1.584c1.924,0.989,2.039,1.581,2.039,3.129L6.008,19.009L6.008,19.009z M18.5,9.007
86+ c-0.275,0-0.5-0.224-0.5-0.5c0-0.276,0.225-0.5,0.5-0.5s0.5,0.224,0.5,0.5C19,8.784,18.775,9.007,18.5,9.007z"/>
87+ </g>
88+</g>
89+</svg>
90
91=== added file 'data/icons/hicolor/scalable/places/group-links.svg'
92--- data/icons/hicolor/scalable/places/group-links.svg 1970-01-01 00:00:00 +0000
93+++ data/icons/hicolor/scalable/places/group-links.svg 2012-04-25 17:16:21 +0000
94@@ -0,0 +1,19 @@
95+<?xml version="1.0" encoding="utf-8"?>
96+<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
97+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
98+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
99+ width="22px" height="22px" viewBox="0 0 22 22" enable-background="new 0 0 22 22" xml:space="preserve">
100+<g>
101+ <g>
102+ <path fill="#FFFFFF" d="M15.898,2.517c-1.875-1.083-4.271-0.44-5.355,1.433L9.565,5.647c-0.912,1.579-0.587,3.52,0.655,4.743
103+ l-0.139,0.24c-1.679-0.464-3.523,0.226-4.434,1.805l-0.979,1.696c-1.083,1.873-0.44,4.27,1.434,5.354
104+ c1.874,1.08,4.271,0.438,5.353-1.436l0.978-1.697c0.912-1.578,0.588-3.52-0.654-4.739l0.139-0.242
105+ c1.68,0.465,3.521-0.225,4.436-1.804l0.979-1.697C18.414,5.995,17.771,3.598,15.898,2.517z M10.736,15.372l-0.979,1.696
106+ c-0.54,0.937-1.741,1.258-2.676,0.719c-0.936-0.539-1.258-1.741-0.717-2.678l0.979-1.696c0.361-0.624,1.017-0.968,1.691-0.97
107+ l-0.363,0.629c-0.271,0.469-0.111,1.068,0.359,1.339c0.469,0.271,1.066,0.11,1.338-0.358l0.363-0.629
108+ C11.066,14.009,11.099,14.748,10.736,15.372z M15.635,6.889l-0.979,1.697c-0.36,0.625-1.018,0.967-1.69,0.971l0.363-0.629
109+ C13.6,8.459,13.438,7.86,12.971,7.59c-0.469-0.27-1.066-0.11-1.339,0.359l-0.364,0.628c-0.335-0.585-0.366-1.325-0.005-1.95
110+ l0.98-1.697c0.54-0.935,1.739-1.257,2.676-0.717C15.854,4.753,16.176,5.954,15.635,6.889z"/>
111+ </g>
112+</g>
113+</svg>
114
115=== added file 'data/icons/hicolor/scalable/places/group-messages.svg'
116--- data/icons/hicolor/scalable/places/group-messages.svg 1970-01-01 00:00:00 +0000
117+++ data/icons/hicolor/scalable/places/group-messages.svg 2012-04-25 17:16:21 +0000
118@@ -0,0 +1,8 @@
119+<?xml version="1.0" encoding="utf-8"?>
120+<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
121+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
122+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
123+ width="22px" height="22px" viewBox="0 0 22 22" enable-background="new 0 0 22 22" xml:space="preserve">
124+<path fill="#FFFFFF" d="M18.602,15.805C19.482,14.413,20,12.77,20,11c0-4.971-4.029-9-9-9c-4.971,0-9,4.029-9,9c0,4.971,4.029,9,9,9
125+ c1.768,0,3.413-0.518,4.805-1.398L20,20L18.602,15.805z"/>
126+</svg>
127
128=== added file 'data/icons/hicolor/scalable/places/group-private.svg'
129--- data/icons/hicolor/scalable/places/group-private.svg 1970-01-01 00:00:00 +0000
130+++ data/icons/hicolor/scalable/places/group-private.svg 2012-04-25 17:16:21 +0000
131@@ -0,0 +1,12 @@
132+<?xml version="1.0" encoding="utf-8"?>
133+<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
134+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
135+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
136+ width="22px" height="22px" viewBox="0 0 22 22" enable-background="new 0 0 22 22" xml:space="preserve">
137+<path fill="#FFFFFF" d="M18.602,15.805C19.482,14.413,20,12.77,20,11c0-4.971-4.029-9-9-9c-4.971,0-9,4.029-9,9c0,4.971,4.029,9,9,9
138+ c1.768,0,3.413-0.518,4.805-1.398L20,20L18.602,15.805z M4,11c0-3.866,3.134-7,7-7s7,3.134,7,7s-3.135,7-7,7C7.133,18,4,14.866,4,11
139+ z"/>
140+<path fill="#FFFFFF" d="M14.016,10.003L14,8c0-1.657-1.343-3-3-3S8,6.343,8,8c0,1.585,0.007,1.969,0.008,2H8c-0.552,0-1,0.447-1,1v4
141+ c0,0.553,0.448,1,1,1h6c0.552,0,1-0.447,1-1v-4C15,10.453,14.561,10.011,14.016,10.003z M9,7.998c0-1.105,0.895-2,2-2
142+ c1.105,0,2,0.895,2,2c0,1.084,0,1.968,0,2.002H9V7.998z"/>
143+</svg>
144
145=== added file 'data/icons/hicolor/scalable/places/group-public.svg'
146--- data/icons/hicolor/scalable/places/group-public.svg 1970-01-01 00:00:00 +0000
147+++ data/icons/hicolor/scalable/places/group-public.svg 2012-04-25 17:16:21 +0000
148@@ -0,0 +1,16 @@
149+<?xml version="1.0" encoding="utf-8"?>
150+<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
151+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
152+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
153+ width="22px" height="22px" viewBox="0 0 22 22" enable-background="new 0 0 22 22" xml:space="preserve">
154+<path fill="#FFFFFF" d="M18.602,15.805C19.482,14.413,20,12.77,20,11c0-4.971-4.029-9-9-9c-4.971,0-9,4.029-9,9c0,4.971,4.029,9,9,9
155+ c1.77,0,3.412-0.518,4.805-1.398L20,20L18.602,15.805z M4,11c0-3.866,3.133-7,7-7c3.865,0,7,3.134,7,7s-3.135,7-7,7
156+ C7.133,18,4,14.866,4,11z"/>
157+<path fill="#FFFFFF" d="M12.205,11.114c0,0.333,0.102,0.737,1.161,1.292C14.906,13.212,15,13.695,15,14.958H7
158+ c0-1.263,0.094-1.746,1.64-2.552c1.061-0.555,1.164-0.958,1.164-1.292c0-0.221-0.146-0.566-0.286-0.732
159+ c-0.136-0.164-0.341-0.246-0.436-0.427C8.924,9.656,8.84,9.065,8.89,8.805C8.924,8.618,9.082,8.6,9.082,8.433
160+ c0-0.149-0.035-0.391-0.035-0.8c0-0.573,0.21-0.906,0.437-1.092c0.169-0.138,0.367-0.169,0.49-0.187
161+ c0.086-0.109,0.297-0.273,0.611-0.334c0.127-0.024,0.279-0.036,0.419-0.036c0.664,0,1.188,0.261,1.451,0.5
162+ c0.291,0.27,0.507,0.576,0.507,1.149c0,0.409-0.036,0.65-0.036,0.8c0,0.167,0.159,0.185,0.193,0.372
163+ c0.049,0.26-0.034,0.852-0.193,1.15c-0.094,0.181-0.298,0.263-0.436,0.426C12.352,10.547,12.205,10.893,12.205,11.114"/>
164+</svg>
165
166=== added file 'data/icons/hicolor/scalable/places/group-replies.svg'
167--- data/icons/hicolor/scalable/places/group-replies.svg 1970-01-01 00:00:00 +0000
168+++ data/icons/hicolor/scalable/places/group-replies.svg 2012-04-25 17:16:21 +0000
169@@ -0,0 +1,27 @@
170+<?xml version="1.0" encoding="utf-8"?>
171+<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
172+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
173+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
174+ width="22px" height="22px" viewBox="0 0 22 22" enable-background="new 0 0 22 22" xml:space="preserve">
175+<path fill="#FFFFFF" d="M15.366,16.082c-0.396,0-0.789-0.048-1.183-0.145c-0.396-0.096-0.724-0.266-0.979-0.511
176+ c-0.599,0.423-1.354,0.634-2.266,0.634c-0.681,0-1.303-0.105-1.868-0.315c-0.563-0.211-1.047-0.527-1.448-0.949
177+ s-0.714-0.942-0.938-1.562c-0.225-0.619-0.337-1.338-0.337-2.152c0-0.693,0.112-1.341,0.337-1.939s0.554-1.119,0.99-1.561
178+ C8.108,7.14,8.643,6.789,9.275,6.531c0.633-0.259,1.35-0.388,2.153-0.388c0.802,0,1.513,0.07,2.132,0.214
179+ c0.619,0.143,1.133,0.289,1.541,0.438v6.408c0,0.312,0.062,0.523,0.192,0.633S15.611,14,15.855,14c0.219,0,0.433-0.062,0.644-0.184
180+ c0.212-0.123,0.392-0.344,0.542-0.664c0.148-0.318,0.271-0.754,0.366-1.307c0.096-0.552,0.144-1.249,0.144-2.092
181+ c0-0.845-0.146-1.615-0.438-2.317c-0.293-0.7-0.715-1.298-1.266-1.796c-0.553-0.496-1.227-0.884-2.021-1.162
182+ C13.031,4.2,12.129,4.06,11.123,4.06c-0.967,0-1.854,0.163-2.664,0.489c-0.809,0.329-1.511,0.795-2.102,1.4
183+ C5.766,6.555,5.303,7.293,4.97,8.163c-0.334,0.871-0.501,1.851-0.501,2.939c0,1.13,0.164,2.119,0.49,2.97
184+ c0.326,0.851,0.793,1.562,1.398,2.132c0.605,0.571,1.34,1.004,2.203,1.297c0.864,0.292,1.841,0.438,2.929,0.438
185+ c0.681,0,1.323-0.045,1.929-0.133c0.605-0.091,1.111-0.175,1.52-0.257l0.31,1.918c-0.343,0.108-0.856,0.228-1.554,0.349
186+ C13,19.938,12.266,20,11.489,20c-1.306,0-2.53-0.17-3.673-0.51c-1.143-0.342-2.14-0.871-2.989-1.594
187+ c-0.852-0.723-1.521-1.643-2.011-2.766c-0.489-1.122-0.734-2.466-0.734-4.031c0-1.51,0.258-2.833,0.775-3.969
188+ c0.517-1.136,1.197-2.085,2.04-2.847C5.742,3.522,6.704,2.951,7.785,2.57C8.867,2.191,9.979,2,11.123,2
189+ c1.251,0,2.414,0.174,3.488,0.521s2.004,0.854,2.785,1.52c0.783,0.666,1.396,1.493,1.848,2.479c0.449,0.987,0.674,2.119,0.674,3.398
190+ c0,0.992-0.105,1.874-0.316,2.643c-0.211,0.771-0.518,1.412-0.918,1.93c-0.399,0.518-0.882,0.91-1.438,1.185
191+ C16.688,15.945,16.061,16.082,15.366,16.082z M12.49,13.652c-0.028-0.108-0.049-0.27-0.062-0.479c-0.013-0.21-0.02-0.411-0.02-0.603
192+ V8.408c-0.272-0.054-0.559-0.082-0.857-0.082c-0.449,0-0.83,0.072-1.143,0.215c-0.312,0.144-0.565,0.337-0.756,0.582
193+ C9.463,9.368,9.323,9.657,9.234,9.989c-0.088,0.334-0.132,0.699-0.132,1.093s0.034,0.758,0.103,1.092
194+ c0.068,0.333,0.187,0.622,0.357,0.867c0.169,0.245,0.397,0.438,0.683,0.582c0.286,0.143,0.641,0.214,1.062,0.214
195+ c0.245,0,0.477-0.017,0.693-0.051C12.218,13.752,12.38,13.707,12.49,13.652z"/>
196+</svg>
197
198=== added file 'data/icons/hicolor/scalable/places/group-videos.svg'
199--- data/icons/hicolor/scalable/places/group-videos.svg 1970-01-01 00:00:00 +0000
200+++ data/icons/hicolor/scalable/places/group-videos.svg 2012-04-25 17:16:21 +0000
201@@ -0,0 +1,12 @@
202+<?xml version="1.0" encoding="utf-8"?>
203+<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
204+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
205+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
206+ width="22px" height="22px" viewBox="0 0 22 22" enable-background="new 0 0 22 22" xml:space="preserve">
207+<path fill="#FFFFFF" d="M19,4.5H3c-0.55,0-1,0.449-1,1v11c0,0.549,0.45,1,1,1h16c0.55,0,1-0.451,1-1v-11C20,4.949,19.55,4.5,19,4.5z
208+ M5,16.5H3v-2h2V16.5z M5,13.5H3v-2h2V13.5z M5,10.5H3v-2h2V10.5z M5,7.5H3v-2h2V7.5z M12.751,11.963
209+ c-0.437,0.334-0.876,0.66-1.319,0.977c-0.443,0.317-0.875,0.61-1.295,0.877c-0.42,0.27-0.801,0.494-1.143,0.679v-6.99
210+ c0.327,0.184,0.7,0.409,1.12,0.677c0.42,0.267,0.852,0.555,1.295,0.864c0.442,0.309,0.886,0.63,1.33,0.965
211+ c0.442,0.333,0.858,0.66,1.249,0.977C13.6,11.303,13.186,11.629,12.751,11.963z M19,16.5h-2v-2h2V16.5z M19,13.5h-2v-2h2V13.5z
212+ M19,10.5h-2v-2h2V10.5z M19,7.5h-2v-2h2V7.5z"/>
213+</svg>
214
215=== modified file 'lens/src/daemon.vala'
216--- lens/src/daemon.vala 2012-02-15 22:51:03 +0000
217+++ lens/src/daemon.vala 2012-04-25 17:16:21 +0000
218@@ -26,6 +26,7 @@
219
220 /* DBus name for the place. Must match out .place file */
221 const string BUS_NAME = "com.canonical.Unity.Lens.Gwibber";
222+ const string ICON_PATH = Config.PKGDATADIR + "/ui/icons/hicolor/scalable/places/";
223
224 /**
225 * The Daemon class implements all of the logic for the place.
226@@ -215,31 +216,33 @@
227 var categories = new GLib.List<Unity.Category> ();
228 Icon icon;
229
230- icon = new ThemedIcon ("tray-message");
231+ var icon_dir = File.new_for_path (ICON_PATH);
232+
233+ icon = new FileIcon (icon_dir.get_child ("group-messages.svg"));
234 var cat = new Unity.Category (_("Messages"), icon, Unity.CategoryRenderer.HORIZONTAL_TILE);
235 categories.append (cat);
236
237- icon = new ThemedIcon ("mail_reply");
238+ icon = new FileIcon (icon_dir.get_child ("group-replies.svg"));
239 cat = new Unity.Category (_("Replies"), icon, Unity.CategoryRenderer.HORIZONTAL_TILE);
240 categories.append (cat);
241
242- icon = new ThemedIcon ("gnome-mime-image");
243+ icon = new FileIcon (icon_dir.get_child ("group-images.svg"));
244 cat = new Unity.Category (_("Images"), icon, Unity.CategoryRenderer.HORIZONTAL_TILE);
245 categories.append (cat);
246
247- icon = new ThemedIcon ("video");
248+ icon = new FileIcon (icon_dir.get_child ("group-videos.svg"));
249 cat = new Unity.Category (_("Videos"), icon, Unity.CategoryRenderer.HORIZONTAL_TILE);
250 categories.append (cat);
251
252- icon = new ThemedIcon ("web-browser");
253+ icon = new FileIcon (icon_dir.get_child ("group-links.svg"));
254 cat = new Unity.Category (_("Links"), icon, Unity.CategoryRenderer.HORIZONTAL_TILE);
255 categories.append (cat);
256
257- icon = new ThemedIcon ("mail-send-receive");
258+ icon = new FileIcon (icon_dir.get_child ("group-private.svg"));
259 cat = new Unity.Category (_("Private"), icon, Unity.CategoryRenderer.HORIZONTAL_TILE);
260 categories.append (cat);
261
262- icon = new ThemedIcon ("evolution");
263+ icon = new FileIcon (icon_dir.get_child ("group-public.svg"));
264 cat = new Unity.Category (_("Public"), icon, Unity.CategoryRenderer.HORIZONTAL_TILE);
265 categories.append (cat);
266