mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2025-08-05 21:37:15 +02:00
53 lines
1.9 KiB
Diff
53 lines
1.9 KiB
Diff
From 2e50d1855b3395b622c768094ff2b617a0208724 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballogyor@gmail.com>
|
|
Date: Thu, 1 Aug 2024 19:26:43 +0200
|
|
Subject: [PATCH] Fix incompatible pointer types
|
|
|
|
gcc14 defaults to -Werror=incompatible-pointer-types .
|
|
Fix build error with this option.
|
|
---
|
|
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 888114d..9aaa222 100644
|
|
--- a/telepathy-logger/conf.c
|
|
+++ b/telepathy-logger/conf.c
|
|
@@ -132,7 +132,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 ee3c353..5f8c158 100644
|
|
--- a/telepathy-logger/dbus-service.c
|
|
+++ b/telepathy-logger/dbus-service.c
|
|
@@ -97,7 +97,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 49bc6db..8ae500d 100644
|
|
--- a/telepathy-logger/log-manager.c
|
|
+++ b/telepathy-logger/log-manager.c
|
|
@@ -160,7 +160,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 (
|