Merge lp:~seb128/indicator-appmenu/clean-hud-leftover into lp:indicator-appmenu/14.04

[Sebastien Bacher]

Clean leftover hud files, it has its own source now. Drop depends as well

Clean leftover hud files, it has its own source now. Drop depends as well

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:259
http://jenkins.qa.ubuntu.com/job/indicator-appmenu-ci/21/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-appmenu-trusty-amd64-ci/16
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-appmenu-trusty-armhf-ci/16
        deb: http://jenkins.qa.ubuntu.com/job/indicator-appmenu-trusty-armhf-ci/16/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-appmenu-ci/21/rebuild

review: Approve (continuous-integration)

[Ted Gould (ted)]

review: Approve

=== modified file 'debian/control'
--- debian/control	2013-07-22 04:46:18 +0000
+++ debian/control	2014-03-21 10:25:21 +0000
@@ -30,7 +30,6 @@
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-         hud,
 Recommends: indicator-applet | indicator-renderer,
             unity-gtk2-module,
             unity-gtk3-module,

=== modified file 'po/POTFILES.skip'
--- po/POTFILES.skip	2012-03-21 17:31:16 +0000
+++ po/POTFILES.skip	2014-03-21 10:25:21 +0000
@@ -1,6 +1,4 @@
 src/create-db.c
 src/gen-application-menu-registrar.xml.c
 src/gen-application-menu-renderer.xml.c
-tools-vala/hud-gtk.ui
-src/hud.interface.c
 src/indicator-appmenu-marshal.c

=== modified file 'po/indicator-appmenu.pot'
--- po/indicator-appmenu.pot	2012-11-22 12:48:46 +0000
+++ po/indicator-appmenu.pot	2014-03-21 10:25:21 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-22 12:51+0100\n"
+"POT-Creation-Date: 2014-03-21 11:22+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -18,129 +18,13 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #: ../data/com.canonical.indicator.appmenu.gschema.xml.h:1
-msgid "Where the menus displayed"
+msgid "Where the menu is displayed."
 msgstr ""
 
 #: ../data/com.canonical.indicator.appmenu.gschema.xml.h:2
-msgid "Controls the menu display location. TODO: add more"
-msgstr ""
-
-#: ../data/com.canonical.indicator.appmenu.hud.gschema.xml.h:1
-msgid "Whether to store usage data"
-msgstr ""
-
-#: ../data/com.canonical.indicator.appmenu.hud.gschema.xml.h:2
-msgid ""
-"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."
-msgstr ""
-
-#: ../data/com.canonical.indicator.appmenu.hud.search.gschema.xml.h:1
-msgid "The penalty given to a menu item being in an indicator"
-msgstr ""
-
-#: ../data/com.canonical.indicator.appmenu.hud.search.gschema.xml.h:3
-#, no-c-format
-msgid ""
-"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."
-msgstr ""
-
-#: ../data/com.canonical.indicator.appmenu.hud.search.gschema.xml.h:4
-msgid "Penalty for extra characters added to the search"
-msgstr ""
-
-#: ../data/com.canonical.indicator.appmenu.hud.search.gschema.xml.h:5
-msgid ""
-"The penalty for each extra character in the search string that does not "
-"appear in the text of a menu item.\n"
-"\n"
-"This penalty would be applied if the user typed \"fiile\" when searching "
-"against the menu item \"File\", for example."
-msgstr ""
-
-#: ../data/com.canonical.indicator.appmenu.hud.search.gschema.xml.h:8
-msgid "Penalty applied if a character is dropped"
-msgstr ""
-
-#: ../data/com.canonical.indicator.appmenu.hud.search.gschema.xml.h:9
-msgid ""
-"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.\n"
-"\n"
-"This penalty would be applied if the user typed \"fle\" when searching "
-"against the menu item \"File\", for example."
-msgstr ""
-
-#: ../data/com.canonical.indicator.appmenu.hud.search.gschema.xml.h:12
-msgid "Penalty applied if a character is dropped from the end"
-msgstr ""
-
-#: ../data/com.canonical.indicator.appmenu.hud.search.gschema.xml.h:13
-msgid ""
-"The penalty for each missing character at the end of a search term.\n"
-"\n"
-"This penalty would be applied if the user typed \"fil\" when searching "
-"against the menu item \"File\", for example."
-msgstr ""
-
-#: ../data/com.canonical.indicator.appmenu.hud.search.gschema.xml.h:16
-msgid "Penalty applied when the characters are not the same"
-msgstr ""
-
-#: ../data/com.canonical.indicator.appmenu.hud.search.gschema.xml.h:17
-msgid ""
-"The penalty for each substituted character in the search term.\n"
-"\n"
-"The penalty would be applied if the user typed \"fike\" when searching "
-"against the menu item \"File\", for example."
-msgstr ""
-
-#: ../data/com.canonical.indicator.appmenu.hud.search.gschema.xml.h:20
-msgid "The highest distance value that is shown in the results"
-msgstr ""
-
-#: ../data/com.canonical.indicator.appmenu.hud.search.gschema.xml.h:21
-msgid ""
-"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."
-msgstr ""
-
-#. 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'.
-#: ../src/hudappindicatorsource.c:105
-#, c-format
-msgid "Untitled Indicator (%s)"
-msgstr ""
-
-#: ../src/hudindicatorsource.c:61
-msgid "Date"
-msgstr ""
-
-#: ../src/hudindicatorsource.c:68
-msgid "Device"
-msgstr ""
-
-#: ../src/hudindicatorsource.c:75
-msgid "Users"
-msgstr ""
-
-#: ../src/hudindicatorsource.c:82
-msgid "Sound"
-msgstr ""
-
-#: ../src/hudindicatorsource.c:89
-msgid "Messages"
-msgstr ""
-
-#: ../src/window-menu-model.c:162
+msgid "Controls the menu display location."
+msgstr ""
+
+#: ../src/window-menu-model.c:170
 msgid "Unknown Application Name"
 msgstr ""

