diff options
| author | Robert Ancell <robert.ancell@canonical.com> | 2012-01-13 14:05:33 +0100 |
|---|---|---|
| committer | Robert Ancell <robert.ancell@canonical.com> | 2012-01-13 14:05:33 +0100 |
| commit | d2ad84e4af3973cece387191e9ae82f4a0cc0cb8 (patch) | |
| tree | b545e6c5dd193a2b41e889b01f149eb92006ec7a /src | |
| parent | fd69a14c07101e0934b6e01bf60b1cf2c8e9aece (diff) | |
| download | lightdm-d2ad84e4af3973cece387191e9ae82f4a0cc0cb8.tar.gz | |
Control more of D-Bus in the regression tests
Diffstat (limited to 'src')
| -rw-r--r-- | src/accounts.c | 4 | ||||
| -rw-r--r-- | src/display.c | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/accounts.c b/src/accounts.c index cef5136e..e974c543 100644 --- a/src/accounts.c +++ b/src/accounts.c @@ -160,7 +160,7 @@ get_accounts_service_proxy () if (have_accounts_service_proxy) return accounts_service_proxy; - + have_accounts_service_proxy = TRUE; accounts_service_proxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SYSTEM, G_DBUS_PROXY_FLAGS_NONE, @@ -214,7 +214,7 @@ get_accounts_proxy_for_user (const gchar *user) if (!user_path) return NULL; - + proxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SYSTEM, G_DBUS_PROXY_FLAGS_NONE, NULL, diff --git a/src/display.c b/src/display.c index 327b40fa..c27b5cb5 100644 --- a/src/display.c +++ b/src/display.c @@ -507,6 +507,8 @@ create_session (Display *display, PAMSession *authentication, const gchar *sessi session_set_env (session, "LIGHTDM_TEST_STATUS_SOCKET", g_getenv ("LIGHTDM_TEST_STATUS_SOCKET")); session_set_env (session, "LIGHTDM_TEST_CONFIG", g_getenv ("LIGHTDM_TEST_CONFIG")); session_set_env (session, "LIGHTDM_TEST_HOME_DIR", g_getenv ("LIGHTDM_TEST_HOME_DIR")); + session_set_env (session, "DBUS_SYSTEM_BUS_ADDRESS", g_getenv ("DBUS_SYSTEM_BUS_ADDRESS")); + session_set_env (session, "DBUS_SESSION_BUS_ADDRESS", g_getenv ("DBUS_SESSION_BUS_ADDRESS")); session_set_env (session, "LD_PRELOAD", g_getenv ("LD_PRELOAD")); session_set_env (session, "LD_LIBRARY_PATH", g_getenv ("LD_LIBRARY_PATH")); } |