diff options
| author | Alexander Larsson <alexander.larsson@gmail.com> | 2016-04-14 19:30:57 +0200 |
|---|---|---|
| committer | Alexander Larsson <alexander.larsson@gmail.com> | 2016-04-14 19:30:57 +0200 |
| commit | b06528e0eff1ef4a3ce47bfed0d9b847e8907d45 (patch) | |
| tree | 8d9a65aac9a622ffd98434e3601a052927ba3152 /common | |
| parent | 1dd993cad6260aa181e767b5370e27f72ffd6217 (diff) | |
| parent | fd4c1018d4d2e487fb4309337504db954b302f5d (diff) | |
| download | xdg-app-b06528e0eff1ef4a3ce47bfed0d9b847e8907d45.tar.gz | |
Merge pull request #127 from matthiasclasen/bus-logging
Bus logging
Diffstat (limited to 'common')
| -rw-r--r-- | common/xdg-app-run.c | 7 | ||||
| -rw-r--r-- | common/xdg-app-run.h | 6 |
2 files changed, 9 insertions, 4 deletions
diff --git a/common/xdg-app-run.c b/common/xdg-app-run.c index 85bf5a7..ecf8ede 100644 --- a/common/xdg-app-run.c +++ b/common/xdg-app-run.c @@ -2120,6 +2120,7 @@ dbus_spawn_child_setup (gpointer user_data) static gboolean add_dbus_proxy_args (GPtrArray *argv_array, GPtrArray *dbus_proxy_argv, + gboolean enable_logging, GError **error) { int sync_proxy_pipes[2]; @@ -2136,6 +2137,8 @@ add_dbus_proxy_args (GPtrArray *argv_array, g_ptr_array_insert (dbus_proxy_argv, 0, g_strdup (DBUSPROXY)); g_ptr_array_insert (dbus_proxy_argv, 1, g_strdup_printf ("--fd=%d", sync_proxy_pipes[1])); + if (enable_logging) + g_ptr_array_add (dbus_proxy_argv, g_strdup ("--log")); g_ptr_array_add (dbus_proxy_argv, NULL); /* NULL terminate */ @@ -2309,10 +2312,10 @@ xdg_app_run_app (const char *app_ref, if (!xdg_app_run_in_transient_unit (app_ref_parts[1], error)) return FALSE; - if (!add_dbus_proxy_args (argv_array, session_bus_proxy_argv, error)) + if (!add_dbus_proxy_args (argv_array, session_bus_proxy_argv, (flags & XDG_APP_RUN_FLAG_LOG_SESSION_BUS) != 0, error)) return FALSE; - if (!add_dbus_proxy_args (argv_array, system_bus_proxy_argv, error)) + if (!add_dbus_proxy_args (argv_array, system_bus_proxy_argv, (flags & XDG_APP_RUN_FLAG_LOG_SYSTEM_BUS) != 0, error)) return FALSE; app_files = xdg_app_deploy_get_files (app_deploy); diff --git a/common/xdg-app-run.h b/common/xdg-app-run.h index 0039007..94462f0 100644 --- a/common/xdg-app-run.h +++ b/common/xdg-app-run.h @@ -82,8 +82,10 @@ GFile *xdg_app_ensure_data_dir (const char *app_id, GError **error); typedef enum { - XDG_APP_RUN_FLAG_DEVEL = (1<<0), - XDG_APP_RUN_FLAG_BACKGROUND = (1<<1), + XDG_APP_RUN_FLAG_DEVEL = (1<<0), + XDG_APP_RUN_FLAG_BACKGROUND = (1<<1), + XDG_APP_RUN_FLAG_LOG_SESSION_BUS = (1<<2), + XDG_APP_RUN_FLAG_LOG_SYSTEM_BUS = (1<<3), } XdgAppRunFlags; gboolean xdg_app_run_app (const char *app_ref, |