Merge lp:~ted/indicator-appmenu/hudectomy into lp:indicator-appmenu/13.04

[Ted Gould]

Remove the HUD files from indicator-appmenu

We've move the HUD to lp:hud. It shouldn't be here anymore.

[Charles Kerr (charlesk)]

Cool.

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://s-jenkins:8080/job/indicator-appmenu-autolanding/2/
Executed test runs:
    FAILURE: http://s-jenkins:8080/job/indicator-appmenu-autolanding/./build=pbuilder,distribution=raring,flavor=amd64/2/console
    FAILURE: http://s-jenkins:8080/job/indicator-appmenu-autolanding/./build=pbuilder,distribution=raring,flavor=i386/2/console

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:224
http://s-jenkins:8080/job/indicator-appmenu-ci/1/
Executed test runs:
    FAILURE: http://s-jenkins:8080/job/indicator-appmenu-ci/./build=pbuilder,distribution=raring,flavor=amd64/1/console
    FAILURE: http://s-jenkins:8080/job/indicator-appmenu-ci/./build=pbuilder,distribution=raring,flavor=i386/1/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/indicator-appmenu-ci/1//rebuild/?

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:224
http://s-jenkins:8080/job/indicator-appmenu-ci/2/
Executed test runs:
    FAILURE: http://s-jenkins:8080/job/indicator-appmenu-ci/./build=pbuilder,distribution=raring,flavor=amd64/2/console
    FAILURE: http://s-jenkins:8080/job/indicator-appmenu-ci/./build=pbuilder,distribution=raring,flavor=i386/2/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/indicator-appmenu-ci/2//rebuild/?

review: Needs Fixing (continuous-integration)

[Allan LeSage (allanlesage)]

Legit CI failure above, packaging needs to be updated:

