[Commit-gnuradio] [gnuradio] 10/10: Merge remote-tracking branch 'gnuradio-wg-grc/master_grcwg'

[git]

This is an automated email from the git hooks/post-receive script.

jcorgan pushed a commit to branch master
in repository gnuradio.

commit 5af1200d20fd41a940ece92d53eabc94427e9145
Merge: 07c6d92 1e0707c
Author: Johnathan Corgan <address@hidden>
Date:   Tue Aug 26 12:21:42 2014 -0700

    Merge remote-tracking branch 'gnuradio-wg-grc/master_grcwg'

 gnuradio-runtime/include/gnuradio/constants.h | 15 +++++++++++
 gnuradio-runtime/lib/constants.cc.in          | 19 ++++++++++++++
 gnuradio-runtime/swig/constants.i             |  5 ++++
 gr-blocks/grc/blocks_udp_source.xml           |  1 +
 grc/base/Constants.py                         |  1 +
 grc/base/FlowGraph.py                         | 20 +++++++++-----
 grc/base/ParseXML.py                          | 38 ++++++++++++++++++---------
 grc/base/Platform.py                          | 13 ++++++++-
 grc/gui/ActionHandler.py                      | 12 +++++++--
 grc/gui/Actions.py                            | 15 +++++++----
 grc/gui/Bars.py                               |  3 +--
 grc/gui/Constants.py                          |  3 ++-
 grc/gui/Dialogs.py                            | 13 +++++++++
 grc/gui/FileDialogs.py                        | 20 +++++++++++---
 grc/gui/FlowGraph.py                          | 17 ++++++++++++
 grc/gui/MainWindow.py                         |  9 +++++++
 grc/python/Generator.py                       | 12 ++++++---
 grc/python/Platform.py                        |  2 +-
 18 files changed, 180 insertions(+), 38 deletions(-)

diff --cc grc/base/FlowGraph.py
index 2281e24,583d7d4..e51843c
--- a/grc/base/FlowGraph.py
+++ b/grc/base/FlowGraph.py
@@@ -318,16 -323,15 +324,16 @@@ class FlowGraph(Element)
                  sink = sink_block.get_sink(sink_key)
                  #build the connection
                  self.connect(source, sink)
-             except LookupError, e: Messages.send_error_load(
-                 'Connection between %s(%s) and %s(%s) could not be 
made.\n\t%s'%(
-                     source_block_id, source_key, sink_block_id, sink_key, e
-                 )
-             )
+             except LookupError, e:
+                 Messages.send_error_load(
+                     'Connection between %s(%s) and %s(%s) could not be 
made.\n\t%s'%(
+                     source_block_id, source_key, sink_block_id, sink_key, e))
+                 errors = True
          self.rewrite() #global rewrite
- 
+         return errors
  
 -    def update_message_port_key(self, key, ports):
 +    @staticmethod
 +    def update_old_message_port_keys(source_key, sink_key, source_block, 
sink_block):
          """Backward compatibility for message port keys
  
          Message ports use their names as key (like in the 'connect' method).