[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_start-412-gc40fd75

[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  c40fd753ed1053715515f0352900cdb836836208 (commit)
      from  d79ff0c92b546184589b34cec5580e34da88fb62 (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=c40fd753ed1053715515f0352900cdb836836208


commit c40fd753ed1053715515f0352900cdb836836208
Author: Sandro Santilli <address@hidden>
Date:   Sun Mar 27 16:44:05 2011 +0200

    Have GTK gui always trust RunResource about hwaccel and renderer. Have 
commandline parser use rcfile setting as a default, or first supported renderer 
otherwise. Fixes #32925 in a safer way.

diff --git a/gui/gnash.cpp b/gui/gnash.cpp
index b1a19e8..1b04564 100644
--- a/gui/gnash.cpp
+++ b/gui/gnash.cpp
@@ -382,7 +382,8 @@ getSupportedOptions(gnash::Player& p)
         ).c_str())
 
     ("renderer,R", po::value<string>()
-        ->default_value(renderers[0])
+        ->default_value(rcfile.getRenderer().empty() ? renderers[0]
+                                                     : rcfile.getRenderer())
         ->notifier(boost::bind(&Player::setRenderer, &p, _1)),
         (string(_("The renderer to use"))
         + string("\n") + boost::join(renderers, "|")
diff --git a/gui/gtk/gtk.cpp b/gui/gtk/gtk.cpp
index 11aac77..85c9f74 100644
--- a/gui/gtk/gtk.cpp
+++ b/gui/gtk/gtk.cpp
@@ -68,8 +68,6 @@ namespace gnash
 // Forward declarations
 namespace {
 
-    gnash::RcInitFile& rcfile = gnash::RcInitFile::getDefaultInstance();
-
     // Menu Item callbacks
     void menuSound(GtkMenuItem *menuitem, gpointer instance);
     void menuFullscreen(GtkMenuItem *menuitem, gpointer instance);
@@ -180,14 +178,8 @@ GtkGui::init(int argc, char **argv[])
     
     addGnashIcon(GTK_WINDOW(_window));
 
-    std::string hwaccel = rcfile.getHWAccel();
-    if (hwaccel.empty()) {
-        hwaccel = _runResources.getHWAccelBackend();
-    }
-    std::string renderer = rcfile.getRenderer();
-    if (renderer.empty()) {
-        renderer = _runResources.getRenderBackend();
-    }
+    std::string hwaccel = _runResources.getHWAccelBackend();
+    std::string renderer = _runResources.getRenderBackend();
 
     if (renderer == "opengl") {
         // See if our X11 server supports the DRI extension, otherwise

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

Summary of changes:
 gui/gnash.cpp   |    3 ++-
 gui/gtk/gtk.cpp |   12 ++----------
 2 files changed, 4 insertions(+), 11 deletions(-)


hooks/post-receive
-- 
Gnash