From 5a28cdfba4743d9d771fc5ee432ce23ca834b38a Mon Sep 17 00:00:00 2001
From: "Dirk-Jan C. Binnema" <djcb@djcbsoftware.nl>
Date: Sat, 26 Mar 2022 20:30:42 +0200
Subject: [PATCH] message: some fixes for github ci build

---
 lib/message/mu-message-part.hh |  2 +-
 lib/message/mu-message.cc      |  2 +-
 lib/message/mu-mime-object.hh  | 11 ++++++++---
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/lib/message/mu-message-part.hh b/lib/message/mu-message-part.hh
index 2a7d2456..a5c31bcf 100644
--- a/lib/message/mu-message-part.hh
+++ b/lib/message/mu-message-part.hh
@@ -28,7 +28,7 @@
 
 namespace Mu {
 
-struct MimeObject; // forward declaration
+class MimeObject; // forward declaration
 
 class MessagePart {
 public:
diff --git a/lib/message/mu-message.cc b/lib/message/mu-message.cc
index 495995eb..493813da 100644
--- a/lib/message/mu-message.cc
+++ b/lib/message/mu-message.cc
@@ -81,7 +81,7 @@ Message::Message(const std::string& path, const std::string& mdir):
 			    g_strerror(errno));
 
 	if (!S_ISREG(statbuf.st_mode))
-		throw Error(Error::Code::File, "not a regular file: %s", path);
+		throw Error(Error::Code::File, "not a regular file: %s", path.c_str());
 
 	init_gmime();
 	if (auto msg{MimeMessage::make_from_file(path)}; !msg)
diff --git a/lib/message/mu-mime-object.hh b/lib/message/mu-mime-object.hh
index 44990b0f..2b2cfb8d 100644
--- a/lib/message/mu-mime-object.hh
+++ b/lib/message/mu-mime-object.hh
@@ -50,7 +50,7 @@ public:
 	 *
 	 * @param obj a gobject. A ref is added.
 	 */
-	Object(GObject* &&obj): self_{g_object_ref(obj)} {
+	Object(GObject* &&obj): self_{G_OBJECT(g_object_ref(obj))} {
 		if (!G_IS_OBJECT(obj))
 			throw std::runtime_error("not a g-object");
 	}
@@ -80,7 +80,8 @@ public:
 
 		if (this != &other) {
 			auto oldself = self_;
-			self_ = other.self_ ? g_object_ref(other.self_) : nullptr;
+			self_ = other.self_ ?
+				G_OBJECT(g_object_ref(other.self_)) : nullptr;
 			if (oldself)
 				g_object_unref(oldself);
 		}
@@ -137,7 +138,11 @@ private:
 	mutable GObject *self_{};
 };
 
-
+
+/**
+ * Thin wrapper around a GMimeOContentType
+ *
+ */
 struct MimeContentType: public Object {
 
 	MimeContentType(GMimeContentType *ctype) : Object{G_OBJECT(ctype)} {