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

Subscribers

People subscribed via source and target branches

to all changes: