Switchboard Power Plug

Merge lp:~ricotz/switchboard-plug-power/polkit into lp:~elementary-apps/switchboard-plug-power/trunk

  1. polkit
  2. Merge into trunk
Proposed by Rico Tzschichholz
Status: Merged
Approved by: Corentin Noël
Approved revision: 356
Merged at revision: 356
Proposed branch: lp:~ricotz/switchboard-plug-power/polkit
Merge into: lp:~elementary-apps/switchboard-plug-power/trunk
Diff against target: 262 lines (+3/-221)
4 files modified
debian/control (+1/-1)
src/CMakeLists.txt (+1/-1)
src/Permission.vala (+1/-1)
vapi/polkit-gobject-1.vapi (+0/-218)
To merge this branch: bzr merge lp:~ricotz/switchboard-plug-power/polkit
Reviewer Review Type Date Requested Status
kay van der Zander (community) Approve
Review via email: mp+309264@code.launchpad.net

Commit message

Remove polkit-gobject-1.vapi and use the one shippped with valac 0.34.1

Description of the change

Remove polkit-gobject-1.vapi and use the one shippped with valac 0.34.1

To post a comment you must log in.
Revision history for this message
kay van der Zander (kay20) wrote :

approved. thank you very much

review: Approve
lp:~ricotz/switchboard-plug-power/polkit updated
356. By Rico Tzschichholz

