aboutsummaryrefslogtreecommitdiff
blob: 6932e4cda02e26e5eb34679c11fdee2cfcd1c70b (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
http://cgit.freedesktop.org/dbus/dbus/commit/dbus/dbus-sysdeps-unix.c?id=66e52541d5bdd4927a5c702963749760643313f4

http://bugs.gentoo.org/390463

--- src/ibusshare.c
+++ src/ibusshare.c
@@ -41,7 +41,11 @@ ibus_get_local_machine_id (void)
 
     if (machine_id == NULL) {
         GError *error = NULL;
-        if (!g_file_get_contents ("/var/lib/dbus/machine-id",
+        if (!g_file_get_contents ("/etc/machine-id",
+                                  &machine_id,
+                                  NULL,
+                                  NULL) &&
+            !g_file_get_contents ("/var/lib/dbus/machine-id",
                                   &machine_id,
                                   NULL,
                                   &error)) {