dh_install --fail-missing
dh_install: indicator-appmenu missing files (debian/tmp/usr/lib/*/hud-service), aborting
make[1]: *** [override_dh_install] Error 2
make[1]: Leaving directory `/tmp/buildd/indicator-appmenu-12.10.4daily12.11.23'
make: *** [binary] Error 2
dpkg-buildpackage: error: fakeroot debian/rules binary gave error exit status 2
E: Failed autobuilding of package

cyphermox advocates editing debian/indicator-appmenu.install to remove this expectation of finding the removed built files.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:226
http://s-jenkins:8080/job/indicator-appmenu-ci/3/
Executed test runs:
    FAILURE: http://s-jenkins:8080/job/indicator-appmenu-ci/./build=pbuilder,distribution=raring,flavor=amd64/3/console
    FAILURE: http://s-jenkins:8080/job/indicator-appmenu-ci/./build=pbuilder,distribution=raring,flavor=i386/3/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/indicator-appmenu-ci/3//rebuild/?

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:227
http://s-jenkins:8080/job/indicator-appmenu-ci/4/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/indicator-appmenu-ci/./build=pbuilder,distribution=raring,flavor=amd64/4/console
    SUCCESS: http://s-jenkins:8080/job/indicator-appmenu-ci/./build=pbuilder,distribution=raring,flavor=i386/4/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/indicator-appmenu-ci/4//rebuild/?

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:230
http://s-jenkins:8080/job/indicator-appmenu-ci/15/
Executed test runs:
    FAILURE: http://s-jenkins:8080/job/indicator-appmenu-ci/./build=pbuilder,distribution=coverity-raring,flavor=amd64/15/console
    FAILURE: http://s-jenkins:8080/job/indicator-appmenu-ci/./build=pbuilder,distribution=raring,flavor=i386/15/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/indicator-appmenu-ci/15//rebuild/?

review: Needs Fixing (continuous-integration)

[Mathieu Trudel-Lapierre (cyphermox)]

Approve.

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:231
http://s-jenkins:8080/job/indicator-appmenu-ci/16/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/indicator-appmenu-ci/./build=pbuilder,distribution=coverity-raring,flavor=amd64/16/console
    SUCCESS: http://s-jenkins:8080/job/indicator-appmenu-ci/./build=pbuilder,distribution=raring,flavor=i386/16/console
Coverity artifacts:
    http://s-jenkins:8080/job/indicator-appmenu-ci/./build=pbuilder,distribution=coverity-raring,flavor=amd64/16//artifact/results/coverity/NO_COVERITY_DEFECTS.txt
    http://s-jenkins:8080/job/indicator-appmenu-ci/./build=pbuilder,distribution=raring,flavor=i386/16//artifact/results/coverity/NO_COVERITY_DEFECTS.txt

Click here to trigger a rebuild:
http://s-jenkins:8080/job/indicator-appmenu-ci/16//rebuild/?

review: Approve (continuous-integration)

=== modified file 'Makefile.am'
--- Makefile.am	2012-12-03 17:40:45 +0000
+++ Makefile.am	2013-02-19 17:11:22 +0000
@@ -3,15 +3,13 @@
 SUBDIRS = \
 	data \
 	po \
-	src \
-	docs
+	src
 
 if BUILD_TESTS
 SUBDIRS += \
 	scripts \
 	tests \
-	tools \
-	tools-vala
+	tools
 endif
 
 tests: src

=== modified file 'configure.ac'
--- configure.ac	2013-01-22 20:39:37 +0000
+++ configure.ac	2013-02-19 17:11:22 +0000
@@ -76,26 +76,6 @@
 AC_SUBST(INDICATOR_LIBS)
 
 ###########################
-# Dependencies
-###########################
-
-DBUSMENU_GLIB_REQUIRED_VERSION=0.4.0
-BAMF_REQUIRED_VERSION=0.2.53
-SQLITE_REQUIRED_VERSION=0.0
-
-PKG_CHECK_MODULES([HUD],[
-		dbusmenu-glib-0.4 >= $DBUSMENU_GLIB_REQUIRED_VERSION
-		gio-2.0 >= $GIO_REQUIRED_VERSION
-		libbamf3
-		sqlite3 >= $SQLITE_REQUIRED_VERSION
-])
-
-PKG_CHECK_MODULES([HUD_CLIENT],[
-		gio-unix-2.0 >= $GIO_REQUIRED_VERSION
-		gtk+-3.0 >= $GTK_REQUIRED_VERSION
-])
-
-###########################
 # CLI Dependencies
 ###########################
 
@@ -233,12 +213,8 @@
 data/Makefile
 tools/Makefile
 po/Makefile.in
-tools-vala/Makefile
 tests/Makefile
 tests/manual/Makefile
-docs/Makefile
-docs/man/Makefile
-docs/devel/Makefile
 ])
 
 ###########################

=== modified file 'data/Makefile.am'
--- data/Makefile.am	2012-12-03 17:40:45 +0000
+++ data/Makefile.am	2013-02-19 17:11:22 +0000
@@ -1,19 +1,8 @@
 gsettings_SCHEMAS = \
-    com.canonical.indicator.appmenu.gschema.xml \
-    com.canonical.indicator.appmenu.hud.gschema.xml \
-    com.canonical.indicator.appmenu.hud.search.gschema.xml
+    com.canonical.indicator.appmenu.gschema.xml
 
 @GSETTINGS_RULES@
 
-dbus_servicesdir = $(DBUSSERVICEDIR)
-dbus_services_DATA = com.canonical.hud.service
-
-%.service: %.service.in
-	sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
-
 EXTRA_DIST = \
-	$(dbus_services_DATA:.service=.service.in) \
 	$(gsettings_SCHEMAS)
 
-CLEANFILES = \
-	$(dbus_services_DATA)

=== removed file 'data/com.canonical.hud.service.in'
--- data/com.canonical.hud.service.in	2012-12-03 17:40:45 +0000
+++ data/com.canonical.hud.service.in	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-[D-BUS Service]
-Name=com.canonical.hud
-Exec=@libexecdir@/hud-service

=== removed file 'data/com.canonical.indicator.appmenu.hud.gschema.xml'
--- data/com.canonical.indicator.appmenu.hud.gschema.xml	2012-12-03 17:40:45 +0000
+++ data/com.canonical.indicator.appmenu.hud.gschema.xml	1970-01-01 00:00:00 +0000
@@ -1,16 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-
-<schemalist>
-  <schema path='/com/canonical/indicator/appmenu/hud/' id='com.canonical.indicator.appmenu.hud' gettext-domain='indicator-appmenu'>
-    <key type='b' name='store-usage-data'>
-      <default>true</default>
-      <summary>Whether to store usage data</summary>
-      <description>
-        When the HUD executes operations it stores the execution in order to
-        make the future results better. Some users could choose to not want
-        this data to be stored. If that is the case they should disable this
-        property.
-      </description>
-    </key>
-  </schema>
-</schemalist>

=== removed file 'data/com.canonical.indicator.appmenu.hud.search.gschema.xml'
--- data/com.canonical.indicator.appmenu.hud.search.gschema.xml	2012-12-03 17:40:45 +0000
+++ data/com.canonical.indicator.appmenu.hud.search.gschema.xml	1970-01-01 00:00:00 +0000
@@ -1,72 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-
-<schemalist>
-  <schema path='/com/canonical/indicator/appmenu/hud/search/'
-          id='com.canonical.indicator.appmenu.hud.search'
-          gettext-domain='indicator-appmenu'>
-    <key type='u' name='indicator-penalty'>
-      <default>50</default>
-      <summary>The penalty given to a menu item being in an indicator</summary>
-      <description>
-        In order to have the application's menu items appear higher in the search results a slight penalty is
-        given to the indicator menu items. This value represents the percentage of that penalty so a value of
-        '50' is a 50% additional to the calculated distance.
-      </description>
-    </key>
-
-    <key type='u' name='add-penalty'>
-      <default>10</default>
-      <summary>Penalty for extra characters added to the search</summary>
-      <description>
-        The penalty for each extra character in the search string that does not appear in the text of a menu
-        item.
-
-        This penalty would be applied if the user typed "fiile" when searching against the menu item "File", for
-        example.
-      </description>
-    </key>
-
-    <key type='u' name='drop-penalty'>
-      <default>10</default>
-      <summary>Penalty applied if a character is dropped</summary>
-      <description>
-        The penalty for each character dropped from the search string, as compared with the text of a menu item.
-        This only applies to missing characters that are not at the end of the search term.
-
-        This penalty would be applied if the user typed "fle" when searching against the menu item "File", for
-        example.
-      </description>
-    </key>
-
-    <key type='u' name='end-drop-penalty'>
-      <default>1</default>
-      <summary>Penalty applied if a character is dropped from the end</summary>
-      <description>
-        The penalty for each missing character at the end of a search term.
-
-        This penalty would be applied if the user typed "fil" when searching against the menu item "File", for
-        example.
-      </description>
-    </key>
-
-    <key type='u' name='swap-penalty'>
-      <default>15</default>
-      <summary>Penalty applied when the characters are not the same</summary>
-      <description>
-        The penalty for each substituted character in the search term.
-
-        The penalty would be applied if the user typed "fike" when searching against the menu item "File", for
-        example.
-      </description>
-    </key>
-
-    <key type='u' name='max-distance'>
-      <default>30</default>
-      <summary>The highest distance value that is shown in the results</summary>
-      <description>
-        After the distances are calculated (including the indicator penalty) then all values above this max are
-        dropped. This means that the history for those entries aren't looked up as well.
-      </description>
-    </key>
-  </schema>
-</schemalist>

=== modified file 'debian/control'
--- debian/control	2013-01-22 20:39:37 +0000
+++ debian/control	2013-02-19 17:11:22 +0000
@@ -17,13 +17,8 @@
                libdbusmenu-gtk3-dev (>= 0.5.90),
                libdbusmenu-jsonloader-dev (>= 0.5.90),
                libbamf3-dev (>= 0.2.53),
-               libsqlite3-dev,
-               sqlite3,
-               libreadline-dev,
-               libncurses5-dev,
                libappindicator3-dev,
                indicator-application (>= 0.4.90),
-               valac-0.16,
 Standards-Version: 3.9.2
 Homepage: http://launchpad.net/indicator-appmenu
 # If you aren't a member of ~indicator-applet-developers but need to upload
@@ -36,6 +31,7 @@
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
+         hud,
 Recommends: indicator-applet | indicator-renderer,
             appmenu-gtk,
             appmenu-gtk3,
@@ -50,7 +46,6 @@
          ${misc:Depends},
          indicator-appmenu (= ${binary:Version}),
          libdbusmenu-tools,
-         sqlite3,
 Description: Tools for debuging application menus.
  .
  This package provides tools for supporting application menus.

=== modified file 'debian/indicator-appmenu-tools.install'
--- debian/indicator-appmenu-tools.install	2012-12-03 17:40:45 +0000
+++ debian/indicator-appmenu-tools.install	2013-02-19 17:11:22 +0000
@@ -1,10 +1,3 @@
 debian/tmp/usr/lib/*/current-menu*
 debian/tmp/usr/lib/*/menu-pusher
 debian/tmp/usr/lib/*/mock-json-app
-debian/tmp/usr/bin/hud-cli /usr/bin/
-debian/tmp/usr/bin/hud-dump-application /usr/bin/
-debian/tmp/usr/bin/hud-gtk /usr/bin/
-debian/tmp/usr/bin/hud-list-applications /usr/bin/
-debian/tmp/usr/bin/hud-verify-app-info /usr/bin/
-debian/tmp/usr/share/man/ /usr/share/
-debian/tmp/usr/share/hud-gtk /usr/share/

=== modified file 'debian/indicator-appmenu.install'
--- debian/indicator-appmenu.install	2012-12-03 17:40:45 +0000
+++ debian/indicator-appmenu.install	2013-02-19 17:11:22 +0000
@@ -1,6 +1,4 @@
 debian/tmp/usr/lib/indicators3 /usr/lib
 debian/source_indicator-appmenu.py /usr/share/apport/package-hooks/
 debian/indicator-appmenu-crashdb.conf /etc/apport/crashdb.conf.d/
-debian/tmp/usr/lib/*/hud-service
-debian/tmp/usr/share/dbus-1/ /usr/share/
 debian/tmp/usr/share/glib-2.0/ /usr/share/

=== removed directory 'docs'
=== removed file 'docs/HUD Architecture.svg'
--- docs/HUD Architecture.svg	2012-12-03 17:40:45 +0000
+++ docs/HUD Architecture.svg	1970-01-01 00:00:00 +0000
@@ -1,368 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="706.61322"
-   height="774.54626"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.2 r9819"
-   sodipodi:docname="HUD Architecture.svg">
-  <defs
-     id="defs4">
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect4218"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect4214"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect4210"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect4206"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect4054"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect3863"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect3829"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect3825"
-       is_visible="true" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1.1071895"
-     inkscape:cx="232.7327"
-     inkscape:cy="382.51953"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:showpageshadow="false"
-     inkscape:window-width="1680"
-     inkscape:window-height="1026"
-     inkscape:window-x="0"
-     inkscape:window-y="24"
-     inkscape:window-maximized="1"
-     fit-margin-top="50"
-     fit-margin-left="50"
-     fit-margin-right="50"
-     fit-margin-bottom="50" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-153.88477,-277.83542)">
-    <rect
-       style="color:#000000;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect2985"
-       width="192.93913"
-       height="104.04572"
-       x="241.00642"
-       y="328.33542" />
-    <rect
-       style="color:#000000;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect2985-3"
-       width="192.93913"
-       height="104.04572"
-       x="245.62126"
-       y="558.84198" />
-    <rect
-       style="color:#000000;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect2985-9"
-       width="192.93913"
-       height="104.04572"
-       x="586.43182"
-       y="384.48648" />
-    <rect
-       style="color:#000000;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect2985-7"
-       width="192.93913"
-       height="104.04572"
-       x="617.05884"
-       y="561.62695" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot3805"
-       style="font-size:18px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Bumped BRK;-inkscape-font-specification:Bumped BRK"><flowRegion
-         id="flowRegion3807"><rect
-           id="rect3809"
-           width="187.07358"
-           height="95.192307"
-           x="242.53345"
-           y="43.193981"
-           style="font-family:Bumped BRK;-inkscape-font-specification:Bumped BRK" /></flowRegion><flowPara
-         id="flowPara3811" /></flowRoot>    <flowRoot
-       xml:space="preserve"
-       id="flowRoot3813"
-       style="font-size:18px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:100%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Ubuntu;-inkscape-font-specification:Ubuntu"
-       transform="translate(0,310.93426)"><flowRegion
-         id="flowRegion3815"><rect
-           id="rect3817"
-           width="175.48492"
-           height="46.354519"
-           x="249.15552"
-           y="52.299332"
-           style="text-align:center;text-anchor:middle"
-           ry="0"
-           rx="0" /></flowRegion><flowPara
-         id="flowPara3819"
-         style="font-weight:bold;-inkscape-font-specification:Ubuntu Bold">Unity</flowPara><flowPara
-         id="flowPara3821"
-         style="font-weight:bold;-inkscape-font-specification:Ubuntu Bold">GUI</flowPara></flowRoot>    <path
-       style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 449.47325,302.28261 c 29.69243,-2.03406 58.53652,-14.78861 80.02111,-35.38449 10.47599,-10.04266 19.17966,-21.79342 29.4484,-32.0479 8.83486,-8.8226 18.80808,-16.50398 29.59403,-22.79336"
-       id="path3823"
-       inkscape:path-effect="#path-effect3825"
-       inkscape:original-d="m 449.47325,302.28261 c 35.92724,5.92939 56.6183,-19.31435 80.02111,-35.38449 11.7014,-8.03507 19.73501,-22.46822 29.4484,-32.0479 9.7134,-9.57969 21.10658,-14.30591 29.59403,-22.79336"
-       inkscape:connector-curvature="0"
-       transform="translate(0,287.36218)"
-       sodipodi:nodetypes="cssc" />
-    <path
-       style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 449.81773,318.01003 c 21.09159,-2.06081 42.43769,-1.50335 63.39297,1.65552 17.10783,2.5789 34.02902,6.89013 51.32108,7.44983 12.84929,0.4159 25.76421,-1.26865 38.07692,-4.96655"
-       id="path3827"
-       inkscape:path-effect="#path-effect3829"
-       inkscape:original-d="m 449.81773,318.01003 c 11.59516,1.94007 62.94692,-1.93293 63.39297,1.65552 1.01665,8.17897 40.57446,3.86763 51.32108,7.44983 19.17114,6.39038 20.04051,-0.45745 38.07692,-4.96655"
-       inkscape:connector-curvature="0"
-       transform="translate(0,287.36218)"
-       sodipodi:nodetypes="cssc" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot3813-1"
-       style="font-size:18px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:100%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Ubuntu;-inkscape-font-specification:Ubuntu"
-       transform="translate(2.6759825,544.72955)"><flowRegion
-         id="flowRegion3815-4"><rect
-           id="rect3817-9"
-           width="175.48492"
-           height="46.354519"
-           x="249.15552"
-           y="52.299332"
-           style="text-align:center;text-anchor:middle"
-           ry="0"
-           rx="0" /></flowRegion><flowPara
-         id="flowPara3819-7"
-         style="font-weight:bold">HUD</flowPara><flowPara
-         id="flowPara3821-6"
-         style="font-weight:bold">Service</flowPara></flowRoot>    <path
-       style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 342.69231,158.25251 0,103.4699"
-       id="path3861"
-       inkscape:path-effect="#path-effect3863"
-       inkscape:original-d="m 342.69231,158.25251 c 0,102.64214 0,103.4699 0,103.4699"
-       inkscape:connector-curvature="0"
-       transform="translate(0,287.36218)" />
-    <text
-       xml:space="preserve"
-       style="font-size:18px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Ubuntu;-inkscape-font-specification:Ubuntu"
-       x="658.00934"
-       y="442.75534"
-       id="text3865"
-       sodipodi:linespacing="100%"><tspan
-         sodipodi:role="line"
-         id="tspan3867"
-         x="658.00934"
-         y="442.75534"
-         style="font-weight:bold">BAMF</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-size:18px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:100%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Ubuntu;-inkscape-font-specification:Ubuntu"
-       x="714.17834"
-       y="609.96881"
-       id="text3869"
-       sodipodi:linespacing="100%"><tspan
-         sodipodi:role="line"
-         id="tspan3871"
-         x="714.17834"
-         y="609.96881"
-         style="font-weight:bold">Indicator</tspan><tspan
-         sodipodi:role="line"
-         x="714.17834"
-         y="627.96881"
-         id="tspan3873"
-         style="font-weight:bold">AppMenu</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-size:18px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#444444;fill-opacity:1;stroke:none;font-family:Ubuntu;-inkscape-font-specification:Ubuntu"
-       x="203.62877"
-       y="481.20834"
-       id="text3875"
-       sodipodi:linespacing="100%"><tspan
-         sodipodi:role="line"
-         id="tspan3877"
-         x="203.62877"
-         y="481.20834"
-         style="font-size:16px;fill:#444444;fill-opacity:1">Text Area</tspan><tspan
-         sodipodi:role="line"
-         x="203.62877"
-         y="497.20834"
-         id="tspan3879"
-         style="font-size:16px;fill:#444444;fill-opacity:1">Target Text</tspan><tspan
-         sodipodi:role="line"
-         x="203.62877"
-         y="513.20837"
-         id="tspan3881"
-         style="font-size:16px;fill:#444444;fill-opacity:1">Suggestions</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-size:18px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:100%;letter-spacing:0px;word-spacing:0px;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#444444;fill-opacity:1;fill-rule:nonzero;stroke:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu"
-       x="470.16724"
-       y="506.04111"
-       id="text3883"
-       sodipodi:linespacing="100%"><tspan
-         sodipodi:role="line"
-         id="tspan3885"
-         x="470.16724"
-         y="506.04111">Focused</tspan><tspan
-         sodipodi:role="line"
-         x="470.16724"
-         y="524.04114"
-         id="tspan3925">Window</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-size:18px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:100%;letter-spacing:0px;word-spacing:0px;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#444444;fill-opacity:1;fill-rule:nonzero;stroke:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu"
-       x="471.28049"
-       y="644.96588"
-       id="text3887"
-       sodipodi:linespacing="100%"><tspan
-         sodipodi:role="line"
-         id="tspan3889"
-         x="471.28049"
-         y="644.96588">Window to</tspan><tspan
-         sodipodi:role="line"
-         x="471.28049"
-         y="662.96588"
-         id="tspan3891">Menu mapping</tspan></text>
-    <rect
-       style="color:#000000;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect2985-3-6-2"
-       width="259.15988"
-       height="245.59258"
-       x="230.90923"
-       y="756.28912" />
-    <text
-       xml:space="preserve"
-       style="font-size:18px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Ubuntu;-inkscape-font-specification:Ubuntu"
-       x="326.11465"
-       y="994.28821"
-       id="text3865-8-2"
-       sodipodi:linespacing="100%"><tspan
-         sodipodi:role="line"
-         id="tspan3867-7-3"
-         x="326.11465"
-         y="994.28821"
-         style="font-weight:bold">Window</tspan></text>
-    <rect
-       style="color:#000000;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect2985-7-7"
-       width="239.29364"
-       height="44.447052"
-       x="239.60066"
-       y="925.6922" />
-    <text
-       xml:space="preserve"
-       style="font-size:18px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:center;text-decoration:none;line-height:100%;letter-spacing:0px;word-spacing:0px;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:middle;baseline-shift:baseline;color:#000000;fill:#444444;fill-opacity:1;fill-rule:nonzero;stroke:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu"
-       x="359.65784"
-       y="953.23474"
-       id="text3887-1"
-       sodipodi:linespacing="100%"><tspan
-         sodipodi:role="line"
-         x="359.65784"
-         y="953.23474"
-         id="tspan3891-2">Appmenu Module</tspan></text>
-    <path
-       style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 485.89465,652.84114 c 16.23733,-3.84221 30.5802,-15.04776 38.23686,-29.87304 6.96387,-13.48385 8.38625,-29.21496 7.3396,-44.35478 -1.04664,-15.13982 -4.41236,-30.01318 -6.51184,-45.04321 -2.74315,-19.63804 -3.3102,-39.70499 0.0347,-59.24953 3.34491,-19.54455 10.71754,-38.58634 22.79255,-54.3144 15.0578,-19.61323 37.35193,-33.53801 61.58305,-38.46438"
-       id="path4052"
-       inkscape:path-effect="#path-effect4054"
-       inkscape:original-d="m 485.89465,652.84114 c 69.8028,11.24543 30.70744,15.30352 38.23686,-29.87304 4.70103,-28.20618 0.82776,-60.68417 0.82776,-89.39799 0,-3.09441 20.32766,-111.06434 22.82725,-113.56393 2.41681,-2.4168 58.09902,-38.46438 61.58305,-38.46438"
-       inkscape:connector-curvature="0"
-       transform="translate(0,287.36218)"
-       sodipodi:nodetypes="csssc" />
-    <rect
-       style="color:#000000;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect4056"
-       width="237.68489"
-       height="150.42575"
-       x="239.97879"
-       y="765.35535" />
-    <text
-       xml:space="preserve"
-       style="font-size:18px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:center;text-decoration:none;line-height:100%;letter-spacing:0px;word-spacing:0px;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:middle;baseline-shift:baseline;color:#000000;fill:#444444;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu"
-       x="358.56305"
-       y="846.6972"
-       id="text4093"
-       sodipodi:linespacing="100%"><tspan
-         sodipodi:role="line"
-         id="tspan4095"
-         x="358.56305"
-         y="846.6972">Menus</tspan></text>
-    <path
-       style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 325.97456,760.29042 c -3.42872,-7.04416 -5.0107,-14.97733 -4.54619,-22.79786 0.46451,-7.82052 2.97446,-15.51064 7.21293,-22.0994 4.43899,-6.90047 10.66453,-12.51742 15.05132,-19.45118 4.11736,-6.5079 6.50844,-14.09719 6.86513,-21.78993"
-       id="path4204"
-       inkscape:path-effect="#path-effect4206"
-       inkscape:original-d="m 325.97456,760.29042 c -12.83313,-16.30425 -6.68734,-30.5721 2.66674,-44.89726 4.67704,-7.16258 10.74147,-11.99823 15.05132,-19.45118 4.30985,-7.45294 6.86513,-13.52319 6.86513,-21.78993"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cssc" />
-    <text
-       xml:space="preserve"
-       style="font-size:18px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:100%;letter-spacing:0px;word-spacing:0px;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#444444;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu"
-       x="357.66235"
-       y="720.89227"
-       id="text3118"
-       sodipodi:linespacing="100%"><tspan
-         sodipodi:role="line"
-         id="tspan3120"
-         x="357.66235"
-         y="720.89227">Dbusmenu</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-size:18px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:100%;letter-spacing:0px;word-spacing:0px;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#444444;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu"
-       x="556.55219"
-       y="804.53925"
-       id="text3118-3"
-       sodipodi:linespacing="100%"><tspan
-         sodipodi:role="line"
-         id="tspan3120-3"
-         x="556.55219"
-         y="804.53925">Registration</tspan></text>
-  </g>
-</svg>

=== removed file 'docs/Makefile.am'
--- docs/Makefile.am	2012-12-03 17:40:45 +0000
+++ docs/Makefile.am	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-SUBDIRS = man devel

=== removed directory 'docs/devel'
=== removed file 'docs/devel/Makefile.am'
--- docs/devel/Makefile.am	2012-12-03 17:40:45 +0000
+++ docs/devel/Makefile.am	1970-01-01 00:00:00 +0000
@@ -1,36 +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)
-
-GTKDOC_LIBS = $(top_builddir)/src/libhud-service.a \
-	$(HUD_LIBS) \
-	$(COVERAGE_LDFLAGS)

=== removed file 'docs/devel/hud-docs.xml'
--- docs/devel/hud-docs.xml	2012-12-03 17:40:45 +0000
+++ docs/devel/hud-docs.xml	1970-01-01 00:00:00 +0000
@@ -1,58 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-               "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
-[
-  <!ENTITY % local.common.attrib "xmlns:xi  CDATA  #FIXED 'http://www.w3.org/2003/XInclude'">
-  ]>
-
-<book id="index">
-  <bookinfo>
-    <title>hud-service Hacking Guide</title>
-  </bookinfo>
-
-  <xi:include href="hud-overview.xml"/>
-
-  <chapter>
-    <title>Data Types</title>
-    <xi:include href="xml/hudstringlist.xml"/>
-  </chapter>
-
-  <chapter>
-    <title>Queries, Results, Items</title>
-    <xi:include href="xml/huditem.xml"/>
-    <xi:include href="xml/hudresult.xml"/>
-    <xi:include href="xml/hudquery.xml"/>
-  </chapter>
-
-  <chapter>
-    <title>Sources</title>
-    <xi:include href="xml/hudsource.xml"/>
-    <xi:include href="xml/hudsourcelist.xml"/>
-    <xi:include href="xml/hudwindowsource.xml"/>
-    <xi:include href="xml/hudindicatorsource.xml"/>
-    <xi:include href="xml/hudappindicatorsource.xml"/>
-    <xi:include href="xml/huddbusmenucollector.xml"/>
-    <xi:include href="xml/hudmenumodelcollector.xml"/>
-  </chapter>
-
-  <chapter>
-    <title>Utility API</title>
-    <xi:include href="xml/hudsettings.xml"/>
-    <xi:include href="xml/hudappmenuregistrar.xml"/>
-  </chapter>
-
-  <chapter id="object-tree">
-    <title>Object Hierarchy</title>
-     <xi:include href="xml/tree_index.sgml"/>
-  </chapter>
-  <index id="api-index-full">
-    <title>API Index</title>
-    <xi:include href="xml/api-index-full.xml"><xi:fallback /></xi:include>
-  </index>
-  <index id="deprecated-api-index" role="deprecated">
-    <title>Index of deprecated API</title>
-    <xi:include href="xml/api-index-deprecated.xml"><xi:fallback /></xi:include>
-  </index>
-
-  <xi:include href="xml/annotation-glossary.xml"><xi:fallback /></xi:include>
-</book>

=== removed file 'docs/devel/hud-overview.xml'
--- docs/devel/hud-overview.xml	2012-12-03 17:40:45 +0000
+++ docs/devel/hud-overview.xml	1970-01-01 00:00:00 +0000
@@ -1,91 +0,0 @@
-<?xml version='1.0'?>
-
-
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-  "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd">
-
-<chapter>
-  <title>Overview</title>
-
-  <para>
-    The HUD consists of the interface in the shell and a backend service, <literal>hud-service</literal>. This
-    document attempts to describe the internal architecture of the service.
-  </para>
-
-  <para>
-    The most important type in the service is <link linkend="HudSource"><type>HudSource</type></link>. This is
-    an interface. Each source is an entity against which a search can be performed. There is one interface
-    method: <link linkend="hud-source-search"><function>hud_source_search()</function></link>. This is the main
-    mechanism by which queries are performed in the HUD. The interface also features a signal
-    <link linkend="HudSource-changed"><function>::changed</function></link> that is emitted when the result of
-    searching may have changed.
-  </para>
-
-  <para>
-    Several implementations of <link linkend="HudSource"><type>HudSource</type></link> exist. A particular type
-    of source that gathers possible search results is referred to as a "collector". There are two of these:
-    <link linkend="HudMenuModelCollector"><type>HudMenuModelCollector</type></link> (for
-    <link linkend="GDBusMenuModel"><type>GDBusMenuModel</type></link>) and
-    <link linkend="HudDbusmenuCollector"><type>HudDbusmenuCollector</type></link> for Dbusmenu. These
-    "collector" sources only function when targetted at a particular endpoint (ie: a unique name and object path
-    on D-Bus). This is only useful for searching for items in one particular set of menus.
-  </para>
-
-  <para>
-    <link linkend="HudSourceList"><type>HudWindowSource</type></link> acts as a multiplexer. It is responsible
-    for determining the currently focused window and performing searches submitted to it against the correct
-    collector for that window. Similarly, there are
-    <link linkend="HudSourceList"><type>HudIndicatorSource</type></link> and
-    <link linkend="HudSourceList"><type>HudAppIndicatorSource</type></link> for performing searches against the
-    system and application indicators, respectively.
-  </para>
-
-  <para>
-    Finally, there is <link linkend="HudSourceList"><type>HudSourceList</type></link> which functions as a list
-    of multiple other <link linkend="HudSource"><type>HudSource</type></link>s (such that performing a search
-    against the list gives the combined result of searches performed against each of the contained sources).
-  </para>
-
-  <para>
-    The <literal>hud-service</literal> initialises itself by creating the window, indicator and appindicator
-    sources and putting each of them into a <link linkend="HudSourceList"><type>HudSourceList</type></link>.
-    This is the source against which all queries submitted to the service are executed.
-  </para>
-
-  <para>
-    Collectors are essentially a collection of <link linkend="HudItem"><type>HudItem</type></link>s. Each item
-    corresponds to an action that may appear in the results of a search made with the HUD. Items have a list of
-    strings describing themselves (eg: <literal>['File', 'Open']</literal> or
-    <literal>['Bluetooth', 'Settings...']</literal>) and some information about their origin (eg: the desktop
-    file of the application or indicator that created them). An item can be disabled, in which case it will
-    never appear in the results of a search. Items are activated using
-    <link linkend="hud-item-activate"><function>hud_item_activate()</function></link> which is implemented by
-    the collector in the appropriate way.
-  </para>
-
-  <para>
-    The result of performing a search is a set of <link linkend="HudResult"><type>HudResult</type></link>s.
-    Each result refers to <link linkend="HudItem"><type>HudItem</type></link> along with information about why
-    that item matched, and how closely.
-  </para>
-
-  <para>
-    The toplevel interface to performing a query is <link linkend="HudQuery"><type>HudQuery</type></link>. It
-    takes a search string and a reference to a <link linkend="HudSource"><type>HudSource</type></link> to search
-    (which, as implemented, is always the toplevel 'list' source). It submits the search to the source then
-    sorts the results by relevence. If the source changes, it resubmits the search. The interface of
-    <link linkend="HudQuery"><type>HudQuery</type></link> is an ordered sequence of results.
-    <link linkend="HudQuery"><type>HudQuery</type></link> has its own
-    <link linkend="HudQuery-changed"><function>::changed</function></link> signal.
-  </para>
-
-  <para>
-    <literal>hud-service</literal> is essentially a simple D-Bus interface corresponding to
-    <link linkend="HudQuery"><type>HudQuery</type></link> as used against the toplevel source list. New queries
-    can be created using <function>StartQuery</function>. Queries can be destroyed using
-    <function>CloseQuery</function>. <link linkend="HudItem"><type>HudItem</type></link>s corresponding to
-    results from the query can be activated using <function>ExecuteQuery</function>. Finally, the
-    <link linkend="HudQuery-changed"><function>::changed</function></link> signal is reported as the
-    <function>UpdatedQuery</function> D-Bus signal.
-  </para>
-</chapter>

=== removed file 'docs/devel/hud-sections.txt'
--- docs/devel/hud-sections.txt	2012-12-03 17:40:45 +0000
+++ docs/devel/hud-sections.txt	1970-01-01 00:00:00 +0000
@@ -1,172 +0,0 @@
-<SECTION>
-<FILE>hudsettings</FILE>
-HudSettings
-hud_settings
-hud_settings_init
-</SECTION>
-
-<SECTION>
-<FILE>hudappmenuregistrar</FILE>
-HudAppMenuRegistrar
-HudAppMenuRegistrarObserverFunc
-hud_app_menu_registrar_add_observer
-hud_app_menu_registrar_get
-hud_app_menu_registrar_remove_observer
-<SUBSECTION Standard>
-HUD_APP_MENU_REGISTRAR
-HUD_IS_APP_MENU_REGISTRAR
-HUD_TYPE_APP_MENU_REGISTRAR
-hud_app_menu_registrar_get_type
-</SECTION>
-
-<SECTION>
-<FILE>huddbusmenucollector</FILE>
-HudDbusmenuCollector
-hud_dbusmenu_collector_new_for_endpoint
-hud_dbusmenu_collector_new_for_window
-hud_dbusmenu_collector_set_prefix
-<SUBSECTION Standard>
-HUD_DBUSMENU_COLLECTOR
-HUD_IS_DBUSMENU_COLLECTOR
-HUD_TYPE_DBUSMENU_COLLECTOR
-hud_dbusmenu_collector_get_type
-</SECTION>
-
-<SECTION>
-<FILE>hudindicatorsource</FILE>
-HudIndicatorSource
-hud_indicator_source_new
-<SUBSECTION Standard>
-HUD_INDICATOR_SOURCE
-HUD_IS_INDICATOR_SOURCE
-HUD_TYPE_INDICATOR_SOURCE
-hud_indicator_source_get_type
-</SECTION>
-
-<SECTION>
-<FILE>hudappindicatorsource</FILE>
-HudAppIndicatorSource
-hud_app_indicator_source_new
-<SUBSECTION Standard>
-HUD_APP_INDICATOR_SOURCE
-HUD_IS_APP_INDICATOR_SOURCE
-HUD_TYPE_APP_INDICATOR_SOURCE
-hud_app_indicator_source_get_type
-</SECTION>
-
-<SECTION>
-<FILE>huditem</FILE>
-<TITLE>HudItem</TITLE>
-HudItem
-HudItemClass
-hud_item_activate
-hud_item_construct
-hud_item_get_app_icon
-hud_item_get_enabled
-hud_item_get_item_icon
-hud_item_get_tokens
-hud_item_get_usage
-hud_item_new
-<SUBSECTION Standard>
-HUD_IS_ITEM
-HUD_IS_ITEM_CLASS
-HUD_ITEM
-HUD_ITEM_CLASS
-HUD_ITEM_GET_CLASS
-HUD_TYPE_ITEM
-HudItemPrivate
-hud_item_get_type
-</SECTION>
-
-<SECTION>
-<FILE>hudmenumodelcollector</FILE>
-HudMenuModelCollector
-hud_menu_model_collector_get
-<SUBSECTION Standard>
-HUD_IS_MENU_MODEL_COLLECTOR
-HUD_MENU_MODEL_COLLECTOR
-HUD_TYPE_MENU_MODEL_COLLECTOR
-hud_menu_model_collector_get_type
-</SECTION>
-
-<SECTION>
-<FILE>hudquery</FILE>
-HudQuery
-hud_query_close
-hud_query_get_generation
-hud_query_get_n_results
-hud_query_get_query_key
-hud_query_get_result_by_index
-hud_query_lookup
-hud_query_new
-<SUBSECTION Standard>
-HUD_IS_QUERY
-HUD_QUERY
-HUD_TYPE_QUERY
-hud_query_get_type
-</SECTION>
-
-<SECTION>
-<FILE>hudresult</FILE>
-HudResult
-hud_result_get_distance
-hud_result_get_html_description
-hud_result_get_if_matched
-hud_result_get_item
-hud_result_new
-<SUBSECTION Standard>
-HUD_IS_RESULT
-HUD_RESULT
-HUD_TYPE_RESULT
-hud_result_get_type
-</SECTION>
-
-<SECTION>
-<FILE>hudsource</FILE>
-<TITLE>HudSource</TITLE>
-HudSource
-HudSourceInterface
-hud_source_changed
-hud_source_search
-<SUBSECTION Standard>
-HUD_IS_SOURCE
-HUD_SOURCE
-HUD_SOURCE_GET_IFACE
-HUD_TYPE_SOURCE
-hud_source_get_type
-</SECTION>
-
-<SECTION>
-<FILE>hudsourcelist</FILE>
-HudSourceList
-hud_source_list_add
-hud_source_list_new
-<SUBSECTION Standard>
-HUD_IS_SOURCE_LIST
-HUD_SOURCE_LIST
-HUD_TYPE_SOURCE_LIST
-hud_source_list_get_type
-</SECTION>
-
-<SECTION>
-<FILE>hudstringlist</FILE>
-HudStringList
-hud_string_list_cons
-hud_string_list_cons_label
-hud_string_list_get_head
-hud_string_list_get_tail
-hud_string_list_pretty_print
-hud_string_list_ref
-hud_string_list_unref
-</SECTION>
-
-<SECTION>
-<FILE>hudwindowsource</FILE>
-HudWindowSource
-hud_window_source_new
-<SUBSECTION Standard>
-HUD_IS_WINDOW_SOURCE
-HUD_TYPE_WINDOW_SOURCE
-HUD_WINDOW_SOURCE
-hud_window_source_get_type
-</SECTION>

=== removed file 'docs/devel/hud.types'
--- docs/devel/hud.types	2012-12-03 17:40:45 +0000
+++ docs/devel/hud.types	1970-01-01 00:00:00 +0000
@@ -1,11 +0,0 @@
-hud_app_indicator_source_get_type
-hud_app_menu_registrar_get_type
-hud_dbusmenu_collector_get_type
-hud_indicator_source_get_type
-hud_item_get_type
-hud_menu_model_collector_get_type
-hud_query_get_type
-hud_result_get_type
-hud_source_get_type
-hud_source_list_get_type
-hud_window_source_get_type

=== removed directory 'docs/man'
=== removed file 'docs/man/Makefile.am'
--- docs/man/Makefile.am	2012-12-03 17:40:45 +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)

=== removed file 'docs/man/hud-cli.xml'
--- docs/man/hud-cli.xml	2012-12-03 17:40:45 +0000
+++ docs/man/hud-cli.xml	1970-01-01 00:00:00 +0000
@@ -1,38 +0,0 @@
-<refentry id="hud-cli" lang="en">
-
-<refmeta>
-	<refentrytitle>hud-cli</refentrytitle>
-	<manvolnum>1</manvolnum>
-	<refmiscinfo class="manual">User Commands</refmiscinfo>
-</refmeta>
-
-<refnamediv>
-	<refname>hud-cli</refname>
-	<refpurpose>Tool to exercise the HUD on the command line</refpurpose>
-</refnamediv>
-
-<refsynopsisdiv>
-	<cmdsynopsis>
-		<command>hud-cli</command>
-	</cmdsynopsis>
-	<cmdsynopsis>
-		<command>hud-cli</command>
-		<arg choice="plain"><replaceable>search string</replaceable></arg>
-	</cmdsynopsis>
-</refsynopsisdiv>
-
-<refsect1>
-	<title>AUTHOR</title>
-	<para>
-		Written by Ted Gould <email>[e-mail]</email> and others.
-	</para>
-</refsect1>
-
-<refsect1>
-	<title>BUGS</title>
-	<para>
-		Bugs should be submitted to Launchpad: <ulink url="https://bugs.launchpad.net/indicator-appmenu/+filebug"/>
-	</para>
-</refsect1>
-
-</refentry>

=== removed file 'docs/man/hud-dump-application.xml'
--- docs/man/hud-dump-application.xml	2012-12-03 17:40:45 +0000
+++ docs/man/hud-dump-application.xml	1970-01-01 00:00:00 +0000
@@ -1,45 +0,0 @@
-<refentry id="hud-dump-application" lang="en">
-
-<refmeta>
-	<refentrytitle>hud-dump-application</refentrytitle>
-	<manvolnum>1</manvolnum>
-	<refmiscinfo class="manual">User Commands</refmiscinfo>
-</refmeta>
-
-<refnamediv>
-	<refname>hud-dump-application</refname>
-	<refpurpose>Tool to dump information on an application from the HUD usage database</refpurpose>
-</refnamediv>
-
-<refsynopsisdiv>
-	<cmdsynopsis>
-		<command>hud-dump-application</command>
-		<arg choice="plain"><replaceable>desktop file path</replaceable></arg>
-	</cmdsynopsis>
-</refsynopsisdiv>
-
-<refsect1>
-	<title>AUTHOR</title>
-	<para>
-		Written by Ted Gould <email>[e-mail]</email> and others.
-	</para>
-</refsect1>
-
-<refsect1>
-	<title>BUGS</title>
-	<para>
-		Bugs should be submitted to Launchpad: <ulink url="https://bugs.launchpad.net/indicator-appmenu/+filebug"/>
-	</para>
-</refsect1>
-
-<refsect1>
-	<title>SEE ALSO</title>
-	<para>
-		<citerefentry>
-			<refentrytitle>hud-list-applications</refentrytitle>
-			<manvolnum>1</manvolnum>
-		</citerefentry>
-	</para>
-</refsect1>
-
-</refentry>

=== removed file 'docs/man/hud-list-applications.xml'
--- docs/man/hud-list-applications.xml	2012-12-03 17:40:45 +0000
+++ docs/man/hud-list-applications.xml	1970-01-01 00:00:00 +0000
@@ -1,44 +0,0 @@
-<refentry id="hud-list-applications" lang="en">
-
-<refmeta>
-	<refentrytitle>hud-list-applications</refentrytitle>
-	<manvolnum>1</manvolnum>
-	<refmiscinfo class="manual">User Commands</refmiscinfo>
-</refmeta>
-
-<refnamediv>
-	<refname>hud-list-applications</refname>
-	<refpurpose>Tool to list the applications in the HUD usage database</refpurpose>
-</refnamediv>
-
-<refsynopsisdiv>
-	<cmdsynopsis>
-		<command>hud-list-applications</command>
-	</cmdsynopsis>
-</refsynopsisdiv>
-
-<refsect1>
-	<title>AUTHOR</title>
-	<para>
-		Written by Ted Gould <email>[e-mail]</email> and others.
-	</para>
-</refsect1>
-
-<refsect1>
-	<title>BUGS</title>
-	<para>
-		Bugs should be submitted to Launchpad: <ulink url="https://bugs.launchpad.net/indicator-appmenu/+filebug"/>
-	</para>
-</refsect1>
-
-<refsect1>
-	<title>SEE ALSO</title>
-	<para>
-		<citerefentry>
-			<refentrytitle>hud-dump-application</refentrytitle>
-			<manvolnum>1</manvolnum>
-		</citerefentry>
-	</para>
-</refsect1>
-
-</refentry>

=== removed file 'docs/man/hud-verify-app-info.xml'
--- docs/man/hud-verify-app-info.xml	2012-12-03 17:40:45 +0000
+++ docs/man/hud-verify-app-info.xml	1970-01-01 00:00:00 +0000
@@ -1,35 +0,0 @@
-<refentry id="hud-verify-app-info" lang="en">
-
-<refmeta>
-	<refentrytitle>hud-verify-app-info</refentrytitle>
-	<manvolnum>1</manvolnum>
-	<refmiscinfo class="manual">User Commands</refmiscinfo>
-</refmeta>
-
-<refnamediv>
-	<refname>hud-verify-app-info</refname>
-	<refpurpose>Tool to verify an app-info file that is expected to be used in the HUD</refpurpose>
-</refnamediv>
-
-<refsynopsisdiv>
-	<cmdsynopsis>
-		<command>hud-verify-app-info</command>
-		<arg choice="plain"><replaceable>path to app info file</replaceable></arg>
-	</cmdsynopsis>
-</refsynopsisdiv>
-
-<refsect1>
-	<title>AUTHOR</title>
-	<para>
-		Written by Ted Gould <email>[e-mail]</email> and others.
-	</para>
-</refsect1>
-
-<refsect1>
-	<title>BUGS</title>
-	<para>
-		Bugs should be submitted to Launchpad: <ulink url="https://bugs.launchpad.net/indicator-appmenu/+filebug"/>
-	</para>
-</refsect1>
-
-</refentry>

=== modified file 'po/POTFILES.in'
--- po/POTFILES.in	2012-12-03 17:40:45 +0000
+++ po/POTFILES.in	2013-02-19 17:11:22 +0000
@@ -1,28 +1,6 @@
 data/com.canonical.indicator.appmenu.gschema.xml
-data/com.canonical.indicator.appmenu.hud.gschema.xml
-data/com.canonical.indicator.appmenu.hud.search.gschema.xml
-src/dump-app-info.c
 src/gdk-get-func.c
-src/hudappindicatorsource.c
-src/hudappmenuregistrar.c
-src/hud-cli.c
-src/huddbusmenucollector.c
-src/hud-dump-application.c
-src/hudindicatorsource.c
-src/huditem.c
-src/hudmenumodelcollector.c
-src/hudquery.c
-src/hudresult.c
-src/hud-service.c
-src/hudsource.c
-src/hudsourcelist.c
-src/hudstringlist.c
-src/hudtoken.c
-src/hud-verify-app-info.c
-src/hudwindowsource.c
 src/indicator-appmenu.c
-src/load-app-info.c
-src/usage-tracker.c
 src/window-menu.c
 src/window-menu-dbusmenu.c
 src/window-menu-model.c

=== removed directory 'service'
=== modified file 'src/Makefile.am'
--- src/Makefile.am	2012-12-27 15:50:33 +0000
+++ src/Makefile.am	2013-02-19 17:11:22 +0000
@@ -1,18 +1,7 @@
 CLEANFILES =
 DISTCLEANFILES =
 BUILT_SOURCES =
-EXTRA_DIST = \
-	hud-list-applications
-
-bin_PROGRAMS = \
-	hud-dump-application \
-	hud-verify-app-info
-
-bin_SCRIPTS = \
-	hud-list-applications
-
-libexec_PROGRAMS = \
-	hud-service
+EXTRA_DIST =
 
 include $(top_srcdir)/Makefile.am.marshal
 
@@ -80,173 +69,6 @@
 	gen-application-menu-registrar.xml.c \
 	gen-application-menu-registrar.xml.h
 
-####################
-# HUD Service
-####################
-
-noinst_LIBRARIES = libhud-service.a
-
-libhud_service_a_SOURCES = \
-	create-db.h \
-	create-db.c \
-	dump-app-info.h \
-	dump-app-info.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	\
-	hudwindowsource.h	\
-	hudwindowsource.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		\
-	huditem.h		\
-	huditem.c		\
-	hudresult.h		\
-	hudresult.c		\
-	hud.interface.h \
-	hud.interface.c \
-	load-app-info.h \
-	load-app-info.c \
-	usage-tracker.h \
-	usage-tracker.c
-
-hud_service_SOURCES = hud-service.c
-
-libhud_service_a_CFLAGS = \
-	$(HUD_CFLAGS) \
-	$(COVERAGE_CFLAGS) \
-	-DDATADIR=\""$(datadir)"\" \
-	-Wall -Werror
-hud_service_CFLAGS = \
-	$(HUD_CFLAGS) \
-	$(COVERAGE_CFLAGS) \
-	-DDATADIR=\""$(datadir)"\" \
-	-Wall -Werror
-hud_service_LDADD = \
-	libhud-service.a	\
-	$(HUD_LIBS)
-hud_service_LDFLAGS = \
-	$(COVERAGE_LDFLAGS)
-
-
-create-db.c: create-db.sql
-	echo "#include \"create-db.h\"" > $@
-	echo -n "const gchar * create_db = \"" >> $@
-	cat $< | xargs printf "%s " >> $@
-	echo -n "\";" >> $@
-
-CLEANFILES += \
-	create-db.c
-
-
-####################
-# HUD CLI
-####################
-
-hud_cli_SOURCES = \
-	shared-values.h \
-	hud-cli.c \
-	hud.interface.h \
-	hud.interface.c
-
-hud_cli_CFLAGS = \
-	$(HUD_CFLAGS) \
-	$(HUD_CLIENT_CFLAGS) \
-	$(COVERAGE_CFLAGS) \
-	-Wall -Werror
-
-hud_cli_LDFLAGS = \
-	$(HUD_LIBS) \
-	$(HUD_CLIENT_LIBS) \
-	$(COVERAGE_LDFLAGS) \
-	-lreadline -lcurses
-
-
-if BUILD_CLI
-bin_PROGRAMS += \
-	hud-cli
-else
-EXTRA_DIST += \
-	$(hud_cli_SOURCES)
-endif
-
-#######################
-# 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) \
-	$(COVERAGE_CFLAGS) \
-	-Wall -Werror
-hud_dump_application_LDFLAGS = \
-	$(COVERAGE_LDFLAGS) \
-	$(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) \
-	$(COVERAGE_CFLAGS) \
-	-Wall -Werror
-hud_verify_app_info_LDFLAGS = \
-	$(COVERAGE_LDFLAGS) \
-	$(HUD_LIBS)
-
-####################
-# HUD DBus Interface
-####################
-
-EXTRA_DIST += \
-	hud.xml \
-	create-db.sql
-
-BUILT_SOURCES += \
-	hud.interface.c \
-	hud.interface.h
-
-%.interface.h: %.xml
-	echo "extern const char * $(subst -,_,$(subst .,_,$(basename $(notdir $@))));" > $@
-
-%.interface.c: %.xml
-	echo "const char * $(subst -,_,$(subst .,_,$(basename $(notdir $@)))) = " > $@
-	sed -e "s:\":\\\\\":g" -e s:^:\": -e s:\$$:\\\\n\": $< >> $@
-	echo ";" >> $@
-
 CLEANFILES += $(BUILT_SOURCES)
 
 EXTRA_DIST += $(DBUS_SPECS) clean-namespaces.xslt

=== removed file 'src/create-db.h'
--- src/create-db.h	2012-12-03 17:40:45 +0000
+++ src/create-db.h	1970-01-01 00:00:00 +0000
@@ -1,4 +0,0 @@
-
-#include <glib.h>
-
-extern const gchar * create_db;

=== removed file 'src/create-db.sql'
--- src/create-db.sql	2012-12-03 17:40:45 +0000
+++ src/create-db.sql	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-create table if not exists usage (application text, entry text, timestamp datetime);
-create index if not exists application_index on usage (application);

=== removed file 'src/dump-app-info.c'
--- src/dump-app-info.c	2012-12-03 17:40:45 +0000
+++ src/dump-app-info.c	1970-01-01 00:00:00 +0000
@@ -1,174 +0,0 @@
-/*
-Prints out application info for debugging and CLI tools
-
-Copyright 2011 Canonical Ltd.
-
-Authors:
-    Ted Gould <[e-mail]>
-
-This program is free software: you can redistribute it and/or modify it 
-under the terms of the GNU General Public License version 3, as published 
-by the Free Software Foundation.
-
-This program is distributed in the hope that it will be useful, but 
-WITHOUT ANY WARRANTY; without even the implied warranties of 
-MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR 
-PURPOSE.  See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along 
-with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "dump-app-info.h"
-#include "shared-values.h"
-
-typedef enum _tree_type_t tree_type_t;
-enum _tree_type_t {
-	MENU_TYPE,
-	ITEM_TYPE
-};
-
-typedef struct _menu_t menu_t;
-struct _menu_t {
-	tree_type_t tree_type;
-	gchar * name;
-	int count;
-	GList * subitems;
-};
-
-GList *
-place_on_tree (GList * tree_in, gchar ** entries)
-{
-	menu_t * menu;
-
-	if (entries[0] == NULL) {
-		return tree_in;
-	}
-
-	GList * entry = tree_in;
-	while (entry != NULL) {
-		menu = (menu_t *)entry->data;
-
-		if (g_strcmp0(menu->name, entries[0]) == 0) {
-			break;
-		}
-
-		entry = g_list_next(entry);
-	}
-
-	if (entry != NULL) {
-		if (menu->tree_type == ITEM_TYPE) {
-			if (entries[1] != NULL) {
-				g_warning("Error parsing on entry '%s'", entries[0]);
-			} else {
-				menu->count++;
-			}
-		} else {
-			menu->subitems = place_on_tree(menu->subitems, &entries[1]);
-		}
-
-		return tree_in;
-	}
-
-	menu = g_new0(menu_t, 1);
-	menu->name = g_strdup(entries[0]);
-
-	if (entries[1] == NULL) {
-		/* This is an item */
-		menu->tree_type = ITEM_TYPE;
-		menu->count = 1;
-		menu->subitems = NULL;
-	} else {
-		/* This is a menu */
-		menu->tree_type = MENU_TYPE;
-		menu->subitems = place_on_tree(NULL, &entries[1]);
-	}
-
-	return g_list_append(tree_in, menu);
-}
-
-static int
-entry_cb (void * user_data, int columns, char ** values, char ** names)
-{
-	GList ** tree = (GList **)user_data;
-
-	gchar ** entries = g_strsplit(values[0], DB_SEPARATOR, -1);
-
-	*tree = place_on_tree(*tree, entries);
-
-	g_strfreev(entries);
-
-	return SQLITE_OK;
-}
-
-void
-print_tree (GList * tree, guint tab_depth)
-{
-	if (tree == NULL) {
-		return;
-	}
-
-	int i;
-	for (i = 0; i < tab_depth; i++) {
-		g_print("\t");
-	}
-
-	menu_t * menu = (menu_t *)tree->data;
-
-	if (menu->tree_type == ITEM_TYPE) {
-		g_print("<item name=\"%s\" count=\"%d\" />\n", menu->name, menu->count);
-	} else {
-		g_print("<menu name=\"%s\">\n", menu->name);
-
-		GList * subs = menu->subitems;
-		while (subs != NULL) {
-			print_tree(subs, tab_depth + 1);
-			subs = g_list_next(subs);
-		}
-
-		for (i = 0; i < tab_depth; i++) {
-			g_print("\t");
-		}
-		g_print("</menu>\n");
-	}
-
-	return;
-}
-
-void
-dump_app_info (const gchar * app, const gchar * domain, sqlite3 * db)
-{
-	g_return_if_fail(app != NULL);
-	g_return_if_fail(db != NULL);
-
-	g_print("<hudappinfo>\n");
-
-	g_print("\t<desktopfile path=\"%s\" />\n", app);
-
-	if (domain != NULL) {
-		g_print("\t<gettext-domain>%s</gettext-domain>\n", domain);
-	}
-
-	gchar * statement = g_strdup_printf("select entry from usage where application = '%s';", app);
-
-	int exec_status = SQLITE_OK;
-	gchar * failstring = NULL;
-	GList * tree = NULL;
-	exec_status = sqlite3_exec(db,
-	                           statement,
-	                           entry_cb, &tree, &failstring);
-	if (exec_status != SQLITE_OK) {
-		g_warning("Unable to get entries: %s", failstring);
-	}
-
-	g_free(statement);
-
-	if (tree != NULL) {
-		g_print("\t<menus>\n");
-		print_tree(tree, 2);
-		g_print("\t</menus>\n");
-	}
-
-	g_print("</hudappinfo>\n");
-	return;
-}

