06d8e54685
- Add patch to fix build with gpsd: * 0001-Fix-build-with-gpsd-3.23.1.patch - Add patch to fix window thumbnails if dmabuf is not supported (kde#428284): * 0002-libtaskmanager-Don-t-request-dmabuf-if-not-supported.patch - Add patches from Plasma/5.23 branch: * 0001-SVN_SILENT-made-messages-.desktop-file-always-resolv.patch * 0002-shell-panel-Fix-ability-to-type-in-textfield.patch * 0003-SVN_SILENT-made-messages-.desktop-file-always-resolv.patch * 0004-PipeWire-Make-sure-thumbnails-properly-use-dmabuf-ag.patch * 0005-SVN_SILENT-made-messages-.desktop-file-always-resolv.patch * 0006-Klipper-Handle-incoming-UTF-8-mime-types.patch * 0007-Klipper-Guard-against-broken-data-fetches.patch * 0008-pipewire-Properly-compare-pipewire-versions-using-QV.patch * 0009-PipeWire-Include-defines-for-older-PipeWire-versions.patch * 0010-sddm-theme-fix-default-username-font-size.patch - Add patch to fix XEmbed context menus (kde#442758) * 0011-Revert-xembed-adapt-to-changes-in-KNotifications.patch OBS-URL: https://build.opensuse.org/request/show/921296 OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/plasma5-workspace?expand=0&rev=615
130 lines
4.5 KiB
Diff
130 lines
4.5 KiB
Diff
From 9e31d3156c0461fcffef9fbe6a6d7ee9151f1cb1 Mon Sep 17 00:00:00 2001
|
|
From: David Edmundson <kde@davidedmundson.co.uk>
|
|
Date: Tue, 21 Sep 2021 23:52:54 +0100
|
|
Subject: [PATCH 11/11] Revert "xembed: adapt to changes in KNotifications"
|
|
|
|
The file org.kde.StatusNotifierItem was syncronised with up-to-date
|
|
master, despite being previous edited to be only supported actions.
|
|
|
|
Whilst it seems harmless the line:
|
|
+ <property name="Menu" type="o" access="read"/>
|
|
means we now advertise this property.
|
|
|
|
The default constructor for QDBusObjectPath is "/".
|
|
|
|
Plasma-workspace "correctly" thinks we have a supported DBus menu and
|
|
therefore don't want to receive context menu events.
|
|
|
|
This reverts commit e782a1248d08adbaa9e3b4ef490c24765c6519c4.
|
|
The XML file gains a comment at the top so this doesn't happen again.
|
|
|
|
BUG: 442758
|
|
---
|
|
.../org.kde.StatusNotifierItem.xml | 42 ++-----------------
|
|
xembed-sni-proxy/sniproxy.cpp | 6 ---
|
|
xembed-sni-proxy/sniproxy.h | 2 -
|
|
3 files changed, 3 insertions(+), 47 deletions(-)
|
|
|
|
diff --git a/xembed-sni-proxy/org.kde.StatusNotifierItem.xml b/xembed-sni-proxy/org.kde.StatusNotifierItem.xml
|
|
index 53989c7b1..0cd7edb1a 100644
|
|
--- a/xembed-sni-proxy/org.kde.StatusNotifierItem.xml
|
|
+++ b/xembed-sni-proxy/org.kde.StatusNotifierItem.xml
|
|
@@ -1,5 +1,7 @@
|
|
<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
|
|
<node>
|
|
+ <!-- This is a minimally cut down version of the interface only implementing the
|
|
+ methods and properties used by xembedsniproxy -->
|
|
<interface name="org.kde.StatusNotifierItem">
|
|
|
|
<property name="Category" type="s" access="read"/>
|
|
@@ -8,48 +10,13 @@
|
|
<property name="Status" type="s" access="read"/>
|
|
<property name="WindowId" type="i" access="read"/>
|
|
|
|
- <!-- An additional path to add to the theme search path to find the icons specified above. -->
|
|
- <property name="IconThemePath" type="s" access="read"/>
|
|
- <property name="Menu" type="o" access="read"/>
|
|
<property name="ItemIsMenu" type="b" access="read"/>
|
|
|
|
|
|
- <!-- main icon -->
|
|
- <!-- names are preferred over pixmaps -->
|
|
- <property name="IconName" type="s" access="read"/>
|
|
-
|
|
- <!--struct containing width, height and image data-->
|
|
- <property name="IconPixmap" type="a(iiay)" access="read">
|
|
- <annotation name="org.qtproject.QtDBus.QtTypeName" value="KDbusImageVector"/>
|
|
- </property>
|
|
-
|
|
- <property name="OverlayIconName" type="s" access="read"/>
|
|
-
|
|
- <property name="OverlayIconPixmap" type="a(iiay)" access="read">
|
|
- <annotation name="org.qtproject.QtDBus.QtTypeName" value="KDbusImageVector"/>
|
|
- </property>
|
|
-
|
|
-
|
|
- <!-- Requesting attention icon -->
|
|
- <property name="AttentionIconName" type="s" access="read"/>
|
|
-
|
|
- <!--same definition as image-->
|
|
- <property name="AttentionIconPixmap" type="a(iiay)" access="read">
|
|
+ <property name="IconPixmap" type="(iiay)" access="read">
|
|
<annotation name="org.qtproject.QtDBus.QtTypeName" value="KDbusImageVector"/>
|
|
</property>
|
|
|
|
- <property name="AttentionMovieName" type="s" access="read"/>
|
|
-
|
|
-
|
|
-
|
|
- <!-- tooltip data -->
|
|
-
|
|
- <!--(iiay) is an image-->
|
|
- <property name="ToolTip" type="(sa(iiay)ss)" access="read">
|
|
- <annotation name="org.qtproject.QtDBus.QtTypeName" value="KDbusToolTipStruct"/>
|
|
- </property>
|
|
-
|
|
-
|
|
<!-- interaction: the systemtray wants the application to do something -->
|
|
<method name="ContextMenu">
|
|
<!-- we're passing the coordinates of the icon, so the app knows where to put the popup window -->
|
|
@@ -85,9 +52,6 @@
|
|
<signal name="NewOverlayIcon">
|
|
</signal>
|
|
|
|
- <signal name="NewMenu">
|
|
- </signal>
|
|
-
|
|
<signal name="NewToolTip">
|
|
</signal>
|
|
|
|
diff --git a/xembed-sni-proxy/sniproxy.cpp b/xembed-sni-proxy/sniproxy.cpp
|
|
index 9a6a7b5be..6faeb8e93 100644
|
|
--- a/xembed-sni-proxy/sniproxy.cpp
|
|
+++ b/xembed-sni-proxy/sniproxy.cpp
|
|
@@ -594,9 +594,3 @@ void SNIProxy::sendClick(uint8_t mouseButton, int x, int y)
|
|
|
|
sendingClickEvent = false;
|
|
}
|
|
-
|
|
-void SNIProxy::ProvideXdgActivationToken(const QString &token)
|
|
-{
|
|
- // Skip, Xembed is well-known for being X
|
|
- Q_UNUSED(token);
|
|
-}
|
|
diff --git a/xembed-sni-proxy/sniproxy.h b/xembed-sni-proxy/sniproxy.h
|
|
index 6ff115005..7d91c740b 100644
|
|
--- a/xembed-sni-proxy/sniproxy.h
|
|
+++ b/xembed-sni-proxy/sniproxy.h
|
|
@@ -80,8 +80,6 @@ public:
|
|
*/
|
|
KDbusImageVector IconPixmap() const;
|
|
|
|
- void ProvideXdgActivationToken(const QString &token);
|
|
-
|
|
public Q_SLOTS:
|
|
// interaction
|
|
/**
|
|
--
|
|
2.33.0
|
|
|