From 74bbd92b31eac0b308b252694f48a37e4f349f50 Mon Sep 17 00:00:00 2001
From: Manuel Nickschas <sputnick@quassel-irc.org>
Date: Thu, 7 Jun 2018 00:49:20 +0200
Subject: [PATCH] interfaces: Fix types in SNI interfaces, remove old
 annotations

Not sure why, but the pixmap types in the SNI interface were all
wrong (didn't seem to cause any issues, though, for some reason...).
Fix this.

Remove old com.trolltech.QtDBus.QtTypeName annotations, which are no
longer needed in any version of Qt we still support.
---
 interfaces/org.kde.StatusNotifierItem.xml    | 12 ++++--------
 interfaces/org.kde.StatusNotifierWatcher.xml |  1 -
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/interfaces/org.kde.StatusNotifierItem.xml b/interfaces/org.kde.StatusNotifierItem.xml
index 09ec3628..a8c23ade 100644
--- a/interfaces/org.kde.StatusNotifierItem.xml
+++ b/interfaces/org.kde.StatusNotifierItem.xml
@@ -18,16 +18,14 @@
     <property name="IconName" type="s" access="read"/>
 
     <!--struct containing width, height and image data-->
-    <property name="IconPixmap" type="(iiay)" access="read">
+    <property name="IconPixmap" type="a(iiay)" access="read">
       <annotation name="org.qtproject.QtDBus.QtTypeName" value="DBusImageVector"/>
-      <annotation name="com.trolltech.QtDBus.QtTypeName" value="DBusImageVector"/>
     </property>
 
     <property name="OverlayIconName" type="s" access="read"/>
 
-    <property name="OverlayIconPixmap" type="(iiay)" access="read">
+    <property name="OverlayIconPixmap" type="a(iiay)" access="read">
       <annotation name="org.qtproject.QtDBus.QtTypeName" value="DBusImageVector"/>
-      <annotation name="com.trolltech.QtDBus.QtTypeName" value="DBusImageVector"/>
     </property>
 
 
@@ -35,9 +33,8 @@
     <property name="AttentionIconName" type="s" access="read"/>
 
     <!--same definition as image-->
-    <property name="AttentionIconPixmap" type="(iiay)" access="read">
+    <property name="AttentionIconPixmap" type="a(iiay)" access="read">
       <annotation name="org.qtproject.QtDBus.QtTypeName" value="DBusImageVector"/>
-      <annotation name="com.trolltech.QtDBus.QtTypeName" value="DBusImageVector"/>
     </property>
 
     <property name="AttentionMovieName" type="s" access="read"/>
@@ -47,9 +44,8 @@
     <!-- tooltip data -->
 
     <!--(iiay) is an image-->
-    <property name="ToolTip" type="(s(iiay)ss)" access="read">
+    <property name="ToolTip" type="(sa(iiay)ss)" access="read">
       <annotation name="org.qtproject.QtDBus.QtTypeName" value="DBusToolTipStruct"/>
-      <annotation name="com.trolltech.QtDBus.QtTypeName" value="DBusToolTipStruct"/>
     </property>
 
 
diff --git a/interfaces/org.kde.StatusNotifierWatcher.xml b/interfaces/org.kde.StatusNotifierWatcher.xml
index 7d754213..2eb1a7a0 100644
--- a/interfaces/org.kde.StatusNotifierWatcher.xml
+++ b/interfaces/org.kde.StatusNotifierWatcher.xml
@@ -16,7 +16,6 @@
 
     <property name="RegisteredStatusNotifierItems" type="as" access="read">
        <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QStringList"/>
-       <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="QStringList"/>
     </property>
 
     <property name="IsStatusNotifierHostRegistered" type="b" access="read"/>
-- 
2.20.1