=== removed file 'src/dump-app-info.h'
--- src/dump-app-info.h	2012-12-03 17:40:45 +0000
+++ src/dump-app-info.h	1970-01-01 00:00:00 +0000
@@ -1,30 +0,0 @@
-/*
-Prints out application info for debugging and CLI tools
-
-Copyright 2011 Canonical Ltd.
-
-Authors:
-    Ted Gould <[e-mail]>
-
-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 __DUMP_APP_INFO_H__
-#define __DUMP_APP_INFO_H__
-
-#include <glib.h>
-#include <sqlite3.h>
-
-void dump_app_info (const gchar * app, const gchar * domain, sqlite3 * db);
-
-#endif /* __DUMP_APP_INFO_H__ */

=== removed file 'src/hud-cli.c'
--- src/hud-cli.c	2013-01-22 20:39:37 +0000
+++ src/hud-cli.c	1970-01-01 00:00:00 +0000
@@ -1,237 +0,0 @@
-/*
-Small utility to excersise the HUD from the command line
-
-Copyright 2011 Canonical Ltd.
-
-Authors:
-    Ted Gould <[e-mail]>
-
-This program is free software: you can redistribute it and/or modify it 
-under the terms of the GNU General Public License version 3, as published 
-by the Free Software Foundation.
-
-This program is distributed in the hope that it will be useful, but 
-WITHOUT ANY WARRANTY; without even the implied warranties of 
-MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR 
-PURPOSE.  See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along 
-with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include <glib.h>
-#include <gio/gunixinputstream.h>
-#include <gtk/gtk.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <readline/readline.h>
-#include <readline/history.h>
-#include <stdlib.h>
-#include <curses.h>
-
-#include "shared-values.h"
-#include "hud.interface.h"
-
-
-static void print_suggestions(const char * query);
-static GDBusProxy * proxy = NULL;
-static GVariant * last_key = NULL;
-static void update(char *string);
-void sighandler(int);
-
-WINDOW *twindow = NULL;
-int use_curses = 0;
-
-int
-main (int argc, char *argv[])
-{
-	int single_char;
-	int pos = 0;
-	
-	char *line = (char*) malloc(256 * sizeof(char));
-
-	signal(SIGINT, sighandler);
-
-	GDBusConnection * session = g_bus_get_sync(G_BUS_TYPE_SESSION, NULL, NULL);
-	g_return_val_if_fail(session != NULL, 1);
-
-	GDBusNodeInfo * nodeinfo = g_dbus_node_info_new_for_xml(hud_interface, NULL);
-	g_return_val_if_fail(nodeinfo != NULL, 1);
-
-	GDBusInterfaceInfo * ifaceinfo = g_dbus_node_info_lookup_interface(nodeinfo, DBUS_IFACE);
-	g_return_val_if_fail(ifaceinfo != NULL, 1);
-
-	proxy = g_dbus_proxy_new_sync(session,
-	                              G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES,
-	                              ifaceinfo,
-	                              DBUS_NAME,
-	                              DBUS_PATH,
-	                              DBUS_IFACE,
-	                              NULL, NULL);
-	g_return_val_if_fail(proxy != NULL, 1);
-
-
-	// reading from pipe
-	if (!isatty (STDIN_FILENO) ) {
-		size_t a;
-		int r;
-		r = getline (&line, &a, stdin);
-	
-		if ( r == -1 ){
-			perror("Error reading from pipe");
-			exit(EXIT_FAILURE);	
-		}
-
-		// get rid of newline
-		if( line[r-1] == '\n' )
-			line[r-1] = '\0';	
-	
-		printf("\nsearch token: %s\n", line);
-		print_suggestions( line );
-	}
-	// read command line parameter - hud-cli "search string"
-	else if( argc > 1 ){
-		printf("\nsearch token: %s\n", argv[1]);
-		print_suggestions( argv[1] );
-	}
-	// interactive mode
-     	else{
-		use_curses = 1;
-		
-		twindow = initscr(); 		
-		cbreak();
-		keypad(stdscr, TRUE);	
-		noecho();
-		
-		/* initialize the query screen */
-		update( "" );
-
-		/* interactive shell interface */
-		while( 1 ){
-		
-			single_char = getch();		
-			/* need to go left in the buffer */
-			if ( single_char == KEY_BACKSPACE ){
-				/* don't go too far left */
-				if( pos > 0 ){
-					pos--;
-					line[pos] = '\0';
-					update( line );
-				}
-				else
-					; /* we are at the beginning of the buffer already */
-			}
-			/* ENTER will trigger the action for the first selected suggestion */
-			else if ( single_char == '\n' ){
-
-				/* FIXME: execute action on RETURN */
-				break;
-			}
-			/* add character to the buffer and terminate string */
-			else if ( single_char != KEY_RESIZE ) {
-				if ( pos < 256 -1 ){ // -1 for \0
-					line[pos] = single_char;
-					line[pos+1] = '\0';
-					pos++;
-					update( line );
-				}
-				else {
-					
-				}
-			}
-			else{
-				// nothing to do
-			}
-		}
-		endwin();
-	}
-	
-	free(line);
-
-	g_dbus_node_info_unref(nodeinfo);
-	g_object_unref(session);
-
-	return 0;
-}
-
-static void 
-update( char *string ){
-	
-	werase(twindow);
-	mvwprintw(twindow, 7, 10, "Search: %s", string);
-
-	print_suggestions( string );
-	
-	// move cursor back to input line
-	wmove( twindow, 7, 10 + 8 + strlen(string) );
-
-	refresh();
-}
-
-
-static void 
-print_suggestions (const char *query)
-{
-	GError * error = NULL;
-	GVariantBuilder querybuilder;
-	g_variant_builder_init(&querybuilder, G_VARIANT_TYPE_TUPLE);
-	g_variant_builder_add_value(&querybuilder, g_variant_new_string(query));
-	g_variant_builder_add_value(&querybuilder, g_variant_new_int32(5));
-
-	GVariant * suggests = g_dbus_proxy_call_sync(proxy,
-	                                             "StartQuery",
-	                                             g_variant_builder_end(&querybuilder),
-	                                             G_DBUS_CALL_FLAGS_NONE,
-	                                             -1,
-	                                             NULL,
-	                                             &error);
-
-	if (error != NULL) {
-		g_warning("Unable to get suggestions: %s", error->message);
-		g_error_free(error);
-		return ;
-	}
-
-	GVariant * target = g_variant_get_child_value(suggests, 0);
-	g_variant_unref(target);
-
-	GVariant * suggestions = g_variant_get_child_value(suggests, 1);
-	GVariantIter iter;
-	g_variant_iter_init(&iter, suggestions);
-	gchar * suggestion = NULL;
-	gchar * appicon = NULL;
-	gchar * icon = NULL;
-	gchar * complete = NULL;
-	gchar * accel = NULL;
-	GVariant * key = NULL;
-
-	last_key = NULL;
-
-	int i=0;
-	char *clean_line;
-
-	while (g_variant_iter_loop(&iter, "(sssssv)", &suggestion, &appicon, &icon, &complete, &accel, &key)) {
-		if( use_curses)
-			mvwprintw(twindow, 9 + i, 15, "%s", suggestion);
-		else{
-			pango_parse_markup(suggestion, -1, 0, NULL, &clean_line, NULL, NULL);
-			printf("\t%s\n", clean_line);
-			free(clean_line);
-		}
-		i++;
-
-	}
-
-	g_variant_unref(suggestions);
-
-	/* NOTE: Ignoring the Query Key as we're not handling the signal now
-	   and just letting it timeout. */
-
-	return;
-}
-
-void sighandler(int signal){
-	endwin();
-	g_object_unref(proxy);
-	exit(EXIT_SUCCESS);
-}

