diff --git a/libfwupd/README.md b/libfwupd/README.md index 66e4b5098..61e445a50 100644 --- a/libfwupd/README.md +++ b/libfwupd/README.md @@ -6,7 +6,6 @@ When we next bump soname the following changes are planned: * {sa{sv}} -> {a{sv}} -- we don't always want to send the device ID * Remove all deprecated API * Remove FWUPD_RESULT_KEY_DEVICE_CHECKSUM_KIND - * Rename UpdateMetadataWithId() -> UpdateMetadata() * Make DeviceAdded emit a FwupdDevice, not a FwupdResult * Unexport fwupd_result_to_data() and fwupd_result_new_from_data() @@ -18,3 +17,4 @@ Migration from Version 0.9.x * Rename FWUPD_DEVICE_FLAG_ALLOW_OFFLINE -> FWUPD_DEVICE_FLAG_ONLY_OFFLINE * Rename fwupd_client_get_devices_simple -> fwupd_client_get_devices * Rename fwupd_client_get_details_local -> fwupd_client_get_details + * Rename fwupd_client_update_metadata_with_id -> fwupd_client_update_metadata diff --git a/libfwupd/fwupd-client.c b/libfwupd/fwupd-client.c index 3944d1001..872a49394 100644 --- a/libfwupd/fwupd-client.c +++ b/libfwupd/fwupd-client.c @@ -1140,37 +1140,6 @@ fwupd_client_get_status (FwupdClient *client) /** * fwupd_client_update_metadata: * @client: A #FwupdClient - * @metadata_fn: the XML metadata filename - * @signature_fn: the GPG signature file - * @cancellable: the #GCancellable, or %NULL - * @error: the #GError, or %NULL - * - * Updates the metadata. This allows a session process to download the metadata - * and metadata signing file to be passed into the daemon to be checked and - * parsed. - * - * Returns: %TRUE for success - * - * Since: 0.7.0 - **/ -gboolean -fwupd_client_update_metadata (FwupdClient *client, - const gchar *metadata_fn, - const gchar *signature_fn, - GCancellable *cancellable, - GError **error) -{ - return fwupd_client_update_metadata_with_id (client, - "lvfs", /* remote_id */ - metadata_fn, - signature_fn, - cancellable, - error); -} - -/** - * fwupd_client_update_metadata_with_id: - * @client: A #FwupdClient * @remote_id: the remote ID, e.g. "lvfs-testing" * @metadata_fn: the XML metadata filename * @signature_fn: the GPG signature file @@ -1186,15 +1155,15 @@ fwupd_client_update_metadata (FwupdClient *client, * * Returns: %TRUE for success * - * Since: 0.9.3 + * Since: 1.0.0 **/ gboolean -fwupd_client_update_metadata_with_id (FwupdClient *client, - const gchar *remote_id, - const gchar *metadata_fn, - const gchar *signature_fn, - GCancellable *cancellable, - GError **error) +fwupd_client_update_metadata (FwupdClient *client, + const gchar *remote_id, + const gchar *metadata_fn, + const gchar *signature_fn, + GCancellable *cancellable, + GError **error) { FwupdClientPrivate *priv = GET_PRIVATE (client); GVariant *body; @@ -1243,7 +1212,7 @@ fwupd_client_update_metadata_with_id (FwupdClient *client, request = g_dbus_message_new_method_call (FWUPD_DBUS_SERVICE, FWUPD_DBUS_PATH, FWUPD_DBUS_INTERFACE, - "UpdateMetadataWithId"); + "UpdateMetadata"); g_dbus_message_set_unix_fd_list (request, fd_list); /* g_unix_fd_list_append did a dup() already */ diff --git a/libfwupd/fwupd-client.h b/libfwupd/fwupd-client.h index cc3abf207..ad3f841b7 100644 --- a/libfwupd/fwupd-client.h +++ b/libfwupd/fwupd-client.h @@ -109,7 +109,7 @@ gboolean fwupd_client_install (FwupdClient *client, FwupdInstallFlags install_flags, GCancellable *cancellable, GError **error); -gboolean fwupd_client_update_metadata_with_id (FwupdClient *client, +gboolean fwupd_client_update_metadata (FwupdClient *client, const gchar *remote_id, const gchar *metadata_fn, const gchar *signature_fn, diff --git a/libfwupd/fwupd-deprecated.h b/libfwupd/fwupd-deprecated.h index af7b06743..bf919fc12 100644 --- a/libfwupd/fwupd-deprecated.h +++ b/libfwupd/fwupd-deprecated.h @@ -25,13 +25,6 @@ #include "fwupd-client.h" #include "fwupd-remote.h" -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) diff --git a/src/fu-main.c b/src/fu-main.c index 0db2ac8ea..8937d03a0 100644 --- a/src/fu-main.c +++ b/src/fu-main.c @@ -516,7 +516,7 @@ fu_main_daemon_method_call (GDBusConnection *connection, const gchar *sender, g_dbus_method_invocation_return_value (invocation, val); return; } - if (g_strcmp0 (method_name, "UpdateMetadataWithId") == 0) { + if (g_strcmp0 (method_name, "UpdateMetadata") == 0) { GDBusMessage *message; GUnixFDList *fd_list; const gchar *remote_id = NULL; diff --git a/src/fu-util.c b/src/fu-util.c index 6e896c4bc..7ce9a3173 100644 --- a/src/fu-util.c +++ b/src/fu-util.c @@ -778,7 +778,7 @@ fu_util_download_metadata_for_remote (FuUtilPrivate *priv, return FALSE; /* send all this to fwupd */ - return fwupd_client_update_metadata_with_id (priv->client, + return fwupd_client_update_metadata (priv->client, fwupd_remote_get_id (remote), filename, filename_asc, @@ -818,12 +818,12 @@ fu_util_refresh (FuUtilPrivate *priv, gchar **values, GError **error) } /* open file */ - return fwupd_client_update_metadata_with_id (priv->client, - values[2], - values[0], - values[1], - NULL, - error); + return fwupd_client_update_metadata (priv->client, + values[2], + values[0], + values[1], + NULL, + error); } static gboolean diff --git a/src/org.freedesktop.fwupd.xml b/src/org.freedesktop.fwupd.xml index 4ba1c1948..1f62ad8af 100644 --- a/src/org.freedesktop.fwupd.xml +++ b/src/org.freedesktop.fwupd.xml @@ -362,7 +362,7 @@ - +