Merge lp:~ted/hud/automatic-shutdown into lp:hud/phablet

[Ted Gould]

Add watchdog to shutdown if the service isn't being used.

Adds a watchdog to shutdown if it's not being used. This is to help with memory and CPU usage on mobile platforms, all services that might not be used are being asked to shutdown with this style of watchdog.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:373
http://s-jenkins:8080/job/hud-small-ci/272/
Executed test runs:
    FAILURE: http://s-jenkins:8080/job/hud-small-ci/./build=pbuilder,distribution=quantal,flavor=i386/272/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/hud-small-ci/272/rebuild

review: Needs Fixing (continuous-integration)

[lp:~ted/hud/automatic-shutdown]

374. By Ted Gould on 2013-03-28

Merge cmake branch

375. By Ted Gould on 2013-04-02

Removing autotools built files from the ignore file

Unmerged revisions

=== modified file '.bzrignore'
--- .bzrignore	2013-02-28 12:06:00 +0000
+++ .bzrignore	2013-03-29 12:53:22 +0000
@@ -1,246 +1,10 @@
-# root
-/ABOUT-NLS
-/aclocal.m4
-/autom4te.cache
-/compile
-/config.guess
-/config.h
-/config.h.in
-/config.log
-/config.rpath
-/config.status
-/config.sub
-/configure
-/depcomp
-/gtk-doc.make
-/install-sh
-/libtool
-/ltmain.sh
-/missing
-/omf.make
-/stamp-h1
-/tmp
-/xmldocs.make
 /.settings
 /.project
 /.cproject
