|
 |
e296c6 |
From a8115378fd876bfd4c3871428cdc16134ed484b1 Mon Sep 17 00:00:00 2001
|
|
|
e296c6 |
From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>
|
|
|
e296c6 |
Date: Tue, 5 Jan 2021 11:11:18 +0100
|
|
|
e296c6 |
Subject: [PATCH] media-keys: Mark screen cast as stopped if it was signalled
|
|
|
e296c6 |
as such
|
|
|
e296c6 |
|
|
|
e296c6 |
gnome-shell now sends a 'Stopped' signal if it was stopped without
|
|
|
e296c6 |
gsd-media-keys itself being the stopper.
|
|
|
e296c6 |
---
|
|
|
e296c6 |
plugins/media-keys/gsd-media-keys-manager.c | 52 +++++++++++++++++++--
|
|
|
e296c6 |
1 file changed, 49 insertions(+), 3 deletions(-)
|
|
|
e296c6 |
|
|
|
e296c6 |
diff --git a/plugins/media-keys/gsd-media-keys-manager.c b/plugins/media-keys/gsd-media-keys-manager.c
|
|
|
e296c6 |
index 4d251f08..a526d5cf 100644
|
|
|
e296c6 |
--- a/plugins/media-keys/gsd-media-keys-manager.c
|
|
|
e296c6 |
+++ b/plugins/media-keys/gsd-media-keys-manager.c
|
|
|
e296c6 |
@@ -210,6 +210,7 @@ struct GsdMediaKeysManagerPrivate
|
|
|
e296c6 |
guint screencast_timeout_id;
|
|
|
e296c6 |
gboolean screencast_recording;
|
|
|
e296c6 |
GCancellable *screencast_cancellable;
|
|
|
e296c6 |
+ guint screencast_stopped_signal_id;
|
|
|
e296c6 |
|
|
|
e296c6 |
/* Rotation */
|
|
|
e296c6 |
guint iio_sensor_watch_id;
|
|
|
e296c6 |
@@ -2346,20 +2347,26 @@ do_rfkill_action (GsdMediaKeysManager *manager,
|
|
|
e296c6 |
}
|
|
|
e296c6 |
|
|
|
e296c6 |
static void
|
|
|
e296c6 |
-screencast_stop (GsdMediaKeysManager *manager)
|
|
|
e296c6 |
+screencast_stopped (GsdMediaKeysManager *manager)
|
|
|
e296c6 |
{
|
|
|
e296c6 |
if (manager->priv->screencast_timeout_id > 0) {
|
|
|
e296c6 |
g_source_remove (manager->priv->screencast_timeout_id);
|
|
|
e296c6 |
manager->priv->screencast_timeout_id = 0;
|
|
|
e296c6 |
}
|
|
|
e296c6 |
|
|
|
e296c6 |
+ manager->priv->screencast_recording = FALSE;
|
|
|
e296c6 |
+}
|
|
|
e296c6 |
+
|
|
|
e296c6 |
+static void
|
|
|
e296c6 |
+screencast_stop (GsdMediaKeysManager *manager)
|
|
|
e296c6 |
+{
|
|
|
e296c6 |
+ screencast_stopped (manager);
|
|
|
e296c6 |
+
|
|
|
e296c6 |
g_dbus_proxy_call (manager->priv->screencast_proxy,
|
|
|
e296c6 |
"StopScreencast", NULL,
|
|
|
e296c6 |
G_DBUS_CALL_FLAGS_NONE, -1,
|
|
|
e296c6 |
manager->priv->screencast_cancellable,
|
|
|
e296c6 |
NULL, NULL);
|
|
|
e296c6 |
-
|
|
|
e296c6 |
- manager->priv->screencast_recording = FALSE;
|
|
|
e296c6 |
}
|
|
|
e296c6 |
|
|
|
e296c6 |
static gboolean
|
|
|
e296c6 |
@@ -2835,6 +2842,21 @@ initialize_volume_handler (GsdMediaKeysManager *manager)
|
|
|
e296c6 |
gnome_settings_profile_end ("gvc_mixer_control_new");
|
|
|
e296c6 |
}
|
|
|
e296c6 |
|
|
|
e296c6 |
+
|
|
|
e296c6 |
+static void
|
|
|
e296c6 |
+on_screencast_stopped (GDBusConnection *connection,
|
|
|
e296c6 |
+ const gchar *sender_name,
|
|
|
e296c6 |
+ const gchar *object_path,
|
|
|
e296c6 |
+ const gchar *interface_name,
|
|
|
e296c6 |
+ const gchar *signal_name,
|
|
|
e296c6 |
+ GVariant *parameters,
|
|
|
e296c6 |
+ gpointer data)
|
|
|
e296c6 |
+{
|
|
|
e296c6 |
+ GsdMediaKeysManager *manager = data;
|
|
|
e296c6 |
+
|
|
|
e296c6 |
+ screencast_stopped (manager);
|
|
|
e296c6 |
+}
|
|
|
e296c6 |
+
|
|
|
e296c6 |
static void
|
|
|
e296c6 |
on_screencast_proxy_ready (GObject *source,
|
|
|
e296c6 |
GAsyncResult *result,
|
|
|
e296c6 |
@@ -2850,7 +2872,20 @@ on_screencast_proxy_ready (GObject *source,
|
|
|
e296c6 |
if (!g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
|
|
|
e296c6 |
g_warning ("Failed to create proxy for screencast: %s", error->message);
|
|
|
e296c6 |
g_error_free (error);
|
|
|
e296c6 |
+ return;
|
|
|
e296c6 |
}
|
|
|
e296c6 |
+
|
|
|
e296c6 |
+ manager->priv->screencast_stopped_signal_id =
|
|
|
e296c6 |
+ g_dbus_connection_signal_subscribe (manager->priv->connection,
|
|
|
e296c6 |
+ SHELL_DBUS_NAME ".Screencast",
|
|
|
e296c6 |
+ SHELL_DBUS_NAME ".Screencast",
|
|
|
e296c6 |
+ "Stopped",
|
|
|
e296c6 |
+ SHELL_DBUS_PATH "/Screencast",
|
|
|
e296c6 |
+ NULL,
|
|
|
e296c6 |
+ G_DBUS_SIGNAL_FLAGS_NONE,
|
|
|
e296c6 |
+ on_screencast_stopped,
|
|
|
e296c6 |
+ manager,
|
|
|
e296c6 |
+ NULL);
|
|
|
e296c6 |
}
|
|
|
e296c6 |
|
|
|
e296c6 |
static void
|
|
|
e296c6 |
@@ -2901,6 +2936,11 @@ shell_presence_changed (GsdMediaKeysManager *manager)
|
|
|
e296c6 |
on_screencast_proxy_ready, manager);
|
|
|
e296c6 |
g_free (name_owner);
|
|
|
e296c6 |
} else {
|
|
|
e296c6 |
+ if (manager->priv->screencast_stopped_signal_id)
|
|
|
e296c6 |
+ g_dbus_connection_signal_unsubscribe (manager->priv->connection,
|
|
|
e296c6 |
+ manager->priv->screencast_stopped_signal_id);
|
|
|
e296c6 |
+ manager->priv->screencast_stopped_signal_id = 0;
|
|
|
e296c6 |
+
|
|
|
e296c6 |
g_ptr_array_set_size (manager->priv->keys, 0);
|
|
|
e296c6 |
g_clear_object (&manager->priv->key_grabber);
|
|
|
e296c6 |
g_clear_object (&manager->priv->screencast_proxy);
|
|
|
e296c6 |
@@ -3091,6 +3131,12 @@ gsd_media_keys_manager_stop (GsdMediaKeysManager *manager)
|
|
|
e296c6 |
priv->reenable_power_button_timer_id = 0;
|
|
|
e296c6 |
}
|
|
|
e296c6 |
|
|
|
e296c6 |
+ if (priv->screencast_stopped_signal_id) {
|
|
|
e296c6 |
+ g_dbus_connection_signal_unsubscribe (priv->connection,
|
|
|
e296c6 |
+ priv->screencast_stopped_signal_id);
|
|
|
e296c6 |
+ priv->screencast_stopped_signal_id = 0;
|
|
|
e296c6 |
+ }
|
|
|
e296c6 |
+
|
|
|
e296c6 |
g_clear_pointer (&manager->priv->ca, ca_context_destroy);
|
|
|
e296c6 |
|
|
|
e296c6 |
#if HAVE_GUDEV
|
|
|
e296c6 |
--
|
|
|
e296c6 |
2.27.0
|
|
|
e296c6 |
|