Merge lp:~ted/indicator-applet/messages-launchers into lp:indicator-applet/messages0.2

[Ted Gould]

Initial work to implement launchers in the messaging menu.

[Ted Gould (ted)]

Okay, so this branch adds all the initial code for launchers. Basically it puts launchers in the menu so that you can click on them and start the application. It then hides them when the real application starts up. But, unfortunatly hide doesn't work in dbusmenu yet, so it's a little unclimatic, you'll have to trust the debug message there :)

To make a simple launcher:
  $ sudo bash
  % mkdir -p /etc/indicators/messages/applications
  % echo "/usr/share/applications/evolution-mail.desktop" > /etc/indicators/messages/applications/test

[David Barth (dbarth)]

Looks like solid code apart from the gobject boilerplate. A few questions and remarks:
- does g_app_info_launch manage notification ids? or do you have to trigger that explicitly with g_app_launch_context_get_startup_notify_id ()? it would be good to add that for the release and cancel the s-n in case of errors
- is reconsile_list_and_menu (reconcile?) an API that was used by other modules? is there a need to deprecate it?
- on sorting launchers: it feels weird that they are sorted dynamically (in terms of having a stable UI), why not just use the order of files found in the config directory, minus the ones which are eclipsed? is there a particular UX requirement there? would that be impacted by the extra launchers feature afterwards?

review: Needs Information

[Ted Gould (ted)]

On Thu, 2009-08-20 at 13:59 +0000, David Barth wrote:
> - does g_app_info_launch manage notification ids? or do you
> have to trigger that explicitly with g_app_launch_context_get_startup_notify_id ()?
> it would be good to add that for the release and cancel
> the s-n in case of errors

I'm not sure. I'll look into the GNOME Panel code and steal it from
them to see how they do it :)

> - is reconsile_list_and_menu (reconcile?) an API that was
> used by other modules? is there a need to deprecate it?

No, nothing here is used by other modules. The only external symbols
are those defined in libindicator.

It's also declared static ;)

> - on sorting launchers: it feels weird that they are sorted
> dynamically (in terms of having a stable UI), why not just
> use the order of files found in the config directory, minus
> the ones which are eclipsed? is there a particular UX
> requirement there? would that be impacted by the extra
> launchers feature afterwards?

They're sorted by the name in the desktop file, so I don't know how we
could sort them without opening up the desktop files. For the most
part, since this is a menu, it's closed as any reordering would be done.
If there is a reorder operation, it'll only move the entries that
actually move. DBusmenu checks to make sure the reorder is a real
reorder and not just a request to put things in the same place.

[lp:~ted/indicator-applet/messages-launchers]

146. By Ted Gould on 2009-08-20

Use a GDK app context. Not sure about the timestamp units though.

147. By Ted Gould on 2009-08-20

Should be in milliseconds not micro

[Ted Gould (ted)]

On Thu, 2009-08-20 at 14:27 +0000, Ted Gould wrote:
> On Thu, 2009-08-20 at 13:59 +0000, David Barth wrote:
> > - does g_app_info_launch manage notification ids? or do you
> > have to trigger that explicitly with g_app_launch_context_get_startup_notify_id ()?
> > it would be good to add that for the release and cancel
> > the s-n in case of errors
>
> I'm not sure. I'll look into the GNOME Panel code and steal it from
> them to see how they do it :)

Turns out they use libgnome :(

I'm not using the GDK App Context which should do this. Updated the
branch.

[David Barth (dbarth)]

Ted Gould wrote:
> [...]
> It's also declared static ;)
>
Ahum... Sure ;)
>> - on sorting launchers: it feels weird that they are sorted
>> dynamically (in terms of having a stable UI), why not just
>> use the order of files found in the config directory, minus
>> the ones which are eclipsed? is there a particular UX
>> requirement there? would that be impacted by the extra
>> launchers feature afterwards?
>>
>
> They're sorted by the name in the desktop file, so I don't know how we
> could sort them without opening up the desktop files. For the most
> part, since this is a menu, it's closed as any reordering would be done.
> If there is a reorder operation, it'll only move the entries that
> actually move. DBusmenu checks to make sure the reorder is a real
> reorder and not just a request to put things in the same place.
>
having:
00_evolution.desktop
00_empathy.desktop
for apps in main for example

