summaryrefslogtreecommitdiffstats
path: root/bus/main.c
diff options
context:
space:
mode:
authorAnders Carlsson <andersca@codefactory.se>2003-02-15 18:22:40 +0000
committerAnders Carlsson <andersca@codefactory.se>2003-02-15 18:22:40 +0000
commitefd53eca67b7d0937533c3b8790368a368fb7dcb (patch)
treea6062d8e53b0361a3c1d184852caaae8f0fc7a35 /bus/main.c
parentbc6cd6fa8586ca0d059961719a6a61df5e063971 (diff)
2003-02-15 Anders Carlsson <andersca@codefactory.se>
* bus/Makefile.am: * bus/activation.c: (bus_activation_entry_free), (add_desktop_file_entry), (load_directory), (bus_activation_init): * bus/activation.h: * bus/main.c: (main): Add simple activation support, doesn't work yet though.
Diffstat (limited to 'bus/main.c')
-rw-r--r--bus/main.c14
1 files changed, 13 insertions, 1 deletions
diff --git a/bus/main.c b/bus/main.c
index fb5e0397..68e3a7b9 100644
--- a/bus/main.c
+++ b/bus/main.c
@@ -21,6 +21,7 @@
*
*/
#include "loop.h"
+#include "activation.h"
#include "connection.h"
#include "driver.h"
#include <dbus/dbus-list.h>
@@ -81,6 +82,17 @@ main (int argc, char **argv)
return 1;
}
+ if (argc < 3)
+ {
+ _dbus_warn ("No service location given, not activating activation\n");
+ }
+ else
+ {
+ char *paths[] = { argv[2], NULL };
+
+ bus_activation_init (paths);
+ }
+
server = dbus_server_listen (argv[1], &result);
if (server == NULL)
{
@@ -88,7 +100,7 @@ main (int argc, char **argv)
argv[1], dbus_result_to_string (result));
return 1;
}
-
+
setup_server (server);
bus_connection_init ();