-
-# In any location
-Makefile
-Makefile.in
-Makefile.in.in
-.deps
-.libs
-*.lo
-*.la
-*.pc
-*.pot
-
-# /docs
-/docs/**/xml
-/docs/**/html
-/docs/**/*.txt
-!/docs/**/*-sections.txt
-/docs/**/*.stamp
-/docs/**/*.args
-/docs/**/*.hierarchy
-/docs/**/*.interfaces
-/docs/**/*.prerequisites
-/docs/**/*.signals
-/docs/**/*.1
-
-# /libhud
-/libhud/app-iface.c
-/libhud/app-iface.h
-/libhud/marshal.c
-/libhud/marshal.h
-/libhud/service-iface.c
-/libhud/service-iface.h
-/libhud/stamp-marshal
-
-/libhud/demo/consumer
-/libhud/demo/consumer.c
-/libhud/demo/consumer_vala.stamp
-/libhud/demo/gimp
-/libhud/demo/gvtk.c
-/libhud/demo/simple-test
-
-/libhud/tests/libhud-test
-/libhud/tests/libhud-test.xml
-/libhud/tests/libhud-tester
-
-# libhud-client
-/libhud-client/HudClient-1.gir
-/libhud-client/HudClient-1.typelib
-/libhud-client/HudClient-1.vapi
-/libhud-client/enum-types.c
-/libhud-client/enum-types.h
-/libhud-client/query-iface.c
-/libhud-client/query-iface.h
-/libhud-client/service-iface.c
-/libhud-client/service-iface.h
-/libhud-client/stamp-enum-types
-
-# m4
-/m4/codeset.m4
-/m4/gettext.m4
-/m4/glibc2.m4
-/m4/glibc21.m4
-/m4/gtk-doc.m4
-/m4/iconv.m4
-/m4/intdiv0.m4
-/m4/intl.m4
-/m4/intldir.m4
-/m4/intlmacosx.m4
-/m4/intltool.m4
-/m4/intmax.m4
-/m4/inttypes-pri.m4
-/m4/inttypes_h.m4
-/m4/lcmessage.m4
-/m4/lib-ld.m4
-/m4/lib-link.m4
-/m4/lib-prefix.m4
-/m4/libtool.m4
-/m4/lock.m4
-/m4/longlong.m4
-/m4/ltoptions.m4
-/m4/ltsugar.m4
-/m4/ltversion.m4
-/m4/lt~obsolete.m4
-/m4/nls.m4
-/m4/po.m4
-/m4/printf-posix.m4
-/m4/progtest.m4
-/m4/size_max.m4
-/m4/stdint_h.m4
-/m4/uintmax_t.m4
-/m4/visibility.m4
-/m4/wchar_t.m4
-/m4/wint_t.m4
-/m4/xsize.m4
-
-# /po
-/po/Makevars.template
-/po/POTFILES
-/po/Rules-quot
-/po/*.sed
-/po/*.header
-/po/*.sin
-/po/stamp-it
-
-# /src
-/src/app-iface.c
-/src/app-iface.h
-/src/create-db.c
-/src/enum-types.c
-/src/enum-types.h
-/src/hud-dump-application
-/src/hud-iface.c
-/src/hud-iface.h
-/src/hud-query-iface.c
-/src/hud-query-iface.h
-/src/hud-service
-/src/hud-verify-app-info
-/src/stamp-enum-types
-
-# /data
-/data/*.valid
-/data/*.service
-
-# /tools
-/tools/hud-cli
-/tools/hud-cli-appstack
-/tools/hud-cli-param
-/tools/hud-cli-toolbar
-/tools/hud-pronounce-for-word
-
-# /tools-vala
-/tools-vala/hud-gtk
-/tools-vala/hud-gtk.c
-/tools-vala/hud_gtk_vala.stamp
-
-# /tests
-/tests/dbusmenu-json-loader
-/tests/hud-performance
-/tests/libhud-client-test
-/tests/libhud-client-test-xunit.xml
-/tests/libhud-client-test.xml
-/tests/libhud-client-tester
-/tests/test-app-indicator-source
-/tests/test-app-indicator-source-test
-/tests/test-app-indicator-source-xunit.xml
-/tests/test-app-indicator-source.xml
-/tests/test-application-list
-/tests/test-application-list-test
-/tests/test-application-list-xunit.xml
-/tests/test-application-list.xml
-/tests/test-bad-app-info
-/tests/test-bad-app-info-dual-header
-/tests/test-bad-app-info-item-no-count
-/tests/test-bad-app-info-item-no-name
-/tests/test-bad-app-info-menu-no-name
-/tests/test-bad-app-info-missing-desktop
-/tests/test-bad-app-info-missing-menus
-/tests/test-bad-app-info-multiple-menus
-/tests/test-dbus-message-count
-/tests/test-dbus-message-count.bustle
-/tests/test-distance
-/tests/test-distance-test
-/tests/test-distance-xunit.xml
-/tests/test-distance.xml
-/tests/test-good-app-info-tons-of-entries
-/tests/test-hud-item
-/tests/test-hud-item-test
-/tests/test-hud-item-xunit.xml
-/tests/test-hud-item.xml
-/tests/test-indicator-source
-/tests/test-indicator-source-test
-/tests/test-indicator-source-xunit.xml
-/tests/test-indicator-source.xml
-/tests/test-keyword-mapping
-/tests/test-keyword-mapping-test
-/tests/test-keyword-mapping-xunit.xml
-/tests/test-keyword-mapping.xml
-/tests/test-load-app-info
-/tests/test-menu-input
-/tests/test-menu-input-model-deep
-/tests/test-menu-input-model-shortcuts
-/tests/test-menu-input-model-simple
-/tests/test-menu-input-tester
-/tests/test-menu-input-xunit.xml
-/tests/test-menu-input.xml
-/tests/test-pronounce-dict
-/tests/test-pronounce-dict-test
-/tests/test-pronounce-dict-xunit.xml
-/tests/test-pronounce-dict.xml
-/tests/test-result-highlighting
-/tests/test-result-highlighting-test
-/tests/test-result-highlighting-xunit.xml
-/tests/test-result-highlighting.xml
-/tests/test-source
-/tests/test-source-test
-/tests/test-source-xunit.xml
-/tests/test-source.xml
-/tests/test-string-list
-/tests/test-string-list-test
-/tests/test-string-list-xunit.xml
-/tests/test-string-list.xml
-/tests/test-usage-db-ancient
-/tests/test-usage-db-ancient-test
-/tests/test-usage-db-off-test
-/tests/test-usage-db-off-xunit.xml
-/tests/test-usage-db-off.xml
-/tests/test-usage-db-old
-/tests/test-usage-db-old-test
-/tests/test-usage-db-old-xunit.xml
-/tests/test-usage-db-old.xml
-/tests/test-usage-db-simple
-/tests/test-usage-db-simple-test
-/tests/test-usage-db-simple-xunit.xml
-/tests/test-usage-db-simple.xml
-/tests/test-usage-db-testapp
-/tests/test-usage-db-testapp-test
-/tests/test-usage-db-testapp-xunit.xml
-/tests/test-usage-db-testapp.xml
-/tests/keyword-mapping/locale/en_FAKELANG/LC_MESSAGES/gnome-terminal.mo
-
+/.pydevproject
+/build
+
+test-watchdog
+test-watchdog-test
+test-watchdog-xunit.xml
+test-watchdog.xml

=== added file 'CMakeLists.txt'
--- CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ CMakeLists.txt	2013-03-29 12:53:22 +0000
@@ -0,0 +1,147 @@
+project(hud C)
+cmake_minimum_required(VERSION 2.8.9)
+
+set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake" "${CMAKE_MODULE_PATH}")
+
+set(PACKAGE ${CMAKE_PROJECT_NAME})
+set(GETTEXT_PACKAGE ${CMAKE_PROJECT_NAME})
+
+if(PROJECT_BINARY_DIR STREQUAL PROJECT_SOURCE_DIR)
+   message(FATAL_ERROR "In-tree build attempt detected, aborting. Set your build dir outside your source dir, delete CMakeCache.txt from source root and try again.")
+endif()
+
+option(enable_tests "Enable tests." ON)
+option(enable_scalability_tests "Additional scalability tests that are potentially very slow to run." OFF)
+option(full_warnings "Full compiler warnings." OFF)
+option(debug_messages "Print debug messages." OFF)
+option(local_install "Support local installation." OFF)
+
+find_package(PkgConfig REQUIRED)
+include(GNUInstallDirs)
+include(CheckIncludeFile)
+include(CheckFunctionExists)
+include(Coverage)
+include(UseGlibGeneration)
+include(UseGdbusCodegen)
+include(UseConstantBuilder)
+include(UseGSettings)
+include(UseVala)
+
+# Workaround for libexecdir on debian
+if (EXISTS "/etc/debian_version") 
+  set(CMAKE_INSTALL_LIBEXECDIR ${CMAKE_INSTALL_LIBDIR})
+  set(CMAKE_INSTALL_FULL_LIBEXECDIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBEXECDIR}")
+endif()
+
+if(${full_warnings})
+  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -pedantic")
+endif()
+
+if(${debug_messages})
+  add_definitions(-DDEBUG_MESSAGES)
+endif()
+
+set(HUD_QUERY_XML ${CMAKE_CURRENT_SOURCE_DIR}/data/com.canonical.hud.query.xml)
+set(HUD_SERVICE_XML ${CMAKE_CURRENT_SOURCE_DIR}/data/com.canonical.hud.xml)
+set(HUD_APP_XML ${CMAKE_CURRENT_SOURCE_DIR}/data/com.canonical.hud.Application.xml)
+
+set(HUD_TOP_DIR ${CMAKE_CURRENT_SOURCE_DIR})
+set(HUD_SRC_DIR "${CMAKE_CURRENT_SOURCE_DIR}/src")
+
+add_definitions( -DDATADIR="${CMAKE_INSTALL_FULL_DATADIR}" )
+add_definitions( -DGNOMELOCALEDIR="${CMAKE_INSTALL_FULL_DATADIR}/locale" )
+add_definitions( -DGETTEXT_PACKAGE="${GETTEXT_PACKAGE}" )
+add_definitions( -DLIBEXECDIR="${CMAKE_INSTALL_FULL_LIBEXECDIR}" )
+add_definitions( -DDICT_PATH="/usr/share/pocketsphinx/model/lm/en_US/cmu07a.dic" )
+add_definitions( -DJULIUS_DICT_PATH="/usr/share/julius-voxforge/acoustic/" )
+
+pkg_check_modules(GLIB2 REQUIRED glib-2.0)
+include_directories(${GLIB2_INCLUDE_DIRS})
+
+pkg_check_modules(GOBJECT2 REQUIRED gobject-2.0)
+include_directories(${GOBJECT2_INCLUDE_DIRS})
+
+pkg_check_modules(GIO2 REQUIRED gio-2.0)
+include_directories(${GIO2_INCLUDE_DIRS})
+
+pkg_check_modules(GIO_UNIX2 REQUIRED gio-unix-2.0)
+include_directories(${GIO_UNIX2_INCLUDE_DIRS})
+
+pkg_check_modules(DEE REQUIRED dee-1.0)
+include_directories(${DEE_INCLUDE_DIRS})
+
+pkg_check_modules(SQLITE3 REQUIRED sqlite3)
+include_directories(${SQLITE3_INCLUDE_DIRS})
+
+pkg_check_modules(DBUSMENU_GLIB REQUIRED dbusmenu-glib-0.4)
+include_directories(${DBUSMENU_GLIB_INCLUDE_DIRS})
+
+pkg_check_modules(POCKETSPHINX REQUIRED pocketsphinx)
+include_directories(${POCKETSPHINX_INCLUDE_DIRS})
+
+pkg_search_module(GTK3 REQUIRED gtk+-3.0)
+include_directories(${GTK3_INCLUDE_DIRS})
+
+find_package(Vala 0.12)
+
+find_package(GObjectIntrospection 0.9.12)
+
+check_include_file("signal.h" HAVE_SIGNAL_H)
+if(${HAVE_SIGNAL_H})
+  set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} "signal.h")
+  check_function_exists(kill HAVE_KILL)
+endif()
+
+find_package(Curses)
+check_include_file("readline/readline.h" READLINE_FOUND)
+check_include_file("readline/history.h" READLINE_HISTORY_FOUND)
+find_library(READLINE_LIBRARIES NAMES readline)
+
+pkg_search_module(PANGO REQUIRED pango)
+
+pkg_search_module(BAMF libbamf3)
+if(${BAMF_FOUND})
+  add_definitions( -DHAVE_BAMF=1 )
+  include_directories(${BAMF_INCLUDE_DIRS})
+endif()
+
+if(${local_install})
+  set(DBUSSERVICEDIR "${CMAKE_INSTALL_DATADIR}/dbus-1/services/")
+else()
+  EXEC_PROGRAM(${PKG_CONFIG_EXECUTABLE} ARGS dbus-1 --variable session_bus_services_dir OUTPUT_VARIABLE DBUSSERVICEDIR )
+endif()
+message("Installing DBus services to ${DBUSSERVICEDIR}")
+
+if(${local_install})
+  set(DBUSIFACEDIR "${CMAKE_INSTALL_DATADIR}/dbus-1/interfaces/")
+else()
+  EXEC_PROGRAM(${PKG_CONFIG_EXECUTABLE} ARGS dbus-1 --variable interfaces_dir OUTPUT_VARIABLE DBUSIFACEDIR )
+endif()
+message("Installing DBus interfaces to ${DBUSIFACEDIR}")
+
+include_directories(${CMAKE_CURRENT_SOURCE_DIR})
+include_directories(${CMAKE_CURRENT_BINARY_DIR})
+
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99 -fPIC")
+
+add_subdirectory(data)
+add_subdirectory(libhud-client)
+add_subdirectory(libhud)
+add_subdirectory(libhud-gtk)
+add_subdirectory(src)
+add_subdirectory(tools)
+
+if(${enable_tests})
+  enable_testing()
+  
+  pkg_check_modules(DBUSTEST REQUIRED dbustest-1)
+  include_directories(${DBUSTEST_INCLUDE_DIRS})
+  
+  pkg_check_modules(DBUSMENU_JSONLOADER REQUIRED dbusmenu-jsonloader-0.4)
+  include_directories(${DBUSMENU_JSONLOADER_INCLUDE_DIRS})
+  
+  add_subdirectory(tests)
+endif()
+
+add_subdirectory(tools-vala)
+add_subdirectory(docs)

=== removed file 'Makefile.am'
--- Makefile.am	2013-02-20 14:52:48 +0000
+++ Makefile.am	1970-01-01 00:00:00 +0000
@@ -1,57 +0,0 @@
-ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
-
-SUBDIRS = \
-	data \
-	po \
-	src \
-	libhud \
-	libhud-gtk \
-	libhud-client \
-	tools \
-	docs
-
-if BUILD_TESTS
-SUBDIRS += \
-	tests \
-	tools-vala
-endif
-
-tests: src
-
-tools: libhud-client
-
-DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-localinstall --enable-deprecations --disable-hybris
-
-dist-hook:
-	@if test -d "$(top_srcdir)/.bzr"; \
-		then \
-			echo Creating ChangeLog && \
-				( cd "$(top_srcdir)" && \
-				echo '# Generated by Makefile. Do not edit.'; echo; \
-				$(top_srcdir)/missing --run bzr log --gnu-changelog ) > ChangeLog.tmp \
-				&& mv -f ChangeLog.tmp $(top_distdir)/ChangeLog \
-				|| (rm -f ChangeLog.tmp; \
-					echo Failed to generate ChangeLog >&2 ); \
-        else \
-			echo Failed to generate ChangeLog: not a branch >&2; \
-	fi
-	@if test -d "$(top_srcdir)/.bzr"; \
-		then \
-			echo Creating AUTHORS && \
-				( cd "$(top_srcdir)" && \
-				echo '# Generated by Makefile. Do not edit.'; echo; \
-				$(top_srcdir)/missing --run  bzr log --long --levels=0 | grep -e "^\s*author:" -e "^\s*committer:" | cut -d ":" -f 2 | cut -d "<" -f 1 | sort -u) > AUTHORS.tmp \
-				&& mv -f AUTHORS.tmp $(top_distdir)/AUTHORS \
-				|| (rm -f AUTHORS.tmp; \
-					echo Failed to generate AUTHORS >&2 ); \
-        else \
-			echo Failed to generate AUTHORS: not a branch >&2; \
-	fi
-
-include $(top_srcdir)/Makefile.am.coverage
-
-EXTRA_DIST = \
-	autogen.sh \
-	Makefile.am.coverage \
-	Makefile.am.enum \
-	Makefile.am.marshal

=== removed file 'Makefile.am.coverage'
--- Makefile.am.coverage	2012-03-27 21:15:59 +0000
+++ Makefile.am.coverage	1970-01-01 00:00:00 +0000
@@ -1,48 +0,0 @@
-
-# Coverage targets
-
-.PHONY: clean-gcno clean-gcda \
-	coverage-html generate-coverage-html clean-coverage-html \
-	coverage-gcovr generate-coverage-gcovr clean-coverage-gcovr
-
-clean-local: clean-gcno clean-coverage-html clean-coverage-gcovr
-
-if HAVE_GCOV
-
-clean-gcno:
-	@echo Removing old coverage instrumentation
-	-find -name '*.gcno' -print | xargs -r rm
-
-clean-gcda:
-	@echo Removing old coverage results
-	-find -name '*.gcda' -print | xargs -r rm
-  
-coverage-html: clean-gcda
-	-$(MAKE) $(AM_MAKEFLAGS) -k check
-	$(MAKE) $(AM_MAKEFLAGS) generate-coverage-html
-  
-generate-coverage-html:
-	@echo Collecting coverage data
-	$(LCOV) --directory $(top_builddir) --capture --output-file coverage.info --no-checksum --compat-libtool
-	LANG=C $(GENHTML) --prefix $(top_builddir) --output-directory coveragereport --title "Code Coverage" --legend --show-details coverage.info
-  
-clean-coverage-html: clean-gcda
-	-$(LCOV) --directory $(top_builddir) -z
-	-rm -rf coverage.info coveragereport
-
-if HAVE_GCOVR
-
-coverage-gcovr: clean-gcda
-	-$(MAKE) $(AM_MAKEFLAGS) -k check
-	$(MAKE) $(AM_MAKEFLAGS) generate-coverage-gcovr
-	
-generate-coverage-gcovr:
-	@echo Generating coverage GCOVR report
-	$(GCOVR) -x -r $(top_builddir) -o $(top_builddir)/coverage.xml
-	
-clean-coverage-gcovr: clean-gcda
-	-rm -rf $(top_builddir)/coverage.xml
-
-endif # HAVE_GCOVR
-
-endif # HAVE_GCOV

=== removed file 'Makefile.am.enum'
--- Makefile.am.enum	2013-02-12 03:01:18 +0000
+++ Makefile.am.enum	1970-01-01 00:00:00 +0000
@@ -1,45 +0,0 @@
-# Rules for generating enumeration types using glib-mkenums
-#
-# Define:
-# 	glib_enum_h = header template file
-# 	glib_enum_c = source template file
-# 	glib_enum_headers = list of headers to parse
-#
-# before including Makefile.am.enums. You will also need to have
-# the following targets already defined:
-#
-# 	CLEANFILES
-#	DISTCLEANFILES
-#	BUILT_SOURCES
-#	EXTRA_DIST
-#
-# Author: Emmanuele Bassi <[e-mail]>
-
-enum_tmpl_h=$(glib_enum_h:.h=.h.in)
-enum_tmpl_c=$(glib_enum_c:.c=.c.in)
-
-CLEANFILES += stamp-enum-types
-DISTCLEANFILES += $(glib_enum_h) $(glib_enum_c)
-BUILT_SOURCES += $(glib_enum_h) $(glib_enum_c)
-EXTRA_DIST += $(enum_tmpl_h) $(enum_tmpl_c)
-
-stamp-enum-types: $(glib_enum_headers)
-	$(QUIET_GEN)mkdir -p `dirname $(builddir)/$(glib_enum_h)`
-	$(QUIET_GEN)$(GLIB_MKENUMS) \
-		--template $(srcdir)/$(enum_tmpl_h) \
-	$(glib_enum_headers) > xgen-eh \
-	&& (cmp -s xgen-eh $(builddir)/$(glib_enum_h) || cp -f xgen-eh $(builddir)/$(glib_enum_h)) \
-	&& rm -f xgen-eh \
-	&& echo timestamp > $(@F)
-
-$(glib_enum_h): stamp-enum-types
-	@true
-
-$(glib_enum_c): $(builddir)/$(glib_enum_h)
-	$(QUIET_GEN)mkdir -p `dirname $(builddir)/$(glib_enum_c)`
-	$(QUIET_GEN)$(GLIB_MKENUMS) \
-		--template $(srcdir)/$(enum_tmpl_c) \
-	$(glib_enum_headers) > xgen-ec \
-	&& cp -f xgen-ec $(builddir)/$(glib_enum_c) \
-	&& rm -f xgen-ec
-

=== removed file 'Makefile.am.marshal'
--- Makefile.am.marshal	2010-04-23 18:01:58 +0000
+++ Makefile.am.marshal	1970-01-01 00:00:00 +0000
@@ -1,45 +0,0 @@
-# Rules for generating marshal files using glib-genmarshal
-#
-# Define:
-# 	glib_marshal_list = marshal list file
-# 	glib_marshal_prefix = prefix for marshal functions
-#
-# before including Makefile.am.marshal. You will also need to have
-# the following targets already defined:
-#
-# 	CLEANFILES
-#	DISTCLEANFILES
-#	BUILT_SOURCES
-#	EXTRA_DIST
-#
-# Author: Emmanuele Bassi <[e-mail]>
-
-marshal_h = $(glib_marshal_list:.list=.h)
-marshal_c = $(glib_marshal_list:.list=.c)
-
-CLEANFILES += stamp-marshal
-DISTCLEANFILES += $(marshal_h) $(marshal_c)
-BUILT_SOURCES += $(marshal_h) $(marshal_c)
-EXTRA_DIST += $(glib_marshal_list)
-
-stamp-marshal: $(glib_marshal_list)
-	$(QUIET_GEN)$(GLIB_GENMARSHAL) \
-		--prefix=$(glib_marshal_prefix) \
-		--header \
-	$(srcdir)/$(glib_marshal_list) > xgen-mh \
-	&& (cmp -s xgen-mh $(marshal_h) || cp -f xgen-mh $(marshal_h)) \
-	&& rm -f xgen-mh \
-	&& echo timestamp > $(@F)
-
-$(marshal_h): stamp-marshal
-	@true
-
-$(marshal_c): $(marshal_h)
-	$(QUIET_GEN)(echo "#include \"$(marshal_h)\"" ; \
-	$(GLIB_GENMARSHAL) \
-		--prefix=$(glib_marshal_prefix) \
-		--body \
-	$(srcdir)/$(glib_marshal_list)) > xgen-mc \
-	&& cp xgen-mc $(marshal_c) \
-	&& rm -f xgen-mc
-

=== removed file 'autogen.sh'
--- autogen.sh	2012-10-24 06:53:55 +0000
+++ autogen.sh	1970-01-01 00:00:00 +0000
@@ -1,12 +0,0 @@
-#!/bin/sh
-
-PKG_NAME="hud"
-
-which gnome-autogen.sh || {
-	echo "You need gnome-common from GNOME SVN"
-	exit 1
-}
-
-USE_GNOME2_MACROS=1 \
-USE_COMMON_DOC_BUILD=yes \
-gnome-autogen.sh --enable-gtk-doc $@

=== added file 'build.sh'
--- build.sh	1970-01-01 00:00:00 +0000
+++ build.sh	2013-03-29 12:53:22 +0000
@@ -0,0 +1,18 @@
+#! /bin/bash
+set -e
+
+mkdir -p build
+
+if [ -f "/usr/bin/ninja" ] ; then
+  EXTRA_ARGS="-G Ninja"
+  BUILD_COMMAND="ninja"
+else
+  BUILD_COMMAND="make"
+fi
+
+echo "Using $BUILD_COMMAND to build"
+(
+  cd build
+  cmake .. $EXTRA_ARGS -DCMAKE_INSTALL_PREFIX=../../install -Dlocal_install=ON -DGSETTINGS_LOCALINSTALL=ON
+  $BUILD_COMMAND
+)

=== added directory 'cmake'
=== added file 'cmake/COPYING-CMAKE-SCRIPTS'
--- cmake/COPYING-CMAKE-SCRIPTS	1970-01-01 00:00:00 +0000
+++ cmake/COPYING-CMAKE-SCRIPTS	2013-03-29 12:53:22 +0000
@@ -0,0 +1,22 @@
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the copyright
+   notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+3. The name of the author may not be used to endorse or promote products 
+   derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

=== added file 'cmake/ConstantBuilderTemplates.cmake'
--- cmake/ConstantBuilderTemplates.cmake	1970-01-01 00:00:00 +0000
+++ cmake/ConstantBuilderTemplates.cmake	2013-03-29 12:53:22 +0000
@@ -0,0 +1,12 @@
+  file(READ "${input}" input_contents)
+  string(REGEX REPLACE "\n" " " input_on_one_line "${input_contents}") 
+  set(new_contents
+    "\#include \"${name}.h\"\nconst gchar * ${const_name} = \"${input_on_one_line}\";\n")
+  if (EXISTS "${file_target}")
+    file(READ "${file_target}" old_contents)
+    if(NOT new_contents EQUAL old_contents)
+      file(WRITE "${file_target}" "${new_contents}")
+    endif()
+  else()
+    file(WRITE "${file_target}" "${new_contents}")
+  endif()

=== added file 'cmake/Coverage.cmake'
--- cmake/Coverage.cmake	1970-01-01 00:00:00 +0000
+++ cmake/Coverage.cmake	2013-03-29 12:53:22 +0000
@@ -0,0 +1,34 @@
+if (CMAKE_BUILD_TYPE MATCHES coverage)
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --coverage")
+  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} --coverage")
+  set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} --coverage")
+  set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} --coverage")
+
+  find_program(GCOVR_EXECUTABLE gcovr HINTS ${GCOVR_ROOT} "${GCOVR_ROOT}/bin")
+  if (NOT GCOVR_EXECUTABLE)
+    message(STATUS "Gcovr binary was not found, can not generate XML coverage info.")
+  else ()
+    message(STATUS "Gcovr found, can generate XML coverage info.")
+    add_custom_target (coverage-xml
+      WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+      COMMAND "${GCOVR_EXECUTABLE}" --exclude="test.*" -x -r "${CMAKE_SOURCE_DIR}" 
+      --object-directory=${CMAKE_BINARY_DIR} -o coverage.xml)
+  endif()
+
+  find_program(LCOV_EXECUTABLE lcov HINTS ${LCOV_ROOT} "${GCOVR_ROOT}/bin")
+  find_program(GENHTML_EXECUTABLE genhtml HINTS ${GENHTML_ROOT})
+  if (NOT LCOV_EXECUTABLE)
+    message(STATUS "Lcov binary was not found, can not generate HTML coverage info.")
+  else ()
+    if(NOT GENHTML_EXECUTABLE)
+      message(STATUS "Genthml binary not found, can not generate HTML coverage info.")
+    else()
+      message(STATUS "Lcov and genhtml found, can generate HTML coverage info.")
+      add_custom_target (coverage-html
+        WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+        COMMAND "${LCOV_EXECUTABLE}" --directory ${CMAKE_BINARY_DIR} --capture --output-file coverage.info --no-checksum
+        COMMAND "${GENHTML_EXECUTABLE}" --prefix ${CMAKE_BINARY_DIR} --output-directory coveragereport --title "Code Coverage" --legend --show-details coverage.info
+        )
+    endif()
+  endif()
+endif()

=== added file 'cmake/FindGObjectIntrospection.cmake'
--- cmake/FindGObjectIntrospection.cmake	1970-01-01 00:00:00 +0000
+++ cmake/FindGObjectIntrospection.cmake	2013-03-29 12:53:22 +0000
@@ -0,0 +1,61 @@
+# - try to find gobject-introspection
+#
+# Once done this will define
+#
+#  INTROSPECTION_FOUND - system has gobject-introspection
+#  INTROSPECTION_SCANNER - the gobject-introspection scanner, g-ir-scanner
+#  INTROSPECTION_COMPILER - the gobject-introspection compiler, g-ir-compiler
+#  INTROSPECTION_GENERATE - the gobject-introspection generate, g-ir-generate
+#  INTROSPECTION_GIRDIR
+#  INTROSPECTION_TYPELIBDIR
+#  INTROSPECTION_CFLAGS
+#  INTROSPECTION_LIBS
+#
+# Copyright (C) 2010, Pino Toscano, <[e-mail]>
+#
+# Redistribution and use is allowed according to the terms of the BSD license.
+# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+
+macro(_GIR_GET_PKGCONFIG_VAR _outvar _varname)
+  execute_process(
+    COMMAND ${PKG_CONFIG_EXECUTABLE} --variable=${_varname} gobject-introspection-1.0
+    OUTPUT_VARIABLE _result
+    RESULT_VARIABLE _null
+  )
+
+  if (_null)
+  else()
+    string(REGEX REPLACE "[\r\n]" " " _result "${_result}")
+    string(REGEX REPLACE " +$" ""  _result "${_result}")
+    separate_arguments(_result)
+    set(${_outvar} ${_result} CACHE INTERNAL "")
+  endif()
+endmacro(_GIR_GET_PKGCONFIG_VAR)
+
+find_package(PkgConfig)
+if(PKG_CONFIG_FOUND)
+  if(PACKAGE_FIND_VERSION_COUNT GREATER 0)
+    set(_gir_version_cmp ">=${PACKAGE_FIND_VERSION}")
+  endif()
+  pkg_check_modules(_pc_gir gobject-introspection-1.0${_gir_version_cmp})
+  if(_pc_gir_FOUND)
+    set(INTROSPECTION_FOUND TRUE)
+    _gir_get_pkgconfig_var(INTROSPECTION_SCANNER "g_ir_scanner")
+    _gir_get_pkgconfig_var(INTROSPECTION_COMPILER "g_ir_compiler")
+    _gir_get_pkgconfig_var(INTROSPECTION_GENERATE "g_ir_generate")
+    _gir_get_pkgconfig_var(INTROSPECTION_GIRDIR "girdir")
+    _gir_get_pkgconfig_var(INTROSPECTION_TYPELIBDIR "typelibdir")
+    set(INTROSPECTION_CFLAGS "${_pc_gir_CFLAGS}")
+    set(INTROSPECTION_LIBS "${_pc_gir_LIBS}")
+  endif()
+endif()
+
+mark_as_advanced(
+  INTROSPECTION_SCANNER
+  INTROSPECTION_COMPILER
+  INTROSPECTION_GENERATE
+  INTROSPECTION_GIRDIR
+  INTROSPECTION_TYPELIBDIR
+  INTROSPECTION_CFLAGS
+  INTROSPECTION_LIBS
+)

=== added file 'cmake/FindGtkDoc.cmake'
--- cmake/FindGtkDoc.cmake	1970-01-01 00:00:00 +0000
+++ cmake/FindGtkDoc.cmake	2013-03-29 12:53:22 +0000
@@ -0,0 +1,68 @@
+# CMake macros to find the GtkDoc documentation system
+
+# Output variables:
+#
+#   GTKDOC_FOUND            ... set to 1 if GtkDoc was foung
+#
+# If GTKDOC_FOUND == 1:
+#
+#   GTKDOC_SCAN_EXE         ... the location of the gtkdoc-scan executable
+#   GTKDOC_SCANGOBJ_EXE     ... the location of the gtkdoc-scangobj executable
+#   GTKDOC_MKTMPL_EXE       ... the location of the gtkdoc-mktmpl executable
+#   GTKDOC_MKDB_EXE         ... the location of the gtkdoc-mkdb executable
+#   GTKDOC_MKHTML_EXE       ... the location of the gtkdoc-mkhtml executable
+#   GTKDOC_FIXXREF_EXE      ... the location of the gtkdoc-fixxref executable
+
+set(GTKDOC_FOUND 1)
+
+find_program(GTKDOC_SCAN_EXE gtkdoc-scan PATH "${GLIB_PREFIX}/bin")
+if(NOT GTKDOC_SCAN_EXE)
+	message(STATUS "gtkdoc-scan not found")
+    set(GTKDOC_FOUND 0)
+endif(NOT GTKDOC_SCAN_EXE)
+
+find_program(GTKDOC_SCANGOBJ_EXE gtkdoc-scangobj PATH "${GLIB_PREFIX}/bin")
+if(NOT GTKDOC_SCANGOBJ_EXE)
+	message(STATUS "gtkdoc-scangobj not found")
+    set(GTKDOC_FOUND 0)
+endif(NOT GTKDOC_SCANGOBJ_EXE)
+
+get_filename_component(_this_dir ${CMAKE_CURRENT_LIST_FILE} PATH)
+find_file(GTKDOC_SCANGOBJ_WRAPPER GtkDocScanGObjWrapper.cmake PATH ${_this_dir})
+if(NOT GTKDOC_SCANGOBJ_WRAPPER)
+	message(STATUS "GtkDocScanGObjWrapper.cmake not found")
+    set(GTKDOC_FOUND 0)
+endif(NOT GTKDOC_SCANGOBJ_WRAPPER)
+
+find_program(GTKDOC_MKTMPL_EXE gtkdoc-mktmpl PATH "${GLIB_PREFIX}/bin")
+if(NOT GTKDOC_MKTMPL_EXE)
+	message(STATUS "gtkdoc-mktmpl not found")
+    set(GTKDOC_FOUND 0)
+endif(NOT GTKDOC_MKTMPL_EXE)
+
+find_program(GTKDOC_MKDB_EXE gtkdoc-mkdb PATH "${GLIB_PREFIX}/bin")
+if(NOT GTKDOC_MKDB_EXE)
+	message(STATUS "gtkdoc-mkdb not found")
+    set(GTKDOC_FOUND 0)
+endif(NOT GTKDOC_MKDB_EXE)
+
+find_program(GTKDOC_MKHTML_EXE gtkdoc-mkhtml PATH "${GLIB_PREFIX}/bin")
+if(NOT GTKDOC_MKHTML_EXE)
+	message(STATUS "gtkdoc-mkhtml not found")
+    set(GTKDOC_FOUND 0)
+endif(NOT GTKDOC_MKHTML_EXE)
+
+find_program(GTKDOC_FIXXREF_EXE gtkdoc-fixxref PATH "${GLIB_PREFIX}/bin")
+if(NOT GTKDOC_FIXXREF_EXE)
+	message(STATUS "gtkdoc-fixxref not found")
+    set(GTKDOC_FOUND 0)
+endif(NOT GTKDOC_FIXXREF_EXE)
+
+find_program(GTKDOC_CHECK_EXE gtkdoc-check PATH "${GLIB_PREFIX}/bin")
+if(NOT GTKDOC_CHECK_EXE)
+	message(STATUS "gtkdoc-check not found")
+    set(GTKDOC_FOUND 0)
+endif(NOT GTKDOC_CHECK_EXE)
+
+# vim:sw=4:ts=4:et:autoindent
+

=== added file 'cmake/FindVala.cmake'
--- cmake/FindVala.cmake	1970-01-01 00:00:00 +0000
+++ cmake/FindVala.cmake	2013-03-29 12:53:22 +0000
@@ -0,0 +1,57 @@
+# - Find Vala
+# This module looks for valac.
+# This module defines the following values:
+#    VALA_FOUND
+#    VALA_COMPILER
+#    VALA_VERSION
+#    VAPI_GEN
+#    VAPI_GEN_VERSION
+
+#=============================================================================
+# Copyright Přemysl Janouch 2011
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#     * Redistributions of source code must retain the above copyright
+#       notice, this list of conditions and the following disclaimer.
+#     * Redistributions in binary form must reproduce the above copyright
+#       notice, this list of conditions and the following disclaimer in the
+#       documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS''
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+# OF SUCH DAMAGE.
+#=============================================================================
+
+find_program (VALA_COMPILER "valac")
+
+if (VALA_COMPILER)
+	execute_process (COMMAND ${VALA_COMPILER} --version
+		OUTPUT_VARIABLE VALA_VERSION)
+	string (REGEX MATCH "[.0-9]+" VALA_VERSION "${VALA_VERSION}")
+endif (VALA_COMPILER)
+
+find_program (VAPI_GEN "vapigen")
+
+if (VAPI_GEN)
+	execute_process (COMMAND ${VAPI_GEN} --version
+		OUTPUT_VARIABLE VAPI_GEN_VERSION)
+	string (REGEX MATCH "[.0-9]+" VAPI_GEN_VERSION "${VAPI_GEN_VERSION}")
+endif (VAPI_GEN)
+
+include (FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS (Vala
+	REQUIRED_VARS VALA_COMPILER
+	VERSION_VAR VALA_VERSION)
+
+mark_as_advanced (VALA_COMPILER VALA_VERSION VAPI_GEN)
+

=== added file 'cmake/GlibGenerationTemplates.cmake'
--- cmake/GlibGenerationTemplates.cmake	1970-01-01 00:00:00 +0000
+++ cmake/GlibGenerationTemplates.cmake	2013-03-29 12:53:22 +0000
@@ -0,0 +1,61 @@
+message(STATUS ${headers})
+file(WRITE ${htemplate} "/*** BEGIN file-header ***/
+#ifndef __${includeguard}_ENUM_TYPES_H__
+#define __${includeguard}_ENUM_TYPES_H__
+
+#include <glib-object.h>
+
+G_BEGIN_DECLS
+
+/*** END file-header ***/
+/*** BEGIN file-production ***/
+
+/* enumerations from \"@filename@\" */
+
+/*** END file-production ***/
+/*** BEGIN value-header ***/
+GType @enum_name@_get_type (void);
+#define ${namespace}_TYPE_@ENUMSHORT@ (@enum_name@_get_type())
+
+/*** END value-header ***/
+/*** BEGIN file-tail ***/
+G_END_DECLS
+
+#endif /* __${includeguard}_ENUM_TYPES_H__ */
+/*** END file-tail ***/
+")
+
+# Write the .c template
+file(WRITE ${ctemplate} "/*** BEGIN file-header ***/
+#include \"${name}.h\"\n")
+foreach(header ${headers})
+  file(APPEND ${ctemplate} "#include \"${header}\"\n")
+endforeach(header)
+file(APPEND ${ctemplate} "
+/*** END file-header ***/
+/*** BEGIN file-production ***/
+
+/* enumerations from \"@filename@\" */
+/*** END file-production ***/
+/*** BEGIN value-header ***/
+GType
+@enum_name@_get_type (void)
+{
+  static volatile gsize g_define_type_id__volatile = 0;
+  if (g_once_init_enter (&g_define_type_id__volatile)) {
+    static const G@Type@Value values[] = {
+/*** END value-header ***/
+/*** BEGIN value-production ***/
+{ @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" },
+/*** END value-production ***/
+/*** BEGIN value-tail ***/
+{ 0, NULL, NULL }
+    };
+    GType g_define_type_id = g_@type@_register_static (\"@EnumName@\", values);
+    g_once_init_leave (&g_define_type_id__volatile, g_define_type_id);
+  }
+  return g_define_type_id__volatile;
+}
+
+/*** END value-tail ***/
+")

=== added file 'cmake/GtkDocScanGObjWrapper.cmake'
--- cmake/GtkDocScanGObjWrapper.cmake	1970-01-01 00:00:00 +0000
+++ cmake/GtkDocScanGObjWrapper.cmake	2013-03-29 12:53:22 +0000
@@ -0,0 +1,43 @@
+if(NOT APPLE)
+    # We use pkg-config to fing glib et al
+    find_package(PkgConfig)
+    # Find glib et al
+    pkg_check_modules(GLIB REQUIRED glib-2.0 gobject-2.0)
+
+foreach(_flag ${EXTRA_CFLAGS} ${GLIB_CFLAGS})
+    set(ENV{CFLAGS} "$ENV{CFLAGS} \"${_flag}\"")
+endforeach(_flag)
+
+foreach(_flag ${EXTRA_LDFLAGS} ${GLIB_LDFLAGS})
+    set(ENV{LDFLAGS} "$ENV{LDFLAGS} \"${_flag}\"")
+endforeach(_flag)
+
+foreach(_flag ${EXTRA_LDPATH})
+    if(ENV{LD_LIBRARY_PATH})
+        set(ENV{LD_LIBRARY_PATH} "$ENV{LD_LIBRARY_PATH}:\"${_flag}\"")
+    else(ENV{LD_LIBRARY_PATH})
+        set(ENV{LD_LIBRARY_PATH} "${_flag}")
+    endif(ENV{LD_LIBRARY_PATH})
+endforeach(_flag)
+
+message(STATUS "Executing gtkdoc-scangobj with:")
+message(STATUS "   CFLAGS: $ENV{CFLAGS}")
+message(STATUS "  LDFLAGS: $ENV{LDFLAGS}")
+message(STATUS "   LDPATH: $ENV{LD_LIBRARY_PATH}")
+
+execute_process(COMMAND ${GTKDOC_SCANGOBJ_EXE}
+    "--module=${doc_prefix}"
+    "--types=${output_types}"
+    "--output-dir=${output_dir}"
+    WORKING_DIRECTORY "${output_dir}"
+    RESULT_VARIABLE _scan_result)
+
+if(_scan_result EQUAL 0)
+    message(STATUS "Scan succeeded.")
+else(_scan_result EQUAL 0)
+    message(SEND_ERROR "Scan failed.")
+endif(_scan_result EQUAL 0)
+
+endif(NOT APPLE)
+
+# vim:sw=4:ts=4:et:autoindent

=== added file 'cmake/ListOperations.cmake'
--- cmake/ListOperations.cmake	1970-01-01 00:00:00 +0000
+++ cmake/ListOperations.cmake	2013-03-29 12:53:22 +0000
@@ -0,0 +1,18 @@
+
+macro(list_prefix _outvar _listvar _prefix)
+  set(${_outvar})
+  foreach(_item IN LISTS ${_listvar})
+    list(APPEND ${_outvar} ${_prefix}${_item})
+  endforeach()
+endmacro(list_prefix)
+
+macro(list_make_absolute _outvar _listvar _prefix)
+  set(${_outvar})
+  foreach(_item IN LISTS ${_listvar})
+    if(IS_ABSOLUTE ${_item})
+      list(APPEND ${_outvar} ${_item})
+    else()
+      list(APPEND ${_outvar} ${_prefix}${_item})
+    endif()
+  endforeach()
+endmacro(list_make_absolute)

=== added file 'cmake/UseConstantBuilder.cmake'
--- cmake/UseConstantBuilder.cmake	1970-01-01 00:00:00 +0000
+++ cmake/UseConstantBuilder.cmake	2013-03-29 12:53:22 +0000
@@ -0,0 +1,19 @@
+cmake_minimum_required(VERSION 2.6)
+if(POLICY CMP0011)
+  cmake_policy(SET CMP0011 NEW)
+endif(POLICY CMP0011)
+
+macro(add_constant_template outfiles name const_name input)
+  set(file_target "${CMAKE_CURRENT_BINARY_DIR}/${name}.c")
+  add_custom_command(
+    OUTPUT ${file_target}
+    COMMAND ${CMAKE_COMMAND}
+        "-Dname=${name}"
+        "-Dfile_target=${file_target}"
+        "-Dconst_name=${const_name}"
+        "-Dinput=${input}"
+        -P "${CMAKE_SOURCE_DIR}/cmake/ConstantBuilderTemplates.cmake"
+    DEPENDS "${CMAKE_SOURCE_DIR}/cmake/ConstantBuilderTemplates.cmake" "${input}"
+  )
+  list(APPEND ${outfiles} "${file_target}")
+endmacro(add_constant_template)

=== added file 'cmake/UseGObjectIntrospection.cmake'
--- cmake/UseGObjectIntrospection.cmake	1970-01-01 00:00:00 +0000
+++ cmake/UseGObjectIntrospection.cmake	2013-03-29 12:53:22 +0000
@@ -0,0 +1,100 @@
+# Copyright (C) 2010, Pino Toscano, <[e-mail]>
+#
+# Redistribution and use is allowed according to the terms of the BSD license.
+# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+
+include(ListOperations)
+
+macro(_gir_list_prefix _outvar _listvar _prefix)
+  set(${_outvar})
+  foreach(_item IN LISTS ${_listvar})
+    list(APPEND ${_outvar} ${_prefix}${_item})
+  endforeach()
+endmacro(_gir_list_prefix)
+
+macro(gir_add_introspections introspections_girs)
+
+  foreach(gir IN LISTS ${introspections_girs})
+
+    set(_gir_name "${gir}")
+
+    ## Transform the gir filename to something which can reference through a variable
+    ## without automake/make complaining, eg Gtk-2.0.gir -> Gtk_2_0_gir
+    string(REPLACE "-" "_" _gir_name "${_gir_name}")
+    string(REPLACE "." "_" _gir_name "${_gir_name}")
+
+    # Namespace and Version is either fetched from the gir filename
+    # or the _NAMESPACE/_VERSION variable combo
+    set(_gir_namespace "${${_gir_name}_NAMESPACE}")
+    if (_gir_namespace STREQUAL "")
+      string(REGEX REPLACE "([^-]+)-.*" "\\1" _gir_namespace "${gir}")
+    endif ()
+    set(_gir_version "${${_gir_name}_VERSION}")
+    if (_gir_version STREQUAL "")
+      string(REGEX REPLACE ".*-([^-]+).gir" "\\1" _gir_version "${gir}")
+    endif ()
+
+    # _PROGRAM is an optional variable which needs it's own --program argument
+    set(_gir_program "${${_gir_name}_PROGRAM}")
+    if (NOT _gir_program STREQUAL "")
+      set(_gir_program "--program=${_gir_program}")
+    endif ()
+
+    # Variables which provides a list of things
+    _gir_list_prefix(_gir_libraries ${_gir_name}_LIBS "--library=")
+    _gir_list_prefix(_gir_packages ${_gir_name}_PACKAGES "--pkg=")
+    _gir_list_prefix(_gir_includes ${_gir_name}_INCLUDES "--include=")
+    _gir_list_prefix(_gir_export_packages ${_gir_name}_EXPORT_PACKAGES "--pkg-export=")
+
+    # Reuse the LIBTOOL variable from by automake if it's set
+    set(_gir_libtool "--no-libtool")
+
+    add_custom_command(
+      COMMAND ${INTROSPECTION_SCANNER}
+              ${INTROSPECTION_SCANNER_ARGS}
+              --namespace=${_gir_namespace}
+              --nsversion=${_gir_version}
+              ${_gir_libtool}
+              ${_gir_program}
+              ${_gir_libraries}
+              ${_gir_packages}
+              ${_gir_includes}
+              ${_gir_export_packages}
+              ${${_gir_name}_SCANNERFLAGS}
+              ${${_gir_name}_CFLAGS}
+              ${${_gir_name}_FILES}
+              --output ${CMAKE_CURRENT_BINARY_DIR}/${gir}
+      DEPENDS ${${_gir_name}_FILES}
+              ${${_gir_name}_LIBS}
+      OUTPUT ${gir}
+      WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+      VERBATIM
+    )
+    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${gir} DESTINATION share/gir-1.0)
+
+    string(REPLACE ".gir" ".typelib" _typelib "${gir}")
+    add_custom_command(
+      COMMAND ${INTROSPECTION_COMPILER}
+              ${INTROSPECTION_COMPILER_ARGS}
+              --includedir=.
+              ${CMAKE_CURRENT_BINARY_DIR}/${gir}
+              -o ${CMAKE_CURRENT_BINARY_DIR}/${_typelib}
+      DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${gir}
+      OUTPUT ${_typelib}
+      WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+    )
+    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${_typelib} DESTINATION ${CMAKE_INSTALL_LIBDIR}/girepository-1.0)
+
+    add_custom_target(gir-${gir} ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${gir})
+    add_custom_target(gir-typelibs-${_typelib} ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${_typelib})
+  endforeach()
+
+endmacro(gir_add_introspections)
+
+macro(gir_get_cflags _output)
+  get_directory_property(_tmp_includes INCLUDE_DIRECTORIES)
+  list_prefix(_includes _tmp_includes "-I")
+  get_directory_property(_tmp_compile_definitions COMPILE_DEFINITIONS)
+  list_prefix(_compile_definitions _tmp_compile_definitions "-D")
+  set(${_output} ${_includes} ${_compile_definitions})
+endmacro(gir_get_cflags)

=== added file 'cmake/UseGSettings.cmake'
--- cmake/UseGSettings.cmake	1970-01-01 00:00:00 +0000
+++ cmake/UseGSettings.cmake	2013-03-29 12:53:22 +0000
@@ -0,0 +1,42 @@
+# GSettings.cmake, CMake macros written for Marlin, feel free to re-use them.
+
+option (GSETTINGS_LOCALINSTALL "Install GSettings Schemas locally instead of to the GLib prefix" OFF)
+
+option (GSETTINGS_COMPILE "Compile GSettings Schemas after installation" ${GSETTINGS_LOCALINSTALL})
+
+if(GSETTINGS_LOCALINSTALL)
+    message(STATUS "GSettings schemas will be installed locally.")
+endif()
+
+if(GSETTINGS_COMPILE)
+    message(STATUS "GSettings shemas will be compiled.")
+endif()
+
+macro(add_schema SCHEMA_NAME)
+
+    set(PKG_CONFIG_EXECUTABLE pkg-config)
+    # Have an option to not install the schema into where GLib is
+    if (GSETTINGS_LOCALINSTALL)
+        SET (GSETTINGS_DIR "${CMAKE_INSTALL_PREFIX}/share/glib-2.0/schemas/")
+    else (GSETTINGS_LOCALINSTALL)
+        execute_process (COMMAND ${PKG_CONFIG_EXECUTABLE} glib-2.0 --variable prefix OUTPUT_VARIABLE _glib_prefix OUTPUT_STRIP_TRAILING_WHITESPACE)
+        SET (GSETTINGS_DIR "${_glib_prefix}/share/glib-2.0/schemas/")
+    endif (GSETTINGS_LOCALINSTALL)
+
+    # Run the validator and error if it fails
+    execute_process (COMMAND ${PKG_CONFIG_EXECUTABLE} gio-2.0 --variable glib_compile_schemas  OUTPUT_VARIABLE _glib_comple_schemas OUTPUT_STRIP_TRAILING_WHITESPACE)
+    execute_process (COMMAND ${_glib_comple_schemas} --dry-run --schema-file=${CMAKE_CURRENT_SOURCE_DIR}/${SCHEMA_NAME} ERROR_VARIABLE _schemas_invalid OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+    if (_schemas_invalid)
+      message (SEND_ERROR "Schema validation error: ${_schemas_invalid}")
+    endif (_schemas_invalid)
+
+    # Actually install and recomple schemas
+    message (STATUS "GSettings schemas will be installed into ${GSETTINGS_DIR}")
+    install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/${SCHEMA_NAME} DESTINATION ${GSETTINGS_DIR} OPTIONAL)
+
+    if (GSETTINGS_COMPILE)
+        install (CODE "message (STATUS \"Compiling GSettings schemas\")")
+        install (CODE "execute_process (COMMAND ${_glib_comple_schemas} ${GSETTINGS_DIR})")
+    endif ()
+endmacro()

=== added file 'cmake/UseGdbusCodegen.cmake'
--- cmake/UseGdbusCodegen.cmake	1970-01-01 00:00:00 +0000
+++ cmake/UseGdbusCodegen.cmake	2013-03-29 12:53:22 +0000
@@ -0,0 +1,35 @@
+cmake_minimum_required(VERSION 2.6)
+if(POLICY CMP0011)
+  cmake_policy(SET CMP0011 NEW)
+endif(POLICY CMP0011)
+
+find_program(GDBUS_CODEGEN NAMES gdbus-codegen DOC "gdbus-codegen executable")
+if(NOT GDBUS_CODEGEN)
+  message(FATAL_ERROR "Excutable gdbus-codegen not found")
+endif()
+
+function(add_gdbus_codegen)
+  set(_one_value OUTFILES NAME PREFIX NAMESPACE SERVICE_XML)
+  set(_multi_value DEPENDS)
+  cmake_parse_arguments (arg "" "${_one_value}" "${_multi_value}" ${ARGN})
+
+  if(arg_PREFIX)
+    set(PREFIX --interface-prefix ${arg_PREFIX})
+  endif()
+  
+  if(arg_NAMESPACE)
+    set(NAMESPACE --c-namespace ${arg_NAMESPACE})
+  endif()
+  
+  add_custom_command(
+    OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${arg_NAME}.h" "${CMAKE_CURRENT_BINARY_DIR}/${arg_NAME}.c"
+    COMMAND "${GDBUS_CODEGEN}"
+        --generate-c-code "${arg_NAME}"
+        ${PREFIX}
+        ${NAMESPACE}
+        "${arg_SERVICE_XML}"
+    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+    DEPENDS ${arg_DEPENDS} "${arg_SERVICE_XML}"
+  )
+  set(${arg_OUTFILES} ${${arg_OUTFILES}} "${CMAKE_CURRENT_BINARY_DIR}/${arg_NAME}.c" PARENT_SCOPE)
+endfunction(add_gdbus_codegen)

=== added file 'cmake/UseGlibGeneration.cmake'
--- cmake/UseGlibGeneration.cmake	1970-01-01 00:00:00 +0000
+++ cmake/UseGlibGeneration.cmake	2013-03-29 12:53:22 +0000
@@ -0,0 +1,71 @@
+cmake_minimum_required(VERSION 2.6)
+if(POLICY CMP0011)
+  cmake_policy(SET CMP0011 NEW)
+endif(POLICY CMP0011)
+
+find_program(GLIB_MKENUMS glib-mkenums)
+find_program(GLIB_GENMARSHAL glib-genmarshal)
+
+macro(add_glib_marshal outfiles name prefix otherinclude)
+  add_custom_command(
+    OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${name}.h"
+    COMMAND ${GLIB_GENMARSHAL} --header "--prefix=${prefix}"
+            "${CMAKE_CURRENT_SOURCE_DIR}/${name}.list"
+            > "${CMAKE_CURRENT_BINARY_DIR}/${name}.h"
+    DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/${name}.list"
+  )
+  add_custom_command(
+    OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${name}.c"
+    COMMAND echo "\\#include \\\"${otherinclude}\\\"" > "${CMAKE_CURRENT_BINARY_DIR}/${name}.c"
+    COMMAND echo "\\#include \\\"glib-object.h\\\"" >> "${CMAKE_CURRENT_BINARY_DIR}/${name}.c"
+    COMMAND echo "\\#include \\\"${name}.h\\\"" >> "${CMAKE_CURRENT_BINARY_DIR}/${name}.c"
+    COMMAND ${GLIB_GENMARSHAL} --body "--prefix=${prefix}"
+            "${CMAKE_CURRENT_SOURCE_DIR}/${name}.list"
+            >> "${CMAKE_CURRENT_BINARY_DIR}/${name}.c"
+    DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/${name}.list"
+            "${CMAKE_CURRENT_BINARY_DIR}/${name}.h"
+  )
+  list(APPEND ${outfiles} "${CMAKE_CURRENT_BINARY_DIR}/${name}.c")
+endmacro(add_glib_marshal)
+
+macro(add_glib_enumtypes_t outfiles name htemplate ctemplate)
+  add_custom_command(
+    OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${name}.h"
+    COMMAND ${GLIB_MKENUMS}
+            --template "${htemplate}"
+            ${ARGN} > "${CMAKE_CURRENT_BINARY_DIR}/${name}.h"
+    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+    DEPENDS ${ARGN} "${htemplate}"
+  )
+  add_custom_command(
+    OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${name}.c"
+    COMMAND ${GLIB_MKENUMS}
+            --template "${ctemplate}"
+            ${ARGN} > "${CMAKE_CURRENT_BINARY_DIR}/${name}.c"
+    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+    DEPENDS ${ARGN} ${ctemplate}
+            "${CMAKE_CURRENT_BINARY_DIR}/${name}.h"
+  )
+  list(APPEND ${outfiles} "${CMAKE_CURRENT_BINARY_DIR}/${name}.c")
+endmacro(add_glib_enumtypes_t)
+
+macro(add_glib_enumtypes outfiles name namespace includeguard)
+  set(htemplate "${CMAKE_CURRENT_BINARY_DIR}/${name}.h.template")
+  set(ctemplate "${CMAKE_CURRENT_BINARY_DIR}/${name}.c.template")
+
+  # Write the .h template
+  add_custom_command(
+    OUTPUT ${htemplate} ${ctemplate}
+    COMMAND ${CMAKE_COMMAND}
+        "-Dctemplate=${ctemplate}"
+        "-Dhtemplate=${htemplate}"
+        "-Dname=${name}"
+        "-Dnamespace=${namespace}"
+        "-Dincludeguard=${includeguard}"
+        "\"-Dheaders=${ARGN}\""
+        -P "${CMAKE_SOURCE_DIR}/cmake/GlibGenerationTemplates.cmake"
+    DEPENDS "${CMAKE_SOURCE_DIR}/cmake/GlibGenerationTemplates.cmake" ${headers}
+  )
+
+  add_glib_enumtypes_t(${outfiles} ${name} ${htemplate} ${ctemplate} ${ARGN})
+endmacro(add_glib_enumtypes)

=== added file 'cmake/UseGtkDoc.cmake'
--- cmake/UseGtkDoc.cmake	1970-01-01 00:00:00 +0000
+++ cmake/UseGtkDoc.cmake	2013-03-29 12:53:22 +0000
@@ -0,0 +1,234 @@
+# CMake macros to use the GtkDoc documentation system
+
+find_package(GtkDoc)
+
+# gtk_doc_add_module(doc_prefix sourcedir 
+#                    [XML xmlfile] 
+#                    [FIXXREFOPTS fixxrefoption1...]
+#                    [IGNOREHEADERS header1...]
+#                    [DEPENDS depend1...] )
+#
+# sourcedir must be the *full* path to the source directory.
+#
+# If omitted, sgmlfile defaults to the auto generated ${doc_prefix}/${doc_prefix}-docs.xml.
+function(gtk_doc_add_module _doc_prefix _doc_sourcedir)
+	set (_multi_value DEPENDS XML FIXXREFOPTS IGNOREHEADERS CFLAGS LDFLAGS LDPATH SUFFIXES)
+	cmake_parse_arguments (ARG "" "" "${_multi_value}" ${ARGN})
+
+    list(LENGTH ARG_XML _xml_file_length)
+
+    if(ARG_SUFFIXES)
+        set(_doc_source_suffixes "")
+        foreach(_suffix ${ARG_SUFFIXES})
+            if(_doc_source_suffixes)
+                set(_doc_source_suffixes "${_doc_source_suffixes},${_suffix}")
+            else(_doc_source_suffixes)
+                set(_doc_source_suffixes "${_suffix}")
+            endif(_doc_source_suffixes)
+        endforeach(_suffix)
+    else(ARG_SUFFIXES)
+        set(_doc_source_suffixes "h")
+    endif(ARG_SUFFIXES)
+
+    set(_do_all ALL)
+
+    set(_opts_valid 1)
+    if(NOT _xml_file_length LESS 2)
+        message(SEND_ERROR "Must have at most one sgml file specified.")
+        set(_opts_valid 0)
+    endif(NOT _xml_file_length LESS 2)
+
+    if(_opts_valid)
+        # a directory to store output.
+        set(_output_dir "${CMAKE_CURRENT_BINARY_DIR}/${_doc_prefix}")
+        set(_output_dir_stamp "${_output_dir}/dir.stamp")
+        
+        # set default sgml file if not specified
+        set(_default_xml_file "${_output_dir}/${_doc_prefix}-docs.xml")
+        get_filename_component(_default_xml_file ${_default_xml_file} ABSOLUTE)
+        
+        # a directory to store html output.
+        set(_output_html_dir "${_output_dir}/html")
+        set(_output_html_dir_stamp "${_output_dir}/html_dir.stamp")
+
+        # The output files
+        set(_output_decl_list "${_output_dir}/${_doc_prefix}-decl-list.txt")
+        set(_output_decl "${_output_dir}/${_doc_prefix}-decl.txt")
+        set(_output_overrides "${_output_dir}/${_doc_prefix}-overrides.txt")
+        set(_output_sections "${_output_dir}/${_doc_prefix}-sections.txt")
+        set(_output_types "${_output_dir}/${_doc_prefix}.types")
+
+        set(_output_signals "${_output_dir}/${_doc_prefix}.signals")
+
+        set(_output_unused "${_output_dir}/${_doc_prefix}-unused.txt")
+        set(_output_undeclared "${_output_dir}/${_doc_prefix}-undeclared.txt")
+        set(_output_undocumented "${_output_dir}/${_doc_prefix}-undocumented.txt")
+        set(_output_tmpl_dir "${_output_dir}/tmpl")
+        set(_output_tmpl_stamp "${_output_dir}/tmpl.stamp")
+
+        set(_output_xml_dir "${_output_dir}/xml")
+        set(_output_sgml_stamp "${_output_dir}/sgml.stamp")
+
+        set(_output_html_stamp "${_output_dir}/html.stamp")
+
+        # add a command to create output directory
+        add_custom_command(
+            OUTPUT "${_output_dir_stamp}" "${_output_dir}"
+            COMMAND ${CMAKE_COMMAND} -E make_directory "${_output_dir}"
+            COMMAND ${CMAKE_COMMAND} -E touch ${_output_dir_stamp}
+            VERBATIM)
+
+        set(_ignore_headers_opt "")
+        if(ARG_IGNOREHEADERS)
+            set(_ignore_headers_opt "--ignore-headers=")
+            foreach(_header ${ARG_IGNOREHEADERS})
+                set(_ignore_headers_opt "${_ignore_headers_opt}${_header} ")
+            endforeach(_header ${ARG_IGNOREHEADERS})
+        endif(ARG_IGNOREHEADERS)
+
+        # add a command to scan the input
+        add_custom_command(
+            OUTPUT
+                "${_output_decl_list}"
+                "${_output_decl}"
+                "${_output_decl}.bak"
+                "${_output_overrides}"
+                "${_output_sections}"
+                "${_output_types}"
+                "${_output_types}.bak"
+            DEPENDS
+                "${_output_dir}"
+                ${ARG_DEPENDS}
+            COMMAND ${GTKDOC_SCAN_EXE}
+                "--module=${_doc_prefix}"
+                "${_ignore_headers_opt}"
+                "--rebuild-sections"
+                "--rebuild-types"
+                "--source-dir=${_doc_sourcedir}"
+            WORKING_DIRECTORY "${_output_dir}"
+            VERBATIM)
+
+        # add a command to scan the input via gtkdoc-scangobj
+        # This is such a disgusting hack!
+        add_custom_command(
+            OUTPUT
+                "${_output_signals}"
+            DEPENDS
+                "${_output_types}"
+                "${ARG_DEPENDS}"
+            COMMAND ${CMAKE_COMMAND} 
+                -D "GTKDOC_SCANGOBJ_EXE:STRING=${GTKDOC_SCANGOBJ_EXE}"
+                -D "doc_prefix:STRING=${_doc_prefix}"
+                -D "output_types:STRING=${_output_types}"
+                -D "output_dir:STRING=${_output_dir}"
+                -D "EXTRA_CFLAGS:STRING=${ARG_CFLAGS}"
+                -D "EXTRA_LDFLAGS:STRING=${ARG_LDFLAGS}"
+                -D "EXTRA_LDPATH:STRING=${ARG_LDPATH}"
+                -P ${GTKDOC_SCANGOBJ_WRAPPER}
+            WORKING_DIRECTORY "${_output_dir}"
+            VERBATIM)
+
+        # add a command to make the templates
+        add_custom_command(
+            OUTPUT
+                "${_output_unused}"
+                "${_output_undeclared}"
+                "${_output_undocumented}"
+                "${_output_tmpl_dir}"
+                "${_output_tmpl_stamp}"
+            DEPENDS
+                "${_output_types}"
+                "${_output_signals}"
+                "${_output_sections}"
+                "${_output_overrides}"
+                ${ARG_DEPENDS}
+            COMMAND ${CMAKE_COMMAND} -E remove_directory ${_output_tmpl_dir}
+            COMMAND ${GTKDOC_MKTMPL_EXE}
+                "--module=${_doc_prefix}"
+            WORKING_DIRECTORY "${_output_dir}"
+            VERBATIM)
+
+        set(_copy_xml_if_needed "")
+        if(ARG_XML)
+            get_filename_component(ARG_XML ${ARG_XML} ABSOLUTE)
+            set(_copy_xml_if_needed 
+                COMMAND ${CMAKE_COMMAND} -E copy "${ARG_XML}" "${_default_xml_file}")
+        endif(ARG_XML)
+
+        set(_remove_xml_if_needed "")
+        if(ARG_XML)
+            set(_remove_xml_if_needed 
+                COMMAND ${CMAKE_COMMAND} -E remove ${_default_xml_file})
+        endif(ARG_XML)
+
+        # add a command to make the database
+        add_custom_command(
+            OUTPUT
+                "${_output_sgml_stamp}"
+                "${_default_xml_file}"
+            DEPENDS
+                "${_output_tmpl_stamp}"
+                "${_output_unused}"
+                "${_output_undeclared}"
+                "${_output_undocumented}"
+                ${ARG_DEPENDS}
+                ${_remove_xml_if_needed}
+            COMMAND ${CMAKE_COMMAND} -E remove_directory ${_output_xml_dir}
+            COMMAND ${GTKDOC_MKDB_EXE}
+                "--module=${_doc_prefix}"
+                "--source-dir=${_doc_sourcedir}"
+                "--source-suffixes=${_doc_source_suffixes}"
+                "--output-format=xml"
+                "--main-sgml-file=${_default_xml_file}"
+            ${_copy_xml_if_needed}
+            WORKING_DIRECTORY "${_output_dir}"
+            VERBATIM)
+
+        # add a command to create html directory
+        add_custom_command(
+            OUTPUT "${_output_html_dir_stamp}" "${_output_html_dir}"
+            COMMAND ${CMAKE_COMMAND} -E make_directory ${_output_html_dir}
+            COMMAND ${CMAKE_COMMAND} -E touch ${_output_html_dir_stamp}
+            VERBATIM)
+
+        # add a command to output HTML
+        add_custom_command(
+            OUTPUT
+                "${_output_html_stamp}" 
+            DEPENDS
+                "${_output_html_dir_stamp}"
+                "${_output_sgml_stamp}"
+                "${_output_tmpl_stamp}"
+                "${ARG_XML}"
+                ${ARG_DEPENDS}
+            ${_copy_xml_if_needed}
+            COMMAND ${GTKDOC_MKHTML_EXE}
+                "${_doc_prefix}"
+                "${_default_xml_file}"
+            WORKING_DIRECTORY "${_output_html_dir}"
+            VERBATIM)
+
+        # fix output refs
+        add_custom_target("${_doc_prefix}-gtxdoc-fixxref" 
+            DEPENDS
+                "${_output_html_stamp}"
+                ${ARG_DEPENDS}
+            COMMAND ${GTKDOC_FIXXREF_EXE}
+                "--module=${_doc_prefix}"
+                "--module-dir=."
+                ${ARG_FIXXREFOPTS}
+            #${_remove_xml_if_needed}
+            WORKING_DIRECTORY "${_output_dir}"
+            VERBATIM)
+
+        add_custom_target(doc-${_doc_prefix} ${_do_all} 
+            DEPENDS
+                "${_doc_prefix}-gtxdoc-fixxref"
+                ${ARG_DEPENDS})
+
+        add_test(doc-${_doc_prefix}-check ${GTKDOC_CHECK_EXE})
+        set_tests_properties(doc-${_doc_prefix}-check PROPERTIES
+          ENVIRONMENT "DOC_MODULE=${_doc_prefix};DOC_MAIN_SGML_FILE=${_doc_prefix}-docs.xml;SRCDIR=${_doc_sourcedir};BUILDDIR=${_output_dir}"
+        )
+    endif(_opts_valid)
+endfunction(gtk_doc_add_module)

=== added file 'cmake/UseVala.cmake'
--- cmake/UseVala.cmake	1970-01-01 00:00:00 +0000
+++ cmake/UseVala.cmake	2013-03-29 12:53:22 +0000
@@ -0,0 +1,241 @@
+# - Precompilation of Vala/Genie source files into C sources
+# Makes use of the parallel build ability introduced in Vala 0.11. Derived
+# from a similar module by Jakob Westhoff and the original GNU Make rules.
+# Might be a bit oversimplified.
+#
+# This module defines three functions. The first one:
+#
+#   vala_init (id
+#     [DIRECTORY dir]          - Output directory (binary dir by default)
+#     [PACKAGES package...]    - Package dependencies
+#     [OPTIONS option...]      - Extra valac options
+#     [CUSTOM_VAPIS file...])  - Custom vapi files to include in the build
+#     [DEPENDS targets...])    - Extra dependencies for code generation
+#
+# initializes a single precompilation unit using the given arguments.
+# You can put files into it via the following function:
+#
+#   vala_add (id source.vala
+#     [DEPENDS source...])     - Vala/Genie source or .vapi dependencies
+#
+# Finally retrieve paths for generated C files by calling:
+#
+#   vala_finish (id
+#     [SOURCES sources_var]          - Input Vala/Genie sources
+#     [OUTPUTS outputs_var]          - Output C sources
+#     [GENERATE_HEADER id.h          - Generate id.h and id_internal.h
+#       [GENERATE_VAPI id.vapi]      - Generate a vapi file
+#       [GENERATE_SYMBOLS id.def]])  - Generate a list of public symbols
+#
+
+#=============================================================================
+# Copyright Přemysl Janouch 2011
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#     * Redistributions of source code must retain the above copyright
+#       notice, this list of conditions and the following disclaimer.
+#     * Redistributions in binary form must reproduce the above copyright
+#       notice, this list of conditions and the following disclaimer in the
+#       documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS''
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+# OF SUCH DAMAGE.
+#=============================================================================
+
+find_package (Vala 0.11 REQUIRED)
+include (CMakeParseArguments)
+
+function (vala_init id)
+	set (_multi_value PACKAGES OPTIONS CUSTOM_VAPIS DEPENDS)
+	cmake_parse_arguments (arg "" "DIRECTORY" "${_multi_value}" ${ARGN})
+
+	if (arg_DIRECTORY)
+		set (directory ${arg_DIRECTORY})
+		if (NOT IS_DIRECTORY ${directory})
+			file (MAKE_DIRECTORY ${directory})
+		endif (NOT IS_DIRECTORY ${directory})
+	else (arg_DIRECTORY)
+		set (directory ${CMAKE_CURRENT_BINARY_DIR})
+	endif (arg_DIRECTORY)
+
+	set (pkg_opts)
+	foreach (pkg ${arg_PACKAGES})
+		list (APPEND pkg_opts "--pkg=${pkg}")
+	endforeach (pkg)
+
+	set (VALA_${id}_DIR "${directory}" PARENT_SCOPE)
+	set (VALA_${id}_ARGS ${pkg_opts} ${arg_OPTIONS}
+		${arg_CUSTOM_VAPIS} PARENT_SCOPE)
+	set (VALA_${id}_DEPENDS ${arg_DEPENDS}
+		PARENT_SCOPE)
+
+	set (VALA_${id}_SOURCES "" PARENT_SCOPE)
+	set (VALA_${id}_OUTPUTS "" PARENT_SCOPE)
+	set (VALA_${id}_FAST_VAPI_FILES "" PARENT_SCOPE)
+	set (VALA_${id}_FAST_VAPI_ARGS "" PARENT_SCOPE)
+endfunction (vala_init)
+
+function (vala_add id file)
+	cmake_parse_arguments (arg "" "" "DEPENDS" ${ARGN})
+
+	if (NOT IS_ABSOLUTE "${file}")
+		set (file "${CMAKE_CURRENT_SOURCE_DIR}/${file}")
+	endif (NOT IS_ABSOLUTE "${file}")
+
+	get_filename_component (output_name "${file}" NAME)
+	get_filename_component (output_base "${file}" NAME_WE)
+	set (output_base "${VALA_${id}_DIR}/${output_base}")
+
+	# XXX: It would be best to have it working without touching the vapi
+	#      but it appears this cannot be done in CMake.
+	add_custom_command (OUTPUT "${output_base}.vapi"
+		COMMAND ${VALA_COMPILER} "${file}" "--fast-vapi=${output_base}.vapi"
+		COMMAND ${CMAKE_COMMAND} -E touch "${output_base}.vapi"
+		DEPENDS "${file}"
+		COMMENT "Generating a fast vapi for ${output_name}" VERBATIM)
+
+	set (vapi_opts)
+	set (vapi_depends)
+	foreach (vapi ${arg_DEPENDS})
+		if (NOT IS_ABSOLUTE "${vapi}")
+			set (vapi "${VALA_${id}_DIR}/${vapi}.vapi")
+		endif (NOT IS_ABSOLUTE "${vapi}")
+
+		list (APPEND vapi_opts "--use-fast-vapi=${vapi}")
+		list (APPEND vapi_depends "${vapi}")
+	endforeach (vapi)
+
+	add_custom_command (OUTPUT "${output_base}.c"
+		COMMAND ${VALA_COMPILER} "${file}" -C ${vapi_opts} ${VALA_${id}_ARGS}
+		COMMAND ${CMAKE_COMMAND} -E touch "${output_base}.c"
+		DEPENDS "${file}" ${vapi_depends} ${VALA_${id}_DEPENDS}
+		WORKING_DIRECTORY "${VALA_${id}_DIR}"
+		COMMENT "Precompiling ${output_name}" VERBATIM)
+
+	set (VALA_${id}_SOURCES ${VALA_${id}_SOURCES}
+		"${file}" PARENT_SCOPE)
+	set (VALA_${id}_OUTPUTS ${VALA_${id}_OUTPUTS}
+		"${output_base}.c" PARENT_SCOPE)
+	set (VALA_${id}_FAST_VAPI_FILES ${VALA_${id}_FAST_VAPI_FILES}
+		"${output_base}.vapi" PARENT_SCOPE)
+	set (VALA_${id}_FAST_VAPI_ARGS ${VALA_${id}_FAST_VAPI_ARGS}
+		"--use-fast-vapi=${output_base}.vapi" PARENT_SCOPE)
+endfunction (vala_add)
+
+function (vala_finish id)
+	set (_one_value SOURCES OUTPUTS
+		GENERATE_VAPI GENERATE_HEADER GENERATE_SYMBOLS)
+	cmake_parse_arguments (arg "" "${_one_value}" "" ${ARGN})
+
+	if (arg_SOURCES)
+		set (${arg_SOURCES} ${VALA_${id}_SOURCES} PARENT_SCOPE)
+	endif (arg_SOURCES)
+
+	if (arg_OUTPUTS)
+		set (${arg_OUTPUTS} ${VALA_${id}_OUTPUTS} PARENT_SCOPE)
+	endif (arg_OUTPUTS)
+
+	set (outputs)
+	set (export_args)
+
+	if (arg_GENERATE_VAPI)
+		if (NOT IS_ABSOLUTE "${arg_GENERATE_VAPI}")
+			set (arg_GENERATE_VAPI
+				"${VALA_${id}_DIR}/${arg_GENERATE_VAPI}")
+		endif (NOT IS_ABSOLUTE "${arg_GENERATE_VAPI}")
+
+		list (APPEND outputs "${arg_GENERATE_VAPI}")
+		list (APPEND export_args "--internal-vapi=${arg_GENERATE_VAPI}")
+
+		if (NOT arg_GENERATE_HEADER)
+			message (FATAL_ERROR "Header generation required for vapi")
+		endif (NOT arg_GENERATE_HEADER)
+	endif (arg_GENERATE_VAPI)
+
+	if (arg_GENERATE_SYMBOLS)
+		if (NOT IS_ABSOLUTE "${arg_GENERATE_SYMBOLS}")
+			set (arg_GENERATE_SYMBOLS
+				"${VALA_${id}_DIR}/${arg_GENERATE_SYMBOLS}")
+		endif (NOT IS_ABSOLUTE "${arg_GENERATE_SYMBOLS}")
+
+		list (APPEND outputs "${arg_GENERATE_SYMBOLS}")
+		list (APPEND export_args "--symbols=${arg_GENERATE_SYMBOLS}")
+
+		if (NOT arg_GENERATE_HEADER)
+			message (FATAL_ERROR "Header generation required for symbols")
+		endif (NOT arg_GENERATE_HEADER)
+	endif (arg_GENERATE_SYMBOLS)
+
+	if (arg_GENERATE_HEADER)
+		if (NOT IS_ABSOLUTE "${arg_GENERATE_HEADER}")
+			set (arg_GENERATE_HEADER
+				"${VALA_${id}_DIR}/${arg_GENERATE_HEADER}")
+		endif (NOT IS_ABSOLUTE "${arg_GENERATE_HEADER}")
+
+		get_filename_component (header_path "${arg_GENERATE_HEADER}" PATH)
+		get_filename_component (header_name "${arg_GENERATE_HEADER}" NAME_WE)
+		set (header_base "${header_path}/${header_name}")
+		get_filename_component (header_ext "${arg_GENERATE_HEADER}" EXT)
+
+		list (APPEND outputs
+			"${header_base}${header_ext}"
+			"${header_base}_internal${header_ext}")
+		list (APPEND export_args
+			"--header=${header_base}${header_ext}"
+			"--internal-header=${header_base}_internal${header_ext}")
+	endif (arg_GENERATE_HEADER)
+
+	if (outputs)
+		add_custom_command (OUTPUT ${outputs}
+			COMMAND ${VALA_COMPILER} -C ${VALA_${id}_ARGS}
+				${export_args} ${VALA_${id}_FAST_VAPI_ARGS}
+			DEPENDS ${VALA_${id}_FAST_VAPI_FILES}
+			COMMENT "Generating vapi/headers/symbols" VERBATIM)
+	endif (outputs)
+endfunction (vala_finish id)
+
+
+function (vapi_gen id)
+	set (_one_value LIBRARY INPUT)
+	set (_multi_value PACKAGES)
+	cmake_parse_arguments (arg "" "${_one_value}" "${_multi_value}" ${ARGN})
+
+	set(OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${id}.vapi")
+	if (arg_LIBRARY)
+		set (OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${arg_LIBRARY}.vapi")
+	endif (arg_LIBRARY)
+	
+	set("${id}_OUTPUT" ${OUTPUT} PARENT_SCOPE)
+	
+	set(PACKAGE_LIST)
+	foreach(PACKAGE ${arg_PACKAGES})
+		list(APPEND PACKAGE_LIST "--pkg" ${PACKAGE})
+	endforeach()
+	
+	add_custom_command(
+		OUTPUT
+			${OUTPUT}
+		COMMAND
+			${VAPI_GEN}
+			${PACKAGE_LIST}
+			--library=${arg_LIBRARY}
+			${arg_INPUT}
+		DEPENDS
+			${arg_INPUT}
+		VERBATIM
+	)
+	
+	add_custom_target(${id} ALL DEPENDS ${OUTPUT})
+endfunction (vapi_gen id)
+

=== removed file 'configure.ac'
--- configure.ac	2013-03-20 21:25:56 +0000
+++ configure.ac	1970-01-01 00:00:00 +0000
@@ -1,306 +0,0 @@
-AC_INIT([hud],
-        [13.10.0],
-        [http://bugs.launchpad.net/hud],
-        [hud],
-        [http://launchpad.net/hud])
-
-AC_COPYRIGHT([Copyright 2010-2012 Canonical])
-
-AC_PREREQ(2.53)
-
-AM_CONFIG_HEADER(config.h)
-AC_CONFIG_SRCDIR([configure.ac])
-AC_CONFIG_MACRO_DIR([m4])
-
-AM_INIT_AUTOMAKE([1.11 -Wall foreign subdir-objects])
-AM_MAINTAINER_MODE([enable])
-
-AM_SILENT_RULES([yes])
-
-# Check for programs
-AC_PROG_CC
-AM_PROG_CC_C_O
-AM_PROG_VALAC([])
-
-# Initialize libtool
-LT_PREREQ([2.2.6])
-LT_INIT
-
-AC_PATH_PROG([GLIB_MKENUMS], [glib-mkenums])
-AC_PATH_PROG([GLIB_GENMARSHAL], [glib-genmarshal])
-
-PKG_PROG_PKG_CONFIG
-
-AC_ARG_ENABLE([deprecations],
-  [AS_HELP_STRING([--enable-deprecations],
-    [allow deprecated API usage @<:@default=yes@:>@])],
-  [],
-  [enable_deprecations=yes])
-AS_IF([test "x$enable_deprecations" = xno],
-  [CFLAGS="$CFLAGS -DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGSEAL_ENABLE -DGTK_DISABLE_SINGLE_INCLUDES"]
-)
-
-###########################
-# GTK Doc
-###########################
-
-GTK_DOC_CHECK([1.9], [--flavour=no-tmpl])
-AC_CONFIG_MACRO_DIR(m4)
-
-###########################
-# GLib GSettings
-###########################
-
-GLIB_GSETTINGS
-
-###########################
-# GObject Introspection
-###########################
-
-GOBJECT_INTROSPECTION_CHECK([0.9.5])
-
-###########################
-# Vala API Generation
-###########################
-
-AC_ARG_ENABLE([vala],
-    AC_HELP_STRING([--disable-vala], [Disable vala]),
-    [enable_vala=$enableval], [enable_vala=auto])
-
-AS_IF([test "x$enable_vala" != "xno"],[
-    AM_COND_IF([HAVE_INTROSPECTION],,[
-        AC_MSG_ERROR([Vala bindings require introspection support, please --enable-introspection])
-    ])  
-AC_PATH_PROG([VALA_API_GEN], [vapigen])
-])
-AM_CONDITIONAL([HAVE_VALA], [test -n "$VALA_API_GEN"])
-
-###########################
-# Dependencies
-###########################
-
-GLIB_REQUIRED_VERSION=2.34.0
-DBUSMENU_GLIB_REQUIRED_VERSION=0.4.0
-SQLITE_REQUIRED_VERSION=0.0
-
-PKG_CHECK_MODULES([HUD],[
-		glib-2.0 >= $GLIB_REQUIRED_VERSION
-		gio-unix-2.0 >= $GLIB_REQUIRED_VERSION
-		dbusmenu-glib-0.4 >= $DBUSMENU_GLIB_REQUIRED_VERSION
-		sqlite3 >= $SQLITE_REQUIRED_VERSION
-		dee-1.0
-		pocketsphinx
-])
-
-GTK_REQUIRED_VERSION=3.0
-PKG_CHECK_MODULES(gtk,[
-		gtk+-3.0 >= $GTK_REQUIRED_VERSION
-])
-
-PKG_CHECK_MODULES([DBUSMENU_JSON], [dbusmenu-jsonloader-0.4])
-
-###########################
-# BAMF Dependency
-###########################
-
-BAMF_REQUIRED_VERSION=0.2.53
-
-AC_ARG_ENABLE([bamf],
-    AC_HELP_STRING([--disable-bamf], [Disable bamf]),
-    [enable_bamf=$enableval], [enable_bamf=auto])
-
-AS_IF([test "x$enable_bamf" != "xno"],[
-PKG_CHECK_MODULES([BAMF],[
-		libbamf3 
-])
-AC_DEFINE([HAVE_BAMF], [1], [Defined if we are building with BAMF])
-])
-
-###########################
-# Hybris Dependency
-###########################
-
-AC_ARG_ENABLE([hybris],
-    AC_HELP_STRING([--disable-hybris], [Disable hybris]),
-    [enable_hybris=$enableval], [enable_hybris=auto])
-
-AS_IF([test "x$enable_hybris" != "xno"],[
-AC_DEFINE([HAVE_HYBRIS], [1], [Defined if we are building with libhybris])
-HYBRIS_CFLAGS="-I/usr/include/hybris"
-HYBRIS_LIBS="-lubuntu_application_api"
-AC_SUBST([HYBRIS_CFLAGS])
-AC_SUBST([HYBRIS_LIBS])
-])
-
-###########################
-# Sanity Check
-###########################
-
-AS_IF([test "x$enable_hybris" == "x$enable_bamf"],[
-AC_MSG_ERROR([Invalid to use hybris and bamf together or neither of them])
-])
-
-###########################
-# Test Dependencies
-###########################
-
-DBUSMENU_JSONLOADER_REQUIRED_VERSION=0.3.3
-LIBAPPINDICATOR_REQUIRED_VERSION=0.0.0
-
-AC_ARG_ENABLE([tests],
-	AC_HELP_STRING([--disable-tests], [Disable test scripts and tools]),,
-	[enable_tests=auto])
-
-if test x"$enable_tests" != x"no" ; then
-   PKG_CHECK_MODULES(INDICATORTEST,
-                     dbusmenu-jsonloader-0.4 >= $DBUSMENU_JSONLOADER_REQUIRED_VERSION
-                     appindicator3-0.1 >= $LIBAPPINDICATOR_REQUIRED_VERSION,
-                     [have_dbusmenu_jsonloader=yes],
-                     [have_dbusmenu_jsonloader=no]
-                    )
-   if test x${enable_tests} = xyes && test x${have_dbusmenu_jsonloader} = xno; then
-     AC_MSG_ERROR([Test scripts and tools configured but dbusmenu-jsonloader not found])
-   fi
-else
-   have_dbusmenu-jsonloader=no
-fi
-AM_CONDITIONAL(BUILD_TESTS, test x${have_dbusmenu_jsonloader} = xyes)
-
-AC_SUBST(INDICATORTEST_CFLAGS)
-AC_SUBST(INDICATORTEST_LIBS)
-
-PKG_CHECK_MODULES(DBUSTEST, dbustest-1)
-AC_SUBST(DBUSTEST_CFLAGS)
-AC_SUBST(DBUSTEST_LIBS)
-
-###########################
-# gcov coverage reporting
-###########################
-
-m4_include([m4/gcov.m4])
-AC_TDD_GCOV
-AM_CONDITIONAL([HAVE_GCOV], [test "x$ac_cv_check_gcov" = xyes])
-AM_CONDITIONAL([HAVE_LCOV], [test "x$ac_cv_check_lcov" = xyes])
-AM_CONDITIONAL([HAVE_GCOVR], [test "x$ac_cv_check_gcovr" = xyes])
-AC_SUBST(COVERAGE_CFLAGS)
-AC_SUBST(COVERAGE_CXXFLAGS)
-AC_SUBST(COVERAGE_LDFLAGS)
-
-###########################
-# XSLT Processor
-###########################
-
-AC_PATH_PROG([XSLT_PROC], [xsltproc])
-
-###########################
-# Check to see if we're local
-###########################
-
-with_localinstall="no"
-AC_ARG_ENABLE(localinstall, AS_HELP_STRING([--enable-localinstall], [install all of the files localy instead of system directories (for distcheck)]), with_localinstall=$enableval, with_localinstall=no)
-
-###########################
-# Indicator Info
-###########################
-
-if test "x$with_localinstall" = "xyes"; then
-	INDICATORDIR="${libdir}/indicators/3/"
-	INDICATORICONSDIR="${datadir}/libindicate/icons/"
-elif test "x$with_gtk" = x2; then
-	INDICATORDIR=`$PKG_CONFIG --variable=indicatordir indicator-0.4`
-	INDICATORICONSDIR=`$PKG_CONFIG --variable=iconsdir indicator-0.4`
-else
-	INDICATORDIR=`$PKG_CONFIG --variable=indicatordir indicator3-0.4`
-	INDICATORICONSDIR=`$PKG_CONFIG --variable=iconsdir indicator3-0.4`
-fi
-AC_SUBST(INDICATORDIR)
-AC_SUBST(INDICATORICONSDIR)
-
-###########################
-# DBus Service Info
-###########################
-
-if test "x$with_localinstall" = "xyes"; then
-	DBUSSERVICEDIR="${datadir}/dbus-1/services/"
-else
-	DBUSSERVICEDIR=`$PKG_CONFIG --variable=session_bus_services_dir dbus-1`
-fi
-AC_SUBST(DBUSSERVICEDIR)
-
-if test "x$with_localinstall" = "xyes"; then
-	DBUSIFACEDIR="${datadir}/dbus-1/interfaces/"
-else
-	DBUSIFACEDIR=`$PKG_CONFIG --variable=interfaces_dir dbus-1`
-fi
-AC_SUBST(DBUSIFACEDIR)
-
-##############################
-# Custom Junk
-##############################
-
-AC_DEFUN([AC_DEFINE_PATH], [
-	test "x$prefix" = xNONE && prefix="$ac_default_prefix"
-	test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-	ac_define_path=`eval echo [$]$2`
-	ac_define_path=`eval echo [$]ac_define_path`
-	$1="$ac_define_path"
-	AC_SUBST($1)
-	ifelse($3, ,
-		AC_DEFINE_UNQUOTED($1, "$ac_define_path"),
-		AC_DEFINE_UNQUOTED($1, "$ac_define_path", $3))
-])
-
-###########################
-# Internationalization
-###########################
-
-GETTEXT_PACKAGE=hud
-
-IT_PROG_INTLTOOL([0.50.2])
-
-AM_GNU_GETTEXT([external])
-AM_GNU_GETTEXT_VERSION([0.17])
-
-AC_SUBST(GETTEXT_PACKAGE)
-AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Define to the gettext package name.])
-AC_DEFINE_PATH(GNOMELOCALEDIR, "${datadir}/locale", [locale directory])
-
-###########################
-# Files
-###########################
-
-AC_OUTPUT([
-Makefile
-src/Makefile
-libhud/Makefile
-libhud/tests/Makefile
-libhud/demo/Makefile
-libhud-gtk/Makefile
-libhud-client/Makefile
-data/Makefile
-po/Makefile.in
-tools-vala/Makefile
-tools/Makefile
-tools/hudkeywords/Makefile
-tools/hudkeywords/bin/Makefile
-tools/hudkeywords/hudkeywords/Makefile
-tests/Makefile
-docs/Makefile
-docs/man/Makefile
-docs/libhud-client/Makefile
-])
-
-###########################
-# Results
-###########################
-
-AC_MSG_NOTICE([
-
-App Menu Indicator Configuration:
-
-	Prefix:        $prefix
-	Indicator Dir: $INDICATORDIR
-	gcov:          $use_gcov
-	Local Install: $with_localinstall
-	Test tools:    $have_dbusmenu_jsonloader
-])

=== added file 'data/CMakeLists.txt'
--- data/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ data/CMakeLists.txt	2013-03-29 12:53:22 +0000
@@ -0,0 +1,38 @@
+
+###########################
+# Dbus Interfaces
+###########################
+
+install(
+FILES
+com.canonical.hud.query.xml
+com.canonical.hud.xml
+DESTINATION ${DBUSIFACEDIR}
+)
+
+###########################
+# Dbus Services
+###########################
+
+set(HUD_SERVICE
+"${CMAKE_CURRENT_BINARY_DIR}/com.canonical.hud.service"
+)
+
+set(pkglibexecdir "${CMAKE_INSTALL_FULL_LIBEXECDIR}/hud")
+configure_file("com.canonical.hud.service.in"
+  "${HUD_SERVICE}"
+  @ONLY
+)
+
+install(
+FILES
+"${HUD_SERVICE}"
+DESTINATION ${DBUSSERVICEDIR}
+)
+
+###########################
+# GSettings
+###########################
+
+add_schema ("com.canonical.indicator.appmenu.hud.gschema.xml")
+add_schema ("com.canonical.indicator.appmenu.hud.search.gschema.xml")

=== removed file 'data/Makefile.am'
--- data/Makefile.am	2013-01-29 20:06:40 +0000
+++ data/Makefile.am	1970-01-01 00:00:00 +0000
@@ -1,28 +0,0 @@
-gsettings_SCHEMAS = \
-    com.canonical.indicator.appmenu.hud.gschema.xml \
-    com.canonical.indicator.appmenu.hud.search.gschema.xml
-
-@GSETTINGS_RULES@
-
-dbus_servicesdir = $(DBUSSERVICEDIR)
-dbus_services_DATA = com.canonical.hud.service
-
-%.service: %.service.in
-	sed -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@
-
-dbus_interfacesdir = $(DBUSIFACEDIR)
-dbus_interfaces_DATA = \
-	com.canonical.hud.query.xml \
-	com.canonical.hud.xml
-
-EXTRA_DIST = \
-	$(dbus_interfaces_DATA) \
-	com.canonical.hud.Application.xml \
-	$(dbus_services_DATA:.service=.service.in) \
-	$(gsettings_SCHEMAS) \
-	$(pkgdata_DATA)
-
-CLEANFILES = \
-	$(dbus_services_DATA)
-
-pkgdata_DATA = 

=== modified file 'debian/control'
--- debian/control	2013-03-26 03:11:16 +0000
+++ debian/control	2013-03-29 12:53:22 +0000
@@ -3,6 +3,7 @@
 Priority: optional
 Maintainer: Ubuntu Developers <[e-mail]>
 Build-Depends: bamfdaemon,
+               cmake,
                bustle,
                dbus-test-runner,
                debhelper (>= 9),

=== modified file 'debian/hud-tools.install'
--- debian/hud-tools.install	2013-01-28 20:15:32 +0000
+++ debian/hud-tools.install	2013-03-29 12:53:22 +0000
@@ -1,4 +1,4 @@
 usr/bin
 usr/share/hud-gtk
 usr/share/man
-usr/lib/python2.7/dist-packages/hudkeywords/*
+usr/lib/python*

=== modified file 'debian/libhud1.symbols'
--- debian/libhud1.symbols	2013-03-13 14:17:25 +0000
+++ debian/libhud1.symbols	2013-03-29 12:53:22 +0000
@@ -1,5 +1,4 @@
 libhud.so.1 libhud1 #MINVER#
- hud_action_description_changed_signal@Base 13.04.0
  hud_action_description_get_action_name@Base 13.04.0
  hud_action_description_get_action_target@Base 13.04.0
  hud_action_description_get_type@Base 13.04.0
@@ -18,27 +17,20 @@
  hud_action_publisher_get_description_path@Base 13.04.0-0ubuntu1~ppa2
  hud_action_publisher_get_id@Base 13.04.0-0ubuntu1~ppa2
  hud_action_publisher_get_type@Base 13.04.0
+ hud_action_publisher_new_for_id@Base 13.04.0-0ubuntu1~ppa2
  hud_action_publisher_new_for_application@Base 13.04.0
- hud_action_publisher_new_for_id@Base 13.04.0-0ubuntu1~ppa2
  hud_action_publisher_remove_action_group@Base 13.04.0
- hud_action_publisher_remove_description@Base 13.04.0
- hud_action_publisher_remove_descriptions@Base 13.04.0
- hud_action_publisher_signals@Base 13.04.0
  hud_action_set_enabled@Base 13.04.0
  hud_action_set_operation@Base 13.04.0
- hud_action_signals@Base 13.04.0
  hud_manager_add_actions@Base 13.04.0
  hud_manager_get_type@Base 13.04.0-0ubuntu1~ppa2
  hud_manager_new@Base 13.04.0-0ubuntu1~ppa2
  hud_manager_new_for_application@Base 13.04.0-0ubuntu1~ppa2
  hud_manager_remove_actions@Base 13.04.0
- hud_operation_ended@Base 13.04.0
  hud_operation_get_boolean@Base 13.04.0
  hud_operation_get_double@Base 13.04.0
  hud_operation_get_int@Base 13.04.0
  hud_operation_get_type@Base 13.04.0
  hud_operation_get_uint@Base 13.04.0
  hud_operation_get_user_data@Base 13.04.0
- hud_operation_new@Base 13.04.0
  hud_operation_setup@Base 13.04.0
- hud_operation_started@Base 13.04.0

=== modified file 'debian/rules'
--- debian/rules	2013-02-28 16:30:17 +0000
+++ debian/rules	2013-03-29 12:53:22 +0000
@@ -2,20 +2,13 @@
 
 export DPKG_GENSYMBOLS_CHECK_LEVEL = 4
 export G_MESSAGES_DEBUG=all
+export DEBIAN_TARGET_DIR="${CURDIR}/debian/tmp"
 
 %:
-	dh $@ --with autoreconf,gir
-
-override_dh_autoreconf:
-	NOCONFIGURE=1 dh_autoreconf ./autogen.sh
-
-DEB_HOST_ARCH_CPU := $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
+	dh $@ --parallel
 
 override_dh_auto_configure:
-	dh_auto_configure -- VALAC=/usr/bin/valac-0.18 --enable-gtk-doc --disable-hybris
+	dh_auto_configure -- -DDEBIAN_TARGET_DIR="${DEBIAN_TARGET_DIR}"
 
 override_dh_install:
-	rm debian/tmp/usr/lib/*/*.la
-	rm debian/tmp/usr/lib/*/*.a
-	rm -rf debian/tmp/usr/share/gtk-doc/html/hud/
 	dh_install --fail-missing

=== added file 'docs/CMakeLists.txt'
--- docs/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ docs/CMakeLists.txt	2013-03-29 12:53:22 +0000
@@ -0,0 +1,2 @@
+add_subdirectory(man)
+add_subdirectory(libhud-client)

=== removed file 'docs/Makefile.am'
--- docs/Makefile.am	2013-02-15 03:15:27 +0000
+++ docs/Makefile.am	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-SUBDIRS = \
-	libhud-client \
-	man

=== removed file 'docs/devel/Makefile.am'
--- docs/devel/Makefile.am	2013-02-13 19:03:17 +0000
+++ docs/devel/Makefile.am	1970-01-01 00:00:00 +0000
@@ -1,42 +0,0 @@
-include $(top_srcdir)/gtk-doc.make
-
-DOC_MODULE = hud
-
-DOC_MAIN_SGML_FILE = $(DOC_MODULE)-docs.xml
-
-DOC_SOURCE_DIR = $(top_srcdir)/src
-
-MKDB_OPTIONS = --sgml-mode --output-format=xml
-
-HFILE_GLOB = $(DOC_SOURCE_DIR)/*.h
-CFILE_GLOB = $(DOC_SOURCE_DIR)/*.c
-
-IGNORE_HFILES = \
-	MwmUtil.h				\
-	create-db.h				\
-	dbus-shared.h				\
-	distance.h				\
-	dump-app-info.h				\
-	gen-application-menu-renderer.xml.h	\
-	gen-application-menu-registrar.xml.h	\
-	gdk-get-func.h				\
-	hud.interface.h				\
-	indicator-tracker.h			\
-	load-app-info.h				\
-	menuitem-collector.h			\
-	shared-values.h				\
-	usage-tracker.h				\
-	utils.h					\
-	window-menus.h
-
-GTKDOC_CFLAGS = \
-	-I$(top_srcdir)/src \
-	$(HUD_CFLAGS) \
-	$(BAMF_CFLAGS) \
-	$(HYBRIS_CFLAGS)
-
-GTKDOC_LIBS = \
-	$(top_builddir)/src/libhud-service.la \
-	$(HUD_LIBS) \
-	$(BAMF_LIBS) \
-	$(HYBRIS_LIBS)

=== added file 'docs/libhud-client/CMakeLists.txt'
--- docs/libhud-client/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ docs/libhud-client/CMakeLists.txt	2013-03-29 12:53:22 +0000
@@ -0,0 +1,32 @@
+
+find_package(GtkDoc)
+
+if(GTKDOC_FOUND)
+  get_target_property(_hud_client_output_name hud-client OUTPUT_NAME)
+  include(UseGtkDoc)
+  gtk_doc_add_module(libhud-client "${CMAKE_SOURCE_DIR}/libhud-client"
+    XML
+      libhud-client-docs.xml
+    SUFFIXES
+      h c
+    IGNOREHEADERS
+      hud-client.h
+      query-iface.h
+      service-iface.h
+    LDFLAGS
+      -L${CMAKE_CURRENT_BINARY_DIR}/../../libhud-client
+      -l${_hud_client_output_name}
+    LDPATH 
+      ${CMAKE_CURRENT_BINARY_DIR}/../../libhud-client
+    DEPENDS
+      hud-client
+  )
+
+  install(
+    DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/libhud-client/html/"
+    DESTINATION "${CMAKE_INSTALL_DATADIR}/gtk-doc/html/libhud-client" 
+  )
+  
+else()
+  message(STATUS "gtkdoc was not found.")
+endif()

=== removed file 'docs/libhud-client/Makefile.am'
--- docs/libhud-client/Makefile.am	2012-11-28 17:03:45 +0000
+++ docs/libhud-client/Makefile.am	1970-01-01 00:00:00 +0000
@@ -1,34 +0,0 @@
-include $(top_srcdir)/gtk-doc.make
-
-DOC_MODULE = libhud-client
-
-DOC_MAIN_SGML_FILE = $(DOC_MODULE)-docs.xml
-
-DOC_SOURCE_DIR = $(top_srcdir)/libhud-client
-
-MKDB_OPTIONS = --sgml-mode --output-format=xml
-
-HFILE_GLOB = $(DOC_SOURCE_DIR)/*.h
-CFILE_GLOB = $(DOC_SOURCE_DIR)/*.c
-
-IGNORE_HFILES = \
-	query-iface.h \
-	service-iface.h
-
-IGNORE_CFILES = \
-	query-iface.c \
-	service-iface.c
-
-GTKDOC_CFLAGS = -I$(top_srcdir)/libhud-client -I$(top_srcdir) $(HUD_CFLAGS)
-
-GTKDOC_LIBS = \
-	$(top_builddir)/libhud-client/libhud-client.la \
-	$(HUD_LIBS)
-
-if ENABLE_GTK_DOC
-TESTS_ENVIRONMENT = cd $(srcdir) && \
-  DOC_MODULE=$(DOC_MODULE) DOC_MAIN_SGML_FILE=$(DOC_MAIN_SGML_FILE) \
-  SRCDIR=$(abs_srcdir) BUILDDIR=$(abs_builddir)
-TESTS = $(GTKDOC_CHECK)
-endif
-

=== added file 'docs/man/CMakeLists.txt'
--- docs/man/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ docs/man/CMakeLists.txt	2013-03-29 12:53:22 +0000
@@ -0,0 +1,28 @@
+
+find_program(XSLTPROC_EXECUTABLE xsltproc)
+
+macro(add_manpage name)
+  add_custom_command(
+    OUTPUT
+      "${CMAKE_CURRENT_BINARY_DIR}/${name}.1"
+    COMMAND
+      ${XSLTPROC_EXECUTABLE}
+      -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl
+      "${CMAKE_CURRENT_SOURCE_DIR}/${name}.xml"
+    DEPENDS
+      "${CMAKE_CURRENT_SOURCE_DIR}/${name}.xml"
+  )
+  add_custom_target(${name}-man DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/${name}.1")
+  add_dependencies(man-pages ${name}-man)
+  install(
+    FILES "${CMAKE_CURRENT_BINARY_DIR}/${name}.1"
+    DESTINATION "${CMAKE_INSTALL_MANDIR}/man1"
+  )
+endmacro()
+
+add_custom_target(man-pages ALL)
+
+add_manpage(hud-cli)
+add_manpage(hud-dump-application)
+add_manpage(hud-list-applications)
+add_manpage(hud-verify-app-info)

=== removed file 'docs/man/Makefile.am'
--- docs/man/Makefile.am	2012-02-16 16:00:44 +0000
+++ docs/man/Makefile.am	1970-01-01 00:00:00 +0000
@@ -1,16 +0,0 @@
-
-man_MANS = \
-	hud-cli.1 \
-	hud-dump-application.1 \
-	hud-list-applications.1 \
-	hud-verify-app-info.1
-
-.xml.1:
-	@env -u XML_CATALOG_FILES $(XSLT_PROC) -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
-
-EXTRA_DIST = \
-	$(man_MANS) \
-	$(man_MANS:.1=.xml) 
-
-CLEANFILES = \
-	$(man_MANS)

=== added file 'libhud-client/CMakeLists.txt'
--- libhud-client/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ libhud-client/CMakeLists.txt	2013-03-29 12:53:22 +0000
@@ -0,0 +1,197 @@
+
+set(HUD_CLIENT_INCLUDE_DIRS
+${CMAKE_CURRENT_SOURCE_DIR}
+${CMAKE_CURRENT_BINARY_DIR}
+)
+
+set(HUD_CLIENT_INCLUDE_DIRS
+${HUD_CLIENT_INCLUDE_DIRS}
+PARENT_SCOPE
+)
+
+include_directories(${HUD_CLIENT_INCLUDE_DIRS})
+
+# FIXME would rather not include this dir
+include_directories(${HUD_SRC_DIR})
+
+add_definitions( -DHUD_CLIENT_COMPILATION=1 )
+
+###########################
+# Version Information
+###########################
+
+set(API_VERSION 1)
+set(ABI_VERSION 1)
+
+###########################
+# Generated Hud Client
+###########################
+
+set(HUD_CLIENT_GENERATED_HEADERS
+service-iface.h
+query-iface.h
+)
+
+set(HUD_CLIENT_GENERATED_SOURCES
+)
+
+add_gdbus_codegen(
+OUTFILES HUD_CLIENT_GENERATED_SOURCES
+NAME service-iface
+PREFIX com.canonical.hud.
+NAMESPACE _HudService
+SERVICE_XML ${HUD_SERVICE_XML}
+)
+
+add_gdbus_codegen(
+OUTFILES HUD_CLIENT_GENERATED_SOURCES
+NAME query-iface
+PREFIX com.canonical.hud.query.
+NAMESPACE _HudQuery
+SERVICE_XML ${HUD_QUERY_XML}
+)
+
+add_library(hud-client-generated STATIC ${HUD_CLIENT_GENERATED_SOURCES})
+
+target_link_libraries(hud-client-generated
+${GLIB2_LIBRARIES}
+${GOBJECT2_LIBRARIES}
+${GIO2_LIBRARIES}
+${DEE_LIBRARIES}
+)
+
+###########################
+# Hud Client
+###########################
+
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fvisibility=hidden")
+
+set(HUD_CLIENT_MAIN_HEADERS
+hud-client.h
+)
+
+set(HUD_CLIENT_HEADERS
+connection.h
+param.h
+query.h
+${CMAKE_SOURCE_DIR}/src/query-columns.h
+)
+
+set(HUD_CLIENT_SOURCES
+connection.c
+param.c
+query.c
+)
+
+add_glib_enumtypes_t(HUD_CLIENT_SOURCES
+enum-types
+enum-types.h.in
+enum-types.c.in
+${HUD_CLIENT_HEADERS}
+)
+list(APPEND HUD_CLIENT_HEADERS ${CMAKE_CURRENT_BINARY_DIR}/enum-types.h)
+
+add_library(hud-client SHARED ${HUD_CLIENT_SOURCES})
+
+set_target_properties(hud-client PROPERTIES
+  VERSION ${API_VERSION}.0.0
+  SOVERSION ${ABI_VERSION}
+  OUTPUT_NAME "hud-client"
+)
+
+target_link_libraries(hud-client
+hud-client-generated
+${GLIB2_LIBRARIES}
+${GOBJECT2_LIBRARIES}
+-Wl,--no-undefined
+)
+
+###########################
+# Pkg Config
+###########################
+
+set(HUD_CLIENT_PC "hud-client-${API_VERSION}.pc")
+set(apiversion "${API_VERSION}")
+set(libdir "${CMAKE_INSTALL_FULL_LIBDIR}")
+set(includedir "${CMAKE_INSTALL_FULL_INCLUDEDIR}")
+set(VERSION "${ABI_VERSION}")
+configure_file("hud-client.pc.in" "${CMAKE_CURRENT_BINARY_DIR}/${HUD_CLIENT_PC}" @ONLY)
+
+###########################
+# GObject Introspection
+###########################
+
+if(${INTROSPECTION_FOUND})
+  include(UseGObjectIntrospection)
+  set(INTROSPECTION_GIRS)
+
+  set(_introspection_files ${HUD_CLIENT_SOURCES} ${HUD_CLIENT_HEADERS})
+  set(HudClient_1_gir "hud-client")
+  set(HudClient_1_gir_INCLUDES GObject-2.0 Dee-1.0)
+  
+  gir_get_cflags(_cflags)
+  set(HudClient_1_gir_CFLAGS ${_cflags})
+  
+  set(HudClient_1_gir_LIBS hud-client)
+  
+  list_make_absolute(_abs_introspection_files _introspection_files "${CMAKE_CURRENT_SOURCE_DIR}/")
+  set(HudClient_1_gir_FILES ${_abs_introspection_files})
+  set(HudClient_1_gir_SCANNERFLAGS --c-include "hud-client.h")
+  set(HudClient_1_gir_EXPORT_PACKAGES "hud-client-${API_VERSION}")
+
+  list(APPEND INTROSPECTION_GIRS HudClient-1.gir)
+  gir_add_introspections(INTROSPECTION_GIRS)
+else()
+  message("Not performing GIR as required tools not found")
+endif()
+
+###########################
+# libhud-client Vala
+###########################
+
+if(${VALA_FOUND})
+if(${INTROSPECTION_FOUND})
+
+vapi_gen(hud-client-vapi
+  INPUT
+  	HudClient-1.gir
+  PACKAGES
+    gio-2.0
+  LIBRARY
+    HudClient-1
+)
+
+install(
+  FILES
+    ${hud-client-vapi_OUTPUT}
+  DESTINATION
+    "${CMAKE_INSTALL_DATADIR}/vala/vapi"
+)
+
+endif()
+endif()
+
+
+###########################
+# Installation
+###########################
+
+install(
+  FILES ${HUD_CLIENT_MAIN_HEADERS}
+  DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/libhud-client-${API_VERSION}"
+)
+
+install(
+  FILES ${HUD_CLIENT_HEADERS}
+  DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/libhud-client-${API_VERSION}/libhud-client"
+)
+
+install(
+  FILES "${CMAKE_CURRENT_BINARY_DIR}/${HUD_CLIENT_PC}"
+  DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig"
+)
+
+install(
+  TARGETS hud-client
+  LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+)

=== removed file 'libhud-client/Makefile.am'
--- libhud-client/Makefile.am	2013-03-18 15:30:05 +0000
+++ libhud-client/Makefile.am	1970-01-01 00:00:00 +0000
@@ -1,175 +0,0 @@
-
-DISTCLEANFILES =
-
-lib_LTLIBRARIES = libhud-client.la
-
-ABI_VERSION = 1
-API_VERSION = 1
-
-libhud_client_include_basedir = $(includedir)/libhud-client-$(API_VERSION)/
-libhud_client_include_base_HEADERS = \
-	hud-client.h
-
-libhud_client_includedir = $(includedir)/libhud-client-$(API_VERSION)/libhud-client
-libhud_client_include_HEADERS = \
-	connection.h \
-	enum-types.h \
-	param.h \
-	query.h
-
-noinst_LTLIBRARIES = libhud-client-generated.la
-
-libhud_client_generated_la_SOURCES = \
-	enum-types.h \
-	enum-types.c \
-	service-iface.h \
-	service-iface.c \
-	query-iface.h \
-	query-iface.c
-
-libhud_client_generated_la_CFLAGS = \
-	$(HUD_CFLAGS) \
-	-I $(top_srcdir) \
-	-D HUD_CLIENT_COMPILATION \
-	-Wall -Werror
-
-libhud_client_generated_la_LIBADD = \
-	$(HUD_LIBS)
-
-libhud_client_la_SOURCES = \
-	connection.h \
-	connection.c \
-	param.h \
-	param.c \
-	$(top_srcdir)/src/query-columns.h \
-	query.h \
-	query.c \
-	hud-client.h
-
-libhud_client_la_CFLAGS = \
-	$(HUD_CFLAGS) \
-	$(COVERAGE_CFLAGS) \
-	-I $(top_srcdir) \
-	-I $(top_srcdir)/src \
-	-D G_LOG_DOMAIN=\"libhud-client\" \
-	-D HUD_CLIENT_COMPILATION \
-	-Wall -Werror
-
-libhud_client_la_LIBADD = \
-	libhud-client-generated.la \
-	$(HUD_LIBS)
-
-libhud_client_la_LDFLAGS = \
-	$(HUD_LDFLAGS) \
-	$(COVERAGE_LDFLAGS) \
-	-version-info $(ABI_VERSION):0:0 \
-	-no-undefined \
-	-export-symbols-regex "^[^_].*"
-
-service-iface.c: $(top_srcdir)/data/com.canonical.hud.xml
-	$(AM_V_GEN) gdbus-codegen \
-		--interface-prefix com.canonical.hud. \
-		--generate-c-code service-iface \
-		--c-namespace _HudService \
-		$^
-service-iface.h: service-iface.c
-
-query-iface.c: $(top_srcdir)/data/com.canonical.hud.query.xml
-	$(AM_V_GEN) gdbus-codegen \
-		--interface-prefix com.canonical.hud.query. \
-		--generate-c-code query-iface \
-		--c-namespace _HudQuery \
-		$^
-query-iface.h: query-iface.c
-
-BUILT_SOURCES = \
-	query-iface.h \
-	query-iface.c \
-	service-iface.h \
-	service-iface.c
-
-EXTRA_DIST = \
-	hud-client.pc.in
-
-pkgconfig_DATA = hud-client-$(API_VERSION).pc
-pkgconfigdir = $(libdir)/pkgconfig
-
-%-$(API_VERSION).pc: %.pc.in
-	sed \
-		-e "s:\@apiversion\@:$(API_VERSION):" \
-		-e "s:\@libdir\@:$(libdir):" \
-		-e "s:\@includedir\@:$(includedir):" \
-		-e "s:\@VERSION\@:$(VERSION):" \
-		$< > $@
-
-CLEANFILES = \
-	$(BUILD_SOURCES) \
-	hud-client-$(API_VERSION).pc
-
-##########################
-# Introspection
-##########################
-
-include $(INTROSPECTION_MAKEFILE)
-INTROSPECTION_GIRS =
-INTROSPECTION_SCANNER_ARGS = \
-	--add-include-path=$(top_srcdir) \
-	--add-include-path=$(srcdir) \
-	-I $(top_srcdir) -I $(srcdir)
-INTROSPECTION_COMPILER_ARGS = --includedir=$(top_srcdir) --includedir=$(srcdir)
-
-if HAVE_INTROSPECTION
-
-# NOTE: 1 here is $API_VERSION
-
-HudClient-1.gir: libhud-client.la
-
-HudClient_1_gir_INCLUDES = Dee-1.0
-HudClient_1_gir_CFLAGS = \
-	-D HUD_CLIENT_COMPILATION \
-	$(HUD_CFLAGS)
-HudClient_1_gir_LIBS = $(builddir)/libhud-client.la
-HudClient_1_gir_EXPORT_PACKAGES = hud-client-$(API_VERSION)
-HudClient_1_gir_SCANNERFLAGS = --c-include "hud-client.h"
-HudClient_1_gir_FILES = $(libhud_client_la_SOURCES)
-
-INTROSPECTION_GIRS += HudClient-1.gir
-
-endif
-
-girdir = $(datadir)/gir-1.0
-gir_DATA = $(INTROSPECTION_GIRS)
-
-typelibdir = $(libdir)/girepository-1.0
-typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
-
-CLEANFILES += $(gir_DATA) $(typelib_DATA)
-
-##########################
-# Vapi
-##########################
-
-if HAVE_VALA
-if HAVE_INTROSPECTION
-
-vapidir = $(datadir)/vala/vapi
-vapi_DATA = HudClient-1.vapi
-
-HudClient-1.vapi: HudClient-1.gir
-	$(VALA_API_GEN) --pkg gio-2.0 --library=HudClient-1 $<
-
-CLEANFILES += $(vapi_DATA)
-
-endif
-endif
-
-##########################
-# Enum Types
-##########################
-
-include $(top_srcdir)/Makefile.am.enum
-
-glib_enum_h = enum-types.h
-glib_enum_c = enum-types.c
-glib_enum_headers = $(srcdir)/query.h
-

=== modified file 'libhud-client/connection.h'
--- libhud-client/connection.h	2012-11-28 16:56:12 +0000
+++ libhud-client/connection.h	2013-03-29 12:53:22 +0000
@@ -23,6 +23,8 @@
 #ifndef __HUD_CLIENT_CONNECTION_H__
 #define __HUD_CLIENT_CONNECTION_H__
 
+#pragma GCC visibility push(default)
+
 #include <glib-object.h>
 
 G_BEGIN_DECLS
@@ -88,4 +90,6 @@
 
 G_END_DECLS
 
+#pragma GCC visibility pop
+
 #endif

=== modified file 'libhud-client/enum-types.h.in'
--- libhud-client/enum-types.h.in	2013-02-12 03:46:44 +0000
+++ libhud-client/enum-types.h.in	2013-03-29 12:53:22 +0000
@@ -24,6 +24,8 @@
 #ifndef __HUD_CLIENT_ENUM_TYPES_H__
 #define __HUD_CLIENT_ENUM_TYPES_H__
 
+#pragma GCC visibility push(default)
+
 #include <glib-object.h>
 
 G_BEGIN_DECLS
@@ -34,6 +36,8 @@
 
 G_END_DECLS
 
+#pragma GCC visibility pop
+
 #endif /* __HUD_CLIENT_ENUM_TYPES_H__ */
 /*** END file-tail ***/
 

=== modified file 'libhud-client/param.h'
--- libhud-client/param.h	2013-02-08 14:53:12 +0000
+++ libhud-client/param.h	2013-03-29 12:53:22 +0000
@@ -23,6 +23,8 @@
 #ifndef __HUD_CLIENT_PARAM_H__
 #define __HUD_CLIENT_PARAM_H__
 
+#pragma GCC visibility push(default)
+
 #include <glib.h>
 #include <glib-object.h>
 #include <gio/gio.h>
@@ -36,6 +38,11 @@
 #define HUD_CLIENT_IS_PARAM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), HUD_CLIENT_TYPE_PARAM))
 #define HUD_CLIENT_PARAM_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), HUD_CLIENT_TYPE_PARAM, HudClientParamClass))
 
+/**
+ * HUD_CLIENT_PARAM_SIGNAL_MODEL_READY
+ *
+ * Signal to indicate when the model is ready
+ */
 #define HUD_CLIENT_PARAM_SIGNAL_MODEL_READY  "model-ready"
 
 typedef struct _HudClientParam          HudClientParam;
@@ -96,4 +103,6 @@
 
 G_END_DECLS
 
+#pragma GCC visibility pop
+
 #endif

=== modified file 'libhud-client/query.h'
--- libhud-client/query.h	2013-03-18 22:20:43 +0000
+++ libhud-client/query.h	2013-03-29 12:53:22 +0000
@@ -23,6 +23,8 @@
 #ifndef __HUD_CLIENT_QUERY_H__
 #define __HUD_CLIENT_QUERY_H__
 
+#pragma GCC visibility push(default)
+
 #include <glib-object.h>
 #include <dee.h>
 #include <libhud-client/connection.h>
@@ -37,6 +39,11 @@
 #define HUD_CLIENT_IS_QUERY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), HUD_CLIENT_TYPE_QUERY))
 #define HUD_CLIENT_QUERY_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), HUD_CLIENT_TYPE_QUERY, HudClientQueryClass))
 
+/**
+ * HUD_CLIENT_QUERY_SIGNAL_TOOLBAR_UPDATED
+ *
+ * Signal to indicate when the toolbar has been updated
+ */
 #define HUD_CLIENT_QUERY_SIGNAL_TOOLBAR_UPDATED   "toolbar-updated"
 
 typedef struct _HudClientQuery         HudClientQuery;
@@ -66,7 +73,7 @@
 };
 
 /**
- * HudClientQueryToolbar:
+ * HudClientQueryToolbarItems:
  * @HUD_CLIENT_QUERY_TOOLBAR_FULLSCREEN: Make the application fullscreen
  * @HUD_CLIENT_QUERY_TOOLBAR_HELP: Help the user use the application
  * @HUD_CLIENT_QUERY_TOOLBAR_PREFERENCES: Configure the application
@@ -158,4 +165,6 @@
 
 G_END_DECLS
 
+#pragma GCC visibility pop
+
 #endif

=== added file 'libhud-gtk/CMakeLists.txt'
--- libhud-gtk/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ libhud-gtk/CMakeLists.txt	2013-03-29 12:53:22 +0000
@@ -0,0 +1,94 @@
+
+set(HUD_GTK_INCLUDE_DIRS
+${CMAKE_CURRENT_SOURCE_DIR}
+${CMAKE_CURRENT_BINARY_DIR}
+)
+
+set(HUD_GTK_INCLUDE_DIRS
+${HUD_GTK_INCLUDE_DIRS}
+PARENT_SCOPE
+)
+
+include_directories(${HUD_INCLUDE_DIRS})
+include_directories(${HUD_GTK_INCLUDE_DIRS})
+include_directories(${GTK3_INCLUDE_DIRS})
+
+#add_definitions( -DHUD_COMPILATION=1 )
+
+###########################
+# Version Information
+###########################
+
+set(API_VERSION 1)
+set(ABI_VERSION 1)
+
+###########################
+# Lib Hud Gtk
+###########################
+
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fvisibility=hidden")
+
+set(HUD_GTK_MAIN_HEADERS
+hud-gtk.h
+)
+
+set(HUD_GTK_HEADERS
+manager.h
+${HUD_HEADERS}
+)
+
+set(HUD_GTK_SOURCES
+manager.c
+)
+
+add_library(hud-gtk SHARED ${HUD_GTK_SOURCES})
+
+set_target_properties(hud-gtk PROPERTIES
+  VERSION ${API_VERSION}.0.0
+  SOVERSION ${ABI_VERSION}
+  OUTPUT_NAME "hud-gtk"
+)
+
+target_link_libraries(hud-gtk
+hud
+${GLIB2_LIBRARIES}
+${GOBJECT2_LIBRARIES}
+${GTK3_LIBRARIES}
+-Wl,--no-undefined
+)
+
+###########################
+# Pkg Config
+###########################
+
+set(HUD_GTK_PC "hud-gtk-${API_VERSION}.pc")
+set(apiversion "${API_VERSION}")
+set(libdir "${CMAKE_INSTALL_FULL_LIBDIR}")
+set(includedir "${CMAKE_INSTALL_FULL_INCLUDEDIR}")
+set(VERSION "${ABI_VERSION}")
+
+configure_file("hud-gtk.pc.in" "${CMAKE_CURRENT_BINARY_DIR}/${HUD_GTK_PC}" @ONLY)
+
+###########################
+# Installation
+###########################
+
+install(
+  FILES ${HUD_GTK_MAIN_HEADERS}
+  DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/libhud-gtk-${API_VERSION}"
+)
+
+install(
+  FILES ${HUD_GTK_HEADERS}
+  DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/libhud-gtk-${API_VERSION}/libhud-gtk"
+)
+
+install(
+  FILES "${CMAKE_CURRENT_BINARY_DIR}/${HUD_GTK_PC}"
+  DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig"
+)
+
+install(
+  TARGETS hud-gtk
+  LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+)
\ No newline at end of file

=== removed file 'libhud-gtk/Makefile.am'
--- libhud-gtk/Makefile.am	2013-01-15 15:58:42 +0000
+++ libhud-gtk/Makefile.am	1970-01-01 00:00:00 +0000
@@ -1,59 +0,0 @@
-
-SUBDIRS = .
-
-lib_LTLIBRARIES = libhud-gtk.la
-
-ABI_VERSION = 1
-API_VERSION = 1
-
-libhud_gtk_include_basedir = $(includedir)/libhud-gtk-$(API_VERSION)/
-libhud_gtk_include_base_HEADERS = \
-	hud-gtk.h
-
-libhud_gtkincludedir = $(includedir)/libhud-gtk-$(API_VERSION)/libhud-gtk
-libhud_gtkinclude_HEADERS = \
-	manager.h
-
-libhud_gtk_la_SOURCES = \
-	manager.c
-
-libhud_gtk_la_CFLAGS = \
-	$(HUD_CFLAGS) \
-	$(COVERAGE_CFLAGS) \
-	$(gtk_CFLAGS) \
-	-I . \
-	-I $(top_srcdir) \
-	-I $(top_srcdir)/libhud \
-	-D G_LOG_DOMAIN=\"libhud-gtk\" \
-	-D HUD_GTK_COMPILATION \
-	-Wall -Werror
-
-libhud_gtk_la_LIBADD = \
-	$(HUD_LIBS)
-
-libhud_gtk_la_LDFLAGS = \
-	$(HUD_LDFLAGS) \
-	$(COVERAGE_LDFLAGS) \
-	$(gtk_LDFLAGS) \
-	-version-info $(ABI_VERSION):0:0 \
-	-no-undefined \
-	-export-symbols-regex "^[^_].*"
-
-EXTRA_DIST = \
-	hud-gtk.pc.in
-
-pkgconfig_DATA = hud-gtk-$(API_VERSION).pc
-pkgconfigdir = $(libdir)/pkgconfig
-
-%-$(API_VERSION).pc: %.pc.in
-	sed \
-		-e "s:\@apiversion\@:$(API_VERSION):" \
-		-e "s:\@libdir\@:$(libdir):" \
-		-e "s:\@includedir\@:$(includedir):" \
-		-e "s:\@VERSION\@:$(VERSION):" \
-		$< > $@
-
-CLEANFILES = \
-	$(BUILD_SOURCES) \
-	hud-gtk-$(API_VERSION).pc
-

=== added file 'libhud/CMakeLists.txt'
--- libhud/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ libhud/CMakeLists.txt	2013-03-29 12:53:22 +0000
@@ -0,0 +1,197 @@
+
+set(HUD_INCLUDE_DIRS
+${CMAKE_CURRENT_SOURCE_DIR}
+${CMAKE_CURRENT_BINARY_DIR}
+)
+
+set(HUD_INCLUDE_DIRS
+${HUD_INCLUDE_DIRS}
+PARENT_SCOPE
+)
+
+include_directories(${HUD_INCLUDE_DIRS})
+
+# FIXME Would rather not include this
+include_directories(${HUD_SRC_DIR})
+
+add_definitions( -DHUD_COMPILATION=1 )
+
+###########################
+# Version Information
+###########################
+
+set(API_VERSION 1)
+set(ABI_VERSION 1)
+
+###########################
+# Generated Lib Hud
+###########################
+
+set(HUD_GENERATED_HEADERS
+app-iface.h
+service-iface.h
+marshal.h
+)
+
+set(HUD_GENERATED_SOURCES
+)
+
+add_gdbus_codegen(
+OUTFILES HUD_GENERATED_SOURCES
+NAME service-iface
+PREFIX com.canonical.hud.
+NAMESPACE _HudServiceIface
+SERVICE_XML ${HUD_SERVICE_XML}
+)
+
+add_gdbus_codegen(
+OUTFILES HUD_GENERATED_SOURCES
+NAME app-iface
+PREFIX com.canonical.hud.Application.
+NAMESPACE _HudAppIface
+SERVICE_XML ${HUD_APP_XML}
+)
+
+add_glib_marshal(HUD_GENERATED_SOURCES
+marshal
+_hud_marshal
+marshal.h
+)
+
+add_library(hud-generated STATIC ${HUD_GENERATED_SOURCES})
+
+target_link_libraries(hud-generated
+${GLIB2_LIBRARIES}
+${GOBJECT2_LIBRARIES}
+${GIO2_LIBRARIES}
+)
+
+###########################
+# Lib Hud
+###########################
+
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fvisibility=hidden")
+
+set(HUD_MAIN_HEADERS
+hud.h
+)
+
+set(HUD_HEADERS
+manager.h
+operation.h
+action.h
+action-publisher.h
+${HUD_HEADERS}
+)
+
+set(HUD_SOURCES
+manager.c
+operation.c
+action.c
+action-publisher.c
+)
+
+add_library(hud SHARED ${HUD_SOURCES})
+
+set_target_properties(hud PROPERTIES
+  VERSION ${API_VERSION}.0.0
+  SOVERSION ${ABI_VERSION}
+  OUTPUT_NAME "hud"
+)
+
+target_link_libraries(hud
+hud-generated
+${GLIB2_LIBRARIES}
+${GOBJECT2_LIBRARIES}
+-Wl,--no-undefined
+)
+
+###########################
+# Pkg Config
+###########################
+
+set(HUD_PC "hud-${API_VERSION}.pc")
+set(apiversion "${API_VERSION}")
+set(libdir "${CMAKE_INSTALL_FULL_LIBDIR}")
+set(includedir "${CMAKE_INSTALL_FULL_INCLUDEDIR}")
+set(VERSION "${ABI_VERSION}")
+
+configure_file("hud.pc.in" "${CMAKE_CURRENT_BINARY_DIR}/${HUD_PC}" @ONLY)
+
+###########################
+# GObject Introspection
+###########################
+
+if(${INTROSPECTION_FOUND})
+  include(UseGObjectIntrospection)
+  set(INTROSPECTION_GIRS)
+
+  set(_introspection_files ${HUD_SOURCES} ${HUD_HEADERS})
+  set(Hud_1_gir "hud")
+  set(Hud_1_gir_INCLUDES GObject-2.0)
+  
+  gir_get_cflags(_cflags)
+  set(Hud_1_gir_CFLAGS ${_cflags})
+  
+  set(Hud_1_gir_LIBS hud)
+  
+  list_make_absolute(_abs_introspection_files _introspection_files "${CMAKE_CURRENT_SOURCE_DIR}/")
+  set(Hud_1_gir_FILES ${_abs_introspection_files})
+  set(Hud_1_gir_SCANNERFLAGS --c-include "hud.h")
+  set(Hud_1_gir_EXPORT_PACKAGES "hud-${API_VERSION}")
+
+  list(APPEND INTROSPECTION_GIRS Hud-1.gir)
+  gir_add_introspections(INTROSPECTION_GIRS)
+else()
+  message("Not performing GIR as required tools not found")
+endif()
+
+###########################
+# libhud Vala
+###########################
+
+if(${VALA_FOUND})
+if(${INTROSPECTION_FOUND})
+
+vapi_gen(hud-vapi
+  INPUT
+  	Hud-1.gir
+  PACKAGES
+    gio-2.0
+  LIBRARY
+    Hud-1
+)
+
+install(
+  FILES
+    ${hud-vapi_OUTPUT}
+  DESTINATION
+    "${CMAKE_INSTALL_DATADIR}/vala/vapi"
+)
+
+endif()
+endif()
+
+###########################
+# Installation
+###########################
+
+install(
+  FILES ${HUD_MAIN_HEADERS}
+  DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/libhud-${API_VERSION}"
+)
+
+install(
+  FILES ${HUD_HEADERS}
+  DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/libhud-${API_VERSION}/libhud"
+)
+
+install(
+  FILES "${CMAKE_CURRENT_BINARY_DIR}/${HUD_PC}"
+  DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig"
+)
+
+install(
+  TARGETS hud
+  LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+)
\ No newline at end of file

=== removed file 'libhud/Makefile.am'
--- libhud/Makefile.am	2013-03-13 14:51:56 +0000
+++ libhud/Makefile.am	1970-01-01 00:00:00 +0000
@@ -1,188 +0,0 @@
-
-CLEANFILES =
-DISTCLEANFILES =
-BUILT_SOURCES =
-EXTRA_DIST =
-
-SUBDIRS = . tests demo
-
-lib_LTLIBRARIES = libhud.la
-
-ABI_VERSION = 1
-API_VERSION = 1
-
-libhud_include_basedir = $(includedir)/libhud-$(API_VERSION)/
-libhud_include_base_HEADERS = \
-	hud.h
-
-libhudincludedir = $(includedir)/libhud-$(API_VERSION)/libhud
-libhudinclude_HEADERS = \
-	manager.h		\
-	operation.h		\
-	action.h		\
-	action-publisher.h
-
-libhud_la_SOURCES = \
-	manager.h		\
-	manager.c		\
-	operation-private.h	\
-	operation.h		\
-	operation.c		\
-	action.c		\
-	action-publisher.h \
-	action-publisher.c
-
-libhud_la_CFLAGS = \
-	$(HUD_CFLAGS) \
-	$(COVERAGE_CFLAGS) \
-	-I . \
-	-I $(top_srcdir) \
-	-D G_LOG_DOMAIN=\"libhud\" \
-	-D HUD_COMPILATION \
-	-Wall -Werror
-
-libhud_la_LIBADD = \
-	$(HUD_LIBS) \
-	libhud-generated.la
-
-libhud_la_LDFLAGS = \
-	$(HUD_LDFLAGS) \
-	$(COVERAGE_LDFLAGS) \
-	-version-info $(ABI_VERSION):0:0 \
-	-no-undefined \
-	-export-symbols-regex "^[^_].*"
-
-#################################
-# Generated Code
-#################################
-
-noinst_LTLIBRARIES = libhud-generated.la
-
-libhud_generated_la_SOURCES = \
-	app-iface.h	\
-	app-iface.c	\
-	service-iface.h	\
-	service-iface.c	\
-	marshal.h \
-	marshal.c
-
-libhud_generated_la_CFLAGS = \
-	$(HUD_CFLAGS)
-
-libhud_generated_la_LIBADD = \
-	$(HUD_LIBS)
-
-libhud_generated_la_LDFLAGS = \
-	$(HUD_LDFLAGS)
-
-# Marshalling
-
-include $(top_srcdir)/Makefile.am.marshal
-
-glib_marshal_list = marshal.list
-glib_marshal_prefix = _hud_marshal
-
-# DBus Ifaces
-
-service-iface.c: $(top_srcdir)/data/com.canonical.hud.xml
-	$(AM_V_GEN) gdbus-codegen \
-		--interface-prefix com.canonical.hud. \
-		--generate-c-code service-iface \
-		--c-namespace _HudServiceIface \
-		$^
-service-iface.h: service-iface.c
-
-app-iface.c: $(top_srcdir)/data/com.canonical.hud.Application.xml
-	$(AM_V_GEN) gdbus-codegen \
-		--interface-prefix com.canonical.hud.Application. \
-		--generate-c-code app-iface \
-		--c-namespace _HudAppIface \
-		$^
-app-iface.h: app-iface.c
-
-BUILT_SOURCES += \
-	app-iface.h \
-	app-iface.c \
-	service-iface.h \
-	service-iface.c
-
-##########################
-# Introspection
-##########################
-
-include $(INTROSPECTION_MAKEFILE)
-INTROSPECTION_GIRS =
-INTROSPECTION_SCANNER_ARGS = \
-	--add-include-path=$(top_srcdir) \
-	--add-include-path=$(srcdir) \
-	-I $(top_srcdir) -I $(srcdir)
-INTROSPECTION_COMPILER_ARGS = --includedir=$(top_srcdir) --includedir=$(srcdir)
-
-if HAVE_INTROSPECTION
-
-# NOTE: 1 here is $API_VERSION
-
-Hud-1.gir: libhud.la
-
-Hud_1_gir_INCLUDES = Dee-1.0
-Hud_1_gir_CFLAGS = \
-	-D HUD_COMPILATION \
-	$(HUD_CFLAGS)
-Hud_1_gir_LIBS = $(builddir)/libhud.la
-Hud_1_gir_EXPORT_PACKAGES = hud-$(API_VERSION)
-Hud_1_gir_SCANNERFLAGS = --c-include "hud.h"
-Hud_1_gir_FILES = $(libhud_la_SOURCES)
-
-INTROSPECTION_GIRS += Hud-1.gir
-
-endif
-
-girdir = $(datadir)/gir-1.0
-gir_DATA = $(INTROSPECTION_GIRS)
-
-typelibdir = $(libdir)/girepository-1.0
-typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
-
-CLEANFILES += $(gir_DATA) $(typelib_DATA)
-
-##########################
-# Vapi
-##########################
-
-if HAVE_VALA
-if HAVE_INTROSPECTION
-
-vapidir = $(datadir)/vala/vapi
-vapi_DATA = Hud-1.vapi
-
-Hud-1.vapi: Hud-1.gir
-	$(VALA_API_GEN) --pkg gio-2.0 --library=Hud-1 $<
-
-CLEANFILES += $(vapi_DATA)
-
-endif
-endif
-
-
-#################################
-# Package Config
-#################################
-
-EXTRA_DIST += \
-	hud.pc.in
-
-pkgconfig_DATA = hud-$(API_VERSION).pc
-pkgconfigdir = $(libdir)/pkgconfig
-
-%-$(API_VERSION).pc: %.pc.in
-	sed \
-		-e "s:\@apiversion\@:$(API_VERSION):" \
-		-e "s:\@libdir\@:$(libdir):" \
-		-e "s:\@includedir\@:$(includedir):" \
-		-e "s:\@VERSION\@:$(VERSION):" \
-		$< > $@
-
-CLEANFILES += \
-	$(BUILD_SOURCES) \
-	hud-$(API_VERSION).pc
-

=== modified file 'libhud/action-publisher.h'
--- libhud/action-publisher.h	2013-03-13 12:10:37 +0000
+++ libhud/action-publisher.h	2013-03-29 12:53:22 +0000
@@ -29,6 +29,8 @@
 #ifndef __HUD_ACTION_PUBLISHER_H__
 #define __HUD_ACTION_PUBLISHER_H__
 
+#pragma GCC visibility push(default)
+
 #include <gio/gio.h>
 
 G_BEGIN_DECLS
@@ -42,6 +44,8 @@
 #define HUD_ACTION_PUBLISHER_SIGNAL_ACTION_GROUP_ADDED      "action-group-added"
 #define HUD_ACTION_PUBLISHER_SIGNAL_ACTION_GROUP_REMOVED    "action-group-removed"
 
+GType hud_action_description_get_type (void);
+
 #define HUD_TYPE_ACTION_DESCRIPTION                         (hud_action_description_get_type ())
 #define HUD_ACTION_DESCRIPTION(inst)                        (G_TYPE_CHECK_INSTANCE_CAST ((inst),                     \
                                                              HUD_TYPE_ACTION_DESCRIPTION, HudActionDescription))
@@ -61,6 +65,8 @@
 
 HudActionPublisher *    hud_action_publisher_new_for_id                 (GVariant              *id);
 
+HudActionPublisher *    hud_action_publisher_new_for_application        (GApplication          *application);
+
 void                    hud_action_publisher_add_description            (HudActionPublisher    *publisher,
                                                                          HudActionDescription  *description);
 
@@ -93,4 +99,6 @@
 
 G_END_DECLS
 
+#pragma GCC visibility pop
+
 #endif /* __HUD_ACTION_PUBLISHER_H__ */

=== modified file 'libhud/action.c'
--- libhud/action.c	2012-12-11 21:14:14 +0000
+++ libhud/action.c	2013-03-29 12:53:22 +0000
@@ -55,7 +55,7 @@
   N_SIGNALS
 };
 
-guint hud_action_signals[N_SIGNALS];
+static guint hud_action_signals[N_SIGNALS];
 
 static void hud_action_iface_init (GActionInterface *iface);
 

=== modified file 'libhud/action.h'
--- libhud/action.h	2012-12-11 21:39:33 +0000
+++ libhud/action.h	2013-03-29 12:53:22 +0000
@@ -29,6 +29,8 @@
 #ifndef __HUD_ACTION_H__
 #define __HUD_ACTION_H__
 
+#pragma GCC visibility push(default)
+
 #include "operation.h"
 
 G_BEGIN_DECLS
@@ -104,4 +106,6 @@
 
 G_END_DECLS
 
+#pragma GCC visibility pop
+
 #endif /* __HUD_ACTION_H__ */

=== removed file 'libhud/demo/Makefile.am'
--- libhud/demo/Makefile.am	2013-03-15 11:41:51 +0000
+++ libhud/demo/Makefile.am	1970-01-01 00:00:00 +0000
@@ -1,13 +0,0 @@
-check_PROGRAMS = \
-	simple-test
-
-simple_test_CFLAGS = \
-	$(HUD_CFLAGS) \
-	$(gtk_CFLAGS) \
-	-I$(top_srcdir) \
-	-I$(top_srcdir)/libhud
-
-simple_test_LDADD = \
-	$(top_builddir)/libhud/libhud.la \
-	$(HUD_LIBS) \
-	$(gtk_LIBS)

=== modified file 'libhud/manager.h'
--- libhud/manager.h	2012-12-19 21:48:35 +0000
+++ libhud/manager.h	2013-03-29 12:53:22 +0000
@@ -25,6 +25,8 @@
 #ifndef __HUD_MANAGER_H__
 #define __HUD_MANAGER_H__
 
+#pragma GCC visibility push(default)
+
 #include <glib-object.h>
 
 #include "action-publisher.h"
@@ -68,4 +70,6 @@
 
 G_END_DECLS
 
+#pragma GCC visibility pop
+
 #endif /* __HUD_MANAGER_H__ */

=== modified file 'libhud/operation.h'
--- libhud/operation.h	2012-12-11 21:39:33 +0000
+++ libhud/operation.h	2013-03-29 12:53:22 +0000
@@ -29,6 +29,8 @@
 #ifndef __HUD_OPERATION_H__
 #define __HUD_OPERATION_H__
 
+#pragma GCC visibility push(default)
+
 #include <gio/gio.h>
 
 G_BEGIN_DECLS
@@ -85,4 +87,6 @@
 
 G_END_DECLS
 
+#pragma GCC visibility pop
+
 #endif /* __HUD_OPERATION_H__ */

=== removed file 'libhud/tests/Makefile.am'
--- libhud/tests/Makefile.am	2012-10-29 15:23:33 +0000
+++ libhud/tests/Makefile.am	1970-01-01 00:00:00 +0000
@@ -1,36 +0,0 @@
-
-CLEANFILES =
-DISTCLEANFILES =
-EXTRA_DIST =
-check_PROGRAMS =
-
-TESTS = \
-	libhud-tester
-
-#####################################
-# libhud-test
-#####################################
-
-LIBHUD_XML_REPORT = libhud-test.xml
-libhud-tester: libhud-test Makefile.am
-	@echo "#!/bin/bash" > $@
-	@echo gtester --verbose -k -o $(LIBHUD_XML_REPORT) $(abs_builddir)/libhud-test >> $@
-	@chmod +x $@
-
-CLEANFILES += \
-	$(LIBHUD_XML_REPORT) \
-	libhud-tester
-
-libhud_test_SOURCES = \
-	hud-test.c
-libhud_test_CFLAGS = \
-	-I $(top_srcdir) \
-	$(HUD_CFLAGS) \
-	$(TEST_CFLAGS)
-libhud_test_LDADD = \
-	$(builddir)/../libhud.la \
-	$(HUD_LIBS) \
-	$(TEST_LIBS)
-
-check_PROGRAMS += libhud-test
-

=== removed directory 'm4'
=== removed file 'm4/gcov.m4'
--- m4/gcov.m4	2012-03-27 20:50:31 +0000
+++ m4/gcov.m4	1970-01-01 00:00:00 +0000
@@ -1,86 +0,0 @@
-# Checks for existence of coverage tools:
-#  * gcov
-#  * lcov
-#  * genhtml
-#  * gcovr
-# 
-# Sets ac_cv_check_gcov to yes if tooling is present
-# and reports the executables to the variables LCOV, GCOVR and GENHTML.
-AC_DEFUN([AC_TDD_GCOV],
-[
-  AC_ARG_ENABLE(gcov,
-  AS_HELP_STRING([--enable-gcov],
-		 [enable coverage testing with gcov]),
-  [use_gcov=$enableval], [use_gcov=no])
-
-  if test "x$use_gcov" = "xyes"; then
-  # we need gcc:
-  if test "$GCC" != "yes"; then
-    AC_MSG_ERROR([GCC is required for --enable-gcov])
-  fi
-
-  # Check if ccache is being used
-  AC_CHECK_PROG(SHTOOL, shtool, shtool)
-  case `$SHTOOL path $CC` in
-    *ccache*[)] gcc_ccache=yes;;
-    *[)] gcc_ccache=no;;
-  esac
-
-  if test "$gcc_ccache" = "yes" && (test -z "$CCACHE_DISABLE" || test "$CCACHE_DISABLE" != "1"); then
-    AC_MSG_ERROR([ccache must be disabled when --enable-gcov option is used. You can disable ccache by setting environment variable CCACHE_DISABLE=1.])
-  fi
-
-  lcov_version_list="1.6 1.7 1.8 1.9"
-  AC_CHECK_PROG(LCOV, lcov, lcov)
-  AC_CHECK_PROG(GENHTML, genhtml, genhtml)
-
-  if test "$LCOV"; then
-    AC_CACHE_CHECK([for lcov version], glib_cv_lcov_version, [
-      glib_cv_lcov_version=invalid
-      lcov_version=`$LCOV -v 2>/dev/null | $SED -e 's/^.* //'`
-      for lcov_check_version in $lcov_version_list; do
-        if test "$lcov_version" = "$lcov_check_version"; then
-          glib_cv_lcov_version="$lcov_check_version (ok)"
-        fi
-      done
-    ])
-  else
-    lcov_msg="To enable code coverage reporting you must have one of the following lcov versions installed: $lcov_version_list"
-    AC_MSG_ERROR([$lcov_msg])
-  fi
-
-  case $glib_cv_lcov_version in
-    ""|invalid[)]
-      lcov_msg="You must have one of the following versions of lcov: $lcov_version_list (found: $lcov_version)."
-      AC_MSG_ERROR([$lcov_msg])
-      LCOV="exit 0;"
-      ;;
-  esac
-
-  if test -z "$GENHTML"; then
-    AC_MSG_ERROR([Could not find genhtml from the lcov package])
-  fi
-
-  ac_cv_check_gcov=yes
-  ac_cv_check_lcov=yes
-
-  # Remove all optimization flags from CFLAGS
-  changequote({,})
-  CFLAGS=`echo "$CFLAGS" | $SED -e 's/-O[0-9]*//g'`
-  changequote([,])
-
-  # Add the special gcc flags
-  COVERAGE_CFLAGS="-O0 -fprofile-arcs -ftest-coverage"
-  COVERAGE_CXXFLAGS="-O0 -fprofile-arcs -ftest-coverage"	
-  COVERAGE_LDFLAGS="-lgcov"
-
-  # Check availability of gcovr
-  AC_CHECK_PROG(GCOVR, gcovr, gcovr)
-  if test -z "$GCOVR"; then
-    ac_cv_check_gcovr=no
-  else
-    ac_cv_check_gcovr=yes
-  fi
-
-fi
-]) # AC_TDD_GCOV

