r24353 - in /packages/unstable/gnome-main-menu/debian: ./ patches/

jak at users.alioth.debian.org jak at users.alioth.debian.org
Thu May 20 13:54:12 UTC 2010


Author: jak
Date: Thu May 20 13:54:08 2010
New Revision: 24353

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=24353
Log:
* Replace the remaining patch series with a new one proposed for upstream.
 - 0001-Drop-usage-of-libgnome-2.0-and-libgnomeui-2.0.patch
 - 0002-Replace-libglade-with-gtkbuilder.patch
 - 0003-Drop-hal-storage-requirement.patch
 - 0004-Drop-the-dbus-glib-1-requirement.patch
 - 0005-Allow-building-without-NetworkManager-and-iwlib.patch
 - 0006-Change-default-search-tool-to-tracker-search-tool.patch

Added:
    packages/unstable/gnome-main-menu/debian/patches/0001-Drop-usage-of-libgnome-2.0-and-libgnomeui-2.0.patch
    packages/unstable/gnome-main-menu/debian/patches/0002-Replace-libglade-with-gtkbuilder.patch
    packages/unstable/gnome-main-menu/debian/patches/0003-Drop-hal-storage-requirement.patch
    packages/unstable/gnome-main-menu/debian/patches/0004-Drop-the-dbus-glib-1-requirement.patch
    packages/unstable/gnome-main-menu/debian/patches/0005-Allow-building-without-NetworkManager-and-iwlib.patch
    packages/unstable/gnome-main-menu/debian/patches/0006-Change-default-search-tool-to-tracker-search-tool.patch
Removed:
    packages/unstable/gnome-main-menu/debian/patches/non-linux.diff
Modified:
    packages/unstable/gnome-main-menu/debian/changelog
    packages/unstable/gnome-main-menu/debian/patches/series

Modified: packages/unstable/gnome-main-menu/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnome-main-menu/debian/changelog?rev=24353&op=diff
==============================================================================
--- packages/unstable/gnome-main-menu/debian/changelog [utf-8] (original)
+++ packages/unstable/gnome-main-menu/debian/changelog [utf-8] Thu May 20 13:54:08 2010
@@ -18,7 +18,13 @@
    - ltmain-as-needed.diff
   * Refresh patches:
    - default-applications.diff: Drop the nautilus change merged upstream
-   - non-linux.diff: Switch to an (upstream rejected, needs work) git patch
+  * Replace the remaining patch series with a new one proposed for upstream.
+   - 0001-Drop-usage-of-libgnome-2.0-and-libgnomeui-2.0.patch
+   - 0002-Replace-libglade-with-gtkbuilder.patch
+   - 0003-Drop-hal-storage-requirement.patch
+   - 0004-Drop-the-dbus-glib-1-requirement.patch
+   - 0005-Allow-building-without-NetworkManager-and-iwlib.patch
+   - 0006-Change-default-search-tool-to-tracker-search-tool.patch
   * Build-depend on dh-autoreconf and drop our own dh_autoreconf* scripts.
 
  -- Julian Andres Klode <jak at debian.org>  Fri, 30 Apr 2010 12:11:40 +0200

