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.

diff --git a/ChangeLog b/ChangeLog
index da2406ffd2f8f55669224f26a8c1f092e1a31f6f..4d7029fb84166f82cb0bcc6c37e379da83b36a13 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+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:

diff --git a/bus/activation.c b/bus/activation.c
index 89c6df48aa24bda01188357f85ee55082a70069e..06dcf0ad8264483726e2c49b74f708fb4a71b065 100644 (file)
--- 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 e4b9a6d2ee4e284fe8f23b902560fdc65c3e33fc..549f89a475bee5bdeb5d4ca8c735fd67823a08c1 100644 (file)
--- 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,