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

Ignore nautilus if run with --use-shell.

Browse source 
2002-02-08  Richard Hestilow  <hestilow@ximian.com>

	* main.c (main): Ignore nautilus if run with --use-shell.
This commit is contained in:
Richard Hestilow 2002-02-09 01:33:32 +00:00 • committed by Rachel Hestilow
parent 3ce6af9430
commit 02fa0440e2
2 changed files with 14 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
control-center/ChangeLog
View file

@ -1,3 +1,7 @@
2002-02-08 Richard Hestilow <hestilow@ximian.com>
* main.c (main): Ignore nautilus if run with --use-shell.
2002-02-06 Mark McLoughlin <mark@skynet.ie> 2002-02-06 Mark McLoughlin <mark@skynet.ie>
* gnomecc.desktop.in: change Exec from gnomecc to * gnomecc.desktop.in: change Exec from gnomecc to

11
control-center/main.c
View file

@ -37,6 +37,14 @@
#include "capplet-dir.h" #include "capplet-dir.h"
#include "capplet-dir-view.h" #include "capplet-dir-view.h"
static gint use_shell = 0;
static struct poptOption cap_options[] = {
{"use-shell", '\0', POPT_ARG_NONE, &use_shell, 0,
N_("Use shell even if nautilus is running."), NULL},
{NULL, '\0', 0, NULL, 0}
};
static gboolean static gboolean
is_nautilus_running (void) is_nautilus_running (void)
{ {
@ -114,9 +122,10 @@ main (int argc, char **argv)
gnome_program_init ("control-center", VERSION, LIBGNOMEUI_MODULE, gnome_program_init ("control-center", VERSION, LIBGNOMEUI_MODULE,
argc, argv, argc, argv,
GNOME_PARAM_APP_DATADIR, GNOMECC_DATA_DIR, GNOME_PARAM_APP_DATADIR, GNOMECC_DATA_DIR,
GNOME_PARAM_POPT_TABLE, cap_options,
NULL); NULL);
if (is_nautilus_running ()) if (!use_shell && is_nautilus_running ())
execlp ("nautilus", "nautilus", "preferences:///", NULL); execlp ("nautilus", "nautilus", "preferences:///", NULL);
gnomecc_init (); gnomecc_init ();