From 79c89af3ac3c0c04f947c98b360a3ccaccbfc5dc Mon Sep 17 00:00:00 2001
From: Pete Woods <pete.woods@canonical.com>
Date: Tue, 20 Aug 2013 11:38:10 +0100
Subject: Re-do merge

---
 common/Makefile.am                                 | 32 ++++++++++++++++++
 ...om.canonical.indicator.messages.application.xml | 39 ++++++++++++++++++++++
 .../com.canonical.indicator.messages.service.xml   | 28 ++++++++++++++++
 3 files changed, 99 insertions(+)
 create mode 100644 common/Makefile.am
 create mode 100644 common/com.canonical.indicator.messages.application.xml
 create mode 100644 common/com.canonical.indicator.messages.service.xml

(limited to 'common')

diff --git a/common/Makefile.am b/common/Makefile.am
new file mode 100644
index 0000000..0b8bad4
--- /dev/null
+++ b/common/Makefile.am
@@ -0,0 +1,32 @@
+
+noinst_LTLIBRARIES = libmessaging-common.la
+
+indicator-messages-service.c: com.canonical.indicator.messages.service.xml
+	$(AM_V_GEN) gdbus-codegen \
+	    --interface-prefix com.canonical.indicator.messages. \
+	    --generate-c-code indicator-messages-service \
+	    --c-namespace IndicatorMessages \
+	    $^
+indicator-messages-service.h: indicator-messages-service.c
+
+indicator-messages-application.c: com.canonical.indicator.messages.application.xml
+	$(AM_V_GEN) gdbus-codegen \
+	    --interface-prefix com.canonical.indicator.messages. \
+	    --generate-c-code indicator-messages-application \
+	    --c-namespace IndicatorMessages \
+	    $^
+indicator-messages-application.h: indicator-messages-application.c
+
+BUILT_SOURCES = \
+	indicator-messages-service.c \
+	indicator-messages-service.h \
+	indicator-messages-application.c \
+	indicator-messages-application.h
+
+libmessaging_common_la_SOURCES = \
+	$(BUILT_SOURCES)
+
+libmessaging_common_la_CFLAGS = $(GIO_CFLAGS)
+libmessaging_common_la_LIBADD = $(GIO_LIBS)
+
+CLEANFILES = $(BUILT_SOURCES)
diff --git a/common/com.canonical.indicator.messages.application.xml b/common/com.canonical.indicator.messages.application.xml
new file mode 100644
index 0000000..6f038e6
--- /dev/null
+++ b/common/com.canonical.indicator.messages.application.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<node name="/">
+  <interface name="com.canonical.indicator.messages.application">
+    <method name="ListSources">
+      <arg type="a(sssuxsb)" name="sources" direction="out" />
+    </method>
+    <method name="ListMessages">
+        <arg type="a(sssssxaa{sv}b)" name="message" direction="out" />
+    </method>
+    <method name="ActivateSource">
+      <arg type="s" name="source_id" direction="in" />
+    </method>
+    <method name="ActivateMessage">
+      <arg type="s" name="message_id" direction="in" />
+      <arg type="s" name="action_id" direction="in" />
+      <arg type="av" name="parameter" direction="in" />
+    </method>
+    <method name="Dismiss">
+      <arg type="as" name="sources" direction="in" />
+      <arg type="as" name="messages" direction="in" />
+    </method>
+    <signal name="SourceAdded">
+      <arg type="u" name="position" direction="in" />
+      <arg type="(sssuxsb)" name="source" direction="in" />
+    </signal>
+    <signal name="SourceChanged">
+      <arg type="(sssuxsb)" name="source" direction="in" />
+    </signal>
+    <signal name="SourceRemoved">
+      <arg type="s" name="source_id" direction="in" />
+    </signal>
+    <signal name="MessageAdded">
+        <arg type="(sssssxaa{sv}b)" name="message" direction="in" />
+    </signal>
+    <signal name="MessageRemoved">
+      <arg type="s" name="message_id" direction="in" />
+    </signal>
+  </interface>
+</node>
diff --git a/common/com.canonical.indicator.messages.service.xml b/common/com.canonical.indicator.messages.service.xml
new file mode 100644
index 0000000..3c3c779
--- /dev/null
+++ b/common/com.canonical.indicator.messages.service.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<node name="/">
+	<interface name="com.canonical.indicator.messages.service">
+
+		<method name="RegisterApplication">
+		    <arg type="s" name="desktop_id" direction="in" />
+		    <arg type="o" name="menu_path" direction="in" />
+		</method>
+
+		<method name="UnregisterApplication">
+		    <arg type="s" name="desktop_id" direction="in" />
+		</method>
+
+		<method name="ApplicationStoppedRunning">
+			<arg type="s" name="desktop_id" direction="in" />
+		</method>
+
+		<method name="SetStatus">
+			<arg type="s" name="desktop_id" direction="in" />
+			<arg type="s" name="status" direction="in" />
+		</method>
+
+		<signal name="StatusChanged">
+			<arg type="s" name="status" direction="in" />
+		</signal>
+
+	</interface>
+</node>
-- 
cgit v1.2.3