Import upstream version 0.2.91

12 files changed, 142 insertions, 1953 deletions

diff --git a/tests/Makefile.am b/tests/Makefile.am
index f2bdbb2..a885dff 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,120 +1,32 @@
 
 check_PROGRAMS = \
-	test-approver \
-	test-libappindicator \
-	test-libappindicator-dbus-client \
-	test-libappindicator-dbus-server \
-	test-libappindicator-status-client \
-	test-libappindicator-status-server \
-	test-libappindicator-fallback-watcher \
-	test-libappindicator-fallback-item \
-	test-simple-app
+	test-approver
 
 TESTS =
 DISTCLEANFILES = $(TESTS)
 
 EXTRA_DIST = run-xvfb.sh
 
-#########################################
-##  test-libappindicator
-#########################################
-
-test_libappindicator_SOURCES = \
-	test-libappindicator.c
-
-test_libappindicator_CFLAGS = \
-	$(INDICATOR_CFLAGS) \
-	-Wall -Werror \
-	-I$(top_srcdir)/src
-
-test_libappindicator_LDADD = \
-	$(INDICATOR_LIBS) \
-	$(top_builddir)/src/libappindicator.la
-
-#########################################
-##  test-libappindicator-dbus-client
-#########################################
-
-test_libappindicator_dbus_client_SOURCES = \
-	test-defines.h \
-	test-libappindicator-dbus-client.c
-
-test_libappindicator_dbus_client_CFLAGS = \
-	$(INDICATOR_CFLAGS) \
-	-Wall -Werror \
-	-I$(top_srcdir)/src
-
-test_libappindicator_dbus_client_LDADD = \
-	$(INDICATOR_LIBS) \
-	$(top_builddir)/src/libappindicator.la
-
-#########################################
-##  test-libappindicator-dbus-server
-#########################################
-
-test_libappindicator_dbus_server_SOURCES = \
-	test-defines.h \
-	test-libappindicator-dbus-server.c
-
-test_libappindicator_dbus_server_CFLAGS = \
-	$(INDICATOR_CFLAGS) \
-	-Wall -Werror \
-	-I$(top_srcdir)/src
-
-test_libappindicator_dbus_server_LDADD = \
-	$(INDICATOR_LIBS) \
-	$(top_builddir)/src/libappindicator.la
-
-#########################################
-##  test-libappindicator-status-client
-#########################################
-
-test_libappindicator_status_client_SOURCES = \
-	test-defines.h \
-	test-libappindicator-status-client.c
-
-test_libappindicator_status_client_CFLAGS = \
-	$(INDICATOR_CFLAGS) \
-	-Wall -Werror \
-	-I$(top_srcdir)/src
-
-test_libappindicator_status_client_LDADD = \
-	$(INDICATOR_LIBS) \
-	$(top_builddir)/src/libappindicator.la
-
-#########################################
-##  test-libappindicator-status-server
-#########################################
-
-test_libappindicator_status_server_SOURCES = \
-	test-defines.h \
-	test-libappindicator-status-server.c
-
-test_libappindicator_status_server_CFLAGS = \
-	$(INDICATOR_CFLAGS) \
-	-Wall -Werror \
-	-I$(top_srcdir)/src
-
-test_libappindicator_status_server_LDADD = \
-	$(INDICATOR_LIBS) \
-	$(top_builddir)/src/libappindicator.la
+DBUS_RUNNER=dbus-test-runner --dbus-config /usr/share/dbus-test-runner/session.conf
 
 #########################################
 ##  test-approver
 #########################################
 
 test_approver_SOURCES = \
+	$(top_srcdir)/src/gen-notification-approver.xml.c \
 	test-approver.c
 
 test_approver_CFLAGS = \
 	$(INDICATOR_CFLAGS) \
+	$(TEST_CFLAGS) \
 	-Wall -Werror \
 	-I$(top_srcdir)/src \
 	-I$(top_builddir)/src
 
 test_approver_LDADD = \
 	$(INDICATOR_LIBS) \
-	$(top_builddir)/src/libappindicator.la
+	$(TEST_LIBS)
 
 test-approver-tester: test-approver Makefile.am
 	@echo "#!/bin/bash" > $@
@@ -126,95 +38,3 @@ test-approver-tester: test-approver Makefile.am
 TESTS += test-approver-tester
 
 
-#########################################
-##  test-libappindicator-fallback
-#########################################
-
-test_libappindicator_fallback_watcher_SOURCES = \
-	test-libappindicator-fallback-watcher.c
-
-test_libappindicator_fallback_watcher_CFLAGS = \
-	$(INDICATOR_CFLAGS) \
-	-Wall -Werror \
-	-I$(top_srcdir)/src
-
-test_libappindicator_fallback_watcher_LDADD = \
-	$(INDICATOR_LIBS) \
-	$(top_builddir)/src/libappindicator.la
-
-test_libappindicator_fallback_item_SOURCES = \
-	test-libappindicator-fallback-item.c
-
-test_libappindicator_fallback_item_CFLAGS = \
-	$(INDICATOR_CFLAGS) \
-	-Wall -Werror \
-	-I$(top_srcdir)/src
-
-test_libappindicator_fallback_item_LDADD = \
-	$(INDICATOR_LIBS) \
-	$(top_builddir)/src/libappindicator.la
-
-test-libappindicator-fallback: test-libappindicator-fallback-watcher test-libappindicator-fallback-item Makefile.am
-	@echo "#!/bin/bash" > $@
-	@echo . $(srcdir)/run-xvfb.sh >> $@
-	@echo $(DBUS_RUNNER) --task ./test-libappindicator-fallback-watcher --task-name Watcher --ignore-return --task ./test-libappindicator-fallback-item --task-name Item >> $@
-	@chmod +x $@
-
-TESTS += test-libappindicator-fallback
-
-#########################################
-##  Actual tests
-#########################################
-
-XML_REPORT   = libappindicator-check-results.xml
-HTML_REPORT  = libappindicator-check-results.html
-
-libappindicator-tests: libappindicator-tests-gtester Makefile.am
-	@echo "#!/bin/bash" > $@
-	@echo . $(srcdir)/run-xvfb.sh >> $@
-	@echo $(DBUS_RUNNER) --task ./libappindicator-tests-gtester >> $@
-	@chmod +x $@
-
-libappindicator-tests-gtester: test-libappindicator Makefile.am
-	@echo "#!/bin/sh" > $@
-	@echo gtester -k --verbose -o=$(XML_REPORT) ./test-libappindicator >> $@
-	@chmod +x $@
-
-TESTS += libappindicator-tests
-DISTCLEANFILES += $(XML_REPORT) $(HTML_REPORT) libappindicator-tests-gtester
-
-
-DBUS_RUNNER=dbus-test-runner --dbus-config /usr/share/dbus-test-runner/session.conf
-
-test-libappindicator-dbus: test-libappindicator-dbus-client test-libappindicator-dbus-server Makefile.am
-	@echo "#!/bin/bash" > test-libappindicator-dbus
-	@echo . $(srcdir)/run-xvfb.sh >> $@
-	@echo $(DBUS_RUNNER) --task ./test-libappindicator-dbus-client --task-name Client --task ./test-libappindicator-dbus-server --task-name Server --ignore-return >> test-libappindicator-dbus
-	@chmod +x test-libappindicator-dbus
-
-TESTS += test-libappindicator-dbus
-
-test-libappindicator-status: test-libappindicator-status-client test-libappindicator-status-server Makefile.am
-	@echo "#!/bin/bash" > test-libappindicator-status
-	@echo . $(srcdir)/run-xvfb.sh >> $@
-	@echo $(DBUS_RUNNER) --task ./test-libappindicator-status-client --task-name Client --task ./test-libappindicator-status-server --task-name Server --ignore-return >> test-libappindicator-status
-	@chmod +x test-libappindicator-status
-
-TESTS += test-libappindicator-status
-
-#########################################
-##  test-simple-app
-#########################################
-
-test_simple_app_SOURCES = \
-	test-simple-app.c
-
-test_simple_app_CFLAGS = \
-	$(INDICATOR_CFLAGS) \
-	-Wall -Werror \
-	-I$(top_srcdir)/src
-
-test_simple_app_LDADD = \
-	$(INDICATOR_LIBS) \
-	$(top_builddir)/src/libappindicator.la
-
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 8594e87..49192b9 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -33,19 +33,11 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-check_PROGRAMS = test-approver$(EXEEXT) test-libappindicator$(EXEEXT) \
-	test-libappindicator-dbus-client$(EXEEXT) \
-	test-libappindicator-dbus-server$(EXEEXT) \
-	test-libappindicator-status-client$(EXEEXT) \
-	test-libappindicator-status-server$(EXEEXT) \
-	test-libappindicator-fallback-watcher$(EXEEXT) \
-	test-libappindicator-fallback-item$(EXEEXT) \
-	test-simple-app$(EXEEXT)
+check_PROGRAMS = test-approver$(EXEEXT)
 subdir = tests
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
-	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
 	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
 	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
@@ -55,89 +47,19 @@ mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
-am_test_approver_OBJECTS = test_approver-test-approver.$(OBJEXT)
+am_test_approver_OBJECTS =  \
+	test_approver-gen-notification-approver.xml.$(OBJEXT) \
+	test_approver-test-approver.$(OBJEXT)
 test_approver_OBJECTS = $(am_test_approver_OBJECTS)
 am__DEPENDENCIES_1 =
 test_approver_DEPENDENCIES = $(am__DEPENDENCIES_1) \
-	$(top_builddir)/src/libappindicator.la
+	$(am__DEPENDENCIES_1)
 AM_V_lt = $(am__v_lt_$(V))
 am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
 am__v_lt_0 = --silent
 test_approver_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(test_approver_CFLAGS) \
 	$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-am_test_libappindicator_OBJECTS =  \
