From dc11cfe515bd4dcd4ad4c8904e43940cf6747f14 Mon Sep 17 00:00:00 2001 From: Nedko Arnaudov Date: Mon, 16 May 2011 03:40:35 +0300 Subject: [PATCH] daemon: move ladish_room::graph member to the common section It is used for room template objects as well --- daemon/room_internal.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/daemon/room_internal.h b/daemon/room_internal.h index f12fafb4..e8aa7f31 100644 --- a/daemon/room_internal.h +++ b/daemon/room_internal.h @@ -2,7 +2,7 @@ /* * LADI Session Handler (ladish) * - * Copyright (C) 2010 Nedko Arnaudov + * Copyright (C) 2010, 2011 Nedko Arnaudov * ************************************************************************** * This file contains internal declarations used by the room object implementation @@ -42,6 +42,7 @@ struct ladish_room uuid_t uuid; char * name; bool template; + ladish_graph_handle graph; /* these are not valid for templates */ uuid_t template_uuid; @@ -50,7 +51,6 @@ struct ladish_room char * object_path; dbus_object_path dbus_object; uint64_t version; - ladish_graph_handle graph; ladish_app_supervisor_handle app_supervisor; ladish_client_handle client; bool started;