snlavaise/pmaports-rtwo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

systemd/phosh: add patch to improve splash timeout handling

Browse Source 
This helps slow devices like the PinePhone particularly, where currently
many apps end up launching after the splash has timed out which creates
an awkward gap where the wallpaper temporarily is displayed and Phosh
says that the app either crashed or is slow to launch.

While this patch does not fix the problem entirely, in my testing it
helps many Flatpak apps launch before the splash goes away leading to a
much smoother and less confusing user experience. As such I think this
is worth backporting.

Signed-off-by: Stefan Hansson <newbyte@postmarketos.org>
Part-of: <https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/9420>
This commit is contained in:
Stefan Hansson
2026-08-21 13:17:22 +02:00
committed by The Friendly Meow (merge) Bot
parent 264f70c4a5
commit 073ff887b0
2 changed files with 659 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
extra-repos/systemd/phosh/APKBUILD
+5 -2
View File
@@ -7,7 +7,7 @@ maintainer="Stefan Hansson <newbyte@postmarketos.org>"
pkgname=phosh
_pkgver=0.57.0
pkgver=9999$_pkgver
pkgrel=0
pkgrel=1
pkgdesc="Wayland shell for GNOME on mobile devices"
# armhf: blocked by gnome-shell-schemas
arch="all !armhf"
@@ -76,7 +76,9 @@ subpackages="
$pkgname-schemas::noarch
$pkgname-systemd
"
source="https://sources.phosh.mobi/releases/phosh/phosh-${_pkgver/_/.}.tar.xz"
source="https://sources.phosh.mobi/releases/phosh/phosh-${_pkgver/_/.}.tar.xz
splash-timeout-flatpak-dbus.patch
"
builddir="$srcdir/$pkgname-${_pkgver/_/.}"
somask="libphoshsearch.so"
# crossdirect disabled because the ARMv7 cross compiler crashes internally with LTO
@@ -126,4 +128,5 @@ schemas() {
sha512sums="
51219a3295b061047765368a0f65a02b131c4b229ec03713f547595b73a98c51b99086769bf0584dd7d44b8426b21d50162e76e955fb7a37a5136cefa253fea8 phosh-0.57.0.tar.xz
cb4bad612e5d2dff156c6b97b460c16ab7fd48067935b616fe0b65d11c3d255f1ecd06b800c654ac9ea93bc53e823eb47134836dfdf61bb338588dab78d3b9e9 splash-timeout-flatpak-dbus.patch
"
extra-repos/systemd/phosh/splash-timeout-flatpak-dbus.patch
+654
View File
@@ -0,0 +1,654 @@
From fe1e8c22a7c262d5f92effbd4da0868b37c236cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx@sigxcpu.org>
Date: Mon, 17 Aug 2026 18:34:47 +0200
Subject: [PATCH 1/7] app-tracker: Fix indent
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
We need to do it at some point.
Signed-off-by: Guido Günther <agx@sigxcpu.org>
Part-of: <https://gitlab.gnome.org/World/Phosh/phosh/-/merge_requests/1955>
---
src/app-tracker.c | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/src/app-tracker.c b/src/app-tracker.c
index c36bd6cad..9fd2dfd3c 100644
--- a/src/app-tracker.c
+++ b/src/app-tracker.c
@@ -83,16 +83,16 @@ typedef enum {
} PhoshAppStateFlags;
typedef struct {
- gint64 pid;
+ gint64 pid;
PhoshAppStateFlags state;
- char *startup_id; /* (owned) */
- GDesktopAppInfo *info; /* (owned) */
- PhoshAppTracker *tracker; /* (unowned) */
+ char *startup_id; /* (owned) */
+ GDesktopAppInfo *info; /* (owned) */
+ PhoshAppTracker *tracker; /* (unowned) */
struct {
- guint id;
- guint waited;
- guint interval;
+ guint id;
+ guint waited;
+ guint interval;
} timeout;
} PhoshAppState;
@@ -160,11 +160,11 @@ on_startup_timeout (gpointer data)
static PhoshAppState *
-phosh_app_state_new (GDesktopAppInfo *info,
- const char *startup_id,
- gint64 pid,
- PhoshAppStateFlags flags,
- PhoshAppTracker *tracker)
+phosh_app_state_new (GDesktopAppInfo *info,
+ const char *startup_id,
+ gint64 pid,
+ PhoshAppStateFlags flags,
+ PhoshAppTracker *tracker)
{
PhoshAppState *state = g_new0 (PhoshAppState, 1);
guint timeout = STARTUP_TIMEOUT;
--
GitLab
From cb12e5f34b1ee7e7f7e2adbbb7f9eac1e66f2ed8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx@sigxcpu.org>
Date: Tue, 19 May 2026 17:37:38 +0200
Subject: [PATCH 2/7] app-tracker: Use g_clear_dbus_signal_subscription
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Guido Günther <agx@sigxcpu.org>
Part-of: <https://gitlab.gnome.org/World/Phosh/phosh/-/merge_requests/1955>
---
src/app-tracker.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/src/app-tracker.c b/src/app-tracker.c
index 9fd2dfd3c..87303042f 100644
--- a/src/app-tracker.c
+++ b/src/app-tracker.c
@@ -596,10 +596,8 @@ phosh_app_tracker_finalize (GObject *object)
g_clear_pointer (&self->wl_tracker, phosh_private_startup_tracker_destroy);
g_clear_handle_id (&self->idle_id, g_source_remove);
- if (self->dbus_id) {
- g_dbus_connection_signal_unsubscribe (self->session_bus, self->dbus_id);
- self->dbus_id = 0;
- }
+ g_clear_dbus_signal_subscription (&self->dbus_id, self->session_bus);
+
g_clear_object (&self->session_bus);
G_OBJECT_CLASS (phosh_app_tracker_parent_class)->finalize (object);
--
GitLab
From 64fc667d3c9fc43f077c6ab32cb1ce93b5d7c2f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx@sigxcpu.org>
Date: Mon, 17 Aug 2026 18:00:40 +0200
Subject: [PATCH 3/7] app-tracker: Really give forks one more iteration
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
If we don't continue we'll fall through to the error right away.
Signed-off-by: Guido Günther <agx@sigxcpu.org>
Part-of: <https://gitlab.gnome.org/World/Phosh/phosh/-/merge_requests/1955>
---
src/app-tracker.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/app-tracker.c b/src/app-tracker.c
index 87303042f..e3fe31f3b 100644
--- a/src/app-tracker.c
+++ b/src/app-tracker.c
@@ -143,7 +143,8 @@ on_startup_timeout (gpointer data)
} else {
/* PID is gone. As this might be a fork give it one more
* iteration to bring up a toplevel */
- state->timeout.waited = STARTUP_TRACKED_TIMEOUT;
+ state->timeout.waited = STARTUP_TRACKED_TIMEOUT;
+ return G_SOURCE_CONTINUE;
}
}
--
GitLab
From 685bf61e5e3e77c0cdcd519a4cf2b43dfb70aeb3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx@sigxcpu.org>
Date: Mon, 17 Aug 2026 18:02:09 +0200
Subject: [PATCH 4/7] app-tracker: Check for timeout first
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
This will make it easier to check for dbus ownership too.
No functional change.
Signed-off-by: Guido Günther <agx@sigxcpu.org>
Part-of: <https://gitlab.gnome.org/World/Phosh/phosh/-/merge_requests/1955>
---
src/app-tracker.c | 27 ++++++++++++++-------------
1 file changed, 14 insertions(+), 13 deletions(-)
diff --git a/src/app-tracker.c b/src/app-tracker.c
index e3fe31f3b..8569bcc92 100644
--- a/src/app-tracker.c
+++ b/src/app-tracker.c
@@ -132,19 +132,20 @@ on_startup_timeout (gpointer data)
state->timeout.waited += state->timeout.interval;
/* If we have a PID we can be more thorough */
- if (state->pid && state->timeout.waited < STARTUP_TRACKED_TIMEOUT) {
- /* TODO: track pidfd on Linux*/
- if (!kill (state->pid, 0)) {
- g_debug ("Startup id: '%s' has PID, waited %us, giving it more time to start",
- state->startup_id,
- state->timeout.waited);
-
- return G_SOURCE_CONTINUE;
- } else {
- /* PID is gone. As this might be a fork give it one more
- * iteration to bring up a toplevel */
- state->timeout.waited = STARTUP_TRACKED_TIMEOUT;
- return G_SOURCE_CONTINUE;
+ if (state->timeout.waited < STARTUP_TRACKED_TIMEOUT) {
+ if (state->pid) {
+ /* TODO: track pidfd on Linux*/
+ if (!kill (state->pid, 0)) {
+ g_debug ("Startup id: '%s' has PID, waited %us, giving it more "
+ "time to start",
+ state->startup_id, state->timeout.waited);
+ return G_SOURCE_CONTINUE;
+ } else {
+ /* PID is gone. As this might be a fork give it one more
+ * iteration to bring up a toplevel */
+ state->timeout.waited = STARTUP_TRACKED_TIMEOUT;
+ return G_SOURCE_CONTINUE;
+ }
}
}
--
GitLab
From d90ea648cac7448a0082bd8742362566bc3f16cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx@sigxcpu.org>
Date: Mon, 17 Aug 2026 18:17:51 +0200
Subject: [PATCH 5/7] app-tracker: Give apps that own a DBus name more time to
start
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
If an app picks up their name as app-id, we give them more time to
start.
Helps: https://gitlab.gnome.org/World/Phosh/phosh/-/work_items/1338
Signed-off-by: Guido Günther <agx@sigxcpu.org>
Part-of: <https://gitlab.gnome.org/World/Phosh/phosh/-/merge_requests/1955>
---
src/app-tracker.c | 60 +++++++++++++++++++++++++++++++++++++++++++++--
1 file changed, 58 insertions(+), 2 deletions(-)
diff --git a/src/app-tracker.c b/src/app-tracker.c
index 8569bcc92..3fc3bfd40 100644
--- a/src/app-tracker.c
+++ b/src/app-tracker.c
@@ -83,12 +83,16 @@ typedef enum {
} PhoshAppStateFlags;
typedef struct {
- gint64 pid;
+ gint64 pid;
PhoshAppStateFlags state;
- char *startup_id; /* (owned) */
+ char *startup_id; /* (owned) */
GDesktopAppInfo *info; /* (owned) */
PhoshAppTracker *tracker; /* (unowned) */
+
+ guint name_owner_id;
+ gboolean has_name_owner;
+
struct {
guint id;
guint waited;
@@ -146,6 +150,11 @@ on_startup_timeout (gpointer data)
state->timeout.waited = STARTUP_TRACKED_TIMEOUT;
return G_SOURCE_CONTINUE;
}
+ } else if (state->has_name_owner) {
+ g_debug ("Startup id: '%s' owns dbus name, waited %us, giving it more "
+ "time to start",
+ state->startup_id, state->timeout.waited);
+ return G_SOURCE_CONTINUE;
}
}
@@ -161,6 +170,32 @@ on_startup_timeout (gpointer data)
}
+static void
+on_name_appeared (GDBusConnection *connection,
+ const char *sender_name,
+ const char *object_path,
+ const char *interface_name,
+ const char *signal_name,
+ GVariant *parameters,
+ gpointer user_data)
+{
+ PhoshAppState *state = user_data;
+ const char *name, *old_owner, *new_owner, *app_id;
+
+ g_variant_get (parameters, "(&s&s&s)", &name, &old_owner, &new_owner);
+
+ app_id = g_app_info_get_id (G_APP_INFO (state->info));
+
+ if (old_owner[0] == '\0' && new_owner[0] != '\0') {
+ g_debug ("%s: Got new owner '%s' for '%s'", app_id, new_owner, name);
+ state->has_name_owner = TRUE;
+ } else if (old_owner[0] != '\0' && new_owner[0] == '\0') {
+ g_debug ("%s: Lost name owner '%s' for '%s'", app_id, old_owner, name);
+ state->has_name_owner = FALSE;
+ }
+}
+
+
static PhoshAppState *
phosh_app_state_new (GDesktopAppInfo *info,
const char *startup_id,
@@ -170,6 +205,7 @@ phosh_app_state_new (GDesktopAppInfo *info,
{
PhoshAppState *state = g_new0 (PhoshAppState, 1);
guint timeout = STARTUP_TIMEOUT;
+ const char *desktop_id;
if (G_UNLIKELY (phosh_shell_get_debug_flags () & PHOSH_SHELL_DEBUG_APP_ACTIVATION))
timeout = DEBUG_STARTUP_TIMEOUT;
@@ -189,6 +225,23 @@ phosh_app_state_new (GDesktopAppInfo *info,
state->startup_id,
state->state);
+ desktop_id = g_app_info_get_id (G_APP_INFO (info));
+ /* For DBus activatable apps we track the bus name too */
+ if (desktop_id && g_desktop_app_info_get_boolean (info, "DBusActivatable")) {
+ g_autofree char *app_id = phosh_strip_suffix_from_app_id (desktop_id);
+
+ state->name_owner_id = g_dbus_connection_signal_subscribe (tracker->session_bus,
+ "org.freedesktop.DBus",
+ "org.freedesktop.DBus",
+ "NameOwnerChanged",
+ "/org/freedesktop/DBus",
+ app_id,
+ G_DBUS_SIGNAL_FLAGS_NONE,
+ on_name_appeared,
+ state,
+ NULL);
+ }
+
return state;
}
@@ -196,6 +249,9 @@ phosh_app_state_new (GDesktopAppInfo *info,
static void
phosh_app_state_free (PhoshAppState *state)
{
+ g_clear_dbus_signal_subscription (&state->name_owner_id, state->tracker->session_bus);
+ g_clear_dbus_signal_subscription (&state->flatpak.dbus_id, state->tracker->session_bus);
+
g_clear_handle_id (&state->timeout.id, g_source_remove);
g_object_unref (state->info);
g_free (state->startup_id);
--
GitLab
From 876e090df73ab521d6a40e765dfaf28545dbb8ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx@sigxcpu.org>
Date: Tue, 19 May 2026 17:38:01 +0200
Subject: [PATCH 6/7] app-tracker: Give flatpaks more time to start
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
If we see the systemd scope we know that at least something
started.
Signed-off-by: Guido Günther <agx@sigxcpu.org>
Part-of: <https://gitlab.gnome.org/World/Phosh/phosh/-/merge_requests/1955>
---
src/app-tracker.c | 67 ++++++++++++++++++++++++++++++++++++++++++++---
1 file changed, 63 insertions(+), 4 deletions(-)
diff --git a/src/app-tracker.c b/src/app-tracker.c
index 3fc3bfd40..f89cc84a4 100644
--- a/src/app-tracker.c
+++ b/src/app-tracker.c
@@ -19,6 +19,8 @@
#include "phosh-marshalers.h"
#include "util.h"
+#include "gmobile.h"
+
#define GNOME_DESKTOP_USE_UNSTABLE_API
#include <libgnome-desktop/gnome-systemd.h>
@@ -93,6 +95,12 @@ typedef struct {
guint name_owner_id;
gboolean has_name_owner;
+ struct {
+ guint dbus_id;
+ gboolean started;
+ GRegex *scope_regex;
+ } flatpak;
+
struct {
guint id;
guint waited;
@@ -107,7 +115,7 @@ struct _PhoshAppTracker {
guint dbus_id;
guint idle_id;
struct phosh_private_startup_tracker *wl_tracker; /* PhoshPrivate wayland interface */
- GHashTable *apps;
+ GHashTable *apps; /* key: startup-id, value: app-state */
GCancellable *cancel;
};
G_DEFINE_TYPE (PhoshAppTracker, phosh_app_tracker, G_TYPE_OBJECT)
@@ -155,6 +163,12 @@ on_startup_timeout (gpointer data)
"time to start",
state->startup_id, state->timeout.waited);
return G_SOURCE_CONTINUE;
+ } else if (state->flatpak.started) {
+ g_debug ("Startup id: '%s' is flatpak, waited %us, giving it more "
+ "time to start",
+ state->startup_id, state->timeout.waited);
+ /* TODO: Should we wait the full STARTUP_TRACKED_TIMEOUT? */
+ return G_SOURCE_CONTINUE;
}
}
@@ -196,6 +210,32 @@ on_name_appeared (GDBusConnection *connection,
}
+static void
+on_systemd_job_removed (GDBusConnection *connection,
+ const char *sender_name,
+ const char *object_path,
+ const char *interface_name,
+ const char *signal_name,
+ GVariant *parameters,
+ gpointer user_data)
+{
+ PhoshAppState *state = user_data;
+ const char *unit, *result, *app_id;
+
+ g_variant_get (parameters, "(uo&s&s)", NULL, NULL, &unit, &result);
+
+ if (!g_regex_match (state->flatpak.scope_regex, unit, 0, NULL))
+ return;
+
+ if (g_strcmp0 (result, "done"))
+ return;
+
+ app_id = g_app_info_get_id (G_APP_INFO (state->info));
+ g_debug ("Found flatpak scope '%s' for %s\n", unit, app_id);
+ state->flatpak.started = TRUE;
+}
+
+
static PhoshAppState *
phosh_app_state_new (GDesktopAppInfo *info,
const char *startup_id,
@@ -205,6 +245,7 @@ phosh_app_state_new (GDesktopAppInfo *info,
{
PhoshAppState *state = g_new0 (PhoshAppState, 1);
guint timeout = STARTUP_TIMEOUT;
+ g_autofree char *flatpak_id = NULL;
const char *desktop_id;
if (G_UNLIKELY (phosh_shell_get_debug_flags () & PHOSH_SHELL_DEBUG_APP_ACTIVATION))
@@ -226,8 +267,25 @@ phosh_app_state_new (GDesktopAppInfo *info,
state->state);
desktop_id = g_app_info_get_id (G_APP_INFO (info));
- /* For DBus activatable apps we track the bus name too */
- if (desktop_id && g_desktop_app_info_get_boolean (info, "DBusActivatable")) {
+ flatpak_id = g_desktop_app_info_get_string (info, "X-Flatpak");
+
+ if (desktop_id && !gm_str_is_null_or_empty (flatpak_id)) {
+ g_autofree char *app_id = phosh_strip_suffix_from_app_id (desktop_id);
+ g_autofree char *match = g_strdup_printf ("app-flatpak-%s-[0-9]+\\.scope", app_id);
+
+ state->flatpak.scope_regex = g_regex_new (match, G_REGEX_DEFAULT, G_REGEX_MATCH_DEFAULT, NULL);
+ state->flatpak.dbus_id = g_dbus_connection_signal_subscribe (tracker->session_bus,
+ NULL,
+ "org.freedesktop.systemd1.Manager",
+ "JobRemoved",
+ "/org/freedesktop/systemd1",
+ NULL,
+ G_DBUS_SIGNAL_FLAGS_NONE,
+ on_systemd_job_removed,
+ state,
+ NULL);
+ } else if (desktop_id && g_desktop_app_info_get_boolean (info, "DBusActivatable")) {
+ /* For DBus activatable apps we track the bus name too */
g_autofree char *app_id = phosh_strip_suffix_from_app_id (desktop_id);
state->name_owner_id = g_dbus_connection_signal_subscribe (tracker->session_bus,
@@ -252,6 +310,8 @@ phosh_app_state_free (PhoshAppState *state)
g_clear_dbus_signal_subscription (&state->name_owner_id, state->tracker->session_bus);
g_clear_dbus_signal_subscription (&state->flatpak.dbus_id, state->tracker->session_bus);
+ g_clear_pointer (&state->flatpak.scope_regex, g_regex_unref);
+
g_clear_handle_id (&state->timeout.id, g_source_remove);
g_object_unref (state->info);
g_free (state->startup_id);
@@ -655,7 +715,6 @@ phosh_app_tracker_finalize (GObject *object)
g_clear_handle_id (&self->idle_id, g_source_remove);
g_clear_dbus_signal_subscription (&self->dbus_id, self->session_bus);
-
g_clear_object (&self->session_bus);
G_OBJECT_CLASS (phosh_app_tracker_parent_class)->finalize (object);
--
GitLab
From e4a2a06b9f8bd47358c545f90a3bcfd1e9678854 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx@sigxcpu.org>
Date: Mon, 17 Aug 2026 22:29:14 +0200
Subject: [PATCH 7/7] app-tracker: Track the systemd unit's state
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
That way we notice startup failures quicky.
Helps: https://gitlab.gnome.org/World/Phosh/phosh/-/work_items/1338
Signed-off-by: Guido Günther <agx@sigxcpu.org>
Part-of: <https://gitlab.gnome.org/World/Phosh/phosh/-/merge_requests/1955>
---
src/app-tracker.c | 106 ++++++++++++++++++++++++++++++++++++++++++++--
1 file changed, 102 insertions(+), 4 deletions(-)
diff --git a/src/app-tracker.c b/src/app-tracker.c
index f89cc84a4..a8486136b 100644
--- a/src/app-tracker.c
+++ b/src/app-tracker.c
@@ -96,9 +96,11 @@ typedef struct {
gboolean has_name_owner;
struct {
- guint dbus_id;
- gboolean started;
- GRegex *scope_regex;
+ guint dbus_id;
+ gboolean started;
+ GRegex *scope_regex;
+ GDBusProxy *unit_proxy;
+ GCancellable *cancel;
} flatpak;
struct {
@@ -121,6 +123,31 @@ struct _PhoshAppTracker {
G_DEFINE_TYPE (PhoshAppTracker, phosh_app_tracker, G_TYPE_OBJECT)
+static void
+check_flatpak_state (PhoshAppState *state)
+{
+ g_autoptr (GVariant) value = NULL;
+ const char *active, *app_id;
+
+ g_return_if_fail (G_IS_DBUS_PROXY (state->flatpak.unit_proxy));
+
+ value = g_dbus_proxy_get_cached_property (state->flatpak.unit_proxy, "ActiveState");
+ if (value == NULL) {
+ g_warning ("ActiveState not cached");
+ return;
+ }
+
+ app_id = g_app_info_get_id (G_APP_INFO (state->info));
+ active = g_variant_get_string (value, NULL);
+ g_debug ("Flatpak %s is %s", app_id, active);
+
+ if (g_strcmp0 (active, "active") && g_strcmp0 (active, "activating")) {
+ g_warning ("Flatpak unit for %s no longer active", app_id);
+ state->flatpak.started = FALSE;
+ }
+}
+
+
static gboolean
on_startup_timeout (gpointer data)
{
@@ -167,7 +194,8 @@ on_startup_timeout (gpointer data)
g_debug ("Startup id: '%s' is flatpak, waited %us, giving it more "
"time to start",
state->startup_id, state->timeout.waited);
- /* TODO: Should we wait the full STARTUP_TRACKED_TIMEOUT? */
+ /* Recheck state */
+ check_flatpak_state (state);
return G_SOURCE_CONTINUE;
}
}
@@ -210,6 +238,56 @@ on_name_appeared (GDBusConnection *connection,
}
+static void
+on_get_unit_proxy_ready (GObject *source_object, GAsyncResult *res, gpointer user_data)
+{
+ PhoshAppState *state;
+ GDBusProxy *proxy;
+ g_autoptr (GVariant) value = NULL;
+ g_autoptr (GError) err = NULL;
+
+ proxy = g_dbus_proxy_new_finish (res, &err);
+ if (proxy == NULL) {
+ phosh_async_error_warn (err, "Failed to get flatpak scope proxy");
+ return;
+ }
+
+ state = user_data;
+ state->flatpak.unit_proxy = proxy;
+ check_flatpak_state (state);
+}
+
+
+static void
+on_get_unit_ready (GObject *source_object, GAsyncResult *res, gpointer user_data)
+{
+ g_autoptr (GVariant) value = NULL;
+ g_autoptr (GError) err = NULL;
+ g_autofree char *unit_path = NULL;
+ PhoshAppState *state;
+
+ value = g_dbus_connection_call_finish (G_DBUS_CONNECTION (source_object), res, &err);
+ if (value == NULL) {
+ phosh_async_error_warn (err, "Failed to get unit path");
+ return;
+ }
+
+ g_variant_get (value,"(o)", &unit_path);
+ g_return_if_fail (unit_path != NULL);
+
+ state = user_data;
+ g_dbus_proxy_new (state->tracker->session_bus,
+ G_DBUS_PROXY_FLAGS_NONE,
+ NULL,
+ "org.freedesktop.systemd1",
+ unit_path,
+ "org.freedesktop.systemd1.Unit",
+ state->flatpak.cancel,
+ on_get_unit_proxy_ready,
+ state);
+}
+
+
static void
on_systemd_job_removed (GDBusConnection *connection,
const char *sender_name,
@@ -233,6 +311,23 @@ on_systemd_job_removed (GDBusConnection *connection,
app_id = g_app_info_get_id (G_APP_INFO (state->info));
g_debug ("Found flatpak scope '%s' for %s\n", unit, app_id);
state->flatpak.started = TRUE;
+
+ g_return_if_fail (state->flatpak.dbus_id);
+ g_clear_dbus_signal_subscription (&state->flatpak.dbus_id, state->tracker->session_bus);
+
+ state->flatpak.cancel = g_cancellable_new ();
+ g_dbus_connection_call (state->tracker->session_bus,
+ "org.freedesktop.systemd1",
+ "/org/freedesktop/systemd1",
+ "org.freedesktop.systemd1.Manager",
+ "GetUnit",
+ g_variant_new ("(s)", unit),
+ G_VARIANT_TYPE ("(o)"),
+ G_DBUS_CALL_FLAGS_NONE,
+ -1,
+ state->flatpak.cancel,
+ on_get_unit_ready,
+ state);
}
@@ -311,6 +406,9 @@ phosh_app_state_free (PhoshAppState *state)
g_clear_dbus_signal_subscription (&state->flatpak.dbus_id, state->tracker->session_bus);
g_clear_pointer (&state->flatpak.scope_regex, g_regex_unref);
+ g_cancellable_cancel (state->flatpak.cancel);
+ g_clear_object (&state->flatpak.cancel);
+ g_clear_object (&state->flatpak.unit_proxy);
g_clear_handle_id (&state->timeout.id, g_source_remove);
g_object_unref (state->info);
--
GitLab