From ef6b3b8daaef62a502c60e0faa22c3a4b10c0399 Mon Sep 17 00:00:00 2001 From: Lars Uebernickel Date: Tue, 13 Nov 2012 13:32:15 +0100 Subject: Move service .xml into a common directory Both the service (in src/) and the client library (in libmessaging-menu/) need access to the dbus interface description file. Until now, it resided in src, with both Makefiles calling gdbus-codegen on it. This patch moves the file to common/ and builds a convenience library that contains only the generated code. --- common/Makefile.am | 22 ++++++++++++++++++++ .../com.canonical.indicator.messages.service.xml | 24 ++++++++++++++++++++++ 2 files changed, 46 insertions(+) create mode 100644 common/Makefile.am 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..5bd7e20 --- /dev/null +++ b/common/Makefile.am @@ -0,0 +1,22 @@ + +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 + +BUILT_SOURCES = \ + indicator-messages-service.c \ + indicator-messages-service.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.service.xml b/common/com.canonical.indicator.messages.service.xml new file mode 100644 index 0000000..00ae154 --- /dev/null +++ b/common/com.canonical.indicator.messages.service.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + + + + -- cgit v1.2.3 From 5a9434c6652ef1117a50a9226f8609cea2ee53c0 Mon Sep 17 00:00:00 2001 From: Lars Uebernickel Date: Wed, 14 Nov 2012 17:57:54 +0100 Subject: Change application to service d-bus protocol Previously, the protocol was simply a menu model and an action group of the currently active sources. The service inserted the menu as a section into the indicator menu. This doesn't work anymore, because applications can (soon) expose individual messages, and the messaging menu doesn't always display all of those at once. This patch introduces a more specific d-bus API. That API is still considered private: applications have to use libmessaging-menu. --- common/Makefile.am | 12 +++++++++++- ...com.canonical.indicator.messages.application.xml | 21 +++++++++++++++++++++ 2 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 common/com.canonical.indicator.messages.application.xml (limited to 'common') diff --git a/common/Makefile.am b/common/Makefile.am index 5bd7e20..0b8bad4 100644 --- a/common/Makefile.am +++ b/common/Makefile.am @@ -9,9 +9,19 @@ indicator-messages-service.c: com.canonical.indicator.messages.service.xml $^ 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-service.h \ + indicator-messages-application.c \ + indicator-messages-application.h libmessaging_common_la_SOURCES = \ $(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..ec095dd --- /dev/null +++ b/common/com.canonical.indicator.messages.application.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + -- cgit v1.2.3 From a44f4a7f0d1918809452da175c5b0585ecd6d951 Mon Sep 17 00:00:00 2001 From: Lars Uebernickel Date: Thu, 15 Nov 2012 14:00:14 +0100 Subject: Add support for individual messages to MessagingMenuApp This is not exposed in the indicator menu yet. --- common/com.canonical.indicator.messages.application.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'common') diff --git a/common/com.canonical.indicator.messages.application.xml b/common/com.canonical.indicator.messages.application.xml index ec095dd..33aed7c 100644 --- a/common/com.canonical.indicator.messages.application.xml +++ b/common/com.canonical.indicator.messages.application.xml @@ -4,9 +4,15 @@ + + + + + + @@ -17,5 +23,11 @@ + + + + + + -- cgit v1.2.3 From b55e637321b0c3fdcb5e8aafab9614f80a3228d3 Mon Sep 17 00:00:00 2001 From: Lars Uebernickel Date: Fri, 16 Nov 2012 14:41:50 +0100 Subject: Export menu for the phone client This is a rough first draft: It only fetched the sources and messages from applications once and doesn't listen for further changes. This removes all code for the desktop menu for now. --- common/com.canonical.indicator.messages.application.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'common') diff --git a/common/com.canonical.indicator.messages.application.xml b/common/com.canonical.indicator.messages.application.xml index 33aed7c..fb9f079 100644 --- a/common/com.canonical.indicator.messages.application.xml +++ b/common/com.canonical.indicator.messages.application.xml @@ -27,7 +27,7 @@ - + -- cgit v1.2.3 From 9287c2e6577e71d8f68d9c9e7d393a4f8524ab10 Mon Sep 17 00:00:00 2001 From: Lars Uebernickel Date: Mon, 26 Nov 2012 20:12:13 +0100 Subject: Tell applications when messages and sources are dismissed Right now, this is only used to clean up internal data structures in libmessaging-menu. It's not exposed to the application itself. --- common/com.canonical.indicator.messages.application.xml | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'common') diff --git a/common/com.canonical.indicator.messages.application.xml b/common/com.canonical.indicator.messages.application.xml index fb9f079..552b6a4 100644 --- a/common/com.canonical.indicator.messages.application.xml +++ b/common/com.canonical.indicator.messages.application.xml @@ -13,6 +13,10 @@ + + + + -- cgit v1.2.3 From e8e99703ef0c565f07a9d1eba03c1003d82ff697 Mon Sep 17 00:00:00 2001 From: Lars Uebernickel Date: Tue, 27 Nov 2012 15:14:26 +0100 Subject: Allow adding actions to MessagingMenuMessage --- common/com.canonical.indicator.messages.application.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'common') diff --git a/common/com.canonical.indicator.messages.application.xml b/common/com.canonical.indicator.messages.application.xml index 552b6a4..f37cd25 100644 --- a/common/com.canonical.indicator.messages.application.xml +++ b/common/com.canonical.indicator.messages.application.xml @@ -5,7 +5,7 @@ - + @@ -28,7 +28,7 @@ - + -- cgit v1.2.3 From ced173aa7ea78c76922e07c84743d5b7f76c265e Mon Sep 17 00:00:00 2001 From: Lars Uebernickel Date: Tue, 27 Nov 2012 16:40:38 +0100 Subject: Pass message action and its parameter through to the application --- common/com.canonical.indicator.messages.application.xml | 2 ++ 1 file changed, 2 insertions(+) (limited to 'common') diff --git a/common/com.canonical.indicator.messages.application.xml b/common/com.canonical.indicator.messages.application.xml index f37cd25..5e99780 100644 --- a/common/com.canonical.indicator.messages.application.xml +++ b/common/com.canonical.indicator.messages.application.xml @@ -12,6 +12,8 @@ + + -- cgit v1.2.3 From 235a7edc5c2fc2435c837f8a3d427dd0755f966d Mon Sep 17 00:00:00 2001 From: Lars Uebernickel Date: Wed, 28 Nov 2012 17:24:31 +0100 Subject: Use aa{sv} instead of a(ssgav) to communicate actions to the service --- common/com.canonical.indicator.messages.application.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'common') diff --git a/common/com.canonical.indicator.messages.application.xml b/common/com.canonical.indicator.messages.application.xml index 5e99780..6f038e6 100644 --- a/common/com.canonical.indicator.messages.application.xml +++ b/common/com.canonical.indicator.messages.application.xml @@ -5,7 +5,7 @@ - + @@ -30,7 +30,7 @@ - + -- cgit v1.2.3