[pan: 16/22] Merge issues

[Dominique Dumont <ddumont src gnome org>]

commit 4b2213122ffb6df382e54eb4167e17b9611de8e3
Author: Thomas Tanner <thosrtanner googlemail com>
Date:   Sat Jul 9 18:21:40 2022 +0100

    Merge issues

 pan/data/parts.cc    | 2 +-
 pan/tasks/encoder.cc | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)
---
diff --git a/pan/data/parts.cc b/pan/data/parts.cc
index 4c5ea33..3adf720 100644
--- a/pan/data/parts.cc
+++ b/pan/data/parts.cc
@@ -191,7 +191,7 @@ Parts :: unpack_message_id (std::string  & setme,
   StringView v;
   v.str = part_mid_buf + part->mid_offset;
   v.len = 2 + strlen (v.str+2);
-  pan::unpack_message_id (setme, v, reference_mid);
+  ::pan::unpack_message_id (setme, v, reference_mid);
 }
 
 bool
diff --git a/pan/tasks/encoder.cc b/pan/tasks/encoder.cc
index 154dbd8..fd9bff0 100644
--- a/pan/tasks/encoder.cc
+++ b/pan/tasks/encoder.cc
@@ -33,10 +33,11 @@
 #define PROTOTYPES
 #include <uulib/uudeview.h>
 #include <glib/gi18n.h>
+
 extern "C" {
 #include <sys/stat.h>
 #include <sys/time.h>
-};
+}
 
 #include <pan/general/worker-pool.h>
 #include <pan/general/debug.h>
@@ -57,7 +58,7 @@ Encoder :: Encoder (WorkerPool& pool):
   percent(0.0),
   _worker_pool (pool),
   _gsourceid (-1),
-  health(OK),
+  health(OK)
 {}