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. --- .bzr-builddeb/default.conf | 2 - .bzrignore | 114 --------------------- Makefile.am | 45 ++++---- configure.ac | 28 ++--- data/Makefile.am | 12 +-- data/ayatana-indicator-application.conf.in | 22 ++++ data/ayatana-indicator-application.desktop.in | 8 ++ data/indicator-application.conf.in | 22 ---- data/indicator-application.desktop.in | 8 -- data/upstart/Makefile.am | 4 +- .../ayatana-indicator-application.desktop.in | 8 ++ data/upstart/indicator-application.desktop.in | 8 -- debian/changelog | 6 ++ debian/control | 25 ++--- debian/rules | 6 +- debian/source/format | 1 + debian/watch | 2 - 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 ------ 29 files changed, 269 insertions(+), 405 deletions(-) delete mode 100644 .bzr-builddeb/default.conf delete mode 100644 .bzrignore create mode 100644 data/ayatana-indicator-application.conf.in create mode 100644 data/ayatana-indicator-application.desktop.in delete mode 100644 data/indicator-application.conf.in delete mode 100644 data/indicator-application.desktop.in create mode 100644 data/upstart/ayatana-indicator-application.desktop.in delete mode 100644 data/upstart/indicator-application.desktop.in create mode 100644 debian/source/format delete mode 100644 debian/watch 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 diff --git a/.bzr-builddeb/default.conf b/.bzr-builddeb/default.conf deleted file mode 100644 index 6c96a98..0000000 --- a/.bzr-builddeb/default.conf +++ /dev/null @@ -1,2 +0,0 @@ -[BUILDDEB] -split = True diff --git a/.bzrignore b/.bzrignore deleted file mode 100644 index 317a187..0000000 --- a/.bzrignore +++ /dev/null @@ -1,114 +0,0 @@ -data/indicator-application.service -compile -m4/ -src/indicator-application-service -src/libappindicator.la -src/libappindicator_la-indicator-application.lo -src/notification-watcher-client.h -src/notification-watcher-server.h -src/libappindicator.la -src/libappindicator_la-application-indicator.lo -src/application-indicator-enum-types.h -src/application-indicator-enum-types.c -src/stamp-enum-types -src/libappindicator_la-application-indicator-enum-types.lo -tests/.deps -tests/.libs -tests/libappindicator-check-results.xml -tests/libappindicator-check-results.html -tests/test-libappindicator -tests/test-libappindicator-dbus-client -tests/test-libappindicator-dbus-server -tests/libappindicator-tests -tests/test-libappindicator-dbus -src/gen-application-service.xml.c -src/gen-application-service.xml.h -src/application-service-server.h -src/application-service-marshal.c -src/application-service-marshal.h -src/stamp-marshal -tests/test-simple-app -example/.deps -example/.libs -example/simple-client -src/libappindicator_la-application-service-marshal.lo -tests/libappindicator-tests-gtester -src/libappindicator_la-app-indicator-enum-types.lo -src/libappindicator_la-app-indicator.lo -src/libapplication.la -src/libapplication_la-application-service-marshal.lo -src/libapplication_la-indicator-application.lo -src/app-indicator-enum-types.c -src/app-indicator-enum-types.h -gtk-doc.make -py-compile -bindings/mono/appindicator-sharp-0.1.pc -bindings/mono/appindicator-sharp.dll -bindings/mono/appindicator-sharp.dll.config -bindings/mono/generated -bindings/mono/generated-stamp -bindings/mono/libappindicator-api.raw -bindings/mono/libappindicator-api.xml -bindings/mono/examples/indicator-example -bindings/python/.deps -bindings/python/.libs -bindings/python/_appindicator.la -bindings/python/appindicator.c -bindings/python/appindicator.lo -bindings/python/appindicatormodule.lo -docs/reference/.libs -docs/reference/gtkdoc-in-srcdir -docs/reference/html -docs/reference/html-build.stamp -docs/reference/html.stamp -docs/reference/libappindicator-decl-list.txt -docs/reference/libappindicator-decl.txt -docs/reference/libappindicator-docs.sgml -docs/reference/libappindicator-overrides.txt -docs/reference/libappindicator-undeclared.txt -docs/reference/libappindicator-undocumented.txt -docs/reference/libappindicator-unused.txt -docs/reference/libappindicator.args -docs/reference/libappindicator.hierarchy -docs/reference/libappindicator.interfaces -docs/reference/libappindicator.prerequisites -docs/reference/libappindicator.signals -docs/reference/scan-build.stamp -docs/reference/sgml-build.stamp -docs/reference/sgml.stamp -docs/reference/tmpl-build.stamp -docs/reference/tmpl.stamp -docs/reference/version.xml -docs/reference/xml -docs/reference/tmpl/app-indicator.sgml -docs/reference/tmpl/app-indicator.sgml.bak -src/appindicator-0.1.pc -tests/test-libappindicator-fallback-item -tests/test-libappindicator-fallback-watcher -tests/test-libappindicator-fallback -tests/test-libappindicator-status -tests/test-libappindicator-status-client -tests/test-libappindicator-status-server -bindings/mono/AppIndicator.Test.dll -bindings/mono/libappindicator-api.middle -bindings/mono/examples/IndicatorExample.exe -src/app-indicator-enum-types.gen.c -indicator-application-[0-9].[0-9].[0-9].tar.gz -indicator-application-[0-9].[0-9].[0-9].tar.gz.asc -indicator-application-[0-9].[0-9].[0-9][0-9].tar.gz -indicator-application-[0-9].[0-9].[0-9][0-9].tar.gz.asc -m4/gtk-doc.m4 -src/AppIndicator-0.1.gir -src/AppIndicator-0.1.typelib -docs/reference/libappindicator-decl.txt.bak -docs/reference/libappindicator-decl-list.txt.bak -src/AppIndicator-0.1.vapi -bindings/mono/policy.appindicator-sharp.dll -tests/test-approver -tests/test-approver-tester -bindings/mono/policy.0.0.appindicator-sharp.config -bindings/mono/policy.0.0.appindicator-sharp.dll -src/libapplication_la-generate-id.lo -src/libappindicator_la-generate-id.lo -indicator-application.conf -indicator-application.desktop diff --git a/Makefile.am b/Makefile.am index 599dfdc..4c4f5b3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -8,30 +8,29 @@ EXTRA_DIST = \ DISTCHECK_CONFIGURE_FLAGS = --enable-localinstall dist-hook: - @if test -d "$(top_srcdir)/.bzr"; \ - then \ - echo Creating ChangeLog && \ - ( cd "$(top_srcdir)" && \ - echo '# Generated by Makefile. Do not edit.'; echo; \ - $(top_srcdir)/missing --run bzr log --gnu-changelog ) > ChangeLog.tmp \ - && mv -f ChangeLog.tmp $(top_distdir)/ChangeLog \ - || (rm -f ChangeLog.tmp; \ - echo Failed to generate ChangeLog >&2 ); \ - else \ - echo Failed to generate ChangeLog: not a branch >&2; \ + @if test -d "$(top_srcdir)/.git"; \ + then \ + echo Creating ChangeLog && \ + ( cd "$(top_srcdir)" && \ + echo '# Generated by Makefile. Do not edit.'; echo; \ + $(top_srcdir)/missing --run git --no-pager log --since "1970" --format="%ai %aN (%h) %n%n%x09*%w(68,0,10) %s%d%n") > ChangeLog.tmp \ + && mv -f ChangeLog.tmp $(top_distdir)/ChangeLog \ + || (rm -f ChangeLog.tmp; \ + echo Failed to generate ChangeLog >&2 ); \ + else \ + echo Failed to generate ChangeLog: not a branch >&2; \ fi - @if test -d "$(top_srcdir)/.bzr"; \ - then \ - echo Creating AUTHORS && \ - ( cd "$(top_srcdir)" && \ - echo '# Generated by Makefile. Do not edit.'; echo; \ - $(top_srcdir)/missing --run bzr log --long --levels=0 | grep -e "^\s*author:" -e "^\s*committer:" | cut -d ":" -f 2 | cut -d "<" -f 1 | sort -u) > AUTHORS.tmp \ - && mv -f AUTHORS.tmp $(top_distdir)/AUTHORS \ - || (rm -f AUTHORS.tmp; \ - echo Failed to generate AUTHORS >&2 ); \ - else \ - echo Failed to generate AUTHORS: not a branch >&2; \ + @if test -d "$(top_srcdir)/.git"; \ + then \ + echo Creating AUTHORS && \ + ( cd "$(top_srcdir)" && \ + echo '# Generated by Makefile. Do not edit.'; echo; \ + $(top_srcdir)/missing --run git log | grep -e "^Author:" -e "Committer:" | cut -d ":" -f 2 | cut -d "<" -f 1 | sort -u) > AUTHORS.tmp \ + && mv -f AUTHORS.tmp $(top_distdir)/AUTHORS \ + || (rm -f AUTHORS.tmp; \ + echo Failed to generate AUTHORS >&2 ); \ + else \ + echo Failed to generate AUTHORS: not a branch >&2; \ fi - include $(top_srcdir)/Makefile.am.coverage diff --git a/configure.ac b/configure.ac index d49a986..167f1d6 100644 --- a/configure.ac +++ b/configure.ac @@ -1,17 +1,19 @@ -AC_INIT(indicator-application, 12.10.0, ted@canonical.com) -AC_COPYRIGHT([Copyright 2009, 2010 Canonical]) +AC_INIT(ayatana-indicator-application, 0.5.1, mike.gabriel@das-netzwerkteam.de) +AC_COPYRIGHT([Copyright 2009, 2010 Canonical +Copyright 2015 Arctica Project]) AC_PREREQ(2.53) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(indicator-application, 12.10.0) +AM_INIT_AUTOMAKE(ayatana-indicator-application, 0.5.1) AM_MAINTAINER_MODE AC_ISC_POSIX AC_PROG_CC AM_PROG_CC_C_O +AM_PROG_AR AC_STDC_HEADERS AC_PROG_LIBTOOL @@ -32,21 +34,21 @@ PKG_PROG_PKG_CONFIG GLIB_REQUIRED_VERSION=2.35.4 GTK_REQUIRED_VERSION=3.0.0 GIO_REQUIRED_VERSION=2.26 -INDICATOR_REQUIRED_VERSION=0.3.5 +INDICATOR_REQUIRED_VERSION=0.6.0 DBUSMENUGTK_REQUIRED_VERSION=0.5.90 JSON_GLIB_REQUIRED_VERSION=0.7.6 DBUS_GLIB_REQUIRED_VERSION=0.82 -LIBAPPINDICATOR_REQUIRED_VERSION=0.2.9 +LIBAPPINDICATOR_REQUIRED_VERSION=0.5.0 PKG_CHECK_MODULES(INDICATOR, glib-2.0 >= $GLIB_REQUIRED_VERSION gio-2.0 >= $GIO_REQUIRED_VERSION gtk+-3.0 >= $GTK_REQUIRED_VERSION - indicator3-0.4 >= $INDICATOR_REQUIRED_VERSION + ayatana-indicator3-0.4 >= $INDICATOR_REQUIRED_VERSION json-glib-1.0 >= $JSON_GLIB_REQUIRED_VERSION dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION dbusmenu-gtk3-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION) -PKG_CHECK_MODULES(APPINDICATOR, appindicator3-0.1 >= $LIBAPPINDICATOR_REQUIRED_VERSION) +PKG_CHECK_MODULES(APPINDICATOR, ayatana-appindicator3-0.1 >= $LIBAPPINDICATOR_REQUIRED_VERSION) ########################### # gcov coverage reporting @@ -76,14 +78,14 @@ AC_ARG_ENABLE(localinstall, AS_HELP_STRING([--enable-localinstall], [install all ########################### if test "x$with_localinstall" = "xyes"; then - INDICATORDIR="${libdir}/indicators/2/" - INDICATORICONSDIR="${datadir}/libindicate/icons/" + INDICATORDIR="${libdir}/ayatana-indicators/2/" + INDICATORICONSDIR="${datadir}/libayatana-indicate/icons/" elif test "x$with_gtk" = x2; then - INDICATORDIR=`$PKG_CONFIG --variable=indicatordir indicator-0.4` - INDICATORICONSDIR=`$PKG_CONFIG --variable=iconsdir indicator-0.4` + INDICATORDIR=`$PKG_CONFIG --variable=indicatordir ayatana-indicator-0.4` + INDICATORICONSDIR=`$PKG_CONFIG --variable=iconsdir ayatana-indicator-0.4` else - INDICATORDIR=`$PKG_CONFIG --variable=indicatordir indicator3-0.4` - INDICATORICONSDIR=`$PKG_CONFIG --variable=iconsdir indicator3-0.4` + INDICATORDIR=`$PKG_CONFIG --variable=indicatordir ayatana-indicator3-0.4` + INDICATORICONSDIR=`$PKG_CONFIG --variable=iconsdir ayatana-indicator3-0.4` fi AC_SUBST(INDICATORDIR) AC_SUBST(INDICATORICONSDIR) diff --git a/data/Makefile.am b/data/Makefile.am index b26a669..bc5260d 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -2,13 +2,13 @@ SUBDIRS = upstart upstart_jobsdir = $(datadir)/upstart/sessions/ -upstart_jobs_DATA = indicator-application.conf +upstart_jobs_DATA = ayatana-indicator-application.conf %.conf: %.conf.in $(AM_V_GEN) sed -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@ xdg_autostartdir = /etc/xdg/autostart -xdg_autostart_DATA = indicator-application.desktop +xdg_autostart_DATA = ayatana-indicator-application.desktop %.desktop: %.desktop.in $(AM_V_GEN) sed -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@ @@ -17,11 +17,11 @@ overridedir = $(pkgdatadir) override_DATA = ordering-override.keyfile EXTRA_DIST = \ - indicator-application.desktop.in \ - indicator-application.conf.in \ + ayatana-indicator-application.desktop.in \ + ayatana-indicator-application.conf.in \ ordering-override.keyfile CLEANFILES = \ - indicator-application.conf \ - indicator-application.desktop + ayatana-indicator-application.conf \ + ayatana-indicator-application.desktop diff --git a/data/ayatana-indicator-application.conf.in b/data/ayatana-indicator-application.conf.in new file mode 100644 index 0000000..07a7d05 --- /dev/null +++ b/data/ayatana-indicator-application.conf.in @@ -0,0 +1,22 @@ +description "Indicator Application Service" + +start on indicator-services-start +stop on desktop-end or indicator-services-end + +emits appindicators-start appindicators-end + +respawn +respawn limit 2 10 + +pre-start script + # NOTE: Limiting only to Unity 7 right now as it's still using + # dbusmenu. That can be lifted after it is ported to GMenu + + if [ "x$DESKTOP_SESSION" = "xubuntu-touch" ] ; then + stop; exit 0 + fi +end script + +exec @pkglibexecdir@/indicator-application-service + +pre-stop exec initctl emit appindicators-end diff --git a/data/ayatana-indicator-application.desktop.in b/data/ayatana-indicator-application.desktop.in new file mode 100644 index 0000000..4f5bf98 --- /dev/null +++ b/data/ayatana-indicator-application.desktop.in @@ -0,0 +1,8 @@ +[Desktop Entry] +Type=Application +Name=Indicator Application +Exec=@pkglibexecdir@/indicator-application-service +StartupNotify=false +Terminal=false +OnlyShowIn=Unity;GNOME; +AutostartCondition=GNOME3 unless-session gnome diff --git a/data/indicator-application.conf.in b/data/indicator-application.conf.in deleted file mode 100644 index 07a7d05..0000000 --- a/data/indicator-application.conf.in +++ /dev/null @@ -1,22 +0,0 @@ -description "Indicator Application Service" - -start on indicator-services-start -stop on desktop-end or indicator-services-end - -emits appindicators-start appindicators-end - -respawn -respawn limit 2 10 - -pre-start script - # NOTE: Limiting only to Unity 7 right now as it's still using - # dbusmenu. That can be lifted after it is ported to GMenu - - if [ "x$DESKTOP_SESSION" = "xubuntu-touch" ] ; then - stop; exit 0 - fi -end script - -exec @pkglibexecdir@/indicator-application-service - -pre-stop exec initctl emit appindicators-end diff --git a/data/indicator-application.desktop.in b/data/indicator-application.desktop.in deleted file mode 100644 index 4f5bf98..0000000 --- a/data/indicator-application.desktop.in +++ /dev/null @@ -1,8 +0,0 @@ -[Desktop Entry] -Type=Application -Name=Indicator Application -Exec=@pkglibexecdir@/indicator-application-service -StartupNotify=false -Terminal=false -OnlyShowIn=Unity;GNOME; -AutostartCondition=GNOME3 unless-session gnome diff --git a/data/upstart/Makefile.am b/data/upstart/Makefile.am index f7bc09e..6866ed0 100644 --- a/data/upstart/Makefile.am +++ b/data/upstart/Makefile.am @@ -1,9 +1,9 @@ xdg_autostartdir = $(pkgdatadir)/upstart/xdg/autostart -xdg_autostart_DATA = indicator-application.desktop +xdg_autostart_DATA = ayatana-indicator-application.desktop %.desktop: %.desktop.in sed -e "s|\@libexecdir\@|$(pkglibexecdir)|" $< > $@ EXTRA_DIST = \ - indicator-application.desktop.in + ayatana-indicator-application.desktop.in diff --git a/data/upstart/ayatana-indicator-application.desktop.in b/data/upstart/ayatana-indicator-application.desktop.in new file mode 100644 index 0000000..f4c6c27 --- /dev/null +++ b/data/upstart/ayatana-indicator-application.desktop.in @@ -0,0 +1,8 @@ +[Desktop Entry] +Type=Application +Name=Indicator Application +Exec=@pkglibexecdir@/indicator-application-service +StartupNotify=false +Terminal=false +OnlyShowIn=Unity; +Hidden=true diff --git a/data/upstart/indicator-application.desktop.in b/data/upstart/indicator-application.desktop.in deleted file mode 100644 index f4c6c27..0000000 --- a/data/upstart/indicator-application.desktop.in +++ /dev/null @@ -1,8 +0,0 @@ -[Desktop Entry] -Type=Application -Name=Indicator Application -Exec=@pkglibexecdir@/indicator-application-service -StartupNotify=false -Terminal=false -OnlyShowIn=Unity; -Hidden=true diff --git a/debian/changelog b/debian/changelog index 9b0072b..afba493 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +ayatana-indicator-application (0.5.1-0) UNRELEASED; urgency=medium + + * Fork from Ubuntu's indicator-application code project. + + -- Mike Gabriel Wed, 11 Nov 2015 05:47:58 +0100 + indicator-application (12.10.1+15.04.20150128-0ubuntu1) vivid; urgency=low [ Ted Gould ] diff --git a/debian/control b/debian/control index f609449..9b5901e 100644 --- a/debian/control +++ b/debian/control @@ -1,9 +1,8 @@ -Source: indicator-application +Source: ayatana-indicator-application Section: gnome Priority: optional -Maintainer: Ubuntu Desktop Team +Maintainer: Mike Gabriel Build-Depends: debhelper (>= 9.0), - dh-translations, dh-autoreconf, dbus-test-runner, gnome-common, @@ -13,22 +12,18 @@ Build-Depends: debhelper (>= 9.0), libdbus-glib-1-dev (>= 0.82), libjson-glib-dev, intltool, - libappindicator3-dev (>= 0.2.91), - libindicator3-dev (>= 0.3.90), + libayatana-appindicator3-dev (>= 0.5.0~), + libayatana-indicator3-dev (>= 0.6.0~), libdbusmenu-glib-dev (>= 0.5.90), libdbusmenu-gtk3-dev (>= 0.5.90), -Standards-Version: 3.9.3 -Homepage: https://launchpad.net/indicator-application -# If you aren't a member of ~indicator-applet-developers but need to upload -# packaging changes, just go ahead. ~indicator-applet-developers will notice -# and sync up the code again. -Vcs-Bzr: https://code.launchpad.net/~indicator-applet-developers/indicator-application/trunk.13.04 -Vcs-Browser: https://bazaar.launchpad.net/~indicator-applet-developers/indicator-application/trunk.13.04/files +Standards-Version: 3.9.6 +Homepage: https://github.com/ArcticaProject/ayatana-indicator-application +Vcs-Git: git://cgit.arctica-project.org/ayatana/ayatana-indicator-application.git +Vcs-Browser: https://cgit.arctica-project.org/ayatana/ayatana-indicator-application.git/ -Package: indicator-application +Package: ayatana-indicator-application Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, -Description: Application Indicators +Description: Ayatana Application Indicators An indicator to take menus from applications and place them in the panel. - diff --git a/debian/rules b/debian/rules index e3385df..16b5da6 100755 --- a/debian/rules +++ b/debian/rules @@ -3,12 +3,12 @@ export DPKG_GENSYMBOLS_CHECK_LEVEL=4 %: - dh $@ --with translations,autoreconf + dh $@ --with autoreconf override_dh_autoreconf: NOCONFIGURE=1 dh_autoreconf ./autogen.sh override_dh_install: - find debian/indicator-application/usr/lib -name *.la -delete - find debian/indicator-application/usr/lib -name *.a -delete + find debian/ayatana-indicator-application/usr/lib -name *.la -delete + find debian/ayatana-indicator-application/usr/lib -name *.a -delete dh_install --fail-missing diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..9f8e9b6 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +1.0 \ No newline at end of file diff --git a/debian/watch b/debian/watch deleted file mode 100644 index ffb0b21..0000000 --- a/debian/watch +++ /dev/null @@ -1,2 +0,0 @@ -version=3 -http://launchpad.net/indicator-application/+download .*/indicator-application-([0-9.]+)\.tar\.gz 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