From 5db553f7aa002ab928d4a605311909cac91782fa Mon Sep 17 00:00:00 2001 From: Nine Date: Thu, 17 Jan 2019 08:28:53 +1100 Subject: [PATCH] Remove old libaccounts-glib VAPI (#411) --- plugins/LastFM/meson.build | 2 +- vapi/libaccounts-glib.deps | 1 - vapi/libaccounts-glib.vapi | 238 ------------------------------------- 3 files changed, 1 insertion(+), 240 deletions(-) delete mode 100644 vapi/libaccounts-glib.deps delete mode 100644 vapi/libaccounts-glib.vapi diff --git a/plugins/LastFM/meson.build b/plugins/LastFM/meson.build index 84e99f82a..cb42f71e1 100644 --- a/plugins/LastFM/meson.build +++ b/plugins/LastFM/meson.build @@ -1,7 +1,7 @@ lastfm_deps = [ app_dep, dependency('json-glib-1.0'), - dependency('libaccounts-glib'), + dependency('libaccounts-glib', version: '>=1.23'), dependency('libsignon-glib', version: '>=2.0'), dependency('libsoup-2.4') ] diff --git a/vapi/libaccounts-glib.deps b/vapi/libaccounts-glib.deps deleted file mode 100644 index 755c4ca04..000000000 --- a/vapi/libaccounts-glib.deps +++ /dev/null @@ -1 +0,0 @@ -gio-unix-2.0 diff --git a/vapi/libaccounts-glib.vapi b/vapi/libaccounts-glib.vapi deleted file mode 100644 index 208539366..000000000 --- a/vapi/libaccounts-glib.vapi +++ /dev/null @@ -1,238 +0,0 @@ -/* libaccounts-glib.vapi generated by vapigen, do not modify. */ - -[CCode (cprefix = "Ag", gir_namespace = "Accounts", gir_version = "1.0", lower_case_cprefix = "ag_")] -namespace Ag { - [CCode (cheader_filename = "libaccounts-glib/accounts-glib.h", type_id = "ag_account_get_type ()")] - public class Account : GLib.Object, GLib.Initable { - [CCode (has_construct_function = false)] - protected Account (); - public void @delete (); - public unowned string get_display_name (); - public bool get_enabled (); - public unowned Ag.Manager get_manager (); - public unowned string get_provider_name (); - public Ag.Service get_selected_service (); - public Ag.AccountSettingIter get_settings_iter (string? key_prefix); - [Deprecated (replacement = "get_variant", since = "1.4")] - public Ag.SettingSource get_value (string key, ref GLib.Value value); - public unowned GLib.Variant get_variant (string key, out Ag.SettingSource? source); - public GLib.List list_enabled_services (); - public GLib.List list_services (); - public GLib.List list_services_by_type (string service_type); - public void remove_watch (Ag.AccountWatch watch); - public void select_service (Ag.Service? service); - public void set_display_name (string display_name); - public void set_enabled (bool enabled); - [Deprecated (replacement = "set_variant", since = "1.4")] - public void set_value (string key, GLib.Value? value); - public void set_variant (string key, GLib.Variant? value); - public void settings_iter_init (Ag.AccountSettingIter iter, string? key_prefix); - public void sign (string key, string token); - [Deprecated (replacement = "store_async", since="1.4")] - public void store (Ag.AccountStoreCb callback); - public async void store_async (GLib.Cancellable? cancellable = null) throws Ag.AccountsError; - public bool store_blocking () throws Ag.AccountsError; - public bool supports_service (string service_type); - public bool verify (string key, string token); - public bool verify_with_tokens (string key, string tokens); - public unowned Ag.AccountWatch watch_dir (string key_prefix, Ag.AccountNotifyCb callback); - public unowned Ag.AccountWatch watch_key (string key, Ag.AccountNotifyCb callback); - public string display_name { get; } -/* FIXME: Same name as a signal, so ignore for the moment. - public bool enabled { get; } - */ - public bool foreign { construct; } - [NoAccessorMethod] - public uint id { get; construct; } - public Ag.Manager manager { get; construct; } - public string provider { get; construct; } - public signal void deleted (); - public signal void display_name_changed (); - public signal void enabled (string service, bool enabled); - } - [CCode (cheader_filename = "libaccounts-glib/accounts-glib.h", type_id = "ag_account_service_get_type ()")] - public class AccountService : GLib.Object { - [CCode (has_construct_function = false)] - public AccountService (owned Ag.Account account, owned Ag.Service? service); - public unowned Ag.Account get_account (); - public Ag.AuthData get_auth_data (); - [CCode (array_length = false, array_null_terminated = true)] - public string[] get_changed_fields (); - public bool get_enabled (); - public unowned Ag.Service get_service (); - public Ag.AccountSettingIter get_settings_iter (string? key_prefix); - [Deprecated (replacement = "get_variant", since = "1.4")] - public Ag.SettingSource get_value (string key, ref GLib.Value value); - public unowned GLib.Variant get_variant (string key, out Ag.SettingSource? source); - [Deprecated (replacement = "set_variant", since = "1.4")] - public void set_value (string key, GLib.Value? value); - public void set_variant (string key, GLib.Variant? value); - public void settings_iter_init (Ag.AccountSettingIter iter, string? key_prefix); - [Deprecated (since = "1.4")] - public static bool settings_iter_next (Ag.AccountSettingIter iter, out unowned string key, out GLib.Value value); - public Ag.Account account { get; construct; } -/* FIXME: Same name as a signal, so ignore for the moment. - public bool enabled { get; } - */ - public Ag.Service service { get; construct; } - public signal void changed (); - public signal void enabled (bool enabled); - } - [CCode (cheader_filename = "libaccounts-glib/accounts-glib.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", lower_case_csuffix = "account_settings_iter", type_id = "ag_account_settings_iter_get_type ()")] - [Compact] - public class AccountSettingIter { - public weak Ag.Account account; - public void free (); - public bool get_next (out unowned string key, out unowned GLib.Variant value); - [Deprecated (replacement = "get_next", since = "1.4")] - public bool next (out unowned string key, out GLib.Value value); - } - [CCode (cheader_filename = "libaccounts-glib/accounts-glib.h")] - [Compact] - public class AccountWatch { - } - [CCode (cheader_filename = "libaccounts-glib/accounts-glib.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "ag_application_get_type ()")] - [Compact] - public class Application { - public unowned string get_description (); - public GLib.DesktopAppInfo get_desktop_app_info (); - public unowned string get_i18n_domain (); - public unowned string get_name (); - public unowned string get_service_usage (Ag.Service service); - public Ag.Application @ref (); - public void unref (); - } - [CCode (cheader_filename = "libaccounts-glib/accounts-glib.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "ag_auth_data_get_type ()")] - [Compact] - public class AuthData { - public uint get_credentials_id (); - public unowned GLib.Variant get_login_parameters (GLib.Variant? extra_parameters); - public unowned string get_mechanism (); - public unowned string get_method (); - [Deprecated (replacement = "get_login_parameters", since = "1.4")] - public unowned GLib.HashTable get_parameters (); - [Deprecated (replacement = "get_login_parameters", since = "1.4")] - public void insert_parameters (GLib.HashTable parameters); - public Ag.AuthData @ref (); - public void unref (); - } - [CCode (cheader_filename = "libaccounts-glib/accounts-glib.h", type_id = "ag_manager_get_type ()")] - public class Manager : GLib.Object, GLib.Initable { - [CCode (has_construct_function = false)] - public Manager (); - public Ag.Account create_account (string provider_name); - [CCode (has_construct_function = false)] - public Manager.for_service_type (string service_type); - public bool get_abort_on_db_timeout (); - public Ag.Account get_account (Ag.AccountId account_id); - public GLib.List get_account_services (); - public Ag.Application get_application (string application_name); - public uint get_db_timeout (); - public GLib.List get_enabled_account_services (); - public Ag.Provider get_provider (string provider_name); - public Ag.Service get_service (string service_name); - public unowned string get_service_type (); - public GLib.List list (); - public GLib.List list_applications_by_service (Ag.Service service); - public GLib.List list_by_service_type (string service_type); - public GLib.List list_enabled (); - public GLib.List list_enabled_by_service_type (string service_type); - public static void list_free (GLib.List list); - public GLib.List list_providers (); - public GLib.List list_service_types (); - public GLib.List list_services (); - public GLib.List list_services_by_type (string service_type); - public Ag.Account load_account (Ag.AccountId account_id) throws Ag.AccountsError; - public Ag.ServiceType load_service_type (string service_type); - public void set_abort_on_db_timeout (bool abort); - public void set_db_timeout (uint timeout_ms); - public bool abort_on_db_timeout { get; set; } - public uint db_timeout { get; set; } - public string service_type { get; construct; } - [NoAccessorMethod] - public bool use_dbus { get; construct; } - public signal void account_created (uint account_id); - public virtual signal void account_deleted (uint id); - public signal void account_updated (uint account_id); - public signal void enabled_event (uint account_id); - } - [CCode (cheader_filename = "libaccounts-glib/accounts-glib.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "ag_provider_get_type ()")] - [Compact] - public class Provider { - public unowned string get_description (); - public unowned string get_display_name (); - public unowned string get_domains_regex (); - public void get_file_contents (string contents); - public unowned string get_i18n_domain (); - public unowned string get_icon_name (); - public unowned string get_name (); - public unowned string get_plugin_name (); - public bool get_single_account (); - public static void list_free (GLib.List list); - public bool match_domain (string domain); - public Ag.Provider @ref (); - public void unref (); - } - [CCode (cheader_filename = "libaccounts-glib/accounts-glib.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "ag_service_get_type ()")] - [Compact] - public class Service { - public unowned string get_description (); - public unowned string get_display_name (); - public void get_file_contents (string contents, size_t data_offset); - public unowned string get_i18n_domain (); - public unowned string get_icon_name (); - public unowned string get_name (); - public unowned string get_provider (); - public unowned string get_service_type (); - public GLib.List get_tags (); - public bool has_tag (string tag); - public static void list_free (GLib.List list); - public Ag.Service @ref (); - public void unref (); - } - [CCode (cheader_filename = "libaccounts-glib/accounts-glib.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "ag_service_type_get_type ()")] - [Compact] - public class ServiceType { - public unowned string get_description (); - public unowned string get_display_name (); - public void get_file_contents (string contents, size_t len); - public unowned string get_i18n_domain (); - public unowned string get_icon_name (); - public unowned string get_name (); - public GLib.List get_tags (); - public bool has_tag (string tag); - public static void list_free (GLib.List list); - public Ag.ServiceType @ref (); - public void unref (); - } - [CCode (cheader_filename = "libaccounts-glib/accounts-glib.h")] - [SimpleType] - public struct AccountId : uint { - } - [CCode (cheader_filename = "libaccounts-glib/accounts-glib.h", cprefix = "AG_SETTING_SOURCE_", has_type_id = false)] - public enum SettingSource { - NONE, - ACCOUNT, - PROFILE - } - [CCode (cheader_filename = "libaccounts-glib/accounts-glib.h", cprefix = "AG_ACCOUNTS_ERROR_")] - public errordomain AccountsError { - DB, - DISPOSED, - DELETED, - DB_LOCKED, - ACCOUNT_NOT_FOUND, - STORE_IN_PROGRESS, - READONLY; - public static GLib.Quark quark (); - } - [CCode (cheader_filename = "libaccounts-glib/accounts-glib.h", instance_pos = 2.9)] - public delegate void AccountNotifyCb (Ag.Account account, string key); - [CCode (cheader_filename = "libaccounts-glib/accounts-glib.h", instance_pos = 2.9)] - public delegate void AccountServiceNotifyCb (Ag.AccountService self, string key); - [Deprecated (since = "1.4")] - [CCode (cheader_filename = "libaccounts-glib/accounts-glib.h", instance_pos = 2.9)] - public delegate void AccountStoreCb (Ag.Account account, GLib.Error error); - [CCode (cheader_filename = "libaccounts-glib/accounts-glib.h")] - public static GLib.Quark errors_quark (); -}