=== added file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ src/CMakeLists.txt	2013-03-29 12:53:22 +0000
@@ -0,0 +1,202 @@
+
+set(HUD_SERVICE_INCLUDE_DIRS
+${CMAKE_CURRENT_SOURCE_DIR}
+${CMAKE_CURRENT_BINARY_DIR}
+)
+
+set(HUD_SERVICE_INCLUDE_DIRS
+${HUD_SERVICE_INCLUDE_DIRS}
+PARENT_SCOPE
+)
+
+include_directories(${HUD_SERVICE_INCLUDE_DIRS})
+include_directories(${HUD_CLIENT_INCLUDE_DIRS})
+
+###########################
+# Generated Lib Hud Service
+###########################
+
+set(HUD_SERVICE_GENERATED_HEADERS
+app-iface.h
+hud-iface.h
+hud-query-iface.h
+)
+
+set(HUD_SERVICE_GENERATED_SOURCES
+)
+
+add_gdbus_codegen(
+OUTFILES HUD_SERVICE_GENERATED_SOURCES
+NAME hud-iface
+PREFIX com.canonical.hud.
+NAMESPACE HudIface
+SERVICE_XML ${HUD_SERVICE_XML}
+)
+
+add_gdbus_codegen(
+OUTFILES HUD_SERVICE_GENERATED_SOURCES
+NAME hud-query-iface
+PREFIX com.canonical.hud.query.
+NAMESPACE HudQueryIface
+SERVICE_XML ${HUD_QUERY_XML}
+)
+
+add_gdbus_codegen(
+OUTFILES HUD_SERVICE_GENERATED_SOURCES
+NAME app-iface
+PREFIX com.canonical.hud.Application.
+NAMESPACE AppIface
+SERVICE_XML ${HUD_APP_XML}
+)
+
+add_constant_template(HUD_SERVICE_GENERATED_SOURCES
+create-db
+create_db
+"${CMAKE_CURRENT_SOURCE_DIR}/create-db.sql"
+)
+
+add_library(hud-service-generated STATIC ${HUD_SERVICE_GENERATED_SOURCES})
+
+target_link_libraries(hud-service-generated
+${GLIB2_LIBRARIES}
+${GOBJECT2_LIBRARIES}
+)
+
+###########################
+# Lib Hud Service
+###########################
+
+set(HUD_SERVICE_LIB_HEADERS
+abstract-app.h
+action-muxer.h
+application-list.h
+application-source.h
+dump-app-info.h
+shared-values.h
+hudsettings.h
+hudappmenuregistrar.h
+huddbusmenucollector.h
+hudmenumodelcollector.h
+hudappindicatorsource.h
+hudwebappsource.h
+hudindicatorsource.h
+huddebugsource.h
+hudsourcelist.h
+hudsource.h
+hudtoken.h
+hudquery.h
+hudstringlist.h
+hudvoice.h
+hudsphinx.h
+hudjulius.h
+huditem.h
+hudkeywordmapping.h
+hudresult.h
+load-app-info.h
+pronounce-dict.h
+query-columns.h
+usage-tracker.h
+watchdog.h
+)
+
+set(HUD_SERVICE_LIB_SOURCES
+action-muxer.c
+application-list.c
+application-source.c
+dump-app-info.c
+hudsettings.c
+hudappmenuregistrar.c
+huddbusmenucollector.c
+hudmenumodelcollector.c
+hudappindicatorsource.c
+hudwebappsource.c
+hudindicatorsource.c
+huddebugsource.c
+hudsourcelist.c
+hudsource.c
+hudtoken.c
+hudquery.c
+hudstringlist.c
+hudvoice.c
+hudsphinx.c
+hudjulius.c
+huditem.c
+hudkeywordmapping.c
+hudresult.c
+load-app-info.c
+pronounce-dict.c
+usage-tracker.c
+watchdog.c
+)
+
+add_glib_enumtypes_t(HUD_SERVICE_LIB_SOURCES
+enum-types
+enum-types.h.in
+enum-types.c.in
+${HUD_SERVICE_LIB_HEADERS}
+)
+
+add_library(hud-service STATIC ${HUD_SERVICE_LIB_SOURCES})
+
+target_link_libraries(hud-service
+hud-client
+hud-service-generated
+${GLIB2_LIBRARIES}
+${GOBJECT2_LIBRARIES}
+${GIO2_LIBRARIES}
+${BAMF_LIBRARIES}
+${DEE_LIBRARIES}
+${DBUSMENU_GLIB_LIBRARIES}
+${SQLITE3_LIBRARIES}
+${POCKETSPHINX_LIBRARIES}
+)
+
+###########################
+# Hud Service Executable
+###########################
+
+add_executable(hud-service-exec hud-service.c)
+
+set_target_properties(hud-service-exec PROPERTIES OUTPUT_NAME "hud-service")
+
+target_link_libraries(hud-service-exec hud-service)
+
+###########################
+# Hud Dump Application
+###########################
+
+add_executable(hud-dump-application hud-dump-application.c)
+
+target_link_libraries(hud-dump-application hud-service)
+
+###########################
+# Hud Verify App Info
+###########################
+
+add_executable(hud-verify-app-info hud-verify-app-info.c)
+
+target_link_libraries(hud-verify-app-info hud-service)
+
+###########################
+# Installation
+###########################
+
+install(
+  PROGRAMS
+    hud-list-applications
+  DESTINATION
+    ${CMAKE_INSTALL_BINDIR}
+)
+
+install(
+  TARGETS
+    hud-dump-application
+    hud-verify-app-info
+  RUNTIME DESTINATION
+    ${CMAKE_INSTALL_BINDIR}
+)
+
+install(
+  TARGETS hud-service-exec
+  RUNTIME DESTINATION "${CMAKE_INSTALL_FULL_LIBEXECDIR}/hud"
+)

