From ba9b72bce438c257aeeb8bc06af57b5411b7102c Mon Sep 17 00:00:00 2001
From: Ichthyostega <prg@ichthyostega.de>
Date: Sat, 10 Jan 2009 21:35:43 +0100
Subject: [PATCH] Fixes after merge

---
 src/common/Makefile.am              |  2 +-
 src/gui/Makefile.am                 | 25 +++++++++++++------------
 src/gui/gtk-lumiera.cpp             |  2 +-
 tests/lib/subsystem-runner-test.cpp |  3 +--
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/common/Makefile.am b/src/common/Makefile.am
index 5833b9ba1..337bf1595 100644
--- a/src/common/Makefile.am
+++ b/src/common/Makefile.am
@@ -61,6 +61,6 @@ noinst_HEADERS +=							\
 	$(liblumieracommon_la_srcdir)/subsys.hpp			\
 	$(liblumieracommon_la_srcdir)/appstate.hpp			\
 	$(liblumieracommon_la_srcdir)/option.hpp			\
-	$(liblumieracommon_la_srcdir)/subsystemrunner.hpp		\
+	$(liblumieracommon_la_srcdir)/subsystem-runner.hpp		\
 	$(liblumieracommon_la_srcdir)/instancehandle.hpp
 
diff --git a/src/gui/Makefile.am b/src/gui/Makefile.am
index 70e8264fb..4d39b39a6 100644
--- a/src/gui/Makefile.am
+++ b/src/gui/Makefile.am
@@ -64,7 +64,7 @@ pkglib_LTLIBRARIES += gtk_gui.la
 
 gtk_gui_la_CFLAGS = $(AM_CFLAGS) -std=gnu99 -Wall -Wextra -Werror
 gtk_gui_la_CXXFLAGS = $(AM_CXXFLAGS) -Wall -Wextra
-gtk_gui_la_CPPFLAGS = $(AM_CPPFLAGS) -DLUMIERA_PLUGIN -I$(top_srcdir)/src/
+gtk_gui_la_CPPFLAGS = $(AM_CPPFLAGS) $(LUMIERA_GUI_CFLAGS) -DLUMIERA_PLUGIN -I$(top_srcdir)/src/
 gtk_gui_la_LDFLAGS = -module -avoid-version -no-undefined -rpath /dev/null -shrext .lum
 
 gtk_gui_la_LIBADD =		\
@@ -72,10 +72,11 @@ gtk_gui_la_LIBADD =		\
 	liblumierabackend.la	\
 	liblumieraproc.la	\
 	liblumiera.la		\
+	libgui.la		\
 	$(LUMIERA_GUI_LIBS)	\
 	$(NOBUGMT_LUMIERA_LIBS)
 
-gtk_gui_la_SOURCES =			\
+gtk_gui_la_SOURCES =		\
 	$(lumigui_srcdir)/guistart.cpp
 
 
@@ -94,18 +95,18 @@ libgui_la_CPPFLAGS = $(AM_CPPFLAGS)					\
 	$(LUMIERA_GUI_CFLAGS)
 
 libgui_la_SOURCES =							\
-	$(lumigui_srcdir)/guinotificationfacade.cpp			\
+	$(lumigui_srcdir)/notification-service.cpp			\
 	$(lumigui_srcdir)/window-manager.cpp				\
 	$(lumigui_srcdir)/window-manager.hpp				\
 	$(lumigui_srcdir)/workspace/actions.cpp				\
 	$(lumigui_srcdir)/workspace/actions.hpp				\
-	$(lumigui_srcdir)/workspace/workspace-window.cpp			\
-	$(lumigui_srcdir)/workspace/workspace-window.hpp			\
+	$(lumigui_srcdir)/workspace/workspace-window.cpp		\
+	$(lumigui_srcdir)/workspace/workspace-window.hpp		\
 	$(lumigui_srcdir)/dialogs/dialog.hpp				\
 	$(lumigui_srcdir)/dialogs/render.cpp				\
 	$(lumigui_srcdir)/dialogs/render.hpp				\
-	$(lumigui_srcdir)/dialogs/preferences-dialog.cpp			\
-	$(lumigui_srcdir)/dialogs/preferences-dialog.hpp			\
+	$(lumigui_srcdir)/dialogs/preferences-dialog.cpp		\
+	$(lumigui_srcdir)/dialogs/preferences-dialog.hpp		\
 	$(lumigui_srcdir)/dialogs/name-chooser.cpp			\
 	$(lumigui_srcdir)/dialogs/name-chooser.hpp			\
 	$(lumigui_srcdir)/panels/panel.cpp				\
@@ -152,19 +153,19 @@ libgui_la_SOURCES =							\
 	$(lumigui_srcdir)/model/track.hpp				\
 	$(lumigui_srcdir)/model/clip-track.cpp				\
 	$(lumigui_srcdir)/model/clip-track.hpp				\
-	$(lumigui_srcdir)/model/parent-track.cpp				\
-	$(lumigui_srcdir)/model/parent-track.hpp				\
+	$(lumigui_srcdir)/model/parent-track.cpp			\
+	$(lumigui_srcdir)/model/parent-track.hpp			\
 	$(lumigui_srcdir)/model/group-track.cpp				\
 	$(lumigui_srcdir)/model/group-track.hpp				\
 	$(lumigui_srcdir)/model/sequence.cpp				\
 	$(lumigui_srcdir)/model/sequence.hpp				\
-	$(lumigui_srcdir)/model/clip.cpp					\
-	$(lumigui_srcdir)/model/clip.hpp					\
+	$(lumigui_srcdir)/model/clip.cpp				\
+	$(lumigui_srcdir)/model/clip.hpp				\
 	$(lumigui_srcdir)/output/displayer.cpp				\
 	$(lumigui_srcdir)/output/displayer.hpp				\
 	$(lumigui_srcdir)/output/gdkdisplayer.cpp			\
 	$(lumigui_srcdir)/output/gdkdisplayer.hpp			\
-	$(lumigui_srcdir)/output/xvdisplayer.cpp				\
+	$(lumigui_srcdir)/output/xvdisplayer.cpp			\
 	$(lumigui_srcdir)/output/xvdisplayer.hpp
 
 libgui_la_LIBADD =		\
diff --git a/src/gui/gtk-lumiera.cpp b/src/gui/gtk-lumiera.cpp
index 34a49d4ad..9fd41b94e 100644
--- a/src/gui/gtk-lumiera.cpp
+++ b/src/gui/gtk-lumiera.cpp
@@ -69,9 +69,9 @@ GtkLumiera::main(int argc, char *argv[])
 
   kit.run(main_window);
   
-  return 0;
 }
 
+
 Glib::ustring
 GtkLumiera::get_home_data_path()
 {
diff --git a/tests/lib/subsystem-runner-test.cpp b/tests/lib/subsystem-runner-test.cpp
index 766005357..cca17b0a8 100644
--- a/tests/lib/subsystem-runner-test.cpp
+++ b/tests/lib/subsystem-runner-test.cpp
@@ -315,9 +315,8 @@ namespace lumiera {
                                                                         //    is a short time window where isUp_==true )
             
             
-            bool emergency = runner.wait();
+            runner.wait();
             
-            ASSERT (emergency);       // emergency state from unit4 got propagated
             ASSERT (!unit1.isRunning());
             ASSERT (!unit2.isRunning());
             ASSERT (!unit3.isRunning());