diff options
Diffstat (limited to 'bus/activation-helper.c')
-rw-r--r-- | bus/activation-helper.c | 61 |
1 files changed, 30 insertions, 31 deletions
diff --git a/bus/activation-helper.c b/bus/activation-helper.c index baba8f04..6ce02401 100644 --- a/bus/activation-helper.c +++ b/bus/activation-helper.c @@ -27,7 +27,6 @@ #include "bus.h" #include "driver.h" #include "utils.h" -#include "desktop-file.h" #include "config-parser-trivial.h" #include "activation-helper.h" #include "activation-exit-codes.h" @@ -42,13 +41,14 @@ #include <dbus/dbus-shell.h> #include <dbus/dbus-marshal-validate.h> +#include <dbus/dbus-desktop-file.h> -static BusDesktopFile * +static DBusDesktopFile * desktop_file_for_name (BusConfigParser *parser, const char *name, DBusError *error) { - BusDesktopFile *desktop_file; + DBusDesktopFile *desktop_file; DBusList **service_dirs; DBusList *link; DBusError tmp_error; @@ -101,7 +101,7 @@ desktop_file_for_name (BusConfigParser *parser, } _dbus_verbose ("Trying to load file '%s'\n", _dbus_string_get_data (&full_path)); - desktop_file = bus_desktop_file_load (&full_path, &tmp_error); + desktop_file = _dbus_desktop_file_load (&full_path, &tmp_error); if (desktop_file == NULL) { _DBUS_ASSERT_ERROR_IS_SET (&tmp_error); @@ -222,9 +222,9 @@ check_permissions (const char *dbus_user, DBusError *error) } static dbus_bool_t -check_service_name (BusDesktopFile *desktop_file, - const char *service_name, - DBusError *error) +check_service_name (DBusDesktopFile *desktop_file, + const char *service_name, + DBusError *error) { char *name_tmp; dbus_bool_t retval; @@ -232,11 +232,11 @@ check_service_name (BusDesktopFile *desktop_file, retval = FALSE; /* try to get Name */ - if (!bus_desktop_file_get_string (desktop_file, - DBUS_SERVICE_SECTION, - DBUS_SERVICE_NAME, - &name_tmp, - error)) + if (!_dbus_desktop_file_get_string (desktop_file, + DBUS_SERVICE_SECTION, + DBUS_SERVICE_NAME, + &name_tmp, + error)) goto failed; /* verify that the name is the same as the file service name */ @@ -257,11 +257,11 @@ failed: } static dbus_bool_t -get_parameters_for_service (BusDesktopFile *desktop_file, - const char *service_name, - char **exec, - char **user, - DBusError *error) +get_parameters_for_service (DBusDesktopFile *desktop_file, + const char *service_name, + char **exec, + char **user, + DBusError *error) { char *exec_tmp; char *user_tmp; @@ -274,22 +274,22 @@ get_parameters_for_service (BusDesktopFile *desktop_file, goto failed; /* get the complete path of the executable */ - if (!bus_desktop_file_get_string (desktop_file, - DBUS_SERVICE_SECTION, - DBUS_SERVICE_EXEC, - &exec_tmp, - error)) + if (!_dbus_desktop_file_get_string (desktop_file, + DBUS_SERVICE_SECTION, + DBUS_SERVICE_EXEC, + &exec_tmp, + error)) { _DBUS_ASSERT_ERROR_IS_SET (error); goto failed; } /* get the user that should run this service - user is compulsary for system activation */ - if (!bus_desktop_file_get_string (desktop_file, - DBUS_SERVICE_SECTION, - DBUS_SERVICE_USER, - &user_tmp, - error)) + if (!_dbus_desktop_file_get_string (desktop_file, + DBUS_SERVICE_SECTION, + DBUS_SERVICE_USER, + &user_tmp, + error)) { _DBUS_ASSERT_ERROR_IS_SET (error); goto failed; @@ -394,7 +394,7 @@ check_bus_name (const char *bus_name, bus_name); return FALSE; } - + return TRUE; } @@ -468,7 +468,7 @@ out: static dbus_bool_t launch_bus_name (const char *bus_name, BusConfigParser *parser, DBusError *error) { - BusDesktopFile *desktop_file; + DBusDesktopFile *desktop_file; char *exec, *user; dbus_bool_t retval; @@ -498,7 +498,7 @@ launch_bus_name (const char *bus_name, BusConfigParser *parser, DBusError *error finish: dbus_free (exec); dbus_free (user); - bus_desktop_file_free (desktop_file); + _dbus_desktop_file_free (desktop_file); return retval; } @@ -560,4 +560,3 @@ error_free_parser: error: return retval; } - |