Gentoo Archives: gentoo-commits

From: "Justin Lecher (jlec)" <jlec@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in gnome-extra/activity-log-manager/files: activity-log-manager-0.9.7-ambiguous.patch
Date: Sun, 28 Jun 2015 17:01:21
Message-Id: 20150628170115.6FB31747@oystercatcher.gentoo.org
1 jlec 15/06/28 17:01:15
2
3 Added: activity-log-manager-0.9.7-ambiguous.patch
4 Log:
5 Add fixes for latest glib, Gtk and vala changes, bug #553348
6
7 (Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key E9402A79B03529A2!)
8
9 Revision Changes Path
10 1.1 gnome-extra/activity-log-manager/files/activity-log-manager-0.9.7-ambiguous.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/activity-log-manager/files/activity-log-manager-0.9.7-ambiguous.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/activity-log-manager/files/activity-log-manager-0.9.7-ambiguous.patch?rev=1.1&content-type=text/plain
14
15 Index: activity-log-manager-0.9.7-ambiguous.patch
16 ===================================================================
17 src/blacklist-dbus.vala | 4 ++--
18 src/security-widget.vala | 2 +-
19 src/unified-privacy-applications.vala | 16 ++++++++--------
20 src/unified-privacy.vala | 4 ++--
21 4 files changed, 13 insertions(+), 13 deletions(-)
22
23 diff --git a/src/blacklist-dbus.vala b/src/blacklist-dbus.vala
24 index 355a684..fd165e3 100644
25 --- a/src/blacklist-dbus.vala
26 +++ b/src/blacklist-dbus.vala
27 @@ -137,7 +137,7 @@ namespace Alm {
28 return false;
29 }
30
31 - public async void find_events (string id, TreeIter iter, ListStore store)
32 + public async void find_events (string id, TreeIter iter, Gtk.ListStore store)
33 {
34 Event event = new Event();
35 event.manifestation = Zeitgeist.ZG.USER_ACTIVITY;
36 @@ -165,7 +165,7 @@ namespace Alm {
37 store.set_value(iter, 5, counter);
38 }
39
40 - public void get_count_for_app (string app_id, TreeIter iter, ListStore store) {
41 + public void get_count_for_app (string app_id, TreeIter iter, Gtk.ListStore store) {
42 find_events(app_id, iter, store);
43 }
44
45 diff --git a/src/security-widget.vala b/src/security-widget.vala
46 index 4394924..e983c15 100644
47 --- a/src/security-widget.vala
48 +++ b/src/security-widget.vala
49 @@ -39,7 +39,7 @@ namespace Alm {
50
51 private void set_up_ui () {
52
53 - var liststore_delay = new ListStore (2, typeof (string), typeof (int));
54 + var liststore_delay = new Gtk.ListStore (2, typeof (string), typeof (int));
55 TreeIter iter;
56 liststore_delay.append (out iter);
57 liststore_delay.set (iter, 0, "1 second", 1, 0);
58 diff --git a/src/unified-privacy-applications.vala b/src/unified-privacy-applications.vala
59 index 9b06f44..a4966d3 100644
60 --- a/src/unified-privacy-applications.vala
61 +++ b/src/unified-privacy-applications.vala
62 @@ -60,7 +60,7 @@ namespace Alm {
63 }
64 }
65
66 - public void get_count_for_app(string id, TreeIter iter, ListStore store) {
67 + public void get_count_for_app(string id, TreeIter iter, Gtk.ListStore store) {
68 this.blacklist_interface.get_count_for_app(id, iter, store);
69 }
70
71 @@ -131,7 +131,7 @@ namespace Alm {
72 private class ApplicationsTreeView : Gtk.Box {
73
74 private ApplicationBlacklist app_blacklist;
75 - private ListStore store;
76 + private Gtk.ListStore store;
77 private TreeView treeview;
78
79 HashTable<string, AppChooseInfo> blocked_apps;
80 @@ -145,7 +145,7 @@ namespace Alm {
81 N_COLS
82 }
83
84 - public ListStore liststore {
85 + public Gtk.ListStore liststore {
86 get {
87 return this.store;
88 }
89 @@ -160,7 +160,7 @@ namespace Alm {
90 this.blocked_apps = blocked;
91 this.unblocked_apps = unblocked;
92
93 - this.store = new ListStore (TreeViewCols.N_COLS,
94 + this.store = new Gtk.ListStore (TreeViewCols.N_COLS,
95 typeof (string),
96 typeof (Gdk.Pixbuf),
97 typeof (string));
98 @@ -292,7 +292,7 @@ namespace Alm {
99 private class AppSelectionTreeView : Gtk.Box {
100
101 private ApplicationBlacklist app_blacklist;
102 - private ListStore store;
103 + private Gtk.ListStore store;
104 private TreeView treeview;
105
106 enum TreeViewCols
107 @@ -312,7 +312,7 @@ namespace Alm {
108 }
109 }
110
111 - public ListStore liststore {
112 + public Gtk.ListStore liststore {
113 get {
114 return store;
115 }
116 @@ -323,7 +323,7 @@ namespace Alm {
117
118 this.app_blacklist = app_blacklist;
119
120 - this.store = new ListStore (TreeViewCols.N_COLS,
121 + this.store = new Gtk.ListStore (TreeViewCols.N_COLS,
122 typeof (string),
123 typeof (Gdk.Pixbuf),
124 typeof (string),
125 @@ -426,7 +426,7 @@ namespace Alm {
126 }
127 }
128
129 - public ListStore liststore {
130 + public Gtk.ListStore liststore {
131 get {
132 return treeview.liststore;
133 }
134 diff --git a/src/unified-privacy.vala b/src/unified-privacy.vala
135 index 0d46370..c64f78d 100644
136 --- a/src/unified-privacy.vala
137 +++ b/src/unified-privacy.vala
138 @@ -55,7 +55,7 @@ namespace Alm {
139
140 //General stuffs
141 private TreeView exception_list;
142 - private ListStore exception_list_store;
143 + private Gtk.ListStore exception_list_store;
144
145 private Switch record_button;
146
147 @@ -262,7 +262,7 @@ namespace Alm {
148 exception_vbox.pack_start (al2, false, false, 5);
149
150 // Exception TreeView
151 - this.exception_list_store = new ListStore (4,
152 + this.exception_list_store = new Gtk.ListStore (4,
153 typeof(string), // Full file path of application desktop file.
154 typeof(Gdk.Pixbuf?), // Pixbuf
155 typeof(string), // File basename or ApplicationName