Added: packages/unstable/gnome-main-menu/debian/patches/0001-Drop-usage-of-libgnome-2.0-and-libgnomeui-2.0.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnome-main-menu/debian/patches/0001-Drop-usage-of-libgnome-2.0-and-libgnomeui-2.0.patch?rev=24353&op=file
==============================================================================
--- packages/unstable/gnome-main-menu/debian/patches/0001-Drop-usage-of-libgnome-2.0-and-libgnomeui-2.0.patch (added)
+++ packages/unstable/gnome-main-menu/debian/patches/0001-Drop-usage-of-libgnome-2.0-and-libgnomeui-2.0.patch [utf-8] Thu May 20 13:54:08 2010
@@ -1,0 +1,66 @@
+From 38bddf5d6a2051967b3daaa5239204e7050b3261 Mon Sep 17 00:00:00 2001
+From: Julian Andres Klode <jak at debian.org>
+Date: Wed, 5 May 2010 16:57:44 +0200
+Subject: [PATCH 1/6] Drop usage of libgnome-2.0 and libgnomeui-2.0
+
+Drop the complete usage of libgnome-2.0 and libgnomeui-2.0
+from main-menu.c and remove them from the list of used modules
+in configure.in
+
+https://bugzilla.gnome.org/show_bug.cgi?id=591001
+---
+ configure.in              |    2 +-
+ main-menu/src/main-menu.c |   10 +++++++---
+ 2 files changed, 8 insertions(+), 4 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index 2f61406..c2a47ce 100644
+--- a/configure.in
++++ b/configure.in
+@@ -53,7 +53,7 @@ if test "x$NM_GLIB" = "x"; then
+ 	PKG_CHECK_EXISTS(libnm_glib, [ NM_GLIB=libnm_glib ], [ AC_ERROR(cannot find NetworkManager Glib library) ])
+ fi
+ 
+-PKG_CHECK_MODULES(MAIN_MENU, [ $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 gconf-2.0 libgtop-2.0 libgnome-2.0 libgnomeui-2.0 dbus-glib-1 NetworkManager $NM_GLIB >= 0.7.0 libnm-util >= 0.7.0 x11 hal-storage cairo ])
++PKG_CHECK_MODULES(MAIN_MENU, [ $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 gconf-2.0 libgtop-2.0 dbus-glib-1 NetworkManager $NM_GLIB >= 0.7.0 libnm-util >= 0.7.0 x11 hal-storage cairo ])
+ 
+ AC_CHECK_HEADERS(iwlib.h, [ AC_CHECK_LIB(iw, iw_sockets_open, have_iwlib=yes, have_iwlib=no, -lm)], have_iwlib=no)
+ 
+diff --git a/main-menu/src/main-menu.c b/main-menu/src/main-menu.c
+index 476805b..15f20cd 100644
+--- a/main-menu/src/main-menu.c
++++ b/main-menu/src/main-menu.c
+@@ -24,7 +24,6 @@
+ 
+ #include <glib.h>
+ #include <panel-applet.h>
+-#include <libgnomeui/libgnomeui.h>
+ #include <string.h>
+ #include <libslab/slab.h>
+ 
+@@ -43,7 +42,10 @@ PANEL_APPLET_BONOBO_FACTORY ("OAFIID:GNOME_MainMenu_Factory", PANEL_TYPE_APPLET,
+ static gboolean
+ main_menu_applet_init (PanelApplet *applet, const gchar *iid, gpointer user_data)
+ {
+-	gchar *argv [1] = { "slab" };
++	int argc = 1;
++	gchar *_argv [1] = { "slab" };
++	// Needed for calling gtk_init.
++	gchar **argv = _argv;
+ 
+ 	libslab_checkpoint_init (CHECKPOINT_CONFIG_BASENAME, CHECKPOINT_FILE_BASENAME);
+ 
+@@ -65,7 +67,9 @@ main_menu_applet_init (PanelApplet *applet, const gchar *iid, gpointer user_data
+ 	textdomain (GETTEXT_PACKAGE);
+ #endif
+ 
+-	gnome_program_init (PACKAGE, VERSION, LIBGNOMEUI_MODULE, 1, argv, NULL, NULL);
++	gtk_init (&argc, &argv);
++	g_set_prgname (PACKAGE);
++	g_set_application_name (_("GNOME Main Menu"));
+ 
+ 	libslab_checkpoint ("Migrating old configurations");
+ 	move_system_area_to_new_set ();
+-- 
+1.7.1
+

Added: packages/unstable/gnome-main-menu/debian/patches/0002-Replace-libglade-with-gtkbuilder.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnome-main-menu/debian/patches/0002-Replace-libglade-with-gtkbuilder.patch?rev=24353&op=file
==============================================================================
--- packages/unstable/gnome-main-menu/debian/patches/0002-Replace-libglade-with-gtkbuilder.patch (added)
+++ packages/unstable/gnome-main-menu/debian/patches/0002-Replace-libglade-with-gtkbuilder.patch [utf-8] Thu May 20 13:54:08 2010
@@ -1,0 +1,2790 @@
+From 566617ba9ccd79530056bf3d865db00761329536 Mon Sep 17 00:00:00 2001
+From: Julian Andres Klode <jak at debian.org>
+Date: Wed, 5 May 2010 17:29:16 +0200
+Subject: [PATCH 2/6] Replace libglade with gtkbuilder
+
+This patch was originally written by Robert Ancell <robert.ancell at gmail.com>,
+and later adapted to main-menu trunk.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=590221
+---
+ configure.in                        |    4 -
+ main-menu/src/Makefile.am           |   10 +-
+ main-menu/src/main-menu-ui.c        |  154 ++--
+ main-menu/src/network-status-tile.c |   37 +-
+ main-menu/src/slab-button.ui        |  211 ++++++
+ main-menu/src/slab-window.glade     | 1395 -----------------------------------
+ main-menu/src/slab-window.ui        |  635 ++++++++++++++++
+ po/POTFILES.in                      |    3 +-
+ 8 files changed, 951 insertions(+), 1498 deletions(-)
+ create mode 100644 main-menu/src/slab-button.ui
+ delete mode 100644 main-menu/src/slab-window.glade
+ create mode 100644 main-menu/src/slab-window.ui
+
+diff --git a/configure.in b/configure.in
+index c2a47ce..cb7d4f0 100644
+--- a/configure.in
++++ b/configure.in
+@@ -43,10 +43,6 @@ COMMON_MODULES="glib-2.0 >= $GLIB_REQUIRED	\
+ 		gdk-2.0				\
+ 		libslab >= $SLAB_REQUIRED"
+ 
+-PKG_CHECK_MODULES(GLADE, libglade-2.0)
+-AC_SUBST(GLADE_CFLAGS)
+-AC_SUBST(GLADE_LIBS)
+-
+ NM_GLIB=
+ PKG_CHECK_EXISTS(libnm-glib, [ NM_GLIB=libnm-glib ])
+ if test "x$NM_GLIB" = "x"; then
+diff --git a/main-menu/src/Makefile.am b/main-menu/src/Makefile.am
+index 77ae71b..fdfa6e4 100644
+--- a/main-menu/src/Makefile.am
++++ b/main-menu/src/Makefile.am
+@@ -2,15 +2,14 @@ INCLUDES =								\
+ 	$(MAIN_MENU_CFLAGS)						\
+ 	$(WARN_CFLAGS)
+ 
+-gladedir = $(datadir)/$(PACKAGE)
+-glade_DATA = slab-window.glade
++uidir = $(datadir)/$(PACKAGE)
++ui_DATA = slab-button.ui slab-window.ui
+ 
+ libexec_PROGRAMS = main-menu
+ 
+ bin_PROGRAMS = trigger-panel-run-dialog
+ 
+ AM_CPPFLAGS =								\
+-	$(GLADE_CFLAGS)							\
+ 	-DDATADIR=\""$(datadir)"\"					\
+ 	-DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\"
+ 
+@@ -27,8 +26,7 @@ main_menu_SOURCES =							\
+ 	eggaccelerators.c		eggaccelerators.h
+ 
+ main_menu_LDADD =							\
+-	$(MAIN_MENU_LIBS)						\
+-	$(GLADE_LIBS)
++	$(MAIN_MENU_LIBS)
+ 
+ trigger_panel_run_dialog_SOURCES =					\
+ 	trigger-panel-run-dialog.c
+@@ -36,4 +34,4 @@ trigger_panel_run_dialog_SOURCES =					\
+ trigger_panel_run_dialog_LDADD =					\
+ 	$(MAIN_MENU_LIBS)
+ 
+-EXTRA_DIST = $(glade_DATA)
++EXTRA_DIST = $(ui_DATA)
+diff --git a/main-menu/src/main-menu-ui.c b/main-menu/src/main-menu-ui.c
+index dbe7fc7..67e6102 100644
+--- a/main-menu/src/main-menu-ui.c
++++ b/main-menu/src/main-menu-ui.c
+@@ -25,7 +25,6 @@
+ #endif
+ 
+ #include <panel-applet.h>
+-#include <glade/glade.h>
+ #include <cairo.h>
+ #include <string.h>
+ #include <libxml/parser.h>
+@@ -76,8 +75,8 @@ typedef struct {
+ 	PanelApplet *panel_applet;
+ 	GtkWidget   *panel_about_dialog;
+ 
+-	GladeXML *main_menu_xml;
+-	GladeXML *panel_button_xml;
++	GtkBuilder *main_menu_ui;
++	GtkBuilder *panel_button_ui;
+ 
+ 	GtkToggleButton *panel_buttons [4];
+ 	GtkToggleButton *panel_button;
+@@ -314,7 +313,7 @@ main_menu_ui_new (PanelApplet *applet)
+ 	MainMenuUI        *this;
+ 	MainMenuUIPrivate *priv;
+ 
+-	gchar *glade_xml_path;
++	gchar *window_ui_path, *button_ui_path;
+ 
+ 
+ 	this = g_object_new (MAIN_MENU_UI_TYPE, NULL);
+@@ -322,11 +321,15 @@ main_menu_ui_new (PanelApplet *applet)
+ 
+ 	priv->panel_applet = applet;
+ 
+-	glade_xml_path = g_build_filename (DATADIR, PACKAGE, "slab-window.glade", NULL);
++	window_ui_path = g_build_filename (DATADIR, PACKAGE, "slab-window.ui", NULL);
++	button_ui_path = g_build_filename (DATADIR, PACKAGE, "slab-button.ui", NULL);
+ 
+-	priv->main_menu_xml    = glade_xml_new (glade_xml_path, "slab-main-menu-window", NULL);
+-	priv->panel_button_xml = glade_xml_new (glade_xml_path, "slab-panel-button-root", NULL);
+-	g_free (glade_xml_path);
++	priv->main_menu_ui    = gtk_builder_new ();
++	gtk_builder_add_from_file (priv->main_menu_ui, window_ui_path, NULL);
++	priv->panel_button_ui = gtk_builder_new ();
++	gtk_builder_add_from_file (priv->panel_button_ui, button_ui_path, NULL);
++	g_free (window_ui_path);
++	g_free (button_ui_path);
+ 
+ 	libslab_checkpoint ("main_menu_ui_new(): create_panel_button");
+ 	create_panel_button (this);
+@@ -353,8 +356,8 @@ main_menu_ui_init (MainMenuUI *this)
+ 	priv->panel_applet                               = NULL;
+ 	priv->panel_about_dialog                         = NULL;
+ 
+-	priv->main_menu_xml                              = NULL;
+-	priv->panel_button_xml                           = NULL;
++	priv->main_menu_ui                               = NULL;
++	priv->panel_button_ui                            = NULL;
+ 
+ 	priv->panel_buttons [PANEL_BUTTON_ORIENT_TOP]    = NULL;
+ 	priv->panel_buttons [PANEL_BUTTON_ORIENT_BOTTOM] = NULL;
+@@ -492,19 +495,19 @@ create_panel_button (MainMenuUI *this)
+ 	gint i;
+ 
+ 
+-	button_root = glade_xml_get_widget (
+-		priv->panel_button_xml, "slab-panel-button-root");
++	button_root = GTK_WIDGET (gtk_builder_get_object (
++		priv->panel_button_ui, "slab-panel-button-root"));
+ 
+ 	gtk_widget_hide (button_root);
+ 
+-	priv->panel_buttons [PANEL_BUTTON_ORIENT_TOP] = GTK_TOGGLE_BUTTON (glade_xml_get_widget (
+-		priv->panel_button_xml, "slab-main-menu-panel-button-top"));
+-	priv->panel_buttons [PANEL_BUTTON_ORIENT_BOTTOM] = GTK_TOGGLE_BUTTON (glade_xml_get_widget (
+-		priv->panel_button_xml, "slab-main-menu-panel-button-bottom"));
+-	priv->panel_buttons [PANEL_BUTTON_ORIENT_LEFT] = GTK_TOGGLE_BUTTON (glade_xml_get_widget (
+-		priv->panel_button_xml, "slab-main-menu-panel-button-left"));
+-	priv->panel_buttons [PANEL_BUTTON_ORIENT_RIGHT] = GTK_TOGGLE_BUTTON (glade_xml_get_widget (
+-		priv->panel_button_xml, "slab-main-menu-panel-button-right"));
++	priv->panel_buttons [PANEL_BUTTON_ORIENT_TOP] = GTK_TOGGLE_BUTTON (gtk_builder_get_object (
++		priv->panel_button_ui, "slab-main-menu-panel-button-top"));
++	priv->panel_buttons [PANEL_BUTTON_ORIENT_BOTTOM] = GTK_TOGGLE_BUTTON (gtk_builder_get_object (
++		priv->panel_button_ui, "slab-main-menu-panel-button-bottom"));
++	priv->panel_buttons [PANEL_BUTTON_ORIENT_LEFT] = GTK_TOGGLE_BUTTON (gtk_builder_get_object (
++		priv->panel_button_ui, "slab-main-menu-panel-button-left"));
++	priv->panel_buttons [PANEL_BUTTON_ORIENT_RIGHT] = GTK_TOGGLE_BUTTON (gtk_builder_get_object (
++		priv->panel_button_ui, "slab-main-menu-panel-button-right"));
+ 
+ 	for (i = 0; i < 4; ++i) {
+ 		g_object_set_data (
+@@ -554,6 +557,13 @@ create_panel_button (MainMenuUI *this)
+ 		G_CALLBACK (panel_applet_change_background_cb), this);
+ }
+ 
++static GtkWidget *
++get_widget (MainMenuUIPrivate *priv, const gchar *name)
++{
++	return GTK_WIDGET (gtk_builder_get_object (priv->main_menu_ui, name));
++}
++
++
+ static void
+ create_slab_window (MainMenuUI *this)
+ {
+@@ -562,14 +572,13 @@ create_slab_window (MainMenuUI *this)
+ 	GdkAtom slab_action_atom;
+ 
+ 
+-	priv->slab_window = glade_xml_get_widget (
+-		priv->main_menu_xml, "slab-main-menu-window");
++	priv->slab_window = get_widget (priv, "slab-main-menu-window");
+ 	gtk_widget_set_app_paintable (priv->slab_window, TRUE);
+ 	gtk_widget_hide              (priv->slab_window);
+ 	gtk_window_stick             (GTK_WINDOW (priv->slab_window));
+ 
+-	priv->top_pane  = glade_xml_get_widget (priv->main_menu_xml, "top-pane");
+-	priv->left_pane = glade_xml_get_widget (priv->main_menu_xml, "left-pane");
++	priv->top_pane  = get_widget (priv, "top-pane");
++	priv->left_pane = get_widget (priv, "left-pane");
+ 
+ 	tomboy_keybinder_init ();
+ 	tomboy_keybinder_bind ("<Ctrl>Escape", slab_window_tomboy_bindkey_cb, this);
+@@ -614,8 +623,8 @@ create_search_section (MainMenuUI *this)
+ {
+ 	MainMenuUIPrivate *priv = PRIVATE (this);
+ 
+-        priv->search_section = glade_xml_get_widget (priv->main_menu_xml, "search-section");
+-	priv->search_entry   = glade_xml_get_widget (priv->main_menu_xml, "search-entry");
++	priv->search_section = get_widget (priv, "search-section");
++	priv->search_entry   = get_widget (priv, "search-entry");
+ 
+ 	g_signal_connect (
+ 		G_OBJECT (priv->search_entry), "activate",
+@@ -637,19 +646,19 @@ create_file_section (MainMenuUI *this)
+ 	gint i;
+ 
+ 
+-	priv->file_section = GTK_NOTEBOOK (glade_xml_get_widget (
+-		priv->main_menu_xml, "file-area-notebook"));
++	priv->file_section = GTK_NOTEBOOK (gtk_builder_get_object (
++		priv->main_menu_ui, "file-area-notebook"));
+ 
+-	priv->page_selectors [APPS_PAGE] = glade_xml_get_widget (
+-		priv->main_menu_xml, "slab-page-selector-button-applications");
+-	priv->page_selectors [DOCS_PAGE] = glade_xml_get_widget (
+-		priv->main_menu_xml, "slab-page-selector-button-documents");
+-	priv->page_selectors [DIRS_PAGE] = glade_xml_get_widget (
+-		priv->main_menu_xml, "slab-page-selector-button-places");
++	priv->page_selectors [APPS_PAGE] =
++        get_widget (priv, "slab-page-selector-button-applications");
++	priv->page_selectors [DOCS_PAGE] =
++        get_widget (priv, "slab-page-selector-button-documents");
++	priv->page_selectors [DIRS_PAGE] =
++        get_widget (priv, "slab-page-selector-button-places");
+ 
+-	pages [APPS_PAGE] = glade_xml_get_widget (priv->main_menu_xml, "applications-page");
+-	pages [DOCS_PAGE] = glade_xml_get_widget (priv->main_menu_xml, "documents-page");
+-	pages [DIRS_PAGE] = glade_xml_get_widget (priv->main_menu_xml, "places-page");
++	pages [APPS_PAGE] = get_widget (priv, "applications-page");
++	pages [DOCS_PAGE] = get_widget (priv, "documents-page");
++	pages [DIRS_PAGE] = get_widget (priv, "places-page");
+ 
+ 	for (i = 0; i < 3; ++i) {
+ 		gtk_container_child_get (
+@@ -667,16 +676,16 @@ create_file_section (MainMenuUI *this)
+ 	priv->current_page_gconf_mntr_id = libslab_gconf_notify_add (
+ 		CURRENT_PAGE_GCONF_KEY, current_page_notify_cb, this);
+ 
+-	priv->table_sections [USER_APPS_TABLE] = glade_xml_get_widget (
+-		priv->main_menu_xml, "user-apps-section");
+-	priv->table_sections [RCNT_APPS_TABLE] = glade_xml_get_widget (
+-		priv->main_menu_xml, "recent-apps-section");
+-	priv->table_sections [USER_DOCS_TABLE] = glade_xml_get_widget (
+-		priv->main_menu_xml, "user-docs-section");
+-	priv->table_sections [RCNT_DOCS_TABLE] = glade_xml_get_widget (
+-		priv->main_menu_xml, "recent-docs-section");
+-	priv->table_sections [USER_DIRS_TABLE] = glade_xml_get_widget (
+-		priv->main_menu_xml, "user-dirs-section");
++	priv->table_sections [USER_APPS_TABLE] =
++        get_widget (priv, "user-apps-section");
++	priv->table_sections [RCNT_APPS_TABLE] =
++        get_widget (priv, "recent-apps-section");
++	priv->table_sections [USER_DOCS_TABLE] =
++        get_widget (priv, "user-docs-section");
++	priv->table_sections [RCNT_DOCS_TABLE] =
++        get_widget (priv, "recent-docs-section");
++	priv->table_sections [USER_DIRS_TABLE] =
++        get_widget (priv, "user-dirs-section");
+ }
+ 
+ static void
+@@ -687,8 +696,8 @@ create_system_section (MainMenuUI *this)
+ 	GtkContainer *ctnr;
+ 
+ 
+-	ctnr = GTK_CONTAINER (glade_xml_get_widget (
+-		priv->main_menu_xml, "system-item-table-container"));
++	ctnr = GTK_CONTAINER (gtk_builder_get_object (
++		priv->main_menu_ui, "system-item-table-container"));
+ 
+ 	priv->sys_table = TILE_TABLE (tile_table_new (
+ 		priv->bm_agents [BOOKMARK_STORE_SYSTEM], -1, 1, TRUE, TRUE,
+@@ -702,8 +711,7 @@ create_system_section (MainMenuUI *this)
+ 		G_OBJECT (priv->sys_table), "notify::" TILE_TABLE_TILES_PROP,
+ 		G_CALLBACK (tile_table_notify_cb), this);
+ 
+-	priv->system_section = glade_xml_get_widget (
+-		priv->main_menu_xml, "slab-system-section");
++	priv->system_section = get_widget (priv, "slab-system-section");
+ }
+ 
+ static void
+@@ -717,8 +725,8 @@ create_status_section (MainMenuUI *this)
+ 	gint icon_width;
+ 
+ 
+-	ctnr = GTK_CONTAINER (glade_xml_get_widget (
+-		priv->main_menu_xml, "hard-drive-status-container"));
++	ctnr = GTK_CONTAINER (gtk_builder_get_object (
++		priv->main_menu_ui, "hard-drive-status-container"));
+ 	tile = hard_drive_status_tile_new ();
+ 
+ 	gtk_icon_size_lookup (GTK_ICON_SIZE_DND, & icon_width, NULL);
+@@ -729,8 +737,8 @@ create_status_section (MainMenuUI *this)
+ 	gtk_container_add   (ctnr, tile);
+ 	gtk_widget_show_all (GTK_WIDGET (ctnr));
+ 
+-	ctnr = GTK_CONTAINER (glade_xml_get_widget (
+-		priv->main_menu_xml, "network-status-container"));
++	ctnr = GTK_CONTAINER (gtk_builder_get_object (
++		priv->main_menu_ui, "network-status-container"));
+ 	priv->network_status = network_status_tile_new ();
+ 
+ 	gtk_widget_set_size_request (priv->network_status, 6 * icon_width, -1);
+@@ -742,8 +750,8 @@ create_status_section (MainMenuUI *this)
+ 	gtk_container_add   (ctnr, priv->network_status);
+ 	gtk_widget_show_all (GTK_WIDGET (ctnr));
+ 
+-	priv->status_section = glade_xml_get_widget (
+-		priv->main_menu_xml, "slab-status-section");
++	priv->status_section = get_widget (priv, "slab-status-section");
++
+ }
+ 
+ static void
+@@ -754,8 +762,8 @@ create_user_apps_section (MainMenuUI *this)
+ 	GtkContainer *ctnr;
+ 
+ 
+-	ctnr = GTK_CONTAINER (glade_xml_get_widget (
+-		priv->main_menu_xml, "user-apps-table-container"));
++	ctnr = GTK_CONTAINER (gtk_builder_get_object (
++		priv->main_menu_ui, "user-apps-table-container"));
+ 
+ 	priv->file_tables [USER_APPS_TABLE] = TILE_TABLE (tile_table_new (
+ 		priv->bm_agents [BOOKMARK_STORE_USER_APPS], -1, 2, TRUE, TRUE,
+@@ -772,8 +780,8 @@ create_rct_apps_section (MainMenuUI *this)
+ 	GtkContainer *ctnr;
+ 
+ 
+-	ctnr = GTK_CONTAINER (glade_xml_get_widget (
+-		priv->main_menu_xml, "recent-apps-table-container"));
++	ctnr = GTK_CONTAINER (gtk_builder_get_object (
++		priv->main_menu_ui, "recent-apps-table-container"));
+ 
+ 	priv->file_tables [RCNT_APPS_TABLE] = TILE_TABLE (tile_table_new (
+ 		priv->bm_agents [BOOKMARK_STORE_RECENT_APPS], -1, 2, FALSE, FALSE,
+@@ -790,8 +798,8 @@ create_user_docs_section (MainMenuUI *this)
+ 	GtkContainer *ctnr;
+ 
+ 
+-	ctnr = GTK_CONTAINER (glade_xml_get_widget (
+-		priv->main_menu_xml, "user-docs-table-container"));
++	ctnr = GTK_CONTAINER (gtk_builder_get_object (
++		priv->main_menu_ui, "user-docs-table-container"));
+ 
+ 	priv->file_tables [USER_DOCS_TABLE] = TILE_TABLE (tile_table_new (
+ 		priv->bm_agents [BOOKMARK_STORE_USER_DOCS], -1, 2, TRUE, TRUE,
+@@ -808,8 +816,8 @@ create_rct_docs_section (MainMenuUI *this)
+ 	GtkContainer *ctnr;
+ 
+ 
+-	ctnr = GTK_CONTAINER (glade_xml_get_widget (
+-		priv->main_menu_xml, "recent-docs-table-container"));
++	ctnr = GTK_CONTAINER (gtk_builder_get_object (
++		priv->main_menu_ui, "recent-docs-table-container"));
+ 
+ 	priv->file_tables [RCNT_DOCS_TABLE] = TILE_TABLE (tile_table_new (
+ 		priv->bm_agents [BOOKMARK_STORE_RECENT_DOCS], -1, 2, FALSE, FALSE,
+@@ -832,8 +840,8 @@ create_user_dirs_section (MainMenuUI *this)
+ 	GtkContainer *ctnr;
+ 
+ 
+-	ctnr = GTK_CONTAINER (glade_xml_get_widget (
+-		priv->main_menu_xml, "user-dirs-table-container"));
++	ctnr = GTK_CONTAINER (gtk_builder_get_object (
++		priv->main_menu_ui, "user-dirs-table-container"));
+ 
+ 	priv->file_tables [USER_DIRS_TABLE] = TILE_TABLE (tile_table_new (
+ 		priv->bm_agents [BOOKMARK_STORE_USER_DIRS], -1, 2, FALSE, FALSE,
+@@ -850,9 +858,9 @@ create_more_buttons (MainMenuUI *this)
+ 	gint i;
+ 
+ 
+-	priv->more_buttons [0] = glade_xml_get_widget (priv->main_menu_xml, "more-applications-button");
+-	priv->more_buttons [1] = glade_xml_get_widget (priv->main_menu_xml, "more-documents-button");
+-	priv->more_buttons [2] = glade_xml_get_widget (priv->main_menu_xml, "more-places-button");
++	priv->more_buttons [0] = get_widget (priv, "more-applications-button");
++	priv->more_buttons [1] = get_widget (priv, "more-documents-button");
++	priv->more_buttons [2] = get_widget (priv, "more-places-button");
+ 
+ 	for (i = 0; i < 3; ++i) {
+ 		g_object_set_data (
+@@ -864,9 +872,9 @@ create_more_buttons (MainMenuUI *this)
+ 			G_CALLBACK (more_buttons_clicked_cb), this);
+ 	}
+ 
+-	priv->more_sections [0] = glade_xml_get_widget (priv->main_menu_xml, "more-apps-section");
+-	priv->more_sections [1] = glade_xml_get_widget (priv->main_menu_xml, "more-docs-section");
+-	priv->more_sections [2] = glade_xml_get_widget (priv->main_menu_xml, "more-dirs-section");
++	priv->more_sections [0] = get_widget (priv, "more-apps-section");
++	priv->more_sections [1] = get_widget (priv, "more-docs-section");
++	priv->more_sections [2] = get_widget (priv, "more-dirs-section");
+ }
+ 
+ static void
+diff --git a/main-menu/src/network-status-tile.c b/main-menu/src/network-status-tile.c
+index 3b31cfd..655d9e7 100644
+--- a/main-menu/src/network-status-tile.c
++++ b/main-menu/src/network-status-tile.c
+@@ -22,7 +22,6 @@
+ 
+ #include <string.h>
+ #include <glib/gi18n.h>
+-#include <glade/glade.h>
+ 
+ #include "network-status-agent.h"
+ #include "network-status-info.h"
+@@ -46,7 +45,7 @@ static void tile_show_event_cb (GtkWidget *, gpointer);
+ static void status_changed_cb (NetworkStatusAgent *, gpointer);
+ static void info_dialog_cfg_button_clicked_cb (GtkButton *, gpointer);
+ 
+-static void set_glade_label (GladeXML *, const gchar *, const gchar *);
++static void set_ui_label (GtkBuilder *, const gchar *, const gchar *);
+ static void launch_network_config (const gchar * desktop_key);
+ 
+ typedef struct
+@@ -54,7 +53,7 @@ typedef struct
+ 	NetworkStatusAgent *agent;
+ 	NetworkStatusInfo *status_info;
+ 	
+-	GladeXML *info_dialog_xml;
++	GtkBuilder *info_dialog_ui;
+ 	GtkWidget *info_dialog;
+ } NetworkStatusTilePrivate;
+ 
+@@ -120,7 +119,7 @@ network_status_tile_init (NetworkStatusTile * tile)
+ 	NetworkStatusTilePrivate *priv = NETWORK_STATUS_TILE_GET_PRIVATE (tile);
+ 
+ 	priv->agent = NULL;
+-	priv->info_dialog_xml = NULL;
++	priv->info_dialog_ui = NULL;
+ 	priv->info_dialog = NULL;
+ }
+ 
+@@ -132,8 +131,8 @@ network_status_tile_finalize (GObject * g_object)
+ 		g_object_unref (priv->status_info);
+ 	if (priv->agent)
+ 		g_object_unref (priv->agent);
+-	if (priv->info_dialog_xml)
+-		g_object_unref (priv->info_dialog_xml);
++	if (priv->info_dialog_ui)
++		g_object_unref (priv->info_dialog_ui);
+ 
+ 	(*G_OBJECT_CLASS (network_status_tile_parent_class)->finalize) (g_object);
+ }
+@@ -330,7 +329,7 @@ update_info_dialog (NetworkStatusTile * tile)
+ {
+ 	NetworkStatusTilePrivate *priv = NETWORK_STATUS_TILE_GET_PRIVATE (tile);
+ 
+-	GladeXML *xml = priv->info_dialog_xml;
++	GtkBuilder *ui = priv->info_dialog_ui;
+ 
+ 	gchar *iface_and_type = NULL;
+ 	gchar *speed = NULL;
+@@ -365,7 +364,7 @@ update_info_dialog (NetworkStatusTile * tile)
+ 		break;
+ 	}
+ 
+-	set_glade_label (xml, "label-interface", iface_and_type);
++	set_ui_label (ui, "label-interface", iface_and_type);
+ 	g_free (iface_and_type);
+ 
+ 	if (priv->status_info->speed_mbs)
+@@ -373,18 +372,18 @@ update_info_dialog (NetworkStatusTile * tile)
+ 	else
+ 		speed = g_strdup_printf (_("Unknown"));
+ 
+-	set_glade_label (xml, "label-speed", speed);
++	set_ui_label (ui, "label-speed", speed);
+ 	g_free (speed);
+ 
+-	set_glade_label (xml, "label-driver", priv->status_info->driver);
+-	set_glade_label (xml, "label-ip-address", priv->status_info->ip4_addr);
+-	set_glade_label (xml, "label-broadcast-address", priv->status_info->broadcast);
+-	set_glade_label (xml, "label-subnet-mask", priv->status_info->subnet_mask);
+-	set_glade_label (xml, "label-default-route", priv->status_info->route);
+-	set_glade_label (xml, "label-primary-dns", priv->status_info->primary_dns);
+-	set_glade_label (xml, "label-secondary-dns", priv->status_info->secondary_dns);
++	set_ui_label (ui, "label-driver", priv->status_info->driver);
++	set_ui_label (ui, "label-ip-address", priv->status_info->ip4_addr);
++	set_ui_label (ui, "label-broadcast-address", priv->status_info->broadcast);
++	set_ui_label (ui, "label-subnet-mask", priv->status_info->subnet_mask);
++	set_ui_label (ui, "label-default-route", priv->status_info->route);
++	set_ui_label (ui, "label-primary-dns", priv->status_info->primary_dns);
++	set_ui_label (ui, "label-secondary-dns", priv->status_info->secondary_dns);
+ 	if (priv->status_info->hw_addr)
+-		set_glade_label (xml, "label-hardware-address", priv->status_info->hw_addr);
++		set_ui_label (ui, "label-hardware-address", priv->status_info->hw_addr);
+ }
+ 
+ static void
+@@ -432,11 +431,11 @@ info_dialog_cfg_button_clicked_cb (GtkButton * button, gpointer user_data)
+ }
+ 
+ static void
+-set_glade_label (GladeXML * xml, const gchar * id, const gchar * text)
++set_ui_label (GtkBuilder * ui, const gchar * id, const gchar * text)
+ {
+ 	GtkLabel *label = NULL;
+ 
+-	label = GTK_LABEL (glade_xml_get_widget (xml, id));
++	label = GTK_LABEL (gtk_builder_get_object (ui, id));
+ 
+ 	if (label)
+ 		gtk_label_set_text (label, text);
+diff --git a/main-menu/src/slab-button.ui b/main-menu/src/slab-button.ui
+new file mode 100644
+index 0000000..4b3d863
+--- /dev/null
++++ b/main-menu/src/slab-button.ui
+@@ -0,0 +1,211 @@
++<?xml version="1.0"?>
++<interface>
++  <requires lib="gtk+" version="2.16"/>
++  <!-- interface-naming-policy toplevel-contextual -->
++  <object class="GtkWindow" id="slab-panel-button-root">
++    <property name="title" translatable="yes">window1</property>
++    <child>
++      <object class="GtkHBox" id="hbox42">
++        <property name="visible">True</property>
++        <child>
++          <object class="GtkAlignment" id="alignment12">
++            <property name="visible">True</property>
++            <property name="xscale">0</property>
++            <property name="yscale">0</property>
++            <child>
++              <object class="GtkToggleButton" id="slab-main-menu-panel-button-top">
++                <property name="visible">True</property>
++                <property name="can_focus">True</property>
++                <property name="receives_default">False</property>
++                <property name="relief">none</property>
++                <property name="focus_on_click">False</property>
++                <child>
++                  <object class="GtkHBox" id="panel-button-inner-container">
++                    <property name="visible">True</property>
++                    <property name="spacing">6</property>
++                    <child>
++                      <object class="GtkImage" id="panel-button-icon">
++                        <property name="visible">True</property>
++                        <property name="icon_name">gnome-fs-client</property>
++                        <property name="icon-size">1</property>
++                      </object>
++                      <packing>
++                        <property name="expand">False</property>
++                        <property name="fill">False</property>
++                        <property name="position">0</property>
++                      </packing>
++                    </child>
++                    <child>
++                      <object class="GtkLabel" id="panel-button-label">
++                        <property name="visible">True</property>
++                        <property name="label" translatable="yes">Computer</property>
++                      </object>
++                      <packing>
++                        <property name="expand">False</property>
++                        <property name="fill">False</property>
++                        <property name="position">1</property>
++                      </packing>
++                    </child>
++                  </object>
++                </child>
++              </object>
++            </child>
++          </object>
++          <packing>
++            <property name="expand">False</property>
++            <property name="fill">False</property>
++            <property name="position">0</property>
++          </packing>
++        </child>
++        <child>
++          <object class="GtkAlignment" id="alignment14">
++            <property name="visible">True</property>
++            <property name="xscale">0</property>
++            <property name="yscale">0</property>
++            <child>
++              <object class="GtkToggleButton" id="slab-main-menu-panel-button-left">
++                <property name="visible">True</property>
++                <property name="can_focus">True</property>
++                <property name="receives_default">False</property>
++                <property name="relief">none</property>
++                <property name="focus_on_click">False</property>
++                <child>
++                  <object class="GtkVBox" id="vbox42">
++                    <property name="visible">True</property>
++                    <property name="orientation">vertical</property>
++                    <property name="spacing">6</property>
++                    <child>
++                      <object class="GtkLabel" id="label91">
++                        <property name="visible">True</property>
++                        <property name="label" translatable="yes">Computer</property>
++                        <property name="angle">90</property>
++                      </object>
++                      <packing>
++                        <property name="expand">False</property>
++                        <property name="fill">False</property>
++                        <property name="position">0</property>
++                      </packing>
++                    </child>
++                    <child>
++                      <object class="GtkImage" id="image42">
++                        <property name="visible">True</property>
++                        <property name="icon_name">gnome-fs-client</property>
++                        <property name="icon-size">1</property>
++                      </object>
++                      <packing>
++                        <property name="position">1</property>
++                      </packing>
++                    </child>
++                  </object>
++                </child>
++              </object>
++            </child>
++          </object>
++          <packing>
++            <property name="expand">False</property>
++            <property name="fill">False</property>
++            <property name="position">1</property>
++          </packing>
++        </child>
++        <child>
++          <object class="GtkAlignment" id="alignment13">
++            <property name="visible">True</property>
++            <property name="xscale">0</property>
++            <property name="yscale">0</property>
++            <child>
++              <object class="GtkToggleButton" id="slab-main-menu-panel-button-right">
++                <property name="visible">True</property>
++                <property name="can_focus">True</property>
++                <property name="receives_default">False</property>
++                <property name="relief">none</property>
++                <property name="focus_on_click">False</property>
++                <child>
++                  <object class="GtkVBox" id="vbox43">
++                    <property name="visible">True</property>
++                    <property name="orientation">vertical</property>
++                    <property name="spacing">6</property>
++                    <child>
++                      <object class="GtkImage" id="image43">
++                        <property name="visible">True</property>
++                        <property name="icon_name">gnome-fs-client</property>
++                        <property name="icon-size">1</property>
++                      </object>
++                      <packing>
++                        <property name="position">0</property>
++                      </packing>
++                    </child>
++                    <child>
++                      <object class="GtkLabel" id="label92">
++                        <property name="visible">True</property>
++                        <property name="label" translatable="yes">Computer</property>
++                        <property name="angle">270</property>
++                      </object>
++                      <packing>
++                        <property name="expand">False</property>
++                        <property name="fill">False</property>
++                        <property name="position">1</property>
++                      </packing>
++                    </child>
++                  </object>
++                </child>
++              </object>
++            </child>
++          </object>
++          <packing>
++            <property name="expand">False</property>
++            <property name="fill">False</property>
++            <property name="position">2</property>
++          </packing>
++        </child>
++        <child>
++          <object class="GtkAlignment" id="alignment25">
++            <property name="visible">True</property>
++            <property name="xscale">0</property>
++            <property name="yscale">0</property>
++            <child>
++              <object class="GtkToggleButton" id="slab-main-menu-panel-button-bottom">
++                <property name="visible">True</property>
++                <property name="can_focus">True</property>
++                <property name="receives_default">False</property>
++                <property name="relief">none</property>
++                <property name="focus_on_click">False</property>
++                <child>
++                  <object class="GtkHBox" id="hbox43">
++                    <property name="visible">True</property>
++                    <property name="spacing">6</property>
++                    <child>
++                      <object class="GtkImage" id="image44">
++                        <property name="visible">True</property>
++                        <property name="icon_name">gnome-fs-client</property>
++                        <property name="icon-size">1</property>
++                      </object>
++                      <packing>
++                        <property name="expand">False</property>
++                        <property name="fill">False</property>
++                        <property name="position">0</property>
++                      </packing>
++                    </child>
++                    <child>
++                      <object class="GtkLabel" id="label93">
++                        <property name="visible">True</property>
++                        <property name="label" translatable="yes">Computer</property>
++                      </object>
++                      <packing>
++                        <property name="expand">False</property>
++                        <property name="fill">False</property>
++                        <property name="position">1</property>
++                      </packing>
++                    </child>
++                  </object>
++                </child>
++              </object>
++            </child>
++          </object>
++          <packing>
++            <property name="position">3</property>
++          </packing>
++        </child>
++      </object>
++    </child>
++  </object>
++</interface>
+diff --git a/main-menu/src/slab-window.glade b/main-menu/src/slab-window.glade
+deleted file mode 100644
+index 108a9dc..0000000
+--- a/main-menu/src/slab-window.glade
++++ /dev/null
+@@ -1,1395 +0,0 @@
+-<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
+-<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
+-
+-<glade-interface>
+-<requires lib="gnome"/>
+-
+-<widget class="GtkWindow" id="slab-main-menu-window">
+-  <property name="border_width">3</property>
+-  <property name="title" translatable="yes">GNOME Main Menu</property>
+-  <property name="type">GTK_WINDOW_POPUP</property>
+-  <property name="window_position">GTK_WIN_POS_NONE</property>
+-  <property name="modal">False</property>
+-  <property name="resizable">False</property>
+-  <property name="destroy_with_parent">True</property>
+-  <property name="icon_name">gnome-fs-client</property>
+-  <property name="decorated">False</property>
+-  <property name="skip_taskbar_hint">True</property>
+-  <property name="skip_pager_hint">False</property>
+-  <property name="type_hint">GDK_WINDOW_TYPE_HINT_MENU</property>
+-  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+-  <property name="focus_on_map">True</property>
+-  <property name="urgency_hint">False</property>
+-  <signal name="expose_event" handler="slab_window_expose_cb" last_modification_time="Wed, 17 Jan 2007 06:48:47 GMT"/>
+-
+-  <child>
+-    <widget class="GtkHBox" id="hbox1">
+-      <property name="visible">True</property>
+-      <property name="homogeneous">False</property>
+-      <property name="spacing">0</property>
+-
+-      <child>
+-	<widget class="GtkAlignment" id="left-pane">
+-	  <property name="visible">True</property>
+-	  <property name="xalign">0.5</property>
+-	  <property name="yalign">0.5</property>
+-	  <property name="xscale">1</property>
+-	  <property name="yscale">1</property>
+-	  <property name="top_padding">0</property>
+-	  <property name="bottom_padding">0</property>
+-	  <property name="left_padding">0</property>
+-	  <property name="right_padding">0</property>
+-
+-	  <child>
+-	    <widget class="GtkVBox" id="vbox_0">
+-	      <property name="visible">True</property>
+-	      <property name="homogeneous">False</property>
+-	      <property name="spacing">0</property>
+-
+-	      <child>
+-		<widget class="GtkAlignment" id="top-pane">
+-		  <property name="visible">True</property>
+-		  <property name="xalign">0.5</property>
+-		  <property name="yalign">0.5</property>
+-		  <property name="xscale">1</property>
+-		  <property name="yscale">1</property>
+-		  <property name="top_padding">0</property>
+-		  <property name="bottom_padding">0</property>
+-		  <property name="left_padding">0</property>
+-		  <property name="right_padding">6</property>
+-
+-		  <child>
+-		    <widget class="GtkVBox" id="vbox_1">
+-		      <property name="border_width">6</property>
+-		      <property name="visible">True</property>
+-		      <property name="homogeneous">False</property>
+-		      <property name="spacing">12</property>
+-
+-		      <child>
+-			<widget class="GtkHBox" id="search-section">
+-			  <property name="visible">True</property>
+-			  <property name="homogeneous">False</property>
+-			  <property name="spacing">6</property>
+-
+-			  <child>
+-			    <widget class="GtkImage" id="image1">
+-			      <property name="visible">True</property>
+-			      <property name="icon_size">5</property>
+-			      <property name="icon_name">system-search</property>
+-			      <property name="xalign">0.5</property>
+-			      <property name="yalign">0.5</property>
+-			      <property name="xpad">0</property>
+-			      <property name="ypad">0</property>
+-			    </widget>
+-			    <packing>
+-			      <property name="padding">0</property>
+-			      <property name="expand">False</property>
+-			      <property name="fill">False</property>
+-			    </packing>
+-			  </child>
+-
+-			  <child>
+-			    <widget class="GtkLabel" id="label1">
+-			      <property name="visible">True</property>
+-			      <property name="label" translatable="yes">Search:</property>
+-			      <property name="use_underline">False</property>
+-			      <property name="use_markup">False</property>
+-			      <property name="justify">GTK_JUSTIFY_LEFT</property>
+-			      <property name="wrap">False</property>
+-			      <property name="selectable">False</property>
+-			      <property name="xalign">0.5</property>
+-			      <property name="yalign">0.5</property>
+-			      <property name="xpad">0</property>
+-			      <property name="ypad">0</property>
+-			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+-			      <property name="width_chars">-1</property>
+-			      <property name="single_line_mode">False</property>
+-			      <property name="angle">0</property>
+-			    </widget>
+-			    <packing>
+-			      <property name="padding">0</property>
+-			      <property name="expand">False</property>
+-			      <property name="fill">False</property>
+-			    </packing>
+-			  </child>
+-
+-			  <child>
+-			    <widget class="GtkEntry" id="search-entry">
+-			      <property name="visible">True</property>
+-			      <property name="can_focus">True</property>
+-			      <property name="editable">True</property>
+-			      <property name="visibility">True</property>
+-			      <property name="max_length">0</property>
+-			      <property name="text" translatable="yes"></property>
+-			      <property name="has_frame">True</property>
+-			      <property name="invisible_char">●</property>
+-			      <property name="activates_default">False</property>
+-			    </widget>
+-			    <packing>
+-			      <property name="padding">0</property>
+-			      <property name="expand">True</property>
+-			      <property name="fill">True</property>
+-			    </packing>
+-			  </child>
+-			</widget>
+-			<packing>
+-			  <property name="padding">0</property>
+-			  <property name="expand">True</property>
+-			  <property name="fill">True</property>
+-			</packing>
+-		      </child>
+-
+-		      <child>
+-			<widget class="GtkAlignment" id="alignment1">
+-			  <property name="visible">True</property>
+-			  <property name="xalign">0</property>
+-			  <property name="yalign">0.5</property>
+-			  <property name="xscale">0</property>
+-			  <property name="yscale">1</property>
+-			  <property name="top_padding">0</property>
+-			  <property name="bottom_padding">0</property>
+-			  <property name="left_padding">0</property>
+-			  <property name="right_padding">0</property>
+-
+-			  <child>
+-			    <widget class="GtkHBox" id="hbox3">
+-			      <property name="visible">True</property>
+-			      <property name="homogeneous">False</property>
+-			      <property name="spacing">6</property>
+-
+-			      <child>
+-				<widget class="GtkRadioButton" id="slab-page-selector-button-applications">
+-				  <property name="visible">True</property>
+-				  <property name="can_focus">True</property>
+-				  <property name="relief">GTK_RELIEF_NORMAL</property>
+-				  <property name="focus_on_click">False</property>
+-				  <property name="active">False</property>
+-				  <property name="inconsistent">False</property>
+-				  <property name="draw_indicator">False</property>
+-
+-				  <child>
+-				    <widget class="GtkLabel" id="label94">
+-				      <property name="visible">True</property>
+-				      <property name="label" translatable="yes">Applications</property>
+-				      <property name="use_underline">False</property>
+-				      <property name="use_markup">False</property>
+-				      <property name="justify">GTK_JUSTIFY_CENTER</property>
+-				      <property name="wrap">False</property>
+-				      <property name="selectable">False</property>
+-				      <property name="xalign">0.5</property>
+-				      <property name="yalign">0.5</property>
+-				      <property name="xpad">12</property>
+-				      <property name="ypad">0</property>
+-				      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+-				      <property name="width_chars">-1</property>
+-				      <property name="single_line_mode">False</property>
+-				      <property name="angle">0</property>
+-				    </widget>
+-				  </child>
+-				</widget>
+-				<packing>
+-				  <property name="padding">0</property>
+-				  <property name="expand">False</property>
+-				  <property name="fill">False</property>
+-				</packing>
+-			      </child>
+-
+-			      <child>
+-				<widget class="GtkRadioButton" id="slab-page-selector-button-documents">
+-				  <property name="visible">True</property>
+-				  <property name="can_focus">True</property>
+-				  <property name="relief">GTK_RELIEF_NORMAL</property>
+-				  <property name="focus_on_click">False</property>
+-				  <property name="active">False</property>
+-				  <property name="inconsistent">False</property>
+-				  <property name="draw_indicator">False</property>
+-				  <property name="group">slab-page-selector-button-applications</property>
+-
+-				  <child>
+-				    <widget class="GtkLabel" id="label95">
+-				      <property name="visible">True</property>
+-				      <property name="label" translatable="yes">Documents</property>
+-				      <property name="use_underline">False</property>
+-				      <property name="use_markup">False</property>
+-				      <property name="justify">GTK_JUSTIFY_CENTER</property>
+-				      <property name="wrap">False</property>
+-				      <property name="selectable">False</property>
+-				      <property name="xalign">0.5</property>
+-				      <property name="yalign">0.5</property>
+-				      <property name="xpad">12</property>
+-				      <property name="ypad">0</property>
+-				      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+-				      <property name="width_chars">-1</property>
+-				      <property name="single_line_mode">False</property>
+-				      <property name="angle">0</property>
+-				    </widget>
+-				  </child>
+-				</widget>
+-				<packing>
+-				  <property name="padding">0</property>
+-				  <property name="expand">False</property>
+-				  <property name="fill">False</property>
+-				</packing>
+-			      </child>
+-
+-			      <child>
+-				<widget class="GtkRadioButton" id="slab-page-selector-button-places">
+-				  <property name="visible">True</property>
+-				  <property name="can_focus">True</property>
+-				  <property name="relief">GTK_RELIEF_NORMAL</property>
+-				  <property name="focus_on_click">False</property>
+-				  <property name="active">False</property>
+-				  <property name="inconsistent">False</property>
+-				  <property name="draw_indicator">False</property>
+-				  <property name="group">slab-page-selector-button-applications</property>
+-
+-				  <child>
+-				    <widget class="GtkLabel" id="label96">
+-				      <property name="visible">True</property>
+-				      <property name="label" translatable="yes">Places</property>
+-				      <property name="use_underline">False</property>
+-				      <property name="use_markup">False</property>
+-				      <property name="justify">GTK_JUSTIFY_CENTER</property>
+-				      <property name="wrap">False</property>
+-				      <property name="selectable">False</property>
+-				      <property name="xalign">0.5</property>
+-				      <property name="yalign">0.5</property>
+-				      <property name="xpad">12</property>
+-				      <property name="ypad">0</property>
+-				      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+-				      <property name="width_chars">-1</property>
+-				      <property name="single_line_mode">False</property>
+-				      <property name="angle">0</property>
+-				    </widget>
+-				  </child>
+-				</widget>
+-				<packing>
+-				  <property name="padding">0</property>
+-				  <property name="expand">False</property>
+-				  <property name="fill">False</property>
+-				</packing>
+-			      </child>
+-			    </widget>
+-			  </child>
+-			</widget>
+-			<packing>
+-			  <property name="padding">0</property>
+-			  <property name="expand">True</property>
+-			  <property name="fill">True</property>
+-			</packing>
+-		      </child>
+-		    </widget>
+-		  </child>
+-		</widget>
+-		<packing>
+-		  <property name="padding">0</property>
+-		  <property name="expand">True</property>
+-		  <property name="fill">True</property>
+-		</packing>
+-	      </child>
+-
+-	      <child>
+-		<widget class="GtkNotebook" id="file-area-notebook">
+-		  <property name="border_width">3</property>
+-		  <property name="visible">True</property>
+-		  <property name="show_tabs">False</property>
+-		  <property name="show_border">False</property>
+-		  <property name="tab_pos">GTK_POS_TOP</property>
+-		  <property name="scrollable">False</property>
+-		  <property name="enable_popup">False</property>
+-
+-		  <child>
+-		    <widget class="GtkAlignment" id="applications-page">
+-		      <property name="visible">True</property>
+-		      <property name="xalign">0.5</property>
+-		      <property name="yalign">0.5</property>
+-		      <property name="xscale">1</property>
+-		      <property name="yscale">1</property>
+-		      <property name="top_padding">6</property>
+-		      <property name="bottom_padding">0</property>
+-		      <property name="left_padding">12</property>
+-		      <property name="right_padding">12</property>
+-
+-		      <child>
+-			<widget class="GtkVBox" id="vbox3">
+-			  <property name="visible">True</property>
+-			  <property name="homogeneous">False</property>
+-			  <property name="spacing">12</property>
+-
+-			  <child>
+-			    <widget class="GtkVBox" id="user-apps-section">
+-			      <property name="visible">True</property>
+-			      <property name="homogeneous">False</property>
+-			      <property name="spacing">12</property>
+-
+-			      <child>
+-				<widget class="GtkLabel" id="slab-favorite-applications">
+-				  <property name="visible">True</property>
+-				  <property name="label" translatable="yes">Favorite Applications</property>
+-				  <property name="use_underline">False</property>
+-				  <property name="use_markup">False</property>
+-				  <property name="justify">GTK_JUSTIFY_LEFT</property>
+-				  <property name="wrap">False</property>
+-				  <property name="selectable">False</property>
+-				  <property name="xalign">0</property>
+-				  <property name="yalign">0.5</property>
+-				  <property name="xpad">0</property>
+-				  <property name="ypad">0</property>
+-				  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+-				  <property name="width_chars">-1</property>
+-				  <property name="single_line_mode">False</property>
+-				  <property name="angle">0</property>
+-				</widget>
+-				<packing>
+-				  <property name="padding">0</property>
+-				  <property name="expand">False</property>
+-				  <property name="fill">False</property>
+-				</packing>
+-			      </child>
+-
+-			      <child>
+-				<widget class="GtkAlignment" id="user-apps-table-container">
+-				  <property name="visible">True</property>
+-				  <property name="xalign">0.5</property>
+-				  <property name="yalign">0.5</property>
+-				  <property name="xscale">1</property>
+-				  <property name="yscale">1</property>
+-				  <property name="top_padding">0</property>
+-				  <property name="bottom_padding">0</property>
+-				  <property name="left_padding">12</property>
+-				  <property name="right_padding">0</property>
+-
+-				  <child>
+-				    <placeholder/>
+-				  </child>
+-				</widget>
+-				<packing>
+-				  <property name="padding">0</property>
+-				  <property name="expand">True</property>
+-				  <property name="fill">True</property>
+-				</packing>
+-			      </child>
+-			    </widget>
+-			    <packing>
+-			      <property name="padding">0</property>
+-			      <property name="expand">False</property>
+-			      <property name="fill">False</property>
+-			    </packing>
+-			  </child>
+-
+-			  <child>
+-			    <widget class="GtkVBox" id="recent-apps-section">
+-			      <property name="visible">True</property>
+-			      <property name="homogeneous">False</property>
+-			      <property name="spacing">12</property>
+-
+-			      <child>
+-				<widget class="GtkLabel" id="slab-recent-applications">
+-				  <property name="visible">True</property>
+-				  <property name="label" translatable="yes">Recent Applications</property>
+-				  <property name="use_underline">False</property>
+-				  <property name="use_markup">False</property>
+-				  <property name="justify">GTK_JUSTIFY_LEFT</property>
+-				  <property name="wrap">False</property>
+-				  <property name="selectable">False</property>
+-				  <property name="xalign">0</property>
+-				  <property name="yalign">0.5</property>
+-				  <property name="xpad">0</property>
+-				  <property name="ypad">0</property>
+-				  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+-				  <property name="width_chars">-1</property>
+-				  <property name="single_line_mode">False</property>
+-				  <property name="angle">0</property>
+-				</widget>
+-				<packing>
+-				  <property name="padding">0</property>
+-				  <property name="expand">False</property>
+-				  <property name="fill">False</property>
+-				</packing>
+-			      </child>
+-
+-			      <child>
+-				<widget class="GtkAlignment" id="recent-apps-table-container">
+-				  <property name="visible">True</property>
+-				  <property name="xalign">0.5</property>
+-				  <property name="yalign">0.5</property>
+-				  <property name="xscale">1</property>
+-				  <property name="yscale">1</property>
+-				  <property name="top_padding">0</property>
+-				  <property name="bottom_padding">0</property>
+-				  <property name="left_padding">12</property>
+-				  <property name="right_padding">0</property>
+-
+-				  <child>
+-				    <placeholder/>
+-				  </child>
+-				</widget>
+-				<packing>
+-				  <property name="padding">0</property>
+-				  <property name="expand">True</property>
+-				  <property name="fill">True</property>
+-				</packing>
+-			      </child>
+-			    </widget>
+-			    <packing>
+-			      <property name="padding">0</property>
+-			      <property name="expand">False</property>
+-			      <property name="fill">False</property>
+-			    </packing>
+-			  </child>
+-
+-			  <child>
+-			    <widget class="GtkAlignment" id="more-apps-section">
+-			      <property name="visible">True</property>
+-			      <property name="xalign">1</property>
+-			      <property name="yalign">0.5</property>
+-			      <property name="xscale">0</property>
+-			      <property name="yscale">0</property>
+-			      <property name="top_padding">0</property>
+-			      <property name="bottom_padding">18</property>
+-			      <property name="left_padding">0</property>
+-			      <property name="right_padding">0</property>
+-
+-			      <child>
+-				<widget class="GtkButton" id="more-applications-button">
+-				  <property name="visible">True</property>
+-				  <property name="can_focus">True</property>
+-				  <property name="label" translatable="yes">More Applications...</property>
+-				  <property name="use_underline">True</property>
+-				  <property name="relief">GTK_RELIEF_NORMAL</property>
+-				  <property name="focus_on_click">False</property>
+-				</widget>
+-			      </child>
+-			    </widget>
+-			    <packing>
+-			      <property name="padding">0</property>
+-			      <property name="expand">False</property>
+-			      <property name="fill">False</property>
+-			      <property name="pack_type">GTK_PACK_END</property>
+-			    </packing>
+-			  </child>
+-			</widget>
+-		      </child>
+-		    </widget>
+-		    <packing>
+-		      <property name="tab_expand">False</property>
+-		      <property name="tab_fill">True</property>
+-		    </packing>
+-		  </child>
+-
+-		  <child>
+-		    <widget class="GtkLabel" id="label2">
+-		      <property name="visible">True</property>
+-		      <property name="label" translatable="yes">label2</property>
+-		      <property name="use_underline">False</property>
+-		      <property name="use_markup">False</property>
+-		      <property name="justify">GTK_JUSTIFY_LEFT</property>
+-		      <property name="wrap">False</property>
+-		      <property name="selectable">False</property>
+-		      <property name="xalign">0.5</property>
+-		      <property name="yalign">0.5</property>
+-		      <property name="xpad">0</property>
+-		      <property name="ypad">0</property>
+-		      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+-		      <property name="width_chars">-1</property>
+-		      <property name="single_line_mode">False</property>
+-		      <property name="angle">0</property>
+-		    </widget>
+-		    <packing>
+-		      <property name="type">tab</property>
+-		    </packing>
+-		  </child>
+-
+-		  <child>
+-		    <widget class="GtkAlignment" id="documents-page">
+-		      <property name="visible">True</property>
+-		      <property name="xalign">0.5</property>
+-		      <property name="yalign">0.5</property>
+-		      <property name="xscale">1</property>
+-		      <property name="yscale">1</property>
+-		      <property name="top_padding">6</property>
+-		      <property name="bottom_padding">0</property>
+-		      <property name="left_padding">12</property>
+-		      <property name="right_padding">12</property>
+-
+-		      <child>
+-			<widget class="GtkVBox" id="vbox44">
+-			  <property name="visible">True</property>
+-			  <property name="homogeneous">False</property>
+-			  <property name="spacing">12</property>
+-
+-			  <child>
+-			    <widget class="GtkVBox" id="user-docs-section">
+-			      <property name="visible">True</property>
+-			      <property name="homogeneous">False</property>
+-			      <property name="spacing">12</property>
+-
+-			      <child>
+-				<widget class="GtkLabel" id="slab-favorite-documents">
+-				  <property name="visible">True</property>
+-				  <property name="label" translatable="yes">Favorite Documents</property>
+-				  <property name="use_underline">False</property>
+-				  <property name="use_markup">False</property>
+-				  <property name="justify">GTK_JUSTIFY_LEFT</property>
+-				  <property name="wrap">False</property>
+-				  <property name="selectable">False</property>
+-				  <property name="xalign">0</property>
+-				  <property name="yalign">0.5</property>
+-				  <property name="xpad">0</property>
+-				  <property name="ypad">0</property>
+-				  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+-				  <property name="width_chars">-1</property>
+-				  <property name="single_line_mode">False</property>
+-				  <property name="angle">0</property>
+-				</widget>
+-				<packing>
+-				  <property name="padding">0</property>
+-				  <property name="expand">False</property>
+-				  <property name="fill">False</property>
+-				</packing>
+-			      </child>
+-
+-			      <child>
+-				<widget class="GtkAlignment" id="user-docs-table-container">
+-				  <property name="visible">True</property>
+-				  <property name="xalign">0.5</property>
+-				  <property name="yalign">0.5</property>
+-				  <property name="xscale">1</property>
+-				  <property name="yscale">1</property>
+-				  <property name="top_padding">0</property>
+-				  <property name="bottom_padding">0</property>
+-				  <property name="left_padding">12</property>
+-				  <property name="right_padding">0</property>
+-
+-				  <child>
+-				    <placeholder/>
+-				  </child>
+-				</widget>
+-				<packing>
+-				  <property name="padding">0</property>
+-				  <property name="expand">True</property>
+-				  <property name="fill">True</property>
+-				</packing>
+-			      </child>
+-			    </widget>
+-			    <packing>
+-			      <property name="padding">0</property>
+-			      <property name="expand">False</property>
+-			      <property name="fill">False</property>
+-			    </packing>
+-			  </child>
+-
+-			  <child>
+-			    <widget class="GtkVBox" id="recent-docs-section">
+-			      <property name="visible">True</property>
+-			      <property name="homogeneous">False</property>
+-			      <property name="spacing">12</property>
+-
+-			      <child>
+-				<widget class="GtkLabel" id="slab-recent-documents">
+-				  <property name="visible">True</property>
+-				  <property name="label" translatable="yes">Recent Documents</property>
+-				  <property name="use_underline">False</property>
+-				  <property name="use_markup">False</property>
+-				  <property name="justify">GTK_JUSTIFY_LEFT</property>
+-				  <property name="wrap">False</property>
+-				  <property name="selectable">False</property>
+-				  <property name="xalign">0</property>
+-				  <property name="yalign">0.5</property>
+-				  <property name="xpad">0</property>
+-				  <property name="ypad">0</property>
+-				  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+-				  <property name="width_chars">-1</property>
+-				  <property name="single_line_mode">False</property>
+-				  <property name="angle">0</property>
+-				</widget>
+-				<packing>
+-				  <property name="padding">0</property>
+-				  <property name="expand">False</property>
+-				  <property name="fill">False</property>
+-				</packing>
+-			      </child>
+-
+-			      <child>
+-				<widget class="GtkAlignment" id="recent-docs-table-container">
+-				  <property name="visible">True</property>
+-				  <property name="xalign">0.5</property>
+-				  <property name="yalign">0.5</property>
+-				  <property name="xscale">1</property>
+-				  <property name="yscale">1</property>
+-				  <property name="top_padding">0</property>
+-				  <property name="bottom_padding">0</property>
+-				  <property name="left_padding">12</property>
+-				  <property name="right_padding">0</property>
+-
+-				  <child>
+-				    <placeholder/>
+-				  </child>
+-				</widget>
+-				<packing>
+-				  <property name="padding">0</property>
+-				  <property name="expand">True</property>
+-				  <property name="fill">True</property>
+-				</packing>
+-			      </child>
+-			    </widget>
+-			    <packing>
+-			      <property name="padding">0</property>
+-			      <property name="expand">False</property>
+-			      <property name="fill">False</property>
+-			    </packing>
+-			  </child>
+-
+-			  <child>
+-			    <widget class="GtkAlignment" id="more-docs-section">
+-			      <property name="visible">True</property>
+-			      <property name="xalign">1</property>
+-			      <property name="yalign">0.5</property>
+-			      <property name="xscale">0</property>
+-			      <property name="yscale">0</property>
+-			      <property name="top_padding">0</property>
+-			      <property name="bottom_padding">18</property>
+-			      <property name="left_padding">0</property>
+-			      <property name="right_padding">0</property>
+-
+-			      <child>
+-				<widget class="GtkButton" id="more-documents-button">
+-				  <property name="visible">True</property>
+-				  <property name="can_focus">True</property>
+-				  <property name="label" translatable="yes">More Documents...</property>
+-				  <property name="use_underline">True</property>
+-				  <property name="relief">GTK_RELIEF_NORMAL</property>
+-				  <property name="focus_on_click">False</property>
+-				</widget>
+-			      </child>
+-			    </widget>
+-			    <packing>
+-			      <property name="padding">0</property>
+-			      <property name="expand">False</property>
+-			      <property name="fill">False</property>
+-			      <property name="pack_type">GTK_PACK_END</property>
+-			    </packing>
+-			  </child>
+-			</widget>
+-		      </child>
+-		    </widget>
+-		    <packing>
+-		      <property name="tab_expand">False</property>
+-		      <property name="tab_fill">True</property>
+-		    </packing>
+-		  </child>
+-
+-		  <child>
+-		    <widget class="GtkLabel" id="label3">
+-		      <property name="visible">True</property>
+-		      <property name="label" translatable="yes">label3</property>
+-		      <property name="use_underline">False</property>
+-		      <property name="use_markup">False</property>
+-		      <property name="justify">GTK_JUSTIFY_LEFT</property>
+-		      <property name="wrap">False</property>
+-		      <property name="selectable">False</property>
+-		      <property name="xalign">0.5</property>
+-		      <property name="yalign">0.5</property>
+-		      <property name="xpad">0</property>
+-		      <property name="ypad">0</property>
+-		      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+-		      <property name="width_chars">-1</property>
+-		      <property name="single_line_mode">False</property>
+-		      <property name="angle">0</property>
+-		    </widget>
+-		    <packing>
+-		      <property name="type">tab</property>
+-		    </packing>
+-		  </child>
+-
+-		  <child>
+-		    <widget class="GtkAlignment" id="places-page">
+-		      <property name="visible">True</property>
+-		      <property name="xalign">0.5</property>
+-		      <property name="yalign">0.5</property>
+-		      <property name="xscale">1</property>
+-		      <property name="yscale">1</property>
+-		      <property name="top_padding">6</property>
+-		      <property name="bottom_padding">0</property>
+-		      <property name="left_padding">12</property>
+-		      <property name="right_padding">12</property>
+-
+-		      <child>
+-			<widget class="GtkVBox" id="vbox45">
+-			  <property name="visible">True</property>
+-			  <property name="homogeneous">False</property>
+-			  <property name="spacing">12</property>
+-
+-			  <child>
+-			    <widget class="GtkVBox" id="user-dirs-section">
+-			      <property name="visible">True</property>
+-			      <property name="homogeneous">False</property>
+-			      <property name="spacing">12</property>
+-
+-			      <child>
+-				<widget class="GtkLabel" id="slab-favorite-places">
+-				  <property name="visible">True</property>
+-				  <property name="label" translatable="yes">Favorite Places</property>
+-				  <property name="use_underline">False</property>
+-				  <property name="use_markup">False</property>
+-				  <property name="justify">GTK_JUSTIFY_LEFT</property>
+-				  <property name="wrap">False</property>
+-				  <property name="selectable">False</property>
+-				  <property name="xalign">0</property>
+-				  <property name="yalign">0.5</property>
+-				  <property name="xpad">0</property>
+-				  <property name="ypad">0</property>
+-				  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+-				  <property name="width_chars">-1</property>
+-				  <property name="single_line_mode">False</property>
+-				  <property name="angle">0</property>
+-				</widget>
+-				<packing>
+-				  <property name="padding">0</property>
+-				  <property name="expand">False</property>
+-				  <property name="fill">False</property>
+-				</packing>
+-			      </child>
+-
+-			      <child>
+-				<widget class="GtkAlignment" id="user-dirs-table-container">
+-				  <property name="visible">True</property>
+-				  <property name="xalign">0.5</property>
+-				  <property name="yalign">0.5</property>
+-				  <property name="xscale">1</property>
+-				  <property name="yscale">1</property>
+-				  <property name="top_padding">0</property>
+-				  <property name="bottom_padding">0</property>
+-				  <property name="left_padding">12</property>
+-				  <property name="right_padding">0</property>
+-
+-				  <child>
+-				    <placeholder/>
+-				  </child>
+-				</widget>
+-				<packing>
+-				  <property name="padding">0</property>
+-				  <property name="expand">True</property>
+-				  <property name="fill">True</property>
+-				</packing>
+-			      </child>
+-			    </widget>
+-			    <packing>
+-			      <property name="padding">0</property>
+-			      <property name="expand">False</property>
+-			      <property name="fill">False</property>
+-			    </packing>
+-			  </child>
+-
+-			  <child>
+-			    <widget class="GtkAlignment" id="more-dirs-section">
+-			      <property name="visible">True</property>
+-			      <property name="xalign">1</property>
+-			      <property name="yalign">0.5</property>
+-			      <property name="xscale">0</property>
+-			      <property name="yscale">0</property>
+-			      <property name="top_padding">0</property>
+-			      <property name="bottom_padding">18</property>
+-			      <property name="left_padding">0</property>
+-			      <property name="right_padding">0</property>
+-
+-			      <child>
+-				<widget class="GtkButton" id="more-places-button">
+-				  <property name="visible">True</property>
+-				  <property name="can_focus">True</property>
+-				  <property name="label" translatable="yes">More Places...</property>
+-				  <property name="use_underline">True</property>
+-				  <property name="relief">GTK_RELIEF_NORMAL</property>
+-				  <property name="focus_on_click">False</property>
+-				</widget>
+-			      </child>
+-			    </widget>
+-			    <packing>
+-			      <property name="padding">0</property>
+-			      <property name="expand">False</property>
+-			      <property name="fill">False</property>
+-			      <property name="pack_type">GTK_PACK_END</property>
+-			    </packing>
+-			  </child>
+-			</widget>
+-		      </child>
+-		    </widget>
+-		    <packing>
+-		      <property name="tab_expand">False</property>
+-		      <property name="tab_fill">True</property>
+-		    </packing>
+-		  </child>
+-
+-		  <child>
+-		    <widget class="GtkLabel" id="label4">
+-		      <property name="visible">True</property>
+-		      <property name="label" translatable="yes">label4</property>
+-		      <property name="use_underline">False</property>
+-		      <property name="use_markup">False</property>
+-		      <property name="justify">GTK_JUSTIFY_LEFT</property>
+-		      <property name="wrap">False</property>
+-		      <property name="selectable">False</property>
+-		      <property name="xalign">0.5</property>
+-		      <property name="yalign">0.5</property>
+-		      <property name="xpad">0</property>
+-		      <property name="ypad">0</property>
+-		      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+-		      <property name="width_chars">-1</property>
+-		      <property name="single_line_mode">False</property>
+-		      <property name="angle">0</property>
+-		    </widget>
+-		    <packing>
+-		      <property name="type">tab</property>
+-		    </packing>
+-		  </child>
+-		</widget>
+-		<packing>
+-		  <property name="padding">0</property>
+-		  <property name="expand">True</property>
+-		  <property name="fill">True</property>
+-		</packing>
+-	      </child>
+-	    </widget>
+-	  </child>
+-	</widget>
+-	<packing>
+-	  <property name="padding">0</property>
+-	  <property name="expand">True</property>
+-	  <property name="fill">True</property>
+-	</packing>
+-      </child>
+-
+-      <child>
+-	<widget class="GtkAlignment" id="alignment5">
+-	  <property name="visible">True</property>
+-	  <property name="xalign">0.5</property>
+-	  <property name="yalign">0.5</property>
+-	  <property name="xscale">1</property>
+-	  <property name="yscale">1</property>
+-	  <property name="top_padding">15</property>
+-	  <property name="bottom_padding">18</property>
+-	  <property name="left_padding">12</property>
+-	  <property name="right_padding">6</property>
+-
+-	  <child>
+-	    <widget class="GtkVBox" id="vbox30">
+-	      <property name="visible">True</property>
+-	      <property name="homogeneous">False</property>
+-	      <property name="spacing">6</property>
+-
+-	      <child>
+-		<widget class="GtkVBox" id="slab-system-section">
+-		  <property name="visible">True</property>
+-		  <property name="homogeneous">False</property>
+-		  <property name="spacing">6</property>
+-
+-		  <child>
+-		    <widget class="GtkLabel" id="slab-side-system-label">
+-		      <property name="visible">True</property>
+-		      <property name="label" translatable="yes">System</property>
+-		      <property name="use_underline">False</property>
+-		      <property name="use_markup">False</property>
+-		      <property name="justify">GTK_JUSTIFY_LEFT</property>
+-		      <property name="wrap">False</property>
+-		      <property name="selectable">False</property>
+-		      <property name="xalign">0</property>
+-		      <property name="yalign">0.5</property>
+-		      <property name="xpad">0</property>
+-		      <property name="ypad">0</property>
+-		      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+-		      <property name="width_chars">-1</property>
+-		      <property name="single_line_mode">False</property>
+-		      <property name="angle">0</property>
+-		    </widget>
+-		    <packing>
+-		      <property name="padding">0</property>
+-		      <property name="expand">False</property>
+-		      <property name="fill">False</property>
+-		    </packing>
+-		  </child>
+-
+-		  <child>
+-		    <widget class="GtkAlignment" id="system-item-table-container">
+-		      <property name="visible">True</property>
+-		      <property name="xalign">0.5</property>
+-		      <property name="yalign">0.5</property>
+-		      <property name="xscale">1</property>
+-		      <property name="yscale">1</property>
+-		      <property name="top_padding">0</property>
+-		      <property name="bottom_padding">0</property>
+-		      <property name="left_padding">0</property>
+-		      <property name="right_padding">0</property>
+-
+-		      <child>
+-			<placeholder/>
+-		      </child>
+-		    </widget>
+-		    <packing>
+-		      <property name="padding">0</property>
+-		      <property name="expand">True</property>
+-		      <property name="fill">True</property>
+-		    </packing>
+-		  </child>
+-		</widget>
+-		<packing>
+-		  <property name="padding">0</property>
+-		  <property name="expand">False</property>
+-		  <property name="fill">False</property>
+-		</packing>
+-	      </child>
+-
+-	      <child>
+-		<widget class="GtkVBox" id="slab-status-section">
+-		  <property name="visible">True</property>
+-		  <property name="homogeneous">False</property>
+-		  <property name="spacing">6</property>
+-
+-		  <child>
+-		    <widget class="GtkLabel" id="slab-side-status-label">
+-		      <property name="visible">True</property>
+-		      <property name="label" translatable="yes">Status</property>
+-		      <property name="use_underline">False</property>
+-		      <property name="use_markup">False</property>
+-		      <property name="justify">GTK_JUSTIFY_LEFT</property>
+-		      <property name="wrap">False</property>
+-		      <property name="selectable">False</property>
+-		      <property name="xalign">0</property>
+-		      <property name="yalign">0.5</property>
+-		      <property name="xpad">0</property>
+-		      <property name="ypad">0</property>
+-		      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+-		      <property name="width_chars">-1</property>
+-		      <property name="single_line_mode">False</property>
+-		      <property name="angle">0</property>
+-		    </widget>
+-		    <packing>
+-		      <property name="padding">0</property>
+-		      <property name="expand">False</property>
+-		      <property name="fill">False</property>
+-		    </packing>
+-		  </child>
+-
+-		  <child>
+-		    <widget class="GtkVBox" id="vbox52">
+-		      <property name="visible">True</property>
+-		      <property name="homogeneous">False</property>
+-		      <property name="spacing">0</property>
+-
+-		      <child>
+-			<widget class="GtkAlignment" id="hard-drive-status-container">
+-			  <property name="visible">True</property>
+-			  <property name="xalign">0.5</property>
+-			  <property name="yalign">0.5</property>
+-			  <property name="xscale">1</property>
+-			  <property name="yscale">1</property>
+-			  <property name="top_padding">0</property>
+-			  <property name="bottom_padding">0</property>
+-			  <property name="left_padding">0</property>
+-			  <property name="right_padding">0</property>
+-
+-			  <child>
+-			    <placeholder/>
+-			  </child>
+-			</widget>
+-			<packing>
+-			  <property name="padding">0</property>
+-			  <property name="expand">True</property>
+-			  <property name="fill">True</property>
+-			</packing>
+-		      </child>
+-
+-		      <child>
+-			<widget class="GtkAlignment" id="network-status-container">
+-			  <property name="visible">True</property>
+-			  <property name="xalign">0.5</property>
+-			  <property name="yalign">0.5</property>
+-			  <property name="xscale">1</property>
+-			  <property name="yscale">1</property>
+-			  <property name="top_padding">0</property>
+-			  <property name="bottom_padding">0</property>
+-			  <property name="left_padding">0</property>
+-			  <property name="right_padding">0</property>
+-
+-			  <child>
+-			    <placeholder/>
+-			  </child>
+-			</widget>
+-			<packing>
+-			  <property name="padding">0</property>
+-			  <property name="expand">True</property>
+-			  <property name="fill">True</property>
+-			</packing>
+-		      </child>
+-		    </widget>
+-		    <packing>
+-		      <property name="padding">0</property>
+-		      <property name="expand">True</property>
+-		      <property name="fill">True</property>
+-		    </packing>
+-		  </child>
+-		</widget>
+-		<packing>
+-		  <property name="padding">0</property>
+-		  <property name="expand">False</property>
+-		  <property name="fill">False</property>
+-		  <property name="pack_type">GTK_PACK_END</property>
+-		</packing>
+-	      </child>
+-	    </widget>
+-	  </child>
+-	</widget>
+-	<packing>
+-	  <property name="padding">0</property>
+-	  <property name="expand">True</property>
+-	  <property name="fill">True</property>
+-	</packing>
+-      </child>
+-    </widget>
+-  </child>
+-</widget>
+-
+-<widget class="GtkWindow" id="slab-panel-button-root">
+-  <property name="title" translatable="yes">window1</property>
+-  <property name="type">GTK_WINDOW_TOPLEVEL</property>
+-  <property name="window_position">GTK_WIN_POS_NONE</property>
+-  <property name="modal">False</property>
+-  <property name="resizable">True</property>
+-  <property name="destroy_with_parent">False</property>
+-  <property name="decorated">True</property>
+-  <property name="skip_taskbar_hint">False</property>
+-  <property name="skip_pager_hint">False</property>
+-  <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
+-  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+-  <property name="focus_on_map">True</property>
+-  <property name="urgency_hint">False</property>
+-
+-  <child>
+-    <widget class="GtkHBox" id="hbox42">
+-      <property name="visible">True</property>
+-      <property name="homogeneous">False</property>
+-      <property name="spacing">0</property>
+-
+-      <child>
+-	<widget class="GtkAlignment" id="alignment12">
+-	  <property name="visible">True</property>
+-	  <property name="xalign">0.5</property>
+-	  <property name="yalign">0.5</property>
+-	  <property name="xscale">0</property>
+-	  <property name="yscale">0</property>
+-	  <property name="top_padding">0</property>
+-	  <property name="bottom_padding">0</property>
+-	  <property name="left_padding">0</property>
+-	  <property name="right_padding">0</property>
+-
+-	  <child>
+-	    <widget class="GtkToggleButton" id="slab-main-menu-panel-button-top">
+-	      <property name="visible">True</property>
+-	      <property name="can_focus">True</property>
+-	      <property name="relief">GTK_RELIEF_NONE</property>
+-	      <property name="focus_on_click">False</property>
+-	      <property name="active">False</property>
+-	      <property name="inconsistent">False</property>
+-
+-	      <child>
+-		<widget class="GtkHBox" id="panel-button-inner-container">
+-		  <property name="visible">True</property>
+-		  <property name="homogeneous">False</property>
+-		  <property name="spacing">6</property>
+-
+-		  <child>
+-		    <widget class="GtkImage" id="panel-button-icon">
+-		      <property name="visible">True</property>
+-		      <property name="icon_size">1</property>
+-		      <property name="icon_name">gnome-fs-client</property>
+-		      <property name="xalign">0.5</property>
+-		      <property name="yalign">0.5</property>
+-		      <property name="xpad">0</property>
+-		      <property name="ypad">0</property>
+-		    </widget>
+-		    <packing>
+-		      <property name="padding">0</property>
+-		      <property name="expand">False</property>
+-		      <property name="fill">False</property>
+-		    </packing>
+-		  </child>
+-
+-		  <child>
+-		    <widget class="GtkLabel" id="panel-button-label">
+-		      <property name="visible">True</property>
+-		      <property name="label" translatable="yes">Computer</property>
+-		      <property name="use_underline">False</property>
+-		      <property name="use_markup">False</property>
+-		      <property name="justify">GTK_JUSTIFY_LEFT</property>
+-		      <property name="wrap">False</property>
+-		      <property name="selectable">False</property>
+-		      <property name="xalign">0.5</property>
+-		      <property name="yalign">0.5</property>
+-		      <property name="xpad">0</property>
+-		      <property name="ypad">0</property>
+-		      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+-		      <property name="width_chars">-1</property>
+-		      <property name="single_line_mode">False</property>
+-		      <property name="angle">0</property>
+-		    </widget>
+-		    <packing>
+-		      <property name="padding">0</property>
+-		      <property name="expand">False</property>
+-		      <property name="fill">False</property>
+-		    </packing>
+-		  </child>
+-		</widget>
+-	      </child>
+-	    </widget>
+-	  </child>
+-	</widget>
+-	<packing>
+-	  <property name="padding">0</property>
+-	  <property name="expand">False</property>
+-	  <property name="fill">False</property>
+-	</packing>
+-      </child>
+-
+-      <child>
+-	<widget class="GtkAlignment" id="alignment14">
+-	  <property name="visible">True</property>
+-	  <property name="xalign">0.5</property>
+-	  <property name="yalign">0.5</property>
+-	  <property name="xscale">0</property>
+-	  <property name="yscale">0</property>
+-	  <property name="top_padding">0</property>
+-	  <property name="bottom_padding">0</property>
+-	  <property name="left_padding">0</property>
+-	  <property name="right_padding">0</property>
+-
+-	  <child>
+-	    <widget class="GtkToggleButton" id="slab-main-menu-panel-button-left">
+-	      <property name="visible">True</property>
+-	      <property name="can_focus">True</property>
+-	      <property name="relief">GTK_RELIEF_NONE</property>
+-	      <property name="focus_on_click">False</property>
+-	      <property name="active">False</property>
+-	      <property name="inconsistent">False</property>
+-
+-	      <child>
+-		<widget class="GtkVBox" id="vbox42">
+-		  <property name="visible">True</property>
+-		  <property name="homogeneous">False</property>
+-		  <property name="spacing">6</property>
+-
+-		  <child>
+-		    <widget class="GtkLabel" id="label91">
+-		      <property name="visible">True</property>
+-		      <property name="label" translatable="yes">Computer</property>
+-		      <property name="use_underline">False</property>
+-		      <property name="use_markup">False</property>
+-		      <property name="justify">GTK_JUSTIFY_LEFT</property>
+-		      <property name="wrap">False</property>
+-		      <property name="selectable">False</property>
+-		      <property name="xalign">0.5</property>
+-		      <property name="yalign">0.5</property>
+-		      <property name="xpad">0</property>
+-		      <property name="ypad">0</property>
+-		      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+-		      <property name="width_chars">-1</property>
+-		      <property name="single_line_mode">False</property>
+-		      <property name="angle">90</property>
+-		    </widget>
+-		    <packing>
+-		      <property name="padding">0</property>
+-		      <property name="expand">False</property>
+-		      <property name="fill">False</property>
+-		    </packing>
+-		  </child>
+-
+-		  <child>
+-		    <widget class="GtkImage" id="image42">
+-		      <property name="visible">True</property>
+-		      <property name="icon_size">1</property>
+-		      <property name="icon_name">gnome-fs-client</property>
+-		      <property name="xalign">0.5</property>
+-		      <property name="yalign">0.5</property>
+-		      <property name="xpad">0</property>
+-		      <property name="ypad">0</property>
+-		    </widget>
+-		    <packing>
+-		      <property name="padding">0</property>
+-		      <property name="expand">True</property>
+-		      <property name="fill">True</property>
+-		    </packing>
+-		  </child>
+-		</widget>
+-	      </child>
+-	    </widget>
+-	  </child>
+-	</widget>
+-	<packing>
+-	  <property name="padding">0</property>
+-	  <property name="expand">False</property>
+-	  <property name="fill">False</property>
+-	</packing>
+-      </child>
+-
+-      <child>
+-	<widget class="GtkAlignment" id="alignment13">
+-	  <property name="visible">True</property>
+-	  <property name="xalign">0.5</property>
+-	  <property name="yalign">0.5</property>
+-	  <property name="xscale">0</property>
+-	  <property name="yscale">0</property>
+-	  <property name="top_padding">0</property>
+-	  <property name="bottom_padding">0</property>
+-	  <property name="left_padding">0</property>
+-	  <property name="right_padding">0</property>
+-
+-	  <child>
+-	    <widget class="GtkToggleButton" id="slab-main-menu-panel-button-right">
+-	      <property name="visible">True</property>
+-	      <property name="can_focus">True</property>
+-	      <property name="relief">GTK_RELIEF_NONE</property>
+-	      <property name="focus_on_click">False</property>
+-	      <property name="active">False</property>
+-	      <property name="inconsistent">False</property>
+-
+-	      <child>
+-		<widget class="GtkVBox" id="vbox43">
+-		  <property name="visible">True</property>
+-		  <property name="homogeneous">False</property>
+-		  <property name="spacing">6</property>
+-
+-		  <child>
+-		    <widget class="GtkImage" id="image43">
+-		      <property name="visible">True</property>
+-		      <property name="icon_size">1</property>
+-		      <property name="icon_name">gnome-fs-client</property>
+-		      <property name="xalign">0.5</property>
+-		      <property name="yalign">0.5</property>
+-		      <property name="xpad">0</property>
+-		      <property name="ypad">0</property>
+-		    </widget>
+-		    <packing>
+-		      <property name="padding">0</property>
+-		      <property name="expand">True</property>
+-		      <property name="fill">True</property>
+-		    </packing>
+-		  </child>
+-
+-		  <child>
+-		    <widget class="GtkLabel" id="label92">
+-		      <property name="visible">True</property>
+-		      <property name="label" translatable="yes">Computer</property>
+-		      <property name="use_underline">False</property>
+-		      <property name="use_markup">False</property>
+-		      <property name="justify">GTK_JUSTIFY_LEFT</property>
+-		      <property name="wrap">False</property>
+-		      <property name="selectable">False</property>
+-		      <property name="xalign">0.5</property>
+-		      <property name="yalign">0.5</property>
+-		      <property name="xpad">0</property>
+-		      <property name="ypad">0</property>
+-		      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+-		      <property name="width_chars">-1</property>
+-		      <property name="single_line_mode">False</property>
+-		      <property name="angle">270</property>
+-		    </widget>
+-		    <packing>
+-		      <property name="padding">0</property>
+-		      <property name="expand">False</property>
+-		      <property name="fill">False</property>
+-		    </packing>
+-		  </child>
+-		</widget>
+-	      </child>
+-	    </widget>
+-	  </child>
+-	</widget>
+-	<packing>
+-	  <property name="padding">0</property>
+-	  <property name="expand">False</property>
+-	  <property name="fill">False</property>
+-	</packing>
+-      </child>
+-
+-      <child>
+-	<widget class="GtkAlignment" id="alignment25">
+-	  <property name="visible">True</property>
+-	  <property name="xalign">0.5</property>
+-	  <property name="yalign">0.5</property>
+-	  <property name="xscale">0</property>
+-	  <property name="yscale">0</property>
+-	  <property name="top_padding">0</property>
+-	  <property name="bottom_padding">0</property>
+-	  <property name="left_padding">0</property>
+-	  <property name="right_padding">0</property>
+-
+-	  <child>
+-	    <widget class="GtkToggleButton" id="slab-main-menu-panel-button-bottom">
+-	      <property name="visible">True</property>
+-	      <property name="can_focus">True</property>
+-	      <property name="relief">GTK_RELIEF_NONE</property>
+-	      <property name="focus_on_click">False</property>
+-	      <property name="active">False</property>
+-	      <property name="inconsistent">False</property>
+-
+-	      <child>
+-		<widget class="GtkHBox" id="hbox43">
+-		  <property name="visible">True</property>
+-		  <property name="homogeneous">False</property>
+-		  <property name="spacing">6</property>
+-
+-		  <child>
+-		    <widget class="GtkImage" id="image44">
+-		      <property name="visible">True</property>
+-		      <property name="icon_size">1</property>
+-		      <property name="icon_name">gnome-fs-client</property>
+-		      <property name="xalign">0.5</property>
+-		      <property name="yalign">0.5</property>
+-		      <property name="xpad">0</property>
+-		      <property name="ypad">0</property>
+-		    </widget>
+-		    <packing>
+-		      <property name="padding">0</property>
+-		      <property name="expand">False</property>
+-		      <property name="fill">False</property>
+-		    </packing>
+-		  </child>
+-
+-		  <child>
+-		    <widget class="GtkLabel" id="label93">
+-		      <property name="visible">True</property>
+-		      <property name="label" translatable="yes">Computer</property>
+-		      <property name="use_underline">False</property>
+-		      <property name="use_markup">False</property>
+-		      <property name="justify">GTK_JUSTIFY_LEFT</property>
+-		      <property name="wrap">False</property>
+-		      <property name="selectable">False</property>
+-		      <property name="xalign">0.5</property>
+-		      <property name="yalign">0.5</property>
+-		      <property name="xpad">0</property>
+-		      <property name="ypad">0</property>
+-		      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+-		      <property name="width_chars">-1</property>
+-		      <property name="single_line_mode">False</property>
+-		      <property name="angle">0</property>
+-		    </widget>
+-		    <packing>
+-		      <property name="padding">0</property>
+-		      <property name="expand">False</property>
+-		      <property name="fill">False</property>
+-		    </packing>
+-		  </child>
+-		</widget>
+-	      </child>
+-	    </widget>
+-	  </child>
+-	</widget>
+-	<packing>
+-	  <property name="padding">0</property>
+-	  <property name="expand">True</property>
+-	  <property name="fill">True</property>
+-	</packing>
+-      </child>
+-    </widget>
+-  </child>
+-</widget>
+-
+-</glade-interface>
+diff --git a/main-menu/src/slab-window.ui b/main-menu/src/slab-window.ui
+new file mode 100644
+index 0000000..74b8067
+--- /dev/null
++++ b/main-menu/src/slab-window.ui
+@@ -0,0 +1,635 @@
++<?xml version="1.0"?>
++<interface>
++  <requires lib="gtk+" version="2.16"/>
++  <!-- interface-naming-policy toplevel-contextual -->
++  <object class="GtkWindow" id="slab-main-menu-window">
++    <property name="border_width">3</property>
++    <property name="type">popup</property>
++    <property name="title" translatable="yes">GNOME Main Menu</property>
++    <property name="resizable">False</property>
++    <property name="destroy_with_parent">True</property>
++    <property name="icon_name">gnome-fs-client</property>
++    <property name="type_hint">menu</property>
++    <property name="skip_taskbar_hint">True</property>
++    <property name="decorated">False</property>
++    <signal name="expose_event" handler="slab_window_expose_cb"/>
++    <child>
++      <object class="GtkHBox" id="hbox1">
++        <property name="visible">True</property>
++        <child>
++          <object class="GtkAlignment" id="left-pane">
++            <property name="visible">True</property>
++            <child>
++              <object class="GtkVBox" id="vbox_0">
++                <property name="visible">True</property>
++                <property name="orientation">vertical</property>
++                <child>
++                  <object class="GtkAlignment" id="top-pane">
++                    <property name="visible">True</property>
++                    <property name="right_padding">6</property>
++                    <child>
++                      <object class="GtkVBox" id="vbox_1">
++                        <property name="visible">True</property>
++                        <property name="border_width">6</property>
++                        <property name="orientation">vertical</property>
++                        <property name="spacing">12</property>
++                        <child>
++                          <object class="GtkHBox" id="search-section">
++                            <property name="visible">True</property>
++                            <property name="spacing">6</property>
++                            <child>
++                              <object class="GtkImage" id="image1">
++                                <property name="visible">True</property>
++                                <property name="icon_name">system-search</property>
++                                <property name="icon-size">5</property>
++                              </object>
++                              <packing>
++                                <property name="expand">False</property>
++                                <property name="fill">False</property>
++                                <property name="position">0</property>
++                              </packing>
++                            </child>
++                            <child>
++                              <object class="GtkLabel" id="label1">
++                                <property name="visible">True</property>
++                                <property name="label" translatable="yes">Search:</property>
++                              </object>
++                              <packing>
++                                <property name="expand">False</property>
++                                <property name="fill">False</property>
++                                <property name="position">1</property>
++                              </packing>
++                            </child>
++                            <child>
++                              <object class="GtkEntry" id="search-entry">
++                                <property name="visible">True</property>
++                                <property name="can_focus">True</property>
++                                <property name="invisible_char">&#x25CF;</property>
++                              </object>
++                              <packing>
++                                <property name="position">2</property>
++                              </packing>
++                            </child>
++                          </object>
++                          <packing>
++                            <property name="position">0</property>
++                          </packing>
++                        </child>
++                        <child>
++                          <object class="GtkAlignment" id="alignment1">
++                            <property name="visible">True</property>
++                            <property name="xalign">0</property>
++                            <property name="xscale">0</property>
++                            <child>
++                              <object class="GtkHBox" id="hbox3">
++                                <property name="visible">True</property>
++                                <property name="spacing">6</property>
++                                <child>
++                                  <object class="GtkRadioButton" id="slab-page-selector-button-applications">
++                                    <property name="visible">True</property>
++                                    <property name="can_focus">True</property>
++                                    <property name="receives_default">False</property>
++                                    <property name="focus_on_click">False</property>
++                                    <property name="draw_indicator">False</property>
++                                    <child>
++                                      <object class="GtkLabel" id="label94">
++                                        <property name="visible">True</property>
++                                        <property name="xpad">12</property>
++                                        <property name="label" translatable="yes">Applications</property>
++                                        <property name="justify">center</property>
++                                      </object>
++                                    </child>
++                                  </object>
++                                  <packing>
++                                    <property name="expand">False</property>
++                                    <property name="fill">False</property>
++                                    <property name="position">0</property>
++                                  </packing>
++                                </child>
++                                <child>
++                                  <object class="GtkRadioButton" id="slab-page-selector-button-documents">
++                                    <property name="visible">True</property>
++                                    <property name="can_focus">True</property>
++                                    <property name="receives_default">False</property>
++                                    <property name="focus_on_click">False</property>
++                                    <property name="draw_indicator">False</property>
++                                    <property name="group">slab-page-selector-button-applications</property>
++                                    <child>
++                                      <object class="GtkLabel" id="label95">
++                                        <property name="visible">True</property>
++                                        <property name="xpad">12</property>
++                                        <property name="label" translatable="yes">Documents</property>
++                                        <property name="justify">center</property>
++                                      </object>
++                                    </child>
++                                  </object>
++                                  <packing>
++                                    <property name="expand">False</property>
++                                    <property name="fill">False</property>
++                                    <property name="position">1</property>
++                                  </packing>
++                                </child>
++                                <child>
++                                  <object class="GtkRadioButton" id="slab-page-selector-button-places">
++                                    <property name="visible">True</property>
++                                    <property name="can_focus">True</property>
++                                    <property name="receives_default">False</property>
++                                    <property name="focus_on_click">False</property>
++                                    <property name="draw_indicator">False</property>
++                                    <property name="group">slab-page-selector-button-applications</property>
++                                    <child>
++                                      <object class="GtkLabel" id="label96">
++                                        <property name="visible">True</property>
++                                        <property name="xpad">12</property>
++                                        <property name="label" translatable="yes">Places</property>
++                                        <property name="justify">center</property>
++                                      </object>
++                                    </child>
++                                  </object>
++                                  <packing>
++                                    <property name="expand">False</property>
++                                    <property name="fill">False</property>
++                                    <property name="position">2</property>
++                                  </packing>
++                                </child>
++                              </object>
++                            </child>
++                          </object>
++                          <packing>
++                            <property name="position">1</property>
++                          </packing>
++                        </child>
++                      </object>
++                    </child>
++                  </object>
++                  <packing>
++                    <property name="position">0</property>
++                  </packing>
++                </child>
++                <child>
++                  <object class="GtkNotebook" id="file-area-notebook">
++                    <property name="visible">True</property>
++                    <property name="border_width">3</property>
++                    <property name="show_tabs">False</property>
++                    <property name="show_border">False</property>
++                    <child>
++                      <object class="GtkAlignment" id="applications-page">
++                        <property name="visible">True</property>
++                        <property name="top_padding">6</property>
++                        <property name="left_padding">12</property>
++                        <property name="right_padding">12</property>
++                        <child>
++                          <object class="GtkVBox" id="vbox3">
++                            <property name="visible">True</property>
++                            <property name="orientation">vertical</property>
++                            <property name="spacing">12</property>
++                            <child>
++                              <object class="GtkVBox" id="user-apps-section">
++                                <property name="visible">True</property>
++                                <property name="orientation">vertical</property>
++                                <property name="spacing">12</property>
++                                <child>
++                                  <object class="GtkLabel" id="slab-favorite-applications">
++                                    <property name="visible">True</property>
++                                    <property name="xalign">0</property>
++                                    <property name="label" translatable="yes">Favorite Applications</property>
++                                  </object>
++                                  <packing>
++                                    <property name="expand">False</property>
++                                    <property name="fill">False</property>
++                                    <property name="position">0</property>
++                                  </packing>
++                                </child>
++                                <child>
++                                  <object class="GtkAlignment" id="user-apps-table-container">
++                                    <property name="visible">True</property>
++                                    <property name="left_padding">12</property>
++                                    <child>
++                                      <placeholder/>
++                                    </child>
++                                  </object>
++                                  <packing>
++                                    <property name="position">1</property>
++                                  </packing>
++                                </child>
++                              </object>
++                              <packing>
++                                <property name="expand">False</property>
++                                <property name="fill">False</property>
++                                <property name="position">0</property>
++                              </packing>
++                            </child>
++                            <child>
++                              <object class="GtkVBox" id="recent-apps-section">
++                                <property name="visible">True</property>
++                                <property name="orientation">vertical</property>
++                                <property name="spacing">12</property>
++                                <child>
++                                  <object class="GtkLabel" id="slab-recent-applications">
++                                    <property name="visible">True</property>
++                                    <property name="xalign">0</property>
++                                    <property name="label" translatable="yes">Recent Applications</property>
++                                  </object>
++                                  <packing>
++                                    <property name="expand">False</property>
++                                    <property name="fill">False</property>
++                                    <property name="position">0</property>
++                                  </packing>
++                                </child>
++                                <child>
++                                  <object class="GtkAlignment" id="recent-apps-table-container">
++                                    <property name="visible">True</property>
++                                    <property name="left_padding">12</property>
++                                    <child>
++                                      <placeholder/>
++                                    </child>
++                                  </object>
++                                  <packing>
++                                    <property name="position">1</property>
++                                  </packing>
++                                </child>
++                              </object>
++                              <packing>
++                                <property name="expand">False</property>
++                                <property name="fill">False</property>
++                                <property name="position">1</property>
++                              </packing>
++                            </child>
++                            <child>
++                              <object class="GtkAlignment" id="more-apps-section">
++                                <property name="visible">True</property>
++                                <property name="xalign">1</property>
++                                <property name="xscale">0</property>
++                                <property name="yscale">0</property>
++                                <property name="bottom_padding">18</property>
++                                <child>
++                                  <object class="GtkButton" id="more-applications-button">
++                                    <property name="label" translatable="yes">More Applications...</property>
++                                    <property name="visible">True</property>
++                                    <property name="can_focus">True</property>
++                                    <property name="receives_default">False</property>
++                                    <property name="use_underline">True</property>
++                                    <property name="focus_on_click">False</property>
++                                  </object>
++                                </child>
++                              </object>
++                              <packing>
++                                <property name="expand">False</property>
++                                <property name="fill">False</property>
++                                <property name="pack_type">end</property>
++                                <property name="position">2</property>
++                              </packing>
++                            </child>
++                          </object>
++                        </child>
++                      </object>
++                    </child>
++                    <child type="tab">
++                      <object class="GtkLabel" id="label2">
++                        <property name="visible">True</property>
++                        <property name="label" translatable="yes">label2</property>
++                      </object>
++                      <packing>
++                        <property name="tab_fill">False</property>
++                      </packing>
++                    </child>
++                    <child>
++                      <object class="GtkAlignment" id="documents-page">
++                        <property name="visible">True</property>
++                        <property name="top_padding">6</property>
++                        <property name="left_padding">12</property>
++                        <property name="right_padding">12</property>
++                        <child>
++                          <object class="GtkVBox" id="vbox44">
++                            <property name="visible">True</property>
++                            <property name="orientation">vertical</property>
++                            <property name="spacing">12</property>
++                            <child>
++                              <object class="GtkVBox" id="user-docs-section">
++                                <property name="visible">True</property>
++                                <property name="orientation">vertical</property>
++                                <property name="spacing">12</property>
++                                <child>
++                                  <object class="GtkLabel" id="slab-favorite-documents">
++                                    <property name="visible">True</property>
++                                    <property name="xalign">0</property>
++                                    <property name="label" translatable="yes">Favorite Documents</property>
++                                  </object>
++                                  <packing>
++                                    <property name="expand">False</property>
++                                    <property name="fill">False</property>
++                                    <property name="position">0</property>
++                                  </packing>
++                                </child>
++                                <child>
++                                  <object class="GtkAlignment" id="user-docs-table-container">
++                                    <property name="visible">True</property>
++                                    <property name="left_padding">12</property>
++                                    <child>
++                                      <placeholder/>
++                                    </child>
++                                  </object>
++                                  <packing>
++                                    <property name="position">1</property>
++                                  </packing>
++                                </child>
++                              </object>
++                              <packing>
++                                <property name="expand">False</property>
++                                <property name="fill">False</property>
++                                <property name="position">0</property>
++                              </packing>
++                            </child>
++                            <child>
++                              <object class="GtkVBox" id="recent-docs-section">
++                                <property name="visible">True</property>
++                                <property name="orientation">vertical</property>
++                                <property name="spacing">12</property>
++                                <child>
++                                  <object class="GtkLabel" id="slab-recent-documents">
++                                    <property name="visible">True</property>
++                                    <property name="xalign">0</property>
++                                    <property name="label" translatable="yes">Recent Documents</property>
++                                  </object>
++                                  <packing>
++                                    <property name="expand">False</property>
++                                    <property name="fill">False</property>
++                                    <property name="position">0</property>
++                                  </packing>
++                                </child>
++                                <child>
++                                  <object class="GtkAlignment" id="recent-docs-table-container">
++                                    <property name="visible">True</property>
++                                    <property name="left_padding">12</property>
++                                    <child>
++                                      <placeholder/>
++                                    </child>
++                                  </object>
++                                  <packing>
++                                    <property name="position">1</property>
++                                  </packing>
++                                </child>
++                              </object>
++                              <packing>
++                                <property name="expand">False</property>
++                                <property name="fill">False</property>
++                                <property name="position">1</property>
++                              </packing>
++                            </child>
++                            <child>
++                              <object class="GtkAlignment" id="more-docs-section">
++                                <property name="visible">True</property>
++                                <property name="xalign">1</property>
++                                <property name="xscale">0</property>
++                                <property name="yscale">0</property>
++                                <property name="bottom_padding">18</property>
++                                <child>
++                                  <object class="GtkButton" id="more-documents-button">
++                                    <property name="label" translatable="yes">More Documents...</property>
++                                    <property name="visible">True</property>
++                                    <property name="can_focus">True</property>
++                                    <property name="receives_default">False</property>
++                                    <property name="use_underline">True</property>
++                                    <property name="focus_on_click">False</property>
++                                  </object>
++                                </child>
++                              </object>
++                              <packing>
++                                <property name="expand">False</property>
++                                <property name="fill">False</property>
++                                <property name="pack_type">end</property>
++                                <property name="position">2</property>
++                              </packing>
++                            </child>
++                          </object>
++                        </child>
++                      </object>
++                      <packing>
++                        <property name="position">1</property>
++                      </packing>
++                    </child>
++                    <child type="tab">
++                      <object class="GtkLabel" id="label3">
++                        <property name="visible">True</property>
++                        <property name="label" translatable="yes">label3</property>
++                      </object>
++                      <packing>
++                        <property name="position">1</property>
++                        <property name="tab_fill">False</property>
++                      </packing>
++                    </child>
++                    <child>
++                      <object class="GtkAlignment" id="places-page">
++                        <property name="visible">True</property>
++                        <property name="top_padding">6</property>
++                        <property name="left_padding">12</property>
++                        <property name="right_padding">12</property>
++                        <child>
++                          <object class="GtkVBox" id="vbox45">
++                            <property name="visible">True</property>
++                            <property name="orientation">vertical</property>
++                            <property name="spacing">12</property>
++                            <child>
++                              <object class="GtkVBox" id="user-dirs-section">
++                                <property name="visible">True</property>
++                                <property name="orientation">vertical</property>
++                                <property name="spacing">12</property>
++                                <child>
++                                  <object class="GtkLabel" id="slab-favorite-places">
++                                    <property name="visible">True</property>
++                                    <property name="xalign">0</property>
++                                    <property name="label" translatable="yes">Favorite Places</property>
++                                  </object>
++                                  <packing>
++                                    <property name="expand">False</property>
++                                    <property name="fill">False</property>
++                                    <property name="position">0</property>
++                                  </packing>
++                                </child>
++                                <child>
++                                  <object class="GtkAlignment" id="user-dirs-table-container">
++                                    <property name="visible">True</property>
++                                    <property name="left_padding">12</property>
++                                    <child>
++                                      <placeholder/>
++                                    </child>
++                                  </object>
++                                  <packing>
++                                    <property name="position">1</property>
++                                  </packing>
++                                </child>
++                              </object>
++                              <packing>
++                                <property name="expand">False</property>
++                                <property name="fill">False</property>
++                                <property name="position">0</property>
++                              </packing>
++                            </child>
++                            <child>
++                              <object class="GtkAlignment" id="more-dirs-section">
++                                <property name="visible">True</property>
++                                <property name="xalign">1</property>
++                                <property name="xscale">0</property>
++                                <property name="yscale">0</property>
++                                <property name="bottom_padding">18</property>
++                                <child>
++                                  <object class="GtkButton" id="more-places-button">
++                                    <property name="label" translatable="yes">More Places...</property>
++                                    <property name="visible">True</property>
++                                    <property name="can_focus">True</property>
++                                    <property name="receives_default">False</property>
++                                    <property name="use_underline">True</property>
++                                    <property name="focus_on_click">False</property>
++                                  </object>
++                                </child>
++                              </object>
++                              <packing>
++                                <property name="expand">False</property>
++                                <property name="fill">False</property>
++                                <property name="pack_type">end</property>
++                                <property name="position">1</property>
++                              </packing>
++                            </child>
++                          </object>
++                        </child>
++                      </object>
++                      <packing>
++                        <property name="position">2</property>
++                      </packing>
++                    </child>
++                    <child type="tab">
++                      <object class="GtkLabel" id="label4">
++                        <property name="visible">True</property>
++                        <property name="label" translatable="yes">label4</property>
++                      </object>
++                      <packing>
++                        <property name="position">2</property>
++                        <property name="tab_fill">False</property>
++                      </packing>
++                    </child>
++                  </object>
++                  <packing>
++                    <property name="position">1</property>
++                  </packing>
++                </child>
++              </object>
++            </child>
++          </object>
++          <packing>
++            <property name="position">0</property>
++          </packing>
++        </child>
++        <child>
++          <object class="GtkAlignment" id="alignment5">
++            <property name="visible">True</property>
++            <property name="top_padding">15</property>
++            <property name="bottom_padding">18</property>
++            <property name="left_padding">12</property>
++            <property name="right_padding">6</property>
++            <child>
++              <object class="GtkVBox" id="vbox30">
++                <property name="visible">True</property>
++                <property name="orientation">vertical</property>
++                <property name="spacing">6</property>
++                <child>
++                  <object class="GtkVBox" id="slab-system-section">
++                    <property name="visible">True</property>
++                    <property name="orientation">vertical</property>
++                    <property name="spacing">6</property>
++                    <child>
++                      <object class="GtkLabel" id="slab-side-system-label">
++                        <property name="visible">True</property>
++                        <property name="xalign">0</property>
++                        <property name="label" translatable="yes">System</property>
++                      </object>
++                      <packing>
++                        <property name="expand">False</property>
++                        <property name="fill">False</property>
++                        <property name="position">0</property>
++                      </packing>
++                    </child>
++                    <child>
++                      <object class="GtkAlignment" id="system-item-table-container">
++                        <property name="visible">True</property>
++                        <child>
++                          <placeholder/>
++                        </child>
++                      </object>
++                      <packing>
++                        <property name="position">1</property>
++                      </packing>
++                    </child>
++                  </object>
++                  <packing>
++                    <property name="expand">False</property>
++                    <property name="fill">False</property>
++                    <property name="position">0</property>
++                  </packing>
++                </child>
++                <child>
++                  <object class="GtkVBox" id="slab-status-section">
++                    <property name="visible">True</property>
++                    <property name="orientation">vertical</property>
++                    <property name="spacing">6</property>
++                    <child>
++                      <object class="GtkLabel" id="slab-side-status-label">
++                        <property name="visible">True</property>
++                        <property name="xalign">0</property>
++                        <property name="label" translatable="yes">Status</property>
++                      </object>
++                      <packing>
++                        <property name="expand">False</property>
++                        <property name="fill">False</property>
++                        <property name="position">0</property>
++                      </packing>
++                    </child>
++                    <child>
++                      <object class="GtkVBox" id="vbox52">
++                        <property name="visible">True</property>
++                        <property name="orientation">vertical</property>
++                        <child>
++                          <object class="GtkAlignment" id="hard-drive-status-container">
++                            <property name="visible">True</property>
++                            <child>
++                              <placeholder/>
++                            </child>
++                          </object>
++                          <packing>
++                            <property name="position">0</property>
++                          </packing>
++                        </child>
++                        <child>
++                          <object class="GtkAlignment" id="network-status-container">
++                            <property name="visible">True</property>
++                            <child>
++                              <placeholder/>
++                            </child>
++                          </object>
++                          <packing>
++                            <property name="position">1</property>
++                          </packing>
++                        </child>
++                      </object>
++                      <packing>
++                        <property name="position">1</property>
++                      </packing>
++                    </child>
++                  </object>
++                  <packing>
++                    <property name="expand">False</property>
++                    <property name="fill">False</property>
++                    <property name="pack_type">end</property>
++                    <property name="position">1</property>
++                  </packing>
++                </child>
++              </object>
++            </child>
++          </object>
++          <packing>
++            <property name="position">1</property>
++          </packing>
++        </child>
++      </object>
++    </child>
++  </object>
++</interface>
+diff --git a/po/POTFILES.in b/po/POTFILES.in
+index eeca3e3..c3be7a0 100644
+--- a/po/POTFILES.in
++++ b/po/POTFILES.in
+@@ -12,6 +12,7 @@ main-menu/src/hard-drive-status-tile.c
+ main-menu/src/main-menu-migration.c
+ main-menu/src/main-menu-ui.c
+ main-menu/src/network-status-tile.c
+-main-menu/src/slab-window.glade
++[type: gettext/glade]main-menu/src/slab-button.ui
++[type: gettext/glade]main-menu/src/slab-window.ui
+ nautilus-main-menu/nautilus-main-menu.c
+ [type: gettext/xml] main-menu/etc/system-items.xbel.in
+-- 
+1.7.1
+

Added: packages/unstable/gnome-main-menu/debian/patches/0003-Drop-hal-storage-requirement.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnome-main-menu/debian/patches/0003-Drop-hal-storage-requirement.patch?rev=24353&op=file
==============================================================================
--- packages/unstable/gnome-main-menu/debian/patches/0003-Drop-hal-storage-requirement.patch (added)
+++ packages/unstable/gnome-main-menu/debian/patches/0003-Drop-hal-storage-requirement.patch [utf-8] Thu May 20 13:54:08 2010
@@ -1,0 +1,25 @@
+From 671578fca4587fa96132275f84f34e820fcae6cc Mon Sep 17 00:00:00 2001
+From: Julian Andres Klode <jak at debian.org>
+Date: Wed, 5 May 2010 17:31:46 +0200
+Subject: [PATCH 3/6] Drop hal-storage requirement.
+
+---
+ configure.in |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index cb7d4f0..f107717 100644
+--- a/configure.in
++++ b/configure.in
+@@ -49,7 +49,7 @@ if test "x$NM_GLIB" = "x"; then
+ 	PKG_CHECK_EXISTS(libnm_glib, [ NM_GLIB=libnm_glib ], [ AC_ERROR(cannot find NetworkManager Glib library) ])
+ fi
+ 
+-PKG_CHECK_MODULES(MAIN_MENU, [ $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 gconf-2.0 libgtop-2.0 dbus-glib-1 NetworkManager $NM_GLIB >= 0.7.0 libnm-util >= 0.7.0 x11 hal-storage cairo ])
++PKG_CHECK_MODULES(MAIN_MENU, [ $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 gconf-2.0 libgtop-2.0 dbus-glib-1 NetworkManager $NM_GLIB >= 0.7.0 libnm-util >= 0.7.0 x11 cairo ])
+ 
+ AC_CHECK_HEADERS(iwlib.h, [ AC_CHECK_LIB(iw, iw_sockets_open, have_iwlib=yes, have_iwlib=no, -lm)], have_iwlib=no)
+ 
+-- 
+1.7.1
+

Added: packages/unstable/gnome-main-menu/debian/patches/0004-Drop-the-dbus-glib-1-requirement.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnome-main-menu/debian/patches/0004-Drop-the-dbus-glib-1-requirement.patch?rev=24353&op=file
==============================================================================
--- packages/unstable/gnome-main-menu/debian/patches/0004-Drop-the-dbus-glib-1-requirement.patch (added)
+++ packages/unstable/gnome-main-menu/debian/patches/0004-Drop-the-dbus-glib-1-requirement.patch [utf-8] Thu May 20 13:54:08 2010
@@ -1,0 +1,40 @@
+From 115872fa10f3a48fe302a4f8d6ffeae29add22b0 Mon Sep 17 00:00:00 2001
+From: Julian Andres Klode <jak at debian.org>
+Date: Wed, 5 May 2010 17:34:35 +0200
+Subject: [PATCH 4/6] Drop the dbus-glib-1 requirement.
+
+---
+ configure.in                         |    2 +-
+ main-menu/src/network-status-agent.c |    3 ---
+ 2 files changed, 1 insertions(+), 4 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index f107717..de2fedd 100644
+--- a/configure.in
++++ b/configure.in
+@@ -49,7 +49,7 @@ if test "x$NM_GLIB" = "x"; then
+ 	PKG_CHECK_EXISTS(libnm_glib, [ NM_GLIB=libnm_glib ], [ AC_ERROR(cannot find NetworkManager Glib library) ])
+ fi
+ 
+-PKG_CHECK_MODULES(MAIN_MENU, [ $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 gconf-2.0 libgtop-2.0 dbus-glib-1 NetworkManager $NM_GLIB >= 0.7.0 libnm-util >= 0.7.0 x11 cairo ])
++PKG_CHECK_MODULES(MAIN_MENU, [ $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 gconf-2.0 libgtop-2.0 NetworkManager $NM_GLIB >= 0.7.0 libnm-util >= 0.7.0 x11 cairo ])
+ 
+ AC_CHECK_HEADERS(iwlib.h, [ AC_CHECK_LIB(iw, iw_sockets_open, have_iwlib=yes, have_iwlib=no, -lm)], have_iwlib=no)
+ 
+diff --git a/main-menu/src/network-status-agent.c b/main-menu/src/network-status-agent.c
+index 6568dcd..9b49e8c 100644
+--- a/main-menu/src/network-status-agent.c
++++ b/main-menu/src/network-status-agent.c
+@@ -30,9 +30,6 @@
+ #include <nm-setting-ip4-config.h>
+ #include <nm-utils.h>
+ #include <arpa/inet.h>
+-#include <dbus/dbus.h>
+-#include <dbus/dbus-glib.h>
+-#include <dbus/dbus-glib-lowlevel.h>
+ #include <iwlib.h>
+ #include <glibtop/netlist.h>
+ #include <glibtop/netload.h>
+-- 
+1.7.1
+

Added: packages/unstable/gnome-main-menu/debian/patches/0005-Allow-building-without-NetworkManager-and-iwlib.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnome-main-menu/debian/patches/0005-Allow-building-without-NetworkManager-and-iwlib.patch?rev=24353&op=file
==============================================================================
--- packages/unstable/gnome-main-menu/debian/patches/0005-Allow-building-without-NetworkManager-and-iwlib.patch (added)
+++ packages/unstable/gnome-main-menu/debian/patches/0005-Allow-building-without-NetworkManager-and-iwlib.patch [utf-8] Thu May 20 13:54:08 2010
@@ -1,0 +1,146 @@
+From 59b4f9f4e5cdfd4f3a6b851caa1b25cc5c237679 Mon Sep 17 00:00:00 2001
+From: Julian Andres Klode <jak at debian.org>
+Date: Wed, 5 May 2010 16:21:01 +0200
+Subject: [PATCH 5/6] Allow building without NetworkManager and iwlib.
+
+If NetworkManager or iwlib is not available, allow
+gnome-main-menu to be built without it by disabling
+the network-related functionality; making it possible
+to build on non-Linux architectures.
+
+Based on a patch by Petr Salinger <Petr.Salinger at seznam.cz>.
+
+Bug-Debian: http://bugs.debian.org/542628
+---
+ configure.in                 |   31 ++++++++++++++++++-------------
+ main-menu/src/Makefile.am    |   14 ++++++++++----
+ main-menu/src/main-menu-ui.c |    7 +++++++
+ 3 files changed, 35 insertions(+), 17 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index de2fedd..1129459 100644
+--- a/configure.in
++++ b/configure.in
+@@ -43,25 +43,30 @@ COMMON_MODULES="glib-2.0 >= $GLIB_REQUIRED	\
+ 		gdk-2.0				\
+ 		libslab >= $SLAB_REQUIRED"
+ 
+-NM_GLIB=
+-PKG_CHECK_EXISTS(libnm-glib, [ NM_GLIB=libnm-glib ])
+-if test "x$NM_GLIB" = "x"; then
+-	PKG_CHECK_EXISTS(libnm_glib, [ NM_GLIB=libnm_glib ], [ AC_ERROR(cannot find NetworkManager Glib library) ])
+-fi
++PKG_CHECK_MODULES(MAIN_MENU, [ $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 gconf-2.0 libgtop-2.0 x11 cairo ])
+ 
+-PKG_CHECK_MODULES(MAIN_MENU, [ $COMMON_MODULES libpanelapplet-2.0 gnome-desktop-2.0 gconf-2.0 libgtop-2.0 NetworkManager $NM_GLIB >= 0.7.0 libnm-util >= 0.7.0 x11 cairo ])
++AC_SUBST(MAIN_MENU_CFLAGS)
++AC_SUBST(MAIN_MENU_LIBS)
+ 
+-AC_CHECK_HEADERS(iwlib.h, [ AC_CHECK_LIB(iw, iw_sockets_open, have_iwlib=yes, have_iwlib=no, -lm)], have_iwlib=no)
++# Check for Network Manager
++NM_GLIB=
++PKG_CHECK_EXISTS(libnm-glib, [ NM_GLIB=libnm-glib],
++                 PKG_CHECK_EXISTS(libnm_glib, [ NM_GLIB=libnm_glib ]))
+ 
+-if test "x$have_iwlib" != "xyes" ; then
+-	AC_ERROR(cannot find iwlib)
++PKG_CHECK_MODULES(NETWORK, [NetworkManager $NM_GLIB >= 0.7.0 libnm-util >= 0.7.0], HAVE_NETWORK=1, HAVE_NETWORK=0)
++AC_CHECK_HEADERS(iwlib.h, [ AC_CHECK_LIB(iw, iw_sockets_open, , HAVE_NETWORK=0, -lm)], HAVE_NETWORK=0)
++
++if test "x$HAVE_NETWORK" != "x1" ; then
++	AC_WARN(Missing network manager or iwlib, network support disabled)
+ else
+-	MAIN_MENU_LIBS="$MAIN_MENU_LIBS -liw -lm"
+-	AC_SUBST(MAIN_MENU_LIBS)
++	AC_DEFINE(HAVE_NETWORK, 1, [use network-manager and wireless])
++	NETWORK_LIBS="$NETWORK_LIBS -liw -lm"
+ fi
+ 
+-AC_SUBST(MAIN_MENU_CFLAGS)
+-AC_SUBST(MAIN_MENU_LIBS)
++AM_CONDITIONAL(HAVE_NETWORK, test "x$HAVE_NETWORK" = "x1")
++AC_SUBST(NETWORK_LIBS)
++AC_SUBST(NETWORK_MAIN)
++
+ 
+ PKG_CHECK_MODULES(APPLICATION_BROWSER, [ $COMMON_MODULES gnome-desktop-2.0 unique-1.0 ])
+ 
+diff --git a/main-menu/src/Makefile.am b/main-menu/src/Makefile.am
+index fdfa6e4..38ab399 100644
+--- a/main-menu/src/Makefile.am
++++ b/main-menu/src/Makefile.am
+@@ -1,5 +1,6 @@
+ INCLUDES =								\
+ 	$(MAIN_MENU_CFLAGS)						\
++	$(NETWORK_CFLAGS)						\
+ 	$(WARN_CFLAGS)
+ 
+ uidir = $(datadir)/$(PACKAGE)
+@@ -19,14 +20,19 @@ main_menu_SOURCES =							\
+ 	main-menu-migration.c		main-menu-migration.h		\
+ 	tile-table.c			tile-table.h			\
+ 	hard-drive-status-tile.c	hard-drive-status-tile.h	\
+-	network-status-tile.c		network-status-tile.h		\
+-	network-status-agent.c		network-status-agent.h		\
+-	network-status-info.c		network-status-info.h		\
+ 	tomboykeybinder.c		tomboykeybinder.h		\
+ 	eggaccelerators.c		eggaccelerators.h
+ 
++if HAVE_NETWORK
++main_menu_SOURCES += \
++	network-status-tile.c		network-status-tile.h		\
++	network-status-agent.c		network-status-agent.h		\
++	network-status-info.c		network-status-info.h
++endif
++
+ main_menu_LDADD =							\
+-	$(MAIN_MENU_LIBS)
++	$(MAIN_MENU_LIBS)						\
++	$(NETWORK_LIBS)
+ 
+ trigger_panel_run_dialog_SOURCES =					\
+ 	trigger-panel-run-dialog.c
+diff --git a/main-menu/src/main-menu-ui.c b/main-menu/src/main-menu-ui.c
+index 67e6102..451b3f5 100644
+--- a/main-menu/src/main-menu-ui.c
++++ b/main-menu/src/main-menu-ui.c
+@@ -37,7 +37,10 @@
+ #include <libslab/slab.h>
+ 
+ #include "hard-drive-status-tile.h"
++
++#ifdef HAVE_NETWORK
+ #include "network-status-tile.h"
++#endif
+ 
+ #include "tile-table.h"
+ 
+@@ -737,6 +740,7 @@ create_status_section (MainMenuUI *this)
+ 	gtk_container_add   (ctnr, tile);
+ 	gtk_widget_show_all (GTK_WIDGET (ctnr));
+ 
++#ifdef HAVE_NETWORK
+ 	ctnr = GTK_CONTAINER (gtk_builder_get_object (
+ 		priv->main_menu_ui, "network-status-container"));
+ 	priv->network_status = network_status_tile_new ();
+@@ -749,6 +753,7 @@ create_status_section (MainMenuUI *this)
+ 
+ 	gtk_container_add   (ctnr, priv->network_status);
+ 	gtk_widget_show_all (GTK_WIDGET (ctnr));
++#endif
+ 
+ 	priv->status_section = get_widget (priv, "slab-status-section");
+ 
+@@ -1855,7 +1860,9 @@ present_slab_window (MainMenuUI *this)
+ {
+ 	MainMenuUIPrivate *priv = PRIVATE (this);
+ 
++#ifdef HAVE_NETWORK
+ 	network_tile_update_status (priv->network_status);
++#endif
+ 
+ 	update_recently_used_sections (this);
+ 
+-- 
+1.7.1
+

Added: packages/unstable/gnome-main-menu/debian/patches/0006-Change-default-search-tool-to-tracker-search-tool.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnome-main-menu/debian/patches/0006-Change-default-search-tool-to-tracker-search-tool.patch?rev=24353&op=file
==============================================================================
--- packages/unstable/gnome-main-menu/debian/patches/0006-Change-default-search-tool-to-tracker-search-tool.patch (added)
+++ packages/unstable/gnome-main-menu/debian/patches/0006-Change-default-search-tool-to-tracker-search-tool.patch [utf-8] Thu May 20 13:54:08 2010
@@ -1,0 +1,26 @@
+From d411a3ceb4675676f5719b5f9d654e87b7010e4d Mon Sep 17 00:00:00 2001
+From: Julian Andres Klode <jak at debian.org>
+Date: Wed, 5 May 2010 18:17:07 +0200
+Subject: [PATCH 6/6] Change default search tool to tracker-search-tool.
+
+Switch from Beagle to Tracker, as the former is unmaintained.
+---
+ main-menu/etc/slab.schemas.in.in |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/main-menu/etc/slab.schemas.in.in b/main-menu/etc/slab.schemas.in.in
+index 55db9c1..14f0231 100644
+--- a/main-menu/etc/slab.schemas.in.in
++++ b/main-menu/etc/slab.schemas.in.in
+@@ -89,7 +89,7 @@
+ 			<applyto>/desktop/gnome/applications/main-menu/search_command</applyto>
+ 			<owner>gnome-main-menu</owner>
+ 			<type>string</type>
+-			<default>beagle-search SEARCH_STRING</default>
++			<default>tracker-search-tool SEARCH_STRING</default>
+ 			<locale name="C">
+ 				<short>This is the command to execute when the search entry is used.</short>
+ 				<long>This is the command to execute when the search entry is used.  SEARCH_STRING is replaced with the entered search text.</long>
+-- 
+1.7.1
+

Modified: packages/unstable/gnome-main-menu/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnome-main-menu/debian/patches/series?rev=24353&op=diff
==============================================================================
--- packages/unstable/gnome-main-menu/debian/patches/series [utf-8] (original)
+++ packages/unstable/gnome-main-menu/debian/patches/series [utf-8] Thu May 20 13:54:08 2010
@@ -1,2 +1,7 @@
+0001-Drop-usage-of-libgnome-2.0-and-libgnomeui-2.0.patch
+0002-Replace-libglade-with-gtkbuilder.patch
+0003-Drop-hal-storage-requirement.patch
+0004-Drop-the-dbus-glib-1-requirement.patch
+0005-Allow-building-without-NetworkManager-and-iwlib.patch
+0006-Change-default-search-tool-to-tracker-search-tool.patch
 default-applications.diff
-non-linux.diff




More information about the pkg-gnome-commits mailing list