-	test_libappindicator-test-libappindicator.$(OBJEXT)
-test_libappindicator_OBJECTS = $(am_test_libappindicator_OBJECTS)
-test_libappindicator_DEPENDENCIES = $(am__DEPENDENCIES_1) \
-	$(top_builddir)/src/libappindicator.la
-test_libappindicator_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
-	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-	$(test_libappindicator_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
-am_test_libappindicator_dbus_client_OBJECTS = test_libappindicator_dbus_client-test-libappindicator-dbus-client.$(OBJEXT)
-test_libappindicator_dbus_client_OBJECTS =  \
-	$(am_test_libappindicator_dbus_client_OBJECTS)
-test_libappindicator_dbus_client_DEPENDENCIES = $(am__DEPENDENCIES_1) \
-	$(top_builddir)/src/libappindicator.la
-test_libappindicator_dbus_client_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
-	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-	$(test_libappindicator_dbus_client_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-am_test_libappindicator_dbus_server_OBJECTS = test_libappindicator_dbus_server-test-libappindicator-dbus-server.$(OBJEXT)
-test_libappindicator_dbus_server_OBJECTS =  \
-	$(am_test_libappindicator_dbus_server_OBJECTS)
-test_libappindicator_dbus_server_DEPENDENCIES = $(am__DEPENDENCIES_1) \
-	$(top_builddir)/src/libappindicator.la
-test_libappindicator_dbus_server_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
-	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-	$(test_libappindicator_dbus_server_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-am_test_libappindicator_fallback_item_OBJECTS = test_libappindicator_fallback_item-test-libappindicator-fallback-item.$(OBJEXT)
-test_libappindicator_fallback_item_OBJECTS =  \
-	$(am_test_libappindicator_fallback_item_OBJECTS)
-test_libappindicator_fallback_item_DEPENDENCIES =  \
-	$(am__DEPENDENCIES_1) $(top_builddir)/src/libappindicator.la
-test_libappindicator_fallback_item_LINK = $(LIBTOOL) $(AM_V_lt) \
-	--tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \
-	$(CCLD) $(test_libappindicator_fallback_item_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-am_test_libappindicator_fallback_watcher_OBJECTS = test_libappindicator_fallback_watcher-test-libappindicator-fallback-watcher.$(OBJEXT)
-test_libappindicator_fallback_watcher_OBJECTS =  \
-	$(am_test_libappindicator_fallback_watcher_OBJECTS)
-test_libappindicator_fallback_watcher_DEPENDENCIES =  \
-	$(am__DEPENDENCIES_1) $(top_builddir)/src/libappindicator.la
-test_libappindicator_fallback_watcher_LINK = $(LIBTOOL) $(AM_V_lt) \
-	--tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \
-	$(CCLD) $(test_libappindicator_fallback_watcher_CFLAGS) \
-	$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-am_test_libappindicator_status_client_OBJECTS = test_libappindicator_status_client-test-libappindicator-status-client.$(OBJEXT)
-test_libappindicator_status_client_OBJECTS =  \
-	$(am_test_libappindicator_status_client_OBJECTS)
-test_libappindicator_status_client_DEPENDENCIES =  \
-	$(am__DEPENDENCIES_1) $(top_builddir)/src/libappindicator.la
-test_libappindicator_status_client_LINK = $(LIBTOOL) $(AM_V_lt) \
-	--tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \
-	$(CCLD) $(test_libappindicator_status_client_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-am_test_libappindicator_status_server_OBJECTS = test_libappindicator_status_server-test-libappindicator-status-server.$(OBJEXT)
-test_libappindicator_status_server_OBJECTS =  \
-	$(am_test_libappindicator_status_server_OBJECTS)
-test_libappindicator_status_server_DEPENDENCIES =  \
-	$(am__DEPENDENCIES_1) $(top_builddir)/src/libappindicator.la
-test_libappindicator_status_server_LINK = $(LIBTOOL) $(AM_V_lt) \
-	--tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \
-	$(CCLD) $(test_libappindicator_status_server_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-am_test_simple_app_OBJECTS =  \
-	test_simple_app-test-simple-app.$(OBJEXT)
-test_simple_app_OBJECTS = $(am_test_simple_app_OBJECTS)
-test_simple_app_DEPENDENCIES = $(am__DEPENDENCIES_1) \
-	$(top_builddir)/src/libappindicator.la
-test_simple_app_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
-	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-	$(test_simple_app_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
-	-o $@
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
@@ -164,34 +86,17 @@ am__v_CCLD_0 = @echo "  CCLD  " $@;
 AM_V_GEN = $(am__v_GEN_$(V))
 am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
 am__v_GEN_0 = @echo "  GEN   " $@;
-SOURCES = $(test_approver_SOURCES) $(test_libappindicator_SOURCES) \
-	$(test_libappindicator_dbus_client_SOURCES) \
-	$(test_libappindicator_dbus_server_SOURCES) \
-	$(test_libappindicator_fallback_item_SOURCES) \
-	$(test_libappindicator_fallback_watcher_SOURCES) \
-	$(test_libappindicator_status_client_SOURCES) \
-	$(test_libappindicator_status_server_SOURCES) \
-	$(test_simple_app_SOURCES)
-DIST_SOURCES = $(test_approver_SOURCES) \
-	$(test_libappindicator_SOURCES) \
-	$(test_libappindicator_dbus_client_SOURCES) \
-	$(test_libappindicator_dbus_server_SOURCES) \
-	$(test_libappindicator_fallback_item_SOURCES) \
-	$(test_libappindicator_fallback_watcher_SOURCES) \
-	$(test_libappindicator_status_client_SOURCES) \
-	$(test_libappindicator_status_server_SOURCES) \
-	$(test_simple_app_SOURCES)
+SOURCES = $(test_approver_SOURCES)
+DIST_SOURCES = $(test_approver_SOURCES)
 ETAGS = etags
 CTAGS = ctags
 am__tty_colors = \
 red=; grn=; lgn=; blu=; std=
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
-AL = @AL@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-APPINDICATOR_PYTHON_CFLAGS = @APPINDICATOR_PYTHON_CFLAGS@
-APPINDICATOR_PYTHON_LIBS = @APPINDICATOR_PYTHON_LIBS@
+APP_INDICATOR_INCLUDE = @APP_INDICATOR_INCLUDE@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -202,7 +107,6 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CSC = @CSC@
 CYGPATH_W = @CYGPATH_W@
 DBUSSERVICEDIR = @DBUSSERVICEDIR@
 DEFS = @DEFS@
@@ -215,22 +119,9 @@ ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
-GACUTIL = @GACUTIL@
-GAPI_CFLAGS = @GAPI_CFLAGS@
-GAPI_CODEGEN = @GAPI_CODEGEN@
-GAPI_FIXUP = @GAPI_FIXUP@
-GAPI_LIBS = @GAPI_LIBS@
-GAPI_PARSER = @GAPI_PARSER@
-GENERATED_SOURCES = @GENERATED_SOURCES@
 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
 GLIB_MKENUMS = @GLIB_MKENUMS@
 GREP = @GREP@
-GTKDOC_CHECK = @GTKDOC_CHECK@
-GTKDOC_MKPDF = @GTKDOC_MKPDF@
-GTKDOC_REBASE = @GTKDOC_REBASE@
-GTK_SHARP_CFLAGS = @GTK_SHARP_CFLAGS@
-GTK_SHARP_LIBS = @GTK_SHARP_LIBS@
-HTML_DIR = @HTML_DIR@
 INDICATORDIR = @INDICATORDIR@
 INDICATORICONSDIR = @INDICATORICONSDIR@
 INDICATOR_CFLAGS = @INDICATOR_CFLAGS@
@@ -240,33 +131,19 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
-INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
-INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
-INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
-INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
-INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
-INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
-INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
-LIB_PREFIX = @LIB_PREFIX@
-LIB_SUFFIX = @LIB_SUFFIX@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
-MONO_DEPENDENCY_CFLAGS = @MONO_DEPENDENCY_CFLAGS@
-MONO_DEPENDENCY_LIBS = @MONO_DEPENDENCY_LIBS@
 NM = @NM@
 NMEDIT = @NMEDIT@
-NUNIT_CFLAGS = @NUNIT_CFLAGS@
-NUNIT_LIBS = @NUNIT_LIBS@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
 OTOOL = @OTOOL@
@@ -282,21 +159,13 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PYGTK_CODEGEN = @PYGTK_CODEGEN@
-PYGTK_DEFSDIR = @PYGTK_DEFSDIR@
-PYTHON = @PYTHON@
-PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
-PYTHON_INCLUDES = @PYTHON_INCLUDES@
-PYTHON_PLATFORM = @PYTHON_PLATFORM@
-PYTHON_PREFIX = @PYTHON_PREFIX@
-PYTHON_VERSION = @PYTHON_VERSION@
 RANLIB = @RANLIB@
-RUNTIME = @RUNTIME@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-VALA_API_GEN = @VALA_API_GEN@
+TEST_CFLAGS = @TEST_CFLAGS@
+TEST_LIBS = @TEST_LIBS@
 VERSION = @VERSION@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
@@ -339,13 +208,9 @@ mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
-pkgpyexecdir = @pkgpyexecdir@
-pkgpythondir = @pkgpythondir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
-pyexecdir = @pyexecdir@
-pythondir = @pythondir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -354,154 +219,27 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-TESTS = test-approver-tester test-libappindicator-fallback \
-	libappindicator-tests test-libappindicator-dbus \
-	test-libappindicator-status
-DISTCLEANFILES = $(TESTS) $(XML_REPORT) $(HTML_REPORT) \
-	libappindicator-tests-gtester
+TESTS = test-approver-tester
+DISTCLEANFILES = $(TESTS)
 EXTRA_DIST = run-xvfb.sh
-
-#########################################
-#########################################
-test_libappindicator_SOURCES = \
-	test-libappindicator.c
-
-test_libappindicator_CFLAGS = \
-	$(INDICATOR_CFLAGS) \
-	-Wall -Werror \
-	-I$(top_srcdir)/src
-
-test_libappindicator_LDADD = \
-	$(INDICATOR_LIBS) \
-	$(top_builddir)/src/libappindicator.la
-
-
-#########################################
-#########################################
-test_libappindicator_dbus_client_SOURCES = \
-	test-defines.h \
-	test-libappindicator-dbus-client.c
-
-test_libappindicator_dbus_client_CFLAGS = \
-	$(INDICATOR_CFLAGS) \
-	-Wall -Werror \
-	-I$(top_srcdir)/src
-
-test_libappindicator_dbus_client_LDADD = \
-	$(INDICATOR_LIBS) \
-	$(top_builddir)/src/libappindicator.la
-
-
-#########################################
-#########################################
-test_libappindicator_dbus_server_SOURCES = \
-	test-defines.h \
-	test-libappindicator-dbus-server.c
-
-test_libappindicator_dbus_server_CFLAGS = \
-	$(INDICATOR_CFLAGS) \
-	-Wall -Werror \
-	-I$(top_srcdir)/src
-
-test_libappindicator_dbus_server_LDADD = \
-	$(INDICATOR_LIBS) \
-	$(top_builddir)/src/libappindicator.la
-
-
-#########################################
-#########################################
-test_libappindicator_status_client_SOURCES = \
-	test-defines.h \
-	test-libappindicator-status-client.c
-
-test_libappindicator_status_client_CFLAGS = \
-	$(INDICATOR_CFLAGS) \
-	-Wall -Werror \
-	-I$(top_srcdir)/src
-
-test_libappindicator_status_client_LDADD = \
-	$(INDICATOR_LIBS) \
-	$(top_builddir)/src/libappindicator.la
-
-
-#########################################
-#########################################
-test_libappindicator_status_server_SOURCES = \
-	test-defines.h \
-	test-libappindicator-status-server.c
-
-test_libappindicator_status_server_CFLAGS = \
-	$(INDICATOR_CFLAGS) \
-	-Wall -Werror \
-	-I$(top_srcdir)/src
-
-test_libappindicator_status_server_LDADD = \
-	$(INDICATOR_LIBS) \
-	$(top_builddir)/src/libappindicator.la
-
+DBUS_RUNNER = dbus-test-runner --dbus-config /usr/share/dbus-test-runner/session.conf
 
 #########################################
 #########################################
 test_approver_SOURCES = \
+	$(top_srcdir)/src/gen-notification-approver.xml.c \
 	test-approver.c
 
 test_approver_CFLAGS = \
 	$(INDICATOR_CFLAGS) \
+	$(TEST_CFLAGS) \
 	-Wall -Werror \
 	-I$(top_srcdir)/src \
 	-I$(top_builddir)/src
 
 test_approver_LDADD = \
 	$(INDICATOR_LIBS) \
-	$(top_builddir)/src/libappindicator.la
-
-
-#########################################
-#########################################
-test_libappindicator_fallback_watcher_SOURCES = \
-	test-libappindicator-fallback-watcher.c
-
-test_libappindicator_fallback_watcher_CFLAGS = \
-	$(INDICATOR_CFLAGS) \
-	-Wall -Werror \
-	-I$(top_srcdir)/src
-
-test_libappindicator_fallback_watcher_LDADD = \
-	$(INDICATOR_LIBS) \
-	$(top_builddir)/src/libappindicator.la
-
-test_libappindicator_fallback_item_SOURCES = \
-	test-libappindicator-fallback-item.c
-
-test_libappindicator_fallback_item_CFLAGS = \
-	$(INDICATOR_CFLAGS) \
-	-Wall -Werror \
-	-I$(top_srcdir)/src
-
-test_libappindicator_fallback_item_LDADD = \
-	$(INDICATOR_LIBS) \
-	$(top_builddir)/src/libappindicator.la
-
-
-#########################################
-#########################################
-XML_REPORT = libappindicator-check-results.xml
-HTML_REPORT = libappindicator-check-results.html
-DBUS_RUNNER = dbus-test-runner --dbus-config /usr/share/dbus-test-runner/session.conf
-
-#########################################
-#########################################
-test_simple_app_SOURCES = \
-	test-simple-app.c
-
-test_simple_app_CFLAGS = \
-	$(INDICATOR_CFLAGS) \
-	-Wall -Werror \
-	-I$(top_srcdir)/src
-
-test_simple_app_LDADD = \
-	$(INDICATOR_LIBS) \
-	$(top_builddir)/src/libappindicator.la
+	$(TEST_LIBS)
 
 all: all-am
 
@@ -549,30 +287,6 @@ clean-checkPROGRAMS:
 test-approver$(EXEEXT): $(test_approver_OBJECTS) $(test_approver_DEPENDENCIES) 
 	@rm -f test-approver$(EXEEXT)
 	$(AM_V_CCLD)$(test_approver_LINK) $(test_approver_OBJECTS) $(test_approver_LDADD) $(LIBS)
-test-libappindicator$(EXEEXT): $(test_libappindicator_OBJECTS) $(test_libappindicator_DEPENDENCIES) 
-	@rm -f test-libappindicator$(EXEEXT)
-	$(AM_V_CCLD)$(test_libappindicator_LINK) $(test_libappindicator_OBJECTS) $(test_libappindicator_LDADD) $(LIBS)
-test-libappindicator-dbus-client$(EXEEXT): $(test_libappindicator_dbus_client_OBJECTS) $(test_libappindicator_dbus_client_DEPENDENCIES) 
-	@rm -f test-libappindicator-dbus-client$(EXEEXT)
-	$(AM_V_CCLD)$(test_libappindicator_dbus_client_LINK) $(test_libappindicator_dbus_client_OBJECTS) $(test_libappindicator_dbus_client_LDADD) $(LIBS)
-test-libappindicator-dbus-server$(EXEEXT): $(test_libappindicator_dbus_server_OBJECTS) $(test_libappindicator_dbus_server_DEPENDENCIES) 
-	@rm -f test-libappindicator-dbus-server$(EXEEXT)
-	$(AM_V_CCLD)$(test_libappindicator_dbus_server_LINK) $(test_libappindicator_dbus_server_OBJECTS) $(test_libappindicator_dbus_server_LDADD) $(LIBS)
-test-libappindicator-fallback-item$(EXEEXT): $(test_libappindicator_fallback_item_OBJECTS) $(test_libappindicator_fallback_item_DEPENDENCIES) 
-	@rm -f test-libappindicator-fallback-item$(EXEEXT)
-	$(AM_V_CCLD)$(test_libappindicator_fallback_item_LINK) $(test_libappindicator_fallback_item_OBJECTS) $(test_libappindicator_fallback_item_LDADD) $(LIBS)
-test-libappindicator-fallback-watcher$(EXEEXT): $(test_libappindicator_fallback_watcher_OBJECTS) $(test_libappindicator_fallback_watcher_DEPENDENCIES) 
-	@rm -f test-libappindicator-fallback-watcher$(EXEEXT)
-	$(AM_V_CCLD)$(test_libappindicator_fallback_watcher_LINK) $(test_libappindicator_fallback_watcher_OBJECTS) $(test_libappindicator_fallback_watcher_LDADD) $(LIBS)
-test-libappindicator-status-client$(EXEEXT): $(test_libappindicator_status_client_OBJECTS) $(test_libappindicator_status_client_DEPENDENCIES) 
-	@rm -f test-libappindicator-status-client$(EXEEXT)
-	$(AM_V_CCLD)$(test_libappindicator_status_client_LINK) $(test_libappindicator_status_client_OBJECTS) $(test_libappindicator_status_client_LDADD) $(LIBS)
-test-libappindicator-status-server$(EXEEXT): $(test_libappindicator_status_server_OBJECTS) $(test_libappindicator_status_server_DEPENDENCIES) 
-	@rm -f test-libappindicator-status-server$(EXEEXT)
-	$(AM_V_CCLD)$(test_libappindicator_status_server_LINK) $(test_libappindicator_status_server_OBJECTS) $(test_libappindicator_status_server_LDADD) $(LIBS)
-test-simple-app$(EXEEXT): $(test_simple_app_OBJECTS) $(test_simple_app_DEPENDENCIES) 
-	@rm -f test-simple-app$(EXEEXT)
-	$(AM_V_CCLD)$(test_simple_app_LINK) $(test_simple_app_OBJECTS) $(test_simple_app_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -580,15 +294,8 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_approver-gen-notification-approver.xml.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_approver-test-approver.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_libappindicator-test-libappindicator.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_libappindicator_dbus_client-test-libappindicator-dbus-client.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_libappindicator_dbus_server-test-libappindicator-dbus-server.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_libappindicator_fallback_item-test-libappindicator-fallback-item.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_libappindicator_fallback_watcher-test-libappindicator-fallback-watcher.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_libappindicator_status_client-test-libappindicator-status-client.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_libappindicator_status_server-test-libappindicator-status-server.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_simple_app-test-simple-app.Po@am__quote@
 
 .c.o:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -614,6 +321,22 @@ distclean-compile:
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
+test_approver-gen-notification-approver.xml.o: $(top_srcdir)/src/gen-notification-approver.xml.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_approver_CFLAGS) $(CFLAGS) -MT test_approver-gen-notification-approver.xml.o -MD -MP -MF $(DEPDIR)/test_approver-gen-notification-approver.xml.Tpo -c -o test_approver-gen-notification-approver.xml.o `test -f '$(top_srcdir)/src/gen-notification-approver.xml.c' || echo '$(srcdir)/'`$(top_srcdir)/src/gen-notification-approver.xml.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_approver-gen-notification-approver.xml.Tpo $(DEPDIR)/test_approver-gen-notification-approver.xml.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/src/gen-notification-approver.xml.c' object='test_approver-gen-notification-approver.xml.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_approver_CFLAGS) $(CFLAGS) -c -o test_approver-gen-notification-approver.xml.o `test -f '$(top_srcdir)/src/gen-notification-approver.xml.c' || echo '$(srcdir)/'`$(top_srcdir)/src/gen-notification-approver.xml.c
+
+test_approver-gen-notification-approver.xml.obj: $(top_srcdir)/src/gen-notification-approver.xml.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_approver_CFLAGS) $(CFLAGS) -MT test_approver-gen-notification-approver.xml.obj -MD -MP -MF $(DEPDIR)/test_approver-gen-notification-approver.xml.Tpo -c -o test_approver-gen-notification-approver.xml.obj `if test -f '$(top_srcdir)/src/gen-notification-approver.xml.c'; then $(CYGPATH_W) '$(top_srcdir)/src/gen-notification-approver.xml.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/gen-notification-approver.xml.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_approver-gen-notification-approver.xml.Tpo $(DEPDIR)/test_approver-gen-notification-approver.xml.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/src/gen-notification-approver.xml.c' object='test_approver-gen-notification-approver.xml.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_approver_CFLAGS) $(CFLAGS) -c -o test_approver-gen-notification-approver.xml.obj `if test -f '$(top_srcdir)/src/gen-notification-approver.xml.c'; then $(CYGPATH_W) '$(top_srcdir)/src/gen-notification-approver.xml.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/gen-notification-approver.xml.c'; fi`
+
 test_approver-test-approver.o: test-approver.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_approver_CFLAGS) $(CFLAGS) -MT test_approver-test-approver.o -MD -MP -MF $(DEPDIR)/test_approver-test-approver.Tpo -c -o test_approver-test-approver.o `test -f 'test-approver.c' || echo '$(srcdir)/'`test-approver.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_approver-test-approver.Tpo $(DEPDIR)/test_approver-test-approver.Po
@@ -630,134 +353,6 @@ test_approver-test-approver.obj: test-approver.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_approver_CFLAGS) $(CFLAGS) -c -o test_approver-test-approver.obj `if test -f 'test-approver.c'; then $(CYGPATH_W) 'test-approver.c'; else $(CYGPATH_W) '$(srcdir)/test-approver.c'; fi`
 
-test_libappindicator-test-libappindicator.o: test-libappindicator.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_libappindicator_CFLAGS) $(CFLAGS) -MT test_libappindicator-test-libappindicator.o -MD -MP -MF $(DEPDIR)/test_libappindicator-test-libappindicator.Tpo -c -o test_libappindicator-test-libappindicator.o `test -f 'test-libappindicator.c' || echo '$(srcdir)/'`test-libappindicator.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_libappindicator-test-libappindicator.Tpo $(DEPDIR)/test_libappindicator-test-libappindicator.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='test-libappindicator.c' object='test_libappindicator-test-libappindicator.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_libappindicator_CFLAGS) $(CFLAGS) -c -o test_libappindicator-test-libappindicator.o `test -f 'test-libappindicator.c' || echo '$(srcdir)/'`test-libappindicator.c
-
-test_libappindicator-test-libappindicator.obj: test-libappindicator.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_libappindicator_CFLAGS) $(CFLAGS) -MT test_libappindicator-test-libappindicator.obj -MD -MP -MF $(DEPDIR)/test_libappindicator-test-libappindicator.Tpo -c -o test_libappindicator-test-libappindicator.obj `if test -f 'test-libappindicator.c'; then $(CYGPATH_W) 'test-libappindicator.c'; else $(CYGPATH_W) '$(srcdir)/test-libappindicator.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_libappindicator-test-libappindicator.Tpo $(DEPDIR)/test_libappindicator-test-libappindicator.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='test-libappindicator.c' object='test_libappindicator-test-libappindicator.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_libappindicator_CFLAGS) $(CFLAGS) -c -o test_libappindicator-test-libappindicator.obj `if test -f 'test-libappindicator.c'; then $(CYGPATH_W) 'test-libappindicator.c'; else $(CYGPATH_W) '$(srcdir)/test-libappindicator.c'; fi`
-
-test_libappindicator_dbus_client-test-libappindicator-dbus-client.o: test-libappindicator-dbus-client.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_libappindicator_dbus_client_CFLAGS) $(CFLAGS) -MT test_libappindicator_dbus_client-test-libappindicator-dbus-client.o -MD -MP -MF $(DEPDIR)/test_libappindicator_dbus_client-test-libappindicator-dbus-client.Tpo -c -o test_libappindicator_dbus_client-test-libappindicator-dbus-client.o `test -f 'test-libappindicator-dbus-client.c' || echo '$(srcdir)/'`test-libappindicator-dbus-client.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_libappindicator_dbus_client-test-libappindicator-dbus-client.Tpo $(DEPDIR)/test_libappindicator_dbus_client-test-libappindicator-dbus-client.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='test-libappindicator-dbus-client.c' object='test_libappindicator_dbus_client-test-libappindicator-dbus-client.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_libappindicator_dbus_client_CFLAGS) $(CFLAGS) -c -o test_libappindicator_dbus_client-test-libappindicator-dbus-client.o `test -f 'test-libappindicator-dbus-client.c' || echo '$(srcdir)/'`test-libappindicator-dbus-client.c
-
-test_libappindicator_dbus_client-test-libappindicator-dbus-client.obj: test-libappindicator-dbus-client.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_libappindicator_dbus_client_CFLAGS) $(CFLAGS) -MT test_libappindicator_dbus_client-test-libappindicator-dbus-client.obj -MD -MP -MF $(DEPDIR)/test_libappindicator_dbus_client-test-libappindicator-dbus-client.Tpo -c -o test_libappindicator_dbus_client-test-libappindicator-dbus-client.obj `if test -f 'test-libappindicator-dbus-client.c'; then $(CYGPATH_W) 'test-libappindicator-dbus-client.c'; else $(CYGPATH_W) '$(srcdir)/test-libappindicator-dbus-client.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_libappindicator_dbus_client-test-libappindicator-dbus-client.Tpo $(DEPDIR)/test_libappindicator_dbus_client-test-libappindicator-dbus-client.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='test-libappindicator-dbus-client.c' object='test_libappindicator_dbus_client-test-libappindicator-dbus-client.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_libappindicator_dbus_client_CFLAGS) $(CFLAGS) -c -o test_libappindicator_dbus_client-test-libappindicator-dbus-client.obj `if test -f 'test-libappindicator-dbus-client.c'; then $(CYGPATH_W) 'test-libappindicator-dbus-client.c'; else $(CYGPATH_W) '$(srcdir)/test-libappindicator-dbus-client.c'; fi`
-
-test_libappindicator_dbus_server-test-libappindicator-dbus-server.o: test-libappindicator-dbus-server.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_libappindicator_dbus_server_CFLAGS) $(CFLAGS) -MT test_libappindicator_dbus_server-test-libappindicator-dbus-server.o -MD -MP -MF $(DEPDIR)/test_libappindicator_dbus_server-test-libappindicator-dbus-server.Tpo -c -o test_libappindicator_dbus_server-test-libappindicator-dbus-server.o `test -f 'test-libappindicator-dbus-server.c' || echo '$(srcdir)/'`test-libappindicator-dbus-server.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_libappindicator_dbus_server-test-libappindicator-dbus-server.Tpo $(DEPDIR)/test_libappindicator_dbus_server-test-libappindicator-dbus-server.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='test-libappindicator-dbus-server.c' object='test_libappindicator_dbus_server-test-libappindicator-dbus-server.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_libappindicator_dbus_server_CFLAGS) $(CFLAGS) -c -o test_libappindicator_dbus_server-test-libappindicator-dbus-server.o `test -f 'test-libappindicator-dbus-server.c' || echo '$(srcdir)/'`test-libappindicator-dbus-server.c
-
-test_libappindicator_dbus_server-test-libappindicator-dbus-server.obj: test-libappindicator-dbus-server.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_libappindicator_dbus_server_CFLAGS) $(CFLAGS) -MT test_libappindicator_dbus_server-test-libappindicator-dbus-server.obj -MD -MP -MF $(DEPDIR)/test_libappindicator_dbus_server-test-libappindicator-dbus-server.Tpo -c -o test_libappindicator_dbus_server-test-libappindicator-dbus-server.obj `if test -f 'test-libappindicator-dbus-server.c'; then $(CYGPATH_W) 'test-libappindicator-dbus-server.c'; else $(CYGPATH_W) '$(srcdir)/test-libappindicator-dbus-server.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_libappindicator_dbus_server-test-libappindicator-dbus-server.Tpo $(DEPDIR)/test_libappindicator_dbus_server-test-libappindicator-dbus-server.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='test-libappindicator-dbus-server.c' object='test_libappindicator_dbus_server-test-libappindicator-dbus-server.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_libappindicator_dbus_server_CFLAGS) $(CFLAGS) -c -o test_libappindicator_dbus_server-test-libappindicator-dbus-server.obj `if test -f 'test-libappindicator-dbus-server.c'; then $(CYGPATH_W) 'test-libappindicator-dbus-server.c'; else $(CYGPATH_W) '$(srcdir)/test-libappindicator-dbus-server.c'; fi`
-
-test_libappindicator_fallback_item-test-libappindicator-fallback-item.o: test-libappindicator-fallback-item.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_libappindicator_fallback_item_CFLAGS) $(CFLAGS) -MT test_libappindicator_fallback_item-test-libappindicator-fallback-item.o -MD -MP -MF $(DEPDIR)/test_libappindicator_fallback_item-test-libappindicator-fallback-item.Tpo -c -o test_libappindicator_fallback_item-test-libappindicator-fallback-item.o `test -f 'test-libappindicator-fallback-item.c' || echo '$(srcdir)/'`test-libappindicator-fallback-item.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_libappindicator_fallback_item-test-libappindicator-fallback-item.Tpo $(DEPDIR)/test_libappindicator_fallback_item-test-libappindicator-fallback-item.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='test-libappindicator-fallback-item.c' object='test_libappindicator_fallback_item-test-libappindicator-fallback-item.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_libappindicator_fallback_item_CFLAGS) $(CFLAGS) -c -o test_libappindicator_fallback_item-test-libappindicator-fallback-item.o `test -f 'test-libappindicator-fallback-item.c' || echo '$(srcdir)/'`test-libappindicator-fallback-item.c
-
-test_libappindicator_fallback_item-test-libappindicator-fallback-item.obj: test-libappindicator-fallback-item.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_libappindicator_fallback_item_CFLAGS) $(CFLAGS) -MT test_libappindicator_fallback_item-test-libappindicator-fallback-item.obj -MD -MP -MF $(DEPDIR)/test_libappindicator_fallback_item-test-libappindicator-fallback-item.Tpo -c -o test_libappindicator_fallback_item-test-libappindicator-fallback-item.obj `if test -f 'test-libappindicator-fallback-item.c'; then $(CYGPATH_W) 'test-libappindicator-fallback-item.c'; else $(CYGPATH_W) '$(srcdir)/test-libappindicator-fallback-item.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_libappindicator_fallback_item-test-libappindicator-fallback-item.Tpo $(DEPDIR)/test_libappindicator_fallback_item-test-libappindicator-fallback-item.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='test-libappindicator-fallback-item.c' object='test_libappindicator_fallback_item-test-libappindicator-fallback-item.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_libappindicator_fallback_item_CFLAGS) $(CFLAGS) -c -o test_libappindicator_fallback_item-test-libappindicator-fallback-item.obj `if test -f 'test-libappindicator-fallback-item.c'; then $(CYGPATH_W) 'test-libappindicator-fallback-item.c'; else $(CYGPATH_W) '$(srcdir)/test-libappindicator-fallback-item.c'; fi`
-
-test_libappindicator_fallback_watcher-test-libappindicator-fallback-watcher.o: test-libappindicator-fallback-watcher.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_libappindicator_fallback_watcher_CFLAGS) $(CFLAGS) -MT test_libappindicator_fallback_watcher-test-libappindicator-fallback-watcher.o -MD -MP -MF $(DEPDIR)/test_libappindicator_fallback_watcher-test-libappindicator-fallback-watcher.Tpo -c -o test_libappindicator_fallback_watcher-test-libappindicator-fallback-watcher.o `test -f 'test-libappindicator-fallback-watcher.c' || echo '$(srcdir)/'`test-libappindicator-fallback-watcher.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_libappindicator_fallback_watcher-test-libappindicator-fallback-watcher.Tpo $(DEPDIR)/test_libappindicator_fallback_watcher-test-libappindicator-fallback-watcher.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='test-libappindicator-fallback-watcher.c' object='test_libappindicator_fallback_watcher-test-libappindicator-fallback-watcher.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_libappindicator_fallback_watcher_CFLAGS) $(CFLAGS) -c -o test_libappindicator_fallback_watcher-test-libappindicator-fallback-watcher.o `test -f 'test-libappindicator-fallback-watcher.c' || echo '$(srcdir)/'`test-libappindicator-fallback-watcher.c
-
-test_libappindicator_fallback_watcher-test-libappindicator-fallback-watcher.obj: test-libappindicator-fallback-watcher.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_libappindicator_fallback_watcher_CFLAGS) $(CFLAGS) -MT test_libappindicator_fallback_watcher-test-libappindicator-fallback-watcher.obj -MD -MP -MF $(DEPDIR)/test_libappindicator_fallback_watcher-test-libappindicator-fallback-watcher.Tpo -c -o test_libappindicator_fallback_watcher-test-libappindicator-fallback-watcher.obj `if test -f 'test-libappindicator-fallback-watcher.c'; then $(CYGPATH_W) 'test-libappindicator-fallback-watcher.c'; else $(CYGPATH_W) '$(srcdir)/test-libappindicator-fallback-watcher.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_libappindicator_fallback_watcher-test-libappindicator-fallback-watcher.Tpo $(DEPDIR)/test_libappindicator_fallback_watcher-test-libappindicator-fallback-watcher.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='test-libappindicator-fallback-watcher.c' object='test_libappindicator_fallback_watcher-test-libappindicator-fallback-watcher.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_libappindicator_fallback_watcher_CFLAGS) $(CFLAGS) -c -o test_libappindicator_fallback_watcher-test-libappindicator-fallback-watcher.obj `if test -f 'test-libappindicator-fallback-watcher.c'; then $(CYGPATH_W) 'test-libappindicator-fallback-watcher.c'; else $(CYGPATH_W) '$(srcdir)/test-libappindicator-fallback-watcher.c'; fi`
-
-test_libappindicator_status_client-test-libappindicator-status-client.o: test-libappindicator-status-client.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_libappindicator_status_client_CFLAGS) $(CFLAGS) -MT test_libappindicator_status_client-test-libappindicator-status-client.o -MD -MP -MF $(DEPDIR)/test_libappindicator_status_client-test-libappindicator-status-client.Tpo -c -o test_libappindicator_status_client-test-libappindicator-status-client.o `test -f 'test-libappindicator-status-client.c' || echo '$(srcdir)/'`test-libappindicator-status-client.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_libappindicator_status_client-test-libappindicator-status-client.Tpo $(DEPDIR)/test_libappindicator_status_client-test-libappindicator-status-client.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='test-libappindicator-status-client.c' object='test_libappindicator_status_client-test-libappindicator-status-client.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_libappindicator_status_client_CFLAGS) $(CFLAGS) -c -o test_libappindicator_status_client-test-libappindicator-status-client.o `test -f 'test-libappindicator-status-client.c' || echo '$(srcdir)/'`test-libappindicator-status-client.c
-
-test_libappindicator_status_client-test-libappindicator-status-client.obj: test-libappindicator-status-client.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_libappindicator_status_client_CFLAGS) $(CFLAGS) -MT test_libappindicator_status_client-test-libappindicator-status-client.obj -MD -MP -MF $(DEPDIR)/test_libappindicator_status_client-test-libappindicator-status-client.Tpo -c -o test_libappindicator_status_client-test-libappindicator-status-client.obj `if test -f 'test-libappindicator-status-client.c'; then $(CYGPATH_W) 'test-libappindicator-status-client.c'; else $(CYGPATH_W) '$(srcdir)/test-libappindicator-status-client.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_libappindicator_status_client-test-libappindicator-status-client.Tpo $(DEPDIR)/test_libappindicator_status_client-test-libappindicator-status-client.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='test-libappindicator-status-client.c' object='test_libappindicator_status_client-test-libappindicator-status-client.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_libappindicator_status_client_CFLAGS) $(CFLAGS) -c -o test_libappindicator_status_client-test-libappindicator-status-client.obj `if test -f 'test-libappindicator-status-client.c'; then $(CYGPATH_W) 'test-libappindicator-status-client.c'; else $(CYGPATH_W) '$(srcdir)/test-libappindicator-status-client.c'; fi`
-
-test_libappindicator_status_server-test-libappindicator-status-server.o: test-libappindicator-status-server.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_libappindicator_status_server_CFLAGS) $(CFLAGS) -MT test_libappindicator_status_server-test-libappindicator-status-server.o -MD -MP -MF $(DEPDIR)/test_libappindicator_status_server-test-libappindicator-status-server.Tpo -c -o test_libappindicator_status_server-test-libappindicator-status-server.o `test -f 'test-libappindicator-status-server.c' || echo '$(srcdir)/'`test-libappindicator-status-server.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_libappindicator_status_server-test-libappindicator-status-server.Tpo $(DEPDIR)/test_libappindicator_status_server-test-libappindicator-status-server.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='test-libappindicator-status-server.c' object='test_libappindicator_status_server-test-libappindicator-status-server.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_libappindicator_status_server_CFLAGS) $(CFLAGS) -c -o test_libappindicator_status_server-test-libappindicator-status-server.o `test -f 'test-libappindicator-status-server.c' || echo '$(srcdir)/'`test-libappindicator-status-server.c
-
-test_libappindicator_status_server-test-libappindicator-status-server.obj: test-libappindicator-status-server.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_libappindicator_status_server_CFLAGS) $(CFLAGS) -MT test_libappindicator_status_server-test-libappindicator-status-server.obj -MD -MP -MF $(DEPDIR)/test_libappindicator_status_server-test-libappindicator-status-server.Tpo -c -o test_libappindicator_status_server-test-libappindicator-status-server.obj `if test -f 'test-libappindicator-status-server.c'; then $(CYGPATH_W) 'test-libappindicator-status-server.c'; else $(CYGPATH_W) '$(srcdir)/test-libappindicator-status-server.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_libappindicator_status_server-test-libappindicator-status-server.Tpo $(DEPDIR)/test_libappindicator_status_server-test-libappindicator-status-server.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='test-libappindicator-status-server.c' object='test_libappindicator_status_server-test-libappindicator-status-server.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_libappindicator_status_server_CFLAGS) $(CFLAGS) -c -o test_libappindicator_status_server-test-libappindicator-status-server.obj `if test -f 'test-libappindicator-status-server.c'; then $(CYGPATH_W) 'test-libappindicator-status-server.c'; else $(CYGPATH_W) '$(srcdir)/test-libappindicator-status-server.c'; fi`
-
-test_simple_app-test-simple-app.o: test-simple-app.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_simple_app_CFLAGS) $(CFLAGS) -MT test_simple_app-test-simple-app.o -MD -MP -MF $(DEPDIR)/test_simple_app-test-simple-app.Tpo -c -o test_simple_app-test-simple-app.o `test -f 'test-simple-app.c' || echo '$(srcdir)/'`test-simple-app.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_simple_app-test-simple-app.Tpo $(DEPDIR)/test_simple_app-test-simple-app.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='test-simple-app.c' object='test_simple_app-test-simple-app.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_simple_app_CFLAGS) $(CFLAGS) -c -o test_simple_app-test-simple-app.o `test -f 'test-simple-app.c' || echo '$(srcdir)/'`test-simple-app.c
-
-test_simple_app-test-simple-app.obj: test-simple-app.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_simple_app_CFLAGS) $(CFLAGS) -MT test_simple_app-test-simple-app.obj -MD -MP -MF $(DEPDIR)/test_simple_app-test-simple-app.Tpo -c -o test_simple_app-test-simple-app.obj `if test -f 'test-simple-app.c'; then $(CYGPATH_W) 'test-simple-app.c'; else $(CYGPATH_W) '$(srcdir)/test-simple-app.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_simple_app-test-simple-app.Tpo $(DEPDIR)/test_simple_app-test-simple-app.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='test-simple-app.c' object='test_simple_app-test-simple-app.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_simple_app_CFLAGS) $(CFLAGS) -c -o test_simple_app-test-simple-app.obj `if test -f 'test-simple-app.c'; then $(CYGPATH_W) 'test-simple-app.c'; else $(CYGPATH_W) '$(srcdir)/test-simple-app.c'; fi`
-
 mostlyclean-libtool:
 	-rm -f *.lo
 
@@ -1065,35 +660,6 @@ test-approver-tester: test-approver Makefile.am
 	@echo $(DBUS_RUNNER) --task $(builddir)/test-approver --task-name Approver --task $(top_builddir)/src/indicator-application-service --task-name Service --ignore-return >> $@
 	@chmod +x $@
 
-test-libappindicator-fallback: test-libappindicator-fallback-watcher test-libappindicator-fallback-item Makefile.am
-	@echo "#!/bin/bash" > $@
-	@echo . $(srcdir)/run-xvfb.sh >> $@
-	@echo $(DBUS_RUNNER) --task ./test-libappindicator-fallback-watcher --task-name Watcher --ignore-return --task ./test-libappindicator-fallback-item --task-name Item >> $@
-	@chmod +x $@
-
-libappindicator-tests: libappindicator-tests-gtester Makefile.am
-	@echo "#!/bin/bash" > $@
-	@echo . $(srcdir)/run-xvfb.sh >> $@
-	@echo $(DBUS_RUNNER) --task ./libappindicator-tests-gtester >> $@
-	@chmod +x $@
-
-libappindicator-tests-gtester: test-libappindicator Makefile.am
-	@echo "#!/bin/sh" > $@
-	@echo gtester -k --verbose -o=$(XML_REPORT) ./test-libappindicator >> $@
-	@chmod +x $@
-
-test-libappindicator-dbus: test-libappindicator-dbus-client test-libappindicator-dbus-server Makefile.am
-	@echo "#!/bin/bash" > test-libappindicator-dbus
-	@echo . $(srcdir)/run-xvfb.sh >> $@
-	@echo $(DBUS_RUNNER) --task ./test-libappindicator-dbus-client --task-name Client --task ./test-libappindicator-dbus-server --task-name Server --ignore-return >> test-libappindicator-dbus
-	@chmod +x test-libappindicator-dbus
-
-test-libappindicator-status: test-libappindicator-status-client test-libappindicator-status-server Makefile.am
-	@echo "#!/bin/bash" > test-libappindicator-status
-	@echo . $(srcdir)/run-xvfb.sh >> $@
-	@echo $(DBUS_RUNNER) --task ./test-libappindicator-status-client --task-name Client --task ./test-libappindicator-status-server --task-name Server --ignore-return >> test-libappindicator-status
-	@chmod +x test-libappindicator-status
-
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/tests/test-approver.c b/tests/test-approver.c
index 2665505..6fc75c5 100644
--- a/tests/test-approver.c
+++ b/tests/test-approver.c
@@ -1,11 +1,10 @@
 #include <glib.h>
 #include <glib-object.h>
+#include <gio/gio.h>
 
-#include <dbus/dbus-glib-bindings.h>
-
-#include "notification-watcher-client.h"
 #include "dbus-shared.h"
-#include "app-indicator.h"
+#include "libappindicator/app-indicator.h"
+#include "gen-notification-approver.xml.h"
 
 #define APPROVER_PATH  "/my/approver"
 
@@ -35,13 +34,22 @@ GType test_approver_get_type (void);
 
 static void test_approver_class_init (TestApproverClass *klass);
 static void test_approver_init       (TestApprover *self);
-static gboolean _notification_approver_server_approve_item (TestApprover * ta, const gchar * id, const gchar * category, guint pid, const gchar * address, const gchar * path, gboolean * approved, GError ** error);
-
-#include "../src/notification-approver-server.h"
+static GVariant * approve_item (TestApprover * ta, const gchar * id);
+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);
+
+/* GDBus Stuff */
+static GDBusNodeInfo *      node_info = NULL;
+static GDBusInterfaceInfo * interface_info = NULL;
+static GDBusInterfaceVTable interface_table = {
+       method_call:    bus_method_call,
+       get_property:   NULL, /* No properties */
+       set_property:   NULL  /* No properties */
+};
 
 GMainLoop * main_loop = NULL;
-DBusGConnection * session_bus = NULL;
-DBusGProxy * bus_proxy = NULL;
+GDBusConnection * session_bus = NULL;
+GDBusProxy * bus_proxy = NULL;
+GDBusProxy * watcher_proxy = NULL;
 AppIndicator * app_indicator = NULL;
 gboolean passed = FALSE;
 
@@ -50,8 +58,24 @@ G_DEFINE_TYPE (TestApprover, test_approver, G_TYPE_OBJECT);
 static void
 test_approver_class_init (TestApproverClass *klass)
 {
-	dbus_g_object_type_install_info(TEST_APPROVER_TYPE,
-	                                &dbus_glib__notification_approver_server_object_info);
+	/* Setting up the DBus interfaces */
+	if (node_info == NULL) {
+		GError * error = NULL;
+
+		node_info = g_dbus_node_info_new_for_xml(_notification_approver, &error);
+		if (error != NULL) {
+			g_error("Unable to parse Approver Service Interface description: %s", error->message);
+			g_error_free(error);
+		}
+	}
+
+	if (interface_info == NULL) {
+		interface_info = g_dbus_node_info_lookup_interface(node_info, NOTIFICATION_APPROVER_DBUS_IFACE);
+
+		if (interface_info == NULL) {
+			g_error("Unable to find interface '" NOTIFICATION_APPROVER_DBUS_IFACE "'");
+		}
+	}
 
 	return;
 }
@@ -59,17 +83,29 @@ test_approver_class_init (TestApproverClass *klass)
 static void
 test_approver_init (TestApprover *self)
 {
-	dbus_g_connection_register_g_object(session_bus,
-	                                    APPROVER_PATH,
-	                                    G_OBJECT(self));
+	GError * error = NULL;
+
+	/* Now register our object on our new connection */
+	g_dbus_connection_register_object(session_bus,
+	                                  APPROVER_PATH,
+	                                  interface_info,
+	                                  &interface_table,
+	                                  self,
+	                                  NULL,
+	                                  &error);
+
+	if (error != NULL) {
+		g_error("Unable to register the object to DBus: %s", error->message);
+		g_error_free(error);
+		return;
+	}
 
 	return;
 }
 
-static gboolean 
-_notification_approver_server_approve_item (TestApprover * ta, const gchar * id, const gchar * category, guint pid, const gchar * address, const gchar * path, gboolean * approved, GError ** error)
+static GVariant *
+approve_item (TestApprover * ta, const gchar * id)
 {
-	*approved = TRUE;
 	g_debug("Asked to approve indicator");
 
 	if (g_strcmp0(id, INDICATOR_ID) == 0) {
@@ -78,12 +114,41 @@ _notification_approver_server_approve_item (TestApprover * ta, const gchar * id,
 
 	g_main_loop_quit(main_loop);
 
-	return TRUE;
+	return g_variant_new("(b)", TRUE);
 }
 
+/* A method has been called from our dbus inteface.  Figure out what it
+   is and dispatch it. */
 static void
-register_cb (DBusGProxy * proxy, GError * error, gpointer user_data)
+bus_method_call (GDBusConnection * connection, const gchar * sender,
+                 const gchar * path, const gchar * interface,
+                 const gchar * method, GVariant * params,
+                 GDBusMethodInvocation * invocation, gpointer user_data)
 {
+	TestApprover * ta = (TestApprover *)user_data;
+	GVariant * retval = NULL;
+
+	if (g_strcmp0(method, "ApproveItem") == 0) {
+		const gchar * id;
+		g_variant_get(params, "(&ssuso)", &id, NULL, NULL, NULL, NULL);
+		retval = approve_item(ta, id);
+	} else {
+		g_warning("Calling method '%s' on the indicator service and it's unknown", method);
+	}
+
+	g_dbus_method_invocation_return_value(invocation, retval);
+	return;
+}
+
+static void
+register_cb (GObject *object, GAsyncResult *res, gpointer user_data)
+{
+	GDBusProxy * proxy = G_DBUS_PROXY(object);
+	GError * error = NULL;
+	GVariant * result;
+
+	result = g_dbus_proxy_call_finish(proxy, res, &error);
+
 	if (error != NULL) {
 		g_warning("Unable to register approver: %s", error->message);
 		g_error_free(error);
@@ -118,18 +183,17 @@ check_for_service (gpointer user_data)
 	owner_count++;
 
 	gboolean has_owner = FALSE;
-	org_freedesktop_DBus_name_has_owner(bus_proxy, NOTIFICATION_WATCHER_DBUS_ADDR, &has_owner, NULL);
+	gchar * owner = g_dbus_proxy_get_name_owner(bus_proxy);
+	has_owner = (owner != NULL);
+	g_free (owner);
 
 	if (has_owner) {
-		const char * cats = NULL;
-		DBusGProxy * proxy = dbus_g_proxy_new_for_name(session_bus,
-		                                               NOTIFICATION_WATCHER_DBUS_ADDR,
-		                                               NOTIFICATION_WATCHER_DBUS_OBJ,
-		                                               NOTIFICATION_WATCHER_DBUS_IFACE);
-
 		g_debug("Registering Approver");
-		org_kde_StatusNotifierWatcher_x_ayatana_register_notification_approver_async (proxy, APPROVER_PATH, &cats, register_cb, NULL);
-
+		GVariantBuilder * builder = g_variant_builder_new(G_VARIANT_TYPE("as"));
+		g_dbus_proxy_call(bus_proxy, "XAyatanaRegisterNotificationApprover",
+		                  g_variant_new("(oas)", APPROVER_PATH, builder),
+		                  G_DBUS_CALL_FLAGS_NONE, -1, NULL, register_cb,
+		                  NULL);
 		return FALSE;
 	}
 
@@ -152,16 +216,22 @@ main (int argc, char ** argv)
 	gtk_init(&argc, &argv);
 	g_debug("Initing");
 
-	session_bus = dbus_g_bus_get(DBUS_BUS_SESSION, &error);
+	session_bus = g_bus_get_sync(G_BUS_TYPE_SESSION, NULL, &error);
+	TestApprover * approver = g_object_new(TEST_APPROVER_TYPE, NULL);
+
+	bus_proxy = g_dbus_proxy_new_for_bus_sync(G_BUS_TYPE_SESSION, G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START, NULL, NOTIFICATION_WATCHER_DBUS_ADDR, NOTIFICATION_WATCHER_DBUS_OBJ, NOTIFICATION_WATCHER_DBUS_IFACE, NULL, &error);
 	if (error != NULL) {
-		g_warning("Unable to get session bus: %s", error->message);
+		g_warning("Unable to get bus proxy: %s", error->message);
 		g_error_free(error);
 		return -1;
 	}
 
-	TestApprover * approver = g_object_new(TEST_APPROVER_TYPE, NULL);
-
-	bus_proxy = dbus_g_proxy_new_for_name(session_bus, DBUS_SERVICE_DBUS, DBUS_PATH_DBUS, DBUS_INTERFACE_DBUS);
+	watcher_proxy = g_dbus_proxy_new_for_bus_sync(G_BUS_TYPE_SESSION, G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START, NULL, NOTIFICATION_WATCHER_DBUS_ADDR, NOTIFICATION_WATCHER_DBUS_OBJ, NOTIFICATION_WATCHER_DBUS_IFACE, NULL, &error);
+	if (error != NULL) {
+		g_warning("Unable to get watcher bus: %s", error->message);
+		g_error_free(error);
+		return -1;
+	}
 
 	g_timeout_add(100, check_for_service, NULL);
 	g_timeout_add_seconds(2, fail_timeout, NULL);
diff --git a/tests/test-defines.h b/tests/test-defines.h
deleted file mode 100644
index 2baf728..0000000
--- a/tests/test-defines.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
-Testing defines to be shared between various tests.
-
-Copyright 2009 Canonical Ltd.
-
-Authors:
-    Ted Gould <ted@canonical.com>
-
-This program is free software: you can redistribute it and/or modify it 
-under the terms of the GNU General Public License version 3, as published 
-by the Free Software Foundation.
-
-This program is distributed in the hope that it will be useful, but 
-WITHOUT ANY WARRANTY; without even the implied warranties of 
-MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR 
-PURPOSE.  See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along 
-with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#define  TEST_ID                   "my-id"
-#define  TEST_ICON_NAME            "my-icon-name"
-#define  TEST_ATTENTION_ICON_NAME  "my-attention-icon-name"
-#define  TEST_STATE                APP_INDICATOR_STATUS_ACTIVE
-#define  TEST_STATE_S              "Active"
-#define  TEST_CATEGORY             APP_INDICATOR_CATEGORY_APPLICATION_STATUS
-#define  TEST_CATEGORY_S           "ApplicationStatus"
-#define  TEST_OBJECT               "/an/object/path/to/use"
-
diff --git a/tests/test-libappindicator-dbus-client.c b/tests/test-libappindicator-dbus-client.c
deleted file mode 100644
index 1500213..0000000
--- a/tests/test-libappindicator-dbus-client.c
+++ /dev/null
@@ -1,292 +0,0 @@
-/*
-Tests for the libappindicator library that are over DBus.  This is
-the client side of those tests.
-
-Copyright 2009 Canonical Ltd.
-
-Authors:
-    Ted Gould <ted@canonical.com>
-
-This program is free software: you can redistribute it and/or modify it
-under the terms of the GNU General Public License version 3, as published
-by the Free Software Foundation.
-
-This program is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranties of
-MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
-PURPOSE.  See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along
-with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-
-#include <glib.h>
-#include <dbus/dbus-glib.h>
-#include <dbus/dbus-glib-bindings.h>
-#include <dbus/dbus-glib-lowlevel.h>
-#include <app-indicator.h>
-#include "test-defines.h"
-
-#include "../src/dbus-shared.h"
-
-static GMainLoop * mainloop = NULL;
-static gboolean passed = TRUE;
-static int propcount = 0;
-
-static void
-check_propcount (void)
-{
-	if (propcount >= 5) {
-		g_main_loop_quit(mainloop);
-	}
-	return;
-}
-
-
-static void
-prop_id_cb (DBusGProxy * proxy, DBusGProxyCall * call, void * data)
-{
-	propcount++;
-
-	GError * error = NULL;
-	GValue value = {0};
-
-	if (!dbus_g_proxy_end_call(proxy, call, &error, G_TYPE_VALUE, &value, G_TYPE_INVALID)) {
-		g_warning("Getting ID failed: %s", error->message);
-		g_error_free(error);
-		passed = FALSE;
-		check_propcount();
-		return;
-	}
-
-	if (g_strcmp0(TEST_ID, g_value_get_string(&value))) {
-		g_debug("Property ID Returned: FAILED");
-		passed = FALSE;
-	} else {
-		g_debug("Property ID Returned: PASSED");
-	}
-
-	check_propcount();
-	return;
-}
-
-static void
-prop_category_cb (DBusGProxy * proxy, DBusGProxyCall * call, void * data)
-{
-	propcount++;
-
-	GError * error = NULL;
-	GValue value = {0};
-
-	if (!dbus_g_proxy_end_call(proxy, call, &error, G_TYPE_VALUE, &value, G_TYPE_INVALID)) {
-		g_warning("Getting category failed: %s", error->message);
-		g_error_free(error);
-		passed = FALSE;
-		check_propcount();
-		return;
-	}
-
-	if (g_strcmp0(TEST_CATEGORY_S, g_value_get_string(&value))) {
-		g_debug("Property category Returned: FAILED");
-		passed = FALSE;
-	} else {
-		g_debug("Property category Returned: PASSED");
-	}
-
-	check_propcount();
-	return;
-}
-
-static void
-prop_status_cb (DBusGProxy * proxy, DBusGProxyCall * call, void * data)
-{
-	propcount++;
-
-	GError * error = NULL;
-	GValue value = {0};
-
-	if (!dbus_g_proxy_end_call(proxy, call, &error, G_TYPE_VALUE, &value, G_TYPE_INVALID)) {
-		g_warning("Getting status failed: %s", error->message);
-		g_error_free(error);
-		passed = FALSE;
-		check_propcount();
-		return;
-	}
-
-	if (g_strcmp0(TEST_STATE_S, g_value_get_string(&value))) {
-		g_debug("Property status Returned: FAILED");
-		passed = FALSE;
-	} else {
-		g_debug("Property status Returned: PASSED");
-	}
-
-	check_propcount();
-	return;
-}
-
-static void
-prop_icon_name_cb (DBusGProxy * proxy, DBusGProxyCall * call, void * data)
-{
-	propcount++;
-
-	GError * error = NULL;
-	GValue value = {0};
-
-	if (!dbus_g_proxy_end_call(proxy, call, &error, G_TYPE_VALUE, &value, G_TYPE_INVALID)) {
-		g_warning("Getting icon name failed: %s", error->message);
-		g_error_free(error);
-		passed = FALSE;
-		check_propcount();
-		return;
-	}
-
-	if (g_strcmp0(TEST_ICON_NAME, g_value_get_string(&value))) {
-		g_debug("Property icon name Returned: FAILED");
-		passed = FALSE;
-	} else {
-		g_debug("Property icon name Returned: PASSED");
-	}
-
-	check_propcount();
-	return;
-}
-
-static void
-prop_attention_icon_name_cb (DBusGProxy * proxy, DBusGProxyCall * call, void * data)
-{
-	propcount++;
-
-	GError * error = NULL;
-	GValue value = {0};
-
-	if (!dbus_g_proxy_end_call(proxy, call, &error, G_TYPE_VALUE, &value, G_TYPE_INVALID)) {
-		g_warning("Getting attention icon name failed: %s", error->message);
-		g_error_free(error);
-		passed = FALSE;
-		check_propcount();
-		return;
-	}
-
-	if (g_strcmp0(TEST_ATTENTION_ICON_NAME, g_value_get_string(&value))) {
-		g_debug("Property attention icon name Returned: FAILED");
-		passed = FALSE;
-	} else {
-		g_debug("Property attention icon name Returned: PASSED");
-	}
-
-	check_propcount();
-	return;
-}
-
-gboolean
-kill_func (gpointer userdata)
-{
-	g_main_loop_quit(mainloop);
-	g_warning("Forced to Kill");
-	passed = FALSE;
-	return FALSE;
-}
-
-static DBusHandlerResult
-dbus_filter (DBusConnection * connection, DBusMessage * message, void * user_data)
-{
-	if (dbus_message_is_method_call(message, NOTIFICATION_WATCHER_DBUS_ADDR, "RegisterStatusNotifierItem")) {
-		DBusMessage * reply = dbus_message_new_method_return(message);
-		dbus_connection_send(connection, reply, NULL);
-		dbus_message_unref(reply);
-		return DBUS_HANDLER_RESULT_HANDLED;
-	}
-
-	return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
-}
-
-gint
-main (gint argc, gchar * argv[])
-{
-	g_type_init();
-
-	g_usleep(500000);
-
-	GError * error = NULL;
-	DBusGConnection * session_bus = dbus_g_bus_get(DBUS_BUS_SESSION, &error);
-	if (error != NULL) {
-		g_error("Unable to get session bus: %s", error->message);
-		return 1;
-	}
-
-    DBusGProxy * bus_proxy = dbus_g_proxy_new_for_name(session_bus, DBUS_SERVICE_DBUS, DBUS_PATH_DBUS, DBUS_INTERFACE_DBUS);
-	guint nameret = 0;
-
-	if (!org_freedesktop_DBus_request_name(bus_proxy, NOTIFICATION_WATCHER_DBUS_ADDR, 0, &nameret, &error)) {
-		g_error("Unable to call to request name");
-		return 1;
-	}   
-
-	if (nameret != DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER) {
-		g_error("Unable to get name");
-		return 1;
-	}
-
-	dbus_connection_add_filter(dbus_g_connection_get_connection(session_bus), dbus_filter, NULL, NULL);
-
-	DBusGProxy * props = dbus_g_proxy_new_for_name_owner(session_bus,
-	                                                     ":1.0",
-	                                                     "/org/ayatana/NotificationItem/my_id",
-	                                                     DBUS_INTERFACE_PROPERTIES,
-	                                                     &error);
-	if (error != NULL) {
-		g_error("Unable to get property proxy: %s", error->message);
-		return 1;
-	}
-
-	dbus_g_proxy_begin_call (props,
-	                         "Get",
-	                         prop_id_cb,
-	                         NULL, NULL,
-	                         G_TYPE_STRING, "org.ayatana.indicator.application.NotificationItem",
-	                         G_TYPE_STRING, "Id",
-	                         G_TYPE_INVALID);
-	dbus_g_proxy_begin_call (props,
-	                         "Get",
-	                         prop_category_cb,
-	                         NULL, NULL,
-	                         G_TYPE_STRING, "org.ayatana.indicator.application.NotificationItem",
-	                         G_TYPE_STRING, "Category",
-	                         G_TYPE_INVALID);
-	dbus_g_proxy_begin_call (props,
-	                         "Get",
-	                         prop_status_cb,
-	                         NULL, NULL,
-	                         G_TYPE_STRING, "org.ayatana.indicator.application.NotificationItem",
-	                         G_TYPE_STRING, "Status",
-	                         G_TYPE_INVALID);
-	dbus_g_proxy_begin_call (props,
-	                         "Get",
-	                         prop_icon_name_cb,
-	                         NULL, NULL,
-	                         G_TYPE_STRING, "org.ayatana.indicator.application.NotificationItem",
-	                         G_TYPE_STRING, "IconName",
-	                         G_TYPE_INVALID);
-	dbus_g_proxy_begin_call (props,
-	                         "Get",
-	                         prop_attention_icon_name_cb,
-	                         NULL, NULL,
-	                         G_TYPE_STRING, "org.ayatana.indicator.application.NotificationItem",
-	                         G_TYPE_STRING, "AttentionIconName",
-	                         G_TYPE_INVALID);
-
-	g_timeout_add_seconds(2, kill_func, NULL);
-
-	mainloop = g_main_loop_new(NULL, FALSE);
-	g_main_loop_run(mainloop);
-
-	if (passed) {
-		g_debug("Quiting");
-		return 0;
-	} else {
-		g_debug("Quiting as we're a failure");
-		return 1;
-	}
-	return 0;
-}
diff --git a/tests/test-libappindicator-dbus-server.c b/tests/test-libappindicator-dbus-server.c
deleted file mode 100644
index 995d49b..0000000
--- a/tests/test-libappindicator-dbus-server.c
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
-Tests for the libappindicator library that are over DBus.  This is
-the server side of those tests.
-
-Copyright 2009 Canonical Ltd.
-
-Authors:
-    Ted Gould <ted@canonical.com>
-
-This program is free software: you can redistribute it and/or modify it
-under the terms of the GNU General Public License version 3, as published
-by the Free Software Foundation.
-
-This program is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranties of
-MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
-PURPOSE.  See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along
-with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-
-#include <dbus/dbus-glib.h>
-#include <dbus/dbus-glib-lowlevel.h>
-#include <gtk/gtk.h>
-#include <app-indicator.h>
-#include "test-defines.h"
-
-static GMainLoop * mainloop = NULL;
-
-gboolean
-kill_func (gpointer userdata)
-{
-	g_main_loop_quit(mainloop);
-	return FALSE;
-}
-
-gint
-main (gint argc, gchar * argv[])
-{
-	gtk_init(&argc, &argv);
-
-	g_debug("DBus ID: %s", dbus_connection_get_server_id(dbus_g_connection_get_connection(dbus_g_bus_get(DBUS_BUS_SESSION, NULL))));
-
-	AppIndicator * ci = app_indicator_new (TEST_ID, TEST_ICON_NAME, TEST_CATEGORY);
-
-	app_indicator_set_status (ci, TEST_STATE);
-	app_indicator_set_attention_icon (ci, TEST_ATTENTION_ICON_NAME);
-
-	GtkMenu * menu = GTK_MENU(gtk_menu_new());
-	GtkMenuItem * item = GTK_MENU_ITEM(gtk_menu_item_new_with_label("Label"));
-	gtk_menu_shell_append(GTK_MENU_SHELL(menu), GTK_WIDGET(item));
-
-	app_indicator_set_menu(ci, menu);
-
-	g_timeout_add_seconds(2, kill_func, NULL);
-
-	mainloop = g_main_loop_new(NULL, FALSE);
-	g_main_loop_run(mainloop);
-
-	g_object_unref(G_OBJECT(ci));
-	g_debug("Quiting");
-
-	return 0;
-}
diff --git a/tests/test-libappindicator-fallback-item.c b/tests/test-libappindicator-fallback-item.c
deleted file mode 100644
index 418b779..0000000
--- a/tests/test-libappindicator-fallback-item.c
+++ /dev/null
@@ -1,153 +0,0 @@
-#include <glib.h>
-#include <glib-object.h>
-#include <dbus/dbus-glib.h>
-#include <dbus/dbus-glib-bindings.h>
-#include <app-indicator.h>
-
-#define TEST_LIBAPPINDICATOR_FALLBACK_ITEM_TYPE            (test_libappindicator_fallback_item_get_type ())
-#define TEST_LIBAPPINDICATOR_FALLBACK_ITEM(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), TEST_LIBAPPINDICATOR_FALLBACK_ITEM_TYPE, TestLibappindicatorFallbackItem))
-#define TEST_LIBAPPINDICATOR_FALLBACK_ITEM_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), TEST_LIBAPPINDICATOR_FALLBACK_ITEM_TYPE, TestLibappindicatorFallbackItemClass))
-#define IS_TEST_LIBAPPINDICATOR_FALLBACK_ITEM(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TEST_LIBAPPINDICATOR_FALLBACK_ITEM_TYPE))
-#define IS_TEST_LIBAPPINDICATOR_FALLBACK_ITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TEST_LIBAPPINDICATOR_FALLBACK_ITEM_TYPE))
-#define TEST_LIBAPPINDICATOR_FALLBACK_ITEM_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), TEST_LIBAPPINDICATOR_FALLBACK_ITEM_TYPE, TestLibappindicatorFallbackItemClass))
-
-typedef struct _TestLibappindicatorFallbackItem      TestLibappindicatorFallbackItem;
-typedef struct _TestLibappindicatorFallbackItemClass TestLibappindicatorFallbackItemClass;
-
-struct _TestLibappindicatorFallbackItemClass {
-	AppIndicatorClass parent_class;
-
-};
-
-struct _TestLibappindicatorFallbackItem {
-	AppIndicator parent;
-
-};
-
-GType test_libappindicator_fallback_item_get_type (void);
-
-#define TEST_LIBAPPINDICATOR_FALLBACK_ITEM_GET_PRIVATE(o) \
-(G_TYPE_INSTANCE_GET_PRIVATE ((o), TEST_LIBAPPINDICATOR_FALLBACK_ITEM_TYPE, TestLibappindicatorFallbackItemPrivate))
-
-static void test_libappindicator_fallback_item_class_init (TestLibappindicatorFallbackItemClass *klass);
-static void test_libappindicator_fallback_item_init       (TestLibappindicatorFallbackItem *self);
-static GtkStatusIcon * fallback (AppIndicator * indicator);
-static void unfallback (AppIndicator * indicator, GtkStatusIcon * status_icon);
-
-G_DEFINE_TYPE (TestLibappindicatorFallbackItem, test_libappindicator_fallback_item, APP_INDICATOR_TYPE);
-
-static void
-test_libappindicator_fallback_item_class_init (TestLibappindicatorFallbackItemClass *klass)
-{
-	AppIndicatorClass * aiclass = APP_INDICATOR_CLASS(klass);
-
-	aiclass->fallback = fallback;
-	aiclass->unfallback = unfallback;
-}
-
-static void
-test_libappindicator_fallback_item_init (TestLibappindicatorFallbackItem *self)
-{
-}
-
-GMainLoop * mainloop = NULL;
-gboolean passed = FALSE;
-
-enum {
-	STATE_INIT,
-	STATE_FALLBACK,
-	STATE_UNFALLBACK,
-	STATE_REFALLBACK,
-	STATE_REUNFALLBACK
-};
-
-gint state = STATE_INIT;
-
-static GtkStatusIcon *
-fallback (AppIndicator * indicator)
-{
-	g_debug("Fallback");
-	if (state == STATE_INIT) {
-		state = STATE_FALLBACK;
-	} else if (state == STATE_UNFALLBACK) {
-		state = STATE_REFALLBACK;
-	} else {
-		g_debug("Error, fallback in state: %d", state);
-		passed = FALSE;
-	}
-	return (GtkStatusIcon *)5;
-}
-
-static void
-unfallback (AppIndicator * indicator, GtkStatusIcon * status_icon)
-{
-	g_debug("Unfallback");
-	if (state == STATE_FALLBACK) {
-		state = STATE_UNFALLBACK;
-	} else if (state == STATE_REFALLBACK) {
-		state = STATE_REUNFALLBACK;
-		passed = TRUE;
-		g_main_loop_quit(mainloop);
-	} else {
-		g_debug("Error, unfallback in state: %d", state);
-		passed = FALSE;
-	}
-	return;
-}
-
-gboolean
-kill_func (gpointer data)
-{
-	g_debug("Kill Function");
-	g_main_loop_quit(mainloop);
-	return FALSE;
-}
-
-int
-main (int argc, char ** argv)
-{
-	gtk_init(&argc, &argv);
-
-	GError * error = NULL;
-	DBusGConnection * session_bus = dbus_g_bus_get(DBUS_BUS_SESSION, &error);
-	if (error != NULL) {
-		g_error("Unable to get session bus: %s", error->message);
-		return 1;
-	}
-
-    DBusGProxy * bus_proxy = dbus_g_proxy_new_for_name(session_bus, DBUS_SERVICE_DBUS, DBUS_PATH_DBUS, DBUS_INTERFACE_DBUS);
-
-	guint nameret = 0;
-
-	if (!org_freedesktop_DBus_request_name(bus_proxy, "org.test", 0, &nameret, NULL)) {
-		g_error("Unable to call to request name");
-		return 1;
-	}   
-
-	if (nameret != DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER) {
-		g_error("Unable to get name");
-		return 1;
-	}
-
-	TestLibappindicatorFallbackItem * item = g_object_new(TEST_LIBAPPINDICATOR_FALLBACK_ITEM_TYPE,
-		"id", "test-id",
-		"category", "Other",
-		"icon-name", "bob",
-		NULL);
-	
-	GtkWidget * menu = gtk_menu_new();
-	app_indicator_set_menu(APP_INDICATOR(item), GTK_MENU(menu));
-
-	g_timeout_add_seconds(2, kill_func, NULL);
-
-	mainloop = g_main_loop_new(NULL, FALSE);
-	g_main_loop_run(mainloop);
-
-	g_object_unref(G_OBJECT(item));
-
-	if (passed) {
-		return 0;
-	} else {
-		return 1;
-	}
-}
diff --git a/tests/test-libappindicator-fallback-watcher.c b/tests/test-libappindicator-fallback-watcher.c
deleted file mode 100644
index 5494082..0000000
--- a/tests/test-libappindicator-fallback-watcher.c
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
-This puts the NotificationWatcher on the bus, kinda.  Enough to
-trick the Item into unfalling back.
-
-Copyright 2010 Canonical Ltd.
-
-Authors:
-    Ted Gould <ted@canonical.com>
-
-This program is free software: you can redistribute it and/or modify it
-under the terms of the GNU General Public License version 3, as published
-by the Free Software Foundation.
-
-This program is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranties of
-MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
-PURPOSE.  See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along
-with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include <glib.h>
-#include <dbus/dbus-glib.h>
-#include <dbus/dbus-glib-bindings.h>
-#include <dbus/dbus-glib-lowlevel.h>
-
-#include "../src/dbus-shared.h"
-
-gboolean kill_func (gpointer userdata);
-
-static GMainLoop * mainloop = NULL;
-
-static DBusHandlerResult
-dbus_filter (DBusConnection * connection, DBusMessage * message, void * user_data)
-{
-	if (dbus_message_is_method_call(message, NOTIFICATION_WATCHER_DBUS_ADDR, "RegisterStatusNotifierItem")) {
-		DBusMessage * reply = dbus_message_new_method_return(message);
-		dbus_connection_send(connection, reply, NULL);
-		dbus_message_unref(reply);
-
-		/* Let the messages get out, but we're done at this point */
-		g_timeout_add(50, kill_func, NULL);
-
-		return DBUS_HANDLER_RESULT_HANDLED;
-	}
-
-	return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
-}
-
-gboolean
-kill_func (gpointer userdata)
-{
-	g_main_loop_quit(mainloop);
-	return FALSE;
-}
-
-int
-main (int argv, char ** argc)
-{
-	g_type_init();
-
-	g_debug("Waiting to init.");
-
-
-	GError * error = NULL;
-	DBusGConnection * session_bus = dbus_g_bus_get(DBUS_BUS_SESSION, &error);
-	if (error != NULL) {
-		g_error("Unable to get session bus: %s", error->message);
-		return 1;
-	}
-
-    DBusGProxy * bus_proxy = dbus_g_proxy_new_for_name(session_bus, DBUS_SERVICE_DBUS, DBUS_PATH_DBUS, DBUS_INTERFACE_DBUS);
-
-	gboolean has_owner = FALSE;
-	gint owner_count = 0;
-	while (!has_owner && owner_count < 10000) {
-		org_freedesktop_DBus_name_has_owner(bus_proxy, "org.test", &has_owner, NULL);
-		owner_count++;
-	}
-
-	if (owner_count == 10000) {
-		g_error("Unable to get name owner after 10000 tries");
-		return 1;
-	}
-
-	g_usleep(500000);
-
-	g_debug("Initing");
-
-	guint nameret = 0;
-
-	if (!org_freedesktop_DBus_request_name(bus_proxy, NOTIFICATION_WATCHER_DBUS_ADDR, 0, &nameret, &error)) {
-		g_error("Unable to call to request name");
-		return 1;
-	}   
-
-	if (nameret != DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER) {
-		g_error("Unable to get name");
-		return 1;
-	}
-
-	dbus_connection_add_filter(dbus_g_connection_get_connection(session_bus), dbus_filter, NULL, NULL);
-
-	/* This is the final kill function.  It really shouldn't happen
-	   unless we get an error. */
-	g_timeout_add(2000, kill_func, NULL);
-
-	g_debug("Entering Mainloop");
-
-	mainloop = g_main_loop_new(NULL, FALSE);
-	g_main_loop_run(mainloop);
-
-	g_debug("Exiting");
-
-	return 0;
-}
diff --git a/tests/test-libappindicator-status-client.c b/tests/test-libappindicator-status-client.c
deleted file mode 100644
index 9e39ed8..0000000
--- a/tests/test-libappindicator-status-client.c
+++ /dev/null
@@ -1,153 +0,0 @@
-/*
-Tests for the libappindicator library that are over DBus.  This is
-the client side of those tests.
-
-Copyright 2009 Canonical Ltd.
-
-Authors:
-    Ted Gould <ted@canonical.com>
-
-This program is free software: you can redistribute it and/or modify it
-under the terms of the GNU General Public License version 3, as published
-by the Free Software Foundation.
-
-This program is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranties of
-MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
-PURPOSE.  See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along
-with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-
-#include <glib.h>
-#include <dbus/dbus-glib.h>
-#include <dbus/dbus-glib-bindings.h>
-#include <dbus/dbus-glib-lowlevel.h>
-#include "../src/dbus-shared.h"
-
-static GMainLoop * mainloop = NULL;
-static gboolean passed = TRUE;
-static gboolean watchdog_hit = TRUE;
-static gboolean active = FALSE;
-static guint toggle_count = 0;
-
-#define PASSIVE_STR  "Passive"
-#define ACTIVE_STR   "Active"
-#define ATTN_STR     "NeedsAttention"
-
-static DBusHandlerResult
-dbus_reg_filter (DBusConnection * connection, DBusMessage * message, void * user_data)
-{
-	if (dbus_message_is_method_call(message, NOTIFICATION_WATCHER_DBUS_ADDR, "RegisterStatusNotifierItem")) {
-		DBusMessage * reply = dbus_message_new_method_return(message);
-		dbus_connection_send(connection, reply, NULL);
-		dbus_message_unref(reply);
-		return DBUS_HANDLER_RESULT_HANDLED;
-	}
-
-	return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
-}
-
-
-static DBusHandlerResult
-dbus_filter (DBusConnection * connection, DBusMessage * message, void * user_data)
-{
-	if (!dbus_message_is_signal(message, NOTIFICATION_ITEM_DBUS_IFACE, "NewStatus")) {
-		return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
-	}
-
-	gchar * string;
-
-	DBusError derror;
-	dbus_error_init(&derror);
-	if (!dbus_message_get_args(message, &derror,
-				DBUS_TYPE_STRING, &string,
-				DBUS_TYPE_INVALID)) {
-		g_warning("Couldn't get parameters");
-		dbus_error_free(&derror);
-		return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
-	}
-
-	watchdog_hit = TRUE;
-
-	if (g_strcmp0(string, ACTIVE_STR) == 0) {
-		if (active) {
-			g_warning("Got active when already active");
-			passed = FALSE;
-			return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
-		}
-		active = TRUE;
-	} else {
-		active = FALSE;
-	}
-
-	toggle_count++;
-
-	if (toggle_count == 100) {
-		g_main_loop_quit(mainloop);
-	}
-
-	return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
-}
-
-gboolean
-kill_func (gpointer userdata)
-{
-	if (watchdog_hit == FALSE) {
-		g_main_loop_quit(mainloop);
-		g_warning("Forced to Kill");
-		g_warning("Toggle count: %d", toggle_count);
-		passed = FALSE;
-		return FALSE;
-	}
-	watchdog_hit = FALSE;
-	return TRUE;
-}
-
-gint
-main (gint argc, gchar * argv[])
-{
-	g_type_init();
-
-	GError * error = NULL;
-	DBusGConnection * session_bus = dbus_g_bus_get(DBUS_BUS_SESSION, &error);
-	if (error != NULL) {
-		g_error("Unable to get session bus: %s", error->message);
-		return 1;
-	}
-
-    DBusGProxy * bus_proxy = dbus_g_proxy_new_for_name(session_bus, DBUS_SERVICE_DBUS, DBUS_PATH_DBUS, DBUS_INTERFACE_DBUS);
-	guint nameret = 0;
-
-	if (!org_freedesktop_DBus_request_name(bus_proxy, NOTIFICATION_WATCHER_DBUS_ADDR, 0, &nameret, &error)) {
-		g_error("Unable to call to request name");
-		return 1;
-	}   
-
-	if (nameret != DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER) {
-		g_error("Unable to get name");
-		return 1;
-	}
-
-	dbus_connection_add_filter(dbus_g_connection_get_connection(session_bus), dbus_reg_filter, NULL, NULL);
-
-	dbus_connection_add_filter(dbus_g_connection_get_connection(session_bus), dbus_filter, NULL, NULL);
-	dbus_bus_add_match(dbus_g_connection_get_connection(session_bus), "type='signal',interface='" NOTIFICATION_ITEM_DBUS_IFACE "',member='NewStatus'", NULL);
-
-	watchdog_hit = TRUE;
-	g_timeout_add(1000, kill_func, NULL);
-
-	mainloop = g_main_loop_new(NULL, FALSE);
-	g_main_loop_run(mainloop);
-
-	if (passed) {
-		g_debug("Quiting");
-		return 0;
-	} else {
-		g_debug("Quiting as we're a failure");
-		return 1;
-	}
-	return 0;
-}
diff --git a/tests/test-libappindicator-status-server.c b/tests/test-libappindicator-status-server.c
deleted file mode 100644
index 8cd5571..0000000
--- a/tests/test-libappindicator-status-server.c
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
-Tests for the libappindicator library that are over DBus.  This is
-the server side of those tests.
-
-Copyright 2009 Canonical Ltd.
-
-Authors:
-    Ted Gould <ted@canonical.com>
-
-This program is free software: you can redistribute it and/or modify it
-under the terms of the GNU General Public License version 3, as published
-by the Free Software Foundation.
-
-This program is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranties of
-MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
-PURPOSE.  See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along
-with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-
-#include <stdlib.h>
-#include <dbus/dbus-glib.h>
-#include <dbus/dbus-glib-lowlevel.h>
-#include <glib.h>
-#include <app-indicator.h>
-
-static GMainLoop * mainloop = NULL;
-static gboolean active = FALSE;
-static guint toggle_count = 0;
-
-gboolean
-toggle (gpointer userdata)
-{
-	if (active) {
-		app_indicator_set_status (APP_INDICATOR(userdata), APP_INDICATOR_STATUS_ATTENTION);
-		active = FALSE;
-	} else {
-		app_indicator_set_status (APP_INDICATOR(userdata), APP_INDICATOR_STATUS_ACTIVE);
-		active = TRUE;
-	}
-
-	toggle_count++;
-
-	if (toggle_count == 100) {
-		g_main_loop_quit(mainloop);
-		return FALSE;
-	}
-
-	return TRUE;
-}
-
-gint
-main (gint argc, gchar * argv[])
-{
-	gtk_init(&argc, &argv);
-
-	g_usleep(100000);
-
-	g_debug("DBus ID: %s", dbus_connection_get_server_id(dbus_g_connection_get_connection(dbus_g_bus_get(DBUS_BUS_SESSION, NULL))));
-
-	AppIndicator * ci = app_indicator_new ("my-id", "my-icon-name", APP_INDICATOR_CATEGORY_APPLICATION_STATUS);
-	app_indicator_set_attention_icon (ci, "my-attention-icon");
-
-	GtkMenu * menu = GTK_MENU(gtk_menu_new());
-	GtkMenuItem * item = GTK_MENU_ITEM(gtk_menu_item_new_with_label("Label"));
-	gtk_menu_shell_append(GTK_MENU_SHELL(menu), GTK_WIDGET(item));
-
-	app_indicator_set_menu(ci, menu);
-
-	g_timeout_add(50, toggle, ci);
-
-	mainloop = g_main_loop_new(NULL, FALSE);
-	g_main_loop_run(mainloop);
-
-	g_object_unref(G_OBJECT(ci));
-	g_debug("Quiting");
-
-	return 0;
-}
diff --git a/tests/test-libappindicator.c b/tests/test-libappindicator.c
deleted file mode 100644
index 8d12ac5..0000000
--- a/tests/test-libappindicator.c
+++ /dev/null
@@ -1,320 +0,0 @@
-/*
-Tests for the libappindicator library.
-
-Copyright 2009 Canonical Ltd.
-
-Authors:
-    Ted Gould <ted@canonical.com>
-
-This program is free software: you can redistribute it and/or modify it 
-under the terms of the GNU General Public License version 3, as published 
-by the Free Software Foundation.
-
-This program is distributed in the hope that it will be useful, but 
-WITHOUT ANY WARRANTY; without even the implied warranties of 
-MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR 
-PURPOSE.  See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along 
-with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-
-#include <glib.h>
-#include <glib-object.h>
-
-#include <app-indicator.h>
-
-void
-test_libappindicator_prop_signals_status_helper (AppIndicator * ci, gchar * status, gboolean * signalactivated)
-{
-	*signalactivated = TRUE;
-	return;
-}
-
-void
-test_libappindicator_prop_signals_helper (AppIndicator * ci, gboolean * signalactivated)
-{
-	*signalactivated = TRUE;
-	return;
-}
-
-void
-test_libappindicator_prop_signals (void)
-{
-        AppIndicator * ci = app_indicator_new ("test-app-indicator",
-                                               "indicator-messages",
-                                               APP_INDICATOR_CATEGORY_APPLICATION_STATUS);
-
-	g_assert(ci != NULL);
-
-	gboolean signaled = FALSE;
-	gulong handlerid;
-
-	handlerid = 0;
-	handlerid = g_signal_connect(G_OBJECT(ci), "new-icon", G_CALLBACK(test_libappindicator_prop_signals_helper), &signaled);
-	g_assert(handlerid != 0);
-
-	handlerid = 0;
-	handlerid = g_signal_connect(G_OBJECT(ci), "new-attention-icon", G_CALLBACK(test_libappindicator_prop_signals_helper), &signaled);
-	g_assert(handlerid != 0);
-
-	handlerid = 0;
-	handlerid = g_signal_connect(G_OBJECT(ci), "new-status", G_CALLBACK(test_libappindicator_prop_signals_status_helper), &signaled);
-	g_assert(handlerid != 0);
-
-
-	signaled = FALSE;
-	app_indicator_set_icon(ci, "bob");
-	g_assert(signaled);
-
-	signaled = FALSE;
-	app_indicator_set_icon(ci, "bob");
-	g_assert(!signaled);
-
-	signaled = FALSE;
-	app_indicator_set_icon(ci, "al");
-	g_assert(signaled);
-
-
-	signaled = FALSE;
-	app_indicator_set_attention_icon(ci, "bob");
-	g_assert(signaled);
-
-	signaled = FALSE;
-	app_indicator_set_attention_icon(ci, "bob");
-	g_assert(!signaled);
-
-	signaled = FALSE;
-	app_indicator_set_attention_icon(ci, "al");
-	g_assert(signaled);
-
-
-	signaled = FALSE;
-	app_indicator_set_status(ci, APP_INDICATOR_STATUS_PASSIVE);
-	g_assert(!signaled);
-
-	signaled = FALSE;
-	app_indicator_set_status(ci, APP_INDICATOR_STATUS_ACTIVE);
-	g_assert(signaled);
-
-	signaled = FALSE;
-	app_indicator_set_status(ci, APP_INDICATOR_STATUS_ACTIVE);
-	g_assert(!signaled);
-
-	signaled = FALSE;
-	app_indicator_set_status(ci, APP_INDICATOR_STATUS_ATTENTION);
-	g_assert(signaled);
-
-	return;
-}
-
-void
-test_libappindicator_init_set_props (void)
-{
-        AppIndicator * ci = app_indicator_new ("my-id",
-                                               "my-name",
-                                               APP_INDICATOR_CATEGORY_APPLICATION_STATUS);
-
-	g_assert(ci != NULL);
-
-	app_indicator_set_status(ci, APP_INDICATOR_STATUS_ACTIVE);
-	app_indicator_set_attention_icon(ci, "my-attention-name");
-
-	g_assert(!g_strcmp0("my-id", app_indicator_get_id(ci)));
-	g_assert(!g_strcmp0("my-name", app_indicator_get_icon(ci)));
-	g_assert(!g_strcmp0("my-attention-name", app_indicator_get_attention_icon(ci)));
-	g_assert(app_indicator_get_status(ci) == APP_INDICATOR_STATUS_ACTIVE);
-	g_assert(app_indicator_get_category(ci) == APP_INDICATOR_CATEGORY_APPLICATION_STATUS);
-
-	g_object_unref(G_OBJECT(ci));
-	return;
-}
-
-void
-test_libappindicator_init_with_props (void)
-{
-        AppIndicator * ci = app_indicator_new ("my-id",
-                                               "my-name",
-                                               APP_INDICATOR_CATEGORY_APPLICATION_STATUS);
-
-        app_indicator_set_status (ci, APP_INDICATOR_STATUS_ACTIVE);
-        app_indicator_set_attention_icon (ci, "my-attention-name");
-
-	g_assert(ci != NULL);
-
-	g_assert(!g_strcmp0("my-id", app_indicator_get_id(ci)));
-	g_assert(!g_strcmp0("my-name", app_indicator_get_icon(ci)));
-	g_assert(!g_strcmp0("my-attention-name", app_indicator_get_attention_icon(ci)));
-	g_assert(app_indicator_get_status(ci) == APP_INDICATOR_STATUS_ACTIVE);
-	g_assert(app_indicator_get_category(ci) == APP_INDICATOR_CATEGORY_APPLICATION_STATUS);
-
-	g_object_unref(G_OBJECT(ci));
-	return;
-}
-
-void
-test_libappindicator_init (void)
-{
-        AppIndicator * ci = app_indicator_new ("my-id", "my-name", APP_INDICATOR_CATEGORY_APPLICATION_STATUS);
-	g_assert(ci != NULL);
-	g_object_unref(G_OBJECT(ci));
-	return;
-}
-
-void
-test_libappindicator_set_label (void)
-{
-	AppIndicator * ci = app_indicator_new ("my-id",
-	                                       "my-name",
-	                                       APP_INDICATOR_CATEGORY_APPLICATION_STATUS);
-
-	g_assert(ci != NULL);
-	g_assert(app_indicator_get_label(ci) == NULL);
-	g_assert(app_indicator_get_label_guide(ci) == NULL);
-
-	/* First check all the clearing modes, this is important as
-	   we're going to use them later, we need them to work. */
-	app_indicator_set_label(ci, NULL, NULL);
-
-	g_assert(app_indicator_get_label(ci) == NULL);
-	g_assert(app_indicator_get_label_guide(ci) == NULL);
-
-	app_indicator_set_label(ci, "", NULL);
-
-	g_assert(app_indicator_get_label(ci) == NULL);
-	g_assert(app_indicator_get_label_guide(ci) == NULL);
-
-	app_indicator_set_label(ci, NULL, "");
-
-	g_assert(app_indicator_get_label(ci) == NULL);
-	g_assert(app_indicator_get_label_guide(ci) == NULL);
-
-	app_indicator_set_label(ci, "", "");
-
-	g_assert(app_indicator_get_label(ci) == NULL);
-	g_assert(app_indicator_get_label_guide(ci) == NULL);
-
-	app_indicator_set_label(ci, "label", "");
-
-	g_assert(g_strcmp0(app_indicator_get_label(ci), "label") == 0);
-	g_assert(app_indicator_get_label_guide(ci) == NULL);
-
-	app_indicator_set_label(ci, NULL, NULL);
-
-	g_assert(app_indicator_get_label(ci) == NULL);
-	g_assert(app_indicator_get_label_guide(ci) == NULL);
-
-	app_indicator_set_label(ci, "label", "guide");
-
-	g_assert(g_strcmp0(app_indicator_get_label(ci), "label") == 0);
-	g_assert(g_strcmp0(app_indicator_get_label_guide(ci), "guide") == 0);
-
-	app_indicator_set_label(ci, "label2", "guide");
-
-	g_assert(g_strcmp0(app_indicator_get_label(ci), "label2") == 0);
-	g_assert(g_strcmp0(app_indicator_get_label_guide(ci), "guide") == 0);
-
-	app_indicator_set_label(ci, "trick-label", "trick-guide");
-
-	g_assert(g_strcmp0(app_indicator_get_label(ci), "trick-label") == 0);
-	g_assert(g_strcmp0(app_indicator_get_label_guide(ci), "trick-guide") == 0);
-
-	g_object_unref(G_OBJECT(ci));
-	return;
-}
-
-void
-label_signals_cb (AppIndicator * appindicator, gchar * label, gchar * guide, gpointer user_data)
-{
-	gint * label_signals_count = (gint *)user_data;
-	(*label_signals_count)++;
-	return;
-}
-
-void
-label_signals_check (void)
-{
-	while (g_main_context_pending(NULL)) {
-		g_main_context_iteration(NULL, TRUE);
-	}
-
-	return;
-}
-
-void
-test_libappindicator_label_signals (void)
-{
-	gint label_signals_count = 0;
-	AppIndicator * ci = app_indicator_new ("my-id",
-	                                       "my-name",
-	                                       APP_INDICATOR_CATEGORY_APPLICATION_STATUS);
-
-	g_assert(ci != NULL);
-	g_assert(app_indicator_get_label(ci) == NULL);
-	g_assert(app_indicator_get_label_guide(ci) == NULL);
-
-	g_signal_connect(G_OBJECT(ci), APP_INDICATOR_SIGNAL_NEW_LABEL, G_CALLBACK(label_signals_cb), &label_signals_count);
-
-	/* Shouldn't be a signal as it should be stuck in idle */
-	app_indicator_set_label(ci, "label", "guide");
-	g_assert(label_signals_count == 0);
-
-	/* Should show up after idle processing */
-	label_signals_check();
-	g_assert(label_signals_count == 1);
-
-	/* Shouldn't signal with no change */
-	label_signals_count = 0;
-	app_indicator_set_label(ci, "label", "guide");
-	label_signals_check();
-	g_assert(label_signals_count == 0);
-
-	/* Change one, we should get one signal */
-	app_indicator_set_label(ci, "label2", "guide");
-	label_signals_check();
-	g_assert(label_signals_count == 1);
-
-	/* Change several times, one signal */
-	label_signals_count = 0;
-	app_indicator_set_label(ci, "label1", "guide0");
-	app_indicator_set_label(ci, "label1", "guide1");
-	app_indicator_set_label(ci, "label2", "guide2");
-	app_indicator_set_label(ci, "label3", "guide3");
-	label_signals_check();
-	g_assert(label_signals_count == 1);
-
-	/* Clear should signal too */
-	label_signals_count = 0;
-	app_indicator_set_label(ci, NULL, NULL);
-	label_signals_check();
-	g_assert(label_signals_count == 1);
-
-	return;
-}
-
-void
-test_libappindicator_props_suite (void)
-{
-	g_test_add_func ("/indicator-application/libappindicator/init",            test_libappindicator_init);
-	g_test_add_func ("/indicator-application/libappindicator/init_props",      test_libappindicator_init_with_props);
-	g_test_add_func ("/indicator-application/libappindicator/init_set_props",  test_libappindicator_init_set_props);
-	g_test_add_func ("/indicator-application/libappindicator/prop_signals",    test_libappindicator_prop_signals);
-	g_test_add_func ("/indicator-application/libappindicator/set_label",       test_libappindicator_set_label);
-	g_test_add_func ("/indicator-application/libappindicator/label_signals",   test_libappindicator_label_signals);
-
-	return;
-}
-
-gint
-main (gint argc, gchar * argv[])
-{
-	gtk_init(&argc, &argv);
-	g_test_init(&argc, &argv, NULL);
-
-	/* Test suites */
-	test_libappindicator_props_suite();
-
-
-	return g_test_run ();
-}
diff --git a/tests/test-simple-app.c b/tests/test-simple-app.c
deleted file mode 100644
index d60d9b9..0000000
--- a/tests/test-simple-app.c
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
-Test that creates a small test app which links with libappindicator.
-
-Copyright 2009 Canonical Ltd.
-
-Authors:
-    Ted Gould <ted@canonical.com>
-
-This program is free software: you can redistribute it and/or modify it 
-under the terms of the GNU General Public License version 3, as published 
-by the Free Software Foundation.
-
-This program is distributed in the hope that it will be useful, but 
-WITHOUT ANY WARRANTY; without even the implied warranties of 
-MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR 
-PURPOSE.  See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along 
-with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-
-#include <dbus/dbus-glib.h>
-#include <dbus/dbus-glib-lowlevel.h>
-#include <glib.h>
-#include <libdbusmenu-glib/server.h>
-#include <app-indicator.h>
-
-static GMainLoop * mainloop = NULL;
-
-int
-main (int argc, char ** argv)
-{
-	g_type_init();
-
-	DbusmenuServer * dms = dbusmenu_server_new("/menu");
-	DbusmenuMenuitem * dmi = dbusmenu_menuitem_new();
-	dbusmenu_menuitem_property_set(dmi, "label", "Bob");
-
-	AppIndicator * ci = APP_INDICATOR(g_object_new(APP_INDICATOR_TYPE, 
-	                                               "id", "test-application",
-	                                               "status-enum", APP_INDICATOR_STATUS_ACTIVE,
-	                                               "icon-name", "system-shutdown",
-	                                               "menu-object", dms,
-	                                               NULL));
-
-	mainloop = g_main_loop_new(NULL, FALSE);
-	g_main_loop_run(mainloop);
-
-	g_object_unref(G_OBJECT(ci));
-	g_debug("Quiting");
-
-	return 0;
-}