Merge lp:~bratsche/xsplash/two-log-files-and-a-microphone into lp:xsplash

[Cody Russell]

[Ted Gould (ted)]

review: Approve

=== modified file 'src/xsplash.c'
--- src/xsplash.c	2009-10-05 21:48:01 +0000
+++ src/xsplash.c	2009-10-12 15:25:18 +0000
@@ -997,8 +997,6 @@
     }
 }
 
-#define XSPLASH_LOG "/var/log/gdm/xsplash.log"
-
 int
 main (int argc, char *argv[])
 {
@@ -1008,6 +1006,7 @@
   DBusGConnection *system_bus;
   DBusGProxy      *bus_proxy;
   guint            nameret = 0;
+  gchar           *log_filename = NULL;
   struct passwd   *pwd;
 
   pwd = getpwnam (XSPLASH_USER);
@@ -1039,10 +1038,12 @@
       exit (1);
     }
 
+  log_filename = g_strdup_printf ("/var/log/gdm/xsplash-%s.log", gdm_session ? "gdm" : "user");
+  log_init (log_filename); g_message ("xsplash started");
+  g_free (log_filename);
+
   gtk_init (&argc, &argv);
 
-  log_init (XSPLASH_LOG); g_message ("xsplash started");
-
   signal (SIGHUP, sig_handler);
   signal (SIGINT, sig_handler);
   signal (SIGTERM, sig_handler);