[gnome-control-center] Remove libgnomeui usage. Fixes bug #586527.



commit f7334d30ce739012385f2cd858c9d6ae8b8cba48
Author: Andreas Proschofsky <suka gentoo org>
Date:   Fri Aug 7 17:41:06 2009 +0200

    Remove libgnomeui usage. Fixes bug #586527.

 configure.in           |    2 +-
 shell/control-center.c |    5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)
---
diff --git a/configure.in b/configure.in
index ec2a67b..9e9b4ff 100644
--- a/configure.in
+++ b/configure.in
@@ -95,7 +95,7 @@ COMMON_MODULES="gtk+-2.0 >= 2.15.0 dnl
  gnome-desktop-2.0 >= 2.25.1"
 PKG_CHECK_MODULES(CAPPLET, $COMMON_MODULES)
 PKG_CHECK_MODULES(GNOMECC, $COMMON_MODULES libgnome-menu >= 2.10.1)
-PKG_CHECK_MODULES(GNOMECC_SHELL, $COMMON_MODULES libgnomeui-2.0 libgnome-menu libpanelapplet-2.0)
+PKG_CHECK_MODULES(GNOMECC_SHELL, $COMMON_MODULES libgnome-menu libpanelapplet-2.0)
 PKG_CHECK_MODULES(DBUS, dbus-1 dbus-glib-1)
 PKG_CHECK_MODULES(GNOME_DESKTOP, gnome-desktop-2.0)
 PKG_CHECK_MODULES(DEFAULT_APPLICATIONS_CAPPLET, libxml-2.0)
diff --git a/shell/control-center.c b/shell/control-center.c
index 26f902c..4c4bc3a 100644
--- a/shell/control-center.c
+++ b/shell/control-center.c
@@ -25,7 +25,6 @@
 #include <gtk/gtk.h>
 #include <panel-applet.h>
 #include <libgnome/gnome-desktop-item.h>
-#include <libgnomeui/libgnomeui.h>
 #include <dirent.h>
 
 #include "app-shell.h"
@@ -108,7 +107,6 @@ main (int argc, char *argv[])
 	gboolean hidden = FALSE;
 	AppShellData *app_data;
 	GSList *actions;
-	GnomeProgram *program;
 
 #ifdef ENABLE_NLS
 	bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
@@ -128,8 +126,7 @@ main (int argc, char *argv[])
 		hidden = TRUE;
 	}
 
-	program = gnome_program_init ("GNOME Control Center", "0.1", LIBGNOMEUI_MODULE,
-		argc, argv, NULL, NULL);
+	gtk_init (&argc, &argv);
 
 	app_data = appshelldata_new ("gnomecc.menu", NULL, CONTROL_CENTER_PREFIX,
 				     GTK_ICON_SIZE_DND, FALSE, TRUE);



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]