[nemiver: 5/5] Merge branch 'ustring-cleanup'

[Jonathon Jongsma <jjongsma src gnome org>]

commit 8bc85f9340e977c3a5b4bb2c6c501e7dc3f5c57c
Merge: 75dc784... 32d34de...
Author: Jonathon Jongsma <jonathon jongsma collabora co uk>
Date:   Sun Apr 19 21:42:49 2009 -0500

    Merge branch 'ustring-cleanup'

 src/common/nmv-env.cc                              |   24 +++++-----
 src/common/nmv-log-stream.cc                       |   18 ++++++-
 src/common/nmv-log-stream.h                        |   12 ++++-
 src/common/nmv-ustring.cc                          |    5 +-
 src/dbgengine/nmv-gdb-engine.cc                    |   13 +++--
 src/dbgengine/nmv-gdbmi-parser.cc                  |    2 +-
 src/main.cc                                        |    3 +-
 src/persp/dbgperspective/nmv-dbg-perspective.cc    |   49 ++++++++++---------
 src/persp/dbgperspective/nmv-locate-file-dialog.cc |    2 +-
 src/persp/dbgperspective/nmv-memory-view.h         |    1 -
 src/workbench/nmv-workbench.cc                     |    3 +-
 11 files changed, 78 insertions(+), 54 deletions(-)