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