Merge lp:~3v1n0/libappindicator/discord-indicator-crash-fix into lp:libappindicator/16.10

[Marco Trevisan (Treviño)]

[Marco Trevisan (Treviño) (3v1n0)]

review: Approve

[lp:~3v1n0/libappindicator/discord-indicator-crash-fix]

294. By William Grant on 2020-04-08

Disable mono on riscv64 too

295. By Paul G <Unknown> on 2020-04-08

app-indicator: Don't pass unexpected parameter to signal emissions

cleaned up all g_signal_emit and g_signal_new calls so they correspond with
each other and make sense.

No external API changes.

LP: #1867996

296. By Ash Holland <Unknown> on 2020-04-08

app-indicator: Only check for item numbers when iterating array

297. By Marco Trevisan (Treviño) on 2020-04-08

Update changelog

Unmerged revisions

297. By Marco Trevisan (Treviño) on 2020-04-08

Update changelog

296. By Ash Holland <Unknown> on 2020-04-08

app-indicator: Only check for item numbers when iterating array

295. By Paul G <Unknown> on 2020-04-08

app-indicator: Don't pass unexpected parameter to signal emissions

cleaned up all g_signal_emit and g_signal_new calls so they correspond with
each other and make sense.

No external API changes.

LP: #1867996

294. By William Grant on 2020-04-08

Disable mono on riscv64 too

293. By Sebastien Bacher on 2019-12-17

releasing package libappindicator version 12.10.1+18.04.20180322.1-0ubuntu5

292. By Jeremy Bícha on 2019-12-17

Drop python-appindicator and gir1.2-appindicator-0.1 packages
(LP: #1740637)

291. By Sebastien Bacher on 2019-12-17

releasing package libappindicator version 12.10.1+18.04.20180322.1-0ubuntu4

290. By Dimitri John Ledkov on 2019-02-20

releasing package libappindicator version 12.10.1+18.04.20180322.1-0ubuntu2

289. By Dimitri John Ledkov on 2019-02-20

Vendorize indicator-desktop-shortcuts (convenience wrapper around
gdesktopappinfo) from libindicator project, to drop the dependency on
libindicator as none of the rest of it is used.

288. By CI Train Bot Account on 2018-03-22

Releasing 12.10.1+18.04.20180322.1-0ubuntu1

=== modified file 'bindings/Makefile.am'
--- bindings/Makefile.am	2012-06-10 07:32:04 +0000
+++ bindings/Makefile.am	2020-04-08 18:54:42 +0000
@@ -1,10 +1,7 @@
+SUBDIRS =
+
 if USE_GTK3
-SUBDIRS =	\
-	vala
-else
-SUBDIRS =		\
-	python		\
-	vala
+SUBDIRS += vala
 endif
 
 if HAS_MONO

=== removed directory 'bindings/python'
=== removed file 'bindings/python/Makefile.am'
=== removed file 'bindings/python/__init__.py'
=== removed file 'bindings/python/appindicator-arg-types.py'
=== removed file 'bindings/python/appindicator.defs'
=== removed file 'bindings/python/appindicator.override.in'
=== removed file 'bindings/python/appindicatormodule.c'
=== modified file 'configure.ac'
--- configure.ac	2013-01-29 17:50:13 +0000
+++ configure.ac	2020-04-08 18:54:42 +0000
@@ -44,7 +44,6 @@
 GTK3_REQUIRED_VERSION=2.91
 GLIB_REQUIRED_VERSION=2.35.4
 GIO_REQUIRED_VERSION=2.26
-INDICATOR_REQUIRED_VERSION=0.4.93
 DBUSMENUGTK_REQUIRED_VERSION=0.5.90
 DBUS_GLIB_REQUIRED_VERSION=0.82
 
@@ -56,16 +55,16 @@
 AS_IF([test "x$with_gtk" = x3],
         [PKG_CHECK_MODULES(LIBRARY,  gtk+-3.0 >= $GTK3_REQUIRED_VERSION
                                      glib-2.0 >= $GLIB_REQUIRED_VERSION
+                                     gio-unix-2.0
                                      gio-2.0 >= $GIO_REQUIRED_VERSION
-                                     indicator3-0.4 >= $INDICATOR_REQUIRED_VERSION
                                      dbusmenu-gtk3-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION)
          AC_DEFINE(HAVE_GTK3, 1, [whether gtk3 is available])
         ],
       [test "x$with_gtk" = x2],
         [PKG_CHECK_MODULES(LIBRARY,  gtk+-2.0 >= $GTK_REQUIRED_VERSION
                                      glib-2.0 >= $GLIB_REQUIRED_VERSION
+                                     gio-unix-2.0
                                      gio-2.0 >= $GIO_REQUIRED_VERSION
-                                     indicator-0.4 >= $INDICATOR_REQUIRED_VERSION
                                      dbusmenu-gtk-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION)
         ],
       [AC_MSG_FAILURE([Value for --with-gtk was neither 2 nor 3])]
@@ -121,7 +120,7 @@
       RUNTIME=mono
    fi
 
-   AC_PATH_PROG(CSC, gmcs, no)
+   AC_PATH_PROG(CSC, mono-csc, no)
    LIB_PREFIX=.so
    LIB_SUFFIX=
 fi
@@ -181,33 +180,6 @@
 with_localinstall="no"
 AC_ARG_ENABLE(localinstall, AS_HELP_STRING([--enable-localinstall], [install all of the files localy instead of system directories (for distcheck)]), with_localinstall=$enableval, with_localinstall=no)
 
-###########################
-# Python
-###########################
-
-PYGTK_REQUIRED=2.14.0
-PYGOBJECT_REQUIRED=0.22
-
-AM_PATH_PYTHON(2.3.5)
-AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR(could not find Python headers)])
-
-PKG_CHECK_MODULES(APPINDICATOR_PYTHON,
-                  [
-					pygtk-2.0 >= $PYGTK_REQUIRED
-					gtk+-2.0 >= $GTK_REQUIRED_VERSION
-					pygobject-2.0 >= $PYGOBJECT_REQUIRED
-                  ])
-
-AC_MSG_CHECKING(for pygtk defs)
-PYGTK_DEFSDIR=`$PKG_CONFIG --variable=defsdir pygtk-2.0`
-AC_SUBST(PYGTK_DEFSDIR)
-AC_MSG_RESULT($PYGTK_DEFSDIR)
-
-AC_MSG_CHECKING(for pygtk codegen)
-PYGTK_CODEGEN="$PYTHON `$PKG_CONFIG --variable=codegendir pygtk-2.0`/codegen.py"
-AC_SUBST(PYGTK_CODEGEN)
-AC_MSG_RESULT($PYGTK_CODEGEN)
-
 #########################
 # Check if build tests
 #########################
@@ -239,8 +211,6 @@
 src/appindicator-0.1.pc
 src/appindicator3-0.1.pc
 bindings/Makefile
-bindings/python/Makefile
-bindings/python/appindicator.override
 bindings/vala/Makefile
 bindings/vala/examples/Makefile
 tests/Makefile

