diff options
| author | Martin Pitt <martinpitt@gnome.org> | 2013-02-20 15:02:37 +0100 |
|---|---|---|
| committer | Martin Pitt <martinpitt@gnome.org> | 2013-02-20 15:02:37 +0100 |
| commit | 33dfc13c070497b0bf27307e8b17a4c048cde235 (patch) | |
| tree | c96889919ab665d3f9620743c4443b6ddc55b4b0 /src/up-main.c | |
| parent | da066045e4e3ffde26e63285a818880be6ff3316 (diff) | |
| download | upower-33dfc13c070497b0bf27307e8b17a4c048cde235.tar.gz | |
Revert "Add option to run daemon on the session bus for testing"
This reverts commit eddcf0ef3d0b8445618e368328d7e110a83b69b3.
We don't need the --test option any more now that we always run tests on a
(fake) system D-BUS.
Diffstat (limited to 'src/up-main.c')
| -rw-r--r-- | src/up-main.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/up-main.c b/src/up-main.c index 9c4d681..6201a44 100644 --- a/src/up-main.c +++ b/src/up-main.c @@ -189,7 +189,6 @@ main (gint argc, gchar **argv) gint retval = 1; gboolean timed_exit = FALSE; gboolean immediate_exit = FALSE; - gboolean session_bus = FALSE; guint timer_id = 0; gboolean verbose = FALSE; @@ -200,8 +199,6 @@ main (gint argc, gchar **argv) { "immediate-exit", '\0', 0, G_OPTION_ARG_NONE, &immediate_exit, /* TRANSLATORS: exit straight away, used for automatic profiling */ _("Exit after the engine has loaded"), NULL }, - { "test", '\0', 0, G_OPTION_ARG_NONE, &session_bus, - _("Run on the session bus (only for testing)"), NULL }, { "verbose", 'v', 0, G_OPTION_ARG_NONE, &verbose, _("Show extra debugging information"), NULL }, { NULL} @@ -244,9 +241,7 @@ main (gint argc, gchar **argv) } /* get bus connection */ - if (session_bus) - up_daemon_set_bus_type (DBUS_BUS_SESSION); - bus = dbus_g_bus_get (up_daemon_get_bus_type (), &error); + bus = dbus_g_bus_get (DBUS_BUS_SYSTEM, &error); if (bus == NULL) { g_warning ("Couldn't connect to system bus: %s", error->message); g_error_free (error); |