=== removed file 'src/hud-dump-application.c'
--- src/hud-dump-application.c	2012-12-03 17:40:45 +0000
+++ src/hud-dump-application.c	1970-01-01 00:00:00 +0000
@@ -1,73 +0,0 @@
-/*
-Small utility to dump application info in the HUD usage DB
-
-Copyright 2011 Canonical Ltd.
-
-Authors:
-    Ted Gould <[e-mail]>
-
-This program is free software: you can redistribute it and/or modify it 
-under the terms of the GNU General Public License version 3, as published 
-by the Free Software Foundation.
-
-This program is distributed in the hope that it will be useful, but 
-WITHOUT ANY WARRANTY; without even the implied warranties of 
-MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR 
-PURPOSE.  See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along 
-with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include <glib.h>
-#include "dump-app-info.h"
-
-int
-main (int argv, char * argc[])
-{
-	if (argv != 2 && argv != 3) {
-		g_printerr("Usage: %s <desktop file path> [gettext domain]\n", argc[0]);
-		return 1;
-	}
-
-	const gchar * basecachedir = g_getenv("HUD_CACHE_DIR");
-	if (basecachedir == NULL) {
-		basecachedir = g_get_user_cache_dir();
-	}
-
-	gchar * cachedir = g_build_filename(basecachedir, "indicator-appmenu", NULL);
-	if (!g_file_test(cachedir, G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR)) {
-		g_warning("Cache directory '%s' doesn't exist", cachedir);
-		return 1;
-	}
-	g_free(cachedir);
-
-	gchar * cachefile = g_build_filename(basecachedir, "indicator-appmenu", "hud-usage-log.sqlite", NULL);
-	gboolean db_exists = g_file_test(cachefile, G_FILE_TEST_EXISTS);
-
-	if (!db_exists) {
-		g_warning("There is no HUD usage log: %s", cachefile);
-		return 1;
-	}
-
-	sqlite3 * db;
-	int open_status = sqlite3_open(cachefile, &db); 
-
-	if (open_status != SQLITE_OK) {
-		g_warning("Error opening usage DB: %s", cachefile);
-		sqlite3_close(db);
-		return 1;
-	}
-
-	gchar * domain = NULL;
-	if (argv == 3) {
-		domain = argc[2];
-	}
-
-	dump_app_info(argc[1], domain, db);
-
-	sqlite3_close(db);
-	g_free(cachefile);
-
-	return 0;
-}

=== removed file 'src/hud-list-applications'
--- src/hud-list-applications	2012-12-03 17:40:45 +0000
+++ src/hud-list-applications	1970-01-01 00:00:00 +0000
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-if [ -n $HUD_CACHE_DIR ]; then
-	HUD_CACHE_DIR=~/.cache
-fi;
-
-FINAL_DIR="$HUD_CACHE_DIR/indicator-appmenu"
-
-if test -e $FINAL_DIR/hud-usage-log.sqlite; then
-	sqlite3 $FINAL_DIR/hud-usage-log.sqlite "select distinct application from usage"
-fi

=== removed file 'src/hud-service.c'
--- src/hud-service.c	2013-01-22 20:39:37 +0000
+++ src/hud-service.c	1970-01-01 00:00:00 +0000
@@ -1,335 +0,0 @@
-/*
- * Copyright © 2012 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/>.
- *
- * Author: Ryan Lortie <[e-mail]>
- */
-
-#define G_LOG_DOMAIN "hud-service"
-
-#include "config.h"
-
-#include <glib.h>
-#include <gio/gio.h>
-#include <stdlib.h>
-#include <locale.h>
-#include <libintl.h>
-
-#include "hudappindicatorsource.h"
-#include "hudindicatorsource.h"
-#include "hudwebappsource.h"
-#include "hudwindowsource.h"
-#include "huddebugsource.h"
-#include "hudsourcelist.h"
-#include "hudsettings.h"
-
-#include "hud.interface.h"
-#include "shared-values.h"
-#include "hudquery.h"
-
-/* The return value of 'StartQuery' and the signal parameters for
- * 'UpdatedQuery' are the same, so use a utility function for both.
- */
-GVariant *
-describe_query (HudQuery *query)
-{
-  GVariantBuilder builder;
-  gint n, i;
-
-  n = hud_query_get_n_results (query);
-
-  g_variant_builder_init (&builder, G_VARIANT_TYPE ("(sa(sssssv)v)"));
-
-  /* Target */
-  g_variant_builder_add (&builder, "s", "");
-
-  /* List of results */
-  g_variant_builder_open (&builder, G_VARIANT_TYPE ("a(sssssv)"));
-  for (i = 0; i < n; i++)
-    {
-      HudResult *result = hud_query_get_result_by_index (query, i);
-      HudItem *item;
-
-      item = hud_result_get_item (result);
-
-      g_variant_builder_add (&builder, "(sssssv)",
-                             hud_result_get_html_description (result),
-                             hud_item_get_app_icon (item),
-                             hud_item_get_item_icon (item),
-                             "" /* complete text */ , "" /* accel */,
-                             g_variant_new_uint64 (hud_item_get_id (item)));
-    }
-  g_variant_builder_close (&builder);
-
-  /* Query key */
-  g_variant_builder_add (&builder, "v", hud_query_get_query_key (query));
-
-  return g_variant_builder_end (&builder);
-}
-
-static void
-query_changed (HudQuery *query,
-               gpointer  user_data)
-{
-  GDBusConnection *connection = user_data;
-
-  g_debug ("emit UpdatedQuery signal");
-
-  g_dbus_connection_emit_signal (connection, NULL, DBUS_PATH,
-                                 DBUS_IFACE, "UpdatedQuery",
-                                 describe_query (query), NULL);
-}
-
-static GVariant *
-unpack_platform_data (GVariant *parameters)
-{
-  GVariant *platform_data;
-  gchar *startup_id;
-  guint32 timestamp;
-
-  g_variant_get_child (parameters, 1, "u", &timestamp);
-  startup_id = g_strdup_printf ("_TIME%u", timestamp);
-  platform_data = g_variant_new_parsed ("{'desktop-startup-id': < %s >}", startup_id);
-  g_free (startup_id);
-
-  return g_variant_ref_sink (platform_data);
-}
-
-static gboolean
-drop_query_timeout (gpointer user_data)
-{
-  g_object_unref (user_data);
-
-  return G_SOURCE_REMOVE;
-}
-
-static void
-bus_method (GDBusConnection       *connection,
-            const gchar           *sender,
-            const gchar           *object_path,
-            const gchar           *interface_name,
-            const gchar           *method_name,
-            GVariant              *parameters,
-            GDBusMethodInvocation *invocation,
-            gpointer               user_data)
-{
-  HudSource *source = user_data;
-
-  if (g_str_equal (method_name, "StartQuery"))
-    {
-      const gchar *search_string;
-      gint num_results;
-      HudQuery *query;
-
-      g_variant_get (parameters, "(&si)", &search_string, &num_results);
-      g_debug ("'StartQuery' from %s: '%s', %d", sender, search_string, num_results);
-      query = hud_query_new (source, search_string, num_results);
-      g_signal_connect_object (query, "changed", G_CALLBACK (query_changed), connection, 0);
-      g_dbus_method_invocation_return_value (invocation, describe_query (query));
-      g_object_unref (query);
-    }
-
-  else if (g_str_equal (method_name, "ExecuteQuery"))
-    {
-      GVariant *platform_data;
-      GVariant *item_key;
-      guint64 key_value;
-      HudItem *item;
-
-      g_variant_get_child (parameters, 0, "v", &item_key);
-
-      if (!g_variant_is_of_type (item_key, G_VARIANT_TYPE_UINT64))
-        {
-          g_debug ("'ExecuteQuery' from %s: incorrect item key (not uint64)", sender);
-          g_dbus_method_invocation_return_error (invocation, G_DBUS_ERROR, G_DBUS_ERROR_INVALID_ARGS,
-                                                 "item key has invalid format");
-          g_variant_unref (item_key);
-          return;
-        }
-
-      key_value = g_variant_get_uint64 (item_key);
-      g_variant_unref (item_key);
-
-      item = hud_item_lookup (key_value);
-      g_debug ("'ExecuteQuery' from %s, item #%"G_GUINT64_FORMAT": %p", sender, key_value, item);
-
-      if (item == NULL)
-        {
-          g_dbus_method_invocation_return_error (invocation, G_DBUS_ERROR, G_DBUS_ERROR_INVALID_ARGS,
-                                                 "item specified by item key does not exist");
-          return;
-        }
-
-      platform_data = unpack_platform_data (parameters);
-      hud_item_activate (item, platform_data);
-      g_variant_unref (platform_data);
-
-      g_dbus_method_invocation_return_value (invocation, NULL);
-    }
-
-  else if (g_str_equal (method_name, "CloseQuery"))
-    {
-      GVariant *query_key;
-      HudQuery *query;
-
-      g_debug ("Got 'CloseQuery' from %s", sender);
-
-      g_variant_get (parameters, "(v)", &query_key);
-      query = hud_query_lookup (query_key);
-      g_variant_unref (query_key);
-
-      if (query != NULL)
-        {
-          g_signal_handlers_disconnect_by_func (query, query_changed, connection);
-          /* Unity does 'CloseQuery' immediately followed by
-           * 'StartQuery' on every keystroke.  Delay the destruction of
-           * the query for a moment just in case a 'StartQuery' is on the
-           * way.
-           *
-           * That way we can avoid allowing the use count to drop to
-           * zero only to be increased again back to 1.  This prevents a
-           * bunch of dbusmenu "closed"/"opened" calls being sent.
-           */
-          g_timeout_add (1000, drop_query_timeout, g_object_ref (query));
-          hud_query_close (query);
-        }
-
-      /* always success -- they may have just been closing a timed out query */
-      g_dbus_method_invocation_return_value (invocation, NULL);
-    }
-}
-
-static GMainLoop *mainloop = NULL;
-
-static GDBusInterfaceInfo *
-get_iface_info (void)
-{
-  GDBusInterfaceInfo *iface_info;
-  GDBusNodeInfo *node_info;
-  GError *error = NULL;
-
-  node_info = g_dbus_node_info_new_for_xml (hud_interface, &error);
-  g_assert_no_error (error);
-
-  iface_info = g_dbus_node_info_lookup_interface (node_info, DBUS_IFACE);
-  g_assert (iface_info != NULL);
-
-  g_dbus_interface_info_ref (iface_info);
-  g_dbus_node_info_unref (node_info);
-
-  return iface_info;
-}
-
-static void
-bus_acquired_cb (GDBusConnection *connection,
-                 const gchar     *name,
-                 gpointer         user_data)
-{
-  HudSource *source = user_data;
-  GDBusInterfaceVTable vtable = {
-    bus_method
-  };
-  GError *error = NULL;
-
-  g_debug ("Bus acquired (guid %s)", g_dbus_connection_get_guid (connection));
-
-  if (!g_dbus_connection_register_object (connection, DBUS_PATH, get_iface_info (), &vtable, source, NULL, &error))
-    {
-      g_warning ("Unable to register path '"DBUS_PATH"': %s", error->message);
-      g_main_loop_quit (mainloop);
-      g_error_free (error);
-    }
-}
-
-static void
-name_acquired_cb (GDBusConnection *connection,
-                  const gchar     *name,
-                  gpointer         user_data)
-{
-  g_debug ("Acquired bus name '%s'", name);
-}
-
-static void
-name_lost_cb (GDBusConnection *connection,
-              const gchar     *name,
-              gpointer         user_data)
-{
-  g_warning ("Unable to get name '%s'", name);
-  g_main_loop_quit (mainloop);
-}
-
-int
-main (int argc, char **argv)
-{
-  HudWindowSource *window_source;
-  HudSourceList *source_list;
-
-  setlocale (LC_ALL, "");
-  bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
-  textdomain (GETTEXT_PACKAGE);
-
-  hud_settings_init ();
-
-  source_list = hud_source_list_new ();
-
-  /* we will eventually pull GtkMenu out of this, so keep it around */
-  window_source = hud_window_source_new ();
-  hud_source_list_add (source_list, HUD_SOURCE (window_source));
-
-  {
-    HudIndicatorSource *source;
-
-    source = hud_indicator_source_new ();
-    hud_source_list_add (source_list, HUD_SOURCE (source));
-    g_object_unref (source);
-  }
-
-  {
-    HudAppIndicatorSource *source;
-
-    source = hud_app_indicator_source_new ();
-    hud_source_list_add (source_list, HUD_SOURCE (source));
-    g_object_unref (source);
-  }
-  
-  {
-    HudWebappSource *source;
-    
-    source = hud_webapp_source_new (window_source);
-    hud_source_list_add (source_list, HUD_SOURCE (source));
-    
-    g_object_unref (G_OBJECT (source));
-  }
-
-  if (getenv ("HUD_DEBUG_SOURCE"))
-    {
-      HudDebugSource *source;
-
-      source = hud_debug_source_new ();
-      hud_source_list_add (source_list, HUD_SOURCE (source));
-      g_object_unref (source);
-    }
-
-  g_bus_own_name (G_BUS_TYPE_SESSION, DBUS_NAME, G_BUS_NAME_OWNER_FLAGS_NONE,
-                  bus_acquired_cb, name_acquired_cb, name_lost_cb, source_list, NULL);
-
-  mainloop = g_main_loop_new (NULL, FALSE);
-  g_main_loop_run (mainloop);
-  g_main_loop_unref (mainloop);
-
-  g_object_unref (window_source);
-  g_object_unref (source_list);
-
-  return 0;
-}

=== removed file 'src/hud-verify-app-info.c'
--- src/hud-verify-app-info.c	2013-01-22 20:39:37 +0000
+++ src/hud-verify-app-info.c	1970-01-01 00:00:00 +0000
@@ -1,100 +0,0 @@
-/*
-Verify the validity of the App Info file to make sure it parses
-
-Copyright 2011 Canonical Ltd.
-
-Authors:
-    Ted Gould <[e-mail]>
-
-This program is free software: you can redistribute it and/or modify it 
-under the terms of the GNU General Public License version 3, as published 
-by the Free Software Foundation.
-
-This program is distributed in the hope that it will be useful, but 
-WITHOUT ANY WARRANTY; without even the implied warranties of 
-MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR 
-PURPOSE.  See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along 
-with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include <unistd.h>
-#include <glib-object.h>
-#include <glib/gstdio.h>
-#include "load-app-info.h"
-#include "create-db.h"
-
-static void
-build_db (sqlite3 * db)
-{
-	/* Create the table */
-	int exec_status = SQLITE_OK;
-	gchar * failstring = NULL;
-	exec_status = sqlite3_exec(db,
-	                           create_db,
-	                           NULL, NULL, &failstring);
-	if (exec_status != SQLITE_OK) {
-		g_warning("Unable to create table: %s", failstring);
-	}
-
-	/* Import data from the system */
-
-	return;
-}
-
-int
-main (int argv, char * argc[])
-{
-	gboolean passed = TRUE;
-
-	if (argv != 2) {
-		g_printerr("Usage: %s <app-info file path>\n", argc[0]);
-		return 1;
-	}
-
-	gchar * filename = NULL;
-	gint tmpfile = g_file_open_tmp("hud-verify-app-info-temp-db-XXXXXX", &filename, NULL);
-
-	if (tmpfile < 0) {
-		passed = FALSE;
-	} else {
-
-		close(tmpfile);
-		/* NOTE: there is a small security bug here in that we're closing the
-		   file and reopening it, so the temp isn't really guaranteed to be
-		   safe.  But, I don't think we're really worried about security in this
-		   utility. */
-
-		sqlite3 * db = NULL;
-		int open_status = sqlite3_open(filename, &db); 
-
-		if (open_status != SQLITE_OK) {
-			g_warning("Error opening usage DB: %s", filename);
-			passed = FALSE;
-		} else {
-
-			/* Create the table in the DB */
-			build_db(db);
-
-			passed = load_app_info(argc[1], db);
-
-			sqlite3_close(db);
-		}
-	}
-
-	if (filename != NULL) {
-		if (g_getenv("HUD_VERIFY_NO_UNLINK") == NULL) {
-			g_unlink(filename);
-		} else {
-			g_print("Temp db '%s' not deleted\n", filename);
-		}
-		g_free(filename);
-	}
-
-	if (passed) {
-		return 0;
-	} else {
-		return 1;
-	}
-}

