Merge lp:~jconti/indicator-applet/gnome3 into lp:indicator-applet/0.4

[Raphaël Hertzog]

It looks like this branch is the only code base that works with GNOME3. Someone should take the responsibility to merge it and to make a new official release of it.

Without this release, the package is going to be dropped from Debian testing (unless we decide to package this branch directly, but it would be weird to have to do that...).

I put Ted as reviewer since he's the only upstream person that has worked on a port.

[Dmitry Shachnev (mitya57)]

Builds and works for me™, though not for all (see https://bugs.launchpad.net/indicator-applet/+bug/724369/comments/27).

Note that my branch lp:~mitya57/indicator-session/fix-lp-881832 should be merged as well to get this working properly.

review: Approve

[Sebastien Bacher (seb128)]

Thanks for the work there, the people working on this code are at the ubuntu summit this week so it might take a few extra fays before getting a review but it's on the list of things to review

[Jason Conti (jconti)]

I unfortunately converted the tabs to spaces in src/applet-main.c, which makes the diff kind of ugly, so I did the same with Ted's branch and posted a slightly better diff here: http://paste.ubuntu.com/725607/

It is worth noting that I took a look at Ted's branch after seeing the merge proposal, and it appears to work correctly with just the updated configure.ac, data/Makefile.am and src/tomboykeybinder.c (to silence a warning) from my branch, so that may be another way to go since I made quite a few possibly unwelcomed changes in my branch (such as using the logging functions from lightdm, since I found that the ones in indicator-applet tend to lose debug messages occasionally).

[Dmitry Shachnev (mitya57)]

@Jason: I've updated indicator-session package in my ppa (it's now based on 0.7.3.1), can you please copy it to yours?

[Marco Trevisan (Treviño) (3v1n0)]

Missing support for secondary-activate event (i.e. middle-click) and I'd suggest to use something like the indicator-priority that we used in unity-panel-service to show some app-indicators (like bluetooth, keyboard and network ones) in the proper place.

For the rest, it seems good.

review: Needs Fixing

[lp:~jconti/indicator-applet/gnome3]

405. By Jason Conti on 2011-11-25

Add indicator secondary-activate signal

406. By Jason Conti on 2011-11-25

* Prepare indicator_order array for name-hints.
* Clean up menuitem data:
  - Remove old "indicator" data
  - Add new definitions for box and secondary-activate signal data

407. By Jason Conti on 2011-11-26

* Refactor place_in_menu into a separate function using place_in_menu_cb.
* If an entry has name-hint, it is used to position the entry.

408. By Jason Conti on 2011-11-26

Bump version to 0.4.14

[Jason Conti (jconti)]

Added secondary-activate signal and name-hint for positioning support. I'll update the ppa tomorrow for testing.

[Marco Trevisan (Treviño) (3v1n0)]

Code looks good. Thanks.

I've also planned to make the indicator order configurable via gsettings, so stay tuned on this side.

review: Approve

[Ted Gould (ted)]

Great, thanks for the work on this. A few comments:

 * Please don't change the version number in configure.ac, it really confuses things if there are multiple version numbers in "the wild" so it's better just to have one place define it. I'll fix this on merge, no worries there.
 * Love that you changed the strings to #defines. I think that's a wonderful thing :-)

Thanks again for your work.

review: Approve

[Sebastian Geiger (lanoxx)]

This was approved by Marco and Ted back in November, but the merge status is still set to 'Needs Review' could some body please update the status and tell if this is going to be merge upstream?

I also reviewed the code and can approve it. And also the ppa works on my oneric installation right now.

review: Approve (code review and test)

Unmerged revisions

408. By Jason Conti on 2011-11-26

Bump version to 0.4.14

407. By Jason Conti on 2011-11-26

* Refactor place_in_menu into a separate function using place_in_menu_cb.
* If an entry has name-hint, it is used to position the entry.

406. By Jason Conti on 2011-11-25

* Prepare indicator_order array for name-hints.
* Clean up menuitem data:
  - Remove old "indicator" data
  - Add new definitions for box and secondary-activate signal data

405. By Jason Conti on 2011-11-25

Add indicator secondary-activate signal

404. By Jason Conti on 2011-10-25

Bump version to 0.4.13

403. By Jason Conti on 2011-09-18

Missed a dollar sign in configure.ac.

402. By Jason Conti on 2011-08-11

Drop the default css code, it seems to be causing theming issues in the about
dialog when using the Ambiance theme.

401. By Jason Conti on 2011-08-02

Forgot to update the location of the applets.

400. By Jason Conti on 2011-08-02

Updated indicator_order to match the order in unity-panel-service.

399. By Jason Conti on 2011-08-02

Dropped menubar_on_expose and cw_panel_background_changed, I'm not sure they
are necessary anymore (the indicator applet seems to respond correctly to
changes in the panel background).

=== modified file '.bzrignore'
--- .bzrignore	2010-04-27 22:02:51 +0000
+++ .bzrignore	2011-11-26 02:05:26 +0000
@@ -4,8 +4,11 @@
 data/GNOME_IndicatorApplet.server
 data/GNOME_IndicatorApplet.server.in
 data/indicator-applet.schemas
+data/*.panel-applet
+data/*.service
 po/@GETTEXT_PACKAGE@.pot
 po/indicator-applet.pot
+po/*.gmo
 src/indicator-applet
 dbus-indicate-client.h
 dbus-indicate-server.h
 
=== modified file 'configure.ac'
--- configure.ac	2011-04-15 02:32:33 +0000
+++ configure.ac	2011-11-26 02:05:26 +0000
@@ -4,7 +4,7 @@
 AC_PREREQ(2.53)
 
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(indicator-applet, 0.4.12)
+AM_INIT_AUTOMAKE(indicator-applet, 0.4.14)
 
 AM_MAINTAINER_MODE
 m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES])
@@ -25,13 +25,15 @@
 # Dependencies 
 ###########################
 
-GTK_REQUIRED_VERSION=2.12
-INDICATOR_REQUIRED_VERSION=0.3.22
+GTK_REQUIRED_VERSION=3.1
+INDICATOR_REQUIRED_VERSION=0.3.92
+INDICATOR_PKG=indicator3-0.4
+APPLET_PKG=libpanelapplet-4.0
 
-PKG_CHECK_MODULES(APPLET, gtk+-2.0 >= $GTK_REQUIRED_VERSION
+PKG_CHECK_MODULES(APPLET, gtk+-3.0 >= $GTK_REQUIRED_VERSION
                           x11
-                          libpanelapplet-3.0
-                          indicator >= $INDICATOR_REQUIRED_VERSION)
+                          $APPLET_PKG
+                          $INDICATOR_PKG >= $INDICATOR_REQUIRED_VERSION)
 AC_SUBST(APPLET_CFLAGS)
 AC_SUBST(APPLET_LIBS)
 
@@ -47,13 +49,16 @@
 ###########################
 
 if test "x$with_localinstall" = "xyes"; then
+	APPLETDIR="${datadir}/gnome-panel/applets/"
 	INDICATORDIR="${libdir}/indicators/2/"
 	INDICATORICONSDIR="${datadir}/indicator-applet/icons/"
 else
-	INDICATORDIR=`$PKG_CONFIG --variable=indicatordir indicator`
-	INDICATORICONSDIR=`$PKG_CONFIG --variable=iconsdir indicator`
+	APPLETDIR=`$PKG_CONFIG --variable=libpanel_applet_dir $APPLET_PKG`
+	INDICATORDIR=`$PKG_CONFIG --variable=indicatordir $INDICATOR_PKG`
+	INDICATORICONSDIR=`$PKG_CONFIG --variable=iconsdir $INDICATOR_PKG`
 fi
 
+AC_SUBST(APPLETDIR)
 AC_SUBST(INDICATORDIR)
 AC_SUBST(INDICATORICONSDIR)
 
 
=== modified file 'data/Makefile.am'
--- data/Makefile.am	2010-11-10 18:28:18 +0000
+++ data/Makefile.am	2011-11-26 02:05:26 +0000
@@ -4,7 +4,7 @@
 # Applets
 ##############################
 
-appletdir       = $(datadir)/gnome-panel/applets
+appletdir       = $(APPLETDIR)
 applet_in_files = \
 	org.ayatana.panel.IndicatorApplet.panel-applet.in \
 	org.ayatana.panel.IndicatorAppletComplete.panel-applet.in \
 
=== modified file 'src/Makefile.am'
--- src/Makefile.am	2010-04-26 15:21:06 +0000
+++ src/Makefile.am	2011-11-26 02:05:26 +0000
@@ -11,6 +11,8 @@
 	-DINDICATOR_DIR=\""$(INDICATORDIR)"\" \
 	-DINDICATOR_ICONS_DIR=\""$(INDICATORICONSDIR)"\" \
 	-DINDICATOR_APPLET \
+	-DGDK_DISABLE_DEPRECATED \
+	-DGTK_DISABLE_DEPRECATED \
 	-I$(srcdir)/.. \
 	$(APPLET_CFLAGS)
 
@@ -30,6 +32,8 @@
 	-DINDICATOR_DIR=\""$(INDICATORDIR)"\" \
 	-DINDICATOR_ICONS_DIR=\""$(INDICATORICONSDIR)"\" \
 	-DINDICATOR_APPLET_APPMENU \
+	-DGDK_DISABLE_DEPRECATED \
+	-DGTK_DISABLE_DEPRECATED \
 	-I$(srcdir)/.. \
 	$(APPLET_CFLAGS)
 
@@ -49,6 +53,8 @@
 	-DINDICATOR_DIR=\""$(INDICATORDIR)"\" \
 	-DINDICATOR_ICONS_DIR=\""$(INDICATORICONSDIR)"\" \
 	-DINDICATOR_APPLET_SESSION \
+	-DGDK_DISABLE_DEPRECATED \
+	-DGTK_DISABLE_DEPRECATED \
 	-I$(srcdir)/.. \
 	$(APPLET_CFLAGS)
 
@@ -68,6 +74,8 @@
 	-DINDICATOR_DIR=\""$(INDICATORDIR)"\" \
 	-DINDICATOR_ICONS_DIR=\""$(INDICATORICONSDIR)"\" \
 	-DINDICATOR_APPLET_COMPLETE \
+	-DGDK_DISABLE_DEPRECATED \
+	-DGTK_DISABLE_DEPRECATED \
 	-I$(srcdir)/.. \
 	$(APPLET_CFLAGS)
 
 
=== modified file 'src/applet-main.c'
--- src/applet-main.c	2011-04-13 16:22:14 +0000
+++ src/applet-main.c	2011-11-26 02:05:26 +0000
@@ -30,31 +30,36 @@
 #include "libindicator/indicator-object.h"
 #include "tomboykeybinder.h"
 
-static gchar * indicator_order[] = {
-	"libapplication.so",
-	"libsoundmenu.so",
-	"libmessaging.so",
-	"libdatetime.so",
-	"libme.so",
-	"libsession.so",
-	NULL
+static gchar * indicator_order[][2] = {
+  {"libappmenu.so", NULL},
+  {"libapplication.so", NULL},
+  {"libapplication.so", "gst-keyboard-xkb"},
+  {"libmessaging.so", NULL},
+  {"libpower.so", NULL},
+  {"libapplication.so", "bluetooth-manager"},
+  {"libnetwork.so", NULL},
+  {"libnetworkmenu.so", NULL},
+  {"libapplication.so", "nm-applet"},
+  {"libsoundmenu.so", NULL},
+  {"libdatetime.so", NULL},
+  {"libsession.so", NULL},
+  {NULL, NULL}
 };
 
 static GtkPackDirection packdirection;
 static PanelAppletOrient orient;
 
+#define  MENU_DATA_BOX               "box"
 #define  MENU_DATA_INDICATOR_OBJECT  "indicator-object"
 #define  MENU_DATA_INDICATOR_ENTRY   "indicator-entry"
+#define  MENU_DATA_IN_MENUITEM       "in-menuitem"
+#define  MENU_DATA_MENUITEM_PRESSED  "menuitem-pressed"
 
+#define  IO_DATA_NAME                "indicator-name"
 #define  IO_DATA_ORDER_NUMBER        "indicator-order-number"
 
-static gboolean     applet_fill_cb (PanelApplet * applet, const gchar * iid, gpointer data);
+static gboolean applet_fill_cb (PanelApplet * applet, const gchar * iid, gpointer data);
 
-static void cw_panel_background_changed (PanelApplet               *applet,
-                                         PanelAppletBackgroundType  type,
-                        				         GdkColor                  *colour,
-                        				         GdkPixmap                 *pixmap,
-                                         GtkWidget                 *menubar);
 static void update_accessible_desc (IndicatorObjectEntry * entry, GtkWidget * menuitem);
 
 /*************
@@ -64,25 +69,21 @@
 #ifdef INDICATOR_APPLET
 PANEL_APPLET_OUT_PROCESS_FACTORY ("IndicatorAppletFactory",
                PANEL_TYPE_APPLET,
-               "indicator-applet",
                applet_fill_cb, NULL);
 #endif
 #ifdef INDICATOR_APPLET_SESSION
 PANEL_APPLET_OUT_PROCESS_FACTORY ("FastUserSwitchAppletFactory",
                PANEL_TYPE_APPLET,
-               "indicator-applet-session",
                applet_fill_cb, NULL);
 #endif
 #ifdef INDICATOR_APPLET_COMPLETE
 PANEL_APPLET_OUT_PROCESS_FACTORY ("IndicatorAppletCompleteFactory",
                PANEL_TYPE_APPLET,
-               "indicator-applet-complete",
                applet_fill_cb, NULL);
 #endif
 #ifdef INDICATOR_APPLET_APPMENU
 PANEL_APPLET_OUT_PROCESS_FACTORY ("IndicatorAppletAppmenuFactory",
                PANEL_TYPE_APPLET,
-               "indicator-applet-appmenu",
                applet_fill_cb, NULL);
 #endif
 
@@ -101,7 +102,7 @@
 #ifdef INDICATOR_APPLET_APPMENU
 #define LOG_FILE_NAME  "indicator-applet-appmenu.log"
 #endif
-GOutputStream * log_file = NULL;
+static FILE *log_file = NULL;
 
 /*****************
  * Hotkey support 
@@ -136,34 +137,31 @@
 #endif
 
 static const gchar * indicator_env[] = {
-	"indicator-applet",
-	INDICATOR_SPECIFIC_ENV,
-	NULL
+  "indicator-applet",
+  INDICATOR_SPECIFIC_ENV,
+  NULL
 };
 
-/*************
- * init function
- * ***********/
-
 static gint
