applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove #ifdef HAVE_BONOBO instances

Browse source 
2001-10-26  Bradford Hovinen  <hovinen@ximian.com>

	* main.c: Remove #ifdef HAVE_BONOBO instances

	* capplet-dir.c: Remove #idef HAVE_BONOBO instances
This commit is contained in:
Bradford Hovinen 2001-10-26 19:18:24 +00:00 • committed by Bradford Hovinen (Gdict maintainer)
parent 3611eb3a6a
commit 40cb24b5db
3 changed files with 7 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

6
control-center/ChangeLog
View file

@ -1,3 +1,9 @@
2001-10-26 Bradford Hovinen <hovinen@ximian.com>
* main.c: Remove #ifdef HAVE_BONOBO instances
* capplet-dir.c: Remove #idef HAVE_BONOBO instances
2001-10-16 Jakub Steiner <jimmac@ximian.com> 2001-10-16 Jakub Steiner <jimmac@ximian.com>
* control-center.png: usability@ thinks using hands is offensive. * control-center.png: usability@ thinks using hands is offensive.

9
control-center/capplet-dir.c
View file

@ -211,7 +211,6 @@ capplet_activate (Capplet *capplet)
entry = CAPPLET_DIR_ENTRY (capplet)->entry; entry = CAPPLET_DIR_ENTRY (capplet)->entry;
#warning FIXME: this should probably be root-manager-helper #warning FIXME: this should probably be root-manager-helper
#ifdef HAVE_BONOBO
if (!strncmp (entry->exec[0], "gnomecc", strlen ("gnomecc"))) { if (!strncmp (entry->exec[0], "gnomecc", strlen ("gnomecc"))) {
if (capplet->launching) { if (capplet->launching) {
return; return;
@ -220,9 +219,7 @@ capplet_activate (Capplet *capplet)
gtk_idle_add ((GtkFunction) capplet_reset_cb, capplet); gtk_idle_add ((GtkFunction) capplet_reset_cb, capplet);
capplet_control_launch (entry->exec[2], entry->name); capplet_control_launch (entry->exec[2], entry->name);
} }
} else } else if (!strncmp (entry->exec[0], "root-manager", strlen ("root-manager"))) {
#endif
if (!strncmp (entry->exec[0], "root-manager", strlen ("root-manager"))) {
start_capplet_through_root_manager (entry); start_capplet_through_root_manager (entry);
} else { } else {
if (capplet->launching) { if (capplet->launching) {
@ -442,8 +439,6 @@ capplet_close_cb (GtkWidget *widget, GtkWidget *app)
CORBA_exception_free (&ev); CORBA_exception_free (&ev);
} }
#ifdef HAVE_BONOBO
/* capplet_control_launch /* capplet_control_launch
* *
* Launch a capplet as a Bonobo control; returns the relevant BonoboWindow or * Launch a capplet as a Bonobo control; returns the relevant BonoboWindow or
@ -535,5 +530,3 @@ capplet_control_launch (const gchar *capplet_name, gchar *window_title)
return app; return app;
} }
#endif /* HAVE_BONOBO */

10
control-center/main.c
View file

@ -37,8 +37,6 @@
#include "capplet-dir.h" #include "capplet-dir.h"
#include "capplet-dir-view.h" #include "capplet-dir-view.h"
#ifdef HAVE_BONOBO
static gint static gint
real_launch_control (gchar *capplet) real_launch_control (gchar *capplet)
{ {
@ -55,8 +53,6 @@ real_launch_control (gchar *capplet)
return FALSE; return FALSE;
} }
#endif
int int
main (int argc, char **argv) main (int argc, char **argv)
{ {
@ -67,10 +63,8 @@ main (int argc, char **argv)
static gchar *capplet = NULL; static gchar *capplet = NULL;
static struct poptOption gnomecc_options[] = { static struct poptOption gnomecc_options[] = {
#ifdef HAVE_BONOBO
{ "run-capplet", '\0', POPT_ARG_STRING, &capplet, 0, { "run-capplet", '\0', POPT_ARG_STRING, &capplet, 0,
N_("Run the capplet CAPPLET"), N_("CAPPLET") }, N_("Run the capplet CAPPLET"), N_("CAPPLET") },
#endif
{ NULL, '\0', 0, NULL, 0, NULL, NULL } { NULL, '\0', 0, NULL, 0, NULL, NULL }
}; };
@ -89,9 +83,7 @@ main (int argc, char **argv)
gconf_init (argc, argv, NULL); gconf_init (argc, argv, NULL);
#endif #endif
#ifdef HAVE_BONOBO
if (capplet == NULL) { if (capplet == NULL) {
#endif
gnomecc_init (); gnomecc_init ();
dir = get_root_capplet_dir (); dir = get_root_capplet_dir ();
if (!dir) if (!dir)
@ -100,11 +92,9 @@ main (int argc, char **argv)
if (!entry) if (!entry)
return -1; return -1;
capplet_dir_entry_activate (entry, NULL); capplet_dir_entry_activate (entry, NULL);
#ifdef HAVE_BONOBO
} else { } else {
gtk_idle_add ((GtkFunction) real_launch_control, capplet); gtk_idle_add ((GtkFunction) real_launch_control, capplet);
} }
#endif
bonobo_main (); bonobo_main ();