From f0f504c740144daadb8860a1d0512ed319d2ed62 Mon Sep 17 00:00:00 2001 From: Richard Hughes Date: Tue, 26 Nov 2019 16:36:32 +0000 Subject: [PATCH] trivial: Do not use FuProgressbar in dfu-tool This is a debug-only command line program, and we don't want plugins to have access to the animated progressbar header in the future. --- docs/fwupd-docs.xml | 1 - plugins/dfu/dfu-tool.c | 14 +++----------- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/docs/fwupd-docs.xml b/docs/fwupd-docs.xml index 095aa5161..050e93c5f 100644 --- a/docs/fwupd-docs.xml +++ b/docs/fwupd-docs.xml @@ -61,7 +61,6 @@ - diff --git a/plugins/dfu/dfu-tool.c b/plugins/dfu/dfu-tool.c index 12aa9742b..8534aed9a 100644 --- a/plugins/dfu/dfu-tool.c +++ b/plugins/dfu/dfu-tool.c @@ -16,7 +16,6 @@ #include "dfu-sector.h" #include "fu-device-locker.h" -#include "fu-progressbar.h" #include "fwupd-error.h" @@ -26,7 +25,6 @@ typedef struct { gboolean force; gchar *device_vid_pid; guint16 transfer_size; - FuProgressbar *progressbar; FuQuirks *quirks; } DfuToolPrivate; @@ -47,7 +45,6 @@ dfu_tool_private_free (DfuToolPrivate *priv) if (priv == NULL) return; g_free (priv->device_vid_pid); - g_object_unref (priv->progressbar); g_object_unref (priv->cancellable); g_object_unref (priv->quirks); if (priv->cmd_array != NULL) @@ -654,9 +651,9 @@ dfu_tool_convert (DfuToolPrivate *priv, gchar **values, GError **error) static void fu_tool_action_changed_cb (FuDevice *device, GParamSpec *pspec, DfuToolPrivate *priv) { - fu_progressbar_update (priv->progressbar, - fu_device_get_status (device), - fu_device_get_progress (device)); + g_print ("%s:\t%u%%\n", + fwupd_status_to_string (fu_device_get_status (device)), + fu_device_get_progress (device)); } static gboolean @@ -1313,11 +1310,6 @@ main (int argc, char *argv[]) _("Replace data in an existing firmware file"), dfu_tool_replace_data); - /* use animated progress bar */ - priv->progressbar = fu_progressbar_new (); - fu_progressbar_set_length_percentage (priv->progressbar, 50); - fu_progressbar_set_length_status (priv->progressbar, 20); - /* use quirks */ priv->quirks = fu_quirks_new (); if (!fu_quirks_load (priv->quirks, FU_QUIRKS_LOAD_FLAG_NONE, &error)) {