~upstart-devel/upstart/trunk

« back to all changes in this revision

Viewing changes to init/control.c

  • Committer: Dimitri John Ledkov
  • Date: 2016-05-13 08:46:32 UTC
  • mfrom: (1667.2.1 upstart)
  • Revision ID: xnox@ubuntu.com-20160513084632-crex5p5fejugd06t
mergeĀ lp:~3v1n0/upstart/activation-proper-dbus-path

Show diffs side-by-side

added added

removed removed

Lines of Context:
1445
1445
                                        dbus_vars[0]->item1 = nih_strdup (dbus_vars[0], "");
1446
1446
                                }
1447
1447
 
1448
 
                                dbus_proxy = NIH_SHOULD (nih_dbus_proxy_new (dbus_vars, control_bus, "org.freedesktop.DBus", "/", NULL, NULL));
 
1448
                                dbus_proxy = NIH_SHOULD (nih_dbus_proxy_new (dbus_vars, control_bus,
 
1449
                                        "org.freedesktop.DBus", "/org/freedesktop/DBus", NULL, NULL));
 
1450
 
1449
1451
                                if (! dbus_proxy) {
1450
1452
                                        nih_warn (_("Failed to get dbus_proxy"));
1451
1453
                                } else {