[farsight2/master] Comment out unused adder, use gtk.gdk.gdk_threads_init()

Olivier Crête olivier.crete at collabora.co.uk
Tue Dec 23 15:20:34 PST 2008


---
 tests/gui/fs2-gui.py |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/gui/fs2-gui.py b/tests/gui/fs2-gui.py
index 528543b..9f7eebb 100644
--- a/tests/gui/fs2-gui.py
+++ b/tests/gui/fs2-gui.py
@@ -81,7 +81,7 @@ class FsUIPipeline:
         self.videosource = FsUIVideoSource(self.pipeline)
 #        self.audiosession = FsUISession(self.conf, self.audiosource)
         self.videosession = FsUISession(self.conf, self.videosource)
-        self.adder = gst.element_factory_make("adder")
+#        self.adder = gst.element_factory_make("adder")
 #        self.audiosink = gst.element_factory_make("alsasink")
 #        self.pipeline.add(self.audiosink)
 #        self.pipeline.add(self.adder)
@@ -495,6 +495,6 @@ if __name__ == "__main__":
         CAMERA = None
     
     gobject.threads_init()
-    gtk.threads_init()
+    gtk.gdk.threads_init()
     startup = FsUIStartup()
     gtk.main()
-- 
1.5.6.5




More information about the farsight-commits mailing list