=== removed file 'src/hud.xml'
--- src/hud.xml	2012-12-03 17:40:45 +0000
+++ src/hud.xml	1970-01-01 00:00:00 +0000
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<node name="/">
-	<interface name="com.canonical.hud">
-<!-- Properties -->
-		<!-- None -->
-
-<!-- Functions -->
-		<method name="StartQuery">
-			<!-- in -->
-			<arg type="s" name="query" direction="in" />
-			<arg type="i" name="entries" direction="in" />
-			<!-- out -->
-			<arg type="s" name="target" direction="out" />
-			<arg type="a(sssssv)" name="suggestions" direction="out" />
-			<arg type="v" name="querykey" direction="out" />
-		</method>
-
-		<method name="ExecuteQuery">
-			<arg type="v" name="key" direction="in" />
-			<arg type="u" name="timestamp" direction="in" />
-		</method>
-
-		<method name="CloseQuery">
-			<arg type="v" name="querykey" direction="in" />
-		</method>
-
-<!-- Signals -->
-		<signal name="UpdatedQuery">
-			<arg type="s" name="target" direction="out" />
-			<arg type="a(sssssv)" name="suggestions" direction="out" />
-			<arg type="v" name="querykey" direction="out" />
-		</signal>
-
-<!-- End of interesting stuff -->
-
-	</interface>
-</node>

=== removed file 'src/hudappindicatorsource.c'
--- src/hudappindicatorsource.c	2012-12-03 17:40:45 +0000
+++ src/hudappindicatorsource.c	1970-01-01 00:00:00 +0000
@@ -1,432 +0,0 @@
-/*
- * Copyright © 2012 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/>.
- *
- * Authors: Ryan Lortie <[e-mail]>
- *          Ted Gould <[e-mail]>
- */
-
-#define G_LOG_DOMAIN "hudappindicatorsource"
-
-#include "hudappindicatorsource.h"
-
-#include <glib/gi18n.h>
-#include <gio/gio.h>
-
-#include "hudsettings.h"
-#include "huddbusmenucollector.h"
-#include "hudsource.h"
-
-/**
- * SECTION:hudappindicatorsource
- * @title: HudAppIndicatorSource
- * @short_description: a #HudSource to search through the application
- *   indicators
- *
- * #HudAppIndicatorSource searches through the menus of application
- * indicators.
- **/
-
-/**
- * HudAppIndicatorSource:
- *
- * This is an opaque structure type.
- **/
-
-#define APP_INDICATOR_SERVICE_BUS_NAME    "com.canonical.indicator.application"
-#define APP_INDICATOR_SERVICE_OBJECT_PATH "/com/canonical/indicator/application/service"
-#define APP_INDICATOR_SERVICE_IFACE       "com.canonical.indicator.application.service"
-
-struct _HudAppIndicatorSource
-{
-  GObject parent_instance;
-
-  GSequence    *indicators;
-  guint         subscription;
-  GCancellable *cancellable;
-  gint          use_count;
-  gboolean      ready;
-};
-
-typedef GObjectClass HudAppIndicatorSourceClass;
-
-static void hud_app_indicator_source_iface_init (HudSourceInterface *iface);
-G_DEFINE_TYPE_WITH_CODE (HudAppIndicatorSource, hud_app_indicator_source, G_TYPE_OBJECT,
-                         G_IMPLEMENT_INTERFACE (HUD_TYPE_SOURCE, hud_app_indicator_source_iface_init))
-
-static void
-hud_app_indicator_source_collector_changed (HudSource *collector,
-                                            gpointer   user_data)
-{
-  HudAppIndicatorSource *source = user_data;
-
-  hud_source_changed (HUD_SOURCE (source));
-}
-
-static void
-hud_app_indicator_source_add_indicator (HudAppIndicatorSource *source,
-                                        GVariant              *description)
-{
-  HudDbusmenuCollector *collector;
-  const gchar *dbus_name;
-  const gchar *dbus_path;
-  GSequenceIter *iter;
-  const gchar *id;
-  const gchar *icon_name;
-  gint32 position;
-  gchar *title;
-
-  g_variant_get_child (description, 0, "&s", &icon_name);
-  g_variant_get_child (description, 1, "i", &position);
-  g_variant_get_child (description, 2, "&s", &dbus_name);
-  g_variant_get_child (description, 3, "&o", &dbus_path);
-  g_variant_get_child (description, 8, "&s", &id);
-  g_variant_get_child (description, 9, "s", &title);
-
-  if (title[0] == '\0')
-    {
-      g_free (title);
-      /* TRANSLATORS:  This is used for Application indicators that
-         are not providing a title string.  The '%s' represents the
-         unique ID that the app indicator provides, but it is usually
-         the package name and not generally human readable.  An example
-         for Network Manager would be 'nm-applet'. */
-      title = g_strdup_printf(_("Untitled Indicator (%s)"), id);
-    }
-  g_debug ("adding appindicator %s at %d ('%s', %s, %s, %s)", id, position, title, icon_name, dbus_name, dbus_path);
-
-  collector = hud_dbusmenu_collector_new_for_endpoint (id, title, icon_name,
-                                                       hud_settings.indicator_penalty,
-                                                       dbus_name, dbus_path);
-  g_signal_connect (collector, "changed", G_CALLBACK (hud_app_indicator_source_collector_changed), source);
-
-  /* If query is active, mark new app indicator as used. */
-  if (source->use_count)
-    hud_source_use (HUD_SOURCE (collector));
-
-  iter = g_sequence_get_iter_at_pos (source->indicators, position);
-  g_sequence_insert_before (iter, collector);
-  g_free (title);
-}
-
-static void
-hud_app_indicator_source_remove_indicator (HudAppIndicatorSource *source,
-                                           GVariant              *description)
-{
-  GSequenceIter *iter;
-  gint32 position;
-
-  g_variant_get_child (description, 0, "i", &position);
-
-  g_debug ("removing appindicator at %d", position);
-
-  iter = g_sequence_get_iter_at_pos (source->indicators, position);
-  if (!g_sequence_iter_is_end (iter))
-    {
-      HudDbusmenuCollector *collector;
-
-      collector = g_sequence_get (iter);
-      g_signal_handlers_disconnect_by_func (collector, hud_app_indicator_source_collector_changed, source);
-      /* Drop use count if we added one... */
-      if (source->use_count)
-        hud_source_unuse (HUD_SOURCE (collector));
-      g_sequence_remove (iter);
-    }
-}
-
-static void
-hud_app_indicator_source_dbus_signal (GDBusConnection *connection,
-                                      const gchar     *sender_name,
-                                      const gchar     *object_path,
-                                      const gchar     *interface_name,
-                                      const gchar     *signal_name,
-                                      GVariant        *parameters,
-                                      gpointer         user_data)
-{
-  HudAppIndicatorSource *source = user_data;
-
-  g_debug ("got signal");
-
-  if (!source->ready)
-    {
-      g_debug ("not ready, so ignoring signal");
-      return;
-    }
-
-  if (g_str_equal (signal_name, "ApplicationAdded"))
-    {
-      if (!g_variant_is_of_type (parameters, G_VARIANT_TYPE ("(sisossssss)")))
-        return;
-
-      hud_app_indicator_source_add_indicator (source, parameters);
-      hud_source_changed (HUD_SOURCE (source));
-    }
-
-  else if (g_str_equal (signal_name, "ApplicationRemoved"))
-    {
-      if (!g_variant_is_of_type (parameters, G_VARIANT_TYPE ("(i)")))
-        return;
-
-      hud_app_indicator_source_remove_indicator (source, parameters);
-      hud_source_changed (HUD_SOURCE (source));
-    }
-
-  else if (g_str_equal (signal_name, "ApplicationTitleChanged"))
-    {
-      GSequenceIter *iter;
-      const gchar *title;
-      gint32 position;
-
-      if (!g_variant_is_of_type (parameters, G_VARIANT_TYPE ("(is)")))
-        return;
-
-      g_variant_get (parameters, "(i&s)", &position, &title);
-
-      g_debug ("changing title of appindicator at %d to '%s'", position, title);
-
-      iter = g_sequence_get_iter_at_pos (source->indicators, position);
-      if (!g_sequence_iter_is_end (iter))
-        {
-          HudDbusmenuCollector *collector;
-
-          collector = g_sequence_get (iter);
-          hud_dbusmenu_collector_set_prefix (collector, title);
-        }
-    }
-
-  else if (g_str_equal (signal_name, "ApplicationIconChanged"))
-    {
-      GSequenceIter *iter;
-      const gchar *icon;
-      gint32 position;
-
-      if (!g_variant_is_of_type (parameters, G_VARIANT_TYPE ("(iss)")))
-        return;
-
-      g_variant_get (parameters, "(i&ss)", &position, &icon, NULL);
-
-      g_debug ("changing icon of appindicator at %d to '%s'", position, icon);
-
-      iter = g_sequence_get_iter_at_pos (source->indicators, position);
-      if (!g_sequence_iter_is_end (iter))
-        {
-          HudDbusmenuCollector *collector;
-
-          collector = g_sequence_get (iter);
-          hud_dbusmenu_collector_set_icon (collector, icon);
-        }
-    }
-}
-
-static void
-hud_app_indicator_source_ready (GObject      *connection,
-                                GAsyncResult *result,
-                                gpointer      user_data)
-{
-  HudAppIndicatorSource *source = user_data;
-  GError *error = NULL;
-  GVariant *reply;
-
-  g_debug ("GetApplications returned");
-
-  g_clear_object (&source->cancellable);
-
-  reply = g_dbus_connection_call_finish (G_DBUS_CONNECTION (connection), result, &error);
-
-  if (reply)
-    {
-      GVariant *description;
-      GVariantIter *iter;
-
-      g_assert (!source->ready);
-      source->ready = TRUE;
-
-      g_debug ("going ready");
-
-      g_variant_get (reply, "(a(sisossssss))", &iter);
-      while ((description = g_variant_iter_next_value (iter)))
-        {
-          hud_app_indicator_source_add_indicator (source, description);
-          g_variant_unref (description);
-        }
-      g_variant_iter_free (iter);
-      g_variant_unref (reply);
-
-      hud_source_changed (HUD_SOURCE (source));
-    }
-  else
-    {
-      g_warning ("GetApplications returned an error: %s", error->message);
-      g_error_free (error);
-    }
-
-  g_object_unref (source);
-
-  g_debug ("done handling GetApplications reply");
-}
-
-static void
-hud_app_indicator_source_name_appeared (GDBusConnection *connection,
-                                        const gchar     *name,
-                                        const gchar     *name_owner,
-                                        gpointer         user_data)
-{
-  HudAppIndicatorSource *source = user_data;
-
-  g_debug ("name appeared (owner is %s)", name_owner);
-
-  g_assert (source->subscription == 0);
-  source->subscription = g_dbus_connection_signal_subscribe (connection, name_owner,
-                                                             APP_INDICATOR_SERVICE_IFACE, NULL,
-                                                             APP_INDICATOR_SERVICE_OBJECT_PATH, NULL,
-                                                             G_DBUS_SIGNAL_FLAGS_NONE,
-                                                             hud_app_indicator_source_dbus_signal,
-                                                             source, NULL);
-
-  g_assert (source->cancellable == NULL);
-  source->cancellable = g_cancellable_new ();
-  g_dbus_connection_call (connection, name_owner, APP_INDICATOR_SERVICE_OBJECT_PATH, APP_INDICATOR_SERVICE_IFACE,
-                          "GetApplications", NULL, G_VARIANT_TYPE ("(a(sisossssss))"),
-                          G_DBUS_CALL_FLAGS_NONE, -1, source->cancellable,
-                          hud_app_indicator_source_ready, g_object_ref (source));
-}
-
-static void
-hud_app_indicator_source_name_vanished (GDBusConnection *connection,
-                                        const gchar     *name,
-                                        gpointer         user_data)
-{
-  HudAppIndicatorSource *source = user_data;
-
-  g_debug ("name vanished");
-
-  if (source->subscription > 0)
-    {
-      g_dbus_connection_signal_unsubscribe (connection, source->subscription);
-      source->subscription = 0;
-    }
-
-  if (source->cancellable)
-    {
-      g_cancellable_cancel (source->cancellable);
-      g_clear_object (&source->cancellable);
-    }
-
-  if (source->ready)
-    {
-      GSequenceIter *iter;
-
-      source->ready = FALSE;
-
-      iter = g_sequence_get_begin_iter (source->indicators);
-      while (!g_sequence_iter_is_end (iter))
-        {
-          HudDbusmenuCollector *collector;
-          GSequenceIter *next;
-
-          collector = g_sequence_get (iter);
-          g_signal_handlers_disconnect_by_func (collector, hud_app_indicator_source_collector_changed, source);
-          next = g_sequence_iter_next (iter);
-          g_sequence_remove (iter);
-          iter = next;
-        }
-
-      hud_source_changed (HUD_SOURCE (source));
-    }
-}
-
-static void
-hud_app_indicator_source_use (HudSource *hud_source)
-{
-  HudAppIndicatorSource *source = HUD_APP_INDICATOR_SOURCE (hud_source);
-
-  if (source->use_count == 0)
-    g_sequence_foreach (source->indicators, (GFunc) hud_source_use, NULL);
-
-  source->use_count++;
-}
-
-static void
-hud_app_indicator_source_unuse (HudSource *hud_source)
-{
-  HudAppIndicatorSource *source = HUD_APP_INDICATOR_SOURCE (hud_source);
-
-  g_return_if_fail (source->use_count > 0);
-
-  source->use_count--;
-
-  if (source->use_count == 0)
-    g_sequence_foreach (source->indicators, (GFunc) hud_source_unuse, NULL);
-}
-
-static void
-hud_app_indicator_source_search (HudSource    *hud_source,
-                                 GPtrArray    *results_array,
-                                 HudTokenList *search_tokens)
-{
-  HudAppIndicatorSource *source = HUD_APP_INDICATOR_SOURCE (hud_source);
-  GSequenceIter *iter;
-
-  iter = g_sequence_get_begin_iter (source->indicators);
-
-  while (!g_sequence_iter_is_end (iter))
-    {
-      hud_source_search (g_sequence_get (iter), results_array, search_tokens);
-      iter = g_sequence_iter_next (iter);
-    }
-}
-
-static void
-hud_app_indicator_source_finalize (GObject *object)
-{
-  g_assert_not_reached ();
-}
-
-static void
-hud_app_indicator_source_init (HudAppIndicatorSource *source)
-{
-  g_debug ("online");
-
-  source->indicators = g_sequence_new (g_object_unref);
-  g_bus_watch_name (G_BUS_TYPE_SESSION, APP_INDICATOR_SERVICE_BUS_NAME, G_BUS_NAME_WATCHER_FLAGS_NONE,
-                    hud_app_indicator_source_name_appeared, hud_app_indicator_source_name_vanished,
-                    g_object_ref (source), g_object_unref);
-}
-
-static void
-hud_app_indicator_source_iface_init (HudSourceInterface *iface)
-{
-  iface->use = hud_app_indicator_source_use;
-  iface->unuse = hud_app_indicator_source_unuse;
-  iface->search = hud_app_indicator_source_search;
-}
-
-static void
-hud_app_indicator_source_class_init (HudAppIndicatorSourceClass *class)
-{
-  class->finalize = hud_app_indicator_source_finalize;
-}
-
-/**
- * hud_app_indicator_source_new:
- *
- * Creates a #HudAppIndicatorSource.
- *
- * Returns: a new #HudAppIndicatorSource
- **/
-HudAppIndicatorSource *
-hud_app_indicator_source_new (void)
-{
-  return g_object_new (HUD_TYPE_APP_INDICATOR_SOURCE, NULL);
-}

=== removed file 'src/hudappindicatorsource.h'
--- src/hudappindicatorsource.h	2012-12-03 17:40:45 +0000
+++ src/hudappindicatorsource.h	1970-01-01 00:00:00 +0000
@@ -1,36 +0,0 @@
-/*
- * Copyright © 2012 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/>.
- *
- * Author: Ryan Lortie <[e-mail]>
- */
-
-#ifndef __HUD_APP_INDICATOR_SOURCE_H__
-#define __HUD_APP_INDICATOR_SOURCE_H__
-
-#include <glib-object.h>
-
-#define HUD_TYPE_APP_INDICATOR_SOURCE                       (hud_app_indicator_source_get_type ())
-#define HUD_APP_INDICATOR_SOURCE(inst)                      (G_TYPE_CHECK_INSTANCE_CAST ((inst),                     \
-                                                             HUD_TYPE_APP_INDICATOR_SOURCE, HudAppIndicatorSource))
-#define HUD_IS_APP_INDICATOR_SOURCE(inst)                   (G_TYPE_CHECK_INSTANCE_TYPE ((inst),                     \
-                                                             HUD_TYPE_APP_INDICATOR_SOURCE))
-
-typedef struct _HudAppIndicatorSource                       HudAppIndicatorSource;
-
-GType                   hud_app_indicator_source_get_type                   (void);
-
-HudAppIndicatorSource * hud_app_indicator_source_new                        (void);
-
-#endif /* __HUD_APP_INDICATOR_SOURCE_H__ */

