From f8d65da606cc460ebac5f273b754e8885dc91433 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Tue, 19 Jan 2010 10:42:11 -0600
Subject: Adding an object to start tracking the lru of the app indicators

---
 src/Makefile.am                    |  2 ++
 src/application-service-lru-file.c | 56 ++++++++++++++++++++++++++++++++++++++
 src/application-service-lru-file.h | 33 ++++++++++++++++++++++
 3 files changed, 91 insertions(+)
 create mode 100644 src/application-service-lru-file.c
 create mode 100644 src/application-service-lru-file.h

diff --git a/src/Makefile.am b/src/Makefile.am
index d9b7963..38e6dd9 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -35,6 +35,8 @@ indicator_application_service_SOURCES = \
 	application-service.c \
 	application-service-appstore.h \
 	application-service-appstore.c \
+	application-service-lru-file.h \
+	application-service-lru-file.c \
 	application-service-marshal.h \
 	application-service-marshal.c \
 	application-service-server.h \
diff --git a/src/application-service-lru-file.c b/src/application-service-lru-file.c
new file mode 100644
index 0000000..3cbb1dc
--- /dev/null
+++ b/src/application-service-lru-file.c
@@ -0,0 +1,56 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "application-service-lru-file.h"
+
+typedef struct _AppLruFilePrivate AppLruFilePrivate;
+struct _AppLruFilePrivate {
+	gint temp;
+};
+
+#define APP_LRU_FILE_GET_PRIVATE(o) \
+		(G_TYPE_INSTANCE_GET_PRIVATE ((o), APP_LRU_FILE_TYPE, AppLruFilePrivate))
+
+static void app_lru_file_class_init (AppLruFileClass *klass);
+static void app_lru_file_init       (AppLruFile *self);
+static void app_lru_file_dispose    (GObject *object);
+static void app_lru_file_finalize   (GObject *object);
+
+G_DEFINE_TYPE (AppLruFile, app_lru_file, G_TYPE_OBJECT);
+
+static void
+app_lru_file_class_init (AppLruFileClass *klass)
+{
+	GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+	g_type_class_add_private (klass, sizeof (AppLruFilePrivate));
+
+	object_class->dispose = app_lru_file_dispose;
+	object_class->finalize = app_lru_file_finalize;
+
+	return;
+}
+
+static void
+app_lru_file_init (AppLruFile *self)
+{
+
+	return;
+}
+
+static void
+app_lru_file_dispose (GObject *object)
+{
+
+	G_OBJECT_CLASS (app_lru_file_parent_class)->dispose (object);
+	return;
+}
+
+static void
+app_lru_file_finalize (GObject *object)
+{
+
+	G_OBJECT_CLASS (app_lru_file_parent_class)->finalize (object);
+	return;
+}
diff --git a/src/application-service-lru-file.h b/src/application-service-lru-file.h
new file mode 100644
index 0000000..6577278
--- /dev/null
+++ b/src/application-service-lru-file.h
@@ -0,0 +1,33 @@
+#ifndef __APP_LRU_FILE_H__
+#define __APP_LRU_FILE_H__
+
+#include <glib.h>
+#include <glib-object.h>
+
+G_BEGIN_DECLS
+
+#define APP_LRU_FILE_TYPE            (app_lru_file_get_type ())
+#define APP_LRU_FILE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), APP_LRU_FILE_TYPE, AppLruFile))
+#define APP_LRU_FILE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), APP_LRU_FILE_TYPE, AppLruFileClass))
+#define IS_APP_LRU_FILE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), APP_LRU_FILE_TYPE))
+#define IS_APP_LRU_FILE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), APP_LRU_FILE_TYPE))
+#define APP_LRU_FILE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), APP_LRU_FILE_TYPE, AppLruFileClass))
+
+typedef struct _AppLruFile      AppLruFile;
+typedef struct _AppLruFileClass AppLruFileClass;
+
+struct _AppLruFileClass {
+	GObjectClass parent_class;
+
+};
+
+struct _AppLruFile {
+	GObject parent;
+
+};
+
+GType app_lru_file_get_type (void);
+
+G_END_DECLS
+
+#endif
-- 
cgit v1.2.3


From 2f82ed57b751145449506164888281b57819abcc Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Tue, 19 Jan 2010 17:01:57 -0600
Subject: Adding some API to our LRU file

---
 src/application-service-lru-file.c | 33 +++++++++++++++++++++++++++++++++
 src/application-service-lru-file.h |  4 ++++
 2 files changed, 37 insertions(+)

diff --git a/src/application-service-lru-file.c b/src/application-service-lru-file.c
index 3cbb1dc..47cfab9 100644
--- a/src/application-service-lru-file.c
+++ b/src/application-service-lru-file.c
@@ -54,3 +54,36 @@ app_lru_file_finalize (GObject *object)
 	G_OBJECT_CLASS (app_lru_file_parent_class)->finalize (object);
 	return;
 }
