From 74e1b986192d817c5c84a0e71c70fb0cb0378cc6 Mon Sep 17 00:00:00 2001 From: Richard Hughes Date: Tue, 24 Jul 2007 12:14:51 +0000 Subject: 2007-07-24 Richard Hughes * bus/activation.c: * bus/desktop-file.h: Move the defines into the header file, as we use these in the lauch helper as well as the desktop file parsing. --- ChangeLog | 7 +++++++ bus/activation.c | 5 +---- bus/desktop-file.h | 6 ++++++ 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index da2406ff..4d7029fb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2007-07-24 Richard Hughes + + * bus/activation.c: + * bus/desktop-file.h: + Move the defines into the header file, as we use these in the lauch + helper as well as the desktop file parsing. + 2007-07-24 Richard Hughes * bus/.cvsignore: diff --git a/bus/activation.c b/bus/activation.c index 89c6df48..06dcf0ad 100644 --- a/bus/activation.c +++ b/bus/activation.c @@ -23,6 +23,7 @@ * */ #include "activation.h" +#include "activation-exit-codes.h" #include "desktop-file.h" #include "services.h" #include "test.h" @@ -38,10 +39,6 @@ #include #endif -#define DBUS_SERVICE_SECTION "D-BUS Service" -#define DBUS_SERVICE_NAME "Name" -#define DBUS_SERVICE_EXEC "Exec" - struct BusActivation { int refcount; diff --git a/bus/desktop-file.h b/bus/desktop-file.h index e4b9a6d2..549f89a4 100644 --- a/bus/desktop-file.h +++ b/bus/desktop-file.h @@ -30,6 +30,12 @@ #define BUS_DESKTOP_PARSE_ERROR_INVALID_ESCAPES "org.freedesktop.DBus.DesktopParseError.InvalidEscapes" #define BUS_DESKTOP_PARSE_ERROR_INVALID_CHARS "org.freedesktop.DBus.DesktopParseError.InvalidChars" +#define DBUS_SERVICE_SECTION "D-BUS Service" +#define DBUS_SERVICE_NAME "Name" +#define DBUS_SERVICE_EXEC "Exec" +#define DBUS_SERVICE_USER "User" +#define DBUS_SERVICE_GROUP "Group" + typedef struct BusDesktopFile BusDesktopFile; BusDesktopFile *bus_desktop_file_load (DBusString *filename, -- cgit