Fork from Ubuntu's indicator-application code project.

9 files changed, 48 insertions, 69 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index 4174cbc..20fd503 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -10,73 +10,73 @@ include $(top_srcdir)/Makefile.am.marshal
 ##################################
 
 applicationlibdir = $(INDICATORDIR)
-applicationlib_LTLIBRARIES = libapplication.la
-libapplication_la_SOURCES = \
-	application-service-marshal.c \
+applicationlib_LTLIBRARIES = libayatana-application.la
+libayatana_application_la_SOURCES = \
+	ayatana-application-service-marshal.c \
 	dbus-shared.h \
 	indicator-application.c
-libapplication_la_CFLAGS = $(INDICATOR_CFLAGS) \
+libayatana_application_la_CFLAGS = $(INDICATOR_CFLAGS) \
 	$(COVERAGE_CFLAGS) \
 	-Wall \
 	-Wl,-Bsymbolic-functions \
 	-Wl,-z,defs \
 	-Wl,--as-needed \
 	-Werror -Wno-error=deprecated-declarations \
-	-DG_LOG_DOMAIN=\"Indicator-Application\"
-libapplication_la_LIBADD = $(INDICATOR_LIBS) 
-libapplication_la_LDFLAGS = $(COVERAGE_LDFLAGS) \
+	-DG_LOG_DOMAIN=\"Ayatana-Indicator-Application\"
+libayatana_application_la_LIBADD = $(INDICATOR_LIBS) 
+libayatana_application_la_LDFLAGS = $(COVERAGE_LDFLAGS) \
 	-module -avoid-version
 
 ##################################
 # Service
 ##################################
 
-pkglibexec_PROGRAMS = indicator-application-service
+pkglibexec_PROGRAMS = ayatana-indicator-application-service
 
 BUILT_SOURCES += \
-	application-service-marshal.h \
-	application-service-marshal.c \
-	notification-watcher-server.h
+	ayatana-application-service-marshal.h \
+	ayatana-application-service-marshal.c \
+	ayatana-notification-watcher-server.h
 
-indicator_application_service_SOURCES = \
+ayatana_indicator_application_service_SOURCES = \
 	application-service.c \
 	application-service-appstore.h \
 	application-service-appstore.c \
-	application-service-marshal.c \
+	ayatana-application-service-marshal.c \
 	application-service-watcher.h \
 	application-service-watcher.c \
-	gen-application-service.xml.c \
+	gen-ayatana-application-service.xml.c \
 	dbus-shared.h \
 	generate-id.h \
 	generate-id.c
 
-indicator_application_service_CFLAGS = \
+ayatana_indicator_application_service_CFLAGS = \
 	$(INDICATOR_CFLAGS) \
 	$(APPINDICATOR_CFLAGS) \
 	$(COVERAGE_CFLAGS) \
 	-DDATADIR="\"$(pkgdatadir)\"" \
 	-Wall -Werror -Wno-error=deprecated-declarations \
-	-DG_LOG_DOMAIN=\"indicator-application-service\"
+	-DG_LOG_DOMAIN=\"ayatana-indicator-application-service\"
 
-indicator_application_service_LDADD = \
+ayatana_indicator_application_service_LDADD = \
 	$(INDICATOR_LIBS) \
 	$(APPINDICATOR_LIBS)
 
-indicator_application_service_LDFLAGS = \
+ayatana_indicator_application_service_LDFLAGS = \
 	$(COVERAGE_LDFLAGS)
 
-glib_marshal_list = application-service-marshal.list
-glib_marshal_prefix = _application_service_marshal
+glib_marshal_list = ayatana-application-service-marshal.list
+glib_marshal_prefix = _ayatana_application_service_marshal
 
 ##################################
 # DBus Specs
 ##################################
 
 GDBUS_SPECS = \
-	application-service.xml
+	ayatana-application-service.xml
 
 DBUS_SPECS = \
-	notification-watcher.xml
+	ayatana-notification-watcher.xml
 
 %-client.h: %.xml
 	dbus-binding-tool \
@@ -105,8 +105,8 @@ gen-%.xml.h: %.xml
 BUILT_SOURCES += \
 	$(DBUS_SPECS:.xml=-client.h) \
 	$(DBUS_SPECS:.xml=-server.h) \
-	gen-application-service.xml.c \
-	gen-application-service.xml.h
+	gen-ayatana-application-service.xml.c \
+	gen-ayatana-application-service.xml.h
 
 CLEANFILES += $(BUILT_SOURCES)
 
