54 lines
2.1 KiB
Diff
54 lines
2.1 KiB
Diff
From 2c9dcf4318bda6d9d16bfb97da0b75a66d023d80 Mon Sep 17 00:00:00 2001
|
|
From: Bilal Elmoussaoui <belmouss@redhat.com>
|
|
Date: Tue, 14 Apr 2026 18:52:07 +0200
|
|
Subject: [PATCH 04/17] Prefer using g_set_str
|
|
|
|
Part-of: <https://gitlab.gnome.org/GNOME/gnome-kiosk/-/merge_requests/140>
|
|
(cherry picked from commit bc72a3f39e03c07bf602ef511b40dcd5fde9b48f)
|
|
---
|
|
compositor/kiosk-input-engine-manager.c | 3 +--
|
|
compositor/kiosk-input-source-group.c | 6 ++----
|
|
2 files changed, 3 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/compositor/kiosk-input-engine-manager.c b/compositor/kiosk-input-engine-manager.c
|
|
index 07a90df..ae9016e 100644
|
|
--- a/compositor/kiosk-input-engine-manager.c
|
|
+++ b/compositor/kiosk-input-engine-manager.c
|
|
@@ -142,8 +142,7 @@ kiosk_input_engine_manager_set_active_engine (KioskInputEngineManager *self,
|
|
g_debug ("KioskInputEngineManager: Active input engine is now '%s'", active_engine);
|
|
}
|
|
|
|
- g_free (self->active_engine);
|
|
- self->active_engine = g_strdup (active_engine);
|
|
+ g_set_str (&self->active_engine, active_engine);
|
|
|
|
g_object_notify (G_OBJECT (self), "active-engine");
|
|
}
|
|
diff --git a/compositor/kiosk-input-source-group.c b/compositor/kiosk-input-source-group.c
|
|
index e3a4f13..580b88a 100644
|
|
--- a/compositor/kiosk-input-source-group.c
|
|
+++ b/compositor/kiosk-input-source-group.c
|
|
@@ -253,8 +253,7 @@ kiosk_input_source_group_set_input_engine (KioskInputSourceGroup *self,
|
|
{
|
|
g_debug ("KioskInputSourceGroup: Setting input engine to '%s'", engine_name);
|
|
|
|
- g_free (self->input_engine_name);
|
|
- self->input_engine_name = g_strdup (engine_name);
|
|
+ g_set_str (&self->input_engine_name, engine_name);
|
|
|
|
g_ptr_array_set_size (self->layouts, 0);
|
|
g_ptr_array_set_size (self->variants, 0);
|
|
@@ -275,8 +274,7 @@ void
|
|
kiosk_input_source_group_set_options (KioskInputSourceGroup *self,
|
|
const char *options)
|
|
{
|
|
- g_free (self->options);
|
|
- self->options = g_strdup (options);
|
|
+ g_set_str (&self->options, options);
|
|
}
|
|
|
|
const char *
|
|
--
|
|
2.55.0
|
|
|