while universe ones would have:
99_my_funky_msging_app.desktop

the alphabetical order still applies, which should be consistent with
what's *in* the desktop file, while providing some extra level of
ordering at the distribution level.

It's a suggestion. It shouldn't block the merge proposal however.

David

[David Barth (dbarth)]

Go ahead with the change.

review: Approve

=== modified file 'configure.ac'
--- configure.ac	2009-08-04 16:44:11 +0000
+++ configure.ac	2009-08-19 18:36:22 +0000
@@ -17,6 +17,8 @@
 AC_SUBST(VERSION)
 AC_CONFIG_MACRO_DIR([m4])
 
+m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
+
 ###########################
 # Dependencies 
 ###########################

=== modified file 'src/Makefile.am'
--- src/Makefile.am	2009-05-28 15:19:48 +0000
+++ src/Makefile.am	2009-08-20 01:57:37 +0000
@@ -1,13 +1,32 @@
 
 bin_PROGRAMS = indicator-messages-service
 
+######################################
+# Building the messages indicator
+######################################
+
 messaginglibdir = $(INDICATORDIR)
 messaginglib_LTLIBRARIES = libmessaging.la
-libmessaging_la_SOURCES = indicator-messages.c im-menu-item.c im-menu-item.h app-menu-item.c app-menu-item.h
+libmessaging_la_SOURCES = \
+	indicator-messages.c\
+	dbus-data.h
 libmessaging_la_CFLAGS = $(APPLET_CFLAGS) -Wall -Wl,-Bsymbolic-functions -Wl,-z,defs -Wl,--as-needed -Werror
 libmessaging_la_LIBADD = $(APPLET_LIBS)
 libmessaging_la_LDFLAGS = -module -avoid-version
 
-indicator_messages_service_SOURCES = indicator-service.c im-menu-item.c im-menu-item.h app-menu-item.c app-menu-item.h
+######################################
+# Building the messages service
+######################################
+
+indicator_messages_service_SOURCES = \
+	messages-service.c \
+	im-menu-item.c \
+	im-menu-item.h \
+	app-menu-item.c \
+	app-menu-item.h \
+	launcher-menu-item.c \
+	launcher-menu-item.h \
+	dirs.h \
+	dbus-data.h
 indicator_messages_service_CFLAGS = $(APPLET_CFLAGS) -Wall -Wl,-Bsymbolic-functions -Wl,-z,defs -Wl,--as-needed -Werror
 indicator_messages_service_LDADD = $(APPLET_LIBS)

=== modified file 'src/app-menu-item.c'
--- src/app-menu-item.c	2009-05-26 14:30:31 +0000
+++ src/app-menu-item.c	2009-08-20 03:29:40 +0000
@@ -45,6 +45,7 @@
 	
 	gchar * type;
 	GAppInfo * appinfo;
+	gchar * desktop;
 	guint unreadcount;
 	gboolean count_on_label;
 };
@@ -105,6 +106,7 @@
 	priv->server = NULL;
 	priv->type = NULL;
 	priv->appinfo = NULL;
+	priv->desktop = NULL;
 	priv->unreadcount = 0;
 	priv->count_on_label = FALSE;
 
@@ -136,6 +138,10 @@
 		g_free(priv->type);
 	}
 
+	if (priv->desktop != NULL) {
+		g_free(priv->desktop);
+	}
+
 	if (priv->appinfo != NULL) {
 		g_object_unref(priv->appinfo);
 	}
@@ -229,15 +235,23 @@
 
 	if (priv->appinfo != NULL) {
 		g_object_unref(G_OBJECT(priv->appinfo));
+		priv->appinfo = NULL;
+	}
+
+	if (priv->desktop != NULL) {
+		g_free(priv->desktop);
+		priv->desktop = NULL;
 	}
 
 	if (value == NULL || value[0] == '\0') {
 		return;
 	}
