From 4609a13c25a6eccb218597b2d89428c17d5aeeb2 Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Tue, 9 Jun 2020 16:35:49 +0100 Subject: [PATCH 1/3] Bump up the dependency on Meson We're using functionality introduced after 0.42. --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 81ee568..2a52382 100644 --- a/meson.build +++ b/meson.build @@ -1,6 +1,6 @@ project ('libcloudproviders', 'c', version: '0.3.1', - meson_version: '>=0.42.0', + meson_version: '>=0.47.0', license: 'LGPL3+', default_options: [ 'c_std=gnu99', -- GitLab From f44d83259ebddc25447d61b2950c6ff798540203 Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Tue, 9 Jun 2020 16:36:17 +0100 Subject: [PATCH 2/3] Use `copy` instead of an empty configuration_data() object This is the idiomatic way to copy a file from the source directory to the build directory. --- test/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/meson.build b/test/meson.build index 30379b2..c909aad 100644 --- a/test/meson.build +++ b/test/meson.build @@ -10,7 +10,7 @@ executable('testcloudprovidersclient', 'testcloudprovidersclient.c', configure_file(input : 'icon.svg', output : 'icon.svg', - configuration : configuration_data()) + copy : true) if installed service_conf = configuration_data () -- GitLab From 19bdb5ddf2037452ab845ad44120cf06a409c7b6 Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Tue, 9 Jun 2020 16:40:37 +0100 Subject: [PATCH 3/3] ci: Update to a non-ancient version of Fedora --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4ef30a5..a3500f0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,4 +1,4 @@ -image: fedora:26 +image: fedora:32 stages: - build before_script: @@ -8,4 +8,4 @@ build-libcloudproviders: script: - meson _build . - ninja -C _build - - ninja -C _build install \ No newline at end of file + - ninja -C _build install -- GitLab From 6fadeef11514351a9710e9b6adf2d65bbd6cea7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ignacy=20Kuchci=C5=84ski?= Date: Tue, 30 Aug 2022 00:43:37 +0200 Subject: [PATCH] collector: Free cancellable --- src/cloudproviderscollector.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/cloudproviderscollector.c b/src/cloudproviderscollector.c index 7de5efc..ecf7841 100644 --- a/src/cloudproviderscollector.c +++ b/src/cloudproviderscollector.c @@ -95,6 +95,7 @@ cloud_providers_collector_finalize (GObject *object) GList *l; g_cancellable_cancel (self->cancellable); + g_clear_object (&self->cancellable); for (l = self->monitors; l != NULL; l = l->next) { g_signal_handlers_disconnect_by_data (G_OBJECT (l->data), self); @@ -280,6 +281,7 @@ update_cloud_providers (CloudProvidersCollector *self) GList *l; g_cancellable_cancel (self->cancellable); + g_clear_object (&self->cancellable); self->cancellable = g_cancellable_new (); for (l = self->monitors; l != NULL; l = l->next) { -- GitLab From 1f8d24319492d8ed93349035e211a517b21fd3ac Mon Sep 17 00:00:00 2001 From: Bastien Nocera Date: Sun, 8 May 2022 19:19:27 +0200 Subject: [PATCH] all: Fix spelling mistakes --- README.md | 4 ++-- src/cloudprovidersaccount.h | 2 +- src/cloudprovidersaccountexporter.c | 2 +- src/cloudproviderscollector.c | 2 +- src/cloudprovidersprovider.c | 6 +++--- src/cloudprovidersproviderexporter.c | 2 +- test/testcloudprovidersserver.c | 4 ++-- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 836a984..2b1742b 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ libcloudproviders is a DBus API that allows cloud storage sync clients to expose their services. Clients such as file managers and desktop environments can then provide integrated access to the cloud providers services. -More informantion on its uses in [this blog post](https://csorianognome.wordpress.com/2015/07/07/cloud-providers/). +More information on its uses in [this blog post](https://csorianognome.wordpress.com/2015/07/07/cloud-providers/). ## API Documentation @@ -16,4 +16,4 @@ further details. - Nextcloud client 2.5 ### Client - GNOME Nautilus (file manager used by default in Fedora, Ubuntu, OpenSuse, Debian, RHEL, Suse..) -- Elementary OS on Juno \ No newline at end of file +- Elementary OS on Juno diff --git a/src/cloudprovidersaccount.h b/src/cloudprovidersaccount.h index e0b66fd..93c17d9 100644 --- a/src/cloudprovidersaccount.h +++ b/src/cloudprovidersaccount.h @@ -31,7 +31,7 @@ G_BEGIN_DECLS * @CLOUD_PROVIDERS_ACCOUNT_STATUS_INVALID: Set if the initial state of the account is unknown * @CLOUD_PROVIDERS_ACCOUNT_STATUS_IDLE: Set if the account is in idle mode * @CLOUD_PROVIDERS_ACCOUNT_STATUS_SYNCING: Set if the account is currently synchronizing data - * @CLOUD_PROVIDERS_ACCOUNT_STATUS_ERROR: Set if an error occured + * @CLOUD_PROVIDERS_ACCOUNT_STATUS_ERROR: Set if an error occurred * * Enum values used to describe the sync status of a cloud providers account **/ diff --git a/src/cloudprovidersaccountexporter.c b/src/cloudprovidersaccountexporter.c index cf6a281..c34134e 100644 --- a/src/cloudprovidersaccountexporter.c +++ b/src/cloudprovidersaccountexporter.c @@ -359,7 +359,7 @@ cloud_providers_account_exporter_set_icon (CloudProvidersAccountExporter *self, * * One of the benefits of the integration is to display a menu with available * options for an account. Use this function to export a GMenuModel menu to be - * displayed by the choosen integration by the desktop environment or application. + * displayed by the chosen integration by the desktop environment or application. */ void cloud_providers_account_exporter_set_menu_model (CloudProvidersAccountExporter *self, diff --git a/src/cloudproviderscollector.c b/src/cloudproviderscollector.c index 7de5efc..14e1eef 100644 --- a/src/cloudproviderscollector.c +++ b/src/cloudproviderscollector.c @@ -119,7 +119,7 @@ cloud_providers_collector_class_init (CloudProvidersCollectorClass *klass) /** * CloudProviderCollector::providers-changed * - * This signal is emmited by the ammount of providers changed. + * This signal is emitted by the amount of providers changed. */ signals [PROVIDERS_CHANGED] = g_signal_new ("providers-changed", G_TYPE_FROM_CLASS (klass), diff --git a/src/cloudprovidersprovider.c b/src/cloudprovidersprovider.c index 2f9c757..a569144 100644 --- a/src/cloudprovidersprovider.c +++ b/src/cloudprovidersprovider.c @@ -47,7 +47,7 @@ G_DEFINE_TYPE (CloudProvidersProvider, cloud_providers_provider, G_TYPE_OBJECT) * @short_description: Base object for representing a single provider for clients. * @include: src/cloudprovidersprovider.h * - * #CloudProvidersProvider is the basic object object for client implementators + * #CloudProvidersProvider is the basic object object for client implementers * that contains the properties of the provider such as name, and the accounts * associated with it. */ @@ -178,7 +178,7 @@ cloud_providers_provider_class_init (CloudProvidersProviderClass *klass) /** * CloudProviderProvider::accounts-changed * - * This signal is emmited by a provider if the number of accounts changed. + * This signal is emitted by a provider if the number of accounts changed. */ signals [ACCOUNTS_CHANGED] = g_signal_new ("accounts-changed", @@ -193,7 +193,7 @@ cloud_providers_provider_class_init (CloudProvidersProviderClass *klass) /** * CloudProviderProvider::removed * - * This signal is emmited by a provider when the provider is removed in DBUS. + * This signal is emitted by a provider when the provider is removed in DBUS. */ signals [REMOVED] = g_signal_new ("removed", diff --git a/src/cloudprovidersproviderexporter.c b/src/cloudprovidersproviderexporter.c index 01ad1f6..acea06b 100644 --- a/src/cloudprovidersproviderexporter.c +++ b/src/cloudprovidersproviderexporter.c @@ -118,7 +118,7 @@ unexport_account(CloudProvidersProviderExporter *self, * * Each cloud provider can have a variety of account associated with it. Use this * function to add the accounts the user set up. This function is currently only internal, - * as we do automation for hte dbus handling for adding and exporting an account. + * as we do automation for the dbus handling for adding and exporting an account. * This is handled in cloud_providers_account_exporter_new(). */ void diff --git a/test/testcloudprovidersserver.c b/test/testcloudprovidersserver.c index e352fb2..159944a 100644 --- a/test/testcloudprovidersserver.c +++ b/test/testcloudprovidersserver.c @@ -287,7 +287,7 @@ on_bus_acquired (GDBusConnection *connection, { CloudProvidersTestServer *self = CLOUD_PROVIDERS_TEST_SERVER (user_data); - g_debug ("Bus adquired: %s\n", name); + g_debug ("Bus acquired: %s\n", name); g_debug ("Registering cloud provider server 'MyCloud'\n"); @@ -309,7 +309,7 @@ on_name_acquired (GDBusConnection *connection, self->timeout_handler = g_timeout_add (TIMEOUT, (GSourceFunc) change_random_cloud_provider_state, self); - g_debug ("Server test name adquired"); + g_debug ("Server test name acquired"); change_random_cloud_provider_state (self); } -- GitLab