[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_start-413-g4daa5e1

[Sandro Santilli]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnash".

The branch, master has been updated
       via  4daa5e1e4fc8da404c21768f4795d3e7dc8f5226 (commit)
      from  c40fd753ed1053715515f0352900cdb836836208 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit//commit/?id=4daa5e1e4fc8da404c21768f4795d3e7dc8f5226


commit 4daa5e1e4fc8da404c21768f4795d3e7dc8f5226
Author: Sandro Santilli <address@hidden>
Date:   Sun Mar 27 16:51:11 2011 +0200

    Have QT4 gui handle non-existent renderers by throwing an exception rather 
than assuming AGG. Have it trust RunResources to keep rcfile handling 
centralized.

diff --git a/gui/qt/Qt4Gui.cpp b/gui/qt/Qt4Gui.cpp
index 58628d3..82965fe 100644
--- a/gui/qt/Qt4Gui.cpp
+++ b/gui/qt/Qt4Gui.cpp
@@ -109,10 +109,6 @@ Qt4Gui::init(int /*argc*/, char ** /*argv*/[])
     _drawingWidget = _embedWidget->drawingWidget();
 
     std::string renderer = _runResources.getRenderBackend();
-    if (renderer.empty()) {
-        gnash::RcInitFile& rcfile = gnash::RcInitFile::getDefaultInstance();
-        renderer = rcfile.getRenderer();
-    }
 
     if (renderer == "cairo") {
 #ifdef RENDERER_CAIRO
@@ -130,7 +126,7 @@ Qt4Gui::init(int /*argc*/, char ** /*argv*/[])
         log_error(_("OpenGL renderer not supported!"));
         return false;
 #endif
-    } else {
+    } else if (renderer == "agg") {
 #ifdef RENDERER_AGG
         log_debug("Using AGG renderer");
         _glue.reset(new Qt4AggGlue());
@@ -139,6 +135,11 @@ Qt4Gui::init(int /*argc*/, char ** /*argv*/[])
         return false;
 #endif
     }
+    else {
+        boost::format fmt = boost::format("Non-existent renderer %1% "
+            "specified") % renderer;
+        throw gnash::GnashException(fmt.str());
+    }
 
     setupActions();
     setupMenus();

-----------------------------------------------------------------------

Summary of changes:
 gui/qt/Qt4Gui.cpp |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
Gnash