-name2order (const gchar * name) {
-	int i;
-
-	for (i = 0; indicator_order[i] != NULL; i++) {
-		if (g_strcmp0(name, indicator_order[i]) == 0) {
-			return i;
-		}
-	}
-
-	return -1;
+name2order (const gchar * name, const gchar * hint) {
+  int i;
+
+  for (i = 0; indicator_order[i][0] != NULL; i++) {
+    if (g_strcmp0(name, indicator_order[i][0]) == 0 &&
+        g_strcmp0(hint, indicator_order[i][1]) == 0) {
+      return i;
+    }
+  }
+
+  return -1;
 }
 
 typedef struct _incoming_position_t incoming_position_t;
 struct _incoming_position_t {
-	gint objposition;
-	gint entryposition;
-	gint menupos;
-	gboolean found;
+  gint objposition;
+  gint entryposition;
+  gint menupos;
+  gboolean found;
 };
 
 /* This function helps by determining where in the menu list
@@ -171,263 +169,337 @@
    that they're on, and then the individual entries.  Each
    is progressively more expensive. */
 static void
-place_in_menu (GtkWidget * widget, gpointer user_data)
-{
-	incoming_position_t * position = (incoming_position_t *)user_data;
-	if (position->found) {
-		/* We've already been placed, just finish the foreach */
-		return;
-	}
-
-	IndicatorObject * io = INDICATOR_OBJECT(g_object_get_data(G_OBJECT(widget), MENU_DATA_INDICATOR_OBJECT));
-	g_assert(io != NULL);
-
-	gint objposition = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(io), IO_DATA_ORDER_NUMBER));
-	/* We've already passed it, well, then this is where
-	   we should be be.  Stop! */
-	if (objposition > position->objposition) {
-		position->found = TRUE;
-		return;
-	}
-
-	/* The objects don't match yet, keep looking */
-	if (objposition < position->objposition) {
-		position->menupos++;
-		return;
-	}
-
-	/* The objects are the same, let's start looking at entries. */
-	IndicatorObjectEntry * entry = (IndicatorObjectEntry *)g_object_get_data(G_OBJECT(widget), MENU_DATA_INDICATOR_ENTRY);
-	gint entryposition = indicator_object_get_location(io, entry);
-
-	if (entryposition > position->entryposition) {
-		position->found = TRUE;
-		return;
-	}
-
-	if (entryposition < position->entryposition) {
-		position->menupos++;
-		return;
-	}
-
-	/* We've got the same object and the same entry.  Well,
-	   let's just put it right here then. */
-	position->found = TRUE;
-	return;
+place_in_menu_cb (GtkWidget * widget, gpointer user_data)
+{
+  incoming_position_t * position = (incoming_position_t *)user_data;
+  if (position->found) {
+    /* We've already been placed, just finish the foreach */
+    return;
+  }
+
+  IndicatorObject * io = INDICATOR_OBJECT(g_object_get_data(G_OBJECT(widget), MENU_DATA_INDICATOR_OBJECT));
+  g_return_if_fail(INDICATOR_IS_OBJECT(io));
+
+  gint objposition = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(io), IO_DATA_ORDER_NUMBER));
+  /* We've already passed it, well, then this is where
+     we should be be.  Stop! */
+  if (objposition > position->objposition) {
+    position->found = TRUE;
+    return;
+  }
+
+  /* The objects don't match yet, keep looking */
+  if (objposition < position->objposition) {
+    position->menupos++;
+    return;
+  }
+
+  /* The objects are the same, let's start looking at entries. */
+  IndicatorObjectEntry * entry = (IndicatorObjectEntry *)g_object_get_data(G_OBJECT(widget), MENU_DATA_INDICATOR_ENTRY);
+  gint entryposition = indicator_object_get_location(io, entry);
+
+  if (entryposition > position->entryposition) {
+    position->found = TRUE;
+    return;
+  }
+
+  if (entryposition < position->entryposition) {
+    position->menupos++;
+    return;
+  }
+
+  /* We've got the same object and the same entry.  Well,
+     let's just put it right here then. */
+  position->found = TRUE;
+  return;
+}
+
+/* Position the entry */
+static void
+place_in_menu (GtkWidget *menubar, 
+               GtkWidget *menuitem, 
+               IndicatorObject *io, 
+               IndicatorObjectEntry *entry)
+{
+  incoming_position_t position;
+
+  /* Start with the default position for this indicator object */
+  gint io_position = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(io), IO_DATA_ORDER_NUMBER));
+
+  /* If name-hint is set, try to find the entry's position */
+  if (entry->name_hint != NULL) {
+    const gchar *name = (const gchar *)g_object_get_data(G_OBJECT(io), IO_DATA_NAME);
+    gint entry_position = name2order(name, entry->name_hint);
+
+    /* If we don't find the entry, fall back to the indicator object's position */
+    if (entry_position > -1)
+      io_position = entry_position;
+  }
+
+  position.objposition = io_position;
+  position.entryposition = indicator_object_get_location(io, entry);
+  position.menupos = 0;
+  position.found = FALSE;
+
+  gtk_container_foreach(GTK_CONTAINER(menubar), place_in_menu_cb, &position);
+
+  gtk_menu_shell_insert(GTK_MENU_SHELL(menubar), menuitem, position.menupos);
 }
 
 static void
 something_shown (GtkWidget * widget, gpointer user_data)
 {
-	GtkWidget * menuitem = GTK_WIDGET(user_data);
-	gtk_widget_show(menuitem);
+  GtkWidget * menuitem = GTK_WIDGET(user_data);
+  gtk_widget_show(menuitem);
 }
 
 static void
 something_hidden (GtkWidget * widget, gpointer user_data)
 {
-	GtkWidget * menuitem = GTK_WIDGET(user_data);
-	gtk_widget_hide(menuitem);
+  GtkWidget * menuitem = GTK_WIDGET(user_data);
+  gtk_widget_hide(menuitem);
 }
 
 static void
 sensitive_cb (GObject * obj, GParamSpec * pspec, gpointer user_data)
 {
-	g_return_if_fail(GTK_IS_WIDGET(obj));
-	g_return_if_fail(GTK_IS_WIDGET(user_data));
+  g_return_if_fail(GTK_IS_WIDGET(obj));
+  g_return_if_fail(GTK_IS_WIDGET(user_data));
 
-	gtk_widget_set_sensitive(GTK_WIDGET(user_data), gtk_widget_get_sensitive(GTK_WIDGET(obj)));
-	return;
+  gtk_widget_set_sensitive(GTK_WIDGET(user_data), gtk_widget_get_sensitive(GTK_WIDGET(obj)));
+  return;
 }
 
 static void
 entry_activated (GtkWidget * widget, gpointer user_data)
 {
-	g_return_if_fail(GTK_IS_WIDGET(widget));
-	gpointer pio = g_object_get_data(G_OBJECT(widget), "indicator");
-	g_return_if_fail(INDICATOR_IS_OBJECT(pio));
-	IndicatorObject * io = INDICATOR_OBJECT(pio);
-
-	return indicator_object_entry_activate(io, (IndicatorObjectEntry *)user_data, gtk_get_current_event_time());
+  g_return_if_fail(GTK_IS_WIDGET(widget));
+
+  IndicatorObject *io = g_object_get_data (G_OBJECT (widget), MENU_DATA_INDICATOR_OBJECT);
+  IndicatorObjectEntry *entry = g_object_get_data (G_OBJECT (widget), MENU_DATA_INDICATOR_ENTRY);
+
+  g_return_if_fail(INDICATOR_IS_OBJECT(io));
+
+  return indicator_object_entry_activate(io, entry, gtk_get_current_event_time());
+}
+
+static gboolean
+entry_secondary_activated (GtkWidget * widget, GdkEvent * event, gpointer user_data)
+{
+  g_return_val_if_fail(GTK_IS_WIDGET(widget), FALSE);
+
+  switch (event->type) {
+    case GDK_ENTER_NOTIFY:
+      g_object_set_data(G_OBJECT(widget), MENU_DATA_IN_MENUITEM, GINT_TO_POINTER(TRUE));
+      break;
+
+    case GDK_LEAVE_NOTIFY:
+      g_object_set_data(G_OBJECT(widget), MENU_DATA_IN_MENUITEM, GINT_TO_POINTER(FALSE));
+      g_object_set_data(G_OBJECT(widget), MENU_DATA_MENUITEM_PRESSED, GINT_TO_POINTER(FALSE));
+      break;
+
+    case GDK_BUTTON_PRESS:
+      if (event->button.button == 2) {
+        g_object_set_data(G_OBJECT(widget), MENU_DATA_MENUITEM_PRESSED, GINT_TO_POINTER(TRUE));
+      }
+      break;
+
+    case GDK_BUTTON_RELEASE:
+      if (event->button.button == 2) {
+        gboolean in_menuitem = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(widget), MENU_DATA_IN_MENUITEM));
+        gboolean menuitem_pressed = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(widget), MENU_DATA_MENUITEM_PRESSED));
+
+        if (in_menuitem && menuitem_pressed) {
+          g_object_set_data(G_OBJECT(widget), MENU_DATA_MENUITEM_PRESSED, GINT_TO_POINTER(FALSE));
+
+          IndicatorObject *io = g_object_get_data(G_OBJECT(widget), MENU_DATA_INDICATOR_OBJECT);
+          IndicatorObjectEntry *entry = g_object_get_data(G_OBJECT(widget), MENU_DATA_INDICATOR_ENTRY);
+
+          g_return_val_if_fail(INDICATOR_IS_OBJECT(io), FALSE);
+
+          g_signal_emit_by_name(io, INDICATOR_OBJECT_SIGNAL_SECONDARY_ACTIVATE, 
+              entry, event->button.time);
+        }
+      }
+      break;
+  }
+
+  return FALSE;
 }
 
 static gboolean
 entry_scrolled (GtkWidget *menuitem, GdkEventScroll *event, gpointer data)
 {
-	IndicatorObject *io = g_object_get_data (G_OBJECT (menuitem), MENU_DATA_INDICATOR_OBJECT);
-	IndicatorObjectEntry *entry = g_object_get_data (G_OBJECT (menuitem), MENU_DATA_INDICATOR_ENTRY);
-
-	g_return_val_if_fail(INDICATOR_IS_OBJECT(io), FALSE);
-
-	g_signal_emit_by_name (io, "scroll", 1, event->direction);
-	g_signal_emit_by_name (io, "scroll-entry", entry, 1, event->direction);
-
-	return FALSE;
+  g_return_val_if_fail(GTK_IS_WIDGET(menuitem), FALSE);
+
+  IndicatorObject *io = g_object_get_data (G_OBJECT (menuitem), MENU_DATA_INDICATOR_OBJECT);
+  IndicatorObjectEntry *entry = g_object_get_data (G_OBJECT (menuitem), MENU_DATA_INDICATOR_ENTRY);
+
+  g_return_val_if_fail(INDICATOR_IS_OBJECT(io), FALSE);
+
+  g_signal_emit_by_name (io, INDICATOR_OBJECT_SIGNAL_ENTRY_SCROLLED, entry, 1, event->direction);
+
+  return FALSE;
 }
 
 static void
 accessible_desc_update_cb (GtkWidget * widget, gpointer userdata)
 {
-	gpointer data = g_object_get_data(G_OBJECT(widget), MENU_DATA_INDICATOR_ENTRY);
-
-	if (data != userdata) {
-		return;
-	}
-
-	IndicatorObjectEntry * entry = (IndicatorObjectEntry *)data;
-	update_accessible_desc(entry, widget);
+  gpointer data = g_object_get_data(G_OBJECT(widget), MENU_DATA_INDICATOR_ENTRY);
+
+  if (data != userdata) {
+    return;
+  }
+
+  IndicatorObjectEntry * entry = (IndicatorObjectEntry *)data;
+  update_accessible_desc(entry, widget);
 }
 
 static void
 accessible_desc_update (IndicatorObject * io, IndicatorObjectEntry * entry, GtkWidget * menubar)
 {
-	gtk_container_foreach(GTK_CONTAINER(menubar), accessible_desc_update_cb, entry);
-	return;
+  gtk_container_foreach(GTK_CONTAINER(menubar), accessible_desc_update_cb, entry);
+  return;
 }
 
 static void
 entry_added (IndicatorObject * io, IndicatorObjectEntry * entry, GtkWidget * menubar)
 {
-	g_debug("Signal: Entry Added");
-	gboolean something_visible = FALSE;
-	gboolean something_sensitive = FALSE;
-
-	GtkWidget * menuitem = gtk_menu_item_new();
-	GtkWidget * box = (packdirection == GTK_PACK_DIRECTION_LTR) ?
-			gtk_hbox_new(FALSE, 3) : gtk_vbox_new(FALSE, 3);
-
-	g_object_set_data (G_OBJECT (menuitem), "indicator", io);
-	g_object_set_data (G_OBJECT (menuitem), "box", box);
-
-	g_signal_connect(G_OBJECT(menuitem), "activate", G_CALLBACK(entry_activated), entry);
-	g_signal_connect(G_OBJECT(menuitem), "scroll-event", G_CALLBACK(entry_scrolled), entry);
-
-	if (entry->image != NULL) {
-		gtk_box_pack_start(GTK_BOX(box), GTK_WIDGET(entry->image), FALSE, FALSE, 1);
-		if (gtk_widget_get_visible(GTK_WIDGET(entry->image))) {
-			something_visible = TRUE;
-		}
-
-		if (gtk_widget_get_sensitive(GTK_WIDGET(entry->image))) {
-			something_sensitive = TRUE;
-		}
-
-		g_signal_connect(G_OBJECT(entry->image), "show", G_CALLBACK(something_shown), menuitem);
-		g_signal_connect(G_OBJECT(entry->image), "hide", G_CALLBACK(something_hidden), menuitem);
-
-		g_signal_connect(G_OBJECT(entry->image), "notify::sensitive", G_CALLBACK(sensitive_cb), menuitem);
-	}
-	if (entry->label != NULL) {
-		switch(packdirection) {
-			case GTK_PACK_DIRECTION_LTR:
-				gtk_label_set_angle(GTK_LABEL(entry->label), 0.0);
-				break;
-			case GTK_PACK_DIRECTION_TTB:
-				gtk_label_set_angle(GTK_LABEL(entry->label),
-						(orient == PANEL_APPLET_ORIENT_LEFT) ? 
-						270.0 : 90.0);
-				break;
-			default:
-				break;
-		}		
-		gtk_box_pack_start(GTK_BOX(box), GTK_WIDGET(entry->label), FALSE, FALSE, 1);
-
-		if (gtk_widget_get_visible(GTK_WIDGET(entry->label))) {
-			something_visible = TRUE;
-		}
-
-		if (gtk_widget_get_sensitive(GTK_WIDGET(entry->label))) {
-			something_sensitive = TRUE;
-		}
-
-		g_signal_connect(G_OBJECT(entry->label), "show", G_CALLBACK(something_shown), menuitem);
-		g_signal_connect(G_OBJECT(entry->label), "hide", G_CALLBACK(something_hidden), menuitem);
-
-		g_signal_connect(G_OBJECT(entry->label), "notify::sensitive", G_CALLBACK(sensitive_cb), menuitem);
-	}
-	gtk_container_add(GTK_CONTAINER(menuitem), box);
-	gtk_widget_show(box);
-
-	if (entry->menu != NULL) {
-		gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuitem), GTK_WIDGET(entry->menu));
-	}
-
-	incoming_position_t position;
-	position.objposition = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(io), IO_DATA_ORDER_NUMBER));
-	position.entryposition = indicator_object_get_location(io, entry);
-	position.menupos = 0;
-	position.found = FALSE;
-
-	gtk_container_foreach(GTK_CONTAINER(menubar), place_in_menu, &position);
-
-	gtk_menu_shell_insert(GTK_MENU_SHELL(menubar), menuitem, position.menupos);
-
-	if (something_visible) {
-		if (entry->accessible_desc != NULL) {
-			update_accessible_desc(entry, menuitem);
-		}
-		gtk_widget_show(menuitem);
-	}
-	gtk_widget_set_sensitive(menuitem, something_sensitive);
-
-	g_object_set_data(G_OBJECT(menuitem), MENU_DATA_INDICATOR_ENTRY,  entry);
-	g_object_set_data(G_OBJECT(menuitem), MENU_DATA_INDICATOR_OBJECT, io);
-
-	return;
+  const char *indicator_name = (const gchar *)g_object_get_data(G_OBJECT(io), IO_DATA_NAME);
+  g_debug("Signal: Entry Added from %s", indicator_name);
+  gboolean something_visible = FALSE;
+  gboolean something_sensitive = FALSE;
+
+  GtkWidget * menuitem = gtk_menu_item_new();
+  GtkWidget * box = (packdirection == GTK_PACK_DIRECTION_LTR) ?
+      gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 3) : gtk_box_new(GTK_ORIENTATION_VERTICAL, 3);
+
+  g_object_set_data (G_OBJECT (menuitem), MENU_DATA_BOX, box);
+  g_object_set_data(G_OBJECT(menuitem), MENU_DATA_INDICATOR_ENTRY,  entry);
+  g_object_set_data(G_OBJECT(menuitem), MENU_DATA_INDICATOR_OBJECT, io);
+
+  g_signal_connect(G_OBJECT(menuitem), "activate", G_CALLBACK(entry_activated), NULL);
+  g_signal_connect(G_OBJECT(menuitem), "button-press-event", G_CALLBACK(entry_secondary_activated), NULL);
+  g_signal_connect(G_OBJECT(menuitem), "button-release-event", G_CALLBACK(entry_secondary_activated), NULL);
+  g_signal_connect(G_OBJECT(menuitem), "enter-notify-event", G_CALLBACK(entry_secondary_activated), NULL);
+  g_signal_connect(G_OBJECT(menuitem), "leave-notify-event", G_CALLBACK(entry_secondary_activated), NULL);
+  g_signal_connect(G_OBJECT(menuitem), "scroll-event", G_CALLBACK(entry_scrolled), NULL);
+
+  if (entry->image != NULL) {
+    gtk_box_pack_start(GTK_BOX(box), GTK_WIDGET(entry->image), FALSE, FALSE, 1);
+    if (gtk_widget_get_visible(GTK_WIDGET(entry->image))) {
+      something_visible = TRUE;
+    }
+
+    if (gtk_widget_get_sensitive(GTK_WIDGET(entry->image))) {
+      something_sensitive = TRUE;
+    }
+
+    g_signal_connect(G_OBJECT(entry->image), "show", G_CALLBACK(something_shown), menuitem);
+    g_signal_connect(G_OBJECT(entry->image), "hide", G_CALLBACK(something_hidden), menuitem);
+
+    g_signal_connect(G_OBJECT(entry->image), "notify::sensitive", G_CALLBACK(sensitive_cb), menuitem);
+  }
+  if (entry->label != NULL) {
+    switch(packdirection) {
+      case GTK_PACK_DIRECTION_LTR:
+        gtk_label_set_angle(GTK_LABEL(entry->label), 0.0);
+        break;
+      case GTK_PACK_DIRECTION_TTB:
+        gtk_label_set_angle(GTK_LABEL(entry->label),
+            (orient == PANEL_APPLET_ORIENT_LEFT) ? 
+            270.0 : 90.0);
+        break;
+      default:
+        break;
+    }    
+    gtk_box_pack_start(GTK_BOX(box), GTK_WIDGET(entry->label), FALSE, FALSE, 1);
+
+    if (gtk_widget_get_visible(GTK_WIDGET(entry->label))) {
+      something_visible = TRUE;
+    }
+
+    if (gtk_widget_get_sensitive(GTK_WIDGET(entry->label))) {
+      something_sensitive = TRUE;
+    }
+
+    g_signal_connect(G_OBJECT(entry->label), "show", G_CALLBACK(something_shown), menuitem);
+    g_signal_connect(G_OBJECT(entry->label), "hide", G_CALLBACK(something_hidden), menuitem);
+
+    g_signal_connect(G_OBJECT(entry->label), "notify::sensitive", G_CALLBACK(sensitive_cb), menuitem);
+  }
+  gtk_container_add(GTK_CONTAINER(menuitem), box);
+  gtk_widget_show(box);
+
+  if (entry->menu != NULL) {
+    gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuitem), GTK_WIDGET(entry->menu));
+  }
+
+  place_in_menu(menubar, menuitem, io, entry);
+
+  if (something_visible) {
+    if (entry->accessible_desc != NULL) {
+      update_accessible_desc(entry, menuitem);
+    }
+    gtk_widget_show(menuitem);
+  }
+  gtk_widget_set_sensitive(menuitem, something_sensitive);
+
+  return;
 }
 
 static void
 entry_removed_cb (GtkWidget * widget, gpointer userdata)
 {
-	gpointer data = g_object_get_data(G_OBJECT(widget), MENU_DATA_INDICATOR_ENTRY);
-
-	if (data != userdata) {
-		return;
-	}
-
-	IndicatorObjectEntry * entry = (IndicatorObjectEntry *)data;
-	if (entry->label != NULL) {
-		g_signal_handlers_disconnect_by_func(G_OBJECT(entry->label), G_CALLBACK(something_shown), widget);
-		g_signal_handlers_disconnect_by_func(G_OBJECT(entry->label), G_CALLBACK(something_hidden), widget);
-		g_signal_handlers_disconnect_by_func(G_OBJECT(entry->label), G_CALLBACK(sensitive_cb), widget);
-	}
-	if (entry->image != NULL) {
-		g_signal_handlers_disconnect_by_func(G_OBJECT(entry->image), G_CALLBACK(something_shown), widget);
-		g_signal_handlers_disconnect_by_func(G_OBJECT(entry->image), G_CALLBACK(something_hidden), widget);
-		g_signal_handlers_disconnect_by_func(G_OBJECT(entry->image), G_CALLBACK(sensitive_cb), widget);
-	}
-
-	gtk_widget_destroy(widget);
-	return;
+  gpointer data = g_object_get_data(G_OBJECT(widget), MENU_DATA_INDICATOR_ENTRY);
+
+  if (data != userdata) {
+    return;
+  }
+
+  IndicatorObjectEntry * entry = (IndicatorObjectEntry *)data;
+  if (entry->label != NULL) {
+    g_signal_handlers_disconnect_by_func(G_OBJECT(entry->label), G_CALLBACK(something_shown), widget);
+    g_signal_handlers_disconnect_by_func(G_OBJECT(entry->label), G_CALLBACK(something_hidden), widget);
+    g_signal_handlers_disconnect_by_func(G_OBJECT(entry->label), G_CALLBACK(sensitive_cb), widget);
+  }
+  if (entry->image != NULL) {
+    g_signal_handlers_disconnect_by_func(G_OBJECT(entry->image), G_CALLBACK(something_shown), widget);
+    g_signal_handlers_disconnect_by_func(G_OBJECT(entry->image), G_CALLBACK(something_hidden), widget);
+    g_signal_handlers_disconnect_by_func(G_OBJECT(entry->image), G_CALLBACK(sensitive_cb), widget);
+  }
+
+  gtk_widget_destroy(widget);
+  return;
 }
 
 static void
 entry_removed (IndicatorObject * io G_GNUC_UNUSED, IndicatorObjectEntry * entry,
                gpointer user_data)
 {
-	g_debug("Signal: Entry Removed");
-
-	gtk_container_foreach(GTK_CONTAINER(user_data), entry_removed_cb, entry);
-
-	return;
+  g_debug("Signal: Entry Removed");
+
+  gtk_container_foreach(GTK_CONTAINER(user_data), entry_removed_cb, entry);
+
+  return;
 }
 
 static void
 entry_moved_find_cb (GtkWidget * widget, gpointer userdata)
 {
-	gpointer * array = (gpointer *)userdata;
-	if (array[1] != NULL) {
-		return;
-	}
-
-	gpointer data = g_object_get_data(G_OBJECT(widget), MENU_DATA_INDICATOR_ENTRY);
-
-	if (data != array[0]) {
-		return;
-	}
-
-	array[1] = widget;
-	return;
+  gpointer * array = (gpointer *)userdata;
+  if (array[1] != NULL) {
+    return;
+  }
+
+  gpointer data = g_object_get_data(G_OBJECT(widget), MENU_DATA_INDICATOR_ENTRY);
+
+  if (data != array[0]) {
+    return;
+  }
+
+  array[1] = widget;
+  return;
 }
 
 /* Gets called when an entry for an object was moved. */
