ayatana-commits team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  Cody Russell (bratsche)
Related merge proposals:
  https://code.launchpad.net/~bratsche/xsplash/two-log-files-and-a-microphone/+merge/13226
  proposed by: Cody Russell (bratsche)
  review: Approve - Ted Gould (ted)
------------------------------------------------------------
revno: 85 [merge]
committer: Cody Russell <crussell@xxxxxxxxxxxxx>
branch nick: trunk
timestamp: Tue 2009-10-13 16:05:49 -0400
message:
  merge lp:~bratsche/xsplash/two-log-files-and-a-microphone
modified:
  src/xsplash.c


--
lp:xsplash
https://code.launchpad.net/~xsplash-team/xsplash/trunk

Your team ayatana-commits is subscribed to branch lp:xsplash.
To unsubscribe from this branch go to https://code.launchpad.net/~xsplash-team/xsplash/trunk/+edit-subscription.

=== modified file 'src/xsplash.c'
--- src/xsplash.c	2009-10-05 21:48:01 +0000
+++ src/xsplash.c	2009-10-12 15:19:26 +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);