1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
|
From 0c32736980a4f02d4eacf90d145bf937bf29dea6 Mon Sep 17 00:00:00 2001
From: Vincent Untz <vuntz@gnome.org>
Date: Thu, 21 Jul 2011 16:04:13 -0400
Subject: [PATCH 2/4] daemon: use PATH_GDM_CUSTOM instead of string literal
It's better to consolidate references to file path in one
place up top.
---
src/daemon.c | 13 ++++---------
1 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/src/daemon.c b/src/daemon.c
index f8753d6..eb9aa61 100644
--- a/src/daemon.c
+++ b/src/daemon.c
@@ -50,6 +50,7 @@
#define PATH_PASSWD "/etc/passwd"
#define PATH_SHADOW "/etc/shadow"
#define PATH_LOGIN_DEFS "/etc/login.defs"
+#define PATH_GDM_CUSTOM "/etc/gdm/custom.conf"
#ifndef FALLBACK_MINIMAL_UID
#define FALLBACK_MINIMAL_UID 500
@@ -1207,15 +1208,12 @@ load_autologin (Daemon *daemon,
GError **error)
{
GKeyFile *keyfile;
- const gchar *filename;
GError *local_error;
gchar *string;
- filename = "/etc/gdm/custom.conf";
-
keyfile = g_key_file_new ();
if (!g_key_file_load_from_file (keyfile,
- filename,
+ PATH_GDM_CUSTOM,
G_KEY_FILE_KEEP_COMMENTS,
error)) {
g_key_file_free (keyfile);
@@ -1257,15 +1255,12 @@ save_autologin (Daemon *daemon,
GError **error)
{
GKeyFile *keyfile;
- const gchar *filename;
gchar *data;
gboolean result;
- filename = "/etc/gdm/custom.conf";
-
keyfile = g_key_file_new ();
if (!g_key_file_load_from_file (keyfile,
- filename,
+ PATH_GDM_CUSTOM,
G_KEY_FILE_KEEP_COMMENTS,
error)) {
g_key_file_free (keyfile);
@@ -1276,7 +1271,7 @@ save_autologin (Daemon *daemon,
g_key_file_set_string (keyfile, "daemon", "AutomaticLogin", name);
data = g_key_file_to_data (keyfile, NULL, NULL);
- result = g_file_set_contents (filename, data, -1, error);
+ result = g_file_set_contents (PATH_GDM_CUSTOM, data, -1, error);
g_key_file_free (keyfile);
g_free (data);
--
1.7.6
|
GitWeb