@@ -435,147 +507,135 @@
 entry_moved (IndicatorObject * io, IndicatorObjectEntry * entry,
              gint old G_GNUC_UNUSED, gint new G_GNUC_UNUSED, gpointer user_data)
 {
-	GtkWidget * menubar = GTK_WIDGET(user_data);
-
-	gpointer array[2];
-	array[0] = entry;
-	array[1] = NULL;
-
-	gtk_container_foreach(GTK_CONTAINER(menubar), entry_moved_find_cb, array);
-	if (array[1] == NULL) {
-		g_warning("Moving an entry that isn't in our menus.");
-		return;
-	}
-
-	GtkWidget * mi = GTK_WIDGET(array[1]);
-	g_object_ref(G_OBJECT(mi));
-	gtk_container_remove(GTK_CONTAINER(menubar), mi);
-
-	incoming_position_t position;
-	position.objposition = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(io), IO_DATA_ORDER_NUMBER));
-	position.entryposition = indicator_object_get_location(io, entry);
-	position.menupos = 0;
-	position.found = FALSE;
-
-	gtk_container_foreach(GTK_CONTAINER(menubar), place_in_menu, &position);
-
-	gtk_menu_shell_insert(GTK_MENU_SHELL(menubar), mi, position.menupos);
-	g_object_unref(G_OBJECT(mi));
-
-	return;
+  GtkWidget * menubar = GTK_WIDGET(user_data);
+
+  gpointer array[2];
+  array[0] = entry;
+  array[1] = NULL;
+
+  gtk_container_foreach(GTK_CONTAINER(menubar), entry_moved_find_cb, array);
+  if (array[1] == NULL) {
+    g_warning("Moving an entry that isn't in our menus.");
+    return;
+  }
+
+  GtkWidget * mi = GTK_WIDGET(array[1]);
+  g_object_ref(G_OBJECT(mi));
+  gtk_container_remove(GTK_CONTAINER(menubar), mi);
+  place_in_menu(menubar, mi, io, entry);
+  g_object_unref(G_OBJECT(mi));
+
+  return;
 }
 
 static void
 menu_show (IndicatorObject * io, IndicatorObjectEntry * entry,
            guint32 timestamp, gpointer user_data)
 {
-	GtkWidget * menubar = GTK_WIDGET(user_data);
-
-	if (entry == NULL) {
-		/* Close any open menus instead of opening one */
-		GList * entries = indicator_object_get_entries(io);
-		GList * entry = NULL;
-		for (entry = entries; entry != NULL; entry = g_list_next(entry)) {
-			IndicatorObjectEntry * entrydata = (IndicatorObjectEntry *)entry->data;
-			gtk_menu_popdown(entrydata->menu);
-		}
-		g_list_free(entries);
-
-		/* And tell the menubar to exit activation mode too */
-		gtk_menu_shell_cancel(GTK_MENU_SHELL(menubar));
-		return;
-	}
-
-	// TODO: do something sensible here
+  GtkWidget * menubar = GTK_WIDGET(user_data);
+
+  if (entry == NULL) {
+    /* Close any open menus instead of opening one */
+    GList * entries = indicator_object_get_entries(io);
+    GList * entry = NULL;
+    for (entry = entries; entry != NULL; entry = g_list_next(entry)) {
+      IndicatorObjectEntry * entrydata = (IndicatorObjectEntry *)entry->data;
+      gtk_menu_popdown(entrydata->menu);
+    }
+    g_list_free(entries);
+
+    /* And tell the menubar to exit activation mode too */
+    gtk_menu_shell_cancel(GTK_MENU_SHELL(menubar));
+    return;
+  }
+
+  // TODO: do something sensible here
 }
 
 static void
 update_accessible_desc(IndicatorObjectEntry * entry, GtkWidget * menuitem)
 {
-	/* FIXME: We need to deal with the use case where the contents of the
-	   label overrides what is found in the atk object's name, or at least
-	   orca speaks the label instead of the atk object name.
-	 */
-	AtkObject * menuitem_obj = gtk_widget_get_accessible(menuitem);
-	if (menuitem_obj == NULL) {
-		/* Should there be an error printed here? */
-		return;
-	}
+  /* FIXME: We need to deal with the use case where the contents of the
+     label overrides what is found in the atk object's name, or at least
+     orca speaks the label instead of the atk object name.
+   */
+  AtkObject * menuitem_obj = gtk_widget_get_accessible(menuitem);
+  if (menuitem_obj == NULL) {
+    /* Should there be an error printed here? */
+    return;
+  }
 
-	if (entry->accessible_desc != NULL) {
-		atk_object_set_name(menuitem_obj, entry->accessible_desc);
-	} else {
-		atk_object_set_name(menuitem_obj, "");
-	}
-	return;
+  if (entry->accessible_desc != NULL) {
+    atk_object_set_name(menuitem_obj, entry->accessible_desc);
+  } else {
+    atk_object_set_name(menuitem_obj, "");
+  }
+  return;
 }
 
 
 static gboolean
 load_module (const gchar * name, GtkWidget * menubar)
 {
-	g_debug("Looking at Module: %s", name);
-	g_return_val_if_fail(name != NULL, FALSE);
-
-	if (!g_str_has_suffix(name, G_MODULE_SUFFIX)) {
-		return FALSE;
-	}
-
-	g_debug("Loading Module: %s", name);
-
-	/* Build the object for the module */
-	gchar * fullpath = g_build_filename(INDICATOR_DIR, name, NULL);
-	IndicatorObject * io = indicator_object_new_from_file(fullpath);
-	g_free(fullpath);
-
-	/* Set the environment it's in */
-	indicator_object_set_environment(io, (const GStrv)indicator_env);
-
-	/* Attach the 'name' to the object */
-	g_object_set_data(G_OBJECT(io), IO_DATA_ORDER_NUMBER, GINT_TO_POINTER(name2order(name)));
-
-	/* Connect to its signals */
-	g_signal_connect(G_OBJECT(io), INDICATOR_OBJECT_SIGNAL_ENTRY_ADDED,   G_CALLBACK(entry_added),    menubar);
-	g_signal_connect(G_OBJECT(io), INDICATOR_OBJECT_SIGNAL_ENTRY_REMOVED, G_CALLBACK(entry_removed),  menubar);
-	g_signal_connect(G_OBJECT(io), INDICATOR_OBJECT_SIGNAL_ENTRY_MOVED,   G_CALLBACK(entry_moved),    menubar);
-	g_signal_connect(G_OBJECT(io), INDICATOR_OBJECT_SIGNAL_MENU_SHOW,     G_CALLBACK(menu_show),      menubar);
-	g_signal_connect(G_OBJECT(io), INDICATOR_OBJECT_SIGNAL_ACCESSIBLE_DESC_UPDATE, G_CALLBACK(accessible_desc_update), menubar);
-
-	/* Work on the entries */
-	GList * entries = indicator_object_get_entries(io);
-	GList * entry = NULL;
-
-	for (entry = entries; entry != NULL; entry = g_list_next(entry)) {
-		IndicatorObjectEntry * entrydata = (IndicatorObjectEntry *)entry->data;
-		entry_added(io, entrydata, menubar);
-	}
-
-	g_list_free(entries);
-
-	return TRUE;
+  g_debug("Looking at Module: %s", name);
+  g_return_val_if_fail(name != NULL, FALSE);
+
+  if (!g_str_has_suffix(name, G_MODULE_SUFFIX)) {
+    return FALSE;
+  }
+
+  g_debug("Loading Module: %s", name);
+
+  /* Build the object for the module */
+  gchar * fullpath = g_build_filename(INDICATOR_DIR, name, NULL);
+  IndicatorObject * io = indicator_object_new_from_file(fullpath);
+  g_free(fullpath);
+
+  /* Set the environment it's in */
+  indicator_object_set_environment(io, (const GStrv)indicator_env);
+
+  /* Attach the 'name' to the object */
+  g_object_set_data_full(G_OBJECT(io), IO_DATA_NAME, g_strdup(name), g_free);
+  g_object_set_data(G_OBJECT(io), IO_DATA_ORDER_NUMBER, GINT_TO_POINTER(name2order(name, NULL)));
+
+  /* Connect to its signals */
+  g_signal_connect(G_OBJECT(io), INDICATOR_OBJECT_SIGNAL_ENTRY_ADDED,   G_CALLBACK(entry_added),    menubar);
+  g_signal_connect(G_OBJECT(io), INDICATOR_OBJECT_SIGNAL_ENTRY_REMOVED, G_CALLBACK(entry_removed),  menubar);
+  g_signal_connect(G_OBJECT(io), INDICATOR_OBJECT_SIGNAL_ENTRY_MOVED,   G_CALLBACK(entry_moved),    menubar);
+  g_signal_connect(G_OBJECT(io), INDICATOR_OBJECT_SIGNAL_MENU_SHOW,     G_CALLBACK(menu_show),      menubar);
+  g_signal_connect(G_OBJECT(io), INDICATOR_OBJECT_SIGNAL_ACCESSIBLE_DESC_UPDATE, G_CALLBACK(accessible_desc_update), menubar);
+
+  /* Work on the entries */
+  GList * entries = indicator_object_get_entries(io);
+  GList * entry = NULL;
+
+  for (entry = entries; entry != NULL; entry = g_list_next(entry)) {
+    IndicatorObjectEntry * entrydata = (IndicatorObjectEntry *)entry->data;
+    entry_added(io, entrydata, menubar);
+  }
+
+  g_list_free(entries);
+
+  return TRUE;
 }
 
 static void
