diff -ru --exclude=configure --exclude=config.status.lineno --exclude=config.log --exclude=autom4te.cache --exclude=CVS --exclude='*.pyc' -N pitivi_pristine/pitivi/ui/Makefile.am pitivi_pub/pitivi/ui/Makefile.am
--- pitivi_pristine/pitivi/ui/Makefile.am	2006-12-05 01:13:47.000000000 +0000
+++ pitivi_pub/pitivi/ui/Makefile.am	2006-12-05 01:23:13.000000000 +0000
@@ -10,22 +10,21 @@
 	filelisterrordialog.py	\
 	glade.py		\
 	gstwidget.py		\
+	infolayer.py		\
+	layerwidgets.py		\
 	mainwindow.py		\
+	plumber.py		\
 	projectsettings.py	\
+	ruler.py		\
 	signalgroup.py		\
 	sourcefactories.py	\
 	timeline.py		\
 	timelineobjects.py	\
-	viewer.py		\
-	ruler.py		\
-	layerwidgets.py		\
 	tracklayer.py		\
-	infolayer.py		\
-	plumber.py
+	viewer.py
 
 ui_DATA =				\
 	actions.xml			\
-	discoverererrordialog.glade	\
 	elementsettingsdialog.glade	\
 	encodingdialog.glade		\
 	exportsettingswidget.glade	\
diff -ru --exclude=configure --exclude=config.status.lineno --exclude=config.log --exclude=autom4te.cache --exclude=CVS --exclude='*.pyc' -N pitivi_pristine/pitivi/ui/sourcefactories.py pitivi_pub/pitivi/ui/sourcefactories.py
--- pitivi_pristine/pitivi/ui/sourcefactories.py	2006-12-05 01:13:47.000000000 +0000
+++ pitivi_pub/pitivi/ui/sourcefactories.py	2006-12-05 01:19:38.000000000 +0000
@@ -406,7 +406,8 @@
         instance.PiTiVi.playground.playTemporaryFilesourcefactory(factory)
 
     def _newProjectCb(self, unused_pitivi, project):
-        # clear the storemodel
+        assert(instance.PiTiVi.current == project)
+
         self.storemodel.clear()
 
         # synchronize the storemodel with the new project's sourcelist
diff -ru --exclude=configure --exclude=config.status.lineno --exclude=config.log --exclude=autom4te.cache --exclude=CVS --exclude='*.pyc' -N pitivi_pristine/pitivi/ui/timeline.py pitivi_pub/pitivi/ui/timeline.py
--- pitivi_pristine/pitivi/ui/timeline.py	2006-12-03 18:53:32.000000000 +0000
+++ pitivi_pub/pitivi/ui/timeline.py	2006-12-05 01:17:16.000000000 +0000
@@ -28,7 +28,7 @@
 import gobject
 import gst
 
-from timelineobjects import SimpleSourceWidget, SimpleTimeline
+from timelineobjects import SimpleTimeline
 from complextimeline import ComplexTimelineWidget
 
 class TimelineWidget(gtk.VBox):
