diff options
| author | Brian Cameron <brian.cameron@sun.com> | 2009-01-06 15:03:35 +0000 |
|---|---|---|
| committer | Brian Cameron <bcameron@src.gnome.org> | 2009-01-06 15:03:35 +0000 |
| commit | 786d16b8f2771705c5da0a1ee1312c84f2f30e07 (patch) | |
| tree | d90a2c151187aaf2e127df710a873f714d1224da | |
| parent | b63c218120fdf6f7a455270473c04267106bcc99 (diff) | |
| download | gdm-786d16b8f2771705c5da0a1ee1312c84f2f30e07.tar.gz | |
Set default PRIO values appropriately.
2009-01-06 Brian Cameron <brian.cameron@sun.com>
* daemon/server.c, daemon/gdm-daemon-config.c: Set default
PRIO values appropriately.
svn path=/branches/gnome-2-20/; revision=6655
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | daemon/gdm-daemon-config.c | 24 | ||||
| -rw-r--r-- | daemon/server.c | 10 |
3 files changed, 25 insertions, 14 deletions
@@ -1,5 +1,10 @@ 2009-01-06 Brian Cameron <brian.cameron@sun.com> + * daemon/server.c, daemon/gdm-daemon-config.c: Set default + PRIO values appropriately. + +2009-01-06 Brian Cameron <brian.cameron@sun.com> + * daemon/gdm-daemon-config.c: Set PRIO_MIN and PRIO_MAX to the correct values on Solaris. diff --git a/daemon/gdm-daemon-config.c b/daemon/gdm-daemon-config.c index ef0391bb..e7727567 100644 --- a/daemon/gdm-daemon-config.c +++ b/daemon/gdm-daemon-config.c @@ -1050,14 +1050,14 @@ gdm_daemon_config_get_xservers (void) return retval; } -/* PRIO_MIN and PRIO_MAX are not defined on Solaris, but are -20 and 20 */ #if __sun -#ifndef PRIO_MIN -#define PRIO_MIN 0 -#endif -#ifndef PRIO_MAX -#define PRIO_MAX (NZERO*2)-1 -#endif +#define GDM_PRIO_MIN 0 +#define GDM_PRIO_MAX (NZERO*2)-1 +#define GDM_PRIO_DEFAULT NZERO +#else +#define GDM_PRIO_MIN PRIO_MIN +#define GDM_PRIO_MAX PRIO_MAX +#define GDM_PRIO_DEFAULT 0 #endif /** @@ -1119,10 +1119,10 @@ gdm_daemon_config_load_xserver (GdmConfig *config, /* do some bounds checking */ n = svr->priority; - if (n < PRIO_MIN) - n = PRIO_MIN; - else if (n > PRIO_MAX) - n = PRIO_MAX; + if (n < GDM_PRIO_MIN) + n = GDM_PRIO_MIN; + else if (n > GDM_PRIO_MAX) + n = GDM_PRIO_MAX; if (n != svr->priority) { gdm_error (_("%s: Priority out of bounds; changed to %d"), @@ -1173,7 +1173,7 @@ gdm_daemon_config_ensure_one_xserver (GdmConfig *config) svr->flexible = TRUE; svr->choosable = TRUE; svr->handled = TRUE; - svr->priority = 0; + svr->priority = GDM_PRIO_DEFAULT; xservers = g_slist_append (xservers, svr); } diff --git a/daemon/server.c b/daemon/server.c index 71bfb307..9fbae768 100644 --- a/daemon/server.c +++ b/daemon/server.c @@ -57,6 +57,12 @@ #include "gdm-socket-protocol.h" +#if __sun +#define GDM_PRIO_DEFAULT NZERO +#else +#define GDM_PRIO_DEFAULT 0 +#endif + /* Local prototypes */ static void gdm_server_spawn (GdmDisplay *d, const char *vtarg); static void gdm_server_usr1_handler (gint); @@ -1042,7 +1048,7 @@ gdm_server_resolve_command_line (GdmDisplay *disp, disp->handled = FALSE; /* never ever ever use chooser here */ disp->use_chooser = FALSE; - disp->priority = 0; + disp->priority = GDM_PRIO_DEFAULT; /* run just one session */ argv[len++] = g_strdup ("-terminate"); argv[len++] = g_strdup ("-query"); @@ -1263,7 +1269,7 @@ gdm_server_spawn (GdmDisplay *d, const char *vtarg) gdm_debug ("gdm_server_spawn: '%s'", command); - if (d->priority != 0) { + if (d->priority != GDM_PRIO_DEFAULT) { if (setpriority (PRIO_PROCESS, 0, d->priority)) { gdm_error (_("%s: Server priority couldn't be set to %d: %s"), "gdm_server_spawn", d->priority, |