From baa955d5ad353e90540ebaf37bebd923457ae805 Mon Sep 17 00:00:00 2001
From: hjk <qtc-committer@nokia.com>
Date: Tue, 5 Jan 2010 10:53:59 +0100
Subject: [PATCH] debugger: make python frame output 'Discardable'

---
 share/qtcreator/gdbmacros/dumper.py    | 5 -----
 src/plugins/debugger/gdb/gdbengine.cpp | 4 +++-
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/share/qtcreator/gdbmacros/dumper.py b/share/qtcreator/gdbmacros/dumper.py
index c58aab1f3c9..3521e2fe437 100644
--- a/share/qtcreator/gdbmacros/dumper.py
+++ b/share/qtcreator/gdbmacros/dumper.py
@@ -411,11 +411,6 @@ class FrameCommand(gdb.Command):
             + 'watchers={iname="watch",name="Watchers",value=" ",type=" ",'
             + 'children=[' + watchers + ']}\n')
 
-        warn('OUTPUT: locals={iname="local",name="Locals",value=" ",type=" ",'
-            + 'children=[' + locals + ']},'
-            + 'watchers={iname="watch",name="Watchers",value=" ",type=" ",'
-            + 'children=[' + watchers + ']}')
-
 
     def handleWatch(self, d, exp, name):
         #warn("HANDLING WATCH %s, NAME: %s" % (exp, name))
diff --git a/src/plugins/debugger/gdb/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp
index d4a8ca410a2..93eaa08a7d7 100644
--- a/src/plugins/debugger/gdb/gdbengine.cpp
+++ b/src/plugins/debugger/gdb/gdbengine.cpp
@@ -3180,7 +3180,8 @@ void GdbEngine::updateSubItem(const WatchData &data0)
     if (data.isHasChildrenNeeded()) {
         QTC_ASSERT(!data.variable.isEmpty(), return); // tested above
         QString cmd = _("-var-list-children --all-values \"") + data.variable + _c('"');
-        postCommand(cmd, Discardable, CB(handleVarListChildren), QVariant::fromValue(data));
+        postCommand(cmd, Discardable,
+            CB(handleVarListChildren), QVariant::fromValue(data));
         return;
     }
 
@@ -3632,6 +3633,7 @@ void GdbEngine::updateLocals(const QVariant &cookie)
                 .arg(options)
                 .arg(expanded.join(_(",")))
                 .arg(_(watchers.toLatin1().toHex())),
+            Discardable,
             CB(handleStackFrame));
     } else {
         m_processedNames.clear();