-hotkey_filter (char * keystring G_GNUC_UNUSED, gpointer data)
+hotkey_filter (char * keystring, gpointer data)
 {
-	g_return_if_fail(GTK_IS_MENU_SHELL(data));
-
-	/* Oh, wow, it's us! */
-	GList * children = gtk_container_get_children(GTK_CONTAINER(data));
-	if (children == NULL) {
-		g_debug("Menubar has no children");
-		return;
-	}
-
-	if (!GTK_MENU_SHELL(data)->active) {
-		gtk_grab_add (GTK_WIDGET(data));
-		GTK_MENU_SHELL(data)->have_grab = TRUE;
-		GTK_MENU_SHELL(data)->active = TRUE;
-	}
-
-	gtk_menu_shell_select_item(GTK_MENU_SHELL(data), GTK_WIDGET(g_list_last(children)->data));
-	g_list_free(children);
-	return;
+  g_return_if_fail(GTK_IS_MENU_SHELL(data));
+
+  g_debug ("Hotkey: %s", keystring);
+
+  /* Oh, wow, it's us! */
+  GList * children = gtk_container_get_children(GTK_CONTAINER(data));
+  if (children == NULL) {
+    g_debug("Menubar has no children");
+    return;
+  }
+
+  gtk_menu_shell_select_item(GTK_MENU_SHELL(data), GTK_WIDGET(g_list_last(children)->data));
+  g_list_free(children);
+  return;
 }
 
 static gboolean
