[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash ChangeLog plugin/klash/Makefile.am plugin... [relea
From: |
Sandro Santilli |
Subject: |
[Gnash-commit] gnash ChangeLog plugin/klash/Makefile.am plugin... [release-0-8-0] |
Date: |
Wed, 06 Jun 2007 09:07:57 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Branch: release-0-8-0
Changes by: Sandro Santilli <strk> 07/06/06 09:07:57
Modified files:
. : ChangeLog
plugin/klash : Makefile.am klash_part.cpp
Log message:
* plugin/klash/: Makefile.am, klash_part.cpp: spanw the
KLASH_PLAYER
if set in the environment, or default to GNASHBINDIR/klash
otherwise. This is to have klash plugin closer in
implementation/features to the firefox one, and to test using
other
guis...
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&only_with_tag=release-0-8-0&r1=1.3451.2.19&r2=1.3451.2.20
http://cvs.savannah.gnu.org/viewcvs/gnash/plugin/klash/Makefile.am?cvsroot=gnash&only_with_tag=release-0-8-0&r1=1.29&r2=1.29.4.1
http://cvs.savannah.gnu.org/viewcvs/gnash/plugin/klash/klash_part.cpp?cvsroot=gnash&only_with_tag=release-0-8-0&r1=1.13.4.1&r2=1.13.4.2
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3451.2.19
retrieving revision 1.3451.2.20
diff -u -b -r1.3451.2.19 -r1.3451.2.20
--- ChangeLog 6 Jun 2007 06:57:50 -0000 1.3451.2.19
+++ ChangeLog 6 Jun 2007 09:07:55 -0000 1.3451.2.20
@@ -1,5 +1,13 @@
2007-06-06 Sandro Santilli <address@hidden>
+ * plugin/klash/: Makefile.am, klash_part.cpp: spanw the KLASH_PLAYER
+ if set in the environment, or default to GNASHBINDIR/klash
+ otherwise. This is to have klash plugin closer in
+ implementation/features to the firefox one, and to test using other
+ guis...
+
+2007-06-06 Sandro Santilli <address@hidden>
+
* Makefile.am: Add print of CXXFLAGS at 'make dumpconfig' time.
2007-06-05 Sandro Santilli <address@hidden>
Index: plugin/klash/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/plugin/klash/Makefile.am,v
retrieving revision 1.29
retrieving revision 1.29.4.1
diff -u -b -r1.29 -r1.29.4.1
--- plugin/klash/Makefile.am 14 May 2007 15:24:04 -0000 1.29
+++ plugin/klash/Makefile.am 6 Jun 2007 09:07:57 -0000 1.29.4.1
@@ -15,12 +15,12 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-# $Id: Makefile.am,v 1.29 2007/05/14 15:24:04 rsavoye Exp $
+# $Id: Makefile.am,v 1.29.4.1 2007/06/06 09:07:57 strk Exp $
AUTOMAKE_OPTIONS =
if KLASH
-AM_CPPFLAGS= $(KDE_CFLAGS) $(QT_CFLAGS)
+AM_CPPFLAGS= $(KDE_CFLAGS) $(QT_CFLAGS) -DGNASHBINDIR=\"$(GNASHEXE)\"
plugindir = $(libdir)/kde3
kde_servicesdir = $(prefix)/share/services
Index: plugin/klash/klash_part.cpp
===================================================================
RCS file: /sources/gnash/gnash/plugin/klash/klash_part.cpp,v
retrieving revision 1.13.4.1
retrieving revision 1.13.4.2
diff -u -b -r1.13.4.1 -r1.13.4.2
--- plugin/klash/klash_part.cpp 5 Jun 2007 19:19:31 -0000 1.13.4.1
+++ plugin/klash/klash_part.cpp 6 Jun 2007 09:07:57 -0000 1.13.4.2
@@ -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;
@@ -168,7 +179,7 @@
dim = QString ("-j ") + QString::number (m_width) +
QString (" -k ") + QString::number (m_height);
// TODO: check KLASH_PLAYER env ?
- QString cmd = QString ("klash -x ") +
+ QString cmd = procname + QString (" -x ") +
QString::number (static_cast <KlashView *> (widget ())->embedId()) +
QChar (' ') + dim +
QChar (' ') + KProcess::quote (m_src_url);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] gnash ChangeLog plugin/klash/Makefile.am plugin... [release-0-8-0],
Sandro Santilli <=