=== removed file 'src/usage-tracker.c'
--- src/usage-tracker.c	2013-02-06 15:25:03 +0000
+++ src/usage-tracker.c	1970-01-01 00:00:00 +0000
@@ -1,510 +0,0 @@
-/*
-Tracks which menu items get used by users and works to promote those
-higher in the search rankings than others.
-
-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/>.
-*/
-
-#define G_LOG_DOMAIN "usagetracker"
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "usage-tracker.h"
-
-#include <glib.h>
-#include <glib/gstdio.h>
-#include <gio/gio.h>
-#include <sqlite3.h>
-#include "load-app-info.h"
-#include "create-db.h"
-#include "hudsettings.h"
-
-struct _UsageTrackerPrivate {
-	gchar * cachefile;
-	sqlite3 * db;
-	guint drop_timer;
-
-	/* SQL Statements */
-	sqlite3_stmt * insert_entry;
-	sqlite3_stmt * entry_count;
-	sqlite3_stmt * delete_aged;
-	sqlite3_stmt * application_count;
-};
-
-typedef enum {
-	SQL_VAR_APPLICATION = 1,
-	SQL_VAR_ENTRY = 2
-} sql_variables;
-
-#define SQL_VARS_APPLICATION  "1"
-#define SQL_VARS_ENTRY        "2"
-
-#define USAGE_TRACKER_GET_PRIVATE(o) \
-(G_TYPE_INSTANCE_GET_PRIVATE ((o), USAGE_TRACKER_TYPE, UsageTrackerPrivate))
-
-static void usage_tracker_dispose    (GObject *object);
-static void usage_tracker_finalize   (GObject *object);
-static void cleanup_db               (UsageTracker * self);
-static void configure_db             (UsageTracker * self);
-static void prepare_statements       (UsageTracker * self);
-static void build_db                 (UsageTracker * self);
-static gboolean drop_entries         (gpointer user_data);
-static void check_app_init (UsageTracker * self, const gchar * application);
-
-G_DEFINE_TYPE (UsageTracker, usage_tracker, G_TYPE_OBJECT);
-
-static void
-usage_tracker_class_init (UsageTrackerClass *klass)
-{
-	GObjectClass *object_class = G_OBJECT_CLASS (klass);
-
-	g_type_class_add_private (klass, sizeof (UsageTrackerPrivate));
-
-	object_class->dispose = usage_tracker_dispose;
-	object_class->finalize = usage_tracker_finalize;
-
-	return;
-}
-
-static void
-usage_tracker_init (UsageTracker *self)
-{
-	self->priv = USAGE_TRACKER_GET_PRIVATE(self);
-
-	self->priv->cachefile = NULL;
-	self->priv->db = NULL;
-	self->priv->drop_timer = 0;
-
-	self->priv->insert_entry = NULL;
-	self->priv->entry_count = NULL;
-	self->priv->delete_aged = NULL;
-	self->priv->application_count = NULL;
-
-	configure_db(self);
-
-	/* Drop entries daily if we run for a really long time */
-	self->priv->drop_timer = g_timeout_add_seconds(24 * 60 * 60, drop_entries, self);
-	
-	return;
-}
-
-static void
-usage_tracker_dispose (GObject *object)
-{
-	UsageTracker * self = USAGE_TRACKER(object);
-
-	cleanup_db(self);
-
-	if (self->priv->drop_timer != 0) {
-		g_source_remove(self->priv->drop_timer);
-		self->priv->drop_timer = 0;
-	}
-
-	G_OBJECT_CLASS (usage_tracker_parent_class)->dispose (object);
-	return;
-}
-
-static void
-usage_tracker_finalize (GObject *object)
-{
-	UsageTracker * self = USAGE_TRACKER(object);
-
-	if (self->priv->cachefile != NULL) {
-		g_free(self->priv->cachefile);
-		self->priv->cachefile = NULL;
-	}
-
-	G_OBJECT_CLASS (usage_tracker_parent_class)->finalize (object);
-	return;
-}
-
-/* Small function to make sure we get all the DB components cleaned
-   up in the spaces we need them */
-static void
-cleanup_db (UsageTracker * self)
-{
-	if (self->priv->insert_entry != NULL) {
-		sqlite3_finalize(self->priv->insert_entry);
-		self->priv->insert_entry = NULL;
-	}
-
-	if (self->priv->entry_count != NULL) {
-		sqlite3_finalize(self->priv->entry_count);
-		self->priv->entry_count = NULL;
-	}
-
-	if (self->priv->delete_aged != NULL) {
-		sqlite3_finalize(self->priv->delete_aged);
-		self->priv->delete_aged = NULL;
-	}
-
-	if (self->priv->application_count != NULL) {
-		sqlite3_finalize(self->priv->application_count);
-		self->priv->application_count = NULL;
-	}
-
-	if (self->priv->db != NULL) {
-		sqlite3_close(self->priv->db);
-		self->priv->db = NULL;
-	}
-
-	return;
-}
-
-UsageTracker *
-usage_tracker_new (void)
-{
-	return g_object_new(USAGE_TRACKER_TYPE, NULL);
-}
-
-/* Configure which database we should be using */
-static void
-configure_db (UsageTracker * self)
-{
-	/* Removing the previous database */
-	cleanup_db(self);
-
-	if (self->priv->cachefile != NULL) {
-		g_free(self->priv->cachefile);
-		self->priv->cachefile = NULL;
-	}
-	
-	/* Determine where his database should be built */
-	gboolean usage_data = hud_settings.store_usage_data;
-
-	if (g_getenv("HUD_NO_STORE_USAGE_DATA") != NULL) {
-		usage_data = FALSE;
-	}
-
-	if (usage_data) {
-		g_debug("Storing usage data on filesystem");
-	}
-
-	/* Setting up the new database */
-	gboolean db_exists = FALSE;
-
-	if (usage_data) {
-		/* If we're storing the usage data we need to figure out
-		   how to do it on disk */
-
-		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)) {
-			if (g_mkdir(cachedir, 00700) != 0) {
-				g_warning("Could not create cache directory, LRU DB can't be created");
-				self->priv->db = NULL;
-				g_free(cachedir);
-				return;
-			}
-		}
-		g_free(cachedir);
-
-		self->priv->cachefile = g_build_filename(basecachedir, "indicator-appmenu", "hud-usage-log.sqlite", NULL);
-		db_exists = g_file_test(self->priv->cachefile, G_FILE_TEST_EXISTS);
-		int open_status = sqlite3_open(self->priv->cachefile, &self->priv->db); 
-
-		if (open_status != SQLITE_OK) {
-			g_warning("Error building LRU DB");
-			sqlite3_close(self->priv->db);
-			self->priv->db = NULL;
-		}
-	} else {
-		/* If we're not storing it, let's make an in memory database
-		   so that we can use the app-info, and get better, but we don't
-		   give anyone that data. */
-		self->priv->cachefile = g_strdup(":memory:");
-
-		int open_status = sqlite3_open(self->priv->cachefile, &self->priv->db); 
-
-		if (open_status != SQLITE_OK) {
-			g_warning("Error building LRU DB");
-			sqlite3_close(self->priv->db);
-			self->priv->db = NULL;
-		}
-	}
-
-	if (self->priv->db != NULL && !db_exists) {
-		build_db(self);
-	}
-
-	prepare_statements(self);
-
-	drop_entries(self);
-
-	return;
-}
-
-/* Build all the prepared statments */
-static void
-prepare_statements (UsageTracker * self)
-{
-	if (self->priv->db == NULL) {
-		return;
-	}
-
-	/* These should never happen, but let's just check to make sure */
-	g_return_if_fail(self->priv->insert_entry == NULL);
-	g_return_if_fail(self->priv->entry_count == NULL);
-	g_return_if_fail(self->priv->delete_aged == NULL);
-	g_return_if_fail(self->priv->application_count == NULL);
-
-	int prepare_status = SQLITE_OK;
-
-	/* Insert Statement */
-	prepare_status = sqlite3_prepare_v2(self->priv->db,
-	                                    "insert into usage (application, entry, timestamp) values (?" SQL_VARS_APPLICATION ", ?" SQL_VARS_ENTRY ", date('now', 'utc'));",
-	                                    -1, /* length */
-	                                    &(self->priv->insert_entry),
-	                                    NULL); /* unused stmt */
-
-	if (prepare_status != SQLITE_OK) {
-		g_warning("Unable to prepare insert entry statement: %s", sqlite3_errmsg(self->priv->db));
-		self->priv->insert_entry = NULL;
-	}
-
-	/* Entry Count Statement */
-	prepare_status = sqlite3_prepare_v2(self->priv->db,
-	                                    "select count(*) from usage where application = ?" SQL_VARS_APPLICATION " and entry = ?" SQL_VARS_ENTRY " and timestamp > date('now', 'utc', '-30 days');",
-	                                    -1, /* length */
-	                                    &(self->priv->entry_count),
-	                                    NULL); /* unused stmt */
-
-	if (prepare_status != SQLITE_OK) {
-		g_warning("Unable to prepare entry count statement: %s", sqlite3_errmsg(self->priv->db));
-		self->priv->entry_count = NULL;
-	}
-
-	/* Delete Aged Statement */
-	prepare_status = sqlite3_prepare_v2(self->priv->db,
-	                                    "delete from usage where timestamp < date('now', 'utc', '-30 days');",
-	                                    -1, /* length */
-	                                    &(self->priv->delete_aged),
-	                                    NULL); /* unused stmt */
-
-	if (prepare_status != SQLITE_OK) {
-		g_warning("Unable to prepare delete aged statement: %s", sqlite3_errmsg(self->priv->db));
-		self->priv->delete_aged = NULL;
-	}
-
-	/* Application Count Statement */
-	prepare_status = sqlite3_prepare_v2(self->priv->db,
-	                                    "select count(*) from usage where application = ?" SQL_VARS_APPLICATION ";",
-	                                    -1, /* length */
-	                                    &(self->priv->application_count),
-	                                    NULL); /* unused stmt */
-
-	if (prepare_status != SQLITE_OK) {
-		g_warning("Unable to prepare application count statement: %s", sqlite3_errmsg(self->priv->db));
-		self->priv->application_count = NULL;
-	}
-
-	return;
-}
-
-/* Build the database */
-static void
-build_db (UsageTracker * self)
-{
-	g_debug("New database, initializing");
-
-	/* Create the table */
-	int exec_status = SQLITE_OK;
-	gchar * failstring = NULL;
-	exec_status = sqlite3_exec(self->priv->db,
-	                           create_db,
-	                           NULL, NULL, &failstring);
-	if (exec_status != SQLITE_OK) {
-		g_warning("Unable to create table: %s", failstring);
-	}
-
-	return;
-}
-
-void
-usage_tracker_mark_usage (UsageTracker * self, const gchar * application, const gchar * entry)
-{
-	g_return_if_fail(IS_USAGE_TRACKER(self));
-	g_return_if_fail(self->priv->db != NULL);
-
-	g_debug ("Marking %s %s", application, entry);
-
-	check_app_init(self, application);
-
-	sqlite3_reset(self->priv->insert_entry);
-
-	int bind_status = SQLITE_OK;
-
-	bind_status = sqlite3_bind_text(self->priv->insert_entry, SQL_VAR_APPLICATION, application, -1, SQLITE_TRANSIENT);
-	if (bind_status != SQLITE_OK) {
-		g_warning("Unable to bind application info: %s", sqlite3_errmsg(self->priv->db));
-		return;
-	}
-
-	bind_status = sqlite3_bind_text(self->priv->insert_entry, SQL_VAR_ENTRY, entry, -1, SQLITE_TRANSIENT);
-	if (bind_status != SQLITE_OK) {
-		g_warning("Unable to bind entry info: %s", sqlite3_errmsg(self->priv->db));
-		return;
-	}
-
-	int exec_status = SQLITE_ROW;
-	while ((exec_status = sqlite3_step(self->priv->insert_entry)) == SQLITE_ROW) {
-	}
-
-	if (exec_status != SQLITE_DONE) {
-		g_warning("Unknown status from executing insert_entry: %d", exec_status);
-	}
-
-	return;
-}
-
-guint
-usage_tracker_get_usage (UsageTracker * self, const gchar * application, const gchar * entry)
-{
-	g_return_val_if_fail(IS_USAGE_TRACKER(self), 0);
-	g_return_val_if_fail(self->priv->db != NULL, 0);
-
-	check_app_init(self, application);
-
-	sqlite3_reset(self->priv->entry_count);
-
-	int bind_status = SQLITE_OK;
-
-	bind_status = sqlite3_bind_text(self->priv->entry_count, SQL_VAR_APPLICATION, application, -1, SQLITE_TRANSIENT);
-	if (bind_status != SQLITE_OK) {
-		g_warning("Unable to bind application info: %s", sqlite3_errmsg(self->priv->db));
-		return 0;
-	}
-
-	bind_status = sqlite3_bind_text(self->priv->entry_count, SQL_VAR_ENTRY, entry, -1, SQLITE_TRANSIENT);
-	if (bind_status != SQLITE_OK) {
-		g_warning("Unable to bind entry info: %s", sqlite3_errmsg(self->priv->db));
-		return 0;
-	}
-
-	int exec_status = SQLITE_ROW;
-	guint count = 0;
-
-	while ((exec_status = sqlite3_step(self->priv->entry_count)) == SQLITE_ROW) {
-		count = sqlite3_column_int(self->priv->entry_count, 0);
-	}
-
-	if (exec_status != SQLITE_DONE) {
-		g_warning("Unknown status from executing entry_count: %d", exec_status);
-	}
-
-	g_debug ("Usage of %s %s is %u", application, entry, count);
-
-	return count;
-}
-
-/* Drop the entries from the database that have expired as they are
-   over 30 days old */
-static gboolean
-drop_entries (gpointer user_data)
-{
-	g_return_val_if_fail(IS_USAGE_TRACKER(user_data), FALSE);
-	UsageTracker * self = USAGE_TRACKER(user_data);
-
-	if (self->priv->db == NULL) {
-		return TRUE;
-	}
-
-	sqlite3_reset(self->priv->delete_aged);
-
-	int exec_status = SQLITE_ROW;
-	while ((exec_status = sqlite3_step(self->priv->delete_aged)) == SQLITE_ROW) {
-	}
-
-	if (exec_status != SQLITE_DONE) {
-		g_warning("Unknown status from executing delete_aged: %d", exec_status);
-	}
-
-	return TRUE;
-}
-
-static void
-check_app_init (UsageTracker * self, const gchar * application)
-{
-	sqlite3_reset(self->priv->application_count);
-
-	int bind_status = SQLITE_OK;
-	bind_status = sqlite3_bind_text(self->priv->application_count, SQL_VAR_APPLICATION, application, -1, SQLITE_TRANSIENT);
-	if (bind_status != SQLITE_OK) {
-		g_warning("Unable to bind application info: %s", sqlite3_errmsg(self->priv->db));
-		return;
-	}
-
-	int exec_status = SQLITE_ROW;
-	guint count = 0;
-
-	while ((exec_status = sqlite3_step(self->priv->application_count)) == SQLITE_ROW) {
-		count = sqlite3_column_int(self->priv->application_count, 0);
-	}
-
-	if (exec_status != SQLITE_DONE) {
-		g_warning("Unknown status from executing application_count: %d", exec_status);
-	}
-
-	if (count > 0) {
-		return;
-	}
-
-	g_debug("Initializing application: %s", application);
-	gchar * basename = g_path_get_basename(application);
-
-	gchar * app_info_path = NULL;
-
-	if (g_getenv("HUD_APP_INFO_DIR") != NULL) {
-		app_info_path = g_strdup(g_getenv("HUD_APP_INFO_DIR"));
-	} else {
-		app_info_path = g_build_filename(DATADIR, "indicator-appmenu", "hud", "app-info", NULL);
-	}
-
-	gchar * app_info_filename = g_strdup_printf("%s.hud-app-info", basename);
-	gchar * app_info = g_build_filename(app_info_path, app_info_filename, NULL);
-
-	if (!load_app_info(app_info, self->priv->db)) {
-		if (g_file_test(app_info, G_FILE_TEST_EXISTS)) {
-			g_warning("Unable to load application information for application '%s' at path '%s'", application, app_info);
-		}
-	}
-
-	g_free(app_info);
-	g_free(app_info_filename);
-	g_free(app_info_path);
-	g_free(basename);
-
-	return;
-}
-
-UsageTracker *
-usage_tracker_get_instance (void)
-{
-  static UsageTracker *usage_tracker_instance;
-
-  if (usage_tracker_instance == NULL)
-    usage_tracker_instance = usage_tracker_new ();
-
-  return usage_tracker_instance;
-}