diff --git a/src/application-service-appstore.c b/src/application-service-appstore.c
index 864e434..56407da 100644
--- a/src/application-service-appstore.c
+++ b/src/application-service-appstore.c
@@ -24,11 +24,11 @@ with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "config.h"
 #endif
 
-#include <libindicator/indicator-object.h>
-#include "libappindicator/app-indicator.h"
-#include "libappindicator/app-indicator-enum-types.h"
+#include <libayatana-indicator/indicator-object.h>
+#include <libayatana-appindicator/app-indicator.h>
+#include <libayatana-appindicator/app-indicator-enum-types.h>
 #include "application-service-appstore.h"
-#include "application-service-marshal.h"
+#include "ayatana-application-service-marshal.h"
 #include "dbus-shared.h"
 #include "generate-id.h"
 
@@ -37,7 +37,7 @@ static GVariant * get_applications (ApplicationServiceAppstore * appstore);
 static void bus_method_call (GDBusConnection * connection, const gchar * sender, const gchar * path, const gchar * interface, const gchar * method, GVariant * params, GDBusMethodInvocation * invocation, gpointer user_data);
 static void props_cb (GObject * object, GAsyncResult * res, gpointer user_data);
 
-#include "gen-application-service.xml.h"
+#include "gen-ayatana-application-service.xml.h"
 
 #define NOTIFICATION_ITEM_PROP_ID                    "Id"
 #define NOTIFICATION_ITEM_PROP_CATEGORY              "Category"
@@ -154,7 +154,7 @@ application_service_appstore_class_init (ApplicationServiceAppstoreClass *klass)
 	if (node_info == NULL) {
 		GError * error = NULL;
 
-		node_info = g_dbus_node_info_new_for_xml(_application_service, &error);
+		node_info = g_dbus_node_info_new_for_xml(_ayatana_application_service, &error);
 		if (error != NULL) {
 			g_critical("Unable to parse Application Service Interface description: %s", error->message);
 			g_error_free(error);
diff --git a/src/application-service-marshal.list b/src/application-service-marshal.list
deleted file mode 100644
index 2b2efa5..0000000
--- a/src/application-service-marshal.list
+++ /dev/null
@@ -1,23 +0,0 @@
-# Marshaller definitions to be generated.
-# 
-# Copyright 2009 Canonical Ltd.
-# 
-# Authors:
-#    Ted Gould <ted@canonical.com>
-# 
-# This program is free software: you can redistribute it and/or modify it 
-# under the terms of the GNU General Public License version 3, as published 
-# by the Free Software Foundation.
-# 
-# This program is distributed in the hope that it will be useful, but 
-# WITHOUT ANY WARRANTY; without even the implied warranties of 
-# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR 
-# PURPOSE.  See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along 
-# with this program.  If not, see <http://www.gnu.org/licenses/>.
-VOID: STRING, INT, STRING, STRING, STRING, STRING, STRING
-VOID: INT, STRING, STRING
-VOID: INT, STRING
-VOID: STRING, STRING
-VOID: BOOL, STRING, OBJECT
diff --git a/src/application-service-watcher.c b/src/application-service-watcher.c
index 13280ba..8ccce9b 100644
--- a/src/application-service-watcher.c
+++ b/src/application-service-watcher.c
@@ -47,11 +47,11 @@ enum {
 
 #define CURRENT_PROTOCOL_VERSION 0
 
-static gboolean _notification_watcher_server_register_status_notifier_item (ApplicationServiceWatcher * appwatcher, const gchar * service, DBusGMethodInvocation * method);
-static gboolean _notification_watcher_server_register_status_notifier_host (ApplicationServiceWatcher * appwatcher, const gchar * host);
+static gboolean _ayatana_notification_watcher_server_register_status_notifier_item (ApplicationServiceWatcher * appwatcher, const gchar * service, DBusGMethodInvocation * method);
+static gboolean _ayatana_notification_watcher_server_register_status_notifier_host (ApplicationServiceWatcher * appwatcher, const gchar * host);
 static void get_name_cb (DBusGProxy * proxy, guint status, GError * error, gpointer data);
 
-#include "notification-watcher-server.h"
+#include "ayatana-notification-watcher-server.h"
 
 /* Private Stuff */
 typedef struct _ApplicationServiceWatcherPrivate ApplicationServiceWatcherPrivate;
@@ -144,7 +144,7 @@ application_service_watcher_class_init (ApplicationServiceWatcherClass *klass)
 	                                           G_TYPE_NONE, 0, G_TYPE_NONE);
 
 	dbus_g_object_type_install_info(APPLICATION_SERVICE_WATCHER_TYPE,
-	                                &dbus_glib__notification_watcher_server_object_info);
+	                                &dbus_glib__ayatana_notification_watcher_server_object_info);
 
 	return;
 }
