Merge lp:~ricotz/pantheon-agent-polkit/polkit into lp:~elementary-pantheon/pantheon-agent-polkit/trunk
- polkit
- Merge into trunk
Proposed by
Rico Tzschichholz
Status: | Merged |
---|---|
Approved by: | Corentin Noël |
Approved revision: | 38 |
Merged at revision: | 38 |
Proposed branch: | lp:~ricotz/pantheon-agent-polkit/polkit |
Merge into: | lp:~elementary-pantheon/pantheon-agent-polkit/trunk |
Diff against target: |
313 lines (+4/-265) 4 files modified
CMakeLists.txt (+1/-1) src/Agent.vala (+3/-3) vapi/polkit-agent-1.vapi (+0/-43) vapi/polkit-gobject-1.vapi (+0/-218) |
To merge this branch: | bzr merge lp:~ricotz/pantheon-agent-polkit/polkit |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
elementary Pantheon team | Pending | ||
Review via email: mp+309300@code.launchpad.net |
Commit message
Remove polkit-*-1.vapi and use the one shipped with valac 0.34.1
Description of the change
Remove polkit-*-1.vapi and use the one shippped with valac 0.34.1
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 'CMakeLists.txt' |
2 | --- CMakeLists.txt 2016-07-27 15:25:20 +0000 |
3 | +++ CMakeLists.txt 2016-10-25 21:42:06 +0000 |
4 | @@ -24,7 +24,7 @@ |
5 | |
6 | find_package (Vala REQUIRED) |
7 | include (ValaVersion) |
8 | -ensure_vala_version ("0.26" MINIMUM) |
9 | +ensure_vala_version ("0.34.1" MINIMUM) |
10 | |
11 | include (ValaPrecompile) |
12 | |
13 | |
14 | === modified file 'src/Agent.vala' |
15 | --- src/Agent.vala 2016-08-08 19:12:48 +0000 |
16 | +++ src/Agent.vala 2016-10-25 21:42:06 +0000 |
17 | @@ -35,7 +35,7 @@ |
18 | } |
19 | |
20 | public override async bool initiate_authentication (string action_id, string message, string icon_name, |
21 | - Polkit.Details details, string cookie, GLib.List<Polkit.Identity?>? identities, GLib.Cancellable cancellable) { |
22 | + Polkit.Details details, string cookie, GLib.List<Polkit.Identity> identities, GLib.Cancellable? cancellable) { |
23 | if (identities == null) { |
24 | return false; |
25 | } |
26 | @@ -84,7 +84,7 @@ |
27 | |
28 | Polkit.Subject? subject = null; |
29 | try { |
30 | - subject = Polkit.UnixSession.new_for_process_sync (pid, null); |
31 | + subject = new Polkit.UnixSession.for_process_sync (pid, null); |
32 | } catch (Error e) { |
33 | critical ("Unable to initiate Polkit: %s", e.message); |
34 | return 1; |
35 | @@ -99,4 +99,4 @@ |
36 | Gtk.main (); |
37 | return 0; |
38 | } |
39 | -} |
40 | \ No newline at end of file |
41 | +} |
42 | |
43 | === removed file 'vapi/polkit-agent-1.vapi' |
44 | --- vapi/polkit-agent-1.vapi 2016-07-27 13:08:52 +0000 |
45 | +++ vapi/polkit-agent-1.vapi 1970-01-01 00:00:00 +0000 |
46 | @@ -1,43 +0,0 @@ |
47 | -/* polkit-agent-1.vapi generated by vapigen, do not modify. */ |
48 | - |
49 | -[CCode (cprefix = "PolkitAgent", gir_namespace = "PolkitAgent", gir_version = "1.0", lower_case_cprefix = "polkit_agent_")] |
50 | -namespace PolkitAgent { |
51 | - [CCode (cheader_filename = "polkitagent/polkitagent.h", type_id = "polkit_agent_listener_get_type ()")] |
52 | - public abstract class Listener : GLib.Object { |
53 | - [CCode (has_construct_function = false)] |
54 | - protected Listener (); |
55 | - public virtual async bool initiate_authentication (string action_id, string message, string icon_name, Polkit.Details details, string cookie, GLib.List<Polkit.Identity?>? identities, GLib.Cancellable cancellable); |
56 | - public void* register (PolkitAgent.RegisterFlags flags, Polkit.Subject subject, string? object_path, GLib.Cancellable? cancellable = null) throws GLib.Error; |
57 | - public void* register_with_options (PolkitAgent.RegisterFlags flags, Polkit.Subject subject, string object_path, GLib.Variant? options, GLib.Cancellable? cancellable = null) throws GLib.Error; |
58 | - public static void unregister (void* registration_handle); |
59 | - } |
60 | - [CCode (cheader_filename = "polkitagent/polkitagent.h", type_id = "polkit_agent_session_get_type ()")] |
61 | - public class Session : GLib.Object { |
62 | - [CCode (has_construct_function = false)] |
63 | - public Session (Polkit.Identity identity, string cookie); |
64 | - public void cancel (); |
65 | - public void initiate (); |
66 | - public void response (string response); |
67 | - [NoAccessorMethod] |
68 | - public string cookie { owned get; construct; } |
69 | - [NoAccessorMethod] |
70 | - public Polkit.Identity identity { owned get; construct; } |
71 | - public signal void completed (bool gained_authorization); |
72 | - public signal void request (string request, bool echo_on); |
73 | - public signal void show_error (string text); |
74 | - public signal void show_info (string text); |
75 | - } |
76 | - [CCode (cheader_filename = "polkitagent/polkitagent.h", type_id = "polkit_agent_text_listener_get_type ()")] |
77 | - public class TextListener : PolkitAgent.Listener, GLib.Initable { |
78 | - [CCode (has_construct_function = false, type = "PolkitAgentListener*")] |
79 | - public TextListener (GLib.Cancellable? cancellable = null) throws GLib.Error; |
80 | - } |
81 | - [CCode (cheader_filename = "polkitagent/polkitagent.h", cprefix = "POLKIT_AGENT_REGISTER_FLAGS_", type_id = "polkit_agent_register_flags_get_type ()")] |
82 | - [Flags] |
83 | - public enum RegisterFlags { |
84 | - NONE, |
85 | - RUN_IN_THREAD |
86 | - } |
87 | - [CCode (cheader_filename = "polkitagent/polkitagent.h")] |
88 | - public static bool register_listener (PolkitAgent.Listener listener, Polkit.Subject subject, string object_path) throws GLib.Error; |
89 | -} |
90 | \ No newline at end of file |
91 | |
92 | === removed file 'vapi/polkit-gobject-1.vapi' |
93 | --- vapi/polkit-gobject-1.vapi 2016-07-25 22:12:53 +0000 |
94 | +++ vapi/polkit-gobject-1.vapi 1970-01-01 00:00:00 +0000 |
95 | @@ -1,218 +0,0 @@ |
96 | -/* polkit-gobject-1.vapi generated by vapigen, do not modify. */ |
97 | - |
98 | -[CCode (cprefix = "Polkit", gir_namespace = "Polkit", gir_version = "1.0", lower_case_cprefix = "polkit_")] |
99 | -namespace Polkit { |
100 | - [CCode (cheader_filename = "polkit/polkit.h", type_id = "polkit_action_description_get_type ()")] |
101 | - public class ActionDescription : GLib.Object { |
102 | - [CCode (has_construct_function = false)] |
103 | - protected ActionDescription (); |
104 | - public unowned string get_action_id (); |
105 | - public unowned string get_annotation (string key); |
106 | - [CCode (array_length = false, array_null_terminated = true)] |
107 | - public unowned string[] get_annotation_keys (); |
108 | - public unowned string get_description (); |
109 | - public unowned string get_icon_name (); |
110 | - public Polkit.ImplicitAuthorization get_implicit_active (); |
111 | - public Polkit.ImplicitAuthorization get_implicit_any (); |
112 | - public Polkit.ImplicitAuthorization get_implicit_inactive (); |
113 | - public unowned string get_message (); |
114 | - public unowned string get_vendor_name (); |
115 | - public unowned string get_vendor_url (); |
116 | - } |
117 | - [CCode (cheader_filename = "polkit/polkit.h", type_id = "polkit_authority_get_type ()")] |
118 | - public class Authority : GLib.Object, GLib.AsyncInitable, GLib.Initable { |
119 | - [CCode (has_construct_function = false)] |
120 | - protected Authority (); |
121 | - public async bool authentication_agent_response (string cookie, Polkit.Identity identity, GLib.Cancellable? cancellable) throws GLib.Error; |
122 | - public bool authentication_agent_response_sync (string cookie, Polkit.Identity identity, GLib.Cancellable? cancellable = null) throws GLib.Error; |
123 | - public async Polkit.AuthorizationResult check_authorization (Polkit.Subject subject, string action_id, Polkit.Details? details, Polkit.CheckAuthorizationFlags flags, GLib.Cancellable? cancellable) throws GLib.Error; |
124 | - public Polkit.AuthorizationResult check_authorization_sync (Polkit.Subject subject, string action_id, Polkit.Details? details, Polkit.CheckAuthorizationFlags flags, GLib.Cancellable? cancellable = null) throws GLib.Error; |
125 | - public async void enumerate_actions (GLib.Cancellable? cancellable); |
126 | - public async void enumerate_temporary_authorizations (Polkit.Subject subject, GLib.Cancellable? cancellable); |
127 | - public static Polkit.Authority @get (); |
128 | - public static async Polkit.Authority get_async (GLib.Cancellable? cancellable) throws GLib.Error; |
129 | - public Polkit.AuthorityFeatures get_backend_features (); |
130 | - public unowned string get_backend_name (); |
131 | - public unowned string get_backend_version (); |
132 | - public string get_owner (); |
133 | - public static Polkit.Authority get_sync (GLib.Cancellable? cancellable = null) throws GLib.Error; |
134 | - public async bool register_authentication_agent (Polkit.Subject subject, string locale, string object_path, GLib.Cancellable? cancellable) throws GLib.Error; |
135 | - public bool register_authentication_agent_sync (Polkit.Subject subject, string locale, string object_path, GLib.Cancellable? cancellable = null) throws GLib.Error; |
136 | - public async bool register_authentication_agent_with_options (Polkit.Subject subject, string locale, string object_path, GLib.Variant? options, GLib.Cancellable? cancellable) throws GLib.Error; |
137 | - public bool register_authentication_agent_with_options_sync (Polkit.Subject subject, string locale, string object_path, GLib.Variant? options, GLib.Cancellable? cancellable = null) throws GLib.Error; |
138 | - public async bool revoke_temporary_authorization_by_id (string id, GLib.Cancellable? cancellable) throws GLib.Error; |
139 | - public bool revoke_temporary_authorization_by_id_sync (string id, GLib.Cancellable? cancellable = null) throws GLib.Error; |
140 | - public async bool revoke_temporary_authorizations (Polkit.Subject subject, GLib.Cancellable? cancellable) throws GLib.Error; |
141 | - public bool revoke_temporary_authorizations_sync (Polkit.Subject subject, GLib.Cancellable? cancellable = null) throws GLib.Error; |
142 | - public async bool unregister_authentication_agent (Polkit.Subject subject, string object_path, GLib.Cancellable? cancellable) throws GLib.Error; |
143 | - public bool unregister_authentication_agent_sync (Polkit.Subject subject, string object_path, GLib.Cancellable? cancellable = null) throws GLib.Error; |
144 | - public Polkit.AuthorityFeatures backend_features { get; } |
145 | - public string backend_name { get; } |
146 | - public string backend_version { get; } |
147 | - public string owner { owned get; } |
148 | - public signal void changed (); |
149 | - } |
150 | - [CCode (cheader_filename = "polkit/polkit.h", type_id = "polkit_authorization_result_get_type ()")] |
151 | - public class AuthorizationResult : GLib.Object { |
152 | - [CCode (has_construct_function = false)] |
153 | - public AuthorizationResult (bool is_authorized, bool is_challenge, Polkit.Details? details); |
154 | - public unowned Polkit.Details get_details (); |
155 | - public bool get_dismissed (); |
156 | - public bool get_is_authorized (); |
157 | - public bool get_is_challenge (); |
158 | - public bool get_retains_authorization (); |
159 | - public unowned string get_temporary_authorization_id (); |
160 | - } |
161 | - [CCode (cheader_filename = "polkit/polkit.h", type_id = "polkit_details_get_type ()")] |
162 | - public class Details : GLib.Object { |
163 | - [CCode (has_construct_function = false)] |
164 | - public Details (); |
165 | - [CCode (array_length = false, array_null_terminated = true)] |
166 | - public string[] get_keys (); |
167 | - public void insert (string key, string? value); |
168 | - public unowned string lookup (string key); |
169 | - } |
170 | - [CCode (cheader_filename = "polkit/polkit.h", type_id = "polkit_permission_get_type ()")] |
171 | - public class Permission : GLib.Permission, GLib.AsyncInitable, GLib.Initable { |
172 | - [CCode (cname = "polkit_permission_new", has_construct_function = false)] |
173 | - public async Permission (string action_id, Polkit.Subject? subject, GLib.Cancellable? cancellable) throws GLib.Error; |
174 | - public unowned string get_action_id (); |
175 | - public unowned Polkit.Subject get_subject (); |
176 | - [CCode (has_construct_function = false, type = "GPermission*")] |
177 | - public Permission.sync (string action_id, Polkit.Subject? subject, GLib.Cancellable? cancellable = null) throws GLib.Error; |
178 | - public string action_id { get; construct; } |
179 | - public Polkit.Subject subject { get; construct; } |
180 | - } |
181 | - [CCode (cheader_filename = "polkit/polkit.h", type_id = "polkit_system_bus_name_get_type ()")] |
182 | - public class SystemBusName : GLib.Object, Polkit.Subject { |
183 | - [CCode (has_construct_function = false)] |
184 | - protected SystemBusName (); |
185 | - public unowned string get_name (); |
186 | - public Polkit.Subject get_process_sync (GLib.Cancellable? cancellable = null) throws GLib.Error; |
187 | - public static Polkit.Subject @new (string name); |
188 | - public void set_name (string name); |
189 | - public string name { get; set construct; } |
190 | - } |
191 | - [CCode (cheader_filename = "polkit/polkit.h", type_id = "polkit_temporary_authorization_get_type ()")] |
192 | - public class TemporaryAuthorization : GLib.Object { |
193 | - [CCode (has_construct_function = false)] |
194 | - public TemporaryAuthorization (string id, string action_id, Polkit.Subject subject, uint64 time_obtained, uint64 time_expires); |
195 | - public unowned string get_action_id (); |
196 | - public unowned string get_id (); |
197 | - public Polkit.Subject get_subject (); |
198 | - public uint64 get_time_expires (); |
199 | - public uint64 get_time_obtained (); |
200 | - } |
201 | - [CCode (cheader_filename = "polkit/polkit.h", type_id = "polkit_unix_group_get_type ()")] |
202 | - public class UnixGroup : GLib.Object, Polkit.Identity { |
203 | - [CCode (has_construct_function = false)] |
204 | - protected UnixGroup (); |
205 | - public int get_gid (); |
206 | - public static Polkit.Identity @new (int gid); |
207 | - public static Polkit.Identity new_for_name (string name) throws GLib.Error; |
208 | - public void set_gid (int gid); |
209 | - public int gid { get; set construct; } |
210 | - } |
211 | - [CCode (cheader_filename = "polkit/polkit.h", type_id = "polkit_unix_netgroup_get_type ()")] |
212 | - public class UnixNetgroup : GLib.Object, Polkit.Identity { |
213 | - [CCode (has_construct_function = false)] |
214 | - protected UnixNetgroup (); |
215 | - public unowned string get_name (); |
216 | - public static Polkit.Identity @new (string name); |
217 | - public void set_name (string name); |
218 | - public string name { get; set construct; } |
219 | - } |
220 | - [CCode (cheader_filename = "polkit/polkit.h", type_id = "polkit_unix_process_get_type ()")] |
221 | - public class UnixProcess : GLib.Object, Polkit.Subject { |
222 | - [CCode (has_construct_function = false)] |
223 | - protected UnixProcess (); |
224 | - public int get_owner () throws GLib.Error; |
225 | - public int get_pid (); |
226 | - public uint64 get_start_time (); |
227 | - public int get_uid (); |
228 | - public static Polkit.Subject @new (int pid); |
229 | - public static Polkit.Subject new_for_owner (int pid, uint64 start_time, int uid); |
230 | - public static Polkit.Subject new_full (int pid, uint64 start_time); |
231 | - public void set_pid (int pid); |
232 | - public void set_start_time (uint64 start_time); |
233 | - public void set_uid (int uid); |
234 | - public int pid { get; set construct; } |
235 | - public uint64 start_time { get; set construct; } |
236 | - public int uid { get; set construct; } |
237 | - } |
238 | - [CCode (cheader_filename = "polkit/polkit.h", type_id = "polkit_unix_session_get_type ()")] |
239 | - public class UnixSession : GLib.Object, GLib.AsyncInitable, GLib.Initable, Polkit.Subject { |
240 | - [CCode (has_construct_function = false)] |
241 | - protected UnixSession (); |
242 | - public unowned string get_session_id (); |
243 | - public static Polkit.Subject @new (string session_id); |
244 | - public static async Polkit.Subject new_for_process (int pid, GLib.Cancellable? cancellable) throws GLib.Error; |
245 | - public static Polkit.Subject new_for_process_sync (int pid, GLib.Cancellable? cancellable = null) throws GLib.Error; |
246 | - public void set_session_id (string session_id); |
247 | - public int pid { construct; } |
248 | - public string session_id { get; set construct; } |
249 | - } |
250 | - [CCode (cheader_filename = "polkit/polkit.h", type_id = "polkit_unix_user_get_type ()")] |
251 | - public class UnixUser : GLib.Object, Polkit.Identity { |
252 | - [CCode (has_construct_function = false)] |
253 | - protected UnixUser (); |
254 | - public unowned string get_name (); |
255 | - public int get_uid (); |
256 | - public static Polkit.Identity @new (int uid); |
257 | - public static Polkit.Identity new_for_name (string name) throws GLib.Error; |
258 | - public void set_uid (int uid); |
259 | - public int uid { get; set construct; } |
260 | - } |
261 | - [CCode (cheader_filename = "polkit/polkit.h", type_id = "polkit_identity_get_type ()")] |
262 | - public interface Identity : GLib.Object { |
263 | - public abstract bool equal (Polkit.Identity b); |
264 | - public static Polkit.Identity from_string (string str) throws GLib.Error; |
265 | - public abstract uint hash (); |
266 | - public abstract string to_string (); |
267 | - } |
268 | - [CCode (cheader_filename = "polkit/polkit.h", type_id = "polkit_subject_get_type ()")] |
269 | - public interface Subject : GLib.Object { |
270 | - public abstract bool equal (Polkit.Subject b); |
271 | - public abstract async bool exists (GLib.Cancellable? cancellable) throws GLib.Error; |
272 | - public abstract bool exists_sync (GLib.Cancellable? cancellable = null) throws GLib.Error; |
273 | - public static Polkit.Subject from_string (string str) throws GLib.Error; |
274 | - public abstract uint hash (); |
275 | - public abstract string to_string (); |
276 | - } |
277 | - [CCode (cheader_filename = "polkit/polkit.h", cprefix = "POLKIT_AUTHORITY_FEATURES_", type_id = "polkit_authority_features_get_type ()")] |
278 | - [Flags] |
279 | - public enum AuthorityFeatures { |
280 | - NONE, |
281 | - TEMPORARY_AUTHORIZATION |
282 | - } |
283 | - [CCode (cheader_filename = "polkit/polkit.h", cprefix = "POLKIT_CHECK_AUTHORIZATION_FLAGS_", type_id = "polkit_check_authorization_flags_get_type ()")] |
284 | - [Flags] |
285 | - public enum CheckAuthorizationFlags { |
286 | - NONE, |
287 | - ALLOW_USER_INTERACTION |
288 | - } |
289 | - [CCode (cheader_filename = "polkit/polkit.h", cprefix = "POLKIT_IMPLICIT_AUTHORIZATION_", type_id = "polkit_implicit_authorization_get_type ()")] |
290 | - public enum ImplicitAuthorization { |
291 | - UNKNOWN, |
292 | - NOT_AUTHORIZED, |
293 | - AUTHENTICATION_REQUIRED, |
294 | - ADMINISTRATOR_AUTHENTICATION_REQUIRED, |
295 | - AUTHENTICATION_REQUIRED_RETAINED, |
296 | - ADMINISTRATOR_AUTHENTICATION_REQUIRED_RETAINED, |
297 | - AUTHORIZED; |
298 | - public static bool from_string (string string, Polkit.ImplicitAuthorization out_implicit_authorization); |
299 | - public static unowned string to_string (Polkit.ImplicitAuthorization implicit_authorization); |
300 | - } |
301 | - [CCode (cheader_filename = "polkit/polkit.h", cprefix = "POLKIT_ERROR_")] |
302 | - public errordomain Error { |
303 | - FAILED, |
304 | - CANCELLED, |
305 | - NOT_SUPPORTED, |
306 | - NOT_AUTHORIZED; |
307 | - public static GLib.Quark quark (); |
308 | - } |
309 | - [CCode (cheader_filename = "polkit/polkit.h")] |
310 | - public static Polkit.Identity identity_from_string (string str) throws GLib.Error; |
311 | - [CCode (cheader_filename = "polkit/polkit.h")] |
312 | - public static Polkit.Subject subject_from_string (string str) throws GLib.Error; |
313 | -} |