Remove polkit-gobject-1.vapi and use the one shippped with valac 0.34.1

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/control'
2--- debian/control 2016-07-04 02:25:39 +0000
3+++ debian/control 2016-10-25 21:34:23 +0000
4@@ -8,7 +8,7 @@
5 libgranite-dev,
6 libpolkit-gobject-1-dev,
7 libswitchboard-2.0-dev,
8- valac (>= 0.22)
9+ valac (>= 0.34.1)
10 Standards-Version: 3.9.2
11 Homepage: https://launchpad.net/switchboard-plug-power
12
13
14=== modified file 'src/CMakeLists.txt'
15--- src/CMakeLists.txt 2016-07-04 02:25:39 +0000
16+++ src/CMakeLists.txt 2016-10-25 21:34:23 +0000
17@@ -9,7 +9,7 @@
18
19 find_package (Vala REQUIRED)
20 include (ValaVersion)
21-ensure_vala_version ("0.30.0" MINIMUM)
22+ensure_vala_version ("0.34.1" MINIMUM)
23
24 include (ValaPrecompile)
25 # Add all your vala files and requires packages to the List below to include them in the build
26
27=== modified file 'src/Permission.vala'
28--- src/Permission.vala 2016-07-04 02:25:39 +0000
29+++ src/Permission.vala 2016-10-25 21:34:23 +0000
30@@ -26,7 +26,7 @@
31 }
32
33 try {
34- permission = new Polkit.Permission.sync ("org.pantheon.switchboard.power.administration", Polkit.UnixProcess.new (Posix.getpid ()));
35+ permission = new Polkit.Permission.sync ("org.pantheon.switchboard.power.administration", new Polkit.UnixProcess (Posix.getpid ()));
36 return permission;
37 } catch (Error e) {
38 critical (e.message);
39
40=== removed file 'vapi/polkit-gobject-1.vapi'
41--- vapi/polkit-gobject-1.vapi 2016-07-04 02:25:39 +0000
42+++ vapi/polkit-gobject-1.vapi 1970-01-01 00:00:00 +0000
43@@ -1,218 +0,0 @@
44-/* polkit-gobject-1.vapi generated by vapigen, do not modify. */
45-
46-[CCode (cprefix = "Polkit", gir_namespace = "Polkit", gir_version = "1.0", lower_case_cprefix = "polkit_")]
47-namespace Polkit {
48- [CCode (cheader_filename = "polkit/polkit.h", type_id = "polkit_action_description_get_type ()")]
49- public class ActionDescription : GLib.Object {
50- [CCode (has_construct_function = false)]
51- protected ActionDescription ();
52- public unowned string get_action_id ();
53- public unowned string get_annotation (string key);
54- [CCode (array_length = false, array_null_terminated = true)]
55- public unowned string[] get_annotation_keys ();
56- public unowned string get_description ();
57- public unowned string get_icon_name ();
58- public Polkit.ImplicitAuthorization get_implicit_active ();
59- public Polkit.ImplicitAuthorization get_implicit_any ();
60- public Polkit.ImplicitAuthorization get_implicit_inactive ();
61- public unowned string get_message ();
62- public unowned string get_vendor_name ();
63- public unowned string get_vendor_url ();
64- }
65- [CCode (cheader_filename = "polkit/polkit.h", type_id = "polkit_authority_get_type ()")]
66- public class Authority : GLib.Object, GLib.AsyncInitable, GLib.Initable {
67- [CCode (has_construct_function = false)]
68- protected Authority ();
69- public async bool authentication_agent_response (string cookie, Polkit.Identity identity, GLib.Cancellable? cancellable) throws GLib.Error;
70- public bool authentication_agent_response_sync (string cookie, Polkit.Identity identity, GLib.Cancellable? cancellable = null) throws GLib.Error;
71- public async Polkit.AuthorizationResult check_authorization (Polkit.Subject subject, string action_id, Polkit.Details? details, Polkit.CheckAuthorizationFlags flags, GLib.Cancellable? cancellable) throws GLib.Error;
72- 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;
73- public async void enumerate_actions (GLib.Cancellable? cancellable);
74- public async void enumerate_temporary_authorizations (Polkit.Subject subject, GLib.Cancellable? cancellable);
75- public static Polkit.Authority @get ();
76- public static async Polkit.Authority get_async (GLib.Cancellable? cancellable) throws GLib.Error;
77- public Polkit.AuthorityFeatures get_backend_features ();
78- public unowned string get_backend_name ();
79- public unowned string get_backend_version ();
80- public string get_owner ();
81- public static Polkit.Authority get_sync (GLib.Cancellable? cancellable = null) throws GLib.Error;
82- public async bool register_authentication_agent (Polkit.Subject subject, string locale, string object_path, GLib.Cancellable? cancellable) throws GLib.Error;
83- public bool register_authentication_agent_sync (Polkit.Subject subject, string locale, string object_path, GLib.Cancellable? cancellable = null) throws GLib.Error;
84- 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;
85- 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;
86- public async bool revoke_temporary_authorization_by_id (string id, GLib.Cancellable? cancellable) throws GLib.Error;
87- public bool revoke_temporary_authorization_by_id_sync (string id, GLib.Cancellable? cancellable = null) throws GLib.Error;
88- public async bool revoke_temporary_authorizations (Polkit.Subject subject, GLib.Cancellable? cancellable) throws GLib.Error;
89- public bool revoke_temporary_authorizations_sync (Polkit.Subject subject, GLib.Cancellable? cancellable = null) throws GLib.Error;
90- public async bool unregister_authentication_agent (Polkit.Subject subject, string object_path, GLib.Cancellable? cancellable) throws GLib.Error;
91- public bool unregister_authentication_agent_sync (Polkit.Subject subject, string object_path, GLib.Cancellable? cancellable = null) throws GLib.Error;
92- public Polkit.AuthorityFeatures backend_features { get; }
93- public string backend_name { get; }
94- public string backend_version { get; }
95- public string owner { owned get; }
96- public signal void changed ();
97- }
98- [CCode (cheader_filename = "polkit/polkit.h", type_id = "polkit_authorization_result_get_type ()")]
99- public class AuthorizationResult : GLib.Object {
100- [CCode (has_construct_function = false)]
101- public AuthorizationResult (bool is_authorized, bool is_challenge, Polkit.Details? details);
102- public unowned Polkit.Details get_details ();
103- public bool get_dismissed ();
104- public bool get_is_authorized ();
105- public bool get_is_challenge ();
106- public bool get_retains_authorization ();
107- public unowned string get_temporary_authorization_id ();
108- }
109- [CCode (cheader_filename = "polkit/polkit.h", type_id = "polkit_details_get_type ()")]
110- public class Details : GLib.Object {
111- [CCode (has_construct_function = false)]
112- public Details ();
113- [CCode (array_length = false, array_null_terminated = true)]
114- public string[] get_keys ();
115- public void insert (string key, string? value);
116- public unowned string lookup (string key);
117- }
118- [CCode (cheader_filename = "polkit/polkit.h", type_id = "polkit_permission_get_type ()")]
119- public class Permission : GLib.Permission, GLib.AsyncInitable, GLib.Initable {
120- [CCode (cname = "polkit_permission_new", has_construct_function = false)]
121- public async Permission (string action_id, Polkit.Subject? subject, GLib.Cancellable? cancellable) throws GLib.Error;
122- public unowned string get_action_id ();
123- public unowned Polkit.Subject get_subject ();
124- [CCode (has_construct_function = false, type = "GPermission*")]
125- public Permission.sync (string action_id, Polkit.Subject? subject, GLib.Cancellable? cancellable = null) throws GLib.Error;
126- public string action_id { get; construct; }
127- public Polkit.Subject subject { get; construct; }
128- }
129- [CCode (cheader_filename = "polkit/polkit.h", type_id = "polkit_system_bus_name_get_type ()")]
130- public class SystemBusName : GLib.Object, Polkit.Subject {
131- [CCode (has_construct_function = false)]
132- protected SystemBusName ();
133- public unowned string get_name ();
134- public Polkit.Subject get_process_sync (GLib.Cancellable? cancellable = null) throws GLib.Error;
135- public static Polkit.Subject @new (string name);
136- public void set_name (string name);
137- public string name { get; set construct; }
138- }
139- [CCode (cheader_filename = "polkit/polkit.h", type_id = "polkit_temporary_authorization_get_type ()")]
140- public class TemporaryAuthorization : GLib.Object {
141- [CCode (has_construct_function = false)]
142- public TemporaryAuthorization (string id, string action_id, Polkit.Subject subject, uint64 time_obtained, uint64 time_expires);
143- public unowned string get_action_id ();
144- public unowned string get_id ();
145- public Polkit.Subject get_subject ();
146- public uint64 get_time_expires ();
147- public uint64 get_time_obtained ();
148- }
149- [CCode (cheader_filename = "polkit/polkit.h", type_id = "polkit_unix_group_get_type ()")]
150- public class UnixGroup : GLib.Object, Polkit.Identity {
151- [CCode (has_construct_function = false)]
152- protected UnixGroup ();
153- public int get_gid ();
154- public static Polkit.Identity @new (int gid);
155- public static Polkit.Identity new_for_name (string name) throws GLib.Error;
156- public void set_gid (int gid);
157- public int gid { get; set construct; }
158- }
159- [CCode (cheader_filename = "polkit/polkit.h", type_id = "polkit_unix_netgroup_get_type ()")]
160- public class UnixNetgroup : GLib.Object, Polkit.Identity {
161- [CCode (has_construct_function = false)]
162- protected UnixNetgroup ();
163- public unowned string get_name ();
164- public static Polkit.Identity @new (string name);
165- public void set_name (string name);
166- public string name { get; set construct; }
167- }
168- [CCode (cheader_filename = "polkit/polkit.h", type_id = "polkit_unix_process_get_type ()")]
169- public class UnixProcess : GLib.Object, Polkit.Subject {
170- [CCode (has_construct_function = false)]
171- protected UnixProcess ();
172- public int get_owner () throws GLib.Error;
173- public int get_pid ();
174- public uint64 get_start_time ();
175- public int get_uid ();
176- public static Polkit.Subject @new (int pid);
177- public static Polkit.Subject new_for_owner (int pid, uint64 start_time, int uid);
178- public static Polkit.Subject new_full (int pid, uint64 start_time);
179- public void set_pid (int pid);
180- public void set_start_time (uint64 start_time);
181- public void set_uid (int uid);
182- public int pid { get; set construct; }
183- public uint64 start_time { get; set construct; }
184- public int uid { get; set construct; }
185- }
186- [CCode (cheader_filename = "polkit/polkit.h", type_id = "polkit_unix_session_get_type ()")]
187- public class UnixSession : GLib.Object, GLib.AsyncInitable, GLib.Initable, Polkit.Subject {
188- [CCode (has_construct_function = false)]
189- protected UnixSession ();
190- public unowned string get_session_id ();
191- public static Polkit.Subject @new (string session_id);
192- public static async Polkit.Subject new_for_process (int pid, GLib.Cancellable? cancellable) throws GLib.Error;
193- public static Polkit.Subject new_for_process_sync (int pid, GLib.Cancellable? cancellable = null) throws GLib.Error;
194- public void set_session_id (string session_id);
195- public int pid { construct; }
196- public string session_id { get; set construct; }
197- }
198- [CCode (cheader_filename = "polkit/polkit.h", type_id = "polkit_unix_user_get_type ()")]
199- public class UnixUser : GLib.Object, Polkit.Identity {
200- [CCode (has_construct_function = false)]
201- protected UnixUser ();
202- public unowned string get_name ();
203- public int get_uid ();
204- public static Polkit.Identity @new (int uid);
205- public static Polkit.Identity new_for_name (string name) throws GLib.Error;
206- public void set_uid (int uid);
207- public int uid { get; set construct; }
208- }
209- [CCode (cheader_filename = "polkit/polkit.h", type_id = "polkit_identity_get_type ()")]
210- public interface Identity : GLib.Object {
211- public abstract bool equal (Polkit.Identity b);
212- public static Polkit.Identity from_string (string str) throws GLib.Error;
213- public abstract uint hash ();
214- public abstract string to_string ();
215- }
216- [CCode (cheader_filename = "polkit/polkit.h", type_id = "polkit_subject_get_type ()")]
217- public interface Subject : GLib.Object {
218- public abstract bool equal (Polkit.Subject b);
219- public abstract async bool exists (GLib.Cancellable? cancellable) throws GLib.Error;
220- public abstract bool exists_sync (GLib.Cancellable? cancellable = null) throws GLib.Error;
221- public static Polkit.Subject from_string (string str) throws GLib.Error;
222- public abstract uint hash ();
223- public abstract string to_string ();
224- }
225- [CCode (cheader_filename = "polkit/polkit.h", cprefix = "POLKIT_AUTHORITY_FEATURES_", type_id = "polkit_authority_features_get_type ()")]
226- [Flags]
227- public enum AuthorityFeatures {
228- NONE,
229- TEMPORARY_AUTHORIZATION
230- }
231- [CCode (cheader_filename = "polkit/polkit.h", cprefix = "POLKIT_CHECK_AUTHORIZATION_FLAGS_", type_id = "polkit_check_authorization_flags_get_type ()")]
232- [Flags]
233- public enum CheckAuthorizationFlags {
234- NONE,
235- ALLOW_USER_INTERACTION
236- }
237- [CCode (cheader_filename = "polkit/polkit.h", cprefix = "POLKIT_IMPLICIT_AUTHORIZATION_", type_id = "polkit_implicit_authorization_get_type ()")]
238- public enum ImplicitAuthorization {
239- UNKNOWN,
240- NOT_AUTHORIZED,
241- AUTHENTICATION_REQUIRED,
242- ADMINISTRATOR_AUTHENTICATION_REQUIRED,
243- AUTHENTICATION_REQUIRED_RETAINED,
244- ADMINISTRATOR_AUTHENTICATION_REQUIRED_RETAINED,
245- AUTHORIZED;
246- public static bool from_string (string string, Polkit.ImplicitAuthorization out_implicit_authorization);
247- public static unowned string to_string (Polkit.ImplicitAuthorization implicit_authorization);
248- }
249- [CCode (cheader_filename = "polkit/polkit.h", cprefix = "POLKIT_ERROR_")]
250- public errordomain Error {
251- FAILED,
252- CANCELLED,
253- NOT_SUPPORTED,
254- NOT_AUTHORIZED;
255- public static GLib.Quark quark ();
256- }
257- [CCode (cheader_filename = "polkit/polkit.h")]
258- public static Polkit.Identity identity_from_string (string str) throws GLib.Error;
259- [CCode (cheader_filename = "polkit/polkit.h")]
260- public static Polkit.Subject subject_from_string (string str) throws GLib.Error;
261-}
262\ No newline at end of file

Subscribers

People subscribed via source and target branches

to all changes: