[Gnash-commit] gnash ChangeLog plugin/klash/klash_part.cpp

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/07/23 15:44:37

Modified files:
        .              : ChangeLog 
        plugin/klash   : klash_part.cpp 

Log message:
                * plugin/klash/klash_part.cpp: invoke "klash", not "gnash".
                  Allow KLASH_PLAYER environment variable to change what's
                  invoked. The plan is that "klash" would be an alias for
                  "gnash --gui=kde".

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3791&r2=1.3792
http://cvs.savannah.gnu.org/viewcvs/gnash/plugin/klash/klash_part.cpp?cvsroot=gnash&r1=1.14&r2=1.15

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3791
retrieving revision 1.3792
diff -u -b -r1.3791 -r1.3792
--- ChangeLog   23 Jul 2007 14:02:55 -0000      1.3791
+++ ChangeLog   23 Jul 2007 15:44:36 -0000      1.3792
@@ -1,3 +1,10 @@
+2007-07-23 Sandro Santilli <address@hidden>
+
+       * plugin/klash/klash_part.cpp: invoke "klash", not "gnash".
+         Allow KLASH_PLAYER environment variable to change what's
+         invoked. The plan is that "klash" would be an alias for
+         "gnash --gui=kde".
+
 2007-07-23 Udo Giacomozzi <address@hidden>
 
        * server/edit_text_character.cpp: make get_world_cxform() again

Index: plugin/klash/klash_part.cpp
===================================================================
RCS file: /sources/gnash/gnash/plugin/klash/klash_part.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- plugin/klash/klash_part.cpp 1 Jul 2007 10:54:15 -0000       1.14
+++ plugin/klash/klash_part.cpp 23 Jul 2007 15:44:36 -0000      1.15
@@ -156,7 +156,18 @@
     return kapp->authorizeURLAction ("redirect", m_docbase, url);
 }
 
-KDE_NO_EXPORT void KlashPart::play () {
+KDE_NO_EXPORT void KlashPart::play ()
+{
+
+    QString procname;
+    char *gnash_env = getenv("KLASH_PLAYER");
+    if (!gnash_env) {
+      procname = GNASHBINDIR;
+      procname += "/klash";
+    } else {
+      procname = gnash_env;
+    }
+
     stop ();
     if (m_src_url.isEmpty ())
         return;
@@ -167,7 +178,7 @@
     if (m_width > 0 && m_height > 0)
         dim = QString ("-j ") + QString::number (m_width) +
             QString (" -k ") + QString::number (m_height);
-    QString cmd = QString ("gnash -x ") +
+    QString cmd = procname + QString (" -x ") +
         QString::number (static_cast <KlashView *> (widget ())->embedId()) +
         QChar (' ') + dim +
         QChar (' ') + KProcess::quote (m_src_url);