[nemiver/varobjs-support] Use the variable object powered LocalVarsInspector2 in the debug perspective

[Dodji Seketeli <dodji src gnome org>]

commit 6fb9598fa9b82202a7ce945014e51c2c9064ff3e
Author: Dodji Seketeli <dodji redhat com>
Date:   Sun Apr 12 22:38:47 2009 +0200

    Use the variable object powered LocalVarsInspector2 in the debug perspective
    
    	* src/persp/dbgperspective/nmv-dbg-perspective.cc: When
    	WITH_VAROBJS is defined, use LocalVarsInspector2, otherwise, use
    	LocalVarsInspector.
    	This entry adds variable objects support for local variables to the debug
    	perspective.
---
 src/persp/dbgperspective/Makefile.am            |    2 ++
 src/persp/dbgperspective/nmv-dbg-perspective.cc |   23 ++++++++++++++++++++---
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/src/persp/dbgperspective/Makefile.am b/src/persp/dbgperspective/Makefile.am
index 32b961e..bcd1af0 100644
--- a/src/persp/dbgperspective/Makefile.am
+++ b/src/persp/dbgperspective/Makefile.am
@@ -50,6 +50,8 @@ nmv-variables-utils.cc \
 nmv-variables-utils.h \
 nmv-local-vars-inspector.cc \
 nmv-local-vars-inspector.h \
+nmv-local-vars-inspector2.cc \
+nmv-local-vars-inspector2.h \
 nmv-global-vars-inspector-dialog.cc \
 nmv-global-vars-inspector-dialog.h \
 nmv-var-inspector.cc \
diff --git a/src/persp/dbgperspective/nmv-dbg-perspective.cc b/src/persp/dbgperspective/nmv-dbg-perspective.cc
index 2089ff1..bb187c5 100644
--- a/src/persp/dbgperspective/nmv-dbg-perspective.cc
+++ b/src/persp/dbgperspective/nmv-dbg-perspective.cc
@@ -71,9 +71,11 @@
 #include "nmv-ui-utils.h"
 #include "nmv-call-stack.h"
 #include "nmv-spinner-tool-item.h"
-
+#ifdef WITH_VAROBJS
+#include "nmv-local-vars-inspector2.h"
+#else
 #include "nmv-local-vars-inspector.h"
-
+#endif
 #include "nmv-global-vars-inspector-dialog.h"
 #include "nmv-terminal.h"
 #include "nmv-breakpoints-view.h"
@@ -593,8 +595,11 @@ public:
     Gtk::ScrolledWindow& get_thread_list_scrolled_win ();
 
     Gtk::HPaned& get_call_stack_paned ();
-
+#ifdef WITH_VAROBJS
+    LocalVarsInspector2& get_local_vars_inspector ();
+#else
     LocalVarsInspector& get_local_vars_inspector ();
+#endif
 
     Gtk::ScrolledWindow& get_local_vars_inspector_scrolled_win ();
 
@@ -793,7 +798,11 @@ struct DBGPerspective::Priv {
 #endif // WITH_GIO
     Path2MonitorMap path_2_monitor_map;
     Gtk::Notebook *statuses_notebook;
+#ifdef WITH_VAROBJS
+    SafePtr<LocalVarsInspector2> variables_editor;
+#else
     SafePtr<LocalVarsInspector> variables_editor;
+#endif
     SafePtr<Gtk::ScrolledWindow> variables_editor_scrolled_win;
     SafePtr<Terminal> terminal;
     SafePtr<Gtk::Box> terminal_box;
@@ -6080,7 +6089,11 @@ DBGPerspective::get_thread_list_scrolled_win ()
     return *m_priv->thread_list_scrolled_win;
 }
 
+#ifdef WITH_VAROBJS
+LocalVarsInspector2&
+#else
 LocalVarsInspector&
+#endif
 DBGPerspective::get_local_vars_inspector ()
 {
     THROW_IF_FAIL (m_priv);
@@ -6088,7 +6101,11 @@ DBGPerspective::get_local_vars_inspector ()
 
     if (!m_priv->variables_editor) {
         m_priv->variables_editor.reset
+#ifdef WITH_VAROBJS
+            (new LocalVarsInspector2 (debugger (),
+#else
             (new LocalVarsInspector (debugger (),
+#endif
                                      *m_priv->workbench,
                                      *this));
     }