+
+/* API */
+
+/* Simple helper to create a new object */
+AppLruFile *
+app_lru_file_new (void)
+{
+	return APP_LRU_FILE(g_object_new(APP_LRU_FILE_TYPE, NULL));
+}
+
+/* This updates the timestamp for a particular
+   entry in the database.  It also queues up a 
+   write out of the database.  But that'll happen
+   later. */
+void
+app_lru_file_touch (AppLruFile * lrufile, const gchar * id, const gchar * category)
+{
+	g_return_if_fail(IS_APP_LRU_FILE(lrufile));
+	g_return_if_fail(id != NULL && id[0] != '\0');
+	g_return_if_fail(category != NULL && category[0] != '\0');
+
+	return;
+}
+
+/* Used to sort or compare different applications. */
+gint
+app_lru_file_sort (AppLruFile * lrufile, const gchar * id_a, const gchar * id_b)
+{
+	g_return_val_if_fail(IS_APP_LRU_FILE(lrufile), -1);
+
+
+	return 0;
+}
diff --git a/src/application-service-lru-file.h b/src/application-service-lru-file.h
index 6577278..45d3082 100644
--- a/src/application-service-lru-file.h
+++ b/src/application-service-lru-file.h
@@ -28,6 +28,10 @@ struct _AppLruFile {
 
 GType app_lru_file_get_type (void);
 
+AppLruFile * app_lru_file_new (void);
+void app_lru_file_touch (AppLruFile * lrufile, const gchar * id, const gchar * category);
+gint app_lru_file_sort  (AppLruFile * lrufile, const gchar * id_a, const gchar * id_b);
+
 G_END_DECLS
 
 #endif
-- 
cgit v1.2.3


From 85394de1aa25fea66bbe30e3ceeafc754f2e8ff7 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Tue, 19 Jan 2010 17:04:20 -0600
Subject: Building the LRU file.

---
 src/application-service.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/application-service.c b/src/application-service.c
index 351e9aa..abb86ee 100644
--- a/src/application-service.c
+++ b/src/application-service.c
@@ -25,6 +25,7 @@ with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "notification-item-client.h"
 #include "application-service-appstore.h"
 #include "application-service-watcher.h"
+#include "application-service-lru-file.h"
 #include "dbus-shared.h"
 
 /* The base main loop */
@@ -35,6 +36,8 @@ static ApplicationServiceAppstore * appstore = NULL;
 static ApplicationServiceWatcher * watcher = NULL;
 /* The service management interface */
 static IndicatorService * service = NULL;
+/* The LRU file interface */
+static AppLruFile * lrufile = NULL;
 
 /* Recieves the disonnection signal from the service
    object and closes the mainloop. */
@@ -59,6 +62,9 @@ main (int argc, char ** argv)
 	service = indicator_service_new(INDICATOR_APPLICATION_DBUS_ADDR);
 	g_signal_connect(G_OBJECT(service), INDICATOR_SERVICE_SIGNAL_SHUTDOWN, G_CALLBACK(service_disconnected), NULL);
 
+	/* Start up the LRU file reading */
+	lrufile = app_lru_file_new();
+
 	/* Building our app store */
 	appstore = APPLICATION_SERVICE_APPSTORE(g_object_new(APPLICATION_SERVICE_APPSTORE_TYPE, NULL));
 
-- 
cgit v1.2.3


From 08fef8dc585407e88d27da07a7c6fd726303a0dd Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Tue, 19 Jan 2010 17:20:21 -0600
Subject: Adding a _new function for the appstore and using it.  It now takes
 the lru file.

---
 src/application-service-appstore.c | 13 +++++++++++++
 src/application-service-appstore.h |  2 ++
 src/application-service.c          |  3 ++-
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/application-service-appstore.c b/src/application-service-appstore.c
index d0b5570..2121a0d 100644
--- a/src/application-service-appstore.c
+++ b/src/application-service-appstore.c
@@ -52,6 +52,7 @@ typedef struct _ApplicationServiceAppstorePrivate ApplicationServiceAppstorePriv
 struct _ApplicationServiceAppstorePrivate {
 	DBusGConnection * bus;
 	GList * applications;
+	AppLruFile * lrufile;
 };
 
 #define APP_STATUS_PASSIVE_STR    "passive"
@@ -148,6 +149,7 @@ application_service_appstore_init (ApplicationServiceAppstore *self)
 	ApplicationServiceAppstorePrivate * priv = APPLICATION_SERVICE_APPSTORE_GET_PRIVATE(self);
 
 	priv->applications = NULL;
+	priv->lrufile = NULL;
 	
 	GError * error = NULL;
 	priv->bus = dbus_g_bus_get(DBUS_BUS_STARTER, &error);
@@ -645,6 +647,17 @@ application_service_appstore_application_remove (ApplicationServiceAppstore * ap
 	return;
 }
 
+/* Creates a basic appstore object and attaches the
+   LRU file object to it. */
+ApplicationServiceAppstore *
+application_service_appstore_new (AppLruFile * lrufile)
+{
+	ApplicationServiceAppstore * appstore = APPLICATION_SERVICE_APPSTORE(g_object_new(APPLICATION_SERVICE_APPSTORE_TYPE, NULL));
+	ApplicationServiceAppstorePrivate * priv = APPLICATION_SERVICE_APPSTORE_GET_PRIVATE(appstore);
+	priv->lrufile = lrufile;
+	return appstore;
+}
+
 /* DBus Interface */
 static gboolean
 _application_service_server_get_applications (ApplicationServiceAppstore * appstore, GArray ** apps)
diff --git a/src/application-service-appstore.h b/src/application-service-appstore.h
index 6bd7a01..d2e0013 100644
--- a/src/application-service-appstore.h
+++ b/src/application-service-appstore.h
@@ -25,6 +25,7 @@ with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <glib.h>
 #include <glib-object.h>
+#include "application-service-lru-file.h"
 
 G_BEGIN_DECLS
 
@@ -50,6 +51,7 @@ struct _ApplicationServiceAppstore {
 	GObject parent;
 };
 
+ApplicationServiceAppstore * application_service_appstore_new (AppLruFile * lrufile);
 GType application_service_appstore_get_type               (void);
 void  application_service_appstore_application_add        (ApplicationServiceAppstore *   appstore,
                                                       const gchar *             dbus_name,
diff --git a/src/application-service.c b/src/application-service.c
index abb86ee..ffd042e 100644
--- a/src/application-service.c
+++ b/src/application-service.c
@@ -66,7 +66,7 @@ main (int argc, char ** argv)
 	lrufile = app_lru_file_new();
 
 	/* Building our app store */
-	appstore = APPLICATION_SERVICE_APPSTORE(g_object_new(APPLICATION_SERVICE_APPSTORE_TYPE, NULL));
+	appstore = application_service_appstore_new(lrufile);
 
 	/* Adding a watcher for the Apps coming up */
 	watcher = application_service_watcher_new(appstore);
@@ -79,6 +79,7 @@ main (int argc, char ** argv)
 	g_object_unref(G_OBJECT(watcher));
 	g_object_unref(G_OBJECT(appstore));
 	g_object_unref(G_OBJECT(service));
+	g_object_unref(G_OBJECT(lrufile));
 
 	return 0;
 }
-- 
cgit v1.2.3


From e8d460427dd2147f2d8e7f4d648f4a49a3afaed3 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Tue, 19 Jan 2010 17:21:22 -0600
Subject: Protecting our _new a little bit.

---
 src/application-service-appstore.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/application-service-appstore.c b/src/application-service-appstore.c
index 2121a0d..e734bdd 100644
--- a/src/application-service-appstore.c
+++ b/src/application-service-appstore.c
@@ -652,6 +652,7 @@ application_service_appstore_application_remove (ApplicationServiceAppstore * ap
 ApplicationServiceAppstore *
 application_service_appstore_new (AppLruFile * lrufile)
 {
+	g_return_val_if_fail(IS_APP_LRU_FILE(lrufile), NULL);
 	ApplicationServiceAppstore * appstore = APPLICATION_SERVICE_APPSTORE(g_object_new(APPLICATION_SERVICE_APPSTORE_TYPE, NULL));
 	ApplicationServiceAppstorePrivate * priv = APPLICATION_SERVICE_APPSTORE_GET_PRIVATE(appstore);
 	priv->lrufile = lrufile;
-- 
cgit v1.2.3


From 570fc9486cb9f0a442ce0989c2bff1bc7942e67f Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Tue, 19 Jan 2010 20:44:23 -0600
Subject: Adding in the 'id' and 'category' fields to the application
 structure.

---
 src/application-service-appstore.c | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/src/application-service-appstore.c b/src/application-service-appstore.c
index e734bdd..7d925d2 100644
--- a/src/application-service-appstore.c
+++ b/src/application-service-appstore.c
@@ -68,6 +68,8 @@ enum _ApplicationStatus {
 
 typedef struct _Application Application;
 struct _Application {
+	gchar * id;
+	gchar * category;
 	gchar * dbus_name;
 	gchar * dbus_object;
 	ApplicationServiceAppstore * appstore; /* not ref'd */
@@ -203,6 +205,8 @@ get_all_properties_cb (DBusGProxy * proxy, GHashTable * properties, GError * err
 	Application * app = (Application *)data;
 
 	if (g_hash_table_lookup(properties, NOTIFICATION_ITEM_PROP_MENU) == NULL ||
+			g_hash_table_lookup(properties, NOTIFICATION_ITEM_PROP_ID) == NULL ||
+			g_hash_table_lookup(properties, NOTIFICATION_ITEM_PROP_CATEGORY) == NULL ||
 			g_hash_table_lookup(properties, NOTIFICATION_ITEM_PROP_STATUS) == NULL ||
 			g_hash_table_lookup(properties, NOTIFICATION_ITEM_PROP_ICON_NAME) == NULL) {
 		g_warning("Notification Item on object %s of %s doesn't have enough properties.", app->dbus_object, app->dbus_name);
@@ -212,6 +216,11 @@ get_all_properties_cb (DBusGProxy * proxy, GHashTable * properties, GError * err
 
 	app->validated = TRUE;
 
+	app->id = g_value_dup_string(g_hash_table_lookup(properties, NOTIFICATION_ITEM_PROP_ID));
+	app->category = g_value_dup_string(g_hash_table_lookup(properties, NOTIFICATION_ITEM_PROP_CATEGORY));
+	ApplicationServiceAppstorePrivate * priv = APPLICATION_SERVICE_APPSTORE_GET_PRIVATE(app->appstore);
+	app_lru_file_touch(priv->lrufile, app->id, app->category);
+
 	app->icon = g_value_dup_string(g_hash_table_lookup(properties, NOTIFICATION_ITEM_PROP_ICON_NAME));
 	app->menu = g_value_dup_string(g_hash_table_lookup(properties, NOTIFICATION_ITEM_PROP_MENU));
 	if (g_hash_table_lookup(properties, NOTIFICATION_ITEM_PROP_AICON_NAME) != NULL) {
@@ -275,6 +284,12 @@ application_free (Application * app)
 		g_object_unref(app->prop_proxy);
 	}
 
+	if (app->id != NULL) {
+		g_free(app->id);
+	}
+	if (app->category != NULL) {
+		g_free(app->category);
+	}
 	if (app->dbus_name != NULL) {
 		g_free(app->dbus_name);
 	}
-- 
cgit v1.2.3


From a634890d9684f87b796670c89383066bb674863d Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Tue, 19 Jan 2010 20:57:26 -0600
Subject: Switching to inserting in the application array using a sort
 function.  Looking that up in the LRU file DB.

---
 src/application-service-appstore.c | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/application-service-appstore.c b/src/application-service-appstore.c
index 7d925d2..4cb2ab6 100644
--- a/src/application-service-appstore.c
+++ b/src/application-service-appstore.c
@@ -350,6 +350,18 @@ can_add_application (GList *applications, Application *app)
   return TRUE;
 }
 
+/* This function takes two Application structure
+   pointers and uses the lrufile to compare them. */
+static gint
+app_sort_func (gconstpointer a, gconstpointer b, gpointer userdata)
+{
+	Application * appa = (Application *)a;
+	Application * appb = (Application *)b;
+	AppLruFile * lrufile = (AppLruFile *)userdata;
+
+	return app_lru_file_sort(lrufile, appa->id, appb->id);
+}
+
 /* Change the status of the application.  If we're going passive
    it removes it from the panel.  If we're coming online, then
    it add it to the panel.  Otherwise it changes the icon. */
@@ -384,16 +396,12 @@ apply_status (Application * app, ApplicationStatus status)
 		if (app->status == APP_STATUS_PASSIVE) {
                         if (can_add_application (priv->applications, app)) {
                                 /* Put on panel */
-                                priv->applications = g_list_prepend (priv->applications, app);
-
-                                /* TODO: We need to have the position determined better.  This
-                                   would involve looking at the name and category and sorting
-                                   it with the other entries. */
+                                priv->applications = g_list_insert_sorted_with_data (priv->applications, app, app_sort_func, priv->lrufile);
 
                                 g_signal_emit(G_OBJECT(app->appstore),
                                               signals[APPLICATION_ADDED], 0,
                                               newicon,
-                                              0, /* Position */
+                                              g_list_index(priv->applications, app), /* Position */
                                               app->dbus_name,
                                               app->menu,
                                               app->icon_path,
-- 
cgit v1.2.3


From c663b234f90d1b6b5c5eea53d309d5295342b1e0 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Wed, 20 Jan 2010 11:14:21 -0600
Subject: Allocating memory and objects in the lur world

---
 src/application-service-lru-file.c | 69 +++++++++++++++++++++++++++++++++++++-
 1 file changed, 68 insertions(+), 1 deletion(-)

diff --git a/src/application-service-lru-file.c b/src/application-service-lru-file.c
index 47cfab9..a041453 100644
--- a/src/application-service-lru-file.c
+++ b/src/application-service-lru-file.c
@@ -6,7 +6,18 @@
 
 typedef struct _AppLruFilePrivate AppLruFilePrivate;
 struct _AppLruFilePrivate {
-	gint temp;
+	GHashTable * apps;
+	gboolean dirty;
+	guint timer;
+	gchar * filename;
+};
+
+typedef struct _AppData AppData;
+struct _AppData {
+	gchar * id;
+	gchar * category;
+	GTimeVal last_touched;
+	GTimeVal first_touched;
 };
 
 #define APP_LRU_FILE_GET_PRIVATE(o) \
@@ -16,9 +27,12 @@ static void app_lru_file_class_init (AppLruFileClass *klass);
 static void app_lru_file_init       (AppLruFile *self);
 static void app_lru_file_dispose    (GObject *object);
 static void app_lru_file_finalize   (GObject *object);
+static void app_data_free           (gpointer data);
+static gboolean load_from_file      (gpointer data);
 
 G_DEFINE_TYPE (AppLruFile, app_lru_file, G_TYPE_OBJECT);
 
+/* Set up the class variable stuff */
 static void
 app_lru_file_class_init (AppLruFileClass *klass)
 {
@@ -32,29 +46,82 @@ app_lru_file_class_init (AppLruFileClass *klass)
 	return;
 }
 
+/* Set all the data of the per-instance variables */
 static void
 app_lru_file_init (AppLruFile *self)
 {
+	AppLruFilePrivate * priv = APP_LRU_FILE_GET_PRIVATE(self);
+
+	/* Default values */
+	priv->apps = NULL;
+	priv->dirty = FALSE;
+	priv->timer = 0;
+	priv->filename = NULL;
+
+	/* Now let's build some stuff */
+	priv->apps = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, app_data_free);
+	priv->filename = g_build_filename(g_get_user_config_dir(), "indicators", "application", "lru-file.json", NULL);
+
+	/* No reason to delay other stuff for this, we'll
+	   merge any values that get touched. */
+	g_idle_add(load_from_file, self);
 
 	return;
 }
 
+/* Get rid of objects and other big things */
 static void
 app_lru_file_dispose (GObject *object)
 {
+	AppLruFilePrivate * priv = APP_LRU_FILE_GET_PRIVATE(object);
+
+	if (priv->timer != 0) {
+		g_source_remove(priv->timer);
+		priv->timer = 0;
+	}
+
+	if (priv->apps != NULL) {
+		/* Cleans up the keys and entries itself */
+		g_hash_table_destroy(priv->apps);
+		priv->apps = NULL;
+	}
 
 	G_OBJECT_CLASS (app_lru_file_parent_class)->dispose (object);
 	return;
 }
 
+/* Deallocate memory */
 static void
 app_lru_file_finalize (GObject *object)
 {
+	AppLruFilePrivate * priv = APP_LRU_FILE_GET_PRIVATE(object);
+	
+	if (priv->filename != NULL) {
+		g_free(priv->filename);
+		priv->filename = NULL;
+	}
 
 	G_OBJECT_CLASS (app_lru_file_parent_class)->finalize (object);
 	return;
 }
 
+/* Takes an AppData structure and free's the
+   memory from it. */
+static void
+app_data_free (gpointer data)
+{
+
+	return;
+}
+
+/* Loads all of the data out of a json file */
+static gboolean
+load_from_file (gpointer data)
+{
+
+	return FALSE;
+}
+
 /* API */
 
 /* Simple helper to create a new object */
-- 
cgit v1.2.3


From 064fd75a5fe489e03bba5b99ed170401d2fa1def Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Wed, 20 Jan 2010 11:45:13 -0600
Subject: Fleshing out touching.

---
 src/application-service-lru-file.c | 28 +++++++++++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

diff --git a/src/application-service-lru-file.c b/src/application-service-lru-file.c
index a041453..45fe9db 100644
--- a/src/application-service-lru-file.c
+++ b/src/application-service-lru-file.c
@@ -14,7 +14,6 @@ struct _AppLruFilePrivate {
 
 typedef struct _AppData AppData;
 struct _AppData {
-	gchar * id;
 	gchar * category;
 	GTimeVal last_touched;
 	GTimeVal first_touched;
@@ -110,6 +109,13 @@ app_lru_file_finalize (GObject *object)
 static void
 app_data_free (gpointer data)
 {
+	AppData * appdata = (AppData *)data;
+
+	if (appdata->category != NULL) {
+		g_free(appdata->category);
+	}
+
+	g_free(appdata);
 
 	return;
 }
@@ -142,6 +148,26 @@ app_lru_file_touch (AppLruFile * lrufile, const gchar * id, const gchar * catego
 	g_return_if_fail(id != NULL && id[0] != '\0');
 	g_return_if_fail(category != NULL && category[0] != '\0');
 
+	AppData * appdata = NULL;
+	AppLruFilePrivate * priv = APP_LRU_FILE_GET_PRIVATE(lrufile);
+	gpointer data = g_hash_table_lookup(priv->apps, id);
+
+	if (data == NULL) {
+		/* Oh, we don't have one, let's build it and put it
+		   into the hash table ourselves */
+		appdata = g_new0(AppData, 1);
+
+		appdata->category = g_strdup(category);
+		g_get_current_time(&(appdata->first_touched));
+		/* NOTE: last touched set below */
+
+		g_hash_table_insert(priv->apps, g_strdup(id), appdata);
+	} else {
+		/* Boring, we've got this one already */
+		appdata = (AppData *)data;
+	}
+
+	g_get_current_time(&(appdata->last_touched));
 	return;
 }
 
-- 
cgit v1.2.3


From 77f24c0cb4e46ea88a4594bd63875691c25234e4 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Wed, 20 Jan 2010 11:59:33 -0600
Subject: Making a sort function that looks at two Apps and determines their
 ordering.

---
 src/application-service-lru-file.c | 46 +++++++++++++++++++++++++++++++++++++-
 1 file changed, 45 insertions(+), 1 deletion(-)

diff --git a/src/application-service-lru-file.c b/src/application-service-lru-file.c
index 45fe9db..fd0b7ed 100644
--- a/src/application-service-lru-file.c
+++ b/src/application-service-lru-file.c
@@ -167,7 +167,9 @@ app_lru_file_touch (AppLruFile * lrufile, const gchar * id, const gchar * catego
 		appdata = (AppData *)data;
 	}
 
+	/* Touch it and mark the DB as dirty */
 	g_get_current_time(&(appdata->last_touched));
+	/* TODO: Make dirty */
 	return;
 }
 
@@ -177,6 +179,48 @@ app_lru_file_sort (AppLruFile * lrufile, const gchar * id_a, const gchar * id_b)
 {
 	g_return_val_if_fail(IS_APP_LRU_FILE(lrufile), -1);
 
+	/* Let's first look to see if the IDs are the same, this
+	   really shouldn't happen, but it'll be confusing if we
+	   don't get it out of the way to start. */
+	if (g_strcmp0(id_a, id_b) == 0) {
+		return 0;
+	}
+
+	AppLruFilePrivate * priv = APP_LRU_FILE_GET_PRIVATE(lrufile);
+
+	/* Now make sure we have app data for both of these.  If
+	   not we'll assume that the one without is newer? */
+	gpointer data_a = g_hash_table_lookup(priv->apps, id_a);
+	if (data_a == NULL) {
+		return -1;
+	}
+
+	gpointer data_b = g_hash_table_lookup(priv->apps, id_b);
+	if (data_b == NULL) {
+		return 1;
+	}
+
+	/* Ugly casting */
+	AppData * appdata_a = (AppData *)data_a;
+	AppData * appdata_b = (AppData *)data_b;
+
+	/* Look at categories, we'll put the categories in alpha
+	   order if they're not the same. */
+	gint catcompare = g_strcmp0(appdata_a->category, appdata_b->category);
+	if (catcompare != 0) {
+		return catcompare;
+	}
+
+	/* Now we're looking at the first time that these two were
+	   seen in this account.  Only using seconds.  I mean, seriously. */
+	if (appdata_a->first_touched.tv_sec < appdata_b->first_touched.tv_sec) {
+		return -1;
+	}
+	if (appdata_b->first_touched.tv_sec < appdata_a->first_touched.tv_sec) {
+		return 1;
+	}
 
-	return 0;
+	/* Eh, this seems roughly impossible.  But if we have to choose,
+	   I like A better. */
+	return 1;
 }
-- 
cgit v1.2.3


From de476ff16608cc71b09c8ed6591c728b486f4b94 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Wed, 20 Jan 2010 13:36:38 -0600
Subject: Fleshing out the cleaning and dirtying functions.  Now we should
 write out a file.

---
 src/application-service-lru-file.c | 130 ++++++++++++++++++++++++++++++++++++-
 1 file changed, 129 insertions(+), 1 deletion(-)

diff --git a/src/application-service-lru-file.c b/src/application-service-lru-file.c
index fd0b7ed..c7911bc 100644
--- a/src/application-service-lru-file.c
+++ b/src/application-service-lru-file.c
@@ -2,6 +2,8 @@
 #include "config.h"
 #endif
 
+#include <string.h>
+#include <gio/gio.h>
 #include "application-service-lru-file.h"
 
 typedef struct _AppLruFilePrivate AppLruFilePrivate;
@@ -28,6 +30,9 @@ static void app_lru_file_dispose    (GObject *object);
 static void app_lru_file_finalize   (GObject *object);
 static void app_data_free           (gpointer data);
 static gboolean load_from_file      (gpointer data);
+static void clean_off_hash_cb (gpointer key, gpointer value, gpointer data);
+static void clean_off_write_cb (GObject * obj, GAsyncResult * res, gpointer data);
+static void clean_off_write_end_cb (GObject * obj, GAsyncResult * res, gpointer data);
 
 G_DEFINE_TYPE (AppLruFile, app_lru_file, G_TYPE_OBJECT);
 
@@ -128,6 +133,129 @@ load_from_file (gpointer data)
 	return FALSE;
 }
 
+/* Write out our cache to a file so that we can unmark the dirty
+   bit and be happy. */
+static gboolean
+clean_off (gpointer data)
+{
+	AppLruFile * lrufile = (AppLruFile *)data;
+	AppLruFilePrivate * priv = APP_LRU_FILE_GET_PRIVATE(lrufile);
+	priv->timer = 0;
+
+	GError * error = NULL;
+	GFile * file = g_file_new_for_path(priv->filename);
+	GFileOutputStream * ostream = g_file_replace(file,
+	                                             NULL, /* etag */
+	                                             TRUE, /* backup */
+	                                             G_FILE_CREATE_NONE, /* flags */
+	                                             NULL, /* cancelable */
+	                                             &error);
+	if (error != NULL) {
+		g_warning("Unable to open a file to store LRU file: %s", error->message);
+		return FALSE;
+	}
+
+	/* This is how the file will start and end. */
+	gchar * start = g_strdup("{\n  \"version\": 1");
+	gchar * end   = g_strdup("\n}\n");
+
+	/* Put the front on. */
+	g_output_stream_write_async(G_OUTPUT_STREAM(ostream),
+	                            start,
+	                            strlen(start),
+	                            G_PRIORITY_LOW,
+	                            NULL,
+	                            clean_off_write_cb,
+	                            start);
+
+	/* Put the middle in. */
+	g_hash_table_foreach (priv->apps, clean_off_hash_cb, ostream);
+
+
+	/* And then tack on the end. */
+	g_output_stream_write_async(G_OUTPUT_STREAM(ostream),
+	                            end,
+	                            strlen(end),
+	                            G_PRIORITY_LOW,
+	                            NULL,
+	                            clean_off_write_end_cb,
+	                            end);
+
+	return FALSE; /* drop the timer */
+}
+
+/* Looks at every value in the applications hash table and
+   turns it into a string for writing out. */
+static void
+clean_off_hash_cb (gpointer key, gpointer value, gpointer data)
+{
+	/* Mega-cast */
+	gchar * id = (gchar *)key;
+	AppData * appdata = (AppData *)value;
+	GOutputStream * ostream = (GOutputStream *)ostream;
+
+	gchar * firsttime = g_time_val_to_iso8601(&appdata->first_touched);
+	gchar * lasttime = g_time_val_to_iso8601(&appdata->last_touched);
+
+	gchar * output = g_strdup_printf(",\n  \"%s\": { \"first-time\": \"%s\", \"last-time\": \"%s\"}", id, firsttime, lasttime);
+
+	g_free(lasttime);
+	g_free(firsttime);
+
+	g_output_stream_write_async(ostream,
+	                            output,
+	                            strlen(output),
+	                            G_PRIORITY_LOW,
+	                            NULL,
+	                            clean_off_write_cb,
+	                            output);
+
+	return;
+}
+
+/* After the data has been written to the file we make
+   sure to free the string we created */
+static void
+clean_off_write_cb (GObject * obj, GAsyncResult * res, gpointer data)
+{
+	g_free(data);
+	return;
+}
+
+/* Very much like clean_off_write_cb except that it is the
+   last actor on this Output Stream so it closes it. */
+static void
+clean_off_write_end_cb (GObject * obj, GAsyncResult * res, gpointer data)
+{
+	clean_off_write_cb(obj, res, data);
+
+	GError * error = NULL;
+	g_output_stream_close(G_OUTPUT_STREAM(obj), NULL, &error);
+
+	if (error != NULL) {
+		g_warning("Unable to close LRU File: %s", error->message);
+		g_error_free(error);
+	}
+
+	return;
+}
+
+/* Sets the dirty bit if not already set and makes sure that
+   we have a timer to fix that at some point. */
+static void
+get_dirty (AppLruFile * lrufile)
+{
+	AppLruFilePrivate * priv = APP_LRU_FILE_GET_PRIVATE(lrufile);
+
+	priv->dirty = TRUE;
+
+	if (priv->timer == 0) {
+		priv->timer = g_timeout_add_seconds(60, clean_off, lrufile);
+	}
+
+	return;
+}
+
 /* API */
 
 /* Simple helper to create a new object */
@@ -169,7 +297,7 @@ app_lru_file_touch (AppLruFile * lrufile, const gchar * id, const gchar * catego
 
 	/* Touch it and mark the DB as dirty */
 	g_get_current_time(&(appdata->last_touched));
-	/* TODO: Make dirty */
+	get_dirty(lrufile);
 	return;
 }
 
-- 
cgit v1.2.3


From 39c33f772eb63624b4479a5d8a21eb58d37baf8e Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Wed, 20 Jan 2010 14:28:09 -0600
Subject: Build the directory and some debugging info

---
 src/application-service-lru-file.c | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/src/application-service-lru-file.c b/src/application-service-lru-file.c
index c7911bc..cb69a6e 100644
--- a/src/application-service-lru-file.c
+++ b/src/application-service-lru-file.c
@@ -143,6 +143,16 @@ clean_off (gpointer data)
 	priv->timer = 0;
 
 	GError * error = NULL;
+	
+	/* Check to see if our directory exists.  Build it if not. */
+	gchar * dirname = g_build_filename(g_get_user_config_dir(), "indicators", "application", NULL);
+	if (!g_file_test(dirname, G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR)) {
+		GFile * dirfile = g_file_new_for_path(dirname);
+		g_file_make_directory_with_parents(dirfile, NULL, NULL);
+		g_object_unref(dirfile);
+	}
+	g_free(dirname);
+
 	GFile * file = g_file_new_for_path(priv->filename);
 	GFileOutputStream * ostream = g_file_replace(file,
 	                                             NULL, /* etag */
@@ -163,10 +173,11 @@ clean_off (gpointer data)
 	g_output_stream_write_async(G_OUTPUT_STREAM(ostream),
 	                            start,
 	                            strlen(start),
-	                            G_PRIORITY_LOW,
+	                            G_PRIORITY_DEFAULT_IDLE,
 	                            NULL,
 	                            clean_off_write_cb,
 	                            start);
+	g_debug("Start Write   : %s", start);
 
 	/* Put the middle in. */
 	g_hash_table_foreach (priv->apps, clean_off_hash_cb, ostream);
@@ -176,10 +187,11 @@ clean_off (gpointer data)
 	g_output_stream_write_async(G_OUTPUT_STREAM(ostream),
 	                            end,
 	                            strlen(end),
-	                            G_PRIORITY_LOW,
+	                            G_PRIORITY_DEFAULT_IDLE,
 	                            NULL,
 	                            clean_off_write_end_cb,
 	                            end);
+	g_debug("Start Write   : %s", end);
 
 	return FALSE; /* drop the timer */
 }
@@ -192,7 +204,7 @@ clean_off_hash_cb (gpointer key, gpointer value, gpointer data)
 	/* Mega-cast */
 	gchar * id = (gchar *)key;
 	AppData * appdata = (AppData *)value;
-	GOutputStream * ostream = (GOutputStream *)ostream;
+	GOutputStream * ostream = (GOutputStream *)data;
 
 	gchar * firsttime = g_time_val_to_iso8601(&appdata->first_touched);
 	gchar * lasttime = g_time_val_to_iso8601(&appdata->last_touched);
@@ -205,10 +217,11 @@ clean_off_hash_cb (gpointer key, gpointer value, gpointer data)
 	g_output_stream_write_async(ostream,
 	                            output,
 	                            strlen(output),
-	                            G_PRIORITY_LOW,
+	                            G_PRIORITY_DEFAULT_IDLE,
 	                            NULL,
 	                            clean_off_write_cb,
 	                            output);
+	g_debug("Start Write   : %s", output);
 
 	return;
 }
@@ -218,6 +231,7 @@ clean_off_hash_cb (gpointer key, gpointer value, gpointer data)
 static void
 clean_off_write_cb (GObject * obj, GAsyncResult * res, gpointer data)
 {
+	g_debug("Complete Write: %s", (gchar *)data);
 	g_free(data);
 	return;
 }
-- 
cgit v1.2.3


From 72432728b161a54dfd711242e17cd2e55a011c2c Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Wed, 20 Jan 2010 14:40:14 -0600
Subject: Switch to building a string and writing it out instead of async
 writes as the order doesn't seem to be predictable.

---
 src/application-service-lru-file.c | 53 ++++++++------------------------------
 1 file changed, 11 insertions(+), 42 deletions(-)

diff --git a/src/application-service-lru-file.c b/src/application-service-lru-file.c
index cb69a6e..95ffb3c 100644
--- a/src/application-service-lru-file.c
+++ b/src/application-service-lru-file.c
@@ -31,7 +31,6 @@ static void app_lru_file_finalize   (GObject *object);
 static void app_data_free           (gpointer data);
 static gboolean load_from_file      (gpointer data);
 static void clean_off_hash_cb (gpointer key, gpointer value, gpointer data);
-static void clean_off_write_cb (GObject * obj, GAsyncResult * res, gpointer data);
 static void clean_off_write_end_cb (GObject * obj, GAsyncResult * res, gpointer data);
 
 G_DEFINE_TYPE (AppLruFile, app_lru_file, G_TYPE_OBJECT);
@@ -165,33 +164,22 @@ clean_off (gpointer data)
 		return FALSE;
 	}
 
-	/* This is how the file will start and end. */
-	gchar * start = g_strdup("{\n  \"version\": 1");
-	gchar * end   = g_strdup("\n}\n");
-
-	/* Put the front on. */
-	g_output_stream_write_async(G_OUTPUT_STREAM(ostream),
-	                            start,
-	                            strlen(start),
-	                            G_PRIORITY_DEFAULT_IDLE,
-	                            NULL,
-	                            clean_off_write_cb,
-	                            start);
-	g_debug("Start Write   : %s", start);
+	/* This is how the file will start */
+	GString * filestring = g_string_new("{\n  \"version\": 1");
 
 	/* Put the middle in. */
-	g_hash_table_foreach (priv->apps, clean_off_hash_cb, ostream);
-
+	g_hash_table_foreach (priv->apps, clean_off_hash_cb, filestring);
 
 	/* And then tack on the end. */
+	g_string_append(filestring, "\n}\n");
+	gchar * filedata = g_string_free(filestring, FALSE);
 	g_output_stream_write_async(G_OUTPUT_STREAM(ostream),
-	                            end,
-	                            strlen(end),
+	                            filedata,
+	                            strlen(filedata),
 	                            G_PRIORITY_DEFAULT_IDLE,
 	                            NULL,
 	                            clean_off_write_end_cb,
-	                            end);
-	g_debug("Start Write   : %s", end);
+	                            filedata);
 
 	return FALSE; /* drop the timer */
 }
@@ -204,35 +192,16 @@ clean_off_hash_cb (gpointer key, gpointer value, gpointer data)
 	/* Mega-cast */
 	gchar * id = (gchar *)key;
 	AppData * appdata = (AppData *)value;
-	GOutputStream * ostream = (GOutputStream *)data;
+	GString * string = (GString *)data;
 
 	gchar * firsttime = g_time_val_to_iso8601(&appdata->first_touched);
 	gchar * lasttime = g_time_val_to_iso8601(&appdata->last_touched);
 
-	gchar * output = g_strdup_printf(",\n  \"%s\": { \"first-time\": \"%s\", \"last-time\": \"%s\"}", id, firsttime, lasttime);
+	g_string_append_printf(string, ",\n  \"%s\": { \"first-time\": \"%s\", \"last-time\": \"%s\"}", id, firsttime, lasttime);
 
 	g_free(lasttime);
 	g_free(firsttime);
 
-	g_output_stream_write_async(ostream,
-	                            output,
-	                            strlen(output),
-	                            G_PRIORITY_DEFAULT_IDLE,
-	                            NULL,
-	                            clean_off_write_cb,
-	                            output);
-	g_debug("Start Write   : %s", output);
-
-	return;
-}
-
-/* After the data has been written to the file we make
-   sure to free the string we created */
-static void
-clean_off_write_cb (GObject * obj, GAsyncResult * res, gpointer data)
-{
-	g_debug("Complete Write: %s", (gchar *)data);
-	g_free(data);
 	return;
 }
 
@@ -241,7 +210,7 @@ clean_off_write_cb (GObject * obj, GAsyncResult * res, gpointer data)
 static void
 clean_off_write_end_cb (GObject * obj, GAsyncResult * res, gpointer data)
 {
-	clean_off_write_cb(obj, res, data);
+	g_free(data);
 
 	GError * error = NULL;
 	g_output_stream_close(G_OUTPUT_STREAM(obj), NULL, &error);
-- 
cgit v1.2.3


From 5317706e5e2c21962a872f0bbe2cbd948d520e95 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Wed, 20 Jan 2010 15:53:17 -0600
Subject: Fleshing out loading of the LRU file and realizing we need a
 json-glib dep and the 'category' field in the output.

---
 configure.ac                       |  3 ++
 src/application-service-lru-file.c | 80 +++++++++++++++++++++++++++++++++++++-
 2 files changed, 82 insertions(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index ebd6b20..5855168 100644
--- a/configure.ac
+++ b/configure.ac
@@ -40,9 +40,11 @@ AC_CONFIG_MACRO_DIR(m4)
 GTK_REQUIRED_VERSION=2.12
 INDICATOR_REQUIRED_VERSION=0.3.0
 DBUSMENUGTK_REQUIRED_VERSION=0.1.1
+JSON_GLIB_REQUIRED_VERSION=0.7.6
 
 PKG_CHECK_MODULES(INDICATOR, gtk+-2.0 >= $GTK_REQUIRED_VERSION
                              indicator >= $INDICATOR_REQUIRED_VERSION
+                             json-glib-1.0 >= $JSON_GLIB_REQUIRED_VERSION
                              dbusmenu-gtk >= $DBUSMENUGTK_REQUIRED_VERSION)
 
 AC_SUBST(INDICATOR_CFLAGS)
@@ -51,6 +53,7 @@ AC_SUBST(INDICATOR_LIBS)
 ###########################
 # Check for Mono support
 ###########################
+
 MONO_REQUIRED_VERSION=1.0
 PKG_CHECK_MODULES(MONO_DEPENDENCY, mono >= $MONO_REQUIRED_VERSION, has_mono=true, has_mono=false)
 
diff --git a/src/application-service-lru-file.c b/src/application-service-lru-file.c
index 95ffb3c..de28b81 100644
--- a/src/application-service-lru-file.c
+++ b/src/application-service-lru-file.c
@@ -4,6 +4,7 @@
 
 #include <string.h>
 #include <gio/gio.h>
+#include <json-glib/json-glib.h>
 #include "application-service-lru-file.h"
 
 typedef struct _AppLruFilePrivate AppLruFilePrivate;
@@ -30,6 +31,7 @@ static void app_lru_file_dispose    (GObject *object);
 static void app_lru_file_finalize   (GObject *object);
 static void app_data_free           (gpointer data);
 static gboolean load_from_file      (gpointer data);
+static void load_file_object_cb (JsonObject * obj, const gchar * key, JsonNode * value, gpointer data);
 static void clean_off_hash_cb (gpointer key, gpointer value, gpointer data);
 static void clean_off_write_end_cb (GObject * obj, GAsyncResult * res, gpointer data);
 
@@ -128,10 +130,86 @@ app_data_free (gpointer data)
 static gboolean
 load_from_file (gpointer data)
 {
+	AppLruFile * lrufile = (AppLruFile *)data;
+	AppLruFilePrivate * priv = APP_LRU_FILE_GET_PRIVATE(lrufile);
+
+	if (!g_file_test(priv->filename, G_FILE_TEST_EXISTS)) {
+		return FALSE;
+	}
+
+	JsonParser * parser = json_parser_new();
 
+	if (!json_parser_load_from_file(parser, priv->filename, NULL)) {
+		g_warning("Unable to parse JSON file '%s'", priv->filename);
+		g_object_unref(parser);
+		return FALSE;
+	}
+
+	JsonNode * root = json_parser_get_root(parser);
+	JsonObject * rootobj = json_node_get_object(root);
+	if (rootobj == NULL) {
+		g_warning("Malformed LRU file.  The root node is not an object.");
+		g_object_unref(parser);
+		return FALSE;
+	}
+
+	json_object_foreach_member(rootobj, load_file_object_cb, priv);
+
+	g_object_unref(parser);
 	return FALSE;
 }
 
+/* Looks at the various things that we need on a node, makes
+   sure that we have them, and then copies them into the
+   application hash table of love. */
+static void
+load_file_object_cb (JsonObject * rootobj, const gchar * key, JsonNode * value, gpointer data)
+{
+	AppLruFilePrivate * priv = (AppLruFilePrivate *)data;
+
+	/* We're not looking at this today. */
+	if (!g_strcmp0(key, "version")) {
+		return;
+	}
+
+	JsonObject * obj = json_node_get_object(value);
+	if (obj == NULL) {
+		g_warning("Data for node '%s' is not an object.", key);
+		return;
+	}
+
+	const gchar * obj_category = json_object_get_string_member(obj, "category");
+	const gchar * obj_first    = json_object_get_string_member(obj, "first-time");
+	const gchar * obj_last     = json_object_get_string_member(obj, "last-time");
+
+	if (obj_category == NULL || obj_first == NULL || obj_last == NULL) {
+		g_warning("Node '%s' is missing data.  Got: ('%s', '%s', '%s')", key, obj_category, obj_first, obj_last);
+		return;
+	}
+
+	gpointer datapntr = g_hash_table_lookup(priv->apps, key);
+	if (datapntr == NULL) {
+		/* Build a new node */
+		AppData * appdata = g_new0(AppData, 1);
+		appdata->category = g_strdup(obj_category);
+		g_time_val_from_iso8601(obj_first, &appdata->first_touched);
+		g_time_val_from_iso8601(obj_last, &appdata->last_touched);
+
+		g_hash_table_insert(priv->apps, g_strdup(key), appdata);
+	} else {
+		/* Merge nodes */
+		AppData * appdata = (AppData *)datapntr;
+		GTimeVal temptime;
+		g_time_val_from_iso8601(obj_first, &temptime);
+
+		if (temptime.tv_sec < appdata->first_touched.tv_sec) {
+			g_time_val_from_iso8601(obj_first, &appdata->first_touched);
+		}
+	}
+
+	return;
+}
+
 /* Write out our cache to a file so that we can unmark the dirty
    bit and be happy. */
 static gboolean
@@ -197,7 +275,7 @@ clean_off_hash_cb (gpointer key, gpointer value, gpointer data)
 	gchar * firsttime = g_time_val_to_iso8601(&appdata->first_touched);
 	gchar * lasttime = g_time_val_to_iso8601(&appdata->last_touched);
 
-	g_string_append_printf(string, ",\n  \"%s\": { \"first-time\": \"%s\", \"last-time\": \"%s\"}", id, firsttime, lasttime);
+	g_string_append_printf(string, ",\n  \"%s\": { \"first-time\": \"%s\", \"last-time\": \"%s\", \"category\": \"%s\"}", id, firsttime, lasttime, appdata->category);
 
 	g_free(lasttime);
 	g_free(firsttime);
-- 
cgit v1.2.3


From 33644ed5b49b8af5a0d6b2f702c783319285db8d Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Wed, 20 Jan 2010 16:12:11 -0600
Subject: Moving the JSON file values into #defines

---
 src/application-service-lru-file.c | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/application-service-lru-file.c b/src/application-service-lru-file.c
index de28b81..26ff2e8 100644
--- a/src/application-service-lru-file.c
+++ b/src/application-service-lru-file.c
@@ -7,6 +7,11 @@
 #include <json-glib/json-glib.h>
 #include "application-service-lru-file.h"
 
+#define ENTRY_CATEGORY   "category"
+#define ENTRY_FIRST_TIME "first-time"
+#define ENTRY_LAST_TIME  "last-time"
+#define ENTRY_VERSION    "version"
+
 typedef struct _AppLruFilePrivate AppLruFilePrivate;
 struct _AppLruFilePrivate {
 	GHashTable * apps;
@@ -168,7 +173,7 @@ load_file_object_cb (JsonObject * rootobj, const gchar * key, JsonNode * value,
 	AppLruFilePrivate * priv = (AppLruFilePrivate *)data;
 
 	/* We're not looking at this today. */
-	if (!g_strcmp0(key, "version")) {
+	if (!g_strcmp0(key, ENTRY_VERSION)) {
 		return;
 	}
 
@@ -178,9 +183,9 @@ load_file_object_cb (JsonObject * rootobj, const gchar * key, JsonNode * value,
 		return;
 	}
 
-	const gchar * obj_category = json_object_get_string_member(obj, "category");
-	const gchar * obj_first    = json_object_get_string_member(obj, "first-time");
-	const gchar * obj_last     = json_object_get_string_member(obj, "last-time");
+	const gchar * obj_category = json_object_get_string_member(obj, ENTRY_CATEGORY);
+	const gchar * obj_first    = json_object_get_string_member(obj, ENTRY_FIRST_TIME);
+	const gchar * obj_last     = json_object_get_string_member(obj, ENTRY_LAST_TIME);
 
 	if (obj_category == NULL || obj_first == NULL || obj_last == NULL) {
 		g_warning("Node '%s' is missing data.  Got: ('%s', '%s', '%s')", key, obj_category, obj_first, obj_last);
@@ -243,7 +248,7 @@ clean_off (gpointer data)
 	}
 
 	/* This is how the file will start */
-	GString * filestring = g_string_new("{\n  \"version\": 1");
+	GString * filestring = g_string_new("{\n  \"" ENTRY_VERSION "\": 1");
 
 	/* Put the middle in. */
 	g_hash_table_foreach (priv->apps, clean_off_hash_cb, filestring);
@@ -275,7 +280,7 @@ clean_off_hash_cb (gpointer key, gpointer value, gpointer data)
 	gchar * firsttime = g_time_val_to_iso8601(&appdata->first_touched);
 	gchar * lasttime = g_time_val_to_iso8601(&appdata->last_touched);
 
-	g_string_append_printf(string, ",\n  \"%s\": { \"first-time\": \"%s\", \"last-time\": \"%s\", \"category\": \"%s\"}", id, firsttime, lasttime, appdata->category);
+	g_string_append_printf(string, ",\n  \"%s\": { \"" ENTRY_FIRST_TIME "\": \"%s\", \"" ENTRY_LAST_TIME "\": \"%s\", \"" ENTRY_CATEGORY "\": \"%s\"}", id, firsttime, lasttime, appdata->category);
 
 	g_free(lasttime);
 	g_free(firsttime);
-- 
cgit v1.2.3


From 26a0d6f4bb11f7f31d1e8f0f6218cfca859f8a1f Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Wed, 20 Jan 2010 16:16:43 -0600
Subject: Moving directory and filename into defines

---
 src/application-service-lru-file.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/application-service-lru-file.c b/src/application-service-lru-file.c
index 26ff2e8..a13227a 100644
--- a/src/application-service-lru-file.c
+++ b/src/application-service-lru-file.c
@@ -12,6 +12,9 @@
 #define ENTRY_LAST_TIME  "last-time"
 #define ENTRY_VERSION    "version"
 
+#define CONFIG_DIR       ("indicators" G_DIR_SEPARATOR_S "application")
+#define CONFIG_FILE      "lru-file.json"
+
 typedef struct _AppLruFilePrivate AppLruFilePrivate;
 struct _AppLruFilePrivate {
 	GHashTable * apps;
@@ -70,7 +73,7 @@ app_lru_file_init (AppLruFile *self)
 
 	/* Now let's build some stuff */
 	priv->apps = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, app_data_free);
-	priv->filename = g_build_filename(g_get_user_config_dir(), "indicators", "application", "lru-file.json", NULL);
+	priv->filename = g_build_filename(g_get_user_config_dir(), CONFIG_DIR, CONFIG_FILE, NULL);
 
 	/* No reason to delay other stuff for this, we'll
 	   merge any values that get touched. */
@@ -227,7 +230,7 @@ clean_off (gpointer data)
 	GError * error = NULL;
 	
 	/* Check to see if our directory exists.  Build it if not. */
-	gchar * dirname = g_build_filename(g_get_user_config_dir(), "indicators", "application", NULL);
+	gchar * dirname = g_build_filename(g_get_user_config_dir(), CONFIG_DIR, NULL);
 	if (!g_file_test(dirname, G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR)) {
 		GFile * dirfile = g_file_new_for_path(dirname);
 		g_file_make_directory_with_parents(dirfile, NULL, NULL);
-- 
cgit v1.2.3


From 0ccf950d37c2de390f79c10d9bebbd4ca6dfc894 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Wed, 20 Jan 2010 16:28:13 -0600
Subject: License headers.

---
 src/application-service-lru-file.c | 22 ++++++++++++++++++++++
 src/application-service-lru-file.h | 22 ++++++++++++++++++++++
 2 files changed, 44 insertions(+)

diff --git a/src/application-service-lru-file.c b/src/application-service-lru-file.c
index a13227a..fec9644 100644
--- a/src/application-service-lru-file.c
+++ b/src/application-service-lru-file.c
@@ -1,3 +1,25 @@
+/*
+This object manages the database of when the entires were touched
+and loved.  And writes that out to disk occationally as well.
+
+Copyright 2010 Canonical Ltd.
+
+Authors:
+    Ted Gould <ted@canonical.com>
+
+This program is free software: you can redistribute it and/or modify it 
+under the terms of the GNU General Public License version 3, as published 
+by the Free Software Foundation.
+
+This program is distributed in the hope that it will be useful, but 
+WITHOUT ANY WARRANTY; without even the implied warranties of 
+MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR 
+PURPOSE.  See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along 
+with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/src/application-service-lru-file.h b/src/application-service-lru-file.h
index 45d3082..7c92c82 100644
--- a/src/application-service-lru-file.h
+++ b/src/application-service-lru-file.h
@@ -1,3 +1,25 @@
+/*
+This object manages the database of when the entires were touched
+and loved.  And writes that out to disk occationally as well.
+
+Copyright 2010 Canonical Ltd.
+
+Authors:
+    Ted Gould <ted@canonical.com>
+
+This program is free software: you can redistribute it and/or modify it 
+under the terms of the GNU General Public License version 3, as published 
+by the Free Software Foundation.
+
+This program is distributed in the hope that it will be useful, but 
+WITHOUT ANY WARRANTY; without even the implied warranties of 
+MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR 
+PURPOSE.  See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along 
+with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
 #ifndef __APP_LRU_FILE_H__
 #define __APP_LRU_FILE_H__
 
-- 
cgit v1.2.3


From da6242ba497bf70eb2ee8c75e74ddf5ac7f699ca Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Wed, 20 Jan 2010 16:41:38 -0600
Subject: Looking at the last touch date of entries as we're loading the file
 and removing ones that are very old.

---
 src/application-service-lru-file.c | 32 ++++++++++++++++++++++++++++++--
 1 file changed, 30 insertions(+), 2 deletions(-)

diff --git a/src/application-service-lru-file.c b/src/application-service-lru-file.c
index fec9644..c69a20f 100644
--- a/src/application-service-lru-file.c
+++ b/src/application-service-lru-file.c
@@ -60,6 +60,7 @@ static void app_lru_file_init       (AppLruFile *self);
 static void app_lru_file_dispose    (GObject *object);
 static void app_lru_file_finalize   (GObject *object);
 static void app_data_free           (gpointer data);
+static void get_dirty (AppLruFile * lrufile);
 static gboolean load_from_file      (gpointer data);
 static void load_file_object_cb (JsonObject * obj, const gchar * key, JsonNode * value, gpointer data);
 static void clean_off_hash_cb (gpointer key, gpointer value, gpointer data);
@@ -183,7 +184,7 @@ load_from_file (gpointer data)
 		return FALSE;
 	}
 
-	json_object_foreach_member(rootobj, load_file_object_cb, priv);
+	json_object_foreach_member(rootobj, load_file_object_cb, lrufile);
 
 	g_object_unref(parser);
 	return FALSE;
@@ -195,7 +196,8 @@ load_from_file (gpointer data)
 static void
 load_file_object_cb (JsonObject * rootobj, const gchar * key, JsonNode * value, gpointer data)
 {
-	AppLruFilePrivate * priv = (AppLruFilePrivate *)data;
+	AppLruFile * lrufile = (AppLruFile *)data;
+	AppLruFilePrivate * priv = APP_LRU_FILE_GET_PRIVATE(lrufile);
 
 	/* We're not looking at this today. */
 	if (!g_strcmp0(key, ENTRY_VERSION)) {
@@ -214,9 +216,35 @@ load_file_object_cb (JsonObject * rootobj, const gchar * key, JsonNode * value,
 
 	if (obj_category == NULL || obj_first == NULL || obj_last == NULL) {
 		g_warning("Node '%s' is missing data.  Got: ('%s', '%s', '%s')", key, obj_category, obj_first, obj_last);
+		get_dirty(lrufile);
+		return;
+	}
+
+	/* Check to see how old this entry is.  If it hasn't been
+	   used in the last year, we remove the cruft. */
+	GTimeVal currenttime;
+	g_get_current_time(&currenttime);
+	GDate * currentdate = g_date_new();
+	g_date_set_time_val(currentdate, &currenttime);
+
+	GTimeVal lasttouch;
+	g_time_val_from_iso8601(obj_last, &lasttouch);
+	GDate * lastdate = g_date_new();
+	g_date_set_time_val(lastdate, &lasttouch);
+
+	gint spread = g_date_days_between(lastdate, currentdate);
+
+	g_date_free(currentdate);
+	g_date_free(lastdate);
+
+	if (spread > 365) {
+		g_debug("Removing node '%s' as it's %d days old.", key, spread);
+		get_dirty(lrufile);
 		return;
 	}
 
+	/* See if we already have one of these.  It's a little bit
+	   unlikely, but since we're async, we need to check */
 	gpointer datapntr = g_hash_table_lookup(priv->apps, key);
 	if (datapntr == NULL) {
 		/* Build a new node */
-- 
cgit v1.2.3


From a9bf19636361c1d4a912db0a4d51d21d025b4640 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Wed, 20 Jan 2010 16:52:01 -0600
Subject: Implements the get_location function to place the entires.

---
 src/indicator-application.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/indicator-application.c b/src/indicator-application.c
index 5ed7a9e..3ef5688 100644
--- a/src/indicator-application.c
+++ b/src/indicator-application.c
@@ -92,6 +92,7 @@ static void indicator_application_init       (IndicatorApplication *self);
 static void indicator_application_dispose    (GObject *object);
 static void indicator_application_finalize   (GObject *object);
 static GList * get_entries (IndicatorObject * io);
+static guint get_location (IndicatorObject * io, IndicatorObjectEntry * entry);
 static void connected (IndicatorServiceManager * sm, gboolean connected, IndicatorApplication * application);
 static void application_added (DBusGProxy * proxy, const gchar * iconname, gint position, const gchar * dbusaddress, const gchar * dbusobject, const gchar * icon_path, IndicatorApplication * application);
 static void application_removed (DBusGProxy * proxy, gint position , IndicatorApplication * application);
@@ -116,6 +117,7 @@ indicator_application_class_init (IndicatorApplicationClass *klass)
 	IndicatorObjectClass * io_class = INDICATOR_OBJECT_CLASS(klass);
 
 	io_class->get_entries = get_entries;
+	io_class->get_location = get_location;
 
 	dbus_g_object_register_marshaller(_application_service_marshal_VOID__STRING_INT_STRING_STRING_STRING,
 	                                  G_TYPE_NONE,
@@ -298,6 +300,15 @@ get_entries (IndicatorObject * io)
 	return retval;
 }
 
+/* Finds the location of a specific entry */
+static guint 
+get_location (IndicatorObject * io, IndicatorObjectEntry * entry)
+{
+	g_return_val_if_fail(IS_INDICATOR_APPLICATION(io), 0);
+	IndicatorApplicationPrivate * priv = INDICATOR_APPLICATION_GET_PRIVATE(io);
+	return g_list_index(priv->applications, entry);
+}
+
 /* Here we respond to new applications by building up the
    ApplicationEntry and signaling the indicator host that
    we've got a new indicator. */
-- 
cgit v1.2.3