=== removed file 'src/hudappmenuregistrar.c'
--- src/hudappmenuregistrar.c	2012-12-03 17:40:45 +0000
+++ src/hudappmenuregistrar.c	1970-01-01 00:00:00 +0000
@@ -1,507 +0,0 @@
-/*
- * Copyright © 2012 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/>.
- *
- * Author: Ryan Lortie <[e-mail]>
- */
-
-#define G_LOG_DOMAIN "hudappmenuregistrar"
-
-#include "hudappmenuregistrar.h"
-
-#include <gio/gio.h>
-
-/**
- * SECTION:hudappmenuregistrar
- * @title: HudAppMenuRegistrar
- * @short_description: client for the com.canonical.AppMenu.Registrar
- *   D-Bus service
- *
- * The #HudAppMenuRegistrar is a singleton object that monitors the
- * com.canonical.AppMenu.Registrar D-Bus service.
- *
- * On instantiation, a D-Bus name watch is setup for the registrar.
- * When the registrar is found to exist, a local copy is made of the
- * windows and menus that the registrar knows about.  Change
- * notifications are also monitored to keep the local cache in sync.
- *
- * After that point, all queries for information from the registrar are
- * satisfied from the local cache, without blocking.
- *
- * Information is acquired from #HudAppMenuRegistrar by using
- * hud_app_menu_registrar_add_observer().  This immediately calls a
- * callback with the initial information and makes future calls to the
- * same callback if the information is found to have changed.
- *
- * If the registrar is offline or the information is not yet available
- * at the time of the original query, the window will initially be
- * reported as having no menu but a change notification will arrive when
- * the proper information becomes available.
- **/
-
-/**
- * HudAppMenuRegistrar:
- *
- * This is an opaque structure type.
- **/
-
-#define APPMENU_REGISTRAR_BUS_NAME    "com.canonical.AppMenu.Registrar"
-#define APPMENU_REGISTRAR_OBJECT_PATH "/com/canonical/AppMenu/Registrar"
-#define APPMENU_REGISTRAR_IFACE       "com.canonical.AppMenu.Registrar"
-
-typedef struct
-{
-  HudAppMenuRegistrarObserverFunc callback;
-  gpointer                        user_data;
-} HudAppMenuRegistrarObserver;
-
-typedef struct
-{
-  guint xid;
-  gchar *bus_name;
-  gchar *object_path;
-  GSList *observers;
-} HudAppMenuRegistrarWindow;
-
-struct _HudAppMenuRegistrar
-{
-  GObject parent_instance;
-
-  guint subscription;
-  GCancellable *cancellable;
-  GHashTable *windows;
-  gboolean notifying;
-  gboolean ready;
-};
-
-typedef GObjectClass HudAppMenuRegistrarClass;
-
-G_DEFINE_TYPE (HudAppMenuRegistrar, hud_app_menu_registrar, G_TYPE_OBJECT)
-
-static void
-hud_app_menu_registrar_window_free (gpointer user_data)
-{
-  HudAppMenuRegistrarWindow *window = user_data;
-
-  g_assert (window->bus_name == NULL);
-  g_assert (window->object_path == NULL);
-  g_assert (window->observers == NULL);
-
-  g_debug ("free window instance for %u", window->xid);
-
-  g_slice_free (HudAppMenuRegistrarWindow, window);
-}
-
-static HudAppMenuRegistrarWindow *
-hud_app_menu_registrar_get_window (HudAppMenuRegistrar *registrar,
-                                   guint                xid)
-{
-  HudAppMenuRegistrarWindow *window;
-
-  window = g_hash_table_lookup (registrar->windows, GINT_TO_POINTER (xid));
-
-  if (!window)
-    {
-      window = g_slice_new0 (HudAppMenuRegistrarWindow);
-      window->xid = xid;
-
-      g_debug ("create window instance for %u", xid);
-      g_hash_table_insert (registrar->windows, GINT_TO_POINTER (xid), window);
-    }
-
-  return window;
-}
-
-static void
-hud_app_menu_registrar_possibly_free_window (HudAppMenuRegistrar       *registrar,
-                                             HudAppMenuRegistrarWindow *window)
-{
-  if (window->bus_name == NULL && window->observers == NULL)
-    g_hash_table_remove (registrar->windows, GINT_TO_POINTER (window->xid));
-}
-
-static void
-hud_app_menu_registrar_notify_window_observers (HudAppMenuRegistrar       *registrar,
-                                                HudAppMenuRegistrarWindow *window)
-{
-  GSList *node;
-
-  registrar->notifying = TRUE;
-
-  for (node = window->observers; node; node = node->next)
-    {
-      HudAppMenuRegistrarObserver *observer = node->data;
-
-      g_debug ("notifying %p about %u", observer->user_data, window->xid);
-      (* observer->callback) (registrar, window->xid, window->bus_name, window->object_path, observer->user_data);
-    }
-
-  registrar->notifying = FALSE;
-}
-
-static void
-hud_app_menu_registrar_dbus_signal (GDBusConnection *connection,
-                                    const gchar     *sender_name,
-                                    const gchar     *object_path,
-                                    const gchar     *interface_name,
-                                    const gchar     *signal_name,
-                                    GVariant        *parameters,
-                                    gpointer         user_data)
-{
-  HudAppMenuRegistrar *registrar = user_data;
-
-  g_debug ("got signal");
-
-  if (!registrar->ready)
-    {
-      g_debug ("not ready, so ignoring signal");
-      return;
-    }
-
-  if (g_str_equal (signal_name, "WindowRegistered"))
-    {
-      HudAppMenuRegistrarWindow *window;
-      guint xid;
-
-      if (!g_variant_is_of_type (parameters, G_VARIANT_TYPE ("(uso)")))
-          return;
-
-      g_variant_get_child (parameters, 0, "u", &xid);
-      window = hud_app_menu_registrar_get_window (registrar, xid);
-
-      g_free (window->bus_name);
-      g_variant_get_child (parameters, 1, "s", &window->bus_name);
-      g_free (window->object_path);
-      g_variant_get_child (parameters, 2, "o", &window->object_path);
-
-      g_debug ("xid %u is now at (%s, %s)", xid, window->bus_name, window->object_path);
-
-      hud_app_menu_registrar_notify_window_observers (registrar, window);
-    }
-
-  else if (g_str_equal (signal_name, "WindowUnregistered"))
-    {
-      HudAppMenuRegistrarWindow *window;
-      guint xid;
-
-      if (!g_variant_is_of_type (parameters, G_VARIANT_TYPE ("(u)")))
-        return;
-
-      g_variant_get (parameters, 0, "u", &xid);
-
-      g_debug ("xid %u disappeared", xid);
-
-      window = hud_app_menu_registrar_get_window (registrar, xid);
-
-      g_free (window->bus_name);
-      window->bus_name = NULL;
-      g_free (window->object_path);
-      window->object_path = NULL;
-
-      hud_app_menu_registrar_notify_window_observers (registrar, window);
-
-      hud_app_menu_registrar_possibly_free_window (registrar, window);
-    }
-}
-
-static void
-hud_app_menu_registrar_ready (GObject      *source,
-                              GAsyncResult *result,
-                              gpointer      user_data)
-{
-  HudAppMenuRegistrar *registrar = user_data;
-  GError *error = NULL;
-  GVariant *reply;
-
-  g_debug ("GetMenus returned");
-
-  g_clear_object (&registrar->cancellable);
-
-  reply = g_dbus_connection_call_finish (G_DBUS_CONNECTION (source), result, &error);
-
-  if (reply)
-    {
-      GVariantIter *iter;
-      const gchar *bus_name;
-      const gchar *object_path;
-      guint xid;
-
-      g_assert (!registrar->ready);
-      registrar->ready = TRUE;
-
-      g_debug ("going ready");
-
-      g_variant_get (reply, "(a(uso))", &iter);
-
-      while (g_variant_iter_next (iter, "(u&s&o)", &xid, &bus_name, &object_path))
-        {
-          HudAppMenuRegistrarWindow *window;
-
-          window = hud_app_menu_registrar_get_window (registrar, xid);
-
-          /* we were not ready until now, so we expect this to be unset */
-          g_assert (window->bus_name == NULL);
-
-          window->bus_name = g_strdup (bus_name);
-          window->object_path = g_strdup (object_path);
-
-          hud_app_menu_registrar_notify_window_observers (registrar, window);
-        }
-
-      g_variant_iter_free (iter);
-      g_variant_unref (reply);
-    }
-  else
-    {
-      g_warning ("GetMenus returned an error: %s", error->message);
-      g_error_free (error);
-    }
-
-  g_object_unref (registrar);
-
-  g_debug ("done handling GetMenus reply");
-}
-
-static void
-hud_app_menu_registrar_name_appeared (GDBusConnection *connection,
-                                      const gchar     *name,
-                                      const gchar     *name_owner,
-                                      gpointer         user_data)
-{
-  HudAppMenuRegistrar *registrar = user_data;
-
-  g_debug ("name appeared (owner is %s)", name_owner);
-
-  g_assert (registrar->subscription == 0);
-  registrar->subscription = g_dbus_connection_signal_subscribe (connection, name_owner,
-                                                                APPMENU_REGISTRAR_IFACE, NULL,
-                                                                APPMENU_REGISTRAR_OBJECT_PATH, NULL,
-                                                                G_DBUS_SIGNAL_FLAGS_NONE,
-                                                                hud_app_menu_registrar_dbus_signal,
-                                                                registrar, NULL);
-
-  g_assert (registrar->cancellable == NULL);
-  registrar->cancellable = g_cancellable_new ();
-  g_dbus_connection_call (connection, name_owner, APPMENU_REGISTRAR_OBJECT_PATH,
-                          APPMENU_REGISTRAR_IFACE, "GetMenus", NULL, G_VARIANT_TYPE ("(a(uso))"),
-                          G_DBUS_CALL_FLAGS_NONE, -1, registrar->cancellable,
-                          hud_app_menu_registrar_ready, g_object_ref (registrar));
-}
-
-static void
-hud_app_menu_registrar_name_vanished (GDBusConnection *connection,
-                                      const gchar     *name,
-                                      gpointer         user_data)
-{
-  HudAppMenuRegistrar *registrar = user_data;
-
-  g_debug ("name vanished");
-
-  if (registrar->subscription > 0)
-    {
-      g_dbus_connection_signal_unsubscribe (connection, registrar->subscription);
-      registrar->subscription = 0;
-    }
-
-  if (registrar->cancellable)
-    {
-      g_cancellable_cancel (registrar->cancellable);
-      g_clear_object (&registrar->cancellable);
-    }
-
-  if (registrar->ready)
-    {
-      GHashTableIter iter;
-      gpointer value;
-
-      registrar->ready = FALSE;
-
-      g_hash_table_iter_init (&iter, registrar->windows);
-      while (g_hash_table_iter_next (&iter, NULL, &value))
-        {
-          HudAppMenuRegistrarWindow *window = value;
-
-          g_free (window->bus_name);
-          window->bus_name = NULL;
-          g_free (window->object_path);
-          window->object_path = NULL;
-
-          hud_app_menu_registrar_notify_window_observers (registrar, window);
-
-          /* Cannot go the normal route here because we are iterating... */
-          if (window->observers == NULL)
-            g_hash_table_iter_remove (&iter);
-        }
-    }
-}
-
-static void
-hud_app_menu_registrar_finalize (GObject *object)
-{
-  /* This is an immortal singleton.  If we're here, we have trouble. */
-  g_assert_not_reached ();
-}
-
-static void
-hud_app_menu_registrar_init (HudAppMenuRegistrar *registrar)
-{
-  g_debug ("online");
-
-  registrar->windows = g_hash_table_new_full (NULL, NULL, NULL, hud_app_menu_registrar_window_free);
-  g_bus_watch_name (G_BUS_TYPE_SESSION, APPMENU_REGISTRAR_BUS_NAME, G_BUS_NAME_WATCHER_FLAGS_NONE,
-                    hud_app_menu_registrar_name_appeared, hud_app_menu_registrar_name_vanished,
-                    g_object_ref (registrar), g_object_unref);
-}
-
-static void
-hud_app_menu_registrar_class_init (HudAppMenuRegistrarClass *class)
-{
-  class->finalize = hud_app_menu_registrar_finalize;
-}
-
-/**
- * HudAppMenuRegistrarObserverFunc:
- * @registrar: the #HudAppMenuRegistrar
- * @xid: the xid that we are notifying about
- * @bus_name: the bus name for the dbusmenu, or %NULL
- * @object_path: the object path for the dbusmenu, or %NULL
- * @user_data: the data pointer
- *
- * Notifies about the initial values for or changes to the bus name and
- * object path at which to find the dbusmenu for @xid.
- *
- * You should pass the values of @bus_name and @object_path to
- * dbusmenu_client_new() to get started.
- *
- * If no menu is available then @bus_name and @object_path will both be
- * given as %NULL.
- **/
-
-/**
- * hud_app_menu_registrar_add_observer:
- * @registrar: the #HudAppMenuRegistrar
- * @xid: the xid to begin observing
- * @callback: a #HudAppMenuRegistrarObserverFunc
- * @user_data: user data for @callback
- *
- * Begins observing @xid.
- *
- * @callback will be called exactly once before the function returns
- * with a set of initial values (the bus name and object path at which
- * to find the menu for the window).
- *
- * If the location of the menu for @xid changes (including being created
- * or destroyed) then @callback will be called each time an update is
- * required.
- *
- * It is possible that the values are not initially known because they
- * have not yet been retreived from the registrar or because the
- * registrar is not running.  In this case, %NULL values will be
- * provided initially and @callback will be invoked again when the
- * real values are known.
- *
- * Call hud_app_menu_registrar_remove_observer() to when you are no
- * longer interested in @xid.
- **/
-void
-hud_app_menu_registrar_add_observer (HudAppMenuRegistrar             *registrar,
-                                     guint                            xid,
-                                     HudAppMenuRegistrarObserverFunc  callback,
-                                     gpointer                         user_data)
-{
-  HudAppMenuRegistrarObserver *observer;
-  HudAppMenuRegistrarWindow *window;
-
-  g_return_if_fail (xid != 0);
-  g_return_if_fail (callback != NULL);
-  g_return_if_fail (!registrar->notifying);
-
-  g_debug ("observer added for xid %u (%p)", xid, user_data);
-
-  observer = g_slice_new (HudAppMenuRegistrarObserver);
-  observer->callback = callback;
-  observer->user_data = user_data;
-
-  window = hud_app_menu_registrar_get_window (registrar, xid);
-  window->observers = g_slist_prepend (window->observers, observer);
-
-  /* send the first update */
-  (* callback) (registrar, xid, window->bus_name, window->object_path, user_data);
-}
-
-/**
- * hud_app_menu_registrar_remove_observer:
- * @registrar: the #HudAppMenuRegistrar
- * @xid: the xid to begin observing
- * @callback: a #HudAppMenuRegistrarObserverFunc
- * @user_data: user data for @callback
- *
- * Reverses the effect of a previous call to
- * hud_app_menu_registrar_add_observer().
- *
- * @callback and @user_data must be exactly equal to the values passed
- * to that function.
- *
- * One call does not remove all instances of @callback and @user_data.
- * You need to call this function the same number of times that you
- * called hud_app_menu_registrar_add_observer().
- **/
-void
-hud_app_menu_registrar_remove_observer (HudAppMenuRegistrar             *registrar,
-                                        guint                            xid,
-                                        HudAppMenuRegistrarObserverFunc  callback,
-                                        gpointer                         user_data)
-{
-  HudAppMenuRegistrarWindow *window;
-  GSList **node;
-
-  g_return_if_fail (xid != 0);
-  g_return_if_fail (callback != NULL);
-  g_return_if_fail (!registrar->notifying);
-
-  g_debug ("observer removed for xid %u (%p)", xid, user_data);
-
-  window = hud_app_menu_registrar_get_window (registrar, xid);
-  for (node = &window->observers; *node; node = &(*node)->next)
-    {
-      HudAppMenuRegistrarObserver *observer = (*node)->data;
-
-      if (observer->callback == callback && observer->user_data == user_data)
-        {
-          g_slice_free (HudAppMenuRegistrarObserver, observer);
-          *node = g_slist_delete_link (*node, *node);
-          break;
-        }
-    }
-
-  hud_app_menu_registrar_possibly_free_window (registrar, window);
-}
-
-/**
- * hud_app_menu_registrar_get:
- *
- * Gets the singleton instance of #HudAppMenuRegistrar.
- *
- * Returns: (transfer none): the instance
- **/
-HudAppMenuRegistrar *
-hud_app_menu_registrar_get (void)
-{
-  static HudAppMenuRegistrar *singleton;
-
-  if (!singleton)
-    singleton = g_object_new (HUD_TYPE_APP_MENU_REGISTRAR, NULL);
-
-  return singleton;
-}

=== removed file 'src/hudappmenuregistrar.h'
--- src/hudappmenuregistrar.h	2012-12-03 17:40:45 +0000
+++ src/hudappmenuregistrar.h	1970-01-01 00:00:00 +0000
@@ -1,53 +0,0 @@
-/*
- * Copyright © 2012 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/>.
- *
- * Author: Ryan Lortie <[e-mail]>
- */
-
-#ifndef __HUD_APP_MENU_REGISTRAR_H__
-#define __HUD_APP_MENU_REGISTRAR_H__
-
-#include <glib-object.h>
-
-#define HUD_TYPE_APP_MENU_REGISTRAR                         (hud_app_menu_registrar_get_type ())
-#define HUD_APP_MENU_REGISTRAR(inst)                        (G_TYPE_CHECK_INSTANCE_CAST ((inst),                     \
-                                                             HUD_TYPE_APP_MENU_REGISTRAR,                            \
-                                                             HudAppMenuRegistrar))
-#define HUD_IS_APP_MENU_REGISTRAR(inst)                     (G_TYPE_CHECK_INSTANCE_TYPE ((inst),                     \
-                                                             HUD_TYPE_APP_MENU_REGISTRAR))
-
-typedef struct _HudAppMenuRegistrar                         HudAppMenuRegistrar;
-
-GType                   hud_app_menu_registrar_get_type                 (void);
-
-HudAppMenuRegistrar *   hud_app_menu_registrar_get                      (void);
-
-typedef void         (* HudAppMenuRegistrarObserverFunc)                (HudAppMenuRegistrar             *registrar,
-                                                                         guint                            xid,
-                                                                         const gchar                     *bus_name,
-                                                                         const gchar                     *object_path,
-                                                                         gpointer                         user_data);
-
-void                    hud_app_menu_registrar_add_observer             (HudAppMenuRegistrar             *registrar,
-                                                                         guint                            xid,
-                                                                         HudAppMenuRegistrarObserverFunc  callback,
-                                                                         gpointer                         user_data);
-
-void                    hud_app_menu_registrar_remove_observer          (HudAppMenuRegistrar             *registrar,
-                                                                         guint                            xid,
-                                                                         HudAppMenuRegistrarObserverFunc  callback,
-                                                                         gpointer                         user_data);
-
-#endif /* __HUD_APP_MENU_REGISTRAR_H__ */

