Add old-style com.trolltech annotations back into dbus xml files

Looks like the move from com.trolltech to org.qtproject happened only
recently, and with older Qt point releases Quassel will fail to build
that way.

By specifying both annotations, we hopefully silence the warnings in
current Qt while keeping Quassel buildable against older Qt.

diff --git a/interfaces/org.freedesktop.Notifications.xml b/interfaces/org.freedesktop.Notifications.xml
index f368515..97f3a9c 100644 (file)
--- a/interfaces/org.freedesktop.Notifications.xml
+++ b/interfaces/org.freedesktop.Notifications.xml
@@ -27,6 +27,7 @@
       <arg name="actions" type="as" direction="in"/>
       <arg name="hints" type="a{sv}" direction="in"/>
       <annotation name="org.qtproject.QtDBus.QtTypeName.In6" value="QVariantMap"/>
+      <annotation name="com.trolltech.QtDBus.QtTypeName.In6" value="QVariantMap"/>
       <arg name="expire_timeout" type="i" direction="in"/>
     </method>
     <method name="CloseNotification">

diff --git a/interfaces/org.kde.StatusNotifierItem.xml b/interfaces/org.kde.StatusNotifierItem.xml
index fba9b6f..d798bbf 100644 (file)
--- a/interfaces/org.kde.StatusNotifierItem.xml
+++ b/interfaces/org.kde.StatusNotifierItem.xml
@@ -16,12 +16,14 @@
     <!--struct containing width, height and image data-->
     <property name="IconPixmap" type="(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">
       <annotation name="org.qtproject.QtDBus.QtTypeName" value="DBusImageVector"/>
+      <annotation name="com.trolltech.QtDBus.QtTypeName" value="DBusImageVector"/>
     </property>
 
 
@@ -31,6 +33,7 @@
     <!--same definition as image-->
     <property name="AttentionIconPixmap" type="(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"/>
@@ -42,6 +45,7 @@
     <!--(iiay) is an image-->
     <property name="ToolTip" type="(s(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 2eb1a7a..7d75421 100644 (file)
--- a/interfaces/org.kde.StatusNotifierWatcher.xml
+++ b/interfaces/org.kde.StatusNotifierWatcher.xml
@@ -16,6 +16,7 @@
 
     <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"/>