diff options
| author | Richard Hughes <richard@hughsie.com> | 2007-07-24 12:14:51 +0000 |
|---|---|---|
| committer | Richard Hughes <richard@hughsie.com> | 2007-07-24 12:14:51 +0000 |
| commit | 74e1b986192d817c5c84a0e71c70fb0cb0378cc6 (patch) | |
| tree | b6bc89ffea9a3c178a58bccbef2e2a29c259006b | |
| parent | 0a63547d0eda83fb90c7a4bc0cfe475880e8dc4a (diff) | |
2007-07-24 Richard Hughes <richard@hughsie.com>
* 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.
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | bus/activation.c | 5 | ||||
| -rw-r--r-- | bus/desktop-file.h | 6 |
3 files changed, 14 insertions, 4 deletions
@@ -1,5 +1,12 @@ 2007-07-24 Richard Hughes <richard@hughsie.com> + * 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 <richard@hughsie.com> + * bus/.cvsignore: Add the autogenerated binary files. 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 <errno.h> #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, |