From 7905b76f6d3ddc97344717e51ba319b0f65cdf2b Mon Sep 17 00:00:00 2001 From: guinux Date: Sat, 3 Jun 2017 17:55:18 +0200 Subject: [PATCH] fix .files dl progress display --- src/daemon.vala | 7 +++++++ src/transaction.vala | 3 +++ 2 files changed, 10 insertions(+) diff --git a/src/daemon.vala b/src/daemon.vala index d839b61..30bd6ad 100644 --- a/src/daemon.vala +++ b/src/daemon.vala @@ -214,6 +214,7 @@ namespace Pamac { message = _("Failed to initialize alpm library") }; trans_commit_finished (false); + return; } else { alpm_handle.eventcb = (Alpm.EventCallBack) cb_event; alpm_handle.progresscb = (Alpm.ProgressCallBack) cb_progress; @@ -224,6 +225,12 @@ namespace Pamac { lockfile = GLib.File.new_for_path (alpm_handle.lockfile); } files_handle = alpm_config.get_handle (true); + files_handle.eventcb = (Alpm.EventCallBack) cb_event; + files_handle.progresscb = (Alpm.ProgressCallBack) cb_progress; + files_handle.questioncb = (Alpm.QuestionCallBack) cb_question; + files_handle.fetchcb = (Alpm.FetchCallBack) cb_fetch; + files_handle.totaldlcb = (Alpm.TotalDownloadCallBack) cb_totaldownload; + files_handle.logcb = (Alpm.LogCallBack) cb_log; } private bool check_extern_lock () { diff --git a/src/transaction.vala b/src/transaction.vala index ffe8996..b4c7b5d 100644 --- a/src/transaction.vala +++ b/src/transaction.vala @@ -1402,6 +1402,9 @@ namespace Pamac { if (filename.has_suffix (".db")) { string action = dgettext (null, "Refreshing %s").printf (filename.replace (".db", "")) + "..."; reset_progress_box (action); + } else if (filename.has_suffix (".files")) { + string action = dgettext (null, "Refreshing %s").printf (filename.replace (".files", "")) + "..."; + reset_progress_box (action); } } else if (xfered == total) { timer.stop ();