[nemiver/varobjs-support] Make VarInspector use the factorized update_unfolded_variable

[Dodji Seketeli <dodji src gnome org>]

commit d885c41c379025dd75f981729cf05e1f3ac649c9
Author: Dodji Seketeli <dodji redhat com>
Date:   Sun Apr 12 22:22:29 2009 +0200

    Make VarInspector use the factorized update_unfolded_variable
    
    	* src/persp/dbgperspective/nmv-var-inspector2.cc:
    	(VarInspector2::Priv::on_variable_unfolded_signal): Use the
    	new nemiver::variables_utils::update_unfolded_variable instead of
    	our own update_unfolded_variable.
    	(VarInspector2::Priv::update_unfolded_variable): Remove this.
    	Make sure to compile this, only with WITH_VAROBJS is defined.
    	* src/persp/dbgperspective/nmv-var-inspector2.h:
    	Make sure to compile this, only with WITH_VAROBJS is defined.
---
 src/persp/dbgperspective/nmv-var-inspector2.cc |   26 ++++-------------------
 src/persp/dbgperspective/nmv-var-inspector2.h  |    5 ++++
 2 files changed, 10 insertions(+), 21 deletions(-)

diff --git a/src/persp/dbgperspective/nmv-var-inspector2.cc b/src/persp/dbgperspective/nmv-var-inspector2.cc
index 549b082..b465aed 100644
--- a/src/persp/dbgperspective/nmv-var-inspector2.cc
+++ b/src/persp/dbgperspective/nmv-var-inspector2.cc
@@ -33,6 +33,8 @@
 #include "nmv-ui-utils.h"
 #include "nmv-vars-treeview.h"
 
+#ifdef WITH_VAROBJS
+
 namespace uutil = nemiver::ui_utils;
 namespace vutil = nemiver::variables_utils2;
 namespace cmn = nemiver::common;
@@ -132,26 +134,6 @@ class VarInspector2::Priv : public sigc::trackable {
     }
 
     void
-    update_unfolded_variable (const IDebugger::VariableSafePtr a_variable,
-                              Gtk::TreeModel::iterator &a_var_it)
-    {
-        LOG_FUNCTION_SCOPE_NORMAL_DD;
-
-        Gtk::TreeModel::iterator result_var_row_it;
-        IDebugger::VariableList::const_iterator var_it;
-        IDebugger::VariableList::const_iterator member_it;
-        for (member_it = a_variable->members ().begin ();
-             member_it != a_variable->members ().end ();
-             ++member_it) {
-            vutil::append_a_variable (*member_it,
-                                      *tree_view,
-                                      tree_store,
-                                      a_var_it,
-                                      result_var_row_it);
-        }
-    }
-
-    void
     show_variable_type_in_dialog ()
     {
         LOG_FUNCTION_SCOPE_NORMAL_DD;
@@ -277,7 +259,7 @@ class VarInspector2::Priv : public sigc::trackable {
         NEMIVER_TRY
 
         Gtk::TreeModel::iterator var_it = tree_store->get_iter (a_var_node);
-        update_unfolded_variable (a_var, var_it);
+        vutil::update_unfolded_variable (a_var, *tree_view, tree_store, var_it);
         tree_view->expand_row (a_var_node, false);
 
         NEMIVER_CATCH
@@ -361,3 +343,5 @@ VarInspector2::clear ()
 
 NEMIVER_END_NAMESPACE (nemiver)
 
+#endif //WITH_VAROBJS
+
diff --git a/src/persp/dbgperspective/nmv-var-inspector2.h b/src/persp/dbgperspective/nmv-var-inspector2.h
index c83b7ad..1ae012f 100644
--- a/src/persp/dbgperspective/nmv-var-inspector2.h
+++ b/src/persp/dbgperspective/nmv-var-inspector2.h
@@ -29,6 +29,8 @@
 #include "common/nmv-safe-ptr-utils.h"
 #include "nmv-i-debugger.h"
 
+#ifdef WITH_VAROBJS
+
 namespace Gtk {
     class Widget;
 }
@@ -57,5 +59,8 @@ public:
 };//end class VarInspector2
 
 NEMIVER_END_NAMESPACE (nemiver)
+
+#endif //WITH_VAROBJS
+
 #endif //__NMV_VAR_INSPECTOR2_H__