@@ -583,35 +643,23 @@
                     GdkEventButton *event,
                     gpointer data G_GNUC_UNUSED)
 {
-	if (event->button != 1) {
-		g_signal_stop_emission_by_name(widget, "button-press-event");
-	}
-
-	return FALSE;
-}
-
-static gboolean
-menubar_on_expose (GtkWidget * widget,
-                    GdkEventExpose *event G_GNUC_UNUSED,
-                    GtkWidget * menubar)
-{
-	if (GTK_WIDGET_HAS_FOCUS(menubar))
-		gtk_paint_focus(widget->style, widget->window, GTK_WIDGET_STATE(menubar),
-		                NULL, widget, "menubar-applet", 0, 0, -1, -1);
-
-	return FALSE;
+  if (event->button != 1) {
+    g_signal_stop_emission_by_name(widget, "button-press-event");
+  }
+
+  return FALSE;
 }
 
 static void
 about_cb (GtkAction *action G_GNUC_UNUSED,
           gpointer   data G_GNUC_UNUSED)
 {
-	static const gchar *authors[] = {
-		"Ted Gould <[e-mail]>",
-		NULL
-	};
+  static const gchar *authors[] = {
+    "Ted Gould <[e-mail]>",
+    NULL
+  };
 
-	static gchar *license[] = {
+  static gchar *license[] = {
         N_("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."),
@@ -621,103 +669,103 @@
            "PURPOSE.  See the GNU General Public License for more details."),
         N_("You should have received a copy of the GNU General Public License along "
            "with this program.  If not, see <http://www.gnu.org/licenses/>."),
-		NULL
-	};
-	gchar *license_i18n;
-
-	license_i18n = g_strconcat (_(license[0]), "\n\n", _(license[1]), "\n\n", _(license[2]), NULL);
-
-	gtk_show_about_dialog(NULL,
-		"version", VERSION,
-		"copyright", "Copyright \xc2\xa9 2009-2010 Canonical, Ltd.",
+    NULL
+  };
+  gchar *license_i18n;
+
+  license_i18n = g_strconcat (_(license[0]), "\n\n", _(license[1]), "\n\n", _(license[2]), NULL);
+
+  gtk_show_about_dialog(NULL,
+    "version", VERSION,
+    "copyright", "Copyright \xc2\xa9 2009-2010 Canonical, Ltd.",
 #ifdef INDICATOR_APPLET_SESSION
-		"comments", _("A place to adjust your status, change users or exit your session."),
+    "comments", _("A place to adjust your status, change users or exit your session."),
 #else
 #ifdef INDICATOR_APPLET_APPMENU
-		"comments", _("An applet to hold your application menus."),
-#endif
-		"comments", _("An applet to hold all of the system indicators."),
-#endif
-		"authors", authors,
-		"license", license_i18n,
-		"wrap-license", TRUE,
-		"translator-credits", _("translator-credits"),
-		"logo-icon-name", "indicator-applet",
-		"icon-name", "indicator-applet",
-		"website", "http://launchpad.net/indicator-applet",
-		"website-label", _("Indicator Applet Website"),
-		NULL
-	);
-
-	g_free (license_i18n);
-
-	return;
+    "comments", _("An applet to hold your application menus."),
+#endif
+    "comments", _("An applet to hold all of the system indicators."),
+#endif
+    "authors", authors,
+    "license", license_i18n,
+    "wrap-license", TRUE,
+    "translator-credits", _("translator-credits"),
+    "logo-icon-name", "indicator-applet",
+    "icon-name", "indicator-applet",
+    "website", "http://launchpad.net/indicator-applet",
+    "website-label", _("Indicator Applet Website"),
+    NULL
+  );
+
+  g_free (license_i18n);
+
+  return;
 }
 
 static gboolean
 swap_orient_cb (GtkWidget *item, gpointer data)
 {
-	GtkWidget *from = (GtkWidget *) data;
-	GtkWidget *to = (GtkWidget *) g_object_get_data(G_OBJECT(from), "to");
-	g_object_ref(G_OBJECT(item));
-	gtk_container_remove(GTK_CONTAINER(from), item);
-	if (GTK_IS_LABEL(item)) {
-			switch(packdirection) {
-			case GTK_PACK_DIRECTION_LTR:
-				gtk_label_set_angle(GTK_LABEL(item), 0.0);
-				break;
-			case GTK_PACK_DIRECTION_TTB:
-				gtk_label_set_angle(GTK_LABEL(item),
-						(orient == PANEL_APPLET_ORIENT_LEFT) ? 
-						270.0 : 90.0);
-				break;
-			default:
-				break;
-		}		
-	}
-	gtk_box_pack_start(GTK_BOX(to), item, FALSE, FALSE, 0);
-	return TRUE;
+  GtkWidget *from = (GtkWidget *) data;
+  GtkWidget *to = (GtkWidget *) g_object_get_data(G_OBJECT(from), "to");
+  g_object_ref(G_OBJECT(item));
+  gtk_container_remove(GTK_CONTAINER(from), item);
+  if (GTK_IS_LABEL(item)) {
+      switch(packdirection) {
+      case GTK_PACK_DIRECTION_LTR:
+        gtk_label_set_angle(GTK_LABEL(item), 0.0);
+        break;
+      case GTK_PACK_DIRECTION_TTB:
+        gtk_label_set_angle(GTK_LABEL(item),
+            (orient == PANEL_APPLET_ORIENT_LEFT) ? 
+            270.0 : 90.0);
+        break;
+      default:
+        break;
+    }    
+  }
+  gtk_box_pack_start(GTK_BOX(to), item, FALSE, FALSE, 0);
+  return TRUE;
 }
 
 static gboolean
 reorient_box_cb (GtkWidget *menuitem, gpointer data)
 {
-	GtkWidget *from = g_object_get_data(G_OBJECT(menuitem), "box");
-	GtkWidget *to = (packdirection == GTK_PACK_DIRECTION_LTR) ?
-			gtk_hbox_new(FALSE, 0) : gtk_vbox_new(FALSE, 0);
-	g_object_set_data(G_OBJECT(from), "to", to);
-	gtk_container_foreach(GTK_CONTAINER(from), (GtkCallback)swap_orient_cb,
-			from);
-	gtk_container_remove(GTK_CONTAINER(menuitem), from);
-	gtk_container_add(GTK_CONTAINER(menuitem), to);
-	g_object_set_data(G_OBJECT(menuitem), "box", to);
-	gtk_widget_show_all(menuitem);
-	return TRUE;
+  GtkWidget *from = g_object_get_data(G_OBJECT(menuitem), MENU_DATA_BOX);
+  GtkWidget *to = (packdirection == GTK_PACK_DIRECTION_LTR) ?
+      gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0) : gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
+  g_object_set_data(G_OBJECT(from), "to", to);
+  gtk_container_foreach(GTK_CONTAINER(from), (GtkCallback)swap_orient_cb,
+      from);
+  gtk_container_remove(GTK_CONTAINER(menuitem), from);
+  gtk_container_add(GTK_CONTAINER(menuitem), to);
+  g_object_set_data(G_OBJECT(menuitem), MENU_DATA_BOX, to);
+  gtk_widget_show_all(menuitem);
+  return TRUE;
 }
 
 static gboolean
 panelapplet_reorient_cb (GtkWidget *applet, PanelAppletOrient neworient,
-		gpointer data)
+    gpointer data)
 {
-	GtkWidget *menubar = (GtkWidget *)data;
-	if ((((neworient == PANEL_APPLET_ORIENT_UP) || 
-			(neworient == PANEL_APPLET_ORIENT_DOWN)) && 
-			((orient == PANEL_APPLET_ORIENT_LEFT) || 
-			(orient == PANEL_APPLET_ORIENT_RIGHT))) || 
-			(((neworient == PANEL_APPLET_ORIENT_LEFT) || 
-			(neworient == PANEL_APPLET_ORIENT_RIGHT)) && 
-			((orient == PANEL_APPLET_ORIENT_UP) ||
-			(orient == PANEL_APPLET_ORIENT_DOWN)))) {
-		packdirection = (packdirection == GTK_PACK_DIRECTION_LTR) ?
-				GTK_PACK_DIRECTION_TTB : GTK_PACK_DIRECTION_LTR;
-		gtk_menu_bar_set_pack_direction(GTK_MENU_BAR(menubar),
-				packdirection);
-		orient = neworient;
-		gtk_container_foreach(GTK_CONTAINER(menubar),
-				(GtkCallback)reorient_box_cb, NULL);
-	}
-	orient = neworient;
-	return FALSE;
+  GtkWidget *menubar = (GtkWidget *)data;
+  if ((((neworient == PANEL_APPLET_ORIENT_UP) || 
+      (neworient == PANEL_APPLET_ORIENT_DOWN)) && 
+      ((orient == PANEL_APPLET_ORIENT_LEFT) || 
+      (orient == PANEL_APPLET_ORIENT_RIGHT))) || 
+      (((neworient == PANEL_APPLET_ORIENT_LEFT) || 
+      (neworient == PANEL_APPLET_ORIENT_RIGHT)) && 
+      ((orient == PANEL_APPLET_ORIENT_UP) ||
+      (orient == PANEL_APPLET_ORIENT_DOWN)))) {
+    packdirection = (packdirection == GTK_PACK_DIRECTION_LTR) ?
+        GTK_PACK_DIRECTION_TTB : GTK_PACK_DIRECTION_LTR;
+    gtk_menu_bar_set_pack_direction(GTK_MENU_BAR(menubar),
+        packdirection);
+    orient = neworient;
+    gtk_container_foreach(GTK_CONTAINER(menubar),
+        (GtkCallback)reorient_box_cb, NULL);
+  }
+  orient = neworient;
+  return FALSE;
 }
 
 #ifdef N_
