[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_start-414-gb5617cc

[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  b5617cc13524b1fd98e3bd36e1ce158bd48f1d6f (commit)
      from  4daa5e1e4fc8da404c21768f4795d3e7dc8f5226 (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=b5617cc13524b1fd98e3bd36e1ce158bd48f1d6f


commit b5617cc13524b1fd98e3bd36e1ce158bd48f1d6f
Author: Sandro Santilli <address@hidden>
Date:   Sun Mar 27 16:56:50 2011 +0200

    As for renderer, read rcfile for the default mediahandler too. Fixes #32859.

diff --git a/gui/gnash.cpp b/gui/gnash.cpp
index 1b04564..fdd26e0 100644
--- a/gui/gnash.cpp
+++ b/gui/gnash.cpp
@@ -375,14 +375,15 @@ getSupportedOptions(gnash::Player& p)
         ).c_str())
 
     ("media,M", po::value<string>()
-        ->default_value(handlers.front())
+        ->default_value(rcfile.getMediaHandler().empty() ? handlers.front()
+                                                 : rcfile.getMediaHandler() )
         ->notifier(boost::bind(&Player::setMedia, &p, _1)),
         (string(_("The media handler to use"))
          + string("\n") + boost::join(handlers, "|")
         ).c_str())
 
     ("renderer,R", po::value<string>()
-        ->default_value(rcfile.getRenderer().empty() ? renderers[0]
+        ->default_value(rcfile.getRenderer().empty() ? renderers.front()
                                                      : rcfile.getRenderer())
         ->notifier(boost::bind(&Player::setRenderer, &p, _1)),
         (string(_("The renderer to use"))

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

Summary of changes:
 gui/gnash.cpp |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
Gnash