From b6b292428ea4370c53f8f2bfe82640de7c95e763 Mon Sep 17 00:00:00 2001
From: Kai Uwe Broulik <kde@privat.broulik.de>
Date: Mon, 12 Feb 2018 15:07:02 +0100
Subject: [PATCH] Remove copy of com.canonical.dbusmenu.xml

Just use the one provided by libdbusmenuqt
---
 gmenu-dbusmenu-proxy/CMakeLists.txt           |  4 +-
 .../com.canonical.dbusmenu.xml                | 49 -------------------
 2 files changed, 1 insertion(+), 52 deletions(-)
 delete mode 100644 gmenu-dbusmenu-proxy/com.canonical.dbusmenu.xml

diff --git a/gmenu-dbusmenu-proxy/CMakeLists.txt b/gmenu-dbusmenu-proxy/CMakeLists.txt
index 726c55c5b..4f18a170e 100644
--- a/gmenu-dbusmenu-proxy/CMakeLists.txt
+++ b/gmenu-dbusmenu-proxy/CMakeLists.txt
@@ -16,9 +16,7 @@ set(GMENU_DBUSMENU_PROXY_SRCS
     ../libdbusmenuqt/dbusmenutypes_p.cpp
  )
 
-# FIXME use the one in libdbusmenuqt rather than a copy but for testing and meddling with it use a copy for now
-#qt5_add_dbus_adaptor(GMENU_DBUSMENU_PROXY_SRCS ../libdbusmenuqt/com.canonical.dbusmenu.xml menu.h Menu)
-qt5_add_dbus_adaptor(GMENU_DBUSMENU_PROXY_SRCS com.canonical.dbusmenu.xml menu.h Menu)
+qt5_add_dbus_adaptor(GMENU_DBUSMENU_PROXY_SRCS ../libdbusmenuqt/com.canonical.dbusmenu.xml menu.h Menu)
 
 ecm_qt_declare_logging_category(GMENU_DBUSMENU_PROXY_SRCS HEADER debug.h
                                                IDENTIFIER DBUSMENUPROXY
diff --git a/gmenu-dbusmenu-proxy/com.canonical.dbusmenu.xml b/gmenu-dbusmenu-proxy/com.canonical.dbusmenu.xml
deleted file mode 100644
index 140099054..000000000
--- a/gmenu-dbusmenu-proxy/com.canonical.dbusmenu.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<interface name="com.canonical.dbusmenu">
-    <property name="Version" type="u" access="read"/>
-    <property name="Status" type="s" access="read"/>
-    <signal name="ItemsPropertiesUpdated">
-    <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="DBusMenuItemList"/>
-    <annotation name="org.qtproject.QtDBus.QtTypeName.Out1" value="DBusMenuItemKeysList"/>
-    <arg type="a(ia{sv})" direction="out"/>
-    <arg type="a(ias)" direction="out"/>
-    </signal>
-    <signal name="LayoutUpdated">
-    <arg name="revision" type="u" direction="out"/>
-    <arg name="parentId" type="i" direction="out"/>
-    </signal>
-    <signal name="ItemActivationRequested">
-    <arg name="id" type="i" direction="out"/>
-    <arg name="timeStamp" type="u" direction="out"/>
-    </signal>
-    <method name="Event">
-    <arg name="id" type="i" direction="in"/>
-    <arg name="eventId" type="s" direction="in"/>
-    <arg name="data" type="v" direction="in"/>
-    <arg name="timestamp" type="u" direction="in"/>
-    <annotation name="org.freedesktop.DBus.Method.NoReply" value="true"/>
-    </method>
-    <method name="GetProperty">
-    <arg type="v" direction="out"/>
-    <arg name="id" type="i" direction="in"/>
-    <arg name="property" type="s" direction="in"/>
-    </method>
-    <method name="GetLayout">
-    <annotation value="DBusMenuLayoutItem" name="org.qtproject.QtDBus.QtTypeName.Out1"/>
-    <arg direction="in" type="i" name="parentId"/>
-    <arg direction="in" type="i" name="recursionDepth"/>
-    <arg direction="in" type="as" name="propertyNames"/>
-    <arg direction="out" type="u" name="revision"/>
-    <arg direction="out" type="(ia{sv}av)" name="layout"/>
-    </method>
-    <method name="GetGroupProperties">
-    <arg type="a(ia{sv})" direction="out"/>
-    <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="DBusMenuItemList"/>
-    <arg name="ids" type="ai" direction="in"/>
-    <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="QList&lt;int&gt;"/>
-    <arg name="propertyNames" type="as" direction="in"/>
-    </method>
-    <method name="AboutToShow">
-    <arg type="b" direction="out"/>
-    <arg name="id" type="i" direction="in"/>
-    </method>
-</interface>