Switchboard Locale Plug

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

  1. polkit
  2. Merge into trunk
Proposed by Rico Tzschichholz
Status: Merged
Approved by: Corentin Noël
Approved revision: 232
Merged at revision: 232
Proposed branch: lp:~ricotz/switchboard-plug-locale/polkit
Merge into: lp:~elementary-apps/switchboard-plug-locale/trunk
Diff against target: 249 lines (+2/-220)
3 files modified
src/CMakeLists.txt (+1/-1)
src/Utils.vala (+1/-1)
vapi/polkit-gobject-1.vapi (+0/-218)
To merge this branch: bzr merge lp:~ricotz/switchboard-plug-locale/polkit
Reviewer Review Type Date Requested Status
elementary Apps team Pending
Review via email: mp+309261@code.launchpad.net

Commit message

Remove polkit-gobject-1.vapi and use the one shipped 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.

Preview Diff

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

Subscribers

People subscribed via source and target branches

to all changes: