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

[Rico Tzschichholz]

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

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

[lp:~ricotz/switchboard-plug-parental-controls/polkit]

239. By Rico Tzschichholz on 2016-10-25

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

=== modified file 'debian/control'
--- debian/control	2016-09-09 14:51:34 +0000
+++ debian/control	2016-10-25 21:36:09 +0000
@@ -11,7 +11,7 @@
                libgtk-3-dev,
                libpolkit-gobject-1-dev,
                libswitchboard-2.0-dev,
-               valac
+               valac (>= 0.34.1)
 Standards-Version: 3.9.2
 Homepage: https://launchpad.net/pantheon-plugs
 
 
=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2016-08-26 14:35:28 +0000
+++ src/CMakeLists.txt	2016-10-25 21:36:09 +0000
@@ -8,7 +8,7 @@
 
 find_package (Vala REQUIRED)
 include (ValaVersion)
-ensure_vala_version ("0.22.0" MINIMUM)
+ensure_vala_version ("0.34.1" MINIMUM)
 
 include (ValaPrecompile)
 # Add all your vala files and requires packages to the List below to include them in the build
 
=== modified file 'src/client/Client.vala'
--- src/client/Client.vala	2016-08-30 17:28:55 +0000
+++ src/client/Client.vala	2016-10-25 21:36:09 +0000
@@ -57,9 +57,9 @@
             }
 
             try {
-                var user = (Polkit.UnixUser)Polkit.UnixUser.new_for_name (username);
+                var user = new Polkit.UnixUser.for_name (username);
                 permission = new Polkit.Permission.sync (action_id,
-                                        Polkit.UnixProcess.new_for_owner (Posix.getpid (), 0, user.get_uid ()));
+                                        new Polkit.UnixProcess.for_owner (Posix.getpid (), 0, user.get_uid ()));
             } catch (Error e) {
                 warning ("%s\n", e.message);
             }
 
=== modified file 'src/daemon/ProcessWatcher.vala'
--- src/daemon/ProcessWatcher.vala	2016-08-30 17:40:51 +0000
+++ src/daemon/ProcessWatcher.vala	2016-10-25 21:36:09 +0000
@@ -84,8 +84,8 @@
                     ulong signal_id = 0;
                     signal_id = server.app_authorization_ended.connect ((client_pid) => {
                         try {
-                            var unix_user = (Polkit.UnixUser)Polkit.UnixUser.new_for_name (config.username);
-                            var result = authority.check_authorization_sync (Polkit.UnixProcess.new_for_owner (client_pid, 0, unix_user.get_uid ()),
+                            var unix_user = new Polkit.UnixUser.for_name (config.username);
+                            var result = authority.check_authorization_sync (new Polkit.UnixProcess.for_owner (client_pid, 0, unix_user.get_uid ()),
                                                                             Vars.PARENTAL_CONTROLS_ACTION_ID,
                                                                             null,
                                                                             Polkit.CheckAuthorizationFlags.NONE);
@@ -107,4 +107,4 @@
             }  
         }
     }
-}
 \ No newline at end of file
+}
 
=== modified file 'src/daemon/Server.vala'
--- src/daemon/Server.vala	2016-08-30 17:28:55 +0000
+++ src/daemon/Server.vala	2016-10-25 21:36:09 +0000
@@ -227,7 +227,7 @@
                 warning (e.message);
             }            
 
-            var subject = Polkit.UnixProcess.new_for_owner ((int)pid, 0, (int)user);
+            var subject = new Polkit.UnixProcess.for_owner ((int)pid, 0, (int)user);
 
             try {
                 var authority = Polkit.Authority.get_sync (null);
@@ -252,4 +252,4 @@
             return pid;
         }
     }
-}
 \ No newline at end of file
+}
 
=== modified file 'src/shared/Utils.vala'
--- src/shared/Utils.vala	2016-08-29 22:25:35 +0000
+++ src/shared/Utils.vala	2016-10-25 21:36:09 +0000
@@ -90,9 +90,9 @@
             }
 
             try {
-                var user = (Polkit.UnixUser)Polkit.UnixUser.new_for_name (Environment.get_user_name ());
+                var user = new Polkit.UnixUser.for_name (Environment.get_user_name ());
                 permission = new Polkit.Permission.sync (Vars.PARENTAL_CONTROLS_ACTION_ID,
-                                Polkit.UnixProcess.new_for_owner (Posix.getpid (), 0, user.get_uid ()));
+                                new Polkit.UnixProcess.for_owner (Posix.getpid (), 0, user.get_uid ()));
                 return permission;
             } catch (Error e) {
                 critical (e.message);
 
=== removed file 'vapi/polkit-gobject-1.vapi'
--- vapi/polkit-gobject-1.vapi	2015-09-03 19:59:14 +0000
+++ vapi/polkit-gobject-1.vapi	1970-01-01 00:00:00 +0000
@@ -1,218 +0,0 @@
-/* polkit-gobject-1.vapi generated by vapigen, do not modify. */
-
-[CCode (cprefix = "Polkit", gir_namespace = "Polkit", gir_version = "1.0", lower_case_cprefix = "polkit_")]
-namespace Polkit {
-	[CCode (cheader_filename = "polkit/polkit.h", type_id = "polkit_action_description_get_type ()")]
-	public class ActionDescription : GLib.Object {
-		[CCode (has_construct_function = false)]
-		protected ActionDescription ();
-		public unowned string get_action_id ();
-		public unowned string get_annotation (string key);
-		[CCode (array_length = false, array_null_terminated = true)]
-		public unowned string[] get_annotation_keys ();
-		public unowned string get_description ();
-		public unowned string get_icon_name ();
-		public Polkit.ImplicitAuthorization get_implicit_active ();
-		public Polkit.ImplicitAuthorization get_implicit_any ();
-		public Polkit.ImplicitAuthorization get_implicit_inactive ();
-		public unowned string get_message ();
-		public unowned string get_vendor_name ();
-		public unowned string get_vendor_url ();
-	}
-	[CCode (cheader_filename = "polkit/polkit.h", type_id = "polkit_authority_get_type ()")]
-	public class Authority : GLib.Object, GLib.AsyncInitable, GLib.Initable {
-		[CCode (has_construct_function = false)]
-		protected Authority ();
-		public async bool authentication_agent_response (string cookie, Polkit.Identity identity, GLib.Cancellable? cancellable) throws GLib.Error;
-		public bool authentication_agent_response_sync (string cookie, Polkit.Identity identity, GLib.Cancellable? cancellable = null) throws GLib.Error;
-		public async Polkit.AuthorizationResult check_authorization (Polkit.Subject subject, string action_id, Polkit.Details? details, Polkit.CheckAuthorizationFlags flags, GLib.Cancellable? cancellable) throws GLib.Error;
-		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;
-		public async void enumerate_actions (GLib.Cancellable? cancellable);
-		public async void enumerate_temporary_authorizations (Polkit.Subject subject, GLib.Cancellable? cancellable);
-		public static Polkit.Authority @get ();
-		public static async Polkit.Authority get_async (GLib.Cancellable? cancellable) throws GLib.Error;
-		public Polkit.AuthorityFeatures get_backend_features ();
-		public unowned string get_backend_name ();
-		public unowned string get_backend_version ();
-		public string get_owner ();
-		public static Polkit.Authority get_sync (GLib.Cancellable? cancellable = null) throws GLib.Error;
-		public async bool register_authentication_agent (Polkit.Subject subject, string locale, string object_path, GLib.Cancellable? cancellable) throws GLib.Error;
-		public bool register_authentication_agent_sync (Polkit.Subject subject, string locale, string object_path, GLib.Cancellable? cancellable = null) throws GLib.Error;
-		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;
-		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;
-		public async bool revoke_temporary_authorization_by_id (string id, GLib.Cancellable? cancellable) throws GLib.Error;
-		public bool revoke_temporary_authorization_by_id_sync (string id, GLib.Cancellable? cancellable = null) throws GLib.Error;
-		public async bool revoke_temporary_authorizations (Polkit.Subject subject, GLib.Cancellable? cancellable) throws GLib.Error;
-		public bool revoke_temporary_authorizations_sync (Polkit.Subject subject, GLib.Cancellable? cancellable = null) throws GLib.Error;
-		public async bool unregister_authentication_agent (Polkit.Subject subject, string object_path, GLib.Cancellable? cancellable) throws GLib.Error;
-		public bool unregister_authentication_agent_sync (Polkit.Subject subject, string object_path, GLib.Cancellable? cancellable = null) throws GLib.Error;
-		public Polkit.AuthorityFeatures backend_features { get; }
-		public string backend_name { get; }
-		public string backend_version { get; }
-		public string owner { owned get; }
-		public signal void changed ();
-	}
-	[CCode (cheader_filename = "polkit/polkit.h", type_id = "polkit_authorization_result_get_type ()")]
-	public class AuthorizationResult : GLib.Object {
-		[CCode (has_construct_function = false)]
-		public AuthorizationResult (bool is_authorized, bool is_challenge, Polkit.Details? details);
-		public unowned Polkit.Details get_details ();
-		public bool get_dismissed ();
-		public bool get_is_authorized ();
-		public bool get_is_challenge ();
-		public bool get_retains_authorization ();
-		public unowned string get_temporary_authorization_id ();
-	}
-	[CCode (cheader_filename = "polkit/polkit.h", type_id = "polkit_details_get_type ()")]
-	public class Details : GLib.Object {
-		[CCode (has_construct_function = false)]
-		public Details ();
-		[CCode (array_length = false, array_null_terminated = true)]
-		public string[] get_keys ();
-		public void insert (string key, string? value);
-		public unowned string lookup (string key);
-	}
-	[CCode (cheader_filename = "polkit/polkit.h", type_id = "polkit_permission_get_type ()")]
-	public class Permission : GLib.Permission, GLib.AsyncInitable, GLib.Initable {
-		[CCode (cname = "polkit_permission_new", has_construct_function = false)]
-		public async Permission (string action_id, Polkit.Subject? subject, GLib.Cancellable? cancellable) throws GLib.Error;
-		public unowned string get_action_id ();
-		public unowned Polkit.Subject get_subject ();
-		[CCode (has_construct_function = false, type = "GPermission*")]
-		public Permission.sync (string action_id, Polkit.Subject? subject, GLib.Cancellable? cancellable = null) throws GLib.Error;
-		public string action_id { get; construct; }
-		public Polkit.Subject subject { get; construct; }
-	}
-	[CCode (cheader_filename = "polkit/polkit.h", type_id = "polkit_system_bus_name_get_type ()")]
-	public class SystemBusName : GLib.Object, Polkit.Subject {
-		[CCode (has_construct_function = false)]
-		protected SystemBusName ();
-		public unowned string get_name ();
-		public Polkit.Subject get_process_sync (GLib.Cancellable? cancellable = null) throws GLib.Error;
-		public static Polkit.Subject @new (string name);
-		public void set_name (string name);
-		public string name { get; set construct; }
-	}
-	[CCode (cheader_filename = "polkit/polkit.h", type_id = "polkit_temporary_authorization_get_type ()")]
-	public class TemporaryAuthorization : GLib.Object {
-		[CCode (has_construct_function = false)]
-		public TemporaryAuthorization (string id, string action_id, Polkit.Subject subject, uint64 time_obtained, uint64 time_expires);
-		public unowned string get_action_id ();
-		public unowned string get_id ();
-		public Polkit.Subject get_subject ();
-		public uint64 get_time_expires ();
-		public uint64 get_time_obtained ();
-	}
-	[CCode (cheader_filename = "polkit/polkit.h", type_id = "polkit_unix_group_get_type ()")]
-	public class UnixGroup : GLib.Object, Polkit.Identity {
-		[CCode (has_construct_function = false)]
-		protected UnixGroup ();
-		public int get_gid ();
-		public static Polkit.Identity @new (int gid);
-		public static Polkit.Identity new_for_name (string name) throws GLib.Error;
-		public void set_gid (int gid);
-		public int gid { get; set construct; }
-	}
-	[CCode (cheader_filename = "polkit/polkit.h", type_id = "polkit_unix_netgroup_get_type ()")]
-	public class UnixNetgroup : GLib.Object, Polkit.Identity {
-		[CCode (has_construct_function = false)]
-		protected UnixNetgroup ();
-		public unowned string get_name ();
-		public static Polkit.Identity @new (string name);
-		public void set_name (string name);
-		public string name { get; set construct; }
-	}
-	[CCode (cheader_filename = "polkit/polkit.h", type_id = "polkit_unix_process_get_type ()")]
-	public class UnixProcess : GLib.Object, Polkit.Subject {
-		[CCode (has_construct_function = false)]
-		protected UnixProcess ();
-		public int get_owner () throws GLib.Error;
-		public int get_pid ();
-		public uint64 get_start_time ();
-		public int get_uid ();
-		public static Polkit.Subject @new (int pid);
-		public static Polkit.Subject new_for_owner (int pid, uint64 start_time, int uid);
-		public static Polkit.Subject new_full (int pid, uint64 start_time);
-		public void set_pid (int pid);
-		public void set_start_time (uint64 start_time);
-		public void set_uid (int uid);
-		public int pid { get; set construct; }
-		public uint64 start_time { get; set construct; }
-		public int uid { get; set construct; }
-	}
-	[CCode (cheader_filename = "polkit/polkit.h", type_id = "polkit_unix_session_get_type ()")]
-	public class UnixSession : GLib.Object, GLib.AsyncInitable, GLib.Initable, Polkit.Subject {
-		[CCode (has_construct_function = false)]
-		protected UnixSession ();
-		public unowned string get_session_id ();
-		public static Polkit.Subject @new (string session_id);
-		public static async Polkit.Subject new_for_process (int pid, GLib.Cancellable? cancellable) throws GLib.Error;
-		public static Polkit.Subject new_for_process_sync (int pid, GLib.Cancellable? cancellable = null) throws GLib.Error;
-		public void set_session_id (string session_id);
-		public int pid { construct; }
-		public string session_id { get; set construct; }
-	}
-	[CCode (cheader_filename = "polkit/polkit.h", type_id = "polkit_unix_user_get_type ()")]
-	public class UnixUser : GLib.Object, Polkit.Identity {
-		[CCode (has_construct_function = false)]
-		protected UnixUser ();
-		public unowned string get_name ();
-		public int get_uid ();
-		public static Polkit.Identity @new (int uid);
-		public static Polkit.Identity new_for_name (string name) throws GLib.Error;
-		public void set_uid (int uid);
-		public int uid { get; set construct; }
-	}
-	[CCode (cheader_filename = "polkit/polkit.h", type_id = "polkit_identity_get_type ()")]
-	public interface Identity : GLib.Object {
-		public abstract bool equal (Polkit.Identity b);
-		public static Polkit.Identity from_string (string str) throws GLib.Error;
-		public abstract uint hash ();
-		public abstract string to_string ();
-	}
-	[CCode (cheader_filename = "polkit/polkit.h", type_id = "polkit_subject_get_type ()")]
-	public interface Subject : GLib.Object {
-		public abstract bool equal (Polkit.Subject b);
-		public abstract async bool exists (GLib.Cancellable? cancellable) throws GLib.Error;
-		public abstract bool exists_sync (GLib.Cancellable? cancellable = null) throws GLib.Error;
-		public static Polkit.Subject from_string (string str) throws GLib.Error;
-		public abstract uint hash ();
-		public abstract string to_string ();
-	}
-	[CCode (cheader_filename = "polkit/polkit.h", cprefix = "POLKIT_AUTHORITY_FEATURES_", type_id = "polkit_authority_features_get_type ()")]
-	[Flags]
-	public enum AuthorityFeatures {
-		NONE,
-		TEMPORARY_AUTHORIZATION
-	}
-	[CCode (cheader_filename = "polkit/polkit.h", cprefix = "POLKIT_CHECK_AUTHORIZATION_FLAGS_", type_id = "polkit_check_authorization_flags_get_type ()")]
-	[Flags]
-	public enum CheckAuthorizationFlags {
-		NONE,
-		ALLOW_USER_INTERACTION
-	}
-	[CCode (cheader_filename = "polkit/polkit.h", cprefix = "POLKIT_IMPLICIT_AUTHORIZATION_", type_id = "polkit_implicit_authorization_get_type ()")]
-	public enum ImplicitAuthorization {
-		UNKNOWN,
-		NOT_AUTHORIZED,
-		AUTHENTICATION_REQUIRED,
-		ADMINISTRATOR_AUTHENTICATION_REQUIRED,
-		AUTHENTICATION_REQUIRED_RETAINED,
-		ADMINISTRATOR_AUTHENTICATION_REQUIRED_RETAINED,
-		AUTHORIZED;
-		public static bool from_string (string string, Polkit.ImplicitAuthorization out_implicit_authorization);
-		public static unowned string to_string (Polkit.ImplicitAuthorization implicit_authorization);
-	}
-	[CCode (cheader_filename = "polkit/polkit.h", cprefix = "POLKIT_ERROR_")]
-	public errordomain Error {
-		FAILED,
-		CANCELLED,
-		NOT_SUPPORTED,
-		NOT_AUTHORIZED;
-		public static GLib.Quark quark ();
-	}
-	[CCode (cheader_filename = "polkit/polkit.h")]
-	public static Polkit.Identity identity_from_string (string str) throws GLib.Error;
-	[CCode (cheader_filename = "polkit/polkit.h")]
-	public static Polkit.Subject subject_from_string (string str) throws GLib.Error;
-}
 \ No newline at end of file