@@ -726,277 +774,205 @@
 #define N_(x) x
 
 static void
-log_to_file_cb (GObject * source_obj G_GNUC_UNUSED,
-                GAsyncResult * result G_GNUC_UNUSED, gpointer user_data)
-{
-	g_free(user_data);
-	return;
-}
-
-static void
-log_to_file (const gchar * domain G_GNUC_UNUSED,
-             GLogLevelFlags level G_GNUC_UNUSED,
+log_to_file (const gchar * domain,
+             GLogLevelFlags level,
              const gchar * message,
-             gpointer data G_GNUC_UNUSED)
+             gpointer data)
 {
-	if (log_file == NULL) {
-		GError * error = NULL;
-		gchar * filename = g_build_filename(g_get_user_cache_dir(), LOG_FILE_NAME, NULL);
-		GFile * file = g_file_new_for_path(filename);
-		g_free(filename);
-
-		if (!g_file_test(g_get_user_cache_dir(), G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR)) {
-			GFile * cachedir = g_file_new_for_path(g_get_user_cache_dir());
-			g_file_make_directory_with_parents(cachedir, NULL, &error);
-
-			if (error != NULL) {
-				g_error("Unable to make directory '%s' for log file: %s", g_get_user_cache_dir(), error->message);
-				return;
-			}
-		}
-
-		g_file_delete(file, NULL, NULL);
-
-		GFileIOStream * io = g_file_create_readwrite(file,
-		                          G_FILE_CREATE_REPLACE_DESTINATION, /* flags */
-		                          NULL, /* cancelable */
-		                          &error); /* error */
-		if (error != NULL) {
-			g_error("Unable to replace file: %s", error->message);
-			return;
-		}
-
-		log_file = g_io_stream_get_output_stream(G_IO_STREAM(io));
-	}
-
-	gchar * outputstring = g_strdup_printf("%s\n", message);
-	g_output_stream_write_async(log_file,
-	                            outputstring, /* data */
-	                            strlen(outputstring), /* length */
-	                            G_PRIORITY_LOW, /* priority */
-	                            NULL, /* cancelable */
-	                            log_to_file_cb, /* callback */
-	                            outputstring); /* data */
-
-	return;
+  if (log_file == NULL) {
+    gchar *path;
+
+    g_mkdir_with_parents(g_get_user_cache_dir(), 0755);
+    path = g_build_filename(g_get_user_cache_dir(), LOG_FILE_NAME, NULL);
+
+    log_file = fopen(path, "w");
+
+    g_free(path);
+  }
+
+  if(log_file) {
+    const gchar *prefix;
+
+    switch(level & G_LOG_LEVEL_MASK) {
+      case G_LOG_LEVEL_ERROR:
+        prefix = "ERROR:";
+        break;
+      case G_LOG_LEVEL_CRITICAL:
+        prefix = "CRITICAL:";
+        break;
+      case G_LOG_LEVEL_WARNING:
+        prefix = "WARNING:";
+        break;
+      case G_LOG_LEVEL_MESSAGE:
+        prefix = "MESSAGE:";
+        break;
+      case G_LOG_LEVEL_INFO:
+        prefix = "INFO:";
+        break;
+      case G_LOG_LEVEL_DEBUG:
+        prefix = "DEBUG:";
+        break;
+      default:
+        prefix = "LOG:";
+        break;
+    }
+
+    fprintf(log_file, "%s %s - %s\n", prefix, domain, message);
+    fflush(log_file);
+  }
+
+  g_log_default_handler(domain, level, message, data);
+
+  return;
 }
 
 static gboolean
 applet_fill_cb (PanelApplet * applet, const gchar * iid G_GNUC_UNUSED,
                 gpointer data G_GNUC_UNUSED)
 {
-	static const GtkActionEntry menu_actions[] = {
-		{"About", GTK_STOCK_ABOUT, N_("_About"), NULL, NULL, G_CALLBACK(about_cb)}
-	};
-	static const gchar *menu_xml = "<menuitem name=\"About\" action=\"About\"/>";
-
-	static gboolean first_time = FALSE;
-	GtkWidget *menubar;
-	gint indicators_loaded = 0;
-	GtkActionGroup *action_group;
-
-#ifdef INDICATOR_APPLET_SESSION
-	/* check if we are running stracciatella session */
-	if (g_strcmp0(g_getenv("GDMSESSION"), "gnome-stracciatella") == 0) {
-		g_debug("Running stracciatella GNOME session, disabling myself");
-		return TRUE;
-	}
-#endif
-
-	if (!first_time)
-	{
-		first_time = TRUE;
-#ifdef INDICATOR_APPLET
-		g_set_application_name(_("Indicator Applet"));
-#endif
-#ifdef INDICATOR_APPLET_SESSION
-		g_set_application_name(_("Indicator Applet Session"));
-#endif
-#ifdef INDICATOR_APPLET_COMPLETE
-		g_set_application_name(_("Indicator Applet Complete"));
-#endif
-#ifdef INDICATOR_APPLET_APPMENU
-		g_set_application_name(_("Indicator Applet Application Menu"));
-#endif
-		
-		g_log_set_default_handler(log_to_file, NULL);
-
-		tomboy_keybinder_init();
-	}
-
-	/* Set panel options */
-	gtk_container_set_border_width(GTK_CONTAINER (applet), 0);
-	panel_applet_set_flags(applet, PANEL_APPLET_EXPAND_MINOR);
-	menubar = gtk_menu_bar_new();
-	action_group = gtk_action_group_new ("Indicator Applet Actions");
-	gtk_action_group_set_translation_domain (action_group, GETTEXT_PACKAGE);
-	gtk_action_group_add_actions (action_group, menu_actions,
-	                              G_N_ELEMENTS (menu_actions),
-	                              menubar);
-	panel_applet_setup_menu(applet, menu_xml, action_group);
-	g_object_unref(action_group);
-#ifdef INDICATOR_APPLET
-	atk_object_set_name (gtk_widget_get_accessible (GTK_WIDGET (applet)),
-	                     "indicator-applet");
-#endif
-#ifdef INDICATOR_APPLET_SESSION
-	atk_object_set_name (gtk_widget_get_accessible (GTK_WIDGET (applet)),
-	                     "indicator-applet-session");
-#endif
-#ifdef INDICATOR_APPLET_COMPLETE
-	atk_object_set_name (gtk_widget_get_accessible (GTK_WIDGET (applet)),
-	                     "indicator-applet-complete");
-#endif
-#ifdef INDICATOR_APPLET_APPMENU
-	atk_object_set_name (gtk_widget_get_accessible (GTK_WIDGET (applet)),
-	                     "indicator-applet-appmenu");
-#endif
-
-	/* Init some theme/icon stuff */
-	gtk_icon_theme_append_search_path(gtk_icon_theme_get_default(),
-	                                  INDICATOR_ICONS_DIR);
-	/* g_debug("Icons directory: %s", INDICATOR_ICONS_DIR); */
-	gtk_rc_parse_string (
-	    "style \"indicator-applet-style\"\n"
-        "{\n"
-        "    GtkMenuBar::shadow-type = none\n"
-        "    GtkMenuBar::internal-padding = 0\n"
-        "    GtkWidget::focus-line-width = 0\n"
-        "    GtkWidget::focus-padding = 0\n"
-        "}\n"
-	    "style \"indicator-applet-menubar-style\"\n"
-        "{\n"
-        "    GtkMenuBar::shadow-type = none\n"
-        "    GtkMenuBar::internal-padding = 0\n"
-        "    GtkWidget::focus-line-width = 0\n"
-        "    GtkWidget::focus-padding = 0\n"
-        "    GtkMenuItem::horizontal-padding = 0\n"
-        "}\n"
-	    "style \"indicator-applet-menuitem-style\"\n"
-        "{\n"
-        "    GtkWidget::focus-line-width = 0\n"
-        "    GtkWidget::focus-padding = 0\n"
-        "    GtkMenuItem::horizontal-padding = 0\n"
-        "}\n"
-        "widget \"*.fast-user-switch-applet\" style \"indicator-applet-style\""
-        "widget \"*.fast-user-switch-menuitem\" style \"indicator-applet-menuitem-style\""
-        "widget \"*.fast-user-switch-menubar\" style \"indicator-applet-menubar-style\"");
-	//gtk_widget_set_name(GTK_WIDGET (applet), "indicator-applet-menubar");
-	gtk_widget_set_name(GTK_WIDGET (applet), "fast-user-switch-applet");
-
-	/* Build menubar */
-	orient = (panel_applet_get_orient(applet));
-	packdirection = ((orient == PANEL_APPLET_ORIENT_UP) ||
-			(orient == PANEL_APPLET_ORIENT_DOWN)) ? 
-			GTK_PACK_DIRECTION_LTR : GTK_PACK_DIRECTION_TTB;
-	gtk_menu_bar_set_pack_direction(GTK_MENU_BAR(menubar),
-			packdirection);
-	GTK_WIDGET_SET_FLAGS (menubar, GTK_WIDGET_FLAGS(menubar) | GTK_CAN_FOCUS);
-	gtk_widget_set_name(GTK_WIDGET (menubar), "fast-user-switch-menubar");
-	g_signal_connect(menubar, "button-press-event", G_CALLBACK(menubar_press), NULL);
-	g_signal_connect_after(menubar, "expose-event", G_CALLBACK(menubar_on_expose), menubar);
-	g_signal_connect(applet, "change-orient", 
-			G_CALLBACK(panelapplet_reorient_cb), menubar);
-	gtk_container_set_border_width(GTK_CONTAINER(menubar), 0);
-
-	/* Add in filter func */
-	tomboy_keybinder_bind(hotkey_keycode, hotkey_filter, menubar);
-
-	/* load 'em */
-	if (g_file_test(INDICATOR_DIR, (G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR))) {
-		GDir * dir = g_dir_open(INDICATOR_DIR, 0, NULL);
-
-		const gchar * name;
-		while ((name = g_dir_read_name(dir)) != NULL) {
-#ifdef INDICATOR_APPLET_APPMENU
-			if (g_strcmp0(name, "libappmenu.so")) {
-				continue;
-			}
+  static const GtkActionEntry menu_actions[] = {
+    {"About", GTK_STOCK_ABOUT, N_("_About"), NULL, NULL, G_CALLBACK(about_cb)}
+  };
+  static const gchar *menu_xml = "<menuitem name=\"About\" action=\"About\"/>";
+
+  static gboolean first_time = FALSE;
+  GtkWidget *menubar;
+  gint indicators_loaded = 0;
+  GtkActionGroup *action_group;
+  GError *error = NULL;
+
+#ifdef INDICATOR_APPLET_SESSION
+  /* check if we are running stracciatella session */
+  if (g_strcmp0(g_getenv("GDMSESSION"), "gnome-stracciatella") == 0) {
+    g_debug("Running stracciatella GNOME session, disabling myself");
+    return TRUE;
+  }
+#endif
+
+  if (!first_time)
+  {
+    first_time = TRUE;
+#ifdef INDICATOR_APPLET
+    g_set_application_name(_("Indicator Applet"));
+#endif
+#ifdef INDICATOR_APPLET_SESSION
+    g_set_application_name(_("Indicator Applet Session"));
+#endif
+#ifdef INDICATOR_APPLET_COMPLETE
+    g_set_application_name(_("Indicator Applet Complete"));
+#endif
+#ifdef INDICATOR_APPLET_APPMENU
+    g_set_application_name(_("Indicator Applet Application Menu"));
+#endif
+    
+    g_log_set_default_handler(log_to_file, NULL);
+
+    tomboy_keybinder_init();
+  }
+
+  /* Set panel options */
+  gtk_container_set_border_width(GTK_CONTAINER (applet), 0);
+  panel_applet_set_flags(applet, PANEL_APPLET_EXPAND_MINOR);
+  menubar = gtk_menu_bar_new();
+  action_group = gtk_action_group_new ("Indicator Applet Actions");
+  gtk_action_group_set_translation_domain (action_group, GETTEXT_PACKAGE);
+  gtk_action_group_add_actions (action_group, menu_actions,
+                                G_N_ELEMENTS (menu_actions),
+                                menubar);
+  panel_applet_setup_menu(applet, menu_xml, action_group);
+  g_object_unref(action_group);
+#ifdef INDICATOR_APPLET
+  atk_object_set_name (gtk_widget_get_accessible (GTK_WIDGET (applet)),
+                       "indicator-applet");
+#endif
+#ifdef INDICATOR_APPLET_SESSION
+  atk_object_set_name (gtk_widget_get_accessible (GTK_WIDGET (applet)),
+                       "indicator-applet-session");
+#endif
+#ifdef INDICATOR_APPLET_COMPLETE
+  atk_object_set_name (gtk_widget_get_accessible (GTK_WIDGET (applet)),
+                       "indicator-applet-complete");
+#endif
+#ifdef INDICATOR_APPLET_APPMENU
+  atk_object_set_name (gtk_widget_get_accessible (GTK_WIDGET (applet)),
+                       "indicator-applet-appmenu");
+#endif
+
+  /* Init some theme/icon stuff */
+  gtk_icon_theme_append_search_path(gtk_icon_theme_get_default(),
+                                    INDICATOR_ICONS_DIR);
+  g_debug("Icons directory: %s", INDICATOR_ICONS_DIR);
+
+  gtk_widget_set_name(GTK_WIDGET (applet), "fast-user-switch-applet");
+
+  /* Build menubar */
+  orient = (panel_applet_get_orient(applet));
+  packdirection = ((orient == PANEL_APPLET_ORIENT_UP) ||
+      (orient == PANEL_APPLET_ORIENT_DOWN)) ? 
+      GTK_PACK_DIRECTION_LTR : GTK_PACK_DIRECTION_TTB;
+  gtk_menu_bar_set_pack_direction(GTK_MENU_BAR(menubar),
+      packdirection);
+  gtk_widget_set_can_focus (GTK_WIDGET (menubar), TRUE);
+  gtk_widget_set_name(GTK_WIDGET (menubar), "fast-user-switch-menubar");
+  g_signal_connect(menubar, "button-press-event", G_CALLBACK(menubar_press), NULL);
+  g_signal_connect(applet, "change-orient", 
+      G_CALLBACK(panelapplet_reorient_cb), menubar);
+  gtk_container_set_border_width(GTK_CONTAINER(menubar), 0);
+
+  /* Add in filter func */
+  tomboy_keybinder_bind(hotkey_keycode, hotkey_filter, menubar);
+
+  /* load 'em */
+  if (g_file_test(INDICATOR_DIR, (G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR))) {
+    GDir * dir = g_dir_open(INDICATOR_DIR, 0, NULL);
+
+    const gchar * name;
+    while ((name = g_dir_read_name(dir)) != NULL) {
+#ifdef INDICATOR_APPLET_APPMENU
+      if (g_strcmp0(name, "libappmenu.so")) {
+        continue;
+      }
 #else
-			if (!g_strcmp0(name, "libappmenu.so")) {
-				continue;
-			}
+      if (!g_strcmp0(name, "libappmenu.so")) {
+        continue;
+      }
 #endif
 #ifdef INDICATOR_APPLET
-			if (!g_strcmp0(name, "libsession.so")) {
-				continue;
-			}
-			if (!g_strcmp0(name, "libme.so")) {
-				continue;
-			}
-			if (!g_strcmp0(name, "libdatetime.so")) {
-				continue;
-			}
+      if (!g_strcmp0(name, "libsession.so")) {
+        continue;
+      }
+      if (!g_strcmp0(name, "libme.so")) {
+        continue;
+      }
+      if (!g_strcmp0(name, "libdatetime.so")) {
+        continue;
+      }
 #endif
 #ifdef INDICATOR_APPLET_SESSION
-			if (g_strcmp0(name, "libsession.so") && g_strcmp0(name, "libme.so")) {
-				continue;
-			}
+      if (g_strcmp0(name, "libsession.so") && g_strcmp0(name, "libme.so")) {
+        continue;
+      }
 #endif
-			if (load_module(name, menubar)) {
-				indicators_loaded++;
-			}
-		}
-		g_dir_close (dir);
-	}
-
-	if (indicators_loaded == 0) {
-		/* A label to allow for click through */
-		GtkWidget * item = gtk_label_new(_("No Indicators"));
-		gtk_container_add(GTK_CONTAINER(applet), item);
-		gtk_widget_show(item);
-	} else {
-		gtk_container_add(GTK_CONTAINER(applet), menubar);
-		panel_applet_set_background_widget(applet, menubar);
-		gtk_widget_show(menubar);
-	}
-
-	/* Background of applet */
-	g_signal_connect(applet, "change-background",
-			  G_CALLBACK(cw_panel_background_changed), menubar);
-
-	gtk_widget_show(GTK_WIDGET(applet));
-
-	return TRUE;
-
-}
-
-static void
-cw_panel_background_changed (PanelApplet               *applet,
-                             PanelAppletBackgroundType  type,
-                             GdkColor                  *colour,
-                             GdkPixmap                 *pixmap,
-                             GtkWidget                 *menubar)
-{
-	GtkRcStyle *rc_style;
-	GtkStyle *style;
-
-	/* reset style */
-	gtk_widget_set_style(GTK_WIDGET (applet), NULL);
- 	gtk_widget_set_style(menubar, NULL);
-	rc_style = gtk_rc_style_new ();
-	gtk_widget_modify_style(GTK_WIDGET (applet), rc_style);
-	gtk_widget_modify_style(menubar, rc_style);
-	gtk_rc_style_unref(rc_style);
-
-	switch (type)
-	{
-		case PANEL_NO_BACKGROUND:
-			break;
-		case PANEL_COLOR_BACKGROUND:
-			gtk_widget_modify_bg(GTK_WIDGET (applet), GTK_STATE_NORMAL, colour);
-			gtk_widget_modify_bg(menubar, GTK_STATE_NORMAL, colour);
-			break;
-
-		case PANEL_PIXMAP_BACKGROUND:
-			style = gtk_style_copy(GTK_WIDGET (applet)->style);
-			if (style->bg_pixmap[GTK_STATE_NORMAL])
-				g_object_unref(style->bg_pixmap[GTK_STATE_NORMAL]);
-			style->bg_pixmap[GTK_STATE_NORMAL] = g_object_ref (pixmap);
-			gtk_widget_set_style(GTK_WIDGET (applet), style);
-			gtk_widget_set_style(GTK_WIDGET (menubar), style);
-			g_object_unref(style);
-			break;
-  }
+      if (load_module(name, menubar)) {
+        indicators_loaded++;
+      }
+    }
+    g_dir_close (dir);
+  }
+
+  if (indicators_loaded == 0) {
+    /* A label to allow for click through */
+    GtkWidget * item = gtk_label_new(_("No Indicators"));
+    gtk_container_add(GTK_CONTAINER(applet), item);
+    gtk_widget_show(item);
+  } else {
+    gtk_container_add(GTK_CONTAINER(applet), menubar);
+    panel_applet_set_background_widget(applet, menubar);
+    gtk_widget_show(menubar);
+  }
+
+  gtk_widget_show(GTK_WIDGET(applet));
+
+  return TRUE;
 }
 
 
