Merge commit 'origin' into new_eth

Conflicts:
	.gitignore

1 files changed, 7 insertions, 5 deletions

diff --git a/grc/scripts/usrp2_probe b/grc/scripts/usrp2_probe
index 00d4366dd..38c8f655c 100755
--- a/grc/scripts/usrp2_probe
+++ b/grc/scripts/usrp2_probe
@@ -32,9 +32,6 @@ from gnuradio.grc.gui.Dialogs import TextDisplay
 from gnuradio.grc.python.Platform import Platform
 platform = Platform()
 
-from gnuradio.grc.gui.Platform import Platform
-platform = Platform(platform)
-
 flow_graph = platform.get_new_flow_graph()
 block = flow_graph.get_new_block('usrp2_probe')
 
@@ -42,6 +39,11 @@ block = flow_graph.get_new_block('usrp2_probe')
 usrp_interface_param = block.get_param('interface')
 usrp_type_param = block.get_param('type')
 
+def get_input(param):
+	param.validate()
+	input = param.get_input()
+	return input
+
 class USRP2ProbeWindow(gtk.Window):
 	"""
 	The main window for USRP Dignostics.
@@ -69,8 +71,8 @@ class USRP2ProbeWindow(gtk.Window):
 		#create vbox for storage
 		vbox = gtk.VBox()
 		frame.add(vbox)
-		vbox.pack_start(usrp_interface_param.get_input_object(), False)
-		vbox.pack_start(usrp_type_param.get_input_object(), False)
+		vbox.pack_start(get_input(usrp_interface_param), False)
+		vbox.pack_start(get_input(usrp_type_param), False)
 		#make the tree model for holding mac addrs
 		self.treestore = gtk.TreeStore(gobject.TYPE_STRING)
 		self.treeview = gtk.TreeView(self.treestore)