diff options
| author | Michael Weghorn <m.weghorn@posteo.de> | 2024-08-14 12:49:25 +0200 |
|---|---|---|
| committer | Michael Weghorn <m.weghorn@posteo.de> | 2024-08-15 18:51:03 +0200 |
| commit | 2a9f97a26ffe2ef78e71c41a2310a269ed4a6f7c (patch) | |
| tree | 37f0bcaf47f7bd740b98ebb91d8e51415fb24404 /vcl/unx | |
| parent | 16c9053fe54b7c751b5c8c41ec7609199ebd6610 (diff) | |
vcl: Drop MATE <= 1.10 session inhibit support
This was added in:
commit 68570131013cfcf29f4c934a727053c2903e35b1
Author: Andrzej Hunt <andrzej@ahunt.org>
Date: Tue Oct 20 17:24:44 2015 +0200
Add org.mate.SessionManager support
This is valid for Mate <= 1.10
(As of writing, 1.10 is the current stable release - so we'll have
to keep shipping this for quite a few years to come.)
Change-Id: I4d1f81c50923148e710eac22f5428b2a1c41f0e9
As the commit message and code comments say, MATE >= 1.12
also uses the "org.gnome.SessionManager" interface (which is still
supported), so drop the "org.mate.SessionManager" one only needed
for older versions.
MATE 1.12 was released on 2015-11-05, which is long enough ago
by now.
[1] https://mate-desktop.org/blog/2015-11-05-mate-1-12-released/
Change-Id: I062261c6396b35be1a0f452826f8ee2c545f4906
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/171893
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
Diffstat (limited to 'vcl/unx')
| -rw-r--r-- | vcl/unx/generic/window/sessioninhibitor.cxx | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/vcl/unx/generic/window/sessioninhibitor.cxx b/vcl/unx/generic/window/sessioninhibitor.cxx index 300df9ff8031..b207c9a1282f 100644 --- a/vcl/unx/generic/window/sessioninhibitor.cxx +++ b/vcl/unx/generic/window/sessioninhibitor.cxx @@ -38,10 +38,6 @@ #define GSM_DBUS_PATH "/org/gnome/SessionManager" #define GSM_DBUS_INTERFACE "org.gnome.SessionManager" -// Mate <= 1.10 uses org.mate.SessionManager, > 1.10 will use org.gnome.SessionManager -#define MSM_DBUS_SERVICE "org.mate.SessionManager" -#define MSM_DBUS_PATH "/org/mate/SessionManager" -#define MSM_DBUS_INTERFACE "org.mate.SessionManager" #endif #include <sal/log.hxx> @@ -67,7 +63,6 @@ void SessionManagerInhibitor::inhibit(bool bInhibit, std::u16string_view sReason } inhibitGSM(bInhibit, appname, aReason.getStr(), eType, window_system_id); - inhibitMSM(bInhibit, appname, aReason.getStr(), eType, window_system_id); } #if ENABLE_GIO @@ -236,37 +231,6 @@ void SessionManagerInhibitor::inhibitGSM( bool bInhibit, const char* appname, co #endif // ENABLE_GIO } -void SessionManagerInhibitor::inhibitMSM( bool bInhibit, const char* appname, const char* reason, ApplicationInhibitFlags eType, unsigned int window_system_id ) -{ -#if ENABLE_GIO - dbusInhibit( bInhibit, - MSM_DBUS_SERVICE, MSM_DBUS_PATH, MSM_DBUS_INTERFACE, - [appname, reason, eType, window_system_id] ( GDBusProxy *proxy, GError*& error ) -> GVariant* { - return g_dbus_proxy_call_sync( proxy, "Inhibit", - g_variant_new("(susu)", - appname, - window_system_id, - reason, - eType - ), - G_DBUS_CALL_FLAGS_NONE, -1, nullptr, &error ); - }, - [] ( GDBusProxy *proxy, const guint nCookie, GError*& error ) -> GVariant* { - return g_dbus_proxy_call_sync( proxy, "Uninhibit", - g_variant_new("(u)", nCookie), - G_DBUS_CALL_FLAGS_NONE, -1, nullptr, &error ); - }, - mnMSMCookie ); -#else - (void) this; - (void) bInhibit; - (void) appname; - (void) reason; - (void) eType; - (void) window_system_id; -#endif // ENABLE_GIO -} - /** * Disable screensavers using the XSetScreenSaver/XGetScreenSaver API. * |