Always enable TotalDownload

Previously TotalDownload would switch the % download from per package to
overall. Meaning you had a choice of which information to dispplay.

Now with parallel downloads TotalDownload adds an extra progress bar.
There's no reason to have this an off by default feature. Let's just
make it always on.

Signed-off-by: Allan McRae <allan@archlinux.org>

4 files changed, 2 insertions, 10 deletions

diff --git a/src/pacman/callback.c b/src/pacman/callback.c
index 3f32360c..98887d9f 100644
--- a/src/pacman/callback.c
+++ b/src/pacman/callback.c
@@ -340,7 +340,8 @@ void cb_event(alpm_event_t *event)
 			on_progress = 1;
 			list_total_pkgs = event->pkg_retrieve.num;
 			list_total = event->pkg_retrieve.total_size;
-			total_enabled = config->totaldownload && list_total && dload_progressbar_enabled();
+			total_enabled = list_total && dload_progressbar_enabled();
+
 			if(total_enabled) {
 				init_total_progressbar();
 			}
diff --git a/src/pacman/conf.c b/src/pacman/conf.c
index 9578daa3..0f0c2cfb 100644
--- a/src/pacman/conf.c
+++ b/src/pacman/conf.c
@@ -605,9 +605,6 @@ static int _parse_options(const char *key, char *value,
 		} else if(strcmp(key, "VerbosePkgLists") == 0) {
 			config->verbosepkglists = 1;
 			pm_printf(ALPM_LOG_DEBUG, "config: verbosepkglists\n");
-		} else if(strcmp(key, "TotalDownload") == 0) {
-			config->totaldownload = 1;
-			pm_printf(ALPM_LOG_DEBUG, "config: totaldownload\n");
 		} else if(strcmp(key, "CheckSpace") == 0) {
 			config->checkspace = 1;
 		} else if(strcmp(key, "Color") == 0) {
diff --git a/src/pacman/conf.h b/src/pacman/conf.h
index 316c8d0f..04350d39 100644
--- a/src/pacman/conf.h
+++ b/src/pacman/conf.h
@@ -113,9 +113,6 @@ typedef struct __config_t {
 	unsigned short chomp;
 	/* format target pkg lists as table */
 	unsigned short verbosepkglists;
-	/* When downloading, display the amount downloaded, rate, ETA, and percent
-	 * downloaded of the total download list */
-	unsigned short totaldownload;
 	/* number of parallel download streams */
 	unsigned int parallel_downloads;
 	/* select -Sc behavior */
diff --git a/src/pacman/pacman-conf.c b/src/pacman/pacman-conf.c
index 6ca21119..600f1622 100644
--- a/src/pacman/pacman-conf.c
+++ b/src/pacman/pacman-conf.c
@@ -263,7 +263,6 @@ static void dump_config(void)
 
 	show_bool("UseSyslog", config->usesyslog);
 	show_bool("Color", config->color);
-	show_bool("TotalDownload", config->totaldownload);
 	show_bool("CheckSpace", config->checkspace);
 	show_bool("VerbosePkgLists", config->verbosepkglists);
 	show_bool("DisableDownloadTimeout", config->disable_dl_timeout);
@@ -372,8 +371,6 @@ static int list_directives(void)
 			show_bool("UseSyslog", config->usesyslog);
 		} else if(strcasecmp(i->data, "Color") == 0) {
 			show_bool("Color", config->color);
-		} else if(strcasecmp(i->data, "TotalDownload") == 0) {
-			show_bool("TotalDownload", config->totaldownload);
 		} else if(strcasecmp(i->data, "CheckSpace") == 0) {
 			show_bool("CheckSpace", config->checkspace);
 		} else if(strcasecmp(i->data, "VerbosePkgLists") == 0) {