=== removed file 'src/huddbusmenucollector.c'
--- src/huddbusmenucollector.c	2012-12-03 17:40:45 +0000
+++ src/huddbusmenucollector.c	1970-01-01 00:00:00 +0000
@@ -1,679 +0,0 @@
-/*
- * Copyright © 2012 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/>.
- *
- * Authors: Ryan Lortie <[e-mail]>
- *          Ted Gould <[e-mail]>
- */
-
-#define G_LOG_DOMAIN "huddbusmenucollector"
-
-#include "huddbusmenucollector.h"
-
-#include <libdbusmenu-glib/client.h>
-#include <string.h>
-
-#include "hudappmenuregistrar.h"
-#include "hudresult.h"
-#include "hudsource.h"
-
-/**
- * SECTION:huddbusmenucollector
- * @title: HudDbusmenuCollector
- * @short_description: a #HudSource that collects #HudItems from
- *   Dbusmenu
- *
- * The #HudDbusmenuCollector collects menu items from a #DbusmenuClient.
- *
- * There are two modes of operation.
- *
- * In the simple mode, the collector is created with a specified
- * endpoint using hud_dbusmenu_collector_new_for_endpoint().  A
- * #DbusmenuClient is constructed using this endpoint and the collector
- * constructs #HudItems for the contents of the menu found there.  This
- * mode is intended for use with indicators.
- *
- * For menus associated with application windows (ie: menubars), we must
- * consult the AppMenu registrar in order to discover the endpoint to
- * use.  This second mode of the collector is used by calling
- * hud_dbusmenu_collector_new_for_window().
- **/
-
-/**
- * HudDbusmenuCollector:
- *
- * This is an opaque structure type.
- **/
-
-typedef struct
-{
-  HudItem parent_instance;
-
-  DbusmenuMenuitem *menuitem;
-  gboolean is_opened;
-} HudDbusmenuItem;
-
-typedef HudItemClass HudDbusmenuItemClass;
-
-G_DEFINE_TYPE (HudDbusmenuItem, hud_dbusmenu_item, HUD_TYPE_ITEM)
-
-static void
-hud_dbusmenu_item_activate (HudItem  *hud_item,
-                            GVariant *platform_data)
-{
-  HudDbusmenuItem *item = (HudDbusmenuItem *) hud_item;
-  const gchar *startup_id;
-  guint32 timestamp = 0;
-
-  if (g_variant_lookup (platform_data, "desktop-startup-id", "&s", &startup_id))
-    {
-      const gchar *time_tag;
-
-      if ((time_tag = strstr (startup_id, "_TIME")))
-        {
-          gint64 result;
-
-          result = g_ascii_strtoll (time_tag + 5, NULL, 10);
-
-          if (0 <= result && result <= G_MAXINT32)
-           timestamp = result;
-        }
-    }
-
-  dbusmenu_menuitem_handle_event(item->menuitem, DBUSMENU_MENUITEM_EVENT_ACTIVATED, NULL, timestamp);
-}
-
-static void
-hud_dbusmenu_item_finalize (GObject *object)
-{
-  HudDbusmenuItem *item = (HudDbusmenuItem *) object;
-
-  g_object_unref (item->menuitem);
-
-  G_OBJECT_CLASS (hud_dbusmenu_item_parent_class)
-    ->finalize (object);
-}
-
-static void
-hud_dbusmenu_item_init (HudDbusmenuItem *item)
-{
-}
-
-static void
-hud_dbusmenu_item_class_init (HudDbusmenuItemClass *class)
-{
-  GObjectClass *gobject_class = G_OBJECT_CLASS (class);
-
-  gobject_class->finalize = hud_dbusmenu_item_finalize;
-  class->activate = hud_dbusmenu_item_activate;
-}
-
-static const gchar *
-hud_dbusmenu_item_get_label_property (const gchar *type)
-{
-  static const gchar * const property_table[][2] =
-  {
-    { DBUSMENU_CLIENT_TYPES_DEFAULT,                 DBUSMENU_MENUITEM_PROP_LABEL                         },
-    /* Indicator Messages */
-    { "application-item",                            DBUSMENU_MENUITEM_PROP_LABEL                         },
-    { "indicator-item",                              "indicator-label"                                    },
-    /* Indicator Datetime */
-    { "appointment-item",                            "appointment-label"                                  },
-    { "timezone-item",                               "timezone-name"                                      },
-    /* Indicator Sound */
-    { "x-canonical-sound-menu-player-metadata-type", "x-canonical-sound-menu-player-metadata-player-name" },
-    { "x-canonical-sound-menu-mute-type",            DBUSMENU_MENUITEM_PROP_LABEL                         },
-    /* Indicator User */
-    { "x-canonical-user-item",                       "user-item-name"                                     }
-  };
-  static GHashTable *property_hash;
-
-  if G_UNLIKELY (property_hash == NULL)
-    {
-      gint i;
-
-      property_hash = g_hash_table_new (g_str_hash, g_str_equal);
-
-      for (i = 0; i < G_N_ELEMENTS (property_table); i++)
-        g_hash_table_insert (property_hash, (gpointer) property_table[i][0], (gpointer) property_table[i][1]);
-    }
-
-  if (type == NULL)
-    return DBUSMENU_MENUITEM_PROP_LABEL;
-
-  return g_hash_table_lookup (property_hash, type);
-}
-
-
-static HudDbusmenuItem *
-hud_dbusmenu_item_new (HudStringList    *context,
-                       const gchar      *desktop_file,
-                       const gchar      *icon,
-                       DbusmenuMenuitem *menuitem)
-{
-  HudStringList *tokens;
-  HudDbusmenuItem *item;
-  const gchar *type;
-  const gchar *prop;
-  gboolean enabled;
-
-  type = dbusmenu_menuitem_property_get (menuitem, DBUSMENU_MENUITEM_PROP_TYPE);
-  prop = hud_dbusmenu_item_get_label_property (type);
-
-  if (prop && dbusmenu_menuitem_property_exist (menuitem, prop))
-    {
-      const gchar *label;
-
-      label = dbusmenu_menuitem_property_get (menuitem, prop);
-      tokens = hud_string_list_cons_label (label, context);
-      enabled = TRUE;
-    }
-  else
-    {
-      tokens = hud_string_list_ref (context);
-      enabled = FALSE;
-    }
-
-  if (enabled)
-    enabled &= !dbusmenu_menuitem_property_exist (menuitem, DBUSMENU_MENUITEM_PROP_VISIBLE) ||
-               dbusmenu_menuitem_property_get_bool (menuitem, DBUSMENU_MENUITEM_PROP_VISIBLE);
-
-  if (enabled)
-    enabled &= !dbusmenu_menuitem_property_exist (menuitem, DBUSMENU_MENUITEM_PROP_ENABLED) ||
-               dbusmenu_menuitem_property_get_bool (menuitem, DBUSMENU_MENUITEM_PROP_ENABLED);
-
-  if (enabled)
-    enabled &= !dbusmenu_menuitem_property_exist (menuitem, DBUSMENU_MENUITEM_PROP_CHILD_DISPLAY);
-
-  item = hud_item_construct (hud_dbusmenu_item_get_type (), tokens, desktop_file, icon, enabled);
-  item->menuitem = g_object_ref (menuitem);
-
-  hud_string_list_unref (tokens);
-
-  return item;
-}
-
-struct _HudDbusmenuCollector
-{
-  GObject parent_instance;
-
-  DbusmenuClient *client;
-  DbusmenuMenuitem *root;
-  gchar *application_id;
-  HudStringList *prefix;
-  gchar *icon;
-  GHashTable *items;
-  guint penalty;
-  guint xid;
-  gboolean alive;
-  gint use_count;
-  gboolean reentrance_check;
-};
-
-typedef GObjectClass HudDbusmenuCollectorClass;
-
-static void hud_dbusmenu_collector_iface_init (HudSourceInterface *iface);
-G_DEFINE_TYPE_WITH_CODE (HudDbusmenuCollector, hud_dbusmenu_collector, G_TYPE_OBJECT,
-                         G_IMPLEMENT_INTERFACE (HUD_TYPE_SOURCE, hud_dbusmenu_collector_iface_init))
-
-static void
-hud_dbusmenu_collector_open_submenu (gpointer key,
-                                     gpointer value,
-                                     gpointer user_data)
-{
-  DbusmenuMenuitem *menuitem = key;
-  HudDbusmenuItem *item = value;
-
-  if (dbusmenu_menuitem_property_exist (menuitem, DBUSMENU_MENUITEM_PROP_CHILD_DISPLAY))
-    {
-      dbusmenu_menuitem_handle_event (menuitem, DBUSMENU_MENUITEM_EVENT_OPENED, NULL, 0);
-      item->is_opened = TRUE;
-    }
-}
-
-static void
-hud_dbusmenu_collector_close_submenu (gpointer key,
-                                      gpointer value,
-                                      gpointer user_data)
-{
-  DbusmenuMenuitem *menuitem = key;
-  HudDbusmenuItem *item = value;
-
-  if (item->is_opened)
-    {
-      dbusmenu_menuitem_handle_event (menuitem, DBUSMENU_MENUITEM_EVENT_CLOSED, NULL, 0);
-      item->is_opened = FALSE;
-    }
-}
-
-static void
-hud_dbusmenu_collector_use (HudSource *source)
-{
-  HudDbusmenuCollector *collector = HUD_DBUSMENU_COLLECTOR (source);
-
-  collector->reentrance_check = TRUE;
-
-  if (collector->use_count == 0)
-    g_hash_table_foreach (collector->items, hud_dbusmenu_collector_open_submenu, NULL);
-
-  collector->use_count++;
-
-  collector->reentrance_check = FALSE;
-}
-
-static void
-hud_dbusmenu_collector_unuse (HudSource *source)
-{
-  HudDbusmenuCollector *collector = HUD_DBUSMENU_COLLECTOR (source);
-
-  g_return_if_fail (collector->use_count > 0);
-
-  collector->reentrance_check = TRUE;
-
-  collector->use_count--;
-
-  if (collector->use_count == 0)
-    g_hash_table_foreach (collector->items, hud_dbusmenu_collector_close_submenu, NULL);
-
-  collector->reentrance_check = FALSE;
-}
-
-static void
-hud_dbusmenu_collector_search (HudSource    *source,
-                               GPtrArray    *results_array,
-                               HudTokenList *search_string)
-{
-  HudDbusmenuCollector *collector = HUD_DBUSMENU_COLLECTOR (source);
-  GHashTableIter iter;
-  gpointer item;
-
-  g_hash_table_iter_init (&iter, collector->items);
-  while (g_hash_table_iter_next (&iter, NULL, &item))
-    {
-      HudResult *result;
-
-      result = hud_result_get_if_matched (item, search_string, collector->penalty);
-      if (result)
-        g_ptr_array_add (results_array, result);
-    }
-}
-
-static void
-hud_dbusmenu_collector_add_item (HudDbusmenuCollector *collector,
-                                 HudStringList        *context,
-                                 DbusmenuMenuitem     *menuitem);
-static void
-hud_dbusmenu_collector_remove_item (HudDbusmenuCollector *collector,
-                                    DbusmenuMenuitem     *menuitem);
-
-static void
-hud_dbusmenu_collector_child_added (DbusmenuMenuitem *menuitem,
-                                    DbusmenuMenuitem *child,
-                                    guint             position,
-                                    gpointer          user_data)
-{
-  HudDbusmenuCollector *collector = user_data;
-  HudStringList *context;
-  HudItem *item;
-
-  g_assert (!collector->reentrance_check);
-
-  item = g_hash_table_lookup (collector->items, menuitem);
-  g_assert (item != NULL);
-
-  context = hud_item_get_tokens (item);
-
-  hud_dbusmenu_collector_add_item (collector, context, child);
-}
-
-static void
-hud_dbusmenu_collector_child_removed (DbusmenuMenuitem *menuitem,
-                                      DbusmenuMenuitem *child,
-                                      gpointer          user_data)
-{
-  HudDbusmenuCollector *collector = user_data;
-
-  g_assert (!collector->reentrance_check);
-
-  hud_dbusmenu_collector_remove_item (collector, child);
-}
-
-static void
-hud_dbusmenu_collector_property_changed (DbusmenuMenuitem *menuitem,
-                                         const gchar      *property_name,
-                                         GVariant         *new_value,
-                                         gpointer          user_data)
-{
-  HudDbusmenuCollector *collector = user_data;
-  DbusmenuMenuitem *parent;
-  HudStringList *context;
-  HudDbusmenuItem *item;
-  gboolean was_open;
-
-  g_assert (!collector->reentrance_check);
-
-  parent = dbusmenu_menuitem_get_parent (menuitem);
-
-  if (parent)
-    {
-      HudItem *parentitem;
-
-      parentitem = g_hash_table_lookup (collector->items, parent);
-      context = hud_item_get_tokens (parentitem);
-    }
-  else
-    context = collector->prefix;
-
-  item = g_hash_table_lookup (collector->items, menuitem);
-  was_open = item->is_opened;
-  g_hash_table_remove (collector->items, menuitem);
-
-  item = hud_dbusmenu_item_new (context, collector->application_id, collector->icon, menuitem);
-
-  if (collector->use_count && !was_open && dbusmenu_menuitem_property_exist (menuitem, DBUSMENU_MENUITEM_PROP_CHILD_DISPLAY))
-    {
-      dbusmenu_menuitem_handle_event (menuitem, DBUSMENU_MENUITEM_EVENT_OPENED, NULL, 0);
-      item->is_opened = TRUE;
-    }
-
-  g_hash_table_insert (collector->items, menuitem, item);
-
-  hud_source_changed (HUD_SOURCE (collector));
-}
-
-static void
-hud_dbusmenu_collector_add_item (HudDbusmenuCollector *collector,
-                                 HudStringList        *context,
-                                 DbusmenuMenuitem     *menuitem)
-{
-  HudDbusmenuItem *item;
-  GList *child;
-
-  item = hud_dbusmenu_item_new (context, collector->application_id, collector->icon, menuitem);
-  context = hud_item_get_tokens (HUD_ITEM (item));
-
-  g_signal_connect (menuitem, "property-changed", G_CALLBACK (hud_dbusmenu_collector_property_changed), collector);
-  g_signal_connect (menuitem, "child-added", G_CALLBACK (hud_dbusmenu_collector_child_added), collector);
-  g_signal_connect (menuitem, "child-removed", G_CALLBACK (hud_dbusmenu_collector_child_removed), collector);
-
-  /* If we're actively being queried and we add a new submenu item, open it. */
-  if (collector->use_count && dbusmenu_menuitem_property_exist (menuitem, DBUSMENU_MENUITEM_PROP_CHILD_DISPLAY))
-    {
-      dbusmenu_menuitem_handle_event (menuitem, DBUSMENU_MENUITEM_EVENT_OPENED, NULL, 0);
-      item->is_opened = TRUE;
-    }
-
-  g_hash_table_insert (collector->items, menuitem, item);
-
-  for (child = dbusmenu_menuitem_get_children (menuitem); child; child = child->next)
-    hud_dbusmenu_collector_add_item (collector, context, child->data);
-
-  if (collector->alive)
-    hud_source_changed (HUD_SOURCE (collector));
-}
-
-static void
-hud_dbusmenu_collector_remove_item (HudDbusmenuCollector *collector,
-                                    DbusmenuMenuitem     *menuitem)
-{
-  GList *child;
-
-  g_signal_handlers_disconnect_by_func (menuitem, hud_dbusmenu_collector_property_changed, collector);
-  g_signal_handlers_disconnect_by_func (menuitem, hud_dbusmenu_collector_child_added, collector);
-  g_signal_handlers_disconnect_by_func (menuitem, hud_dbusmenu_collector_child_removed, collector);
-  g_hash_table_remove (collector->items, menuitem);
-
-  for (child = dbusmenu_menuitem_get_children (menuitem); child; child = child->next)
-    hud_dbusmenu_collector_remove_item (collector, child->data);
-
-  if (collector->alive)
-    hud_source_changed (HUD_SOURCE (collector));
-}
-
-static void
-hud_dbusmenu_collector_setup_root (HudDbusmenuCollector *collector,
-                                   DbusmenuMenuitem     *root)
-{
-  if (collector->root)
-    {
-      /* If the collector has the submenus opened, close them before we
-       * remove them all.  The use_count being non-zero will cause them
-       * to be reopened as they are added back below (if they will be).
-       */
-      if (collector->use_count > 0)
-        g_hash_table_foreach (collector->items, hud_dbusmenu_collector_close_submenu, NULL);
-
-      hud_dbusmenu_collector_remove_item (collector, collector->root);
-      g_clear_object (&collector->root);
-    }
-
-  if (root)
-    {
-      hud_dbusmenu_collector_add_item (collector, collector->prefix, root);
-      collector->root = g_object_ref (root);
-    }
-}
-
-static void
-hud_dbusmenu_collector_root_changed (DbusmenuClient   *client,
-                                     DbusmenuMenuitem *root,
-                                     gpointer          user_data)
-{
-  HudDbusmenuCollector *collector = user_data;
-
-  g_assert (!collector->reentrance_check);
-
-  hud_dbusmenu_collector_setup_root (collector, root);
-}
-
-static void
-hud_dbusmenu_collector_setup_endpoint (HudDbusmenuCollector *collector,
-                                       const gchar          *bus_name,
-                                       const gchar          *object_path)
-{
-  g_debug ("endpoint is %s %s", bus_name, object_path);
-
-  if (collector->client)
-    {
-      g_signal_handlers_disconnect_by_func (collector->client, hud_dbusmenu_collector_root_changed, collector);
-      hud_dbusmenu_collector_setup_root (collector, NULL);
-      g_clear_object (&collector->client);
-    }
-
-  if (bus_name && object_path)
-    {
-      collector->client = dbusmenu_client_new (bus_name, object_path);
-      g_signal_connect_object (collector->client, "root-changed",
-                               G_CALLBACK (hud_dbusmenu_collector_root_changed), collector, 0);
-      hud_dbusmenu_collector_setup_root (collector, dbusmenu_client_get_root (collector->client));
-    }
-}
-
-static void
-hud_dbusmenu_collector_registrar_observer_func (HudAppMenuRegistrar *registrar,
-                                                guint                xid,
-                                                const gchar         *bus_name,
-                                                const gchar         *object_path,
-                                                gpointer             user_data)
-{
-  HudDbusmenuCollector *collector = user_data;
-
-  hud_dbusmenu_collector_setup_endpoint (collector, bus_name, object_path);
-}
-
-
-static void
-hud_dbusmenu_collector_finalize (GObject *object)
-{
-  HudDbusmenuCollector *collector = HUD_DBUSMENU_COLLECTOR (object);
-
-  if (collector->xid)
-    hud_app_menu_registrar_remove_observer (hud_app_menu_registrar_get (), collector->xid,
-                                            hud_dbusmenu_collector_registrar_observer_func, collector);
-
-  /* remove all the items without firing change signals */
-  collector->alive = FALSE;
-  hud_dbusmenu_collector_setup_endpoint (collector, NULL, NULL);
-
-  /* make sure the table is empty before we free it */
-  g_assert (g_hash_table_size (collector->items) == 0);
-  g_hash_table_unref (collector->items);
-
-  g_free (collector->application_id);
-  g_free (collector->icon);
-
-  hud_string_list_unref (collector->prefix);
-  g_clear_object (&collector->client);
-
-  G_OBJECT_CLASS (hud_dbusmenu_collector_parent_class)
-    ->finalize (object);
-}
-
-static void
-hud_dbusmenu_collector_init (HudDbusmenuCollector *collector)
-{
-  collector->items = g_hash_table_new_full (NULL, NULL, NULL, g_object_unref);
-}
-
-static void
-hud_dbusmenu_collector_iface_init (HudSourceInterface *iface)
-{
-  iface->use = hud_dbusmenu_collector_use;
-  iface->unuse = hud_dbusmenu_collector_unuse;
-  iface->search = hud_dbusmenu_collector_search;
-}
-
-static void
-hud_dbusmenu_collector_class_init (HudDbusmenuCollectorClass *class)
-{
-  class->finalize = hud_dbusmenu_collector_finalize;
-}
-
-/**
- * hud_dbusmenu_collector_new_for_endpoint:
- * @application_id: a unique identifier for the application
- * @prefix: the title to prefix to all items
- * @icon: the icon for the appliction
- * @penalty: the penalty to apply to all results
- * @bus_name: a D-Bus bus name
- * @object_path: an object path at the destination given by @bus_name
- *
- * Creates a new #HudDbusmenuCollector for the specified endpoint.
- *
- * Internally, a #DbusmenuClient is created for this endpoint.  Searches
- * are performed against the contents of those menus.
- *
- * This call is intended to be used for indicators.
- *
- * If @prefix is non-%NULL (which, for indicators, it ought to be), then
- * it is prefixed to every item created by the collector.
- *
- * If @penalty is non-zero then all results returned from the collector
- * have their distance increased by a percentage equal to the penalty.
- * This allows items from indicators to score lower than they would
- * otherwise.
- *
- * Returns: a new #HudDbusmenuCollector
- **/
-HudDbusmenuCollector *
-hud_dbusmenu_collector_new_for_endpoint (const gchar *application_id,
-                                         const gchar *prefix,
-                                         const gchar *icon,
-                                         guint        penalty,
-                                         const gchar *bus_name,
-                                         const gchar *object_path)
-{
-  HudDbusmenuCollector *collector;
-
-  collector = g_object_new (HUD_TYPE_DBUSMENU_COLLECTOR, NULL);
-  collector->application_id = g_strdup (application_id);
-  collector->icon = g_strdup (icon);
-  if (prefix)
-    collector->prefix = hud_string_list_cons (prefix, NULL);
-  collector->penalty = penalty;
-  hud_dbusmenu_collector_setup_endpoint (collector, bus_name, object_path);
-
-  collector->alive = TRUE;
-
-  return collector;
-}
-
-/**
- * hud_dbusmenu_collector_new_for_window:
- * @window: a #BamfWindow
- *
- * Creates a new #HudDbusmenuCollector for the endpoint indicated by the
- * #HudAppMenuRegistrar for @window.
- *
- * This call is intended to be used for application menus.
- *
- * Returns: a new #HudDbusmenuCollector
- **/
-HudDbusmenuCollector *
-hud_dbusmenu_collector_new_for_window (BamfWindow  *window,
-                                       const gchar *desktop_file,
-                                       const gchar *icon)
-{
-  HudDbusmenuCollector *collector;
-
-  collector = g_object_new (HUD_TYPE_DBUSMENU_COLLECTOR, NULL);
-  collector->application_id = g_strdup (desktop_file);
-  collector->icon = g_strdup (icon);
-  collector->xid = bamf_window_get_xid (window);
-  g_debug ("dbusmenu on %d", collector->xid);
-  hud_app_menu_registrar_add_observer (hud_app_menu_registrar_get (), collector->xid,
-                                       hud_dbusmenu_collector_registrar_observer_func, collector);
-
-  collector->alive = TRUE;
-
-  return collector;
-}
-
-/**
- * hud_dbusmenu_collector_set_prefix:
- * @collector: a #HudDbusmenuCollector
- * @prefix: the new prefix to use
- *
- * Changes the prefix applied to all items of the collector.
- *
- * This will involve destroying all of the items and recreating them
- * (since each item's prefix has to be changed).
- **/
-void
-hud_dbusmenu_collector_set_prefix (HudDbusmenuCollector *collector,
-                                   const gchar          *prefix)
-{
-  hud_string_list_unref (collector->prefix);
-  collector->prefix = hud_string_list_cons (prefix, NULL);
-  hud_dbusmenu_collector_setup_root (collector, collector->root);
-}
-
-/**
- * hud_dbusmenu_collector_set_icon:
- * @collector: a #HudDbusmenuCollector
- * @icon: the application icon
- *
- * Changes the application icon used for all items of the collector.
- *
- * This will involve destroying all of the items and recreating them
- * (since each item's icon has to be changed).
- **/
-void
-hud_dbusmenu_collector_set_icon (HudDbusmenuCollector *collector,
-                                 const gchar          *icon)
-{
-  g_free (collector->icon);
-  collector->icon = g_strdup (icon);
-  hud_dbusmenu_collector_setup_root (collector, collector->root);
-}

=== removed file 'src/huddbusmenucollector.h'
--- src/huddbusmenucollector.h	2012-12-03 17:40:45 +0000
+++ src/huddbusmenucollector.h	1970-01-01 00:00:00 +0000
@@ -1,48 +0,0 @@
-/*
- * Copyright © 2012 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/>.
- *
- * Author: Ryan Lortie <[e-mail]>
- */
-
-#ifndef __HUD_DBUSMENU_COLLECTOR_H__
-#define __HUD_DBUSMENU_COLLECTOR_H__
-
-#include <libbamf/libbamf.h>
-
-#define HUD_TYPE_DBUSMENU_COLLECTOR                         (hud_dbusmenu_collector_get_type ())
-#define HUD_DBUSMENU_COLLECTOR(inst)                        (G_TYPE_CHECK_INSTANCE_CAST ((inst),                     \
-                                                             HUD_TYPE_DBUSMENU_COLLECTOR, HudDbusmenuCollector))
-#define HUD_IS_DBUSMENU_COLLECTOR(inst)                     (G_TYPE_CHECK_INSTANCE_TYPE ((inst),                     \
-                                                             HUD_TYPE_DBUSMENU_COLLECTOR))
-
-typedef struct _HudDbusmenuCollector                        HudDbusmenuCollector;
-
-GType                   hud_dbusmenu_collector_get_type                 (void);
-
-HudDbusmenuCollector *  hud_dbusmenu_collector_new_for_endpoint         (const gchar *application_id,
-                                                                         const gchar *prefix,
-                                                                         const gchar *icon,
-                                                                         guint        penalty,
-                                                                         const gchar *bus_name,
-                                                                         const gchar *object_path);
-HudDbusmenuCollector *  hud_dbusmenu_collector_new_for_window           (BamfWindow  *window,
-                                                                         const gchar *desktop_file,
-                                                                         const gchar *icon);
-void                    hud_dbusmenu_collector_set_prefix               (HudDbusmenuCollector *collector,
-                                                                         const gchar          *prefix);
-void                    hud_dbusmenu_collector_set_icon                 (HudDbusmenuCollector *collector,
-                                                                         const gchar          *icon);
-
-#endif /* __HUD_DBUSMENU_COLLECTOR_H__ */

