410d86e925
- Fix abort when disconnecting from libei - Fix restarting the daemon state after a client has disconnected Resolves: RHEL-89455
117 lines
4.6 KiB
Diff
117 lines
4.6 KiB
Diff
From e8ab7ac565f834303828f4f0e7c5ab3467d5c8a9 Mon Sep 17 00:00:00 2001
|
|
From: Olivier Fourdan <ofourdan@redhat.com>
|
|
Date: Mon, 19 May 2025 16:06:42 +0200
|
|
Subject: [PATCH 3/5] session: Add helper function is_cancelled()
|
|
|
|
No functional change, just to make the code easier to read.
|
|
|
|
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
|
|
---
|
|
src/gpd-session.c | 41 +++++++++++++++++++++++++++--------------
|
|
1 file changed, 27 insertions(+), 14 deletions(-)
|
|
|
|
diff --git a/src/gpd-session.c b/src/gpd-session.c
|
|
index 5e8a988..4916cf6 100644
|
|
--- a/src/gpd-session.c
|
|
+++ b/src/gpd-session.c
|
|
@@ -82,6 +82,15 @@ gpd_session_get_context (GpdSession *session)
|
|
return priv->context;
|
|
}
|
|
|
|
+static gboolean
|
|
+is_session_cancelled (GpdSession *session)
|
|
+{
|
|
+ GpdSessionPrivate *priv = gpd_session_get_instance_private (session);
|
|
+
|
|
+ g_debug ("%s", __func__);
|
|
+ return priv->cancellable && g_cancellable_is_cancelled (priv->cancellable);
|
|
+}
|
|
+
|
|
static void
|
|
on_stream_ready (GpdStream *stream,
|
|
GpdSession *session)
|
|
@@ -217,8 +226,8 @@ on_screen_cast_stream_proxy_acquired (GObject *object,
|
|
stream_proxy = gpd_dbus_screen_cast_stream_proxy_new_finish (result, &error);
|
|
if (!stream_proxy)
|
|
{
|
|
- if (priv->cancellable && g_cancellable_is_cancelled (priv->cancellable))
|
|
- g_debug ("%s was canceled", __func__);
|
|
+ if (is_session_cancelled (session))
|
|
+ g_debug ("%s was cancelled", __func__);
|
|
else
|
|
g_warning ("Failed to acquire stream proxy: %s", error->message);
|
|
|
|
@@ -255,8 +264,8 @@ on_record_window_finished (GObject *object,
|
|
result,
|
|
&error))
|
|
{
|
|
- if (priv->cancellable && g_cancellable_is_cancelled (priv->cancellable))
|
|
- g_debug ("%s was canceled", __func__);
|
|
+ if (is_session_cancelled (session))
|
|
+ g_debug ("%s was cancelled", __func__);
|
|
else
|
|
g_warning ("Failed to record window: %s", error->message);
|
|
|
|
@@ -293,8 +302,8 @@ on_record_monitor_finished (GObject *object,
|
|
result,
|
|
&error))
|
|
{
|
|
- if (priv->cancellable && g_cancellable_is_cancelled (priv->cancellable))
|
|
- g_debug ("%s was canceled", __func__);
|
|
+ if (is_session_cancelled (session))
|
|
+ g_debug ("%s was cancelled", __func__);
|
|
else
|
|
g_warning ("Failed to record monitor: %s", error->message);
|
|
|
|
@@ -328,8 +337,8 @@ on_screen_cast_session_proxy_acquired (GObject *object,
|
|
gpd_dbus_screen_cast_session_proxy_new_finish (result, &error);
|
|
if (!session_proxy)
|
|
{
|
|
- if (priv->cancellable && g_cancellable_is_cancelled (priv->cancellable))
|
|
- g_debug ("%s was canceled", __func__);
|
|
+ if (is_session_cancelled (session))
|
|
+ g_debug ("%s was cancelled", __func__);
|
|
else
|
|
{
|
|
g_warning ("Failed to acquire screen cast session proxy: %s\n",
|
|
@@ -364,8 +373,8 @@ on_screen_cast_session_created (GObject *source_object,
|
|
res,
|
|
&error))
|
|
{
|
|
- if (priv->cancellable && g_cancellable_is_cancelled (priv->cancellable))
|
|
- g_debug ("%s was canceled", __func__);
|
|
+ if (is_session_cancelled (session))
|
|
+ g_debug ("%s was cancelled", __func__);
|
|
else
|
|
g_warning ("Failed to start screen cast session: %s\n", error->message);
|
|
|
|
@@ -416,8 +425,10 @@ on_remote_desktop_session_proxy_acquired (GObject *object,
|
|
gpd_dbus_remote_desktop_session_proxy_new_finish (result, &error);
|
|
if (!session_proxy)
|
|
{
|
|
- if (priv->cancellable && g_cancellable_is_cancelled (priv->cancellable))
|
|
- g_debug ("%s was canceled", __func__);
|
|
+ if (is_session_cancelled (session))
|
|
+ {
|
|
+ g_debug ("%s was cancelled", __func__);
|
|
+ }
|
|
else
|
|
{
|
|
g_warning ("Failed to acquire remote desktop session proxy: %s\n",
|
|
@@ -471,8 +482,10 @@ on_remote_desktop_session_created (GObject *source_object,
|
|
res,
|
|
&error))
|
|
{
|
|
- if (priv->cancellable && g_cancellable_is_cancelled (priv->cancellable))
|
|
- g_debug ("%s was canceled", __func__);
|
|
+ if (is_session_cancelled (session))
|
|
+ {
|
|
+ g_debug ("%s was cancelled", __func__);
|
|
+ }
|
|
else
|
|
{
|
|
g_warning ("Failed to start remote desktop session: %s\n",
|
|
--
|
|
2.49.0
|
|
|