|
 |
288b884 |
From 74fc44269613cffef07978b4158c62a9cb887821 Mon Sep 17 00:00:00 2001
|
|
|
288b884 |
From: Ray Strode <rstrode@redhat.com>
|
|
|
288b884 |
Date: Fri, 8 Jun 2012 11:03:31 -0400
|
|
|
288b884 |
Subject: [PATCH] slave: only start gnome-session with --debug if debug
|
|
|
288b884 |
enabled
|
|
|
288b884 |
|
|
|
288b884 |
gnome-session puts all its message in syslog when --debug is
|
|
|
288b884 |
enabled. This floods the log and makes it hard to see other
|
|
|
288b884 |
messages.
|
|
|
288b884 |
|
|
|
288b884 |
This commit only calls gnome-session with --debug when gdm
|
|
|
288b884 |
debugging is on.
|
|
|
288b884 |
|
|
|
288b884 |
https://bugzilla.gnome.org/show_bug.cgi?id=672801
|
|
|
288b884 |
---
|
|
|
288b884 |
daemon/gdm-greeter-session.c | 12 +++++++++++-
|
|
|
288b884 |
1 file changed, 11 insertions(+), 1 deletion(-)
|
|
|
288b884 |
|
|
|
288b884 |
diff --git a/daemon/gdm-greeter-session.c b/daemon/gdm-greeter-session.c
|
|
|
288b884 |
index 44259ab..464b16b 100644
|
|
|
288b884 |
--- a/daemon/gdm-greeter-session.c
|
|
|
288b884 |
+++ b/daemon/gdm-greeter-session.c
|
|
|
288b884 |
@@ -39,6 +39,8 @@
|
|
|
288b884 |
|
|
|
288b884 |
#include "gdm-welcome-session.h"
|
|
|
288b884 |
#include "gdm-greeter-session.h"
|
|
|
288b884 |
+#include "gdm-settings-direct.h"
|
|
|
288b884 |
+#include "gdm-settings-keys.h"
|
|
|
288b884 |
|
|
|
288b884 |
#define GDM_GREETER_SERVER_DBUS_PATH "/org/gnome/DisplayManager/GreeterServer"
|
|
|
288b884 |
#define GDM_GREETER_SERVER_DBUS_INTERFACE "org.gnome.DisplayManager.GreeterServer"
|
|
|
288b884 |
@@ -76,9 +78,17 @@ gdm_greeter_session_new (const char *display_name,
|
|
|
288b884 |
gboolean display_is_local)
|
|
|
288b884 |
{
|
|
|
288b884 |
GObject *object;
|
|
|
288b884 |
+ gboolean debug = FALSE;
|
|
|
288b884 |
+ char *command = BINDIR "/gnome-session -f";
|
|
|
288b884 |
+
|
|
|
288b884 |
+ gdm_settings_direct_get_boolean (GDM_KEY_DEBUG, &debug);
|
|
|
288b884 |
+
|
|
|
288b884 |
+ if (debug) {
|
|
|
288b884 |
+ command = BINDIR "/gnome-session -f --debug";
|
|
|
288b884 |
+ }
|
|
|
288b884 |
|
|
|
288b884 |
object = g_object_new (GDM_TYPE_GREETER_SESSION,
|
|
|
288b884 |
- "command", BINDIR "/gnome-session -f --debug",
|
|
|
288b884 |
+ "command", command,
|
|
|
288b884 |
"server-dbus-path", GDM_GREETER_SERVER_DBUS_PATH,
|
|
|
288b884 |
"server-dbus-interface", GDM_GREETER_SERVER_DBUS_INTERFACE,
|
|
|
288b884 |
"server-env-var-name", "GDM_GREETER_DBUS_ADDRESS",
|
|
|
288b884 |
--
|
|
|
288b884 |
1.7.10
|
|
|
288b884 |
|