-	
+
 	priv->appinfo = G_APP_INFO(g_desktop_app_info_new_from_filename(value));
 	g_return_if_fail(priv->appinfo != NULL);
 
+	priv->desktop = g_strdup(value);
+
 	update_label(self);
 	g_signal_emit(G_OBJECT(self), signals[NAME_CHANGED], 0, app_menu_item_get_name(self), TRUE);
 
@@ -257,6 +271,7 @@
 static void 
 indicator_added_cb (IndicateListener * listener, IndicateListenerServer * server, IndicateListenerIndicator * indicator, gchar * type, gpointer data)
 {
+	g_return_if_fail(IS_APP_MENU_ITEM(data));
 	AppMenuItemPrivate * priv = APP_MENU_ITEM_GET_PRIVATE(data);
 
 	if (g_strcmp0(INDICATE_LISTENER_SERVER_DBUS_NAME(server), INDICATE_LISTENER_SERVER_DBUS_NAME(priv->server))) {
@@ -296,6 +311,7 @@
 guint
 app_menu_item_get_count (AppMenuItem * appitem)
 {
+	g_return_val_if_fail(IS_APP_MENU_ITEM(appitem), 0);
 	AppMenuItemPrivate * priv = APP_MENU_ITEM_GET_PRIVATE(appitem);
 
 	return priv->unreadcount;
@@ -303,6 +319,7 @@
 
 IndicateListenerServer *
 app_menu_item_get_server (AppMenuItem * appitem) {
+	g_return_val_if_fail(IS_APP_MENU_ITEM(appitem), NULL);
 	AppMenuItemPrivate * priv = APP_MENU_ITEM_GET_PRIVATE(appitem);
 
 	return priv->server;
@@ -311,6 +328,7 @@
 const gchar *
 app_menu_item_get_name (AppMenuItem * appitem)
 {
+	g_return_val_if_fail(IS_APP_MENU_ITEM(appitem), NULL);
 	AppMenuItemPrivate * priv = APP_MENU_ITEM_GET_PRIVATE(appitem);
 
 	if (priv->appinfo == NULL) {
@@ -319,3 +337,11 @@
 		return g_app_info_get_name(priv->appinfo);
 	}
 }
+
+const gchar *
+app_menu_item_get_desktop (AppMenuItem * appitem)
+{
+	g_return_val_if_fail(IS_APP_MENU_ITEM(appitem), NULL);
+	AppMenuItemPrivate * priv = APP_MENU_ITEM_GET_PRIVATE(appitem);
+	return priv->desktop;
+}

=== modified file 'src/app-menu-item.h'
--- src/app-menu-item.h	2009-05-26 14:30:31 +0000
+++ src/app-menu-item.h	2009-08-20 03:29:40 +0000
@@ -59,6 +59,7 @@
 guint app_menu_item_get_count (AppMenuItem * appitem);
 IndicateListenerServer * app_menu_item_get_server (AppMenuItem * appitem);
 const gchar * app_menu_item_get_name (AppMenuItem * appitem);
+const gchar * app_menu_item_get_desktop (AppMenuItem * appitem);
 
 G_END_DECLS
 

=== added file 'src/dirs.h'
--- src/dirs.h	1970-01-01 00:00:00 +0000
+++ src/dirs.h	2009-08-19 18:50:16 +0000
@@ -0,0 +1,3 @@
+#define  SYSTEM_APPS_DIR        "/etc/indicators/messages/applications"
+#define  USER_APPS_DIR          "indicators/messages/applications"
+#define  USER_BLACKLIST_DIR     "indicators/messages/applications-blacklist"

=== added file 'src/launcher-menu-item.c'
--- src/launcher-menu-item.c	1970-01-01 00:00:00 +0000
+++ src/launcher-menu-item.c	2009-08-20 03:29:40 +0000
@@ -0,0 +1,184 @@
+/*
+An indicator to show information that is in messaging applications
+that the user is using.
+
+Copyright 2009 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/>.
+*/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <glib/gi18n.h>
+#include <gio/gdesktopappinfo.h>
+#include "launcher-menu-item.h"
+
+enum {
+	NAME_CHANGED,
+	LAST_SIGNAL
+};
+
+static guint signals[LAST_SIGNAL] = { 0 };
+
+typedef struct _LauncherMenuItemPrivate LauncherMenuItemPrivate;
+struct _LauncherMenuItemPrivate
+{
+	GAppInfo * appinfo;
+	gchar * desktop;
+};
+
+#define LAUNCHER_MENU_ITEM_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), LAUNCHER_MENU_ITEM_TYPE, LauncherMenuItemPrivate))
+
+/* Prototypes */
+static void launcher_menu_item_class_init (LauncherMenuItemClass *klass);
+static void launcher_menu_item_init       (LauncherMenuItem *self);
+static void launcher_menu_item_dispose    (GObject *object);
+static void launcher_menu_item_finalize   (GObject *object);
+static void activate_cb (LauncherMenuItem * self, gpointer data);
+
+
+G_DEFINE_TYPE (LauncherMenuItem, launcher_menu_item, DBUSMENU_TYPE_MENUITEM);
+
+static void
+launcher_menu_item_class_init (LauncherMenuItemClass *klass)
+{
+	GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+	g_type_class_add_private (klass, sizeof (LauncherMenuItemPrivate));
+
+	object_class->dispose = launcher_menu_item_dispose;
+	object_class->finalize = launcher_menu_item_finalize;
+
+	signals[NAME_CHANGED] =  g_signal_new(LAUNCHER_MENU_ITEM_SIGNAL_NAME_CHANGED,
+	                                      G_TYPE_FROM_CLASS(klass),
+	                                      G_SIGNAL_RUN_LAST,
+	                                      G_STRUCT_OFFSET (LauncherMenuItemClass, name_changed),
+	                                      NULL, NULL,
+	                                      g_cclosure_marshal_VOID__STRING,
+	                                      G_TYPE_NONE, 1, G_TYPE_STRING);
+
+	return;
+}
+
+static void
+launcher_menu_item_init (LauncherMenuItem *self)
+{
+	g_debug("Building new Launcher Menu Item");
+	LauncherMenuItemPrivate * priv = LAUNCHER_MENU_ITEM_GET_PRIVATE(self);
+
+	priv->appinfo = NULL;
+	priv->desktop = NULL;
+
+	return;
+}
+
+static void
+launcher_menu_item_dispose (GObject *object)
+{
+	// LauncherMenuItem * self = LAUNCHER_MENU_ITEM(object);
+	// LauncherMenuItemPrivate * priv = LAUNCHER_MENU_ITEM_GET_PRIVATE(self);
+
+	G_OBJECT_CLASS (launcher_menu_item_parent_class)->dispose (object);
+}
+
+static void
+launcher_menu_item_finalize (GObject *object)
+{
+	LauncherMenuItem * self = LAUNCHER_MENU_ITEM(object);
+	LauncherMenuItemPrivate * priv = LAUNCHER_MENU_ITEM_GET_PRIVATE(self);
+
+	if (priv->appinfo != NULL) {
+		g_object_unref(priv->appinfo);
+		priv->appinfo = NULL;
+	}
+
+	if (priv->desktop != NULL) {
+		g_free(priv->desktop);
+		priv->desktop = NULL;
+	}
+
+	G_OBJECT_CLASS (launcher_menu_item_parent_class)->finalize (object);
+
+	return;
+}
+
+LauncherMenuItem *
+launcher_menu_item_new (const gchar * desktop_file)
+{
+	LauncherMenuItem * self = g_object_new(LAUNCHER_MENU_ITEM_TYPE, NULL);
+	g_debug("\tDesktop file: %s", desktop_file);
+
+	LauncherMenuItemPrivate * priv = LAUNCHER_MENU_ITEM_GET_PRIVATE(self);
+
+	priv->appinfo = G_APP_INFO(g_desktop_app_info_new_from_filename(desktop_file));
+	priv->desktop = g_strdup(desktop_file);
+
+	g_debug("\tName: %s", launcher_menu_item_get_name(self));
+	dbusmenu_menuitem_property_set(DBUSMENU_MENUITEM(self), "label", launcher_menu_item_get_name(self));
+
+	g_signal_connect(G_OBJECT(self), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK(activate_cb), NULL);
+
+	return self;
+}
+
+const gchar *
+launcher_menu_item_get_name (LauncherMenuItem * appitem)
+{
+	LauncherMenuItemPrivate * priv = LAUNCHER_MENU_ITEM_GET_PRIVATE(appitem);
+
+	if (priv->appinfo == NULL) {
+		return NULL;
+	} else {
+		return g_app_info_get_name(priv->appinfo);
+	}
+}
+
+/* When the menu item is clicked on it tries to launch
+   the application that is represented by the desktop file */
+static void
+activate_cb (LauncherMenuItem * self, gpointer data)
+{
+	LauncherMenuItemPrivate * priv = LAUNCHER_MENU_ITEM_GET_PRIVATE(self);
+	g_return_if_fail(priv->appinfo != NULL);
+
+	GError * error = NULL;
+	if (!g_app_info_launch(priv->appinfo, NULL, NULL, &error)) {
+		g_warning("Application failed to launch '%s' because: %s", launcher_menu_item_get_name(self), error->message);
+		g_error_free(error);
+	}
+
+	return;
+}
+
+const gchar *
+launcher_menu_item_get_desktop (LauncherMenuItem * launchitem)
+{
+	g_return_val_if_fail(IS_LAUNCHER_MENU_ITEM(launchitem), NULL);
+	LauncherMenuItemPrivate * priv = LAUNCHER_MENU_ITEM_GET_PRIVATE(launchitem);
+	return priv->desktop;
+}
+
+/* Hides the menu item based on whether it is eclipsed
+   or not. */
+void
+launcher_menu_item_set_eclipsed (LauncherMenuItem * li, gboolean eclipsed)
+{
+	g_debug("Laucher '%s' is %s", launcher_menu_item_get_name(li), eclipsed ? "now eclipsed" : "shown again");
+	dbusmenu_menuitem_property_set(DBUSMENU_MENUITEM(li), "show", eclipsed ? "false" : "true");
+	return;
+}

=== added file 'src/launcher-menu-item.h'
--- src/launcher-menu-item.h	1970-01-01 00:00:00 +0000
+++ src/launcher-menu-item.h	2009-08-20 03:29:40 +0000
@@ -0,0 +1,64 @@
+/*
+An indicator to show information that is in messaging applications
+that the user is using.
+
+Copyright 2009 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 __LAUNCHER_MENU_ITEM_H__
+#define __LAUNCHER_MENU_ITEM_H__
+
+#include <glib.h>
+#include <glib-object.h>
+
+#include <libdbusmenu-glib/menuitem.h>
+
+G_BEGIN_DECLS
+
+#define LAUNCHER_MENU_ITEM_TYPE            (launcher_menu_item_get_type ())
+#define LAUNCHER_MENU_ITEM(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), LAUNCHER_MENU_ITEM_TYPE, LauncherMenuItem))
+#define LAUNCHER_MENU_ITEM_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), LAUNCHER_MENU_ITEM_TYPE, LauncherMenuItemClass))
+#define IS_LAUNCHER_MENU_ITEM(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), LAUNCHER_MENU_ITEM_TYPE))
+#define IS_LAUNCHER_MENU_ITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), LAUNCHER_MENU_ITEM_TYPE))
+#define LAUNCHER_MENU_ITEM_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), LAUNCHER_MENU_ITEM_TYPE, LauncherMenuItemClass))
+
+#define LAUNCHER_MENU_ITEM_SIGNAL_NAME_CHANGED   "name-changed"
+
+typedef struct _LauncherMenuItem      LauncherMenuItem;
+typedef struct _LauncherMenuItemClass LauncherMenuItemClass;
+
+struct _LauncherMenuItemClass {
+	DbusmenuMenuitemClass parent_class;
+
+	void (* name_changed) (gchar * name);
+};
+
+struct _LauncherMenuItem {
+	DbusmenuMenuitem parent;
+};
+
+GType launcher_menu_item_get_type (void);
+LauncherMenuItem * launcher_menu_item_new (const gchar * desktop_file);
+const gchar * launcher_menu_item_get_name (LauncherMenuItem * appitem);
+const gchar * launcher_menu_item_get_desktop (LauncherMenuItem * launchitem);
+void launcher_menu_item_set_eclipsed (LauncherMenuItem * li, gboolean eclipsed);
+
+G_END_DECLS
+
+#endif /* __LAUNCHER_MENU_ITEM_H__ */
+

=== renamed file 'src/indicator-service.c' => 'src/messages-service.c'
--- src/indicator-service.c	2009-05-27 08:44:37 +0000
+++ src/messages-service.c	2009-08-20 03:54:33 +0000
@@ -21,6 +21,7 @@
 */
 
 #include <string.h>
+#include <pango/pango-utils.h>
 #include <dbus/dbus-glib-bindings.h>
 #include <libindicate/listener.h>
 
@@ -28,10 +29,13 @@
 
 #include "im-menu-item.h"
 #include "app-menu-item.h"
+#include "launcher-menu-item.h"
 #include "dbus-data.h"
+#include "dirs.h"
 
 static IndicateListener * listener;
-static GList * serverList;
+static GList * serverList = NULL;
+static GList * launcherList = NULL;
 
 static DbusmenuMenuitem * root_menuitem = NULL;
 static GMainLoop * mainloop = NULL;
@@ -40,8 +44,12 @@
 static void server_count_changed (AppMenuItem * appitem, guint count, gpointer data);
 static void server_name_changed (AppMenuItem * appitem, gchar * name, gpointer data);
 static void im_time_changed (ImMenuItem * imitem, glong seconds, gpointer data);
-static void reconsile_list_and_menu (GList * serverlist, DbusmenuMenuitem * menushell);
+static void resort_menu (DbusmenuMenuitem * menushell);
 static void indicator_removed (IndicateListener * listener, IndicateListenerServer * server, IndicateListenerIndicator * indicator, gchar * type, gpointer data);
+static void check_eclipses (AppMenuItem * ai);
+static void remove_eclipses (AppMenuItem * ai);
+static gboolean build_launcher (gpointer data);
+static gboolean build_launchers (gpointer data);
 
 typedef struct _serverList_t serverList_t;
 struct _serverList_t {
@@ -116,6 +124,25 @@
 	return (gint)(im_menu_item_get_seconds(IM_MENU_ITEM(pb->menuitem)) - im_menu_item_get_seconds(IM_MENU_ITEM(pa->menuitem)));
 }
 
+typedef struct _launcherList_t launcherList_t;
+struct _launcherList_t {
+	LauncherMenuItem * menuitem;
+};
+
+static gint
+launcherList_sort (gconstpointer a, gconstpointer b)
+{
+	launcherList_t * pa, * pb;
+
+	pa = (launcherList_t *)a;
+	pb = (launcherList_t *)b;
+
+	const gchar * pan = launcher_menu_item_get_name(pa->menuitem);
+	const gchar * pbn = launcher_menu_item_get_name(pb->menuitem);
+
+	return g_strcmp0(pan, pbn);
+}
+
 static void 
 server_added (IndicateListener * listener, IndicateListenerServer * server, gchar * type, gpointer data)
 {
@@ -162,7 +189,7 @@
 	dbusmenu_menuitem_child_append(menushell, DBUSMENU_MENUITEM(menuitem));
 	/* Should be prepend ^ */
 
-	reconsile_list_and_menu(serverList, menushell);
+	resort_menu(menushell);
 
 	return;
 }
@@ -171,7 +198,8 @@
 server_name_changed (AppMenuItem * appitem, gchar * name, gpointer data)
 {
 	serverList = g_list_sort(serverList, serverList_sort);
-	reconsile_list_and_menu(serverList, DBUSMENU_MENUITEM(data));
+	check_eclipses(appitem);
+	resort_menu(DBUSMENU_MENUITEM(data));
 	return;
 }
 
@@ -226,7 +254,7 @@
 {
 	serverList_t * sl = (serverList_t *)data;
 	sl->imList = g_list_sort(sl->imList, imList_sort);
-	reconsile_list_and_menu(serverList, root_menuitem);
+	resort_menu(root_menuitem);
 	return;
 }
 
@@ -245,6 +273,8 @@
 
 	serverList_t * sltp = (serverList_t *)lookup->data;
 
+	remove_eclipses(sltp->menuitem);
+
 	while (sltp->imList) {
 		imList_t * imitem = (imList_t *)sltp->imList->data;
 		indicator_removed(listener, server, imitem->indicator, "message", data);
@@ -255,6 +285,7 @@
 	if (sltp->menuitem != NULL) {
 		dbusmenu_menuitem_property_set(DBUSMENU_MENUITEM(sltp->menuitem), "visibile", "false");
 		dbusmenu_menuitem_child_delete(DBUSMENU_MENUITEM(data), DBUSMENU_MENUITEM(sltp->menuitem));
+		g_object_unref(G_OBJECT(sltp->menuitem));
 	}
 
 	g_free(sltp);
@@ -293,15 +324,31 @@
 }
 
 static void
-reconsile_list_and_menu (GList * serverlist, DbusmenuMenuitem * menushell)
+resort_menu (DbusmenuMenuitem * menushell)
 {
 	guint position = 0;
 	GList * serverentry;
+	GList * launcherentry = launcherList;
 
 	g_debug("Reordering Menu:");
 
 	for (serverentry = serverList; serverentry != NULL; serverentry = serverentry->next) {
 		serverList_t * si = (serverList_t *)serverentry->data;
+		
+		if (launcherentry != NULL) {
+			launcherList_t * li = (launcherList_t *)launcherentry->data;
+			while (launcherentry != NULL && g_strcmp0(launcher_menu_item_get_name(li->menuitem), app_menu_item_get_name(si->menuitem)) < 0) {
+				g_debug("\tMoving launcher '%s' to position %d", launcher_menu_item_get_name(li->menuitem), position);
+				dbusmenu_menuitem_child_reorder(DBUSMENU_MENUITEM(menushell), DBUSMENU_MENUITEM(li->menuitem), position);
+
+				position++;
+				launcherentry = launcherentry->next;
+				if (launcherentry != NULL) {
+					li = (launcherList_t *)launcherentry->data;
+				}
+			}
+		}
+
 		if (si->menuitem != NULL) {
 			g_debug("\tMoving app %s to position %d", INDICATE_LISTENER_SERVER_DBUS_NAME(si->server), position);
 			dbusmenu_menuitem_child_reorder(DBUSMENU_MENUITEM(menushell), DBUSMENU_MENUITEM(si->menuitem), position);
@@ -320,6 +367,15 @@
 		}
 	}
 
+	while (launcherentry != NULL) {
+		launcherList_t * li = (launcherList_t *)launcherentry->data;
+		g_debug("\tMoving launcher '%s' to position %d", launcher_menu_item_get_name(li->menuitem), position);
+		dbusmenu_menuitem_child_reorder(DBUSMENU_MENUITEM(menushell), DBUSMENU_MENUITEM(li->menuitem), position);
+
+		position++;
+		launcherentry = launcherentry->next;
+	}
+
 	return;
 }
 
@@ -465,6 +521,123 @@
 	return;
 }
 
+/* Check to see if a new desktop file causes
+   any of the launchers to be eclipsed by a running
+   process */
+static void
+check_eclipses (AppMenuItem * ai)
+{
+	g_debug("Checking eclipsing");
+	const gchar * aidesktop = app_menu_item_get_desktop(ai);
+	if (aidesktop == NULL) return;
+	g_debug("\tApp desktop: %s", aidesktop);
+
+	GList * llitem;
+	for (llitem = launcherList; llitem != NULL; llitem = llitem->next) {
+		launcherList_t * ll = (launcherList_t *)llitem->data;
+		const gchar * lidesktop = launcher_menu_item_get_desktop(ll->menuitem);
+		g_debug("\tLauncher desktop: %s", lidesktop);
+
+		if (!g_strcmp0(aidesktop, lidesktop)) {
+			launcher_menu_item_set_eclipsed(ll->menuitem, TRUE);
+			break;
+		}
+	}
+
+	return;
+}
+
+/* Remove any eclipses that might have been caused
+   by this app item that is now retiring */
+static void
+remove_eclipses (AppMenuItem * ai)
+{
+	const gchar * aidesktop = app_menu_item_get_desktop(ai);
+	if (aidesktop == NULL) return;
+
+	GList * llitem;
+	for (llitem = launcherList; llitem != NULL; llitem = llitem->next) {
+		launcherList_t * ll = (launcherList_t *)llitem->data;
+		const gchar * lidesktop = launcher_menu_item_get_desktop(ll->menuitem);
+
+		if (!g_strcmp0(aidesktop, lidesktop)) {
+			launcher_menu_item_set_eclipsed(ll->menuitem, FALSE);
+			break;
+		}
+	}
+
+	return;
+}
+
+/* This function turns a specific file into a menu
+   item and registers it appropriately with everyone */
+static gboolean
+build_launcher (gpointer data)
+{
+	/* Read the file get the data */
+	gchar * path = (gchar *)data;
+	g_debug("\tpath: %s", path);
+	gchar * desktop = NULL;
+	
+	g_file_get_contents(path, &desktop, NULL, NULL);
+	g_free(path);
+
+	if (desktop == NULL) {
+		return FALSE;
+	}
+
+	gchar * trimdesktop = pango_trim_string(desktop);
+	g_free(desktop);
+	g_debug("\tcontents: %s", trimdesktop);
+
+	/* Build the item */
+	launcherList_t * ll = g_new0(launcherList_t, 1);
+	ll->menuitem = launcher_menu_item_new(trimdesktop);
+	g_free(trimdesktop);
+
+	/* Add it to the list */
+	launcherList = g_list_insert_sorted(launcherList, ll, launcherList_sort);
+
+	/* Add it to the menu */
+	dbusmenu_menuitem_child_append(root_menuitem, DBUSMENU_MENUITEM(ll->menuitem));
+	resort_menu(root_menuitem);
+
+	return FALSE;
+}
+
+/* This function goes through all the launchers that we're
+   supposed to be grabbing and decides to show turn them
+   into menu items or not.  It doens't do the work, but it
+   makes the decision. */
+static gboolean
+build_launchers (gpointer data)
+{
+	if (!g_file_test(SYSTEM_APPS_DIR, G_FILE_TEST_IS_DIR)) {
+		return FALSE;
+	}
+
+	GError * error = NULL;
+	GDir * dir = g_dir_open(SYSTEM_APPS_DIR, 0, &error);
+	if (dir == NULL) {
+		g_warning("Unable to open system apps directory: %s", error->message);
+		g_error_free(error);
+		return FALSE;
+	}
+
+	const gchar * filename = NULL;
+	while ((filename = g_dir_read_name(dir)) != NULL) {
+		g_debug("Found file: %s", filename);
+		gchar * path = g_build_filename(SYSTEM_APPS_DIR, filename, NULL);
+		g_idle_add(build_launcher, path);
+	}
+
+	g_dir_close(dir);
+	launcherList = g_list_sort(launcherList, launcherList_sort);
+	return FALSE;
+}
+
+/* Oh, if you don't know what main() is for
+   we really shouldn't be talking. */
 int
 main (int argc, char ** argv)
 {
@@ -497,6 +670,8 @@
 	g_signal_connect(listener, INDICATE_LISTENER_SIGNAL_SERVER_ADDED, G_CALLBACK(server_added), root_menuitem);
 	g_signal_connect(listener, INDICATE_LISTENER_SIGNAL_SERVER_REMOVED, G_CALLBACK(server_removed), root_menuitem);
 
+	g_idle_add(build_launchers, NULL);
+
 	mainloop = g_main_loop_new(NULL, FALSE);
 	g_main_loop_run(mainloop);