@@ -245,7 +245,7 @@ application_service_watcher_new (ApplicationServiceAppstore * appstore)
 }
 
 static gboolean
-_notification_watcher_server_register_status_notifier_item (ApplicationServiceWatcher * appwatcher, const gchar * service, DBusGMethodInvocation * method)
+_ayatana_notification_watcher_server_register_status_notifier_item (ApplicationServiceWatcher * appwatcher, const gchar * service, DBusGMethodInvocation * method)
 {
 	ApplicationServiceWatcherPrivate * priv = APPLICATION_SERVICE_WATCHER_GET_PRIVATE(appwatcher);
 
@@ -266,7 +266,7 @@ _notification_watcher_server_register_status_notifier_item (ApplicationServiceWa
 }
 
 static gboolean
-_notification_watcher_server_register_status_notifier_host (ApplicationServiceWatcher * appwatcher, const gchar * host)
+_ayatana_notification_watcher_server_register_status_notifier_host (ApplicationServiceWatcher * appwatcher, const gchar * host)
 {
 
 	return FALSE;
diff --git a/src/appindicator3-0.1.pc.in b/src/ayatana-appindicator3-0.1.pc.in
index a485910..e02bdbd 100644
--- a/src/appindicator3-0.1.pc.in
+++ b/src/ayatana-appindicator3-0.1.pc.in
@@ -4,11 +4,11 @@ libdir=@libdir@
 bindir=@bindir@
 includedir=@includedir@
 
-Cflags: -I${includedir}/libappindicator3-0.1
+Cflags: -I${includedir}/libayatana-appindicator3-0.1
 Requires: dbusmenu-glib gtk+-3.0
-Libs: -L${libdir} -lappindicator3
+Libs: -L${libdir} -layatana-appindicator3
 
-Name: appindicator3-0.1
+Name: ayatana-appindicator3-0.1
 Description: Application indicators
 Version: @VERSION@
 
diff --git a/src/application-service.xml b/src/ayatana-application-service.xml
index 9428ebb..93a3ec6 100644
--- a/src/application-service.xml
+++ b/src/ayatana-application-service.xml
@@ -3,9 +3,11 @@
 An interface for communication between the service and indicator.
 
 Copyright 2009 Canonical Ltd.
+Copyright 2015 Arctica Project
 
 Authors:
     Ted Gould <ted@canonical.com>
+    Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
 
 This program is free software: you can redistribute it and/or modify it 
 under the terms of the GNU General Public License version 3, as published 
@@ -20,7 +22,7 @@ You should have received a copy of the GNU General Public License along
 with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
 <node name="/">
-	<interface name="com.canonical.indicator.application.service">
+	<interface name="org.ayatana.indicator.application.service">
 <!-- Properties -->
 		<!-- None currently -->
 
diff --git a/src/notification-watcher.xml b/src/ayatana-notification-watcher.xml
index e1897f5..e1897f5 100644
--- a/src/notification-watcher.xml
+++ b/src/ayatana-notification-watcher.xml
diff --git a/src/generate-id.h b/src/generate-id.h
index 4c26da2..1d2da21 100644
--- a/src/generate-id.h
+++ b/src/generate-id.h
@@ -23,7 +23,7 @@ with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define __GENERATE_ID_H__
 
 #include <glib.h>
-#include "libappindicator/app-indicator.h"
+#include "libayatana-appindicator/app-indicator.h"
 
 guint32 generate_id (const AppIndicatorCategory category, const gchar * id);
 
diff --git a/src/indicator-application.c b/src/indicator-application.c
index e78c69e..fe9c703 100644
--- a/src/indicator-application.c
+++ b/src/indicator-application.c
@@ -35,14 +35,14 @@ with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <libdbusmenu-gtk/menu.h>
 
 /* Indicator Stuff */
-#include <libindicator/indicator.h>
-#include <libindicator/indicator-object.h>
-#include <libindicator/indicator-image-helper.h>
+#include <libayatana-indicator/indicator.h>
+#include <libayatana-indicator/indicator-object.h>
+#include <libayatana-indicator/indicator-image-helper.h>
 
 /* Local Stuff */
 #include "dbus-shared.h"
-#include "gen-application-service.xml.h"
-#include "application-service-marshal.h"
+#include "gen-ayatana-application-service.xml.h"
+#include "ayatana-application-service-marshal.h"
 
 #define PANEL_ICON_SUFFIX  "panel"