=== modified file 'debian/changelog'
--- debian/changelog	2016-09-05 18:32:14 +0000
+++ debian/changelog	2020-04-08 18:54:42 +0000
@@ -1,3 +1,91 @@
+libappindicator (12.10.1+18.04.20180322.1-0ubuntu7) UNRELEASED; urgency=medium
+
+  [ Paul G ]
+  * app-indicator: Don't pass unexpected parameter to signal emissions
+    (LP: #1867996)
+
+  [ Ash Holland ]
+  * app-indicator: Only check for item numbers when iterating array
+    (LP: #1867996)
+
+ -- Marco Trevisan (Treviño) <[e-mail]>  Wed, 08 Apr 2020 17:55:12 +0200
+
+libappindicator (12.10.1+18.04.20180322.1-0ubuntu6) focal; urgency=medium
+
+  * Disable mono on riscv64 too.
+
+ -- William Grant <[e-mail]>  Mon, 06 Apr 2020 18:15:21 +1000
+
+libappindicator (12.10.1+18.04.20180322.1-0ubuntu5) focal; urgency=medium
+
+  * configure.ac: require gio-unix-2.0, it's need for gdesktopappinfo
+    which was added in one of the recent uploads
+
+  [ Jeremy Bicha ]
+  * Drop python-appindicator and gir1.2-appindicator-0.1 packages
+    (LP: #1740637)
+
+ -- Sebastien Bacher <[e-mail]>  Tue, 17 Dec 2019 15:36:01 +0100
+
+libappindicator (12.10.1+18.04.20180322.1-0ubuntu4) eoan; urgency=medium
+
+  * Don't build with -Werror.
+  * Drop hard coded dependency on multiarch-support.
+
+ -- Matthias Klose <[e-mail]>  Sun, 01 Sep 2019 05:58:07 +0200
+
+libappindicator (12.10.1+18.04.20180322.1-0ubuntu2) disco; urgency=medium
+
+  * Vendorize indicator-desktop-shortcuts (convenience wrapper around
+    gdesktopappinfo) from libindicator project, to drop the dependency on
+    libindicator as none of the rest of it is used.
+
+ -- Dimitri John Ledkov <[e-mail]>  Thu, 21 Feb 2019 00:40:40 +0100
+
+libappindicator (12.10.1+18.04.20180322.1-0ubuntu1) bionic; urgency=medium
+
+  [ Unit 193 ]
+  * Have -dev package depend on libgtk2.0-dev or libgk-3-dev according
+    to its pkgconfig file (LP: #1757574) (LP: #1757574)
+
+ -- Jeremy Bicha <[e-mail]>  Thu, 22 Mar 2018 01:16:11 +0000
+
+libappindicator (12.10.1+18.04.20180320-0ubuntu1) bionic; urgency=medium
+
+  [ Olivier Tilloy ]
+  * Fix build failures on bionic, (LP: #1757121)
+
+ -- Marco Trevisan (Treviño) <[e-mail]>  Tue, 20 Mar 2018 12:48:14 +0000
+
+libappindicator (12.10.1+17.04.20170215-0ubuntu2) artful; urgency=medium
+
+  * debian/control:
+    - Downgrade libappindicator* recommending the indicator-application
+      service to suggests. Only some sessions wants it, while we still
+      link against the lib in multiple apps.
+
+ -- Didier Roche <[e-mail]>  Wed, 19 Jul 2017 13:28:58 +0200
+
+libappindicator (12.10.1+17.04.20170215-0ubuntu1) zesty; urgency=medium
+
+  * app-indicator: don't append the snap prefix if the icon is saved in
+    a well known readable path
+
+ -- Marco Trevisan (Treviño) <[e-mail]>  Wed, 15 Feb 2017 14:16:09 +0000
+
+libappindicator (12.10.1+17.04.20170213-0ubuntu1) zesty; urgency=medium
+
+  * AppIndicator: don't emit label cahanges when guide is still empty
+
+ -- Marco Trevisan (Treviño) <[e-mail]>  Mon, 13 Feb 2017 17:16:38 +0000
+
+libappindicator (12.10.1+17.04.20161129-0ubuntu1) zesty; urgency=medium
+
+  * AppIndicator: fix icon and theme paths when running in $SNAP
+    environment (LP: #1600136)
+
+ -- Marco Trevisan (Treviño) <[e-mail]>  Tue, 29 Nov 2016 18:04:06 +0000
+
 libappindicator (12.10.1+16.10.20160905-0ubuntu1) yakkety; urgency=medium
 
   [ Alberts Muktupāvels ]

=== modified file 'debian/control'
--- debian/control	2013-12-19 14:37:54 +0000
+++ debian/control	2020-04-08 18:54:42 +0000
@@ -1,31 +1,27 @@
 Source: libappindicator
 Section: gnome
 Priority: optional
-XS-Python-Version: all
 Maintainer: Ubuntu Desktop Team <[e-mail]>
 Build-Depends: debhelper (>= 9),
                dh-autoreconf,
-               python-all-dev,
                at-spi2-core,
-               cli-common-dev (>= 0.5.7) [!arm64 !ppc64el],
+               cli-common-dev (>= 0.5.7) [!arm64 !ppc64el !riscv64],
+               gnome-common,
                gobject-introspection,
                intltool,
                gtk-doc-tools,
                libxml2-utils,
-               libnunit-cil-dev [!arm64 !ppc64el],
+               libnunit-cil-dev [!arm64 !ppc64el !riscv64],
                dbus-test-runner,
                xvfb,
                valac,
-               mono-devel (>= 2.4.3) [!arm64 !ppc64el],
+               mono-devel (>= 2.4.3) [!arm64 !ppc64el !riscv64],
                libglib2.0-dev (>= 2.35.4),
                libgtk-3-dev (>= 2.91.3),
                libgtk2.0-dev (>= 2.12.0),
-               python-gtk2-dev,
-               gtk-sharp2-gapi [!arm64 !ppc64el],
-               libgtk2.0-cil-dev [!arm64 !ppc64el],
+               gtk-sharp2-gapi [!arm64 !ppc64el !riscv64],
+               libgtk2.0-cil-dev [!arm64 !ppc64el !riscv64],
                libdbus-glib-1-dev (>= 0.82),
-               libindicator-dev (>= 0.3.90),
-               libindicator3-dev (>= 0.3.90),
                libdbusmenu-glib-dev (>= 0.5.90),
                libdbusmenu-gtk-dev (>= 0.5.90),
                libdbusmenu-gtk3-dev (>= 0.5.90),
@@ -35,54 +31,29 @@
 # 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/libappindicator/trunk.13.04
-Vcs-Browser: https://bazaar.launchpad.net/~indicator-applet-developers/libappindicator/trunk.13.04/files
-
-Package: python-appindicator
-Section: python
-Architecture: any
-XB-Python-Version: ${python:Versions}
-Depends: ${shlibs:Depends},
-         ${misc:Depends},
-         ${python:Depends},
-         libappindicator1 (= ${binary:Version}),
-         python-gobject,
-Provides: ${python:Provides},
-Description: Python bindings for libappindicator
- This package provides Python bindings so that you can use libappindicator from 
- a Python program.
+Vcs-Bzr: https://code.launchpad.net/~indicator-applet-developers/libappindicator/trunk.16.10
+Vcs-Browser: https://bazaar.launchpad.net/~indicator-applet-developers/libappindicator/trunk.16.10/files
 
 Package: libappindicator1
 Section: libs
 Architecture: any
-Pre-Depends: multiarch-support,
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-Recommends: indicator-application (>= 0.2.93),
+Suggests: indicator-application (>= 0.2.93),
 Description: Application Indicators
  A library and indicator to take menus from applications and place them in
  the panel.
  .
  This package contains shared libraries to be used by applications.
 
-Package: gir1.2-appindicator-0.1
-Section: introspection
-Architecture: any
-Depends: ${misc:Depends},
-         ${gir:Depends},
-Description: Typelib files for libappindicator1.
- .
- This package can be used by other packages using the GIRepository format
- to generate dynamic bindings.
-
 Package: libappindicator-dev
 Section: libdevel
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-         gir1.2-appindicator-0.1 (= ${binary:Version}),
          libdbusmenu-glib-dev (>= 0.1.8),
          libdbus-glib-1-dev (>= 0.76),
+         libgtk2.0-dev,
          libappindicator1 (= ${binary:Version}),
 Description: Application Indicators
  A library and indicator to take menus from applications and place them in
@@ -103,10 +74,9 @@
 Package: libappindicator3-1
 Section: libs
 Architecture: any
-Pre-Depends: multiarch-support,
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-Recommends: indicator-application (>= 0.2.93),
+Suggests: indicator-application (>= 0.2.93),
 Description: Application Indicators
  A library and indicator to take menus from applications and place them in
  the panel.
@@ -121,6 +91,7 @@
          gir1.2-appindicator3-0.1 (= ${binary:Version}),
          libdbusmenu-glib-dev (>= 0.1.8),
          libdbus-glib-1-dev (>= 0.76),
+         libgtk-3-dev,
          libappindicator3-1 (= ${binary:Version}),
 Description: Application Indicators
  A library and indicator to take menus from applications and place them in

=== removed file 'debian/gir1.2-appindicator-0.1.install'
=== modified file 'debian/libappindicator-dev.install'
--- debian/libappindicator-dev.install	2012-11-27 02:18:17 +0000
+++ debian/libappindicator-dev.install	2020-04-08 18:54:42 +0000
@@ -1,5 +1,3 @@
 usr/include/libappindicator-0.1/*
 usr/lib/*/libappindicator.so
 usr/lib/*/pkgconfig/appindicator-0.1.pc
-usr/share/gir-1.0/AppIndicator-0.1.gir
-usr/share/vala/vapi/appindicator-0.1.vapi

=== removed file 'debian/python-appindicator.install'
=== modified file 'debian/rules' (properties changed: +x to -x)
--- debian/rules	2013-12-19 14:37:54 +0000
+++ debian/rules	2020-04-08 18:54:42 +0000
@@ -1,13 +1,12 @@
 #!/usr/bin/make -f
 
 FLAVORS = gtk2 gtk3
-PY_VERSIONS = $(shell pyversions --requested debian/control)
 API_VERSION = 0.1
 
 DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH)
 
 CONFIGURE_COMMON_FLAGS = --disable-scrollkeeper --enable-introspection
-ifneq (,$(filter $(DEB_HOST_ARCH),arm64 ppc64el))
+ifneq (,$(filter $(DEB_HOST_ARCH),arm64 ppc64el riscv64))
   CONFIGURE_COMMON_FLAGS += --disable-mono-test
 else
   dh_extra_args = ,cli
@@ -15,14 +14,12 @@
 CONFIGURE_FLAGS_gtk2 = --with-gtk=2 --enable-gtk-doc
 CONFIGURE_FLAGS_gtk3 = --with-gtk=3 --enable-gtk-doc=no
 
-export CSC=/usr/bin/mono-csc
-
 export DPKG_GENSYMBOLS_CHECK_LEVEL = 4
 
 CFLAGS += -fPIC
 
 %:
-	dh $@ --with autoreconf,python2,gir$(dh_extra_args)
+	dh $@ --with autoreconf,gir$(dh_extra_args)
 
 override_dh_autoreconf:
 	NOCONFIGURE=1 dh_autoreconf ./autogen.sh
@@ -32,24 +29,16 @@
 doconfigure-%:
 	dh_auto_configure --builddirectory=build/$* -- $(CONFIGURE_FLAGS_$*) $(CONFIGURE_COMMON_FLAGS)
 
-doconfigure-gtk2: $(PY_VERSIONS:%=doconfiguregtk2-%)
-	# GTK2 flavor configure was run on a per-python-version basis.
-
 doconfiguregtk2-%:
-	PYTHON=`which $*` \
-		dh_auto_configure --builddirectory=build/gtk2 -- $(CONFIGURE_FLAGS_gtk2) $(CONFIGURE_COMMON_FLAGS)
+	dh_auto_configure --builddirectory=build/gtk2 -- $(CONFIGURE_FLAGS_gtk2) $(CONFIGURE_COMMON_FLAGS)
 
 override_dh_auto_build: $(FLAVORS:%=dobuild-%)
 
 dobuild-%:
 	dh_auto_build --builddirectory=build/$*
 
-dobuild-gtk2: $(PY_VERSIONS:%=dobuildgtk2-%)
-	# GTK2 flavor build was run on a per-python-version basis.
-
 dobuildgtk2-%:
-	PYTHON=`which $*` \
-		dh_auto_build --builddirectory=build/gtk2
+	dh_auto_build --builddirectory=build/gtk2
 
 override_dh_auto_install: $(FLAVORS:%=doinstall-%)
 
@@ -61,9 +50,7 @@
 	find debian/tmp -name \*.a -exec rm {} \;
 	rm -rf debian/tmp/*/usr/lib/mono
 	rm -rf debian/tmp/*/usr/share/vala/vapi/appindicator*-0.1.deps
-	dh_install -ppython-appindicator --fail-missing --sourcedir=debian/tmp/gtk2
 	dh_install -plibappindicator1 --fail-missing --sourcedir=debian/tmp/gtk2
-	dh_install -pgir1.2-appindicator-0.1 --fail-missing --sourcedir=debian/tmp/gtk2
 	dh_install -plibappindicator-dev --fail-missing --sourcedir=debian/tmp/gtk2
 	dh_install -plibappindicator-doc --fail-missing --sourcedir=debian/tmp/gtk2
 	dh_install -plibappindicator3-1 --fail-missing --sourcedir=debian/tmp/gtk3
@@ -77,15 +64,10 @@
 dotest-%:
 	dh_auto_test --builddirectory=build/$* --
 
-
-dotest-gtk2: $(PY_VERSIONS:%=dotestgtk2-%)
-	# GTK2 flavor test was run on a per-python-version basis.
-
 dotestgtk2-%:
 	ps -ef
 	env
-	PYTHON=`which $*` \
-		dh_auto_test --builddirectory=build/gtk2 --
+	dh_auto_test --builddirectory=build/gtk2 --
 
 override_dh_auto_clean:
 	dh_auto_clean

=== modified file 'docs/reference/Makefile.am'
--- docs/reference/Makefile.am	2013-06-08 04:26:37 +0000
+++ docs/reference/Makefile.am	2020-04-08 18:54:42 +0000
@@ -33,7 +33,7 @@
 DOC_SOURCE_DIR=$(top_srcdir)/src
 
 # Extra options to pass to gtkdoc-scangobj. Not normally needed.
-SCANGOBJ_OPTIONS=--nogtkinit --type-init-func="g_type_init()"
+SCANGOBJ_OPTIONS=--type-init-func="g_type_init()"
 
 # Extra options to supply to gtkdoc-scan.
 # e.g. SCAN_OPTIONS=--deprecated-guards="GTK_DISABLE_DEPRECATED"

=== modified file 'example/simple-client-vala.vala'
--- example/simple-client-vala.vala	2012-03-21 18:02:41 +0000
+++ example/simple-client-vala.vala	2020-04-08 18:54:42 +0000
@@ -104,7 +104,7 @@
 			print(@"Got scroll event! delta: $delta, direction: $direction\n");
 		});
 
-		Timeout.add_seconds(1, () => {
+		GLib.Timeout.add_seconds(1, () => {
 			percentage = (percentage + 1) % 100;
 			if (can_haz_label) {
 				ci.set_label(@"$(percentage+1)%", "");

=== modified file 'src/Makefile.am'
--- src/Makefile.am	2013-12-19 14:37:54 +0000
+++ src/Makefile.am	2020-04-08 18:54:42 +0000
@@ -62,6 +62,8 @@
 	dbus-shared.h \
 	generate-id.h \
 	generate-id.c \
+	indicator-desktop-shortcuts.c \
+	indicator-desktop-shortcuts.h \
 	gen-notification-item.xml.h \
 	gen-notification-item.xml.c \
 	gen-notification-watcher.xml.h \
@@ -71,12 +73,12 @@
 	$(COVERAGE_LDFLAGS) \
 	-version-info 1:0:0 \
 	-no-undefined \
-	-export-symbols-regex "^[^_d].*"
+	-export-symbols-regex "^app_indicator_.*"
 
 libappindicator_la_CFLAGS = \
 	$(LIBRARY_CFLAGS) \
 	$(COVERAGE_CFLAGS) \
-	-Wall -Werror -Wno-error=deprecated-declarations \
+	-Wall -Wno-error=deprecated-declarations \
 	-DG_LOG_DOMAIN=\"libappindicator\"
 
 libappindicator_la_LIBADD = \
@@ -153,29 +155,23 @@
 	$(addprefix $(srcdir)/,app-indicator.c) \
 	$(addprefix $(srcdir)/,$(libappindicator_headers))
 
-AppIndicator$(VER)-0.1.gir: libappindicator$(VER).la
+AppIndicator3-0.1.gir: libappindicator3.la
 
-AppIndicator_0_1_gir_INCLUDES = \
+AppIndicator3_0_1_gir_INCLUDES = \
     GObject-2.0 \
     $(GTKGIR)
-AppIndicator_0_1_gir_CFLAGS = $(LIBRARY_CFLAGS) -I$(srcdir) -I$(top_builddir)/src
-AppIndicator_0_1_gir_LIBS = libappindicator$(VER).la
-AppIndicator_0_1_gir_FILES = $(introspection_sources)
-# AppIndicator_0_1_gir_NAMESPACE = AppIndicator
-
-AppIndicator3_0_1_gir_INCLUDES = $(AppIndicator_0_1_gir_INCLUDES)
-AppIndicator3_0_1_gir_CFLAGS = $(AppIndicator_0_1_gir_CFLAGS)
-AppIndicator3_0_1_gir_LIBS = $(AppIndicator_0_1_gir_LIBS)
-AppIndicator3_0_1_gir_FILES = $(AppIndicator_0_1_gir_FILES)
+AppIndicator3_0_1_gir_CFLAGS = $(LIBRARY_CFLAGS) -I$(srcdir) -I$(top_builddir)/src
+AppIndicator3_0_1_gir_LIBS = libappindicator3.la
+AppIndicator3_0_1_gir_FILES = $(introspection_sources)
 # AppIndicator3_0_1_gir_NAMESPACE = AppIndicator
 
-INTROSPECTION_GIRS += AppIndicator$(VER)-0.1.gir
+INTROSPECTION_GIRS += AppIndicator3-0.1.gir
 
-AppIndicator$(VER)-0.1.metadata: AppIndicator$(VER)-0.1.gir
+AppIndicator3-0.1.metadata: AppIndicator3-0.1.gir
 	cp -f $(srcdir)/$@.in $@
 
-BUILT_SOURCES += AppIndicator$(VER)-0.1.metadata
-CLEANFILES += AppIndicator$(VER)-0.1.metadata
+BUILT_SOURCES += AppIndicator3-0.1.metadata
+CLEANFILES += AppIndicator3-0.1.metadata
 
 girdir = $(datadir)/gir-1.0
 gir_DATA = $(INTROSPECTION_GIRS)

=== modified file 'src/app-indicator.c'
--- src/app-indicator.c	2015-07-02 17:03:37 +0000
+++ src/app-indicator.c	2020-04-08 18:54:42 +0000
@@ -36,7 +36,9 @@
 #include <libdbusmenu-gtk/client.h>
 #include <libdbusmenu-gtk/parser.h>
 
-#include <libindicator/indicator-desktop-shortcuts.h>
+#include "indicator-desktop-shortcuts.h"
+
+#include <stdlib.h>
 
 #include "app-indicator.h"
 #include "app-indicator-enum-types.h"
@@ -71,8 +73,11 @@
 	AppIndicatorCategory  category;
 	AppIndicatorStatus    status;
 	gchar                *icon_name;
+	gchar                *absolute_icon_name;
 	gchar                *attention_icon_name;
+	gchar                *absolute_attention_icon_name;
 	gchar                *icon_theme_path;
+	gchar                *absolute_icon_theme_path;
 	DbusmenuServer       *menuservice;
 	GtkWidget            *menu;
 	GtkWidget            *sec_activate_target;
@@ -190,6 +195,8 @@
 static void status_icon_menu_activate (GtkStatusIcon *status_icon, guint button, guint activate_time, gpointer user_data);
 static void unfallback (AppIndicator * self, GtkStatusIcon * status_icon);
 static gchar * append_panel_icon_suffix (const gchar * icon_name);
+static gchar * get_real_theme_path (AppIndicator * self);
+static gchar * append_snap_prefix (const gchar * path);
 static void theme_changed_cb (GtkIconTheme * theme, gpointer user_data);
 static void sec_activate_target_parent_changed(GtkWidget *menuitem, GtkWidget *old_parent, gpointer   user_data);
 static GVariant * bus_get_prop (GDBusConnection * connection, const gchar * sender, const gchar * path, const gchar * interface, const gchar * property, GError ** error, gpointer user_data);
@@ -389,7 +396,7 @@
                                                              "An additional place to look for icon names that may be installed by the application.",
                                                              NULL,
                                                              G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | G_PARAM_CONSTRUCT));
-	
+
 	/**
 	 * AppIndicator:connected:
 	 * 
@@ -501,7 +508,7 @@
 	                                  G_STRUCT_OFFSET (AppIndicatorClass, new_icon),
 	                                  NULL, NULL,
 	                                  g_cclosure_marshal_VOID__VOID,
-	                                  G_TYPE_NONE, 0, G_TYPE_NONE);
+	                                  G_TYPE_NONE, 0);
 
 	/**
 	 * AppIndicator::new-attention-icon:
@@ -515,7 +522,7 @@
 	                                            G_STRUCT_OFFSET (AppIndicatorClass, new_attention_icon),
 	                                            NULL, NULL,
 	                                            g_cclosure_marshal_VOID__VOID,
-	                                            G_TYPE_NONE, 0, G_TYPE_NONE);
+	                                            G_TYPE_NONE, 0);
 
 	/**
 	 * AppIndicator::new-status:
@@ -563,7 +570,7 @@
 	                                            G_STRUCT_OFFSET (AppIndicatorClass, connection_changed),
 	                                            NULL, NULL,
 	                                            g_cclosure_marshal_VOID__BOOLEAN,
-	                                            G_TYPE_NONE, 1, G_TYPE_BOOLEAN, G_TYPE_NONE);
+	                                            G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
 
 	/**
 	 * AppIndicator::new-icon-theme-path:
@@ -640,6 +647,7 @@
 app_indicator_init (AppIndicator *self)
 {
 	AppIndicatorPrivate * priv = APP_INDICATOR_GET_PRIVATE(self);
+	self->priv = priv;
 
 	priv->id = NULL;
 	priv->clean_id = NULL;
@@ -648,6 +656,7 @@
 	priv->icon_name = NULL;
 	priv->attention_icon_name = NULL;
 	priv->icon_theme_path = NULL;
+	priv->absolute_icon_theme_path = get_real_theme_path (self);
 	priv->menu = NULL;
 	priv->menuservice = NULL;
 	priv->ordering_index = 0;
@@ -676,8 +685,6 @@
 	                                     (GBusNameVanishedCallback) name_vanished_handler,
 	                                     self, NULL);
 
-	self->priv = priv;
-
 	/* Start getting the session bus */
 	g_object_ref(self); /* ref for the bus creation callback */
 	g_bus_get(G_BUS_TYPE_SESSION, NULL, bus_creation, self);
@@ -794,16 +801,31 @@
 		priv->icon_name = NULL;
 	}
 
+	if (priv->absolute_icon_name != NULL) {
+		g_free(priv->absolute_icon_name);
+		priv->absolute_icon_name = NULL;
+	}
+
 	if (priv->attention_icon_name != NULL) {
 		g_free(priv->attention_icon_name);
 		priv->attention_icon_name = NULL;
 	}
 
+	if (priv->absolute_attention_icon_name != NULL) {
+		g_free(priv->absolute_attention_icon_name);
+		priv->absolute_attention_icon_name = NULL;
+	}
+
 	if (priv->icon_theme_path != NULL) {
 		g_free(priv->icon_theme_path);
 		priv->icon_theme_path = NULL;
 	}
-	
+
+	if (priv->absolute_icon_theme_path != NULL) {
+		g_free(priv->absolute_icon_theme_path);
+		priv->absolute_icon_theme_path = NULL;
+	}
+
 	if (priv->title != NULL) {
 		g_free(priv->title);
 		priv->title = NULL;
@@ -976,6 +998,11 @@
 		  gchar * oldguide = priv->label_guide;
 		  priv->label_guide = g_value_dup_string(value);
 
+		  if (priv->label_guide != NULL && priv->label_guide[0] == '\0') {
+		  	g_free(priv->label_guide);
+			priv->label_guide = NULL;
+		  }
+
 		  if (g_strcmp0(oldguide, priv->label_guide) != 0) {
 		    signal_label_change(APP_INDICATOR(object));
 		  }
@@ -1188,8 +1215,14 @@
 		enum_value = g_enum_get_value ((GEnumClass *) g_type_class_ref (APP_INDICATOR_TYPE_INDICATOR_STATUS), priv->status);
 		return g_variant_new_string(enum_value->value_nick ? enum_value->value_nick : "");
 	} else if (g_strcmp0(property, "IconName") == 0) {
+		if (priv->absolute_icon_name) {
+			return g_variant_new_string(priv->absolute_icon_name);
+		}
 		return g_variant_new_string(priv->icon_name ? priv->icon_name : "");
 	} else if (g_strcmp0(property, "AttentionIconName") == 0) {
+		if (priv->absolute_attention_icon_name) {
+			return g_variant_new_string(priv->absolute_attention_icon_name);
+		}
 		return g_variant_new_string(priv->attention_icon_name ? priv->attention_icon_name : "");
 	} else if (g_strcmp0(property, "Title") == 0) {
 		const gchar * output = NULL;
@@ -1205,6 +1238,9 @@
 		}
 		return g_variant_new_string(output);
 	} else if (g_strcmp0(property, "IconThemePath") == 0) {
+		if (priv->absolute_icon_theme_path) {
+			return g_variant_new_string(priv->absolute_icon_theme_path);
+		}
 		return g_variant_new_string(priv->icon_theme_path ? priv->icon_theme_path : "");
 	} else if (g_strcmp0(property, "Menu") == 0) {
 		if (priv->menuservice != NULL) {
@@ -1244,7 +1280,7 @@
 	gchar * guide = priv->label_guide != NULL ? priv->label_guide : "";
 
 	g_signal_emit(G_OBJECT(self), signals[NEW_LABEL], 0,
-	              label, guide, TRUE);
+	              label, guide);
 	if (priv->dbus_registration != 0 && priv->connection != NULL) {
 		GError * error = NULL;
 
@@ -1460,7 +1496,7 @@
 static void
 theme_changed_cb (GtkIconTheme * theme, gpointer user_data)
 {
-	g_signal_emit (user_data, signals[NEW_ICON], 0, TRUE);
+	g_signal_emit (user_data, signals[NEW_ICON], 0);
 
 	AppIndicator * self = (AppIndicator *)user_data;
 	AppIndicatorPrivate *priv = self->priv;
@@ -1571,19 +1607,23 @@
 
 	/* add the icon_theme_path once if needed */
 	GtkIconTheme *icon_theme = gtk_icon_theme_get_default();
-	if (self->priv->icon_theme_path != NULL) {
+	const gchar *theme_path = self->priv->absolute_icon_theme_path ?
+	                            self->priv->absolute_icon_theme_path :
+	                            self->priv->icon_theme_path;
+
+	if (theme_path != NULL) {
 		gchar **path;
 		gint n_elements, i;
 		gboolean found=FALSE;
 		gtk_icon_theme_get_search_path(icon_theme, &path, &n_elements);
-		for (i=0; i< n_elements || path[i] == NULL; i++) {
-			if(g_strcmp0(path[i], self->priv->icon_theme_path) == 0) {
+		for (i=0; i< n_elements; i++) {
+			if(g_strcmp0(path[i], theme_path) == 0) {
 				found=TRUE;
 				break;
 			}
 		}
 		if(!found) {
-			gtk_icon_theme_append_search_path(icon_theme, self->priv->icon_theme_path);
+			gtk_icon_theme_append_search_path(icon_theme, theme_path);
 		}
 		g_strfreev (path);
 	}
@@ -1607,8 +1647,12 @@
 	};
 
 	if (icon_name != NULL) {
+		gchar *snapped_icon = append_snap_prefix(icon_name);
+
 		if (g_file_test(icon_name, G_FILE_TEST_EXISTS)) {
 			gtk_status_icon_set_from_file(icon, icon_name);
+		} else if (snapped_icon && g_file_test(snapped_icon, G_FILE_TEST_EXISTS)) {
+			gtk_status_icon_set_from_file(icon, snapped_icon);
 		} else {
 			gchar *longname = append_panel_icon_suffix(icon_name);
 
@@ -1620,6 +1664,8 @@
 
 			g_free(longname);
 		}
+
+		g_free(snapped_icon);
 	}
 
 	return;
@@ -1633,7 +1679,7 @@
 	GtkMenu * menu = app_indicator_get_menu(APP_INDICATOR(data));
 	if (menu == NULL)
 		return;
-	
+
 	gtk_menu_popup(menu,
 	               NULL, /* Parent Menu */
 	               NULL, /* Parent item */
@@ -1681,7 +1727,7 @@
            	long_name = g_strdup (icon_name);
         }
 
-	return long_name;	
+	return long_name;
 }
 
 static gboolean
@@ -1858,6 +1904,14 @@
 	if (g_strcmp0 (self->priv->attention_icon_name, icon_name) != 0) {
 		g_free (self->priv->attention_icon_name);
 		self->priv->attention_icon_name = g_strdup (icon_name);
+
+		g_free(self->priv->absolute_attention_icon_name);
+		self->priv->absolute_attention_icon_name = NULL;
+
+		if (icon_name && icon_name[0] == '/') {
+			self->priv->absolute_attention_icon_name = append_snap_prefix (icon_name);
+		}
+
 		changed = TRUE;
 	}
 
@@ -1868,7 +1922,7 @@
 	}
 
 	if (changed) {
-		g_signal_emit (self, signals[NEW_ATTENTION_ICON], 0, TRUE);
+		g_signal_emit (self, signals[NEW_ATTENTION_ICON], 0);
 
 		if (self->priv->dbus_registration != 0 && self->priv->connection != NULL) {
 			GError * error = NULL;
@@ -1933,6 +1987,14 @@
 		}
 
 		self->priv->icon_name = g_strdup(icon_name);
+
+		g_free(self->priv->absolute_icon_name);
+		self->priv->absolute_icon_name = NULL;
+
+		if (icon_name && icon_name[0] == '/') {
+			self->priv->absolute_icon_name = append_snap_prefix (icon_name);
+		}
+
 		changed = TRUE;
 	}
 
@@ -1946,7 +2008,7 @@
 	}
 
 	if (changed) {
-		g_signal_emit (self, signals[NEW_ICON], 0, TRUE);
+		g_signal_emit (self, signals[NEW_ICON], 0);
 
 		if (self->priv->dbus_registration != 0 && self->priv->connection != NULL) {
 			GError * error = NULL;
@@ -1994,6 +2056,66 @@
 	return;
 }
 
+static const gchar *
+get_snap_prefix ()
+{
+	const gchar *snap = g_getenv ("SNAP");
+	return (snap && *snap != '\0') ? snap : NULL;
+}
+
+static gchar *
+append_snap_prefix (const gchar *path)
+{
+	gint i;
+	gchar real_path[PATH_MAX];
+	const gchar *snap = get_snap_prefix ();
+
+	if (snap != NULL && path != NULL) {
+		if (realpath (path, real_path) != NULL) {
+			path = real_path;
+		}
+
+		if (g_str_has_prefix (path, "/tmp/")) {
+			g_warning ("Using '/tmp' paths in SNAP environment will lead to unreadable resources");
+			return NULL;
+		}
+
+		if (g_str_has_prefix (path, snap) ||
+			g_str_has_prefix (path, g_get_home_dir ()) ||
+			g_str_has_prefix (path, g_get_user_cache_dir ()) ||
+			g_str_has_prefix (path, g_get_user_config_dir ()) ||
+			g_str_has_prefix (path, g_get_user_data_dir ()) ||
+			g_str_has_prefix (path, g_get_user_runtime_dir ())) {
+			return g_strdup (path);
+		}
+
+		for (i = 0; i < G_USER_N_DIRECTORIES; ++ i) {
+			if (g_str_has_prefix (path, g_get_user_special_dir (i))) {
+				return g_strdup (path);
+			}
+		}
+
+		return g_build_path (G_DIR_SEPARATOR_S, snap, path, NULL);
+	}
+
+	return NULL;
+}
+
+static gchar *
+get_real_theme_path (AppIndicator * self)
+{
+	const gchar *theme_path = self->priv->icon_theme_path;
+	gchar *snapped_path = append_snap_prefix (theme_path);
+
+	if (snapped_path != NULL) {
+		return snapped_path;
+	} else if (get_snap_prefix ()) {
+		return g_build_path (G_DIR_SEPARATOR_S, g_get_user_data_dir (), "icons", NULL);
+	}
+
+	return NULL;
+}
+
 /**
  * app_indicator_set_icon_theme_path:
  * @self: The #AppIndicator object to use
@@ -2012,9 +2134,15 @@
 
 		self->priv->icon_theme_path = g_strdup(icon_theme_path);
 
-		g_signal_emit (self, signals[NEW_ICON_THEME_PATH], 0, self->priv->icon_theme_path, TRUE);
+		g_free (self->priv->absolute_icon_theme_path);
+		self->priv->absolute_icon_theme_path = get_real_theme_path (self);
+
+		g_signal_emit (self, signals[NEW_ICON_THEME_PATH], 0, self->priv->icon_theme_path);
 
 		if (self->priv->dbus_registration != 0 && self->priv->connection != NULL) {
+			const gchar *theme_path = self->priv->absolute_icon_theme_path ?
+										self->priv->absolute_icon_theme_path :
+										self->priv->icon_theme_path;
 			GError * error = NULL;
 
 			g_dbus_connection_emit_signal(self->priv->connection,
@@ -2022,7 +2150,7 @@
 										  self->priv->path,
 										  NOTIFICATION_ITEM_DBUS_IFACE,
 										  "NewIconThemePath",
-										  g_variant_new("(s)", self->priv->icon_theme_path),
+										  g_variant_new("(s)", theme_path ? theme_path : ""),
 										  &error);
 
 			if (error != NULL) {
@@ -2160,7 +2288,7 @@
 
 	g_return_if_fail (GTK_IS_WIDGET (menuitem));
 
-	priv->sec_activate_target = g_object_ref(G_OBJECT(menuitem));
+	priv->sec_activate_target = g_object_ref(menuitem);
 	priv->sec_activate_enabled = widget_is_menu_child(self, menuitem);
 	g_signal_connect(menuitem, "parent-set", G_CALLBACK(sec_activate_target_parent_changed), self);
 }

=== added file 'src/indicator-desktop-shortcuts.c'
--- src/indicator-desktop-shortcuts.c	1970-01-01 00:00:00 +0000
+++ src/indicator-desktop-shortcuts.c	2020-04-08 18:54:42 +0000
@@ -0,0 +1,705 @@
+/*
+A small file to parse through the actions that are available
+in the desktop file and making those easily usable.
+
+Copyright 2010 Canonical Ltd.
+
+Authors:
+    Ted Gould <[e-mail]>
+
+This library is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+version 3.0 as published by the Free Software Foundation.
+
+This library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License version 3.0 for more details.
+
+You should have received a copy of the GNU General Public
+License along with this library. If not, see
+<http://www.gnu.org/licenses/>.
+*/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <gio/gdesktopappinfo.h>
+#include "indicator-desktop-shortcuts.h"
+
+#define ACTIONS_KEY               "Actions"
+#define ACTION_GROUP_PREFIX       "Desktop Action"
+
+#define OLD_GROUP_SUFFIX          "Shortcut Group"
+#define OLD_SHORTCUTS_KEY         "X-Ayatana-Desktop-Shortcuts"
+#define OLD_ENVIRON_KEY           "TargetEnvironment"
+
+#define PROP_DESKTOP_FILE_S   "desktop-file"
+#define PROP_IDENTITY_S       "identity"
+
+typedef enum _actions_t actions_t;
+enum _actions_t {
+	ACTIONS_NONE,
+	ACTIONS_XAYATANA,
+	ACTIONS_DESKTOP_SPEC
+};
+
+typedef struct _IndicatorDesktopShortcutsPrivate IndicatorDesktopShortcutsPrivate;
+struct _IndicatorDesktopShortcutsPrivate {
+	actions_t actions;
+	GKeyFile * keyfile;
+	gchar * identity;
+	GArray * nicks;
+	gchar * domain;
+};
+
+enum {
+	PROP_0,
+	PROP_DESKTOP_FILE,
+	PROP_IDENTITY
+};
+
+#define INDICATOR_DESKTOP_SHORTCUTS_GET_PRIVATE(o) \
+		(G_TYPE_INSTANCE_GET_PRIVATE ((o), INDICATOR_TYPE_DESKTOP_SHORTCUTS, IndicatorDesktopShortcutsPrivate))
+
+static void indicator_desktop_shortcuts_class_init (IndicatorDesktopShortcutsClass *klass);
+static void indicator_desktop_shortcuts_init       (IndicatorDesktopShortcuts *self);
+static void indicator_desktop_shortcuts_dispose    (GObject *object);
+static void indicator_desktop_shortcuts_finalize   (GObject *object);
+static void set_property (GObject * object, guint prop_id, const GValue * value, GParamSpec * pspec);
+static void get_property (GObject * object, guint prop_id, GValue * value, GParamSpec * pspec);
+static void parse_keyfile (IndicatorDesktopShortcuts * ids);
+static gboolean should_show (GKeyFile * keyfile, const gchar * group, const gchar * identity, gboolean should_have_target);
+
+G_DEFINE_TYPE (IndicatorDesktopShortcuts, indicator_desktop_shortcuts, G_TYPE_OBJECT);
+
+/* Build up the class */
+static void
+indicator_desktop_shortcuts_class_init (IndicatorDesktopShortcutsClass *klass)
+{
+	GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+	g_type_class_add_private (klass, sizeof (IndicatorDesktopShortcutsPrivate));
+
+	object_class->dispose = indicator_desktop_shortcuts_dispose;
+	object_class->finalize = indicator_desktop_shortcuts_finalize;
+
+	/* Property funcs */
+	object_class->set_property = set_property;
+	object_class->get_property = get_property;
+
+	g_object_class_install_property(object_class, PROP_DESKTOP_FILE,
+	                                g_param_spec_string(PROP_DESKTOP_FILE_S,
+	                                                    "The path of the desktop file to read",
+	                                                    "A path to a desktop file that we'll look for shortcuts in.",
+	                                                    NULL,
+	                                                    G_PARAM_WRITABLE | G_PARAM_STATIC_STRINGS | G_PARAM_CONSTRUCT_ONLY));
+	g_object_class_install_property(object_class, PROP_IDENTITY,
+	                                g_param_spec_string(PROP_IDENTITY_S,
+	                                                    "The string that represents the identity that we're acting as.",
+	                                                    "Used to process ShowIn and NotShownIn fields of the desktop shortcust to get the proper list.",
+	                                                    NULL,
+	                                                    G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | G_PARAM_CONSTRUCT_ONLY));
+
+	return;
+}
+
+/* Initialize instance data */
+static void
+indicator_desktop_shortcuts_init (IndicatorDesktopShortcuts *self)
+{
+	IndicatorDesktopShortcutsPrivate * priv = INDICATOR_DESKTOP_SHORTCUTS_GET_PRIVATE(self);
+
+	priv->keyfile = NULL;
+	priv->identity = NULL;
+	priv->domain = NULL;
+	priv->nicks = g_array_new(TRUE, TRUE, sizeof(gchar *));
+	priv->actions = ACTIONS_NONE;
+
+	return;
+}
+
+/* Clear object references */
+static void
+indicator_desktop_shortcuts_dispose (GObject *object)
+{
+	IndicatorDesktopShortcutsPrivate * priv = INDICATOR_DESKTOP_SHORTCUTS_GET_PRIVATE(object);
+
+	if (priv->keyfile) {
+		g_key_file_free(priv->keyfile);
+		priv->keyfile = NULL;
+	}
+
+	G_OBJECT_CLASS (indicator_desktop_shortcuts_parent_class)->dispose (object);
+	return;
+}
+
+/* Free all memory */
+static void
+indicator_desktop_shortcuts_finalize (GObject *object)
+{
+	IndicatorDesktopShortcutsPrivate * priv = INDICATOR_DESKTOP_SHORTCUTS_GET_PRIVATE(object);
+
+	if (priv->identity != NULL) {
+		g_free(priv->identity);
+		priv->identity = NULL;
+	}
+
+	if (priv->domain != NULL) {
+		g_free(priv->domain);
+		priv->domain = NULL;
+	}
+
+	if (priv->nicks != NULL) {
+		gint i;
+		for (i = 0; i < priv->nicks->len; i++) {
+			gchar * nick = g_array_index(priv->nicks, gchar *, i);
+			g_free(nick);
+		}
+		g_array_free(priv->nicks, TRUE);
+		priv->nicks = NULL;
+	}
+
+	G_OBJECT_CLASS (indicator_desktop_shortcuts_parent_class)->finalize (object);
+	return;
+}
+
+/* Sets one of the two properties we have, only at construction though */
+static void
+set_property (GObject * object, guint prop_id, const GValue * value, GParamSpec * pspec)
+{
+	g_return_if_fail(INDICATOR_IS_DESKTOP_SHORTCUTS(object));
+	IndicatorDesktopShortcutsPrivate * priv = INDICATOR_DESKTOP_SHORTCUTS_GET_PRIVATE(object);
+
+	switch(prop_id) {
+	case PROP_DESKTOP_FILE: {
+		if (priv->keyfile != NULL) {
+			g_key_file_free(priv->keyfile);
+			priv->keyfile = NULL;
+			priv->actions = ACTIONS_NONE;
+		}
+
+		GError * error = NULL;
+		GKeyFile * keyfile = g_key_file_new();
+		g_key_file_load_from_file(keyfile, g_value_get_string(value), G_KEY_FILE_NONE, &error);
+
+		if (error != NULL) {
+			g_warning("Unable to load keyfile from file '%s': %s", g_value_get_string(value), error->message);
+			g_error_free(error);
+			g_key_file_free(keyfile);
+			break;
+		}
+
+		/* Always prefer the desktop spec if we can get it */
+		if (priv->actions == ACTIONS_NONE && g_key_file_has_key(keyfile, G_KEY_FILE_DESKTOP_GROUP, ACTIONS_KEY, NULL)) {
+			priv->actions = ACTIONS_DESKTOP_SPEC;
+		}
+
+		/* But fallback if we can't */
+		if (priv->actions == ACTIONS_NONE && g_key_file_has_key(keyfile, G_KEY_FILE_DESKTOP_GROUP, OLD_SHORTCUTS_KEY, NULL)) {
+			priv->actions = ACTIONS_XAYATANA;
+			g_warning("Desktop file '%s' is using a deprecated format for its actions that will be dropped soon.", g_value_get_string(value));
+		}
+
+		if (priv->actions == ACTIONS_NONE) {
+			g_key_file_free(keyfile);
+			break;
+		}
+
+		priv->keyfile = keyfile;
+		parse_keyfile(INDICATOR_DESKTOP_SHORTCUTS(object));
+		break;
+	}
+	case PROP_IDENTITY:
+		if (priv->identity != NULL) {
+			g_warning("Identity already set to '%s' and trying to set it to '%s'.", priv->identity, g_value_get_string(value));
+			return;
+		}
+		priv->identity = g_value_dup_string(value);
+		parse_keyfile(INDICATOR_DESKTOP_SHORTCUTS(object));
+		break;
+	/* *********************** */
+	default:
+		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+		break;
+	}
+
+	return;
+}
+
+/* Gets either the desktop file our the identity. */
+static void
+get_property (GObject * object, guint prop_id, GValue * value, GParamSpec * pspec)
+{
+	g_return_if_fail(INDICATOR_IS_DESKTOP_SHORTCUTS(object));
+	IndicatorDesktopShortcutsPrivate * priv = INDICATOR_DESKTOP_SHORTCUTS_GET_PRIVATE(object);
+
+	switch(prop_id) {
+	case PROP_IDENTITY:
+		g_value_set_string(value, priv->identity);
+		break;
+	/* *********************** */
+	default:
+		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+		break;
+	}
+
+	return;
+}
+
+/* Checks to see if we can, and if we can it goes through
+   and parses the keyfile entries. */
+static void
+parse_keyfile (IndicatorDesktopShortcuts * ids)
+{
+	IndicatorDesktopShortcutsPrivate * priv = INDICATOR_DESKTOP_SHORTCUTS_GET_PRIVATE(ids);
+
+	if (priv->keyfile == NULL) {
+		return;
+	}
+
+	if (priv->identity == NULL) {
+		return;
+	}
+
+	/* Remove a previous translation domain if we had one
+	   from a previously parsed file. */
+	if (priv->domain != NULL) {
+		g_free(priv->domain);
+		priv->domain = NULL;
+	}
+
+	/* Check to see if there is a custom translation domain that
+	   we should take into account. */
+	if (priv->domain == NULL &&
+			g_key_file_has_key(priv->keyfile, G_KEY_FILE_DESKTOP_GROUP, "X-GNOME-Gettext-Domain", NULL)) {
+		priv->domain = g_key_file_get_string(priv->keyfile, G_KEY_FILE_DESKTOP_GROUP, "X-GNOME-Gettext-Domain", NULL);
+	}
+
+	if (priv->domain == NULL &&
+			g_key_file_has_key(priv->keyfile, G_KEY_FILE_DESKTOP_GROUP, "X-Ubuntu-Gettext-Domain", NULL)) {
+		priv->domain = g_key_file_get_string(priv->keyfile, G_KEY_FILE_DESKTOP_GROUP, "X-Ubuntu-Gettext-Domain", NULL);
+	}
+
+	/* We need to figure out what we're looking for and what we want to
+	   look for in the rest of the file */
+	const gchar * list_name = NULL;
+	const gchar * group_format = NULL;
+	gboolean should_have_target = FALSE;
+
+	switch (priv->actions) {
+	case ACTIONS_NONE:
+		/* None, let's just get outta here */
+		return;
+	case ACTIONS_XAYATANA:
+		list_name = OLD_SHORTCUTS_KEY;
+		group_format = "%s " OLD_GROUP_SUFFIX;
+		should_have_target = TRUE;
+		break;
+	case ACTIONS_DESKTOP_SPEC:
+		list_name = ACTIONS_KEY;
+		group_format = ACTION_GROUP_PREFIX " %s";
+		should_have_target = FALSE;
+		break;
+	default:
+		g_assert_not_reached();
+		return;
+	}
+
+	/* Okay, we've got everything we need.  Let's get it on! */
+	gint i;
+	gsize num_nicks = 0;
+	gchar ** nicks = g_key_file_get_string_list(priv->keyfile, G_KEY_FILE_DESKTOP_GROUP, list_name, &num_nicks, NULL);
+
+	/* If there is an error from get_string_list num_nicks should still
+	   be zero, so this loop will drop out. */
+	for (i = 0; i < num_nicks; i++) {
+		/* g_debug("Looking at group nick %s", nicks[i]); */
+		gchar * groupname = g_strdup_printf(group_format, nicks[i]);
+		if (!g_key_file_has_group(priv->keyfile, groupname)) {
+			g_warning("Unable to find group '%s'", groupname);
+			g_free(groupname);
+			continue;
+		}
+
+		if (!should_show(priv->keyfile, G_KEY_FILE_DESKTOP_GROUP, priv->identity, FALSE)) {
+			g_free(groupname);
+			continue;
+		}
+
+		if (!should_show(priv->keyfile, groupname, priv->identity, should_have_target)) {
+			g_free(groupname);
+			continue;
+		}
+
+		gchar * nickalloc = g_strdup(nicks[i]);
+		g_array_append_val(priv->nicks, nickalloc);
+		g_free(groupname);
+	}
+
+	if (nicks != NULL) {
+		g_strfreev(nicks);
+	}
+
+	return;
+}
+
+/* Checks the ONLY_SHOW_IN and NOT_SHOW_IN keys for a group to
+   see if we should be showing ourselves. */
+static gboolean
+should_show (GKeyFile * keyfile, const gchar * group, const gchar * identity, gboolean should_have_target)
+{
+	if (should_have_target && g_key_file_has_key(keyfile, group, OLD_ENVIRON_KEY, NULL)) {
+		/* If we've got this key, we're going to return here and not
+		   process the deprecated keys. */
+		gint j;
+		gsize num_env = 0;
+		gchar ** envs = g_key_file_get_string_list(keyfile, group, OLD_ENVIRON_KEY, &num_env, NULL);
+
+		for (j = 0; j < num_env; j++) {
+			if (g_strcmp0(envs[j], identity) == 0) {
+				break;
+			}
+		}
+
+		if (envs != NULL) {
+			g_strfreev(envs);
+		}
+
+		if (j == num_env) {
+			return FALSE;
+		}
+		return TRUE;	
+	}
+
+	/* If there is a list of OnlyShowIn entries we need to check
+	   to see if we're in that list.  If not, we drop this nick */
+	if (g_key_file_has_key(keyfile, group, G_KEY_FILE_DESKTOP_KEY_ONLY_SHOW_IN, NULL)) {
+		gint j;
+		gsize num_only = 0;
+		gchar ** onlies = g_key_file_get_string_list(keyfile, group, G_KEY_FILE_DESKTOP_KEY_ONLY_SHOW_IN, &num_only, NULL);
+
+		for (j = 0; j < num_only; j++) {
+			if (g_strcmp0(onlies[j], identity) == 0) {
+				break;
+			}
+		}
+
+		if (onlies != NULL) {
+			g_strfreev(onlies);
+		}
+
+		if (j == num_only) {
+			return FALSE;
+		}
+	}
+
+	/* If there is a NotShowIn entry we need to make sure that we're
+	   not in that list.  If we are, we need to drop out. */
+	if (g_key_file_has_key(keyfile, group, G_KEY_FILE_DESKTOP_KEY_NOT_SHOW_IN, NULL)) {
+		gint j;
+		gsize num_not = 0;
+		gchar ** nots = g_key_file_get_string_list(keyfile, group, G_KEY_FILE_DESKTOP_KEY_NOT_SHOW_IN, &num_not, NULL);
+
+		for (j = 0; j < num_not; j++) {
+			if (g_strcmp0(nots[j], identity) == 0) {
+				break;
+			}
+		}
+
+		if (nots != NULL) {
+			g_strfreev(nots);
+		}
+
+		if (j != num_not) {
+			return FALSE;
+		}
+	}
+
+	return TRUE;
+}
+
+/* Looks through the nicks to see if this one is in the list,
+   and thus valid to use. */
+static gboolean
+is_valid_nick (gchar ** list, const gchar * nick)
+{
+	if (*list == NULL)
+		return FALSE;
+	/* g_debug("Checking Nick: %s", list[0]); */
+	if (g_strcmp0(list[0], nick) == 0)
+		return TRUE;
+	return is_valid_nick(&list[1], nick);
+}
+
+/* API */
+
+/**
+	indicator_desktop_shortcuts_new:
+	@file: The desktop file that would be opened to
+		find the actions.
+	@identity: This is a string that represents the identity
+		that should be used in searching those actions.  It 
+		relates to the ShowIn and NotShownIn properties.
+	
+	This function creates the basic object.  It involves opening
+	the file and parsing it.  It could potentially block on IO.  At
+	the end of the day you'll have a fully functional object.
+
+	Return value: A new #IndicatorDesktopShortcuts object.
+*/
+IndicatorDesktopShortcuts *
+indicator_desktop_shortcuts_new (const gchar * file, const gchar * identity)
+{
+	GObject * obj = g_object_new(INDICATOR_TYPE_DESKTOP_SHORTCUTS,
+	                             PROP_DESKTOP_FILE_S, file,
+	                             PROP_IDENTITY_S, identity,
+	                             NULL);
+	return INDICATOR_DESKTOP_SHORTCUTS(obj);
+}
+
+/**
+	indicator_desktop_shortcuts_get_nicks:
+	@ids: The #IndicatorDesktopShortcuts object to look in
+
+	Give you the list of commands that are available for this desktop
+	file given the identity that was passed in at creation.  This will
+	filter out the various items in the desktop file.  These nicks can
+	then be used as keys for working with the desktop file.
+
+	Return value: A #NULL terminated list of strings.  This memory
+		is managed by the @ids object.
+*/
+const gchar **
+indicator_desktop_shortcuts_get_nicks (IndicatorDesktopShortcuts * ids)
+{
+	g_return_val_if_fail(INDICATOR_IS_DESKTOP_SHORTCUTS(ids), NULL);
+	IndicatorDesktopShortcutsPrivate * priv = INDICATOR_DESKTOP_SHORTCUTS_GET_PRIVATE(ids);
+	return (const gchar **)priv->nicks->data;
+}
+
+/**
+	indicator_desktop_shortcuts_nick_get_name:
+	@ids: The #IndicatorDesktopShortcuts object to look in
+	@nick: Which command that we're referencing.
+
+	This function looks in a desktop file for a nick to find the
+	user visible name for that shortcut.  The @nick parameter
+	should be gotten from #indicator_desktop_shortcuts_get_nicks
+	though it's not required that the exact memory location
+	be the same.
+
+	Return value: A user visible string for the shortcut or
+		#NULL on error.
+*/
+gchar *
+indicator_desktop_shortcuts_nick_get_name (IndicatorDesktopShortcuts * ids, const gchar * nick)
+{
+	g_return_val_if_fail(INDICATOR_IS_DESKTOP_SHORTCUTS(ids), NULL);
+	IndicatorDesktopShortcutsPrivate * priv = INDICATOR_DESKTOP_SHORTCUTS_GET_PRIVATE(ids);
+
+	g_return_val_if_fail(priv->actions != ACTIONS_NONE, NULL);
+	g_return_val_if_fail(priv->keyfile != NULL, NULL);
+	g_return_val_if_fail(is_valid_nick((gchar **)priv->nicks->data, nick), NULL);
+
+	const gchar * group_format = NULL;
+
+	switch (priv->actions) {
+	case ACTIONS_XAYATANA:
+		group_format = "%s " OLD_GROUP_SUFFIX;
+		break;
+	case ACTIONS_DESKTOP_SPEC:
+		group_format = ACTION_GROUP_PREFIX " %s";
+		break;
+	default:
+		g_assert_not_reached();
+		return NULL;
+	}
+
+	gchar * groupheader = g_strdup_printf(group_format, nick);
+	if (!g_key_file_has_group(priv->keyfile, groupheader)) {
+		g_warning("The group for nick '%s' doesn't exist anymore.", nick);
+		g_free(groupheader);
+		return NULL;
+	}
+
+	if (!g_key_file_has_key(priv->keyfile, groupheader, G_KEY_FILE_DESKTOP_KEY_NAME, NULL)) {
+		g_warning("No name available for nick '%s'", nick);
+		g_free(groupheader);
+		return NULL;
+	}
+
+	gchar * name = NULL;
+	gchar * keyvalue = g_key_file_get_string(priv->keyfile,
+	                                         groupheader,
+	                                         G_KEY_FILE_DESKTOP_KEY_NAME,
+	                                         NULL);
+	gchar * localeval = g_key_file_get_locale_string(priv->keyfile,
+		                                    groupheader,
+		                                    G_KEY_FILE_DESKTOP_KEY_NAME,
+		                                    NULL,
+		                                    NULL);
+	g_free(groupheader);
+
+	if (priv->domain != NULL && g_strcmp0(keyvalue, localeval) == 0) {
+		name = g_strdup(g_dgettext(priv->domain, keyvalue));
+		g_free(localeval);
+	} else {
+		name = localeval;
+	}
+
+	g_free(keyvalue);
+
+	return name;
+}
+
+/**
+	indicator_desktop_shortcuts_nick_exec_with_context:
+	@ids: The #IndicatorDesktopShortcuts object to look in
+	@nick: Which command that we're referencing.
+	@launch_context: The #GAppLaunchContext to use for launching the shortcut
+
+	Here we take a @nick and try and execute the action that is
+	associated with it.  The @nick parameter should be gotten
+	from #indicator_desktop_shortcuts_get_nicks though it's not
+	required that the exact memory location be the same.
+
+	Return value: #TRUE on success or #FALSE on error.
+*/
+gboolean
+indicator_desktop_shortcuts_nick_exec_with_context (IndicatorDesktopShortcuts * ids, const gchar * nick, GAppLaunchContext * launch_context)
+{
+	GError * error = NULL;
+	gchar * current_dir = NULL;
+
+	g_return_val_if_fail(INDICATOR_IS_DESKTOP_SHORTCUTS(ids), FALSE);
+	IndicatorDesktopShortcutsPrivate * priv = INDICATOR_DESKTOP_SHORTCUTS_GET_PRIVATE(ids);
+
+	g_return_val_if_fail(priv->actions != ACTIONS_NONE, FALSE);
+	g_return_val_if_fail(priv->keyfile != NULL, FALSE);
+	g_return_val_if_fail(is_valid_nick((gchar **)priv->nicks->data, nick), FALSE);
+
+	const gchar * group_format = NULL;
+
+	switch (priv->actions) {
+	case ACTIONS_XAYATANA:
+		group_format = "%s " OLD_GROUP_SUFFIX;
+		break;
+	case ACTIONS_DESKTOP_SPEC:
+		group_format = ACTION_GROUP_PREFIX " %s";
+		break;
+	default:
+		g_assert_not_reached();
+		return FALSE;
+	}
+
+	gchar * groupheader = g_strdup_printf(group_format, nick);
+	if (!g_key_file_has_group(priv->keyfile, groupheader)) {
+		g_warning("The group for nick '%s' doesn't exist anymore.", nick);
+		g_free(groupheader);
+		return FALSE;
+	}
+
+	if (!g_key_file_has_key(priv->keyfile, groupheader, G_KEY_FILE_DESKTOP_KEY_NAME, NULL)) {
+		g_warning("No name available for nick '%s'", nick);
+		g_free(groupheader);
+		return FALSE;
+	}
+
+	if (!g_key_file_has_key(priv->keyfile, groupheader, G_KEY_FILE_DESKTOP_KEY_EXEC, NULL)) {
+		g_warning("No exec available for nick '%s'", nick);
+		g_free(groupheader);
+		return FALSE;
+	}
+
+	/* If possible move to the proper launch path */
+	gchar * path = g_key_file_get_string(priv->keyfile, groupheader,
+	                                     G_KEY_FILE_DESKTOP_KEY_PATH, NULL);
+
+	if (path && *path != '\0') {
+		current_dir = g_get_current_dir();
+
+		if (chdir(path) < 0) {
+			g_warning("Impossible to run action '%s' from path '%s'", nick, path);
+			g_free(current_dir);
+			g_free(groupheader);
+			g_free(path);
+			return FALSE;
+		}
+	}
+
+	/* Grab the name and the exec entries out of our current group */
+	gchar * name = g_key_file_get_locale_string(priv->keyfile,
+	                                            groupheader,
+	                                            G_KEY_FILE_DESKTOP_KEY_NAME,
+	                                            NULL,
+	                                            NULL);
+
+	gchar * exec = g_key_file_get_locale_string(priv->keyfile,
+	                                            groupheader,
+	                                            G_KEY_FILE_DESKTOP_KEY_EXEC,
+	                                            NULL,
+	                                            NULL);
+
+	GAppInfoCreateFlags flags = G_APP_INFO_CREATE_NONE;
+
+	if (launch_context) {
+		flags |= G_APP_INFO_CREATE_SUPPORTS_STARTUP_NOTIFICATION;
+	}
+
+	GAppInfo * appinfo = g_app_info_create_from_commandline(exec, name, flags, &error);
+	g_free(groupheader);
+	g_free(path);
+	g_free(name);
+	g_free(exec);
+
+	if (error != NULL) {
+		g_warning("Unable to build Command line App info: %s", error->message);
+		g_free(current_dir);
+		g_error_free(error);
+		return FALSE;
+	}
+
+	if (appinfo == NULL) {
+		g_warning("Unable to build Command line App info (unknown)");
+		g_free(current_dir);
+		return FALSE;
+	}
+
+	gboolean launched = g_app_info_launch(appinfo, NULL, launch_context, &error);
+
+	if (current_dir && chdir(current_dir) < 0)
+		g_warning("Impossible to switch back to default work dir");
+
+
+	if (error != NULL) {
+		g_warning("Unable to launch file from nick '%s': %s", nick, error->message);
+		g_clear_error(&error);
+	}
+
+	g_free(current_dir);
+	g_object_unref(appinfo);
+
+	return launched;
+}
+
+/**
+	indicator_desktop_shortcuts_nick_exec:
+	@ids: The #IndicatorDesktopShortcuts object to look in
+	@nick: Which command that we're referencing.
+
+	Here we take a @nick and try and execute the action that is
+	associated with it.  The @nick parameter should be gotten
+	from #indicator_desktop_shortcuts_get_nicks though it's not
+	required that the exact memory location be the same.
+	This function is deprecated and shouldn't be used in newly
+	written code.
+
+	Return value: #TRUE on success or #FALSE on error.
+*/
+gboolean
+indicator_desktop_shortcuts_nick_exec (IndicatorDesktopShortcuts * ids, const gchar * nick)
+{
+	return indicator_desktop_shortcuts_nick_exec_with_context (ids, nick, NULL);
+}

=== added file 'src/indicator-desktop-shortcuts.h'
--- src/indicator-desktop-shortcuts.h	1970-01-01 00:00:00 +0000
+++ src/indicator-desktop-shortcuts.h	2020-04-08 18:54:42 +0000
@@ -0,0 +1,80 @@
+/*
+A small file to parse through the actions that are available
+in the desktop file and making those easily usable.
+
+Copyright 2010 Canonical Ltd.
+
+Authors:
+    Ted Gould <[e-mail]>
+
+This library is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+version 3.0 as published by the Free Software Foundation.
+
+This library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License version 3.0 for more details.
+
+You should have received a copy of the GNU General Public
+License along with this library. If not, see
+<http://www.gnu.org/licenses/>.
+*/
+
+#ifndef __INDICATOR_DESKTOP_SHORTCUTS_H__
+#define __INDICATOR_DESKTOP_SHORTCUTS_H__
+
+#include <gio/gio.h>
+#include <glib.h>
+#include <glib-object.h>
+
+G_BEGIN_DECLS
+
+#define INDICATOR_TYPE_DESKTOP_SHORTCUTS            (indicator_desktop_shortcuts_get_type ())
+#define INDICATOR_DESKTOP_SHORTCUTS(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), INDICATOR_TYPE_DESKTOP_SHORTCUTS, IndicatorDesktopShortcuts))
+#define INDICATOR_DESKTOP_SHORTCUTS_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), INDICATOR_TYPE_DESKTOP_SHORTCUTS, IndicatorDesktopShortcutsClass))
+#define INDICATOR_IS_DESKTOP_SHORTCUTS(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), INDICATOR_TYPE_DESKTOP_SHORTCUTS))
+#define INDICATOR_IS_DESKTOP_SHORTCUTS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), INDICATOR_TYPE_DESKTOP_SHORTCUTS))
+#define INDICATOR_DESKTOP_SHORTCUTS_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), INDICATOR_TYPE_DESKTOP_SHORTCUTS, IndicatorDesktopShortcutsClass))
+
+typedef struct _IndicatorDesktopShortcuts      IndicatorDesktopShortcuts;
+typedef struct _IndicatorDesktopShortcutsClass IndicatorDesktopShortcutsClass;
+
+/**
+	IndicatorDesktopShortcutsClass:
+	@parent_class: Space for #GObjectClass
+
+	The vtable for our precious #IndicatorDesktopShortcutsClass.
+*/
+struct _IndicatorDesktopShortcutsClass {
+	GObjectClass parent_class;
+};
+
+/**
+	IndicatorDesktopShortcuts:
+	@parent: The parent data from #GObject
+
+	The public data for an instance of the class
+	#IndicatorDesktopShortcuts.
+*/
+struct _IndicatorDesktopShortcuts {
+	GObject parent;
+};
+
+GType                       indicator_desktop_shortcuts_get_type               (void);
+IndicatorDesktopShortcuts * indicator_desktop_shortcuts_new                    (const gchar * file,
+                                                                                const gchar * identity);
+const gchar **              indicator_desktop_shortcuts_get_nicks              (IndicatorDesktopShortcuts * ids);
+gchar *                     indicator_desktop_shortcuts_nick_get_name          (IndicatorDesktopShortcuts * ids,
+                                                                                const gchar * nick);
+gboolean                    indicator_desktop_shortcuts_nick_exec_with_context (IndicatorDesktopShortcuts * ids,
+                                                                                const gchar * nick,
+                                                                                GAppLaunchContext * launch_context);
+
+GLIB_DEPRECATED_FOR(indicator_desktop_shortcuts_nick_exec_with_context)
+gboolean                    indicator_desktop_shortcuts_nick_exec              (IndicatorDesktopShortcuts * ids,
+                                                                                const gchar * nick);
+
+G_END_DECLS
+
+#endif

=== modified file 'tests/Makefile.am'
--- tests/Makefile.am	2013-12-19 14:37:54 +0000
+++ tests/Makefile.am	2020-04-08 18:54:42 +0000
@@ -32,7 +32,7 @@
 test_libappindicator_CFLAGS = \
 	$(TESTDEPS_CFLAGS) $(LIBRARY_CFLAGS) \
 	-DSRCDIR="\"$(srcdir)\"" \
-	-Wall -Werror -Wno-error=deprecated-declarations \
+	-Wall -Wno-error=deprecated-declarations \
 	-I$(top_srcdir)/src
 
 test_libappindicator_LDADD = \
@@ -49,7 +49,7 @@
 
 test_libappindicator_dbus_client_CFLAGS = \
 	$(TESTDEPS_CFLAGS) $(LIBRARY_CFLAGS) \
-	-Wall -Werror -Wno-error=deprecated-declarations \
+	-Wall -Wno-error=deprecated-declarations \
 	-I$(top_srcdir)/src
 
 test_libappindicator_dbus_client_LDADD = \
@@ -66,7 +66,7 @@
 
 test_libappindicator_dbus_server_CFLAGS = \
 	$(TESTDEPS_CFLAGS) $(LIBRARY_CFLAGS) \
-	-Wall -Werror -Wno-error=deprecated-declarations \
+	-Wall -Wno-error=deprecated-declarations \
 	-I$(top_srcdir)/src
 
 test_libappindicator_dbus_server_LDADD = \
@@ -83,7 +83,7 @@
 
 test_libappindicator_status_client_CFLAGS = \
 	$(TESTDEPS_CFLAGS) $(LIBRARY_CFLAGS) \
-	-Wall -Werror -Wno-error=deprecated-declarations \
+	-Wall -Wno-error=deprecated-declarations \
 	-I$(top_srcdir)/src
 
 test_libappindicator_status_client_LDADD = \
@@ -100,7 +100,7 @@
 
 test_libappindicator_status_server_CFLAGS = \
 	$(TESTDEPS_CFLAGS) $(LIBRARY_CFLAGS) \
-	-Wall -Werror -Wno-error=deprecated-declarations \
+	-Wall -Wno-error=deprecated-declarations \
 	-I$(top_srcdir)/src
 
 test_libappindicator_status_server_LDADD = \
@@ -116,7 +116,7 @@
 
 test_libappindicator_fallback_watcher_CFLAGS = \
 	$(TESTDEPS_CFLAGS) $(LIBRARY_CFLAGS) \
-	-Wall -Werror -Wno-error=deprecated-declarations \
+	-Wall -Wno-error=deprecated-declarations \
 	-I$(top_srcdir)/src
 
 test_libappindicator_fallback_watcher_LDADD = \
@@ -128,7 +128,7 @@
 
 test_libappindicator_fallback_item_CFLAGS = \
 	$(TESTDEPS_CFLAGS) $(LIBRARY_CFLAGS) \
-	-Wall -Werror -Wno-error=deprecated-declarations \
+	-Wall -Wno-error=deprecated-declarations \
 	-I$(top_srcdir)/src
 
 test_libappindicator_fallback_item_LDADD = \
@@ -198,7 +198,7 @@
 
 test_simple_app_CFLAGS = \
 	$(TESTDEPS_CFLAGS) $(LIBRARY_CFLAGS) \
-	-Wall -Werror -Wno-error=deprecated-declarations \
+	-Wall -Wno-error=deprecated-declarations \
 	-I$(top_srcdir)/src
 
 test_simple_app_LDADD = \