util: rename join() to strjoin()

[elogind.git] / src / core / dbus-manager.c

diff --git a/src/core/dbus-manager.c b/src/core/dbus-manager.c
index cd827ca458ddbcbd16a6ce6c5e0517f71addd5fd..67b7b13eacf3e1bde64df8effa86a376417670e9 100644 (file)
--- a/src/core/dbus-manager.c
+++ b/src/core/dbus-manager.c
@@ -114,7 +114,9 @@
         "  </method>\n"                                                 \
         "  <method name=\"Subscribe\"/>\n"                              \
         "  <method name=\"Unsubscribe\"/>\n"                            \
-        "  <method name=\"Dump\"/>\n"                                   \
+        "  <method name=\"Dump\">\n"                                    \
+        "   <arg name=\"dump\" type=\"s\" direction=\"out\"/>\n"        \
+        "  </method>\n"                                                 \
         "  <method name=\"CreateSnapshot\">\n"                          \
         "   <arg name=\"name\" type=\"s\" direction=\"in\"/>\n"         \
         "   <arg name=\"cleanup\" type=\"b\" direction=\"in\"/>\n"      \
@@ -1177,7 +1179,7 @@ static DBusHandlerResult bus_manager_message_handler(DBusConnection *connection,
                 else {
                         char *p;
 
-                        p = join(switch_root, "/", switch_root_init, NULL);
+                        p = strjoin(switch_root, "/", switch_root_init, NULL);
                         if (!p)
                                 goto oom;