=== removed file 'src/Makefile.am'
--- src/Makefile.am	2013-03-25 16:54:06 +0000
+++ src/Makefile.am	1970-01-01 00:00:00 +0000
@@ -1,242 +0,0 @@
-CLEANFILES =
-DISTCLEANFILES =
-BUILT_SOURCES =
-EXTRA_DIST = \
-	hud-list-applications
-
-bin_PROGRAMS = \
-	hud-dump-application \
-	hud-verify-app-info
-
-bin_SCRIPTS = \
-	hud-list-applications
-
-pkglibexec_PROGRAMS = \
-	hud-service
-
-noinst_LTLIBRARIES = \
-	libhud-service-generated.la \
-	libhud-service.la
-
-####################
-# HUD Service C code
-####################
-
-libhud_service_la_SOURCES = \
-	abstract-app.h \
-	action-muxer.h \
-	action-muxer.c \
-	application-list.h \
-	application-list.c \
-	application-source.h \
-	application-source.c \
-	dump-app-info.h \
-	dump-app-info.c \
-	enum-types.h \
-	enum-types.c \
-	shared-values.h \
-	hudsettings.h		\
-	hudsettings.c		\
-	hudappmenuregistrar.h	\
-	hudappmenuregistrar.c	\
-	huddbusmenucollector.h	\
-	huddbusmenucollector.c	\
-	hudmenumodelcollector.h	\
-	hudmenumodelcollector.c	\
-	hudappindicatorsource.h	\
-	hudappindicatorsource.c	\
-	hudwebappsource.h \
-	hudwebappsource.c \
-	hudindicatorsource.h	\
-	hudindicatorsource.c	\
-	huddebugsource.h	\
-	huddebugsource.c	\
-	hudsourcelist.h		\
-	hudsourcelist.c		\
-	hudsource.h		\
-	hudsource.c		\
-	hudtoken.h		\
-	hudtoken.c		\
-	hudquery.h		\
-	hudquery.c		\
-	hudstringlist.h		\
-	hudstringlist.c		\
-	hudvoice.h		\
-	hudvoice.c		\
-	hudsphinx.h		\
-	hudsphinx.c		\
-	hudjulius.h		\
-	hudjulius.c		\
-	huditem.h		\
-	huditem.c		\
-	hudkeywordmapping.h		\
-	hudkeywordmapping.c		\
-	hudresult.h		\
-	hudresult.c		\
-	load-app-info.h \
-	load-app-info.c \
-	pronounce-dict.c \
-	pronounce-dict.h \
-	query-columns.h \
-	usage-tracker.h \
-	usage-tracker.c
-
-libhud_service_la_LDFLAGS = \
-	$(COVERAGE_LDFLAGS)
-
-libhud_service_la_CFLAGS = \
-	$(HUD_CFLAGS) \
-	$(BAMF_CFLAGS) \
-	$(HYBRIS_CFLAGS) \
-	$(COVERAGE_CFLAGS) \
-	-DDATADIR=\""$(datadir)"\" \
-	-DLIBEXECDIR=\""$(libexecdir)"\" \
-	-DDICT_PATH=\""/usr/share/pocketsphinx/model/lm/en_US/cmu07a.dic"\" \
-	-DJULIUS_DICT_PATH=\""/usr/share/julius-voxforge/acoustic/"\" \
-	-I$(top_srcdir)/libhud-client \
-	-I$(top_srcdir) \
-	-DHUD_CLIENT_COMPILATION \
-	-Wall -Werror
-
-#######################
-# HUD Service
-#######################
-
-hud_service_SOURCES = hud-service.c
-
-hud_service_CFLAGS = \
-	$(HUD_CFLAGS) \
-	$(BAMF_CFLAGS) \
-	$(HYBRIS_CFLAGS) \
-	$(COVERAGE_CFLAGS) \
-	-DDATADIR=\""$(datadir)"\" \
-	-I$(top_srcdir)/libhud-client \
-	-I$(top_srcdir) \
-	-DHUD_CLIENT_COMPILATION \
-	-Wall -Werror
-
-hud_service_LDADD = \
-	libhud-service.la	\
-	libhud-service-generated.la \
-	$(COVERAGE_LDFLAGS) \
-	$(BAMF_LIBS) \
-	$(HYBRIS_LIBS) \
-	$(HUD_LIBS)
-
-#######################
-# HUD Dump Application
-#######################
-
-hud_dump_application_SOURCES = \
-	dump-app-info.h \
-	dump-app-info.c \
-	hud-dump-application.c
-
-hud_dump_application_CFLAGS = \
-	$(HUD_CFLAGS) \
-	$(BAMF_CFLAGS) \
-	$(HYBRIS_CFLAGS) \
-	$(COVERAGE_CFLAGS) \
-	-Wall -Werror
-hud_dump_application_LDFLAGS = \
-	$(COVERAGE_LDFLAGS) \
-	$(BAMF_LIBS) \
-	$(HYBRIS_LIBS) \
-	$(HUD_LIBS)
-
-#######################
-# HUD Verify App Info
-#######################
-
-hud_verify_app_info_SOURCES = \
-	create-db.h \
-	create-db.c \
-	load-app-info.h \
-	load-app-info.c \
-	hud-verify-app-info.c
-
-hud_verify_app_info_CFLAGS = \
-	$(HUD_CFLAGS) \
-	$(BAMF_CFLAGS) \
-	$(HYBRIS_CFLAGS) \
-	$(COVERAGE_CFLAGS) \
-	-Wall -Werror
-hud_verify_app_info_LDFLAGS = \
-	$(COVERAGE_LDFLAGS) \
-	$(BAMF_LIBS) \
-	$(HYBRIS_LIBS) \
-	$(HUD_LIBS)
-
-#######################
-# HUD Generated Files
-#######################
-
-libhud_service_generated_la_SOURCES = \
-	create-db.h \
-	create-db.c \
-	app-iface.h \
-	app-iface.c \
-	hud-iface.h \
-	hud-iface.c \
-	hud-query-iface.h \
-	hud-query-iface.c
-
-libhud_service_generated_la_CFLAGS = \
-	$(HUD_CFLAGS) \
-	$(BAMF_CFLAGS) \
-	$(HYBRIS_CFLAGS) \
-	-DDATADIR=\""$(datadir)"\" \
-	-Wall -Werror
-
-EXTRA_DIST += \
-	create-db.sql
-
-create-db.c: create-db.sql
-	echo "#include \"create-db.h\"" > $@
-	echo -n "const gchar * create_db = \"" >> $@
-	cat $< | xargs printf "%s " >> $@
-	echo -n "\";" >> $@
-
-BUILT_SOURCES += \
-	create-db.c \
-	hud-query-iface.c \
-	hud-query-iface.h \
-	hud-iface.c \
-	hud-iface.h
-
-hud-iface.c: $(top_srcdir)/data/com.canonical.hud.xml
-	$(AM_V_GEN) gdbus-codegen \
-		--interface-prefix com.canonical.hud. \
-		--generate-c-code hud-iface \
-		--c-namespace HudIface \
-		$^
-hud-iface.h: hud-iface.c
-
-hud-query-iface.c: $(top_srcdir)/data/com.canonical.hud.query.xml
-	$(AM_V_GEN) gdbus-codegen \
-		--interface-prefix com.canonical.hud.query. \
-		--generate-c-code hud-query-iface \
-		--c-namespace HudQueryIface \
-		$^
-hud-query-iface.h: hud-query-iface.c
-
-app-iface.c: $(top_srcdir)/data/com.canonical.hud.Application.xml
-	$(AM_V_GEN) gdbus-codegen \
-		--interface-prefix com.canonical.hud.Application. \
-		--generate-c-code app-iface \
-		--c-namespace AppIface \
-		$^
-app-iface.h: app-iface.c
-
-##########################
-# Enum Types
-##########################
-
-include $(top_srcdir)/Makefile.am.enum
-
-glib_enum_h = enum-types.h
-glib_enum_c = enum-types.c
-glib_enum_headers = $(top_srcdir)/libhud-client/query.h
-
-
-CLEANFILES += $(BUILT_SOURCES)

