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

Proposed by Cody Russell on 2009-10-12
Status: Merged
Merged at revision: not available
Proposed branch: lp:~bratsche/xsplash/two-log-files-and-a-microphone
Merge into: lp:xsplash
Diff against target: 35 lines
1 file modified
src/xsplash.c (+5/-4)
To merge this branch: bzr merge lp:~bratsche/xsplash/two-log-files-and-a-microphone
Reviewer Review Type Date Requested Status
Ted Gould (community) 2009-10-12 Approve on 2009-10-13
Review via email: mp+13226@code.launchpad.net
To post a comment you must log in.
Ted Gould (ted) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/xsplash.c'
2--- src/xsplash.c 2009-10-05 21:48:01 +0000
3+++ src/xsplash.c 2009-10-12 15:25:18 +0000
4@@ -997,8 +997,6 @@
5 }
6 }
7
8-#define XSPLASH_LOG "/var/log/gdm/xsplash.log"
9-
10 int
11 main (int argc, char *argv[])
12 {
13@@ -1008,6 +1006,7 @@
14 DBusGConnection *system_bus;
15 DBusGProxy *bus_proxy;
16 guint nameret = 0;
17+ gchar *log_filename = NULL;
18 struct passwd *pwd;
19
20 pwd = getpwnam (XSPLASH_USER);
21@@ -1039,10 +1038,12 @@
22 exit (1);
23 }
24
25+ log_filename = g_strdup_printf ("/var/log/gdm/xsplash-%s.log", gdm_session ? "gdm" : "user");
26+ log_init (log_filename); g_message ("xsplash started");
27+ g_free (log_filename);
28+
29 gtk_init (&argc, &argv);
30
31- log_init (XSPLASH_LOG); g_message ("xsplash started");
32-
33 signal (SIGHUP, sig_handler);
34 signal (SIGINT, sig_handler);
35 signal (SIGTERM, sig_handler);

Subscribers

People subscribed via source and target branches