[gnome-control-center] Adapted to new libslab API, with no more Bonobo

[Rodrigo Moya <rodrigo src gnome org>]

commit 638dc8d768ad95b086b5d1a55de141abe986de8a
Author: Rodrigo Moya <rodrigo gnome-db org>
Date:   Thu Aug 6 16:06:28 2009 +0200

    Adapted to new libslab API, with no more Bonobo

 libslab/Makefile.am         |    1 -
 libslab/app-shell-startup.c |  123 -------------------------------------------
 libslab/app-shell-startup.h |   37 -------------
 shell/control-center.c      |   19 +------
 4 files changed, 1 insertions(+), 179 deletions(-)
---
diff --git a/libslab/Makefile.am b/libslab/Makefile.am
index d2ffe6a..520c61e 100644
--- a/libslab/Makefile.am
+++ b/libslab/Makefile.am
@@ -65,7 +65,6 @@ search-entry-watermark.h: search-entry-watermark.svg
 	sed -e 's/"/\\"/g' -e 's/$$/\\/' -e 's/#000000/#%s/g' $< >> $@; \
 	echo '"' >> $@
 
-
 MARSHAL_GENERATED = nld-marshal.c nld-marshal.h
 
 nld-marshal.h: nld-marshal.list
diff --git a/shell/control-center.c b/shell/control-center.c
index 8aefac4..26f902c 100644
--- a/shell/control-center.c
+++ b/shell/control-center.c
@@ -29,7 +29,6 @@
 #include <dirent.h>
 
 #include "app-shell.h"
-#include "app-shell-startup.h"
 #include "slab-gnome-util.h"
 
 void handle_static_action_clicked (Tile * tile, TileEvent * event, gpointer data);
@@ -106,9 +105,7 @@ handle_static_action_clicked (Tile * tile, TileEvent * event, gpointer data)
 int
 main (int argc, char *argv[])
 {
-	BonoboApplication *bonobo_app = NULL;
 	gboolean hidden = FALSE;
-	gchar * startup_id;
 	AppShellData *app_data;
 	GSList *actions;
 	GnomeProgram *program;
@@ -131,33 +128,19 @@ main (int argc, char *argv[])
 		hidden = TRUE;
 	}
 
-	startup_id = g_strdup (g_getenv (DESKTOP_STARTUP_ID));
 	program = gnome_program_init ("GNOME Control Center", "0.1", LIBGNOMEUI_MODULE,
 		argc, argv, NULL, NULL);
 
-	if (apss_already_running (argc, argv, &bonobo_app, "GNOME-NLD-ControlCenter", startup_id))
-	{
-		gdk_notify_startup_complete ();
-		bonobo_debug_shutdown ();
-		g_free (startup_id);
-		exit (1);
-	}
-
 	app_data = appshelldata_new ("gnomecc.menu", NULL, CONTROL_CENTER_PREFIX,
-		GTK_ICON_SIZE_DND, FALSE, TRUE);
+				     GTK_ICON_SIZE_DND, FALSE, TRUE);
 	generate_categories (app_data);
 
 	actions = get_actions_list ();
 	layout_shell (app_data, _("Filter"), _("Groups"), _("Common Tasks"), actions,
 		handle_static_action_clicked);
 
-	g_signal_connect (bonobo_app, "new-instance", G_CALLBACK (apss_new_instance_cb), app_data);
 	create_main_window (app_data, "MyControlCenter", _("Control Center"),
 		"gnome-control-center", 975, 600, hidden);
 
-	if (bonobo_app)
-		bonobo_object_unref (bonobo_app);
-	bonobo_debug_shutdown ();
-	g_free (startup_id);
 	return 0;
 };