=== modified file 'src/abstract-app.h'
--- src/abstract-app.h	2013-02-18 08:44:41 +0000
+++ src/abstract-app.h	2013-03-29 12:53:22 +0000
@@ -19,8 +19,6 @@
 #ifndef __HUD_ABSTRACT_APP_H__
 #define __HUD_ABSTRACT_APP_H__
 
-#include "config.h"
-
 #ifdef HAVE_BAMF
 
 #include <libbamf/libbamf.h>

=== modified file 'src/hud-service.c'
--- src/hud-service.c	2013-03-20 00:53:59 +0000
+++ src/hud-service.c	2013-03-29 12:53:22 +0000
@@ -18,8 +18,6 @@
 
 #define G_LOG_DOMAIN "hud-service"
 
-#include "config.h"
-
 #include <glib.h>
 #include <gio/gio.h>
 #include <stdlib.h>
@@ -38,6 +36,7 @@
 #include "hud-iface.h"
 #include "shared-values.h"
 #include "hudquery.h"
+#include "watchdog.h"
 
 /* Prototypes */
 static void            bus_method         (GDBusConnection       *connection,
@@ -67,6 +66,7 @@
 	.set_property = NULL
 };
 static HudApplicationList * application_list = NULL;
+static HudWatchdog * watchdog = NULL;
 
 /* Get our error domain */
 GQuark
