Switchboard Network Plug

Merge lp:~ricotz/switchboard-plug-networking/polkit into lp:~elementary-pantheon/switchboard-plug-networking/trunk

  1. polkit
  2. Merge into trunk
Proposed by Rico Tzschichholz
Status: Merged
Approved by: Corentin Noël
Approved revision: 323
Merged at revision: 323
Proposed branch: lp:~ricotz/switchboard-plug-networking/polkit
Merge into: lp:~elementary-pantheon/switchboard-plug-networking/trunk
Diff against target: 255 lines (+1/-221)
3 files modified
debian/control (+0/-1)
src/CMakeLists.txt (+1/-2)
src/polkit-gobject-1.vapi (+0/-218)
To merge this branch: bzr merge lp:~ricotz/switchboard-plug-networking/polkit
Reviewer Review Type Date Requested Status
elementary Pantheon team Pending
Review via email: mp+309263@code.launchpad.net

Commit message

Remove polkit-gobject-1 references since it isn't used

Description of the change

Remove polkit-gobject-1 references since it isn't used

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

Subscribers

People subscribed via source and target branches