diff --git a/libfwupd/fwupd-client.c b/libfwupd/fwupd-client.c index 1d6ab65ef..5e5562dfe 100644 --- a/libfwupd/fwupd-client.c +++ b/libfwupd/fwupd-client.c @@ -32,6 +32,7 @@ #include "fwupd-client.h" #include "fwupd-common.h" +#include "fwupd-deprecated.h" #include "fwupd-enums.h" #include "fwupd-error.h" #include "fwupd-device-private.h" diff --git a/libfwupd/fwupd-client.h b/libfwupd/fwupd-client.h index c4a7f266a..e9014508e 100644 --- a/libfwupd/fwupd-client.h +++ b/libfwupd/fwupd-client.h @@ -57,10 +57,6 @@ FwupdClient *fwupd_client_new (void); gboolean fwupd_client_connect (FwupdClient *client, GCancellable *cancellable, GError **error); -G_DEPRECATED_FOR(fwupd_client_get_devices_simple) -GPtrArray *fwupd_client_get_devices (FwupdClient *client, - GCancellable *cancellable, - GError **error); GPtrArray *fwupd_client_get_devices_simple (FwupdClient *client, GCancellable *cancellable, GError **error); @@ -95,11 +91,6 @@ FwupdResult *fwupd_client_get_results (FwupdClient *client, const gchar *device_id, GCancellable *cancellable, GError **error); -G_DEPRECATED_FOR(fwupd_client_get_details_local) -FwupdResult *fwupd_client_get_details (FwupdClient *client, - const gchar *filename, - GCancellable *cancellable, - GError **error); FwupdDevice *fwupd_client_get_device_by_id (FwupdClient *client, const gchar *device_id, GCancellable *cancellable, @@ -110,12 +101,6 @@ gboolean fwupd_client_install (FwupdClient *client, FwupdInstallFlags install_flags, GCancellable *cancellable, GError **error); -G_DEPRECATED_FOR(fwupd_client_update_metadata_with_id) -gboolean fwupd_client_update_metadata (FwupdClient *client, - const gchar *metadata_fn, - const gchar *signature_fn, - GCancellable *cancellable, - GError **error); gboolean fwupd_client_update_metadata_with_id (FwupdClient *client, const gchar *remote_id, const gchar *metadata_fn, diff --git a/libfwupd/fwupd-deprecated.h b/libfwupd/fwupd-deprecated.h new file mode 100644 index 000000000..ba2fbbce4 --- /dev/null +++ b/libfwupd/fwupd-deprecated.h @@ -0,0 +1,229 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- + * + * Copyright (C) 2017 Richard Hughes + * + * Licensed under the GNU Lesser General Public License Version 2.1 + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef __FWUPD_DEPRECATED_H +#define __FWUPD_DEPRECATED_H + +#include "fwupd-client.h" +#include "fwupd-enums.h" +#include "fwupd-remote.h" + +#define FU_DEVICE_FLAG_NONE FWUPD_DEVICE_FLAG_NONE +#define FU_DEVICE_FLAG_INTERNAL FWUPD_DEVICE_FLAG_INTERNAL +#define FU_DEVICE_FLAG_ALLOW_ONLINE FWUPD_DEVICE_FLAG_UPDATABLE +#define FU_DEVICE_FLAG_ALLOW_OFFLINE FWUPD_DEVICE_FLAG_ONLY_OFFLINE +#define FU_DEVICE_FLAG_REQUIRE_AC FWUPD_DEVICE_FLAG_REQUIRE_AC +#define FU_DEVICE_FLAG_LOCKED FWUPD_DEVICE_FLAG_LOCKED +#define FU_DEVICE_FLAG_SUPPORTED FWUPD_DEVICE_FLAG_SUPPORTED +#define FU_DEVICE_FLAG_NEEDS_BOOTLOADER FWUPD_DEVICE_FLAG_NEEDS_BOOTLOADER +#define FU_DEVICE_FLAG_UNKNOWN FWUPD_DEVICE_FLAG_UNKNOWN + +#define FWUPD_DEVICE_FLAG_ALLOW_ONLINE FWUPD_DEVICE_FLAG_UPDATABLE +#define FWUPD_DEVICE_FLAG_ALLOW_OFFLINE FWUPD_DEVICE_FLAG_ONLY_OFFLINE + +G_DEPRECATED_FOR(fwupd_client_get_devices_simple) +GPtrArray *fwupd_client_get_devices (FwupdClient *client, + GCancellable *cancellable, + GError **error); +G_DEPRECATED_FOR(fwupd_client_get_details_local) +FwupdResult *fwupd_client_get_details (FwupdClient *client, + const gchar *filename, + GCancellable *cancellable, + GError **error); +G_DEPRECATED_FOR(fwupd_client_update_metadata_with_id) +gboolean fwupd_client_update_metadata (FwupdClient *client, + const gchar *metadata_fn, + const gchar *signature_fn, + GCancellable *cancellable, + GError **error); + +SoupURI *fwupd_remote_get_uri (FwupdRemote *self) +G_DEPRECATED_FOR(fwupd_remote_get_metadata_uri); +SoupURI *fwupd_remote_get_uri_asc (FwupdRemote *self) +G_DEPRECATED_FOR(fwupd_remote_get_metadata_uri_sig); + + +/* matches */ +G_DEPRECATED_FOR(fwupd_device_add_guid) +void fwupd_result_add_guid (FwupdResult *result, + const gchar *guid); +G_DEPRECATED_FOR(fwupd_device_has_guid) +gboolean fwupd_result_has_guid (FwupdResult *result, + const gchar *guid); +G_DEPRECATED_FOR(fwupd_device_get_guids) +GPtrArray *fwupd_result_get_guids (FwupdResult *result); +G_DEPRECATED_FOR(fwupd_device_get_guid_default) +const gchar *fwupd_result_get_guid_default (FwupdResult *result); + +/* device-specific */ +G_DEPRECATED_FOR(fwupd_device_get_id) +const gchar *fwupd_result_get_device_id (FwupdResult *result); +G_DEPRECATED_FOR(fwupd_device_set_id) +void fwupd_result_set_device_id (FwupdResult *result, + const gchar *device_id); +G_DEPRECATED_FOR(fwupd_device_get_name) +const gchar *fwupd_result_get_device_name (FwupdResult *result); +G_DEPRECATED_FOR(fwupd_device_set_name) +void fwupd_result_set_device_name (FwupdResult *result, + const gchar *device_name); +G_DEPRECATED_FOR(fwupd_device_get_description) +const gchar *fwupd_result_get_device_description (FwupdResult *result); +G_DEPRECATED_FOR(fwupd_device_set_description) +void fwupd_result_set_device_description (FwupdResult *result, + const gchar *device_description); +G_DEPRECATED_FOR(fwupd_device_get_version) +const gchar *fwupd_result_get_device_version (FwupdResult *result); +G_DEPRECATED_FOR(fwupd_device_set_version) +void fwupd_result_set_device_version (FwupdResult *result, + const gchar *device_version); +G_DEPRECATED_FOR(fwupd_device_get_version_lowest) +const gchar *fwupd_result_get_device_version_lowest (FwupdResult *result); +G_DEPRECATED_FOR(fwupd_device_set_version_lowest) +void fwupd_result_set_device_version_lowest (FwupdResult *result, + const gchar *device_version_lowest); +G_DEPRECATED_FOR(fwupd_device_get_version_bootloader) +const gchar *fwupd_result_get_device_version_bootloader (FwupdResult *result); +G_DEPRECATED_FOR(fwupd_device_set_version_bootloader) +void fwupd_result_set_device_version_bootloader (FwupdResult *result, + const gchar *device_version_bootloader); +G_DEPRECATED_FOR(fwupd_device_get_flashes_left) +guint32 fwupd_result_get_device_flashes_left (FwupdResult *result); +G_DEPRECATED_FOR(fwupd_device_set_flashes_left) +void fwupd_result_set_device_flashes_left (FwupdResult *result, + guint32 flashes_left); +G_DEPRECATED_FOR(fwupd_device_get_flags) +guint64 fwupd_result_get_device_flags (FwupdResult *result); +G_DEPRECATED_FOR(fwupd_device_set_flags) +void fwupd_result_set_device_flags (FwupdResult *result, + guint64 device_flags); +G_DEPRECATED_FOR(fwupd_device_add_flag) +void fwupd_result_add_device_flag (FwupdResult *result, + FwupdDeviceFlags flag); +G_DEPRECATED_FOR(fwupd_device_remove_flag) +void fwupd_result_remove_device_flag (FwupdResult *result, + FwupdDeviceFlags flag); +G_DEPRECATED_FOR(fwupd_device_has_flag) +gboolean fwupd_result_has_device_flag (FwupdResult *result, + FwupdDeviceFlags flag); +G_DEPRECATED_FOR(fwupd_device_get_created) +guint64 fwupd_result_get_device_created (FwupdResult *result); +G_DEPRECATED_FOR(fwupd_device_set_created) +void fwupd_result_set_device_created (FwupdResult *result, + guint64 device_created); +G_DEPRECATED_FOR(fwupd_device_get_modified) +guint64 fwupd_result_get_device_modified (FwupdResult *result); +G_DEPRECATED_FOR(fwupd_device_set_modified) +void fwupd_result_set_device_modified (FwupdResult *result, + guint64 device_modified); +G_DEPRECATED_FOR(fwupd_device_get_checksums) +const gchar *fwupd_result_get_device_checksum (FwupdResult *result); +G_DEPRECATED_FOR(fwupd_device_add_checksum) +void fwupd_result_set_device_checksum (FwupdResult *result, + const gchar *device_checksum); +G_DEPRECATED_FOR(fwupd_device_get_checksums) +GChecksumType fwupd_result_get_device_checksum_kind (FwupdResult *result); +G_DEPRECATED_FOR(fwupd_device_add_checksum) +void fwupd_result_set_device_checksum_kind (FwupdResult *result, + GChecksumType checkum_kind); +G_DEPRECATED_FOR(fwupd_device_get_provider) +const gchar *fwupd_result_get_device_provider (FwupdResult *result); +G_DEPRECATED_FOR(fwupd_device_set_provider) +void fwupd_result_set_device_provider (FwupdResult *result, + const gchar *device_provider); +G_DEPRECATED_FOR(fwupd_device_get_vendor) +const gchar *fwupd_result_get_device_vendor (FwupdResult *result); +G_DEPRECATED_FOR(fwupd_device_set_vendor) +void fwupd_result_set_device_vendor (FwupdResult *result, + const gchar *device_vendor); + +/* update-specific */ +G_DEPRECATED_FOR(fwupd_release_get_size) +guint64 fwupd_result_get_update_size (FwupdResult *result); +G_DEPRECATED_FOR(fwupd_release_set_size) +void fwupd_result_set_update_size (FwupdResult *result, + guint64 update_size); +G_DEPRECATED_FOR(fwupd_release_get_version) +const gchar *fwupd_result_get_update_version (FwupdResult *result); +G_DEPRECATED_FOR(fwupd_release_set_version) +void fwupd_result_set_update_version (FwupdResult *result, + const gchar *update_version); +G_DEPRECATED_FOR(fwupd_release_get_filename) +const gchar *fwupd_result_get_update_filename (FwupdResult *result); +G_DEPRECATED_FOR(fwupd_release_set_filename) +void fwupd_result_set_update_filename (FwupdResult *result, + const gchar *update_filename); +G_DEPRECATED_FOR(fwupd_release_get_checksums) +const gchar *fwupd_result_get_update_checksum (FwupdResult *result); +G_DEPRECATED_FOR(fwupd_release_add_checksum) +void fwupd_result_set_update_checksum (FwupdResult *result, + const gchar *update_checksum); +G_DEPRECATED_FOR(fwupd_release_get_checksums) +GChecksumType fwupd_result_get_update_checksum_kind (FwupdResult *result); +G_DEPRECATED_FOR(fwupd_release_add_checksum) +void fwupd_result_set_update_checksum_kind (FwupdResult *result, + GChecksumType checkum_kind); +G_DEPRECATED_FOR(fwupd_release_get_uri) +const gchar *fwupd_result_get_update_uri (FwupdResult *result); +G_DEPRECATED_FOR(fwupd_release_set_uri) +void fwupd_result_set_update_uri (FwupdResult *result, + const gchar *update_uri); +G_DEPRECATED_FOR(fwupd_release_get_homepage) +const gchar *fwupd_result_get_update_homepage (FwupdResult *result); +G_DEPRECATED_FOR(fwupd_release_set_homepage) +void fwupd_result_set_update_homepage (FwupdResult *result, + const gchar *update_homepage); +G_DEPRECATED_FOR(fwupd_release_get_appstream_id) +const gchar *fwupd_result_get_update_id (FwupdResult *result); +G_DEPRECATED_FOR(fwupd_release_set_appstream_id) +void fwupd_result_set_update_id (FwupdResult *result, + const gchar *update_id); +G_DEPRECATED_FOR(fwupd_release_get_description) +const gchar *fwupd_result_get_update_description (FwupdResult *result); +G_DEPRECATED_FOR(fwupd_release_set_description) +void fwupd_result_set_update_description (FwupdResult *result, + const gchar *update_description); +G_DEPRECATED_FOR(fwupd_release_get_vendor) +const gchar *fwupd_result_get_update_vendor (FwupdResult *result); +G_DEPRECATED_FOR(fwupd_release_set_vendor) +void fwupd_result_set_update_vendor (FwupdResult *result, + const gchar *update_vendor); +G_DEPRECATED_FOR(fwupd_release_get_summary) +const gchar *fwupd_result_get_update_summary (FwupdResult *result); +G_DEPRECATED_FOR(fwupd_release_set_summary) +void fwupd_result_set_update_summary (FwupdResult *result, + const gchar *update_summary); +G_DEPRECATED_FOR(fwupd_release_get_license) +const gchar *fwupd_result_get_update_license (FwupdResult *result); +G_DEPRECATED_FOR(fwupd_release_set_license) +void fwupd_result_set_update_license (FwupdResult *result, + const gchar *update_license); +G_DEPRECATED_FOR(fwupd_release_get_name) +const gchar *fwupd_result_get_update_name (FwupdResult *result); +G_DEPRECATED_FOR(fwupd_release_set_name) +void fwupd_result_set_update_name (FwupdResult *result, + const gchar *update_name); +G_DEPRECATED_FOR(fwupd_result_get_guids) +const gchar *fwupd_result_get_guid (FwupdResult *result); +G_DEPRECATED_FOR(fwupd_result_add_guid) +void fwupd_result_set_guid (FwupdResult *result, + const gchar *guid); + +#endif /* __FWUPD_DEPRECATED_H */ diff --git a/libfwupd/fwupd-enums.h b/libfwupd/fwupd-enums.h index 2d305d2f1..9c1952025 100644 --- a/libfwupd/fwupd-enums.h +++ b/libfwupd/fwupd-enums.h @@ -98,19 +98,6 @@ typedef enum { #define FWUPD_DEVICE_FLAG_UNKNOWN G_MAXUINT64 /* Since: 0.7.3 */ typedef guint64 FwupdDeviceFlags; -/* deprecated names */ -#define FU_DEVICE_FLAG_NONE FWUPD_DEVICE_FLAG_NONE -#define FU_DEVICE_FLAG_INTERNAL FWUPD_DEVICE_FLAG_INTERNAL -#define FU_DEVICE_FLAG_ALLOW_ONLINE FWUPD_DEVICE_FLAG_UPDATABLE -#define FU_DEVICE_FLAG_ALLOW_OFFLINE FWUPD_DEVICE_FLAG_ONLY_OFFLINE -#define FU_DEVICE_FLAG_REQUIRE_AC FWUPD_DEVICE_FLAG_REQUIRE_AC -#define FU_DEVICE_FLAG_LOCKED FWUPD_DEVICE_FLAG_LOCKED -#define FU_DEVICE_FLAG_SUPPORTED FWUPD_DEVICE_FLAG_SUPPORTED -#define FU_DEVICE_FLAG_NEEDS_BOOTLOADER FWUPD_DEVICE_FLAG_NEEDS_BOOTLOADER -#define FU_DEVICE_FLAG_UNKNOWN FWUPD_DEVICE_FLAG_UNKNOWN -#define FWUPD_DEVICE_FLAG_ALLOW_ONLINE FWUPD_DEVICE_FLAG_UPDATABLE -#define FWUPD_DEVICE_FLAG_ALLOW_OFFLINE FWUPD_DEVICE_FLAG_ONLY_OFFLINE - /** * FwupdInstallFlags: * @FWUPD_INSTALL_FLAG_NONE: No flags set diff --git a/libfwupd/fwupd-remote.c b/libfwupd/fwupd-remote.c index a11780a37..c19ba40a3 100644 --- a/libfwupd/fwupd-remote.c +++ b/libfwupd/fwupd-remote.c @@ -21,6 +21,7 @@ #include "config.h" +#include "fwupd-deprecated.h" #include "fwupd-error.h" #include "fwupd-remote-private.h" diff --git a/libfwupd/fwupd-remote.h b/libfwupd/fwupd-remote.h index 33aa82089..109527a67 100644 --- a/libfwupd/fwupd-remote.h +++ b/libfwupd/fwupd-remote.h @@ -66,12 +66,6 @@ SoupURI *fwupd_remote_build_uri (FwupdRemote *self, const gchar *url, GError **error); -/* deprecated */ -SoupURI *fwupd_remote_get_uri (FwupdRemote *self) -G_DEPRECATED_FOR(fwupd_remote_get_metadata_uri); -SoupURI *fwupd_remote_get_uri_asc (FwupdRemote *self) -G_DEPRECATED_FOR(fwupd_remote_get_metadata_uri_sig); - G_END_DECLS #endif /* __FWUPD_REMOTE_H */ diff --git a/libfwupd/fwupd-result.c b/libfwupd/fwupd-result.c index acfdffe51..133494274 100644 --- a/libfwupd/fwupd-result.c +++ b/libfwupd/fwupd-result.c @@ -26,6 +26,7 @@ #include #include "fwupd-common-private.h" +#include "fwupd-deprecated.h" #include "fwupd-device-private.h" #include "fwupd-enums-private.h" #include "fwupd-error.h" diff --git a/libfwupd/fwupd-result.h b/libfwupd/fwupd-result.h index 8eb470831..3e69b6b3f 100644 --- a/libfwupd/fwupd-result.h +++ b/libfwupd/fwupd-result.h @@ -48,196 +48,26 @@ struct _FwupdResultClass FwupdResult *fwupd_result_new (void); FwupdResult *fwupd_result_new_from_data (GVariant *data); - -/* matches */ -G_DEPRECATED_FOR(fwupd_device_add_guid) -void fwupd_result_add_guid (FwupdResult *result, - const gchar *guid); -G_DEPRECATED_FOR(fwupd_device_has_guid) -gboolean fwupd_result_has_guid (FwupdResult *result, - const gchar *guid); -G_DEPRECATED_FOR(fwupd_device_get_guids) -GPtrArray *fwupd_result_get_guids (FwupdResult *result); -G_DEPRECATED_FOR(fwupd_device_get_guid_default) -const gchar *fwupd_result_get_guid_default (FwupdResult *result); - const gchar *fwupd_result_get_unique_id (FwupdResult *result); void fwupd_result_set_unique_id (FwupdResult *result, const gchar *unique_id); - -/* helper objects */ FwupdRelease *fwupd_result_get_release (FwupdResult *result); FwupdDevice *fwupd_result_get_device (FwupdResult *result); -/* device-specific */ -G_DEPRECATED_FOR(fwupd_device_get_id) -const gchar *fwupd_result_get_device_id (FwupdResult *result); -G_DEPRECATED_FOR(fwupd_device_set_id) -void fwupd_result_set_device_id (FwupdResult *result, - const gchar *device_id); -G_DEPRECATED_FOR(fwupd_device_get_name) -const gchar *fwupd_result_get_device_name (FwupdResult *result); -G_DEPRECATED_FOR(fwupd_device_set_name) -void fwupd_result_set_device_name (FwupdResult *result, - const gchar *device_name); -G_DEPRECATED_FOR(fwupd_device_get_description) -const gchar *fwupd_result_get_device_description (FwupdResult *result); -G_DEPRECATED_FOR(fwupd_device_set_description) -void fwupd_result_set_device_description (FwupdResult *result, - const gchar *device_description); -G_DEPRECATED_FOR(fwupd_device_get_version) -const gchar *fwupd_result_get_device_version (FwupdResult *result); -G_DEPRECATED_FOR(fwupd_device_set_version) -void fwupd_result_set_device_version (FwupdResult *result, - const gchar *device_version); -G_DEPRECATED_FOR(fwupd_device_get_version_lowest) -const gchar *fwupd_result_get_device_version_lowest (FwupdResult *result); -G_DEPRECATED_FOR(fwupd_device_set_version_lowest) -void fwupd_result_set_device_version_lowest (FwupdResult *result, - const gchar *device_version_lowest); -G_DEPRECATED_FOR(fwupd_device_get_version_bootloader) -const gchar *fwupd_result_get_device_version_bootloader (FwupdResult *result); -G_DEPRECATED_FOR(fwupd_device_set_version_bootloader) -void fwupd_result_set_device_version_bootloader (FwupdResult *result, - const gchar *device_version_bootloader); -G_DEPRECATED_FOR(fwupd_device_get_flashes_left) -guint32 fwupd_result_get_device_flashes_left (FwupdResult *result); -G_DEPRECATED_FOR(fwupd_device_set_flashes_left) -void fwupd_result_set_device_flashes_left (FwupdResult *result, - guint32 flashes_left); -G_DEPRECATED_FOR(fwupd_device_get_flags) -guint64 fwupd_result_get_device_flags (FwupdResult *result); -G_DEPRECATED_FOR(fwupd_device_set_flags) -void fwupd_result_set_device_flags (FwupdResult *result, - guint64 device_flags); -G_DEPRECATED_FOR(fwupd_device_add_flag) -void fwupd_result_add_device_flag (FwupdResult *result, - FwupdDeviceFlags flag); -G_DEPRECATED_FOR(fwupd_device_remove_flag) -void fwupd_result_remove_device_flag (FwupdResult *result, - FwupdDeviceFlags flag); -G_DEPRECATED_FOR(fwupd_device_has_flag) -gboolean fwupd_result_has_device_flag (FwupdResult *result, - FwupdDeviceFlags flag); -G_DEPRECATED_FOR(fwupd_device_get_created) -guint64 fwupd_result_get_device_created (FwupdResult *result); -G_DEPRECATED_FOR(fwupd_device_set_created) -void fwupd_result_set_device_created (FwupdResult *result, - guint64 device_created); -G_DEPRECATED_FOR(fwupd_device_get_modified) -guint64 fwupd_result_get_device_modified (FwupdResult *result); -G_DEPRECATED_FOR(fwupd_device_set_modified) -void fwupd_result_set_device_modified (FwupdResult *result, - guint64 device_modified); -G_DEPRECATED_FOR(fwupd_device_get_checksums) -const gchar *fwupd_result_get_device_checksum (FwupdResult *result); -G_DEPRECATED_FOR(fwupd_device_add_checksum) -void fwupd_result_set_device_checksum (FwupdResult *result, - const gchar *device_checksum); -G_DEPRECATED_FOR(fwupd_device_get_checksums) -GChecksumType fwupd_result_get_device_checksum_kind (FwupdResult *result); -G_DEPRECATED_FOR(fwupd_device_add_checksum) -void fwupd_result_set_device_checksum_kind (FwupdResult *result, - GChecksumType checkum_kind); -G_DEPRECATED_FOR(fwupd_device_get_provider) -const gchar *fwupd_result_get_device_provider (FwupdResult *result); -G_DEPRECATED_FOR(fwupd_device_set_provider) -void fwupd_result_set_device_provider (FwupdResult *result, - const gchar *device_provider); -G_DEPRECATED_FOR(fwupd_device_get_vendor) -const gchar *fwupd_result_get_device_vendor (FwupdResult *result); -G_DEPRECATED_FOR(fwupd_device_set_vendor) -void fwupd_result_set_device_vendor (FwupdResult *result, - const gchar *device_vendor); - -/* update-specific */ -G_DEPRECATED_FOR(fwupd_release_get_size) -guint64 fwupd_result_get_update_size (FwupdResult *result); -G_DEPRECATED_FOR(fwupd_release_set_size) -void fwupd_result_set_update_size (FwupdResult *result, - guint64 update_size); -G_DEPRECATED_FOR(fwupd_release_get_version) -const gchar *fwupd_result_get_update_version (FwupdResult *result); -G_DEPRECATED_FOR(fwupd_release_set_version) -void fwupd_result_set_update_version (FwupdResult *result, - const gchar *update_version); -G_DEPRECATED_FOR(fwupd_release_get_filename) -const gchar *fwupd_result_get_update_filename (FwupdResult *result); -G_DEPRECATED_FOR(fwupd_release_set_filename) -void fwupd_result_set_update_filename (FwupdResult *result, - const gchar *update_filename); FwupdUpdateState fwupd_result_get_update_state (FwupdResult *result); void fwupd_result_set_update_state (FwupdResult *result, FwupdUpdateState update_state); -G_DEPRECATED_FOR(fwupd_release_get_checksums) -const gchar *fwupd_result_get_update_checksum (FwupdResult *result); -G_DEPRECATED_FOR(fwupd_release_add_checksum) -void fwupd_result_set_update_checksum (FwupdResult *result, - const gchar *update_checksum); -G_DEPRECATED_FOR(fwupd_release_get_checksums) -GChecksumType fwupd_result_get_update_checksum_kind (FwupdResult *result); -G_DEPRECATED_FOR(fwupd_release_add_checksum) -void fwupd_result_set_update_checksum_kind (FwupdResult *result, - GChecksumType checkum_kind); -G_DEPRECATED_FOR(fwupd_release_get_uri) -const gchar *fwupd_result_get_update_uri (FwupdResult *result); -G_DEPRECATED_FOR(fwupd_release_set_uri) -void fwupd_result_set_update_uri (FwupdResult *result, - const gchar *update_uri); -G_DEPRECATED_FOR(fwupd_release_get_homepage) -const gchar *fwupd_result_get_update_homepage (FwupdResult *result); -G_DEPRECATED_FOR(fwupd_release_set_homepage) -void fwupd_result_set_update_homepage (FwupdResult *result, - const gchar *update_homepage); -G_DEPRECATED_FOR(fwupd_release_get_appstream_id) -const gchar *fwupd_result_get_update_id (FwupdResult *result); -G_DEPRECATED_FOR(fwupd_release_set_appstream_id) -void fwupd_result_set_update_id (FwupdResult *result, - const gchar *update_id); -G_DEPRECATED_FOR(fwupd_release_get_description) -const gchar *fwupd_result_get_update_description (FwupdResult *result); -G_DEPRECATED_FOR(fwupd_release_set_description) -void fwupd_result_set_update_description (FwupdResult *result, - const gchar *update_description); -G_DEPRECATED_FOR(fwupd_release_get_vendor) -const gchar *fwupd_result_get_update_vendor (FwupdResult *result); -G_DEPRECATED_FOR(fwupd_release_set_vendor) -void fwupd_result_set_update_vendor (FwupdResult *result, - const gchar *update_vendor); -G_DEPRECATED_FOR(fwupd_release_get_summary) -const gchar *fwupd_result_get_update_summary (FwupdResult *result); -G_DEPRECATED_FOR(fwupd_release_set_summary) -void fwupd_result_set_update_summary (FwupdResult *result, - const gchar *update_summary); const gchar *fwupd_result_get_update_error (FwupdResult *result); void fwupd_result_set_update_error (FwupdResult *result, const gchar *update_error); FwupdTrustFlags fwupd_result_get_update_trust_flags (FwupdResult *result); void fwupd_result_set_update_trust_flags (FwupdResult *result, FwupdTrustFlags trust_flags); -G_DEPRECATED_FOR(fwupd_release_get_license) -const gchar *fwupd_result_get_update_license (FwupdResult *result); -G_DEPRECATED_FOR(fwupd_release_set_license) -void fwupd_result_set_update_license (FwupdResult *result, - const gchar *update_license); -G_DEPRECATED_FOR(fwupd_release_get_name) -const gchar *fwupd_result_get_update_name (FwupdResult *result); -G_DEPRECATED_FOR(fwupd_release_set_name) -void fwupd_result_set_update_name (FwupdResult *result, - const gchar *update_name); -/* helpers */ GVariant *fwupd_result_to_data (FwupdResult *result, const gchar *type_string); gchar *fwupd_result_to_string (FwupdResult *result); -/* deprecated */ -G_DEPRECATED_FOR(fwupd_result_get_guids) -const gchar *fwupd_result_get_guid (FwupdResult *result); -G_DEPRECATED_FOR(fwupd_result_add_guid) -void fwupd_result_set_guid (FwupdResult *result, - const gchar *guid); - G_END_DECLS #endif /* __FWUPD_RESULT_H */ diff --git a/libfwupd/fwupd.h b/libfwupd/fwupd.h index 942b74805..7ec88bc39 100644 --- a/libfwupd/fwupd.h +++ b/libfwupd/fwupd.h @@ -39,6 +39,10 @@ #include #include +#ifndef FWUPD_DISABLE_DEPRECATED +#include +#endif + #undef __FWUPD_H_INSIDE__ #endif /* __FWUPD_H__ */ diff --git a/libfwupd/meson.build b/libfwupd/meson.build index 672b33e13..aa9869bbd 100644 --- a/libfwupd/meson.build +++ b/libfwupd/meson.build @@ -16,6 +16,7 @@ install_headers( install_headers([ 'fwupd-client.h', 'fwupd-common.h', + 'fwupd-deprecated.h', 'fwupd-device.h', 'fwupd-enums.h', 'fwupd-error.h', diff --git a/meson.build b/meson.build index 04a5c3905..01e5f49cd 100644 --- a/meson.build +++ b/meson.build @@ -127,6 +127,9 @@ endif # Needed for realpath(), syscall(), cfmakeraw(), etc. add_project_arguments('-D_DEFAULT_SOURCE', language : 'c') +# do not use deprecated symbols or defines internally +add_project_arguments('-DFWUPD_DISABLE_DEPRECATED', language : 'c') + gio = dependency('gio-2.0', version : '>= 2.45.8') gmodule = dependency('gmodule-2.0') giounix = dependency('gio-unix-2.0', version : '>= 2.45.8')