@@ -230,7 +230,7 @@
 static HudQuery *
 build_query (HudSourceList * all_sources, HudApplicationList * app_list, GDBusConnection * connection, const gchar * search_string)
 {
-	HudQuery * query = hud_query_new (HUD_SOURCE(all_sources), application_list, search_string, 10, connection, ++query_count);
+	HudQuery * query = hud_query_new (HUD_SOURCE(all_sources), watchdog, application_list, search_string, 10, connection, ++query_count);
 
 	g_ptr_array_add(query_list, query);
 	g_object_weak_ref(G_OBJECT(query), query_destroyed, query_list);
@@ -265,6 +265,8 @@
             GDBusMethodInvocation *invocation,
             gpointer               user_data)
 {
+	hud_watchdog_ping(watchdog);
+
 	if (g_str_equal (method_name, "CreateQuery")) {
 		HudSourceList *all_sources = user_data;
 		GVariant * vsearch;
@@ -387,6 +389,7 @@
 static GVariant *
 bus_get_prop (GDBusConnection * connection, const gchar * sender, const gchar * object_path, const gchar * interface_name, const gchar * property_name, GError ** error, gpointer user_data)
 {
+	hud_watchdog_ping(watchdog);
 	// HudSource *source = user_data;
 
 	if (g_str_equal(property_name, "OpenQueries")) {
@@ -534,9 +537,13 @@
 
   signal(SIGTERM, sigterm_graceful_exit);
   
+  watchdog = hud_watchdog_new(mainloop);
+
   g_main_loop_run (mainloop);
   g_main_loop_unref (mainloop);
 
+  g_clear_object(&watchdog);
+
   g_object_unref (application_list);
   g_object_unref (source_list);
   g_ptr_array_free(query_list, TRUE);

=== modified file 'src/huddbusmenucollector.c'
--- src/huddbusmenucollector.c	2013-02-14 22:14:37 +0000
+++ src/huddbusmenucollector.c	2013-03-29 12:53:22 +0000
@@ -29,8 +29,6 @@
 #include "hudsource.h"
 #include "hudkeywordmapping.h"
 
-#include "config.h"
-
 /**
  * SECTION:huddbusmenucollector
  * @title: HudDbusmenuCollector

=== modified file 'src/hudjulius.c'
--- src/hudjulius.c	2013-02-28 10:17:55 +0000
+++ src/hudjulius.c	2013-03-29 12:53:22 +0000
@@ -14,6 +14,7 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#define _POSIX_SOURCE 1
 #define G_LOG_DOMAIN "hudjulius"
 
 #include "hudjulius.h"

=== modified file 'src/hudkeywordmapping.c'
--- src/hudkeywordmapping.c	2013-01-17 15:31:14 +0000
+++ src/hudkeywordmapping.c	2013-03-29 12:53:22 +0000
@@ -21,7 +21,6 @@
 #include <glib/gi18n.h>
 
 #include "hudkeywordmapping.h"
-#include "config.h"
 
 /**
  * SECTION:hudkeywordmapping

=== modified file 'src/hudmenumodelcollector.c'
--- src/hudmenumodelcollector.c	2013-02-19 03:49:41 +0000
+++ src/hudmenumodelcollector.c	2013-03-29 12:53:22 +0000
@@ -24,7 +24,6 @@
 #include "hudresult.h"
 #include "huditem.h"
 #include "hudkeywordmapping.h"
-#include "config.h"
 #include "action-muxer.h"
 
 #include <gio/gio.h>

=== modified file 'src/hudquery.c'
--- src/hudquery.c	2013-03-19 21:41:11 +0000
+++ src/hudquery.c	2013-03-29 12:53:22 +0000
@@ -30,6 +30,7 @@
 #include "application-source.h"
 #include "application-list.h"
 #include "query-columns.h"
+#include "watchdog.h"
 
 /**
  * SECTION:hudquery
@@ -58,6 +59,7 @@
 {
   GObject parent_instance;
 
+  HudWatchdog * watchdog;
   HudSource *all_sources;
   HudApplicationList *app_list;
   HudSource *current_source;
@@ -285,6 +287,7 @@
 {
   guint64 start_time;
 
+  hud_watchdog_ping(query->watchdog);
   start_time = g_get_monotonic_time ();
 
   dee_model_clear(query->results_model);
@@ -416,6 +419,7 @@
   g_clear_pointer(&query->appstack_name, g_free);
 
   g_clear_object(&query->voice);
+  g_clear_object(&query->watchdog);
 
   G_OBJECT_CLASS (hud_query_parent_class)
     ->finalize (object);
@@ -427,6 +431,7 @@
 {
   g_return_val_if_fail(HUD_IS_QUERY(user_data), FALSE);
   HudQuery * query = HUD_QUERY(user_data);
+  hud_watchdog_ping(query->watchdog);
 
   g_debug("Voice query is loading");
   hud_query_iface_com_canonical_hud_query_emit_voice_query_loading (
@@ -496,6 +501,7 @@
 {
 	g_return_val_if_fail(HUD_IS_QUERY(user_data), FALSE);
 	HudQuery * query = HUD_QUERY(user_data);
+	hud_watchdog_ping(query->watchdog);
 
 	g_debug("Updating Query to: '%s'", search_string);
 
@@ -529,6 +535,7 @@
 {
 	g_return_val_if_fail(HUD_IS_QUERY(user_data), FALSE);
 	HudQuery * query = HUD_QUERY(user_data);
+	hud_watchdog_ping(query->watchdog);
 
 	g_debug("Updating App to: '%s'", app_id);
 
@@ -552,7 +559,8 @@
 handle_execute (HudQueryIfaceComCanonicalHudQuery * skel, GDBusMethodInvocation * invocation, GVariant * command_id, guint timestamp, gpointer user_data)
 {
 	g_return_val_if_fail(HUD_IS_QUERY(user_data), FALSE);
-	//HudQuery * query = HUD_QUERY(user_data);
+	HudQuery * query = HUD_QUERY(user_data);
+	hud_watchdog_ping(query->watchdog);
 
 	/* Do good */
 	GVariant * inner = g_variant_get_variant(command_id);
@@ -590,7 +598,8 @@
 handle_parameterized (HudQueryIfaceComCanonicalHudQuery * skel, GDBusMethodInvocation * invocation, GVariant * command_id, guint timestamp, gpointer user_data)
 {
 	g_return_val_if_fail(HUD_IS_QUERY(user_data), FALSE);
-	//HudQuery * query = HUD_QUERY(user_data);
+	HudQuery * query = HUD_QUERY(user_data);
+	hud_watchdog_ping(query->watchdog);
 
 	GVariant * inner = g_variant_get_variant(command_id);
 	guint64 id = g_variant_get_uint64(inner);
@@ -642,6 +651,7 @@
 {
 	g_return_val_if_fail(HUD_IS_QUERY(user_data), FALSE);
 	HudQuery * query = HUD_QUERY(user_data);
+	hud_watchdog_ping(query->watchdog);
 
 	HudClientQueryToolbarItems item = hud_client_query_toolbar_items_get_value_from_nick(arg_item);
 
@@ -693,6 +703,7 @@
 {
 	g_return_val_if_fail(HUD_IS_QUERY(user_data), FALSE);
 	HudQuery * query = HUD_QUERY(user_data);
+	hud_watchdog_ping(query->watchdog);
 
 	/* Close the query */
 	hud_query_close(query);
@@ -795,6 +806,7 @@
  **/
 HudQuery *
 hud_query_new (HudSource   *all_sources,
+               HudWatchdog *watchdog,
                HudApplicationList *application_list,
                const gchar *search_string,
                gint         num_results,
@@ -811,6 +823,10 @@
   query->app_list = g_object_ref (application_list);
   query->search_string = g_strdup (search_string);
   query->token_list = NULL;
+
+  if (watchdog != NULL) {
+    query->watchdog = g_object_ref(watchdog);
+  }
   
   if (query->search_string[0] != '\0') {
     query->token_list = hud_token_list_new_from_string (query->search_string);

=== modified file 'src/hudquery.h'
--- src/hudquery.h	2013-02-27 17:35:32 +0000
+++ src/hudquery.h	2013-03-29 12:53:22 +0000
@@ -22,6 +22,7 @@
 #include "hudsource.h"
 #include "hudresult.h"
 #include "application-list.h"
+#include "watchdog.h"
 
 #define HUD_TYPE_QUERY                                      (hud_query_get_type ())
 #define HUD_QUERY(inst)                                     (G_TYPE_CHECK_INSTANCE_CAST ((inst),                     \
@@ -36,6 +37,7 @@
 GType                   hud_query_get_type                              (void);
 
 HudQuery *              hud_query_new                                   (HudSource   *all_sources,
+                                                                         HudWatchdog  * watchdog,
                                                                          HudApplicationList  * application_list,
                                                                          const gchar *search_string,
                                                                          gint         num_results,

=== modified file 'src/hudsource.h'
--- src/hudsource.h	2013-02-15 13:40:44 +0000
+++ src/hudsource.h	2013-03-29 12:53:22 +0000
@@ -22,6 +22,7 @@
 #include "huditem.h"
 #include "hudresult.h"
 #include "enum-types.h"
+#include <libhud-client/hud-client.h>
 
 #define HUD_TYPE_SOURCE                                     (hud_source_get_type ())
 #define HUD_SOURCE(inst)                                    (G_TYPE_CHECK_INSTANCE_CAST ((inst),                     \

=== added file 'src/watchdog.c'
--- src/watchdog.c	1970-01-01 00:00:00 +0000
+++ src/watchdog.c	2013-03-29 12:53:22 +0000
@@ -0,0 +1,178 @@
+/*
+ * Copyright © 2013 Canonical Ltd.
+ *
+ * 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/>.
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <stdlib.h>
+#include "watchdog.h"
+
+#define DEFAULT_TIMEOUT  600 /* seconds, or 10 minutes */
+
+typedef struct _HudWatchdogPrivate HudWatchdogPrivate;
+struct _HudWatchdogPrivate {
+	guint timeout;
+	gulong timer;
+	GMainLoop * loop;
+};
+
+#define HUD_WATCHDOG_GET_PRIVATE(o) \
+(G_TYPE_INSTANCE_GET_PRIVATE ((o), HUD_WATCHDOG_TYPE, HudWatchdogPrivate))
+
+static void hud_watchdog_class_init (HudWatchdogClass *klass);
+static void hud_watchdog_init       (HudWatchdog *self);
+static void hud_watchdog_dispose    (GObject *object);
+static void hud_watchdog_finalize   (GObject *object);
+static gboolean fire_watchdog       (gpointer user_data);
+
+G_DEFINE_TYPE (HudWatchdog, hud_watchdog, G_TYPE_OBJECT);
+
+static void
+hud_watchdog_class_init (HudWatchdogClass *klass)
+{
+	GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+	g_type_class_add_private (klass, sizeof (HudWatchdogPrivate));
+
+	object_class->dispose = hud_watchdog_dispose;
+	object_class->finalize = hud_watchdog_finalize;
+
+	return;
+}
+
+static void
+hud_watchdog_init (HudWatchdog *self)
+{
+	self->priv = HUD_WATCHDOG_GET_PRIVATE(self);
+
+	const gchar * envvar = g_getenv("HUD_SERVICE_TIMEOUT");
+	if (envvar == NULL) {
+		self->priv->timeout = DEFAULT_TIMEOUT;
+	} else {
+		self->priv->timeout = atoi(envvar);
+	}
+
+	if (self->priv->timeout != 0) {
+		self->priv->timer = g_timeout_add_seconds(self->priv->timeout, fire_watchdog, self);
+	}
+
+	return;
+}
+
+static void
+hud_watchdog_dispose (GObject *object)
+{
+	HudWatchdog * self = HUD_WATCHDOG(object);
+
+	if (self->priv->timer != 0) {
+		g_source_remove(self->priv->timer);
+		self->priv->timer = 0;
+	}
+
+	G_OBJECT_CLASS (hud_watchdog_parent_class)->dispose (object);
+	return;
+}
+
+static void
+hud_watchdog_finalize (GObject *object)
+{
+
+	G_OBJECT_CLASS (hud_watchdog_parent_class)->finalize (object);
+	return;
+}
+
+/* Oh noes!  It's our time to go!  Do this!  */
+static gboolean
+fire_watchdog (gpointer user_data)
+{
+	g_return_val_if_fail(IS_HUD_WATCHDOG(user_data), TRUE);
+	HudWatchdog * self = HUD_WATCHDOG(user_data);
+
+	g_debug("Firing Watchdog");
+
+	if (self->priv->loop != NULL) {
+		g_main_loop_quit(self->priv->loop);
+	}
+
+	return FALSE;
+}
+
+/**
+ * hud_watchdog_new:
+ * @loop: Mainloop to quit if we timeout
+ *
+ * Sets up a watchdog that will quit on the main loop if it
+ * doesn't get enough attention.  Reminds of an girlfriend
+ * I had once...
+ *
+ * Return value: (transfer full): A new #HudWatchdog object
+ */
+HudWatchdog *
+hud_watchdog_new (GMainLoop * loop)
+{
+	HudWatchdog * watchdog = g_object_new(HUD_WATCHDOG_TYPE, NULL);
+
+	watchdog->priv->loop = loop;
+
+	return watchdog;
+}
+
+/**
+ * hud_watchdog_ping:
+ * @watchdog: Watchdog to give attention to
+ *
+ * Makes sure to startover and not timeout.
+ */
+void
+hud_watchdog_ping (HudWatchdog * watchdog)
+{
+	/* Doing a silent fail on NULL so that our tests can not worry about
+	   setting up dummy watchdogs when just testing the query.  They have
+	   their own timeouts */
+	if (watchdog == NULL) {
+		return;
+	}
+
+	g_return_if_fail(IS_HUD_WATCHDOG(watchdog));
+
+	if (watchdog->priv->timer != 0) {
+		g_source_remove(watchdog->priv->timer);
+		watchdog->priv->timer = 0;
+	}
+
+	if (watchdog->priv->timeout != 0) {
+		watchdog->priv->timer = g_timeout_add_seconds(watchdog->priv->timeout, fire_watchdog, watchdog);
+	}
+	return;
+}
+
+/**
+ * hud_watchdog_get_timeout:
+ * @watchdog: Watchdog to interegate
+ *
+ * Get the timeout of this watchdog.
+ *
+ * Return value: The number of seconds before it goes off
+ */
+guint
+hud_watchdog_get_timeout (HudWatchdog * watchdog)
+{
+	g_return_val_if_fail(IS_HUD_WATCHDOG(watchdog), 0);
+
+	return watchdog->priv->timeout;
+}

=== added file 'src/watchdog.h'
--- src/watchdog.h	1970-01-01 00:00:00 +0000
+++ src/watchdog.h	2013-03-29 12:53:22 +0000
@@ -0,0 +1,53 @@
+/*
+ * Copyright © 2013 Canonical Ltd.
+ *
+ * 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/>.
+ *
+ */
+
+#ifndef __HUD_WATCHDOG_H__
+#define __HUD_WATCHDOG_H__
+
+#include <glib-object.h>
+
+G_BEGIN_DECLS
+
+#define HUD_WATCHDOG_TYPE            (hud_watchdog_get_type ())
+#define HUD_WATCHDOG(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), HUD_WATCHDOG_TYPE, HudWatchdog))
+#define HUD_WATCHDOG_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), HUD_WATCHDOG_TYPE, HudWatchdogClass))
+#define IS_HUD_WATCHDOG(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), HUD_WATCHDOG_TYPE))
+#define IS_HUD_WATCHDOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), HUD_WATCHDOG_TYPE))
+#define HUD_WATCHDOG_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), HUD_WATCHDOG_TYPE, HudWatchdogClass))
+
+typedef struct _HudWatchdog        HudWatchdog;
+typedef struct _HudWatchdogClass   HudWatchdogClass;
+typedef struct _HudWatchdogPrivate HudWatchdogPrivate;
+
+struct _HudWatchdogClass {
+	GObjectClass parent_class;
+};
+
+struct _HudWatchdog {
+	GObject parent;
+	HudWatchdogPrivate * priv;
+};
+
+GType hud_watchdog_get_type (void);
+
+HudWatchdog * hud_watchdog_new  (GMainLoop * loop);
+void          hud_watchdog_ping (HudWatchdog * watchdog);
+guint         hud_watchdog_get_timeout (HudWatchdog * watchdog);
+
+G_END_DECLS
+
+#endif

=== added file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ tests/CMakeLists.txt	2013-03-29 12:53:22 +0000
@@ -0,0 +1,175 @@
+include_directories(${HUD_SERVICE_INCLUDE_DIRS})
+include_directories(${HUD_CLIENT_INCLUDE_DIRS})
+
+#######################
+# Dbus JSON Loader
+#######################
+
+add_definitions(-DDBUSMENU_JSON_LOADER="${CMAKE_CURRENT_BINARY_DIR}/dbusmenu-json-loader")
+
+add_executable(dbusmenu-json-loader dbusmenu-json-loader.c)
+target_link_libraries(dbusmenu-json-loader
+${DBUSMENU_JSONLOADER_LIBRARIES}
+)
+
+#######################
+# Menu input model deep
+#######################
+
+add_definitions(-DMODEL_DEEP="${CMAKE_CURRENT_BINARY_DIR}/test-menu-input-model-deep")
+
+add_executable(test-menu-input-model-deep test-menu-input-model-deep.c)
+target_link_libraries(test-menu-input-model-deep
+  ${GOBJECT2_LIBRARIES}
+  ${GIO2_LIBRARIES}
+)
+
+#########################
+# Menu input model simple
+#########################
+
+add_definitions(-DMODEL_SIMPLE="${CMAKE_CURRENT_BINARY_DIR}/test-menu-input-model-simple")
+
+add_executable(test-menu-input-model-simple test-menu-input-model-simple.c)
+target_link_libraries(test-menu-input-model-simple
+  ${GOBJECT2_LIBRARIES}
+  ${GIO2_LIBRARIES}
+)
+
+############################
+# Menu input model shortcuts
+############################
+
+add_definitions(-DMODEL_SHORTCUTS="${CMAKE_CURRENT_BINARY_DIR}/test-menu-input-model-shortcuts")
+
+add_executable(test-menu-input-model-shortcuts test-menu-input-model-shortcuts.c)
+target_link_libraries(test-menu-input-model-shortcuts
+  ${GOBJECT2_LIBRARIES}
+  ${GIO2_LIBRARIES}
+)
+
+#######################
+# TEST MACRO
+#######################
+
+macro(hudtest tname tfilename rfilename)
+  add_executable(${tname} ${tfilename})
+  target_link_libraries(${tname}
+    hud-service
+    hud-test
+  )
+  add_test(${tname}
+    "${CMAKE_CURRENT_SOURCE_DIR}/test-runner.sh"
+    "${CMAKE_CURRENT_SOURCE_DIR}"
+    "${CMAKE_CURRENT_BINARY_DIR}"
+    "${CMAKE_CURRENT_BINARY_DIR}/${tname}"
+    "${CMAKE_CURRENT_BINARY_DIR}/${rfilename}"
+  )
+endmacro()
+
+#######################
+# HUD Test Common Code
+#######################
+
+set(HUD_TEST_HEADERS
+app-list-dummy.h
+word-list.h
+hudrandomsource.h
+hudmanualsource.h
+hudtestutils.h
+)
+
+set(HUD_TEST_SOURCES
+app-list-dummy.c
+hudrandomsource.c
+hudmanualsource.c
+hudtestutils.c
+)
+
+add_library(hud-test STATIC ${HUD_TEST_SOURCES})
+
+target_link_libraries(hud-test
+hud-service
+${DBUSTEST_LIBRARIES}
+)
+
+#######################
+# Test Fixtures
+#######################
+
+add_definitions(-DJSON_SIMPLE="${CMAKE_CURRENT_SOURCE_DIR}/test-menu-input-simple.json")
+add_definitions(-DJSON_SHORTCUTS="${CMAKE_CURRENT_SOURCE_DIR}/test-menu-input-shortcuts.json")
+
+#######################
+# Generated test fixtures
+#######################
+
+find_package(Gettext)
+
+set(KEYWORD_LOCALE_DIR "${CMAKE_CURRENT_BINARY_DIR}/keyword-mapping/locale")
+add_definitions(-DKEYWORD_LOCALE_DIR="${KEYWORD_LOCALE_DIR}")
+add_custom_command(
+  OUTPUT
+    "${KEYWORD_LOCALE_DIR}/en_FAKELANG/LC_MESSAGES"
+    "${KEYWORD_LOCALE_DIR}/en_FAKELANG/LC_MESSAGES/gnome-terminal.mo"
+  COMMAND
+    mkdir -p "${KEYWORD_LOCALE_DIR}/en_FAKELANG/LC_MESSAGES"
+  COMMAND
+	"${GETTEXT_MSGFMT_EXECUTABLE}"
+	--check
+	--output-file "${KEYWORD_LOCALE_DIR}/en_FAKELANG/LC_MESSAGES/gnome-terminal.mo"
+	"${CMAKE_CURRENT_SOURCE_DIR}/keyword-mapping/gnome-terminal-en_FAKELANG.po"
+  VERBATIM
+)
+add_custom_target(keyword-files DEPENDS "${KEYWORD_LOCALE_DIR}/en_FAKELANG/LC_MESSAGES/gnome-terminal.mo")
+	
+#######################
+# HUD Test Suite
+#######################
+
+hudtest(test-watchdog test-watchdog.c test-watchdog.xml)
+hudtest(test-distance test-distance.c test-distance.xml)
+hudtest(test-hud-item test-huditem.c test-hud-item.xml)
+hudtest(test-result-highlighting test-result-highlighting.c test-result-highlighting.xml)
+hudtest(test-menu-input test-menu-input.c test-menu-input.xml)
+hudtest(test-keyword-mapping test-keyword-mapping.c test-keyword-mapping.xml)
+add_dependencies(test-keyword-mapping keyword-files)
+hudtest(test-string-list test-string-list.c test-string-list.xml)
+hudtest(test-pronounce-dict test-pronounce-dict.c test-pronounce-dict.xml)
+hudtest(test-source test-source.c test-source.xml)
+hudtest(test-app-indicator-source test-app-indicator-source.c test-app-indicator-source.xml)
+hudtest(test-indicator-source test-indicator-source.c test-indicator-source.xml)
+hudtest(test-application-list test-application-list.c test-application-list.xml)
+#test-usage-db-simple.xml
+#test-usage-db-old.xml
+#test-usage-db-testapp.xml
+#test-usage-db-off.xml
+#test-bad-app-info-dual-header
+#test-bad-app-info-item-no-count
+#test-bad-app-info-item-no-name
+#test-bad-app-info-menu-no-name
+#test-bad-app-info-missing-desktop
+#test-bad-app-info-missing-menus
+#test-bad-app-info-multiple-menus
+#test-good-app-info-tons-of-entries
+#test-dbus-message-count
+
+#######################
+# Slow test
+#######################
+
+add_executable(hud-performance hud-performance.c)
+target_link_libraries(hud-performance
+  hud-service
+  hud-test
+  ${GIO2_LIBRARIES}
+)
+if(${enable_scalability_tests})
+  add_test(hud-performance
+    "${CMAKE_CURRENT_SOURCE_DIR}/test-runner.sh"
+    "${CMAKE_CURRENT_SOURCE_DIR}"
+    "${CMAKE_CURRENT_BINARY_DIR}/hud-performance"
+    "${CMAKE_CURRENT_BINARY_DIR}/hud-performance.xml"