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
1=== modified file 'lens/src/daemon.vala'
2--- lens/src/daemon.vala 2011-08-12 04:24:00 +0000
3+++ lens/src/daemon.vala 2011-09-08 14:22:57 +0000
4@@ -112,7 +112,7 @@
5
6 private void populate_filters ()
7 {
8- Unity.Filter[] filters = {};
9+ var filters = new GLib.List<Unity.Filter> ();
10
11 /* Stream filter */
12 {
13@@ -126,7 +126,7 @@
14 filter.add_option ("private", _("Private"));
15 filter.add_option ("public", _("Public"));
16
17- filters += filter;
18+ filters.append (filter);
19 }
20
21 lens.filters = filters;
22@@ -134,36 +134,36 @@
23
24 private void populate_categories ()
25 {
26- Unity.Category[] categories = {};
27+ var categories = new GLib.List<Unity.Category> ();
28 Icon icon;
29
30 icon = new ThemedIcon ("tray-message");
31- var cat = new Unity.Category (_("Messages"), icon.to_string(), Unity.CategoryRenderer.HORIZONTAL_TILE);
32- categories += cat;
33+ var cat = new Unity.Category (_("Messages"), icon, Unity.CategoryRenderer.HORIZONTAL_TILE);
34+ categories.append (cat);
35
36 icon = new ThemedIcon ("mail_reply");
37- cat = new Unity.Category (_("Replies"), icon.to_string(), Unity.CategoryRenderer.HORIZONTAL_TILE);
38- categories += cat;
39+ cat = new Unity.Category (_("Replies"), icon, Unity.CategoryRenderer.HORIZONTAL_TILE);
40+ categories.append (cat);
41
42 icon = new ThemedIcon ("gnome-mime-image");
43- cat = new Unity.Category (_("Images"), icon.to_string(), Unity.CategoryRenderer.HORIZONTAL_TILE);
44- categories += cat;
45+ cat = new Unity.Category (_("Images"), icon, Unity.CategoryRenderer.HORIZONTAL_TILE);
46+ categories.append (cat);
47
48 icon = new ThemedIcon ("video");
49- cat = new Unity.Category (_("Videos"), icon.to_string(), Unity.CategoryRenderer.HORIZONTAL_TILE);
50- categories += cat;
51+ cat = new Unity.Category (_("Videos"), icon, Unity.CategoryRenderer.HORIZONTAL_TILE);
52+ categories.append (cat);
53
54 icon = new ThemedIcon ("web-browser");
55- cat = new Unity.Category (_("Links"), icon.to_string(), Unity.CategoryRenderer.HORIZONTAL_TILE);
56- categories += cat;
57+ cat = new Unity.Category (_("Links"), icon, Unity.CategoryRenderer.HORIZONTAL_TILE);
58+ categories.append (cat);
59
60 icon = new ThemedIcon ("mail-send-receive");
61- cat = new Unity.Category (_("Private"), icon.to_string(), Unity.CategoryRenderer.HORIZONTAL_TILE);
62- categories += cat;
63+ cat = new Unity.Category (_("Private"), icon, Unity.CategoryRenderer.HORIZONTAL_TILE);
64+ categories.append (cat);
65
66 icon = new ThemedIcon ("evolution");
67- cat = new Unity.Category (_("Public"), icon.to_string(), Unity.CategoryRenderer.HORIZONTAL_TILE);
68- categories += cat;
69+ cat = new Unity.Category (_("Public"), icon, Unity.CategoryRenderer.HORIZONTAL_TILE);
70+ categories.append (cat);
71
72 lens.categories = categories;
73 }