[gdm/f17] be less noisy

[Ray Strode]

commit 288b8849eea5ad30905b8ee131eb427dd07cfb5a
Author: Ray Strode <rstrode at redhat.com>
Date:   Fri Jun 8 18:57:09 2012 -0400

    be less noisy

 be-less-noisy.patch |   53 +++++++++++++++++++++++++++++++++++++++++++++++++++
 gdm.spec            |    9 +++++++-
 2 files changed, 61 insertions(+), 1 deletions(-)
---
diff --git a/be-less-noisy.patch b/be-less-noisy.patch
new file mode 100644
index 0000000..b4cd158
--- /dev/null
+++ b/be-less-noisy.patch
@@ -0,0 +1,53 @@
+From 74fc44269613cffef07978b4158c62a9cb887821 Mon Sep 17 00:00:00 2001
+From: Ray Strode <rstrode at redhat.com>
+Date: Fri, 8 Jun 2012 11:03:31 -0400
+Subject: [PATCH] slave: only start gnome-session with --debug if debug
+ enabled
+
+gnome-session puts all its message in syslog when --debug is
+enabled.  This floods the log and makes it hard to see other
+messages.
+
+This commit only calls gnome-session with --debug when gdm
+debugging is on.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=672801
+---
+ daemon/gdm-greeter-session.c |   12 +++++++++++-
+ 1 file changed, 11 insertions(+), 1 deletion(-)
+
+diff --git a/daemon/gdm-greeter-session.c b/daemon/gdm-greeter-session.c
+index 44259ab..464b16b 100644
+--- a/daemon/gdm-greeter-session.c
++++ b/daemon/gdm-greeter-session.c
+@@ -39,6 +39,8 @@
+ 
+ #include "gdm-welcome-session.h"
+ #include "gdm-greeter-session.h"
++#include "gdm-settings-direct.h"
++#include "gdm-settings-keys.h"
+ 
+ #define GDM_GREETER_SERVER_DBUS_PATH      "/org/gnome/DisplayManager/GreeterServer"
+ #define GDM_GREETER_SERVER_DBUS_INTERFACE "org.gnome.DisplayManager.GreeterServer"
+@@ -76,9 +78,17 @@ gdm_greeter_session_new (const char *display_name,
+                          gboolean    display_is_local)
+ {
+         GObject *object;
++        gboolean debug = FALSE;
++        char *command = BINDIR "/gnome-session -f";
++
++        gdm_settings_direct_get_boolean (GDM_KEY_DEBUG, &debug);
++
++        if (debug) {
++                command = BINDIR "/gnome-session -f --debug";
++        }
+ 
+         object = g_object_new (GDM_TYPE_GREETER_SESSION,
+-                               "command", BINDIR "/gnome-session -f --debug",
++                               "command", command,
+                                "server-dbus-path", GDM_GREETER_SERVER_DBUS_PATH,
+                                "server-dbus-interface", GDM_GREETER_SERVER_DBUS_INTERFACE,
+                                "server-env-var-name", "GDM_GREETER_DBUS_ADDRESS",
+-- 
+1.7.10
+
diff --git a/gdm.spec b/gdm.spec
index 98deec2..f3f086b 100644
--- a/gdm.spec
+++ b/gdm.spec
@@ -14,7 +14,7 @@
 Summary: The GNOME Display Manager
 Name: gdm
 Version: 3.4.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 Epoch: 1
 License: GPLv2+
 Group: User Interface/X
@@ -101,6 +101,7 @@ Obsoletes: gdm-plugin-fingerprint < 1:3.2.1
 Provides: gdm-plugin-fingerprint = %{epoch}:%{version}-%{release}
 
 Patch0: fix-pam-close-session.patch
+Patch1: be-less-noisy.patch
 # Fedora-specific
 Patch98: plymouth.patch
 
@@ -133,6 +134,7 @@ Development files and headers for writing GDM greeters.
 %setup -q
 
 %patch0 -p1 -b .fix-pam-close-session
+%patch1 -p1 -b .be-less-noisy
 %patch98 -p1 -b .plymouth
 
 autoreconf -i -f
@@ -377,6 +379,11 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || :
 %{_libdir}/girepository-1.0/GdmGreeter-1.0.typelib
 
 %changelog
+* Fri Jun 08 2012 Ray Strode <rstrode at redhat.com> 3.4.1-3
+- Don't fill syslog with gnome-session spew
+  Resolves: #759737
+  Resolves: #755135
+
 * Sat May 05 2012 Ray Strode <rstrode at redhat.com> 3.4.1-2
 - Fix pam close session
   Related: #814690