[gnome-settings-daemon] daemon: Support explicitly setting G_MESSAGES_DEBUG

[Bastien Nocera <hadess src gnome org>]

commit 0bef7a8110683608390dd7f0ed2617367997fa3f
Author: Martin Pitt <martin pitt ubuntu com>
Date:   Mon Mar 12 18:07:19 2012 +0100

    daemon: Support explicitly setting G_MESSAGES_DEBUG
    
    Do not force G_MESSAGES_DEBUG to "all" if it is already set. This makes it much
    easier to limit debug output to a particular plugin by starting g-s-d with
    e. g. G_MESSAGES_DEBUG="mouse-plugin".
    
    https://bugzilla.gnome.org/show_bug.cgi?id=671928

 gnome-settings-daemon/main.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/gnome-settings-daemon/main.c b/gnome-settings-daemon/main.c
index 5db8626..7040afd 100644
--- a/gnome-settings-daemon/main.c
+++ b/gnome-settings-daemon/main.c
@@ -394,7 +394,7 @@ parse_args (int *argc, char ***argv)
 
         gnome_settings_profile_end (NULL);
 
-        if (debug)
+        if (debug && g_getenv ("G_MESSAGES_DEBUG") == NULL)
                 g_setenv ("G_MESSAGES_DEBUG", "all", TRUE);
 }