=== removed file 'src/usage-tracker.h'
--- src/usage-tracker.h	2012-02-28 15:22:00 +0000
+++ src/usage-tracker.h	1970-01-01 00:00:00 +0000
@@ -1,59 +0,0 @@
-/*
-Tracks which menu items get used by users and works to promote those
-higher in the search rankings than others.
-
-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 __USAGE_TRACKER_H__
-#define __USAGE_TRACKER_H__
-
-#include <glib-object.h>
-
-G_BEGIN_DECLS
-
-#define USAGE_TRACKER_TYPE            (usage_tracker_get_type ())
-#define USAGE_TRACKER(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), USAGE_TRACKER_TYPE, UsageTracker))
-#define USAGE_TRACKER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), USAGE_TRACKER_TYPE, UsageTrackerClass))
-#define IS_USAGE_TRACKER(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), USAGE_TRACKER_TYPE))
-#define IS_USAGE_TRACKER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), USAGE_TRACKER_TYPE))
-#define USAGE_TRACKER_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), USAGE_TRACKER_TYPE, UsageTrackerClass))
-
-typedef struct _UsageTracker        UsageTracker;
-typedef struct _UsageTrackerClass   UsageTrackerClass;
-typedef struct _UsageTrackerPrivate UsageTrackerPrivate;
-
-struct _UsageTrackerClass {
-	GObjectClass parent_class;
-};
-
-struct _UsageTracker {
-	GObject parent;
-
-	UsageTrackerPrivate * priv;
-};
-
-GType usage_tracker_get_type (void);
-UsageTracker * usage_tracker_new (void);
-void usage_tracker_mark_usage (UsageTracker * self, const gchar * application, const gchar * entry);
-guint usage_tracker_get_usage (UsageTracker * self, const gchar * application, const gchar * entry);
-UsageTracker * usage_tracker_get_instance (void);
-
-G_END_DECLS
-
-#endif