8 files changed, 13 insertions, 14 deletions
diff --git a/gr-analog/lib/fmdet_cf_impl.cc b/gr-analog/lib/fmdet_cf_impl.cc
index 2c48ff07e2..38496d189b 100644
--- a/gr-analog/lib/fmdet_cf_impl.cc
+++ b/gr-analog/lib/fmdet_cf_impl.cc
@@ -106,7 +106,7 @@ namespace gr {
       while(size-- > 0) {
 	S0 = *iptr++;
 
-	Sdot = d_scl * (-S0+d_8*S1-d_8*S1+S4);
+	Sdot = d_scl * (-S0+d_8*S1-d_8*S2+S4);
 
 	d_freq = (S2.real()*Sdot.imag()-S2.imag()*Sdot.real()) /
 	  (S2.real()*S2.real()+S2.imag()*S2.imag());
diff --git a/gr-blocks/include/gnuradio/blocks/stream_to_vector.h b/gr-blocks/include/gnuradio/blocks/stream_to_vector.h
index 10e0b2bf91..ca96bdd7fe 100644
--- a/gr-blocks/include/gnuradio/blocks/stream_to_vector.h
+++ b/gr-blocks/include/gnuradio/blocks/stream_to_vector.h
@@ -43,7 +43,7 @@ namespace gr {
        * Make a stream-to-vector block.
        *
        * \param itemsize the item size of the stream
-       * \param nitems_per_block number of items to but into each vector (vector size)
+       * \param nitems_per_block number of items to put into each vector (vector size)
        */
       static sptr make(size_t itemsize, size_t nitems_per_block);
     };
diff --git a/gr-fec/CMakeLists.txt b/gr-fec/CMakeLists.txt
index cc96cda6e3..338fe71864 100644
--- a/gr-fec/CMakeLists.txt
+++ b/gr-fec/CMakeLists.txt
@@ -34,6 +34,7 @@ GR_REGISTER_COMPONENT("gr-fec" ENABLE_GR_FEC
     Boost_FOUND
     ENABLE_GNURADIO_RUNTIME
     ENABLE_GR_BLOCKS
+    GSL_FOUND
 )
 
 GR_SET_GLOBAL(GR_FEC_INCLUDE_DIRS
diff --git a/gr-fec/swig/CMakeLists.txt b/gr-fec/swig/CMakeLists.txt
index 5a7984925b..443d365c98 100644
--- a/gr-fec/swig/CMakeLists.txt
+++ b/gr-fec/swig/CMakeLists.txt
@@ -41,7 +41,7 @@ endif(GSL_FOUND)
 set(GR_SWIG_DOC_FILE ${CMAKE_CURRENT_BINARY_DIR}/fec_swig_doc.i)
 set(GR_SWIG_DOC_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../include/gnuradio/fec)
 set(GR_SWIG_DOCS_TARGET_DEPS runtime_swig_swig_doc)
-set(GR_SWIG_LIBRARIES gnuradio-fec)
+set(GR_SWIG_LIBRARIES gnuradio-fec ${GSL_LDFLAGS})
 
 GR_SWIG_MAKE(fec_swig fec_swig.i)
 
diff --git a/gr-qtgui/grc/qtgui_number_sink.xml b/gr-qtgui/grc/qtgui_number_sink.xml
index eef862abd4..d10b7325c0 100644
--- a/gr-qtgui/grc/qtgui_number_sink.xml
+++ b/gr-qtgui/grc/qtgui_number_sink.xml
@@ -116,7 +116,7 @@ $(gui_hint()($win))</make>
       <key>qtgui.NUM_GRAPH_HORIZ</key>
     </option>
     <option>
-      <name>Verticle</name>
+      <name>Vertical</name>
       <key>qtgui.NUM_GRAPH_VERT</key>
     </option>
     <option>
diff --git a/grc/core/generator/Generator.py b/grc/core/generator/Generator.py
index fb7a3afb99..3062440814 100644
--- a/grc/core/generator/Generator.py
+++ b/grc/core/generator/Generator.py
@@ -74,13 +74,14 @@ class TopBlockGenerator(object):
         self._flow_graph = FlowGraphProxy(flow_graph)
         self._generate_options = self._flow_graph.get_option('generate_options')
         self._mode = TOP_BLOCK_FILE_MODE
-        dirname = self._dirname = os.path.dirname(file_path)
+        dirname = os.path.dirname(file_path)
         # Handle the case where the directory is read-only
         # In this case, use the system's temp directory
         if not os.access(dirname, os.W_OK):
             dirname = tempfile.gettempdir()
         filename = self._flow_graph.get_option('id') + '.py'
         self.file_path = os.path.join(dirname, filename)
+        self._dirname = dirname
 
     def get_file_path(self):
         return self.file_path
diff --git a/grc/gui/ActionHandler.py b/grc/gui/ActionHandler.py
index 11e81c4613..f18fcea3e1 100644
--- a/grc/gui/ActionHandler.py
+++ b/grc/gui/ActionHandler.py
@@ -66,7 +66,7 @@ class ActionHandler:
         Messages.register_messenger(self.main_window.add_console_line)
         Messages.send_init(platform)
         #initialize
-        self.init_file_paths = file_paths
+        self.init_file_paths = [os.path.abspath(file_path) for file_path in file_paths]
         self.init = False
         Actions.APPLICATION_INITIALIZE()
 
@@ -116,13 +116,10 @@ class ActionHandler:
         # Initialize/Quit
         ##################################################
         if action == Actions.APPLICATION_INITIALIZE:
-            if not self.init_file_paths:
-                self.init_file_paths = filter(os.path.exists, Preferences.get_open_files())
-            if not self.init_file_paths: self.init_file_paths = ['']
-            for file_path in self.init_file_paths:
-                if file_path: main.new_page(file_path) #load pages from file paths
-            if Preferences.file_open() in self.init_file_paths:
-                main.new_page(Preferences.file_open(), show=True)
+            file_path_to_show = Preferences.file_open()
+            for file_path in (self.init_file_paths or Preferences.get_open_files()):
+                if os.path.exists(file_path):
+                    main.new_page(file_path, show=file_path_to_show == file_path)
             if not self.get_page():
                 main.new_page()  # ensure that at least a blank page exists
 
diff --git a/grc/gui/BlockTreeWindow.py b/grc/gui/BlockTreeWindow.py
index f0373eaf2a..900cbd3151 100644
--- a/grc/gui/BlockTreeWindow.py
+++ b/grc/gui/BlockTreeWindow.py
@@ -205,7 +205,7 @@ class BlockTreeWindow(gtk.VBox):
             key = model.get_value(iter_, KEY_INDEX)
             if not key:
                 return  # category node, no doc string
-            block = self.platform.get_block(key)
+            block = self.platform.blocks[key]
             doc = Utils.parse_template(DOC_MARKUP_TMPL, doc=block.get_doc())
             model.set_value(iter_, DOC_INDEX, doc)