Gwibber

Merge lp:~kamstrup/gwibber/update-to-new-libunity-api into lp:gwibber

  1. update-to-new-libunity-api
  2. Merge into trunk
Proposed by Mikkel Kamstrup Erlandsen
Status: Merged
Merged at revision: 1171
Proposed branch: lp:~kamstrup/gwibber/update-to-new-libunity-api
Merge into: lp:gwibber
Diff against target: 73 lines (+17/-17)
1 file modified
lens/src/daemon.vala (+17/-17)
To merge this branch: bzr merge lp:~kamstrup/gwibber/update-to-new-libunity-api
Reviewer Review Type Date Requested Status
Ken VanDine Approve
Review via email: mp+74610@code.launchpad.net

Description of the change

The attached bug links to a libunity branch that will break the libunity lenses api.

To post a comment you must log in.
Revision history for this message
Ken VanDine (ken-vandine) wrote :

Looks great, thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'lens/src/daemon.vala'
--- lens/src/daemon.vala 2011-08-12 04:24:00 +0000
+++ lens/src/daemon.vala 2011-09-08 14:22:57 +0000
@@ -112,7 +112,7 @@
112112
113 private void populate_filters ()113 private void populate_filters ()
114 {114 {
115 Unity.Filter[] filters = {};115 var filters = new GLib.List<Unity.Filter> ();
116116
117 /* Stream filter */117 /* Stream filter */
118 {118 {
@@ -126,7 +126,7 @@
126 filter.add_option ("private", _("Private"));126 filter.add_option ("private", _("Private"));
127 filter.add_option ("public", _("Public"));127 filter.add_option ("public", _("Public"));
128128
129 filters += filter;129 filters.append (filter);
130 }130 }
131131
132 lens.filters = filters;132 lens.filters = filters;
@@ -134,36 +134,36 @@
134134
135 private void populate_categories ()135 private void populate_categories ()
136 {136 {
137 Unity.Category[] categories = {};137 var categories = new GLib.List<Unity.Category> ();
138 Icon icon;138 Icon icon;
139139
140 icon = new ThemedIcon ("tray-message");140 icon = new ThemedIcon ("tray-message");
141 var cat = new Unity.Category (_("Messages"), icon.to_string(), Unity.CategoryRenderer.HORIZONTAL_TILE);141 var cat = new Unity.Category (_("Messages"), icon, Unity.CategoryRenderer.HORIZONTAL_TILE);
142 categories += cat;142 categories.append (cat);
143143
144 icon = new ThemedIcon ("mail_reply");144 icon = new ThemedIcon ("mail_reply");
145 cat = new Unity.Category (_("Replies"), icon.to_string(), Unity.CategoryRenderer.HORIZONTAL_TILE);145 cat = new Unity.Category (_("Replies"), icon, Unity.CategoryRenderer.HORIZONTAL_TILE);
146 categories += cat;146 categories.append (cat);
147147
148 icon = new ThemedIcon ("gnome-mime-image");148 icon = new ThemedIcon ("gnome-mime-image");
149 cat = new Unity.Category (_("Images"), icon.to_string(), Unity.CategoryRenderer.HORIZONTAL_TILE);149 cat = new Unity.Category (_("Images"), icon, Unity.CategoryRenderer.HORIZONTAL_TILE);
150 categories += cat;150 categories.append (cat);
151151
152 icon = new ThemedIcon ("video");152 icon = new ThemedIcon ("video");
153 cat = new Unity.Category (_("Videos"), icon.to_string(), Unity.CategoryRenderer.HORIZONTAL_TILE);153 cat = new Unity.Category (_("Videos"), icon, Unity.CategoryRenderer.HORIZONTAL_TILE);
154 categories += cat;154 categories.append (cat);
155155
156 icon = new ThemedIcon ("web-browser");156 icon = new ThemedIcon ("web-browser");
157 cat = new Unity.Category (_("Links"), icon.to_string(), Unity.CategoryRenderer.HORIZONTAL_TILE);157 cat = new Unity.Category (_("Links"), icon, Unity.CategoryRenderer.HORIZONTAL_TILE);
158 categories += cat;158 categories.append (cat);
159159
160 icon = new ThemedIcon ("mail-send-receive");160 icon = new ThemedIcon ("mail-send-receive");
161 cat = new Unity.Category (_("Private"), icon.to_string(), Unity.CategoryRenderer.HORIZONTAL_TILE);161 cat = new Unity.Category (_("Private"), icon, Unity.CategoryRenderer.HORIZONTAL_TILE);
162 categories += cat;162 categories.append (cat);
163163
164 icon = new ThemedIcon ("evolution");164 icon = new ThemedIcon ("evolution");
165 cat = new Unity.Category (_("Public"), icon.to_string(), Unity.CategoryRenderer.HORIZONTAL_TILE);165 cat = new Unity.Category (_("Public"), icon, Unity.CategoryRenderer.HORIZONTAL_TILE);
166 categories += cat;166 categories.append (cat);
167167
168 lens.categories = categories;168 lens.categories = categories;
169 }169 }