Change object model
This commit is contained in:
Wim Taymans 2016-11-10 15:42:14 +01:00
parent d0f95fc323
commit 190f01d88e
38 changed files with 1594 additions and 3562 deletions

View file

@ -205,7 +205,7 @@ pinos_daemon_config_run_commands (PinosDaemonConfig * config,
for (walk = config->commands; walk != NULL; walk = walk->next) {
PinosCommand *command = (PinosCommand *)walk->data;
if (!pinos_command_run (command, daemon, &err)) {
if (!pinos_command_run (command, daemon->core, &err)) {
pinos_log_warn ("could not run command %s: %s",
pinos_command_get_name (command), err->message);
g_clear_error (&err);

View file

@ -29,15 +29,17 @@
gint
main (gint argc, gchar *argv[])
{
PinosCore *core;
PinosDaemon *daemon;
GMainLoop *loop;
PinosMainLoop *loop;
PinosDaemonConfig *config;
PinosProperties *props;
GError *err = NULL;
pinos_init (&argc, &argv);
loop = g_main_loop_new (NULL, FALSE);
loop = pinos_main_loop_new (NULL);
core = pinos_core_new (loop);
/* parse configuration */
config = pinos_daemon_config_new ();
@ -47,17 +49,18 @@ main (gint argc, gchar *argv[])
}
props = pinos_properties_new ("test", "test", NULL);
daemon = pinos_daemon_new (props);
daemon = pinos_daemon_new (core,
props);
pinos_daemon_config_run_commands (config, daemon);
pinos_daemon_start (daemon);
g_main_loop_run (loop);
pinos_main_loop_run (loop);
pinos_properties_free (props);
g_main_loop_unref (loop);
g_object_unref (daemon);
pinos_main_loop_destroy (loop);
pinos_daemon_destroy (daemon);
return 0;
}