=== modified file 'src/eggaccelerators.c'
--- src/eggaccelerators.c	2010-03-02 22:24:00 +0000
+++ src/eggaccelerators.c	2011-11-26 02:05:26 +0000
@@ -578,20 +578,20 @@
       j = 0;
       while (j < n_entries)
         {          
-          if (keyvals[j] == GDK_Num_Lock)
+          if (keyvals[j] == GDK_KEY_Num_Lock)
             mask |= EGG_VIRTUAL_NUM_LOCK_MASK;
-          else if (keyvals[j] == GDK_Scroll_Lock)
+          else if (keyvals[j] == GDK_KEY_Scroll_Lock)
             mask |= EGG_VIRTUAL_SCROLL_LOCK_MASK;
-          else if (keyvals[j] == GDK_Meta_L ||
-                   keyvals[j] == GDK_Meta_R)
+          else if (keyvals[j] == GDK_KEY_Meta_L ||
+                   keyvals[j] == GDK_KEY_Meta_R)
             mask |= EGG_VIRTUAL_META_MASK;
-          else if (keyvals[j] == GDK_Hyper_L ||
-                   keyvals[j] == GDK_Hyper_R)
+          else if (keyvals[j] == GDK_KEY_Hyper_L ||
+                   keyvals[j] == GDK_KEY_Hyper_R)
             mask |= EGG_VIRTUAL_HYPER_MASK;
-          else if (keyvals[j] == GDK_Super_L ||
-                   keyvals[j] == GDK_Super_R)
+          else if (keyvals[j] == GDK_KEY_Super_L ||
+                   keyvals[j] == GDK_KEY_Super_R)
             mask |= EGG_VIRTUAL_SUPER_MASK;
-          else if (keyvals[j] == GDK_Mode_switch)
+          else if (keyvals[j] == GDK_KEY_Mode_switch)
             mask |= EGG_VIRTUAL_MODE_SWITCH_MASK;
           
           ++j;
 
=== modified file 'src/eggaccelerators.h'
--- src/eggaccelerators.h	2010-03-02 22:24:00 +0000
+++ src/eggaccelerators.h	2011-11-26 02:05:26 +0000
@@ -20,7 +20,7 @@
 #ifndef __EGG_ACCELERATORS_H__
 #define __EGG_ACCELERATORS_H__
 
-#include <gtk/gtkaccelgroup.h>
+#include <gtk/gtk.h>
 #include <gdk/gdk.h>
 
 G_BEGIN_DECLS
 
=== modified file 'src/tomboykeybinder.c'
--- src/tomboykeybinder.c	2010-05-04 16:54:22 +0000
+++ src/tomboykeybinder.c	2011-11-26 02:05:26 +0000
@@ -18,7 +18,6 @@
 #include <string.h>
 
 #include <gdk/gdk.h>
-#include <gdk/gdkwindow.h>
 #include <gdk/gdkx.h>
 #include <X11/Xlib.h>
 
@@ -86,7 +85,7 @@
 			XGrabKey (GDK_WINDOW_XDISPLAY (rootwin), 
 				  binding->keycode, 
 				  binding->modifiers | mod_masks [i], 
-				  GDK_WINDOW_XWINDOW (rootwin), 
+				  GDK_WINDOW_XID (rootwin), 
 				  False, 
 				  GrabModeAsync,
 				  GrabModeAsync);
@@ -94,7 +93,7 @@
 			XUngrabKey (GDK_WINDOW_XDISPLAY (rootwin),
 				    binding->keycode,
 				    binding->modifiers | mod_masks [i], 
-				    GDK_WINDOW_XWINDOW (rootwin));
+				    GDK_WINDOW_XID (rootwin));
 		}
 	}
 }
@@ -312,7 +311,7 @@
 	XModifierKeymap *mod_keymap;
 	gboolean retval = FALSE;
 
-	mod_keymap = XGetModifierMapping (gdk_display);
+	mod_keymap = XGetModifierMapping (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()));
 
 	map_size = 8 * mod_keymap->max_keypermod;