Commit 2941af34 authored by George Lebl's avatar George Lebl Committed by George Lebl

Apply patch from Lee Mallabone <lee@fonicmonkey.net> To add a development

Sun Feb 04 16:23:30 2001  George Lebl <jirka@5z.com>

	* gui/gdmconfig.*: Apply patch from Lee Mallabone <lee@fonicmonkey.net>
	  To add a development define for debugging, and change a bit of
	  the layout to be more consistent.
parent f28f1595
Sun Feb 04 16:23:30 2001 George Lebl <jirka@5z.com>
* gui/gdmconfig.*: Apply patch from Lee Mallabone <lee@fonicmonkey.net>
To add a development define for debugging, and change a bit of
the layout to be more consistent.
Sat Feb 03 19:42:01 2001 George Lebl <jirka@5z.com>
* daemon/display.c, daemon/gdm.c: Fix corruption of GSLists on exit
......
/*
* GDMconfig, a graphical configurator for the GNOME display manager
* Copyright (C) 1999, Lee Mallabone <lee0@callnetuk.com>
* Copyright (C) 1999,2000,2001 Lee Mallabone <lee0@callnetuk.com>
*
* Inspired in places by the original gdmconfig.c, by Martin K. Petersen.
*
......@@ -22,6 +22,9 @@
#include "gdmconfig.h"
/* This should always be undefined before building ANY kind of production release. */
#undef DOING_DEVELOPMENT
GladeXML *GUI = NULL;
int number_of_servers = 0;
......@@ -45,23 +48,33 @@ main (int argc, char *argv[])
/* Make sure the user is root. If not, they shouldn't be messing with
* GDM's configuration.
*/
if (geteuid() != 0)
#ifndef DOING_DEVELOPMENT
if (geteuid() != 0)
{
GtkWidget *fatal_error =
gnome_error_dialog(_("You must be the superuser (root) to configure GDM.\n"));
gnome_dialog_run_and_close(GNOME_DIALOG(fatal_error));
exit(EXIT_FAILURE);
}
#endif /* DOING_DEVELOPMENT */
/* Look for the glade file in $(datadir)/gdmconfig or, failing that,
* look in the current directory.
* Except when doing development, we want the app to use the glade file
* in the same directory, so we can actually make changes easily.
*/
#ifndef DOING_DEVELOPMENT
glade_filename = gnome_datadir_file("gdmconfig/gdmconfig.glade");
if (!glade_filename)
{
glade_filename = g_strdup("gdmconfig.glade");
}
#else
glade_filename = g_strdup("gdmconfig.glade");
#endif /* DOING_DEVELOPMENT */
/* Build the user interface */
GUI = glade_xml_new(glade_filename, NULL);
g_free(glade_filename);
......
......@@ -353,7 +353,7 @@
<shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
<child>
<padding>0</padding>
<expand>True</expand>
<expand>False</expand>
<fill>True</fill>
</child>
......@@ -698,7 +698,7 @@
<shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
<child>
<padding>0</padding>
<expand>True</expand>
<expand>False</expand>
<fill>True</fill>
</child>
......@@ -2615,7 +2615,7 @@ This is %n
<shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
<child>
<padding>0</padding>
<expand>True</expand>
<expand>False</expand>
<fill>True</fill>
</child>
......
/*
* GDMconfig, a graphical configurator for the GNOME display manager
* Copyright (C) 1999, Lee Mallabone <lee0@callnetuk.com>
* Copyright (C) 1999,2000,2001 Lee Mallabone <lee0@callnetuk.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment