6 files changed, 66 insertions, 23 deletions
diff --git a/gr-blocks/grc/blocks_block_tree.xml b/gr-blocks/grc/blocks_block_tree.xml
index cceb6c802a..ea5e552d1d 100644
--- a/gr-blocks/grc/blocks_block_tree.xml
+++ b/gr-blocks/grc/blocks_block_tree.xml
@@ -47,11 +47,11 @@
 	</cat>
 	<cat>
 		<name>Boolean Operations (New) </name>
-		<block>blocks_and_xx.xml</block>
-		<block>blocks_and_const_xx.xml</block>
-		<block>blocks_not_xx.xml</block>
-		<block>blocks_or_xx.xml</block>
-		<block>blocks_xor_xx.xml</block>
+		<block>blocks_and_xx</block>
+		<block>blocks_and_const_xx</block>
+		<block>blocks_not_xx</block>
+		<block>blocks_or_xx</block>
+		<block>blocks_xor_xx</block>
 	</cat>
 	<cat>
 	        <name>Stream Type Conversions (New) </name>
@@ -77,17 +77,17 @@
 	</cat>
 	<cat>
 	        <name>Stream Operations (New) </name>
-		<block>blocks_deinterleave.xml</block>
-		<block>blocks_interleave.xml</block>
-		<block>blocks_keep_m_in_n.xml</block>
-		<block>blocks_keep_one_in_n.xml</block>
-		<block>blocks_repeat.xml</block>
-		<block>stream_mux.xml</block>
-		<block>stream_to_streams.xml</block>
-		<block>stream_to_vector.xml</block>
-		<block>streams_to_stream.xml</block>
-		<block>streams_to_vector.xml</block>
-		<block>vector_to_stream.xml</block>
-		<block>vector_to_streams.xml</block>
+		<block>blocks_deinterleave</block>
+		<block>blocks_interleave</block>
+		<block>blocks_keep_m_in_n</block>
+		<block>blocks_keep_one_in_n</block>
+		<block>blocks_repeat</block>
+		<block>blocks_stream_mux</block>
+		<block>blocks_stream_to_streams</block>
+		<block>blocks_stream_to_vector</block>
+		<block>blocks_streams_to_stream</block>
+		<block>blocks_streams_to_vector</block>
+		<block>blocks_vector_to_stream</block>
+		<block>blocks_vector_to_streams</block>
 	</cat>
 </cat>
diff --git a/gr-blocks/grc/blocks_complex_to_real.xml b/gr-blocks/grc/blocks_complex_to_real.xml
index 7acf3fccb1..0fe77dc1c5 100644
--- a/gr-blocks/grc/blocks_complex_to_real.xml
+++ b/gr-blocks/grc/blocks_complex_to_real.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0"?>
 <!--
 ###################################################
-##Complex to Float:
+##Complex to Real:
 ##	one or two output streams
 ###################################################
  -->
 <block>
-	<name>Complex To Float</name>
-	<key>blocks_complex_to_float</key>
+	<name>Complex To Real</name>
+	<key>blocks_complex_to_real</key>
 	<import>from gnuradio import blocks</import>
-	<make>blocks.complex_to_float($vlen)</make>
+	<make>blocks.complex_to_real($vlen)</make>
 	<param>
 		<name>Vec Length</name>
 		<key>vlen</key>
@@ -24,12 +24,12 @@
 	</sink>
 	<source>
 		<name>re</name>
-		<type>float</type>
+		<type>real</type>
 		<vlen>$vlen</vlen>
 	</source>
 	<source>
 		<name>im</name>
-		<type>float</type>
+		<type>real</type>
 		<vlen>$vlen</vlen>
 		<optional>1</optional>
 	</source>
diff --git a/grc/blocks/pad_sink.xml b/grc/blocks/pad_sink.xml
index 2e94952603..f89eaa53c5 100644
--- a/grc/blocks/pad_sink.xml
+++ b/grc/blocks/pad_sink.xml
@@ -43,6 +43,11 @@
 			<key>byte</key>
 			<opt>size:gr.sizeof_char</opt>
 		</option>
+		<option>
+			<name>Wildcard</name>
+			<key></key>
+			<opt>size:0</opt>
+		</option>
 	</param>
 	<param>
 		<name>Vec Length</name>
@@ -50,6 +55,21 @@
 		<value>1</value>
 		<type>int</type>
 	</param>
+	<param>
+		<name>Optional</name>
+		<key>optional</key>
+		<value>False</value>
+		<type>bool</type>
+		<hide>part</hide>
+		<option>
+			<name>Optional</name>
+			<key>True</key>
+		</option>
+		<option>
+			<name>Required</name>
+			<key>False</key>
+		</option>
+	</param>
 	<check>$vlen &gt; 0</check>
 	<sink>
 		<name>in</name>
diff --git a/grc/blocks/pad_source.xml b/grc/blocks/pad_source.xml
index 7b2210cbbc..cbf38eb390 100644
--- a/grc/blocks/pad_source.xml
+++ b/grc/blocks/pad_source.xml
@@ -43,6 +43,11 @@
 			<key>byte</key>
 			<opt>size:gr.sizeof_char</opt>
 		</option>
+		<option>
+			<name>Wildcard</name>
+			<key></key>
+			<opt>size:0</opt>
+		</option>
 	</param>
 	<param>
 		<name>Vec Length</name>
@@ -50,6 +55,21 @@
 		<value>1</value>
 		<type>int</type>
 	</param>
+	<param>
+		<name>Optional</name>
+		<key>optional</key>
+		<value>False</value>
+		<type>bool</type>
+		<hide>part</hide>
+		<option>
+			<name>Optional</name>
+			<key>True</key>
+		</option>
+		<option>
+			<name>Required</name>
+			<key>False</key>
+		</option>
+	</param>
 	<check>$vlen &gt; 0</check>
 	<source>
 		<name>out</name>
diff --git a/grc/python/FlowGraph.py b/grc/python/FlowGraph.py
index 9d48401ea0..b68d497e58 100644
--- a/grc/python/FlowGraph.py
+++ b/grc/python/FlowGraph.py
@@ -72,6 +72,7 @@ class FlowGraph(_FlowGraph, _GUIFlowGraph):
 			'type': str(pad.get_param('type').get_evaluated()),
 			'vlen': str(pad.get_param('vlen').get_evaluated()),
 			'size': pad.get_param('type').get_opt('size'),
+			'optional': bool(pad.get_param('optional').get_evaluated()),
 		} for pad in sorted_pads]
 
 	def get_pad_sources(self):
diff --git a/grc/python/convert_hier.py b/grc/python/convert_hier.py
index f4d082d596..b609af24ae 100644
--- a/grc/python/convert_hier.py
+++ b/grc/python/convert_hier.py
@@ -62,6 +62,7 @@ def convert_hier(flow_graph, python_file):
 		sink_n['name'] = input_sig['label']
 		sink_n['type'] = input_sig['type']
 		sink_n['vlen'] = input_sig['vlen']
+		if input_sig['optional']: sink_n['optional'] = '1'
 		block_n['sink'].append(sink_n)
 	#source data
 	block_n['source'] = list()
@@ -70,6 +71,7 @@ def convert_hier(flow_graph, python_file):
 		source_n['name'] = output_sig['label']
 		source_n['type'] = output_sig['type']
 		source_n['vlen'] = output_sig['vlen']
+		if output_sig['optional']: source_n['optional'] = '1'
 		block_n['source'].append(source_n)
 	#doc data
 	block_n['doc'] = "%s\n%s\n%s"%(block_author, block_desc, python_file)