community/ibus/ibus-1389-dbus-address.patch


1
2
3
4
5
6
7
8
9
10
11
12
13
14
15

--- ibus-1.4.99.20120317/src/ibusshare.c.orig	2012-04-26 12:24:55.922072674 +0900
+++ ibus-1.4.99.20120317/src/ibusshare.c	2012-04-26 13:10:44.301421547 +0900
@@ -44,7 +44,11 @@ ibus_get_local_machine_id (void)
         if (!g_file_get_contents ("/var/lib/dbus/machine-id",
                                   &machine_id,
                                   NULL,
-                                  &error)) {
+                                  &error) &&
+            !g_file_get_contents ("/etc/machine-id",
+                                  &machine_id,
+                                  NULL,
+                                  NULL)) {
             g_warning ("Unable to load /var/lib/dbus/machine-id: %s", error->message);
             g_error_free (error);
             machine_id = "machine-id";