[telepathy-logger-0.8] telepathy-logger: Fix incompatible pointer types

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Thu Aug 1 18:54:04 UTC 2024


Module: telepathy-logger
Branch: telepathy-logger-0.8
Commit: 9d0b2834f4a3e82bc352ef44ef2903ab98c7e4af
URL:    http://cgit.freedesktop.org/telepathy/telepathy-logger/commit/?id=9d0b2834f4a3e82bc352ef44ef2903ab98c7e4af

Author: Balló György <ballogyor at gmail.com>
Date:   Thu Aug  1 19:26:43 2024 +0200

Fix incompatible pointer types

gcc14 defaults to -Werror=incompatible-pointer-types .
Fix build error with this option.

(cherry picked from commit 2e50d1855b3395b622c768094ff2b617a0208724)

---

 telepathy-logger/conf.c         | 2 +-
 telepathy-logger/dbus-service.c | 2 +-
 telepathy-logger/log-manager.c  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/telepathy-logger/conf.c b/telepathy-logger/conf.c
index d9e21fb..e35c759 100644
--- a/telepathy-logger/conf.c
+++ b/telepathy-logger/conf.c
@@ -127,7 +127,7 @@ tpl_conf_constructor (GType type,
 
   if (conf_singleton != NULL)
     {
-      retval = g_object_ref (conf_singleton);
+      retval = g_object_ref (G_OBJECT (conf_singleton));
     }
   else
     {
diff --git a/telepathy-logger/dbus-service.c b/telepathy-logger/dbus-service.c
index 9300c0e..1a91d03 100644
--- a/telepathy-logger/dbus-service.c
+++ b/telepathy-logger/dbus-service.c
@@ -96,7 +96,7 @@ favourite_contact_closure_new (TplDBusService *self,
   FavouriteContactClosure *closure;
 
   closure = g_slice_new0 (FavouriteContactClosure);
-  closure->service = g_object_ref (G_OBJECT (self));
+  closure->service = TPL_DBUS_SERVICE (g_object_ref (G_OBJECT (self)));
   closure->account = g_strdup (account);
   closure->contact_id = g_strdup (contact_id);
   /* XXX: ideally we'd up the ref count or duplicate this */
diff --git a/telepathy-logger/log-manager.c b/telepathy-logger/log-manager.c
index 37ff1d4..daded96 100644
--- a/telepathy-logger/log-manager.c
+++ b/telepathy-logger/log-manager.c
@@ -159,7 +159,7 @@ log_manager_constructor (GType type,
   GObject *retval = NULL;
 
   if (G_LIKELY (manager_singleton))
-    retval = g_object_ref (manager_singleton);
+    retval = g_object_ref (G_OBJECT (manager_singleton));
   else
     {
       retval = G_OBJECT_CLASS (tpl_log_manager_parent_class)->constructor (



More information about the telepathy-commits mailing list