=== removed file 'src/huddebugsource.c'
--- src/huddebugsource.c	2012-12-03 17:40:45 +0000
+++ src/huddebugsource.c	1970-01-01 00:00:00 +0000
@@ -1,168 +0,0 @@
-/*
- * Copyright © 2012 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/>.
- *
- * Author: Ryan Lortie <[e-mail]>
- */
-
-#include "huddebugsource.h"
-
-#include "hudsource.h"
-#include "hudresult.h"
-
-/**
- * SECTION:huddebugsource
- * @title: HudDebugSource
- * @short_description: a source to assist with debugging
- *
- * #HudDebugSource is a source for debugging purposes.  It is not
- * enabled by default but you can have it added to the global list of
- * sources by setting the HUD_DEBUG_SOURCE environment variable.
- *
- * Presently it creates a #HudItem corresponding to the current date and
- * time (and updates it as the time changes).
- **/
-
-/**
- * HudDebugSource:
- *
- * This is an opaque structure type.
- **/
-
-struct _HudDebugSource
-{
-  GObject parent_instance;
-
-  HudItem *item;
-  gint use_count;
-  gint timeout;
-};
-
-typedef GObjectClass HudDebugSourceClass;
-
-static void hud_debug_source_iface_init (HudSourceInterface *iface);
-G_DEFINE_TYPE_WITH_CODE (HudDebugSource, hud_debug_source, G_TYPE_OBJECT,
-                         G_IMPLEMENT_INTERFACE (HUD_TYPE_SOURCE, hud_debug_source_iface_init))
-
-static gboolean
-hud_debug_source_timeout (gpointer user_data)
-{
-  HudDebugSource *source = user_data;
-  HudStringList *tokens;
-  GDateTime *now;
-  gchar *time;
-
-  g_clear_object (&source->item);
-
-  now = g_date_time_new_now_local ();
-  time = g_date_time_format (now, "hud-debug time: %c");
-  tokens = hud_string_list_cons (time, NULL);
-  g_date_time_unref (now);
-  g_free (time);
-
-  source->item = hud_item_new (tokens, NULL, NULL, TRUE);
-  hud_string_list_unref (tokens);
-
-  hud_source_changed (HUD_SOURCE (source));
-
-  return TRUE;
-}
-
-static void
-hud_debug_source_use (HudSource *hud_source)
-{
-  HudDebugSource *source = HUD_DEBUG_SOURCE (hud_source);
-
-  if (source->use_count == 0)
-    source->timeout = g_timeout_add (1000, hud_debug_source_timeout, source);
-
-  source->use_count++;
-}
-
-static void
-hud_debug_source_unuse (HudSource *hud_source)
-{
-  HudDebugSource *source = HUD_DEBUG_SOURCE (hud_source);
-
-  source->use_count--;
-
-  if (source->use_count == 0)
-    {
-      g_source_remove (source->timeout);
-      source->timeout = 0;
-    }
-}
-
-static void
-hud_debug_source_search (HudSource    *hud_source,
-                         GPtrArray    *results_array,
-                         HudTokenList *search_string)
-{
-  HudDebugSource *source = HUD_DEBUG_SOURCE (hud_source);
-
-  if (source->item)
-    {
-      HudResult *result;
-
-      result = hud_result_get_if_matched (source->item, search_string, 0);
-      if (result != NULL)
-        g_ptr_array_add (results_array, result);
-    }
-}
-
-static void
-hud_debug_source_finalize (GObject *object)
-{
-  HudDebugSource *source = HUD_DEBUG_SOURCE (object);
-
-  g_clear_object (&source->item);
-
-  if (source->timeout)
-    g_source_remove (source->timeout);
-
-  G_OBJECT_CLASS (hud_debug_source_parent_class)
-    ->finalize (object);
-}
-
-static void
-hud_debug_source_init (HudDebugSource *source)
-{
-}
-
-static void
-hud_debug_source_iface_init (HudSourceInterface *iface)
-{
-  iface->use = hud_debug_source_use;
-  iface->unuse = hud_debug_source_unuse;
-  iface->search = hud_debug_source_search;
-}
-
-static void
-hud_debug_source_class_init (HudDebugSourceClass *class)
-{
-  class->finalize = hud_debug_source_finalize;
-}
-
-/**
- * hud_debug_source_new:
- *
- * Creates a #HudDebugSource.
- *
- * Returns: a new empty #HudDebugSource
- **/
-HudDebugSource *
-hud_debug_source_new (void)
-{
-  return g_object_new (HUD_TYPE_DEBUG_SOURCE, NULL);
-}

=== removed file 'src/huddebugsource.h'
--- src/huddebugsource.h	2012-12-03 17:40:45 +0000
+++ src/huddebugsource.h	1970-01-01 00:00:00 +0000
@@ -1,36 +0,0 @@
-/*
- * Copyright © 2012 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/>.
- *
- * Author: Ryan Lortie <[e-mail]>
- */
-
-#ifndef __HUD_DEBUG_SOURCE_H__
-#define __HUD_DEBUG_SOURCE_H__
-
-#include <glib-object.h>
-
-#define HUD_TYPE_DEBUG_SOURCE                               (hud_debug_source_get_type ())
-#define HUD_DEBUG_SOURCE(inst)                              (G_TYPE_CHECK_INSTANCE_CAST ((inst),                     \
-                                                             HUD_TYPE_DEBUG_SOURCE, HudDebugSource))
-#define HUD_IS_DEBUG_SOURCE(inst)                           (G_TYPE_CHECK_INSTANCE_TYPE ((inst),                     \
-                                                             HUD_TYPE_DEBUG_SOURCE))
-
-typedef struct _HudDebugSource                              HudDebugSource;
-
-GType                   hud_debug_source_get_type                   (void);
-
-HudDebugSource *        hud_debug_source_new                        (void);
-
-#endif /* __HUD_DEBUG_SOURCE_H__ */

=== removed file 'src/hudindicatorsource.c'
--- src/hudindicatorsource.c	2012-12-03 17:40:45 +0000
+++ src/hudindicatorsource.c	1970-01-01 00:00:00 +0000
@@ -1,286 +0,0 @@
-/*
- * Copyright © 2012 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/>.
- *
- * Authors: Ryan Lortie <[e-mail]>
- *          Ted Gould <[e-mail]>
- */
-
-#include "hudindicatorsource.h"
-
-#include <glib/gi18n.h>
-#include <gio/gio.h>
-
-#include "hudsettings.h"
-#include "huddbusmenucollector.h"
-#include "hudmenumodelcollector.h"
-#include "hudsource.h"
-
-/**
- * SECTION:hudindicatorsource
- * @title:HudIndicatorSource
- * @short_description: a #HudSource to search through the menus of
- *   indicators
- *
- * #HudIndicatorSource searches through the menu items of the
- * indicators.
- **/
-
-/**
- * HudIndicatorSource:
- *
- * This is an opaque structure type.
- **/
-
-typedef struct
-{
-  const gchar *dbus_name;
-  const gchar *dbus_menu_path;
-  const gchar *indicator_name;
-  const gchar *user_visible_name;
-  const gchar *icon;
-  gboolean     uses_gmenumodel;
-} IndicatorInfo;
-
-static const IndicatorInfo indicator_info[] = {
-  {
-    .dbus_name         = "com.canonical.indicator.datetime",
-    .dbus_menu_path    = "/com/canonical/indicator/datetime/menu",
-    .indicator_name    = "indicator-datetime",
-    .user_visible_name = N_("Date"),
-    .icon              = "office-calendar"
-  },
-  {
-    .dbus_name         = "com.canonical.indicator.session",
-    .dbus_menu_path    = "/com/canonical/indicator/session/menu",
-    .indicator_name    = "indicator-session-device",
-    .user_visible_name = N_("Device"),
-    .icon              = "system-devices-panel"
-  },
-  {
-    .dbus_name         = "com.canonical.indicator.session",
-    .dbus_menu_path    = "/com/canonical/indicator/users/menu",
-    .indicator_name    = "indicator-session-user",
-    .user_visible_name = N_("Users"),
-    .icon              = "avatar-default"
-  },
-  {
-    .dbus_name         = "com.canonical.indicator.sound",
-    .dbus_menu_path    = "/com/canonical/indicator/sound/menu",
-    .indicator_name    = "indicator-sound",
-    .user_visible_name = N_("Sound"),
-    .icon              = "audio-volume-high-panel"
-  },
-  {
-    .dbus_name         = "com.canonical.indicator.messages",
-    .dbus_menu_path    = "/com/canonical/indicator/messages/menu",
-    .indicator_name    = "indicator-messages",
-    .user_visible_name = N_("Messages"),
-    .icon              = "indicator-messages",
-    .uses_gmenumodel   = TRUE
-  }
-};
-
-typedef struct
-{
-  const IndicatorInfo *info;
-  HudIndicatorSource *source;
-  HudSource *collector;
-} HudIndicatorSourceIndicator;
-
-struct _HudIndicatorSource
-{
-  GObject parent_instance;
-
-  HudIndicatorSourceIndicator *indicators;
-  gint n_indicators;
-  gint use_count;
-};
-
-typedef GObjectClass HudIndicatorSourceClass;
-
-static void hud_indicator_source_iface_init (HudSourceInterface *iface);
-G_DEFINE_TYPE_WITH_CODE (HudIndicatorSource, hud_indicator_source, G_TYPE_OBJECT,
-                         G_IMPLEMENT_INTERFACE (HUD_TYPE_SOURCE, hud_indicator_source_iface_init))
-
-static void
-hud_indicator_source_use (HudSource *hud_source)
-{
-  HudIndicatorSource *source = HUD_INDICATOR_SOURCE (hud_source);
-  gint i;
-
-  if (source->use_count == 0)
-    {
-      for (i = 0; i < source->n_indicators; i++)
-        if (source->indicators[i].collector)
-          hud_source_use (source->indicators[i].collector);
-    }
-
-  source->use_count++;
-}
-
-static void
-hud_indicator_source_unuse (HudSource *hud_source)
-{
-  HudIndicatorSource *source = HUD_INDICATOR_SOURCE (hud_source);
-  gint i;
-
-  g_return_if_fail (source->use_count > 0);
-
-  source->use_count--;
-
-  if (source->use_count == 0)
-    {
-      for (i = 0; i < source->n_indicators; i++)
-        if (source->indicators[i].collector)
-          hud_source_unuse (source->indicators[i].collector);
-    }
-}
-
-static void
-hud_indicator_source_search (HudSource    *hud_source,
-                             GPtrArray    *results_array,
-                             HudTokenList *search_string)
-{
-  HudIndicatorSource *source = HUD_INDICATOR_SOURCE (hud_source);
-  gint i;
-
-  for (i = 0; i < source->n_indicators; i++)
-    if (source->indicators[i].collector)
-      hud_source_search (source->indicators[i].collector, results_array, search_string);
-}
-
-static void
-hud_indicator_source_finalize (GObject *object)
-{
-  g_assert_not_reached ();
-}
-
-static void
-hud_indicator_source_collector_changed (HudSource *source,
-                                        gpointer   user_data)
-{
-  HudIndicatorSourceIndicator *indicator = user_data;
-
-  hud_source_changed (HUD_SOURCE (indicator->source));
-}
-
-static void
-hud_indicator_source_name_appeared (GDBusConnection *connection,
-                                    const gchar     *name,
-                                    const gchar     *name_owner,
-                                    gpointer         user_data)
-{
-  HudIndicatorSourceIndicator *indicator = user_data;
-
-  if (indicator->info->uses_gmenumodel)
-    {
-      HudMenuModelCollector *collector;
-
-      collector = hud_menu_model_collector_new_for_endpoint (indicator->info->indicator_name,
-                                                             _(indicator->info->user_visible_name),
-                                                             indicator->info->icon,
-                                                             hud_settings.indicator_penalty,
-                                                             name_owner,
-                                                             indicator->info->dbus_menu_path);
-
-      indicator->collector = HUD_SOURCE (collector);
-    }
-  else
-    {
-      HudDbusmenuCollector *collector;
-
-      collector = hud_dbusmenu_collector_new_for_endpoint (indicator->info->indicator_name,
-                                                           _(indicator->info->user_visible_name),
-                                                           indicator->info->icon,
-                                                           hud_settings.indicator_penalty,
-                                                           name_owner, indicator->info->dbus_menu_path);
-      indicator->collector = HUD_SOURCE (collector);
-    }
-
-  g_signal_connect (indicator->collector, "changed",
-                    G_CALLBACK (hud_indicator_source_collector_changed), indicator);
-
-  /* Set initial use count on new indicator if query is active. */
-  if (indicator->source->use_count)
-    hud_source_use (indicator->collector);
-
-  hud_source_changed (HUD_SOURCE (indicator->source));
-}
-
-static void
-hud_indicator_source_name_vanished (GDBusConnection *connection,
-                                    const gchar     *name,
-                                    gpointer         user_data)
-{
-  HudIndicatorSourceIndicator *indicator = user_data;
-
-  if (indicator->collector)
-    {
-      g_signal_handlers_disconnect_by_func (indicator->collector, hud_indicator_source_collector_changed, indicator);
-      /* Drop our use count on dying indicator (if any) */
-      if (indicator->source->use_count)
-        hud_source_unuse (indicator->collector);
-      g_clear_object (&indicator->collector);
-    }
-
-  hud_source_changed (HUD_SOURCE (indicator->source));
-}
-
-static void
-hud_indicator_source_init (HudIndicatorSource *source)
-{
-  gint i;
-
-  source->n_indicators = G_N_ELEMENTS (indicator_info);
-  source->indicators = g_new0 (HudIndicatorSourceIndicator, source->n_indicators);
-
-  for (i = 0; i < source->n_indicators; i++)
-    {
-      HudIndicatorSourceIndicator *indicator = &source->indicators[i];
-
-      indicator->info = &indicator_info[i];
-      indicator->source = source;
-
-      g_bus_watch_name (G_BUS_TYPE_SESSION, indicator->info->dbus_name, G_BUS_NAME_WATCHER_FLAGS_NONE,
-                        hud_indicator_source_name_appeared, hud_indicator_source_name_vanished, indicator, NULL);
-    }
-}
-
-static void
-hud_indicator_source_iface_init (HudSourceInterface *iface)
-{
-  iface->use = hud_indicator_source_use;
-  iface->unuse = hud_indicator_source_unuse;
-  iface->search = hud_indicator_source_search;
-}
-
-static void
-hud_indicator_source_class_init (HudIndicatorSourceClass *class)
-{
-  class->finalize = hud_indicator_source_finalize;
-}
-
-/**
- * hud_indicator_source_new:
- *
- * Creates a #HudIndicatorSource.
- *
- * Returns: a new #HudIndicatorSource
- **/
-HudIndicatorSource *
-hud_indicator_source_new (void)
-{
-  return g_object_new (HUD_TYPE_INDICATOR_SOURCE, NULL);
-}

=== removed file 'src/hudindicatorsource.h'
--- src/hudindicatorsource.h	2012-12-03 17:40:45 +0000
+++ src/hudindicatorsource.h	1970-01-01 00:00:00 +0000
@@ -1,36 +0,0 @@
-/*
- * Copyright © 2012 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/>.
- *
- * Author: Ryan Lortie <[e-mail]>
- */
-
-#ifndef __HUD_INDICATOR_SOURCE_H__
-#define __HUD_INDICATOR_SOURCE_H__
-
-#include <glib-object.h>
-
-#define HUD_TYPE_INDICATOR_SOURCE                           (hud_indicator_source_get_type ())
-#define HUD_INDICATOR_SOURCE(inst)                          (G_TYPE_CHECK_INSTANCE_CAST ((inst),                     \
-                                                             HUD_TYPE_INDICATOR_SOURCE, HudIndicatorSource))
-#define HUD_IS_INDICATOR_SOURCE(inst)                       (G_TYPE_CHECK_INSTANCE_TYPE ((inst),                     \
-                                                             HUD_TYPE_INDICATOR_SOURCE))
-
-typedef struct _HudIndicatorSource                          HudIndicatorSource;
-
-GType                   hud_indicator_source_get_type                   (void);
-
-HudIndicatorSource *    hud_indicator_source_new                        (void);
-
-#endif /* __HUD_INDICATOR_SOURCE_H__ */

=== removed file 'src/huditem.c'
--- src/huditem.c	2012-12-03 17:40:45 +0000
+++ src/huditem.c	1970-01-01 00:00:00 +0000
@@ -1,343 +0,0 @@
-/*
- * Copyright © 2012 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/>.
- *
- * Author: Ryan Lortie <[e-mail]>
- */
-
-#include "huditem.h"
-
-#include "usage-tracker.h"
-#include "hudtoken.h"
-
-/**
- * SECTION:huditem
- * @title: HudItem
- * @short_description: a user-interesting item that can be activated
- *
- * A #HudItem represents a user-interesting action that can be activated
- * from the Hud user interface.
- **/
-
-/**
- * HudItem:
- *
- * This is an opaque structure type.
- **/
-
-/**
- * HudItemClass:
- * @parent_class: the #GObjectClass
- * @activate: virtual function pointer for hud_item_activate()
- *
- * This is the class vtable for #HudItem.
- **/
-
-static GHashTable *hud_item_table;
-static guint64 hud_item_next_id;
-
-struct _HudItemPrivate
-{
-  GObject parent_instance;
-
-  gchar *desktop_file;
-
-  HudTokenList *token_list;
-  HudStringList *tokens;
-  gchar *usage_tag;
-  gchar *app_icon;
-  gboolean enabled;
-  guint usage;
-  guint64 id;
-};
-
-G_DEFINE_TYPE (HudItem, hud_item, G_TYPE_OBJECT)
-
-static void
-hud_item_finalize (GObject *object)
-{
-  HudItem *item = HUD_ITEM (object);
-
-  g_hash_table_remove (hud_item_table, &item->priv->id);
-  hud_token_list_free (item->priv->token_list);
-  hud_string_list_unref (item->priv->tokens);
-  g_free (item->priv->desktop_file);
-  g_free (item->priv->app_icon);
-  g_free (item->priv->usage_tag);
-
-  G_OBJECT_CLASS (hud_item_parent_class)
-    ->finalize (object);
-}
-
-static void
-hud_item_init (HudItem *item)
-{
-  item->priv = G_TYPE_INSTANCE_GET_PRIVATE (item, HUD_TYPE_ITEM, HudItemPrivate);
-}
-
-static void
-hud_item_class_init (HudItemClass *class)
-{
-  GObjectClass *gobject_class = G_OBJECT_CLASS (class);
-
-  hud_item_table = g_hash_table_new (g_int64_hash, g_int64_equal);
-
-  gobject_class->finalize = hud_item_finalize;
-
-  g_type_class_add_private (class, sizeof (HudItemPrivate));
-}
-
-static void
-hud_item_format_tokens (GString       *string,
-                        HudStringList *tokens)
-{
-  HudStringList *tail;
-
-  tail = hud_string_list_get_tail (tokens);
-
-  if (tail)
-    {
-      hud_item_format_tokens (string, tail);
-      g_string_append (string, "||");
-    }
-
-  g_string_append (string, hud_string_list_get_head (tokens));
-}
-
-static void
-hud_item_setup_usage (HudItem *item)
-{
-  GString *tag;
-
-  if (item->priv->tokens && item->priv->enabled)
-    {
-      tag = g_string_new (NULL);
-      hud_item_format_tokens (tag, item->priv->tokens);
-      item->priv->usage_tag = g_string_free (tag, FALSE);
-      item->priv->usage = usage_tracker_get_usage (usage_tracker_get_instance (),
-                                                   item->priv->desktop_file, item->priv->usage_tag);
-    }
-}
-
-/**
- * hud_item_construct:
- * @g_type: a #GType
- * @tokens: the search tokens for the item
- * @desktop_file: the desktop file of the provider of the item
- * @app_icon: the icon name for the application that created this item
- * @enabled: if the item is enabled
- *
- * This is the Vala-style chain-up constructor corresponding to
- * hud_item_new().  @g_type must be a subtype of #HudItem.
- *
- * Only subclasses of #HudItem should call this.
- *