[nemiver] Second attempt at fixing testvarwalker

[Dodji Seketeli <dodji src gnome org>]

commit 4e64a58557d780d5bf3e15aa4f04d87540ca3a7c
Author: Dodji Seketeli <dodji redhat com>
Date:   Sun Jun 20 12:08:28 2010 +0200

    Second attempt at fixing testvarwalker
    
    	* src/dbgengine/nmv-gdb-engine.cc
    	(OnVariableTypeHandler::can_handle): Look for the "ptype " marker
    	in both debugger console and debugger log. Depending on the
    	version of GDB, sometimes it's in the debugger console, sometimes
    	in the debugger log.
    	(OnVariableTypeHandler::do_handle): Remove unnecessary assert.

 src/dbgengine/nmv-gdb-engine.cc |   12 ++++--------
 1 files changed, 4 insertions(+), 8 deletions(-)
---
diff --git a/src/dbgengine/nmv-gdb-engine.cc b/src/dbgengine/nmv-gdb-engine.cc
index 5653890..66a0b3b 100644
--- a/src/dbgengine/nmv-gdb-engine.cc
+++ b/src/dbgengine/nmv-gdb-engine.cc
@@ -1948,9 +1948,10 @@ struct OnVariableTypeHandler : OutputHandler {
                 LOG_DD ("checking debugger console: "
                         << it->stream_record ().debugger_console ());
                 if (it->has_stream_record ()
-                    && !it->stream_record ().debugger_console ().compare
-                                                            (0, 6, "ptype ")) {
-
+                    && (!it->stream_record ().debugger_console ().compare
+                        (0, 6, "ptype ")
+                        || !it->stream_record () .debugger_log ().compare
+                        (0, 6, "ptype "))) {
                     LOG_DD ("handler selected");
                     return true;
                 }
@@ -1967,11 +1968,6 @@ struct OnVariableTypeHandler : OutputHandler {
         UString type;
         list<Output::OutOfBandRecord>::const_iterator it;
         it = a_in.output ().out_of_band_records ().begin ();
-        THROW_IF_FAIL2 (it->has_stream_record ()
-                        && !it->stream_record ().debugger_console ().compare
-                                               (0, 6, "ptype "),
-                        "stream_record: " +
-                        it->stream_record ().debugger_console ());
         ++it;
         if (!it->has_stream_record ()
             || it->stream_record ().debugger_console ().compare