--- a/gui/src/FilesDockWidget.cpp
+++ b/gui/src/FilesDockWidget.cpp
@@ -36,11 +36,9 @@
 
   // Add a button to the toolbar with the QT standard icon for up-directory
   // TODO: Maybe change this to be an up-directory icon that is OS specific???
-  QStyle *
-    style = QApplication::style ();
+  QStyle *style = QApplication::style ();
   m_directoryIcon = style->standardIcon (QStyle::SP_FileDialogToParent);
-  m_directoryUpAction =
-    new QAction (m_directoryIcon, "", m_navigationToolBar);
+  m_directoryUpAction = new QAction (m_directoryIcon, "", m_navigationToolBar);
   m_currentDirectory = new QLineEdit (m_navigationToolBar);
 
   m_navigationToolBar->addAction (m_directoryUpAction);

--- a/gui/src/IRCWidget.h
+++ b/gui/src/IRCWidget.h
@@ -50,7 +50,7 @@
 
   void updateNickCompleter ();
 private:
-    IRCClient * m_ircClient;
+  IRCClient * m_ircClient;
   QTextEdit *m_chatWindow;
   QPushButton *m_nickButton;
   QLineEdit *m_inputLine;

--- a/gui/src/MainWindow.cpp
+++ b/gui/src/MainWindow.cpp
@@ -243,7 +243,7 @@
   connect (reportBugAction, SIGNAL (triggered ()), this,
 	   SLOT (openBugTrackerPage ()));
 
-  setWindowTitle (QString ("Octave GUI (0.0.3)"));
+  setWindowTitle (QString ("Octave GUI (0.0.4)"));
 
   setCentralWidget (m_centralMdiArea);
   addDockWidget (Qt::LeftDockWidgetArea, m_variablesDockWidget);
@@ -276,7 +276,6 @@
   m_octaveCallbackThread = new OctaveCallbackThread (this, this);
   m_octaveCallbackThread->start ();
 
-  command_editor::add_event_hook (OctaveLink::readlineEventHook);
   m_octaveTerminal->openTerminal ();
   reportStatusMessage (tr ("Established link to Octave."));
 }

--- a/gui/src/MainWindow.h
+++ b/gui/src/MainWindow.h
@@ -146,6 +146,8 @@
   {
     while (m_mainWindow->isRunning ())
       {
+        OctaveLink::instance ()->fetchSymbolTable ();
+
 	// Get a full variable list.
 	QList < SymbolRecord > symbolTable =
           OctaveLink::instance ()->copyCurrentSymbolTable ();

--- a/gui/src/OctaveLink.cpp
+++ b/gui/src/OctaveLink.cpp
@@ -37,13 +37,6 @@
 {
 }
 
-int
-OctaveLink::readlineEventHook ()
-{
-  OctaveLink::instance ()->processOctaveServerData ();
-  return 0;
-}
-
 QString
 OctaveLink::octaveValueAsQString (OctaveValue octaveValue)
 {
@@ -154,9 +147,3 @@
 {
   return m_historyModel;
 }
-
-void
-OctaveLink::processOctaveServerData ()
-{
-  fetchSymbolTable ();
-}

--- a/gui/src/OctaveLink.h
+++ b/gui/src/OctaveLink.h
@@ -97,8 +97,6 @@
   {
     return &m_singleton;
   }
-  static int
-  readlineEventHook (void);
   static QString
   octaveValueAsQString (OctaveValue octaveValue);
 
@@ -114,9 +112,6 @@
   QStringListModel *
   historyModel ();
 
-  void
-  processOctaveServerData ();
-
   /**
     * Updates the current symbol table with new data
     * from octave.