diff options
| author | Ralf Habacker <ralf.habacker@freenet.de> | 2015-11-10 22:25:53 +0100 |
|---|---|---|
| committer | Ralf Habacker <ralf.habacker@freenet.de> | 2015-11-12 22:58:27 +0100 |
| commit | 812cf35afa3a55de9fbb53ee38783c2c3751283c (patch) | |
| tree | 7c2a0763350bc98d2f9e56ffe850cc4bfe8bca57 | |
| parent | 4f928819d1064e795af64c631b50906e5520b09c (diff) | |
desktop-file-fixupmove-desktop-file-parser-to-dbus
| -rw-r--r-- | bus/activation-helper.c | 36 | ||||
| -rw-r--r-- | cmake/bus/CMakeLists.txt | 2 |
2 files changed, 19 insertions, 19 deletions
diff --git a/bus/activation-helper.c b/bus/activation-helper.c index 394f3938c..49a9d96d2 100644 --- a/bus/activation-helper.c +++ b/bus/activation-helper.c @@ -27,7 +27,7 @@ #include "bus.h" #include "driver.h" #include "utils.h" -#include "desktop-file.h" +#include <dbus/desktop-file.h> #include "config-parser-trivial.h" #include "activation-helper.h" #include "activation-exit-codes.h" @@ -102,7 +102,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); @@ -215,11 +215,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,22 +257,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; @@ -484,7 +484,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; } diff --git a/cmake/bus/CMakeLists.txt b/cmake/bus/CMakeLists.txt index ed4e96647..942569ca4 100644 --- a/cmake/bus/CMakeLists.txt +++ b/cmake/bus/CMakeLists.txt @@ -2,7 +2,7 @@ add_definitions(-DDBUS_COMPILATION) SET(EFENCE "") SET(BUS_DIR ${CMAKE_SOURCE_DIR}/../bus) - +SET(DBUS_DIR ${CMAKE_SOURCE_DIR}/../dbus) # config files for installation CONFIGURE_FILE( "${BUS_DIR}/session.conf.in" "${CMAKE_CURRENT_BINARY_DIR}/session.conf" IMMEDIATE @ONLY) CONFIGURE_FILE( "${BUS_DIR}/legacy-config/session.conf.in" "${CMAKE_CURRENT_BINARY_DIR}/legacy-config/session.conf" IMMEDIATE @ONLY) |