Merge commit 'origin' into new_eth

Conflicts:
	.gitignore

1 files changed, 4 insertions, 29 deletions

diff --git a/grc/gui/Platform.py b/grc/gui/Platform.py
index a32b0209f..8bbfaca23 100644
--- a/grc/gui/Platform.py
+++ b/grc/gui/Platform.py
@@ -1,5 +1,5 @@
 """
-Copyright 2008 Free Software Foundation, Inc.
+Copyright 2008, 2009 Free Software Foundation, Inc.
 This file is part of GNU Radio
 
 GNU Radio Companion is free software; you can redistribute it and/or
@@ -17,32 +17,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 """
 
-from FlowGraph import FlowGraph
-from Connection import Connection
-from Block import Block
-from Port import Port
-from Param import Param
+from Element import Element
 
-def conjoin_classes(name, c1, c2):
-	exec("""
-class %s(c1, c2):
-	def __init__(self, *args, **kwargs):
-		c1.__init__(self, *args, **kwargs)
-		c2.__init__(self, *args, **kwargs)
-"""%name, locals())
-	return locals()[name]
-
-def Platform(platform):
-	#combine with gui class
-	for attr, value in (
-		('FlowGraph', FlowGraph),
-		('Connection', Connection),
-		('Block', Block),
-		('Source', Port),
-		('Sink', Port),
-		('Param', Param),
-	):
-		old_value = getattr(platform, attr)
-		c = conjoin_classes(attr, old_value, value)
-		setattr(platform, attr, c)
-	return platform
+class Platform(Element):
+	def __init__(self): Element.__init__(self)