From 13e1544b396a5212e82b940e420a1cd44d8aa24b Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Wed, 11 Nov 2015 05:58:50 +0100 Subject: Fork from Ubuntu's indicator-application code project. --- src/Makefile.am | 48 +++++++++++----------- src/appindicator3-0.1.pc.in | 14 ------- src/application-service-appstore.c | 12 +++--- src/application-service-marshal.list | 23 ----------- src/application-service-watcher.c | 12 +++--- src/application-service.xml | 78 ----------------------------------- src/ayatana-appindicator3-0.1.pc.in | 14 +++++++ src/ayatana-application-service.xml | 80 ++++++++++++++++++++++++++++++++++++ src/ayatana-notification-watcher.xml | 30 ++++++++++++++ src/generate-id.h | 2 +- src/indicator-application.c | 10 ++--- src/notification-watcher.xml | 30 -------------- 12 files changed, 166 insertions(+), 187 deletions(-) delete mode 100644 src/appindicator3-0.1.pc.in delete mode 100644 src/application-service-marshal.list delete mode 100644 src/application-service.xml create mode 100644 src/ayatana-appindicator3-0.1.pc.in create mode 100644 src/ayatana-application-service.xml create mode 100644 src/ayatana-notification-watcher.xml delete mode 100644 src/notification-watcher.xml (limited to 'src') 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/appindicator3-0.1.pc.in b/src/appindicator3-0.1.pc.in deleted file mode 100644 index a485910..0000000 --- a/src/appindicator3-0.1.pc.in +++ /dev/null @@ -1,14 +0,0 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -bindir=@bindir@ -includedir=@includedir@ - -Cflags: -I${includedir}/libappindicator3-0.1 -Requires: dbusmenu-glib gtk+-3.0 -Libs: -L${libdir} -lappindicator3 - -Name: appindicator3-0.1 -Description: Application indicators -Version: @VERSION@ - 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 . #include "config.h" #endif -#include -#include "libappindicator/app-indicator.h" -#include "libappindicator/app-indicator-enum-types.h" +#include +#include +#include #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 -# -# 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 . -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/application-service.xml b/src/application-service.xml deleted file mode 100644 index 9428ebb..0000000 --- a/src/application-service.xml +++ /dev/null @@ -1,78 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/ayatana-appindicator3-0.1.pc.in b/src/ayatana-appindicator3-0.1.pc.in new file mode 100644 index 0000000..e02bdbd --- /dev/null +++ b/src/ayatana-appindicator3-0.1.pc.in @@ -0,0 +1,14 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +bindir=@bindir@ +includedir=@includedir@ + +Cflags: -I${includedir}/libayatana-appindicator3-0.1 +Requires: dbusmenu-glib gtk+-3.0 +Libs: -L${libdir} -layatana-appindicator3 + +Name: ayatana-appindicator3-0.1 +Description: Application indicators +Version: @VERSION@ + diff --git a/src/ayatana-application-service.xml b/src/ayatana-application-service.xml new file mode 100644 index 0000000..93a3ec6 --- /dev/null +++ b/src/ayatana-application-service.xml @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/ayatana-notification-watcher.xml b/src/ayatana-notification-watcher.xml new file mode 100644 index 0000000..e1897f5 --- /dev/null +++ b/src/ayatana-notification-watcher.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 . #define __GENERATE_ID_H__ #include -#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 . #include /* Indicator Stuff */ -#include -#include -#include +#include +#include +#include /* 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" diff --git a/src/notification-watcher.xml b/src/notification-watcher.xml deleted file mode 100644 index e1897f5..0000000 --- a/src/notification-watcher.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -- cgit v1.2.3