[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_start-334-g3441c54

[Benjamin Wolsey]

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  3441c5400aaa5e5896709e9e1bbde3357cb6bc10 (commit)
       via  23940a560cd708f82f7e2e580e5d99c83ee59fa9 (commit)
       via  72d3847d8e5961b78b24b9488b41b65ac510815b (commit)
       via  8fd9265da8e381b6697a75a1198f32abc00c5895 (commit)
      from  461caa30664c45e57ab0f81ed2f7952db00f9ac7 (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=3441c5400aaa5e5896709e9e1bbde3357cb6bc10


commit 3441c5400aaa5e5896709e9e1bbde3357cb6bc10
Author: Benjamin Wolsey <address@hidden>
Date:   Thu Mar 24 13:05:29 2011 +0100

    Fix npapi plugin for qt4-gnash.

diff --git a/plugin/npapi/plugin.cpp b/plugin/npapi/plugin.cpp
index b961dae..71f0ddf 100644
--- a/plugin/npapi/plugin.cpp
+++ b/plugin/npapi/plugin.cpp
@@ -933,7 +933,7 @@ getGnashExecutable()
         process_found = (0 == stat(procname.c_str(), &procstats));
     }
     if (!process_found) {
-        procname = GNASHBINDIR "/kde4-gnash";
+        procname = GNASHBINDIR "/qt4-gnash";
         process_found = (0 == stat(procname.c_str(), &procstats));
     }
 

http://git.savannah.gnu.org/cgit//commit/?id=23940a560cd708f82f7e2e580e5d99c83ee59fa9


commit 23940a560cd708f82f7e2e580e5d99c83ee59fa9
Author: Benjamin Wolsey <address@hidden>
Date:   Thu Mar 24 13:04:22 2011 +0100

    Fix preformatted manpage.

diff --git a/doc/C/preformatted/gnash.1.in b/doc/C/preformatted/gnash.1.in
index 9a1cedb..7743158 100644
--- a/doc/C/preformatted/gnash.1.in
+++ b/doc/C/preformatted/gnash.1.in
@@ -7,7 +7,7 @@
 .if \n(.g .mso www.tmac
 .TH gnash 1 "17 January 2011" "" ""
 .SH NAME
-gnash, gtk-gnash, kde4-gnash \- GNU Flash (SWF) Player
+gnash, gtk-gnash, qt4-gnash \- GNU Flash (SWF) Player
 .SH Synopsis
 .nf
 
diff --git a/doc/C/preformatted/kde4-gnash.1.in 
b/doc/C/preformatted/qt4-gnash.1.in
similarity index 100%
rename from doc/C/preformatted/kde4-gnash.1.in
rename to doc/C/preformatted/qt4-gnash.1.in

http://git.savannah.gnu.org/cgit//commit/?id=72d3847d8e5961b78b24b9488b41b65ac510815b


commit 72d3847d8e5961b78b24b9488b41b65ac510815b
Author: Benjamin Wolsey <address@hidden>
Date:   Thu Mar 24 13:03:54 2011 +0100

    Fix manpages for qt4-gnash.

diff --git a/desktop/gnash-qt-launcher.in b/desktop/gnash-qt-launcher.in
index 6e50cbe..7b928ca 100644
--- a/desktop/gnash-qt-launcher.in
+++ b/desktop/gnash-qt-launcher.in
@@ -21,7 +21,7 @@
 #
 
 if test "x$1" = "x" -a -f @prefix@/share/gnash/gnash-splash.swf; then
-  kde4-gnash @prefix@/share/gnash/gnash-splash.swf
+  qt4-gnash @prefix@/share/gnash/gnash-splash.swf
 else
-  kde4-gnash "$@"
+  qt4-gnash "$@"
 fi
diff --git a/doc/C/Makefile.am b/doc/C/Makefile.am
index d99c3c5..fed3d12 100644
--- a/doc/C/Makefile.am
+++ b/doc/C/Makefile.am
@@ -102,7 +102,7 @@ EXTRA_DIST = \
        preformatted/findmicrophones.1.in \
        preformatted/findwebcams.1.in \
        preformatted/gtk-gnash.1.in \
-       preformatted/kde4-gnash.1.in \
+       preformatted/qt4-gnash.1.in \
        preformatted/sdl-gnash.1.in \
        preformatted/fb-gnash.1.in \
        preformatted/gnash-gtk-launcher.1.in \
@@ -132,7 +132,7 @@ EXTRAMANPAGES += gtk-gnash.1 gnash-gtk-launcher.1
 endif
 
 if BUILD_QT4_GUI
-EXTRAMANPAGES += kde4-gnash.1 gnash-qt-launcher.1
+EXTRAMANPAGES += qt4-gnash.1 gnash-qt-launcher.1
 endif
 
 if BUILD_SDL_GUI
@@ -375,7 +375,7 @@ uninstall-man1-hook:
 # install-data-hook: install-data-hook-omf
 # uninstall-local: uninstall-local-doc uninstall-local-omf
 
-# gtk-gnash.1, kde4-gnash.1, fb-gnash.1, sdl-gnash.1,gnash-gtk-launcher.1 and 
gnash-qt-launcher.1 are special,
+# gtk-gnash.1, qt4-gnash.1, fb-gnash.1, sdl-gnash.1,gnash-gtk-launcher.1 and 
gnash-qt-launcher.1 are special,
 # as they  are created by the --solinks option to the docbook2 tools for 
creating man pages.
 install-man1: $(MANPAGES)
        -test -d "$(DESTDIR)$(man1dir)/" || $(mkinstalldirs) 
"$(DESTDIR)$(man1dir)/"
@@ -388,7 +388,7 @@ uninstall-man1:
           $(RM) $(DESTDIR)$(man1dir)/$$file; \
        done
 
-# gtk-gnash.1, kde4-gnash.1, fb-gnash.1, sdl-gnash.1,gnash-gtk-launcher.1 and 
gnash-qt-launcher.1
+# gtk-gnash.1, qt-gnash.1, fb-gnash.1, sdl-gnash.1,gnash-gtk-launcher.1 and 
gnash-qt-launcher.1
 # manpages are generated as aliases for the gnash.1 man page, so we can't use 
the suffix rules to build
 # them, but we need to install the ".so gnash.1" manpages also, or
 # they aren;t in the tarball.
@@ -455,7 +455,7 @@ CLEANFILES = \
        omf_timestamp \
        images \
        gtk-gnash.1 \
-       kde4-gnash.1 \
+       qt4-gnash.1 \
        fb-gnash.1 \
        sdl-gnash.1 \
        gnash-gtk-launcher.1 \
diff --git a/doc/C/gnash.man-xml b/doc/C/gnash.man-xml
index 76ee3af..836f104 100644
--- a/doc/C/gnash.man-xml
+++ b/doc/C/gnash.man-xml
@@ -21,7 +21,7 @@
 <refnamediv>
 <refname>gnash</refname>
 <refname>gtk-gnash</refname>
-<refname>kde4-gnash</refname>
+<refname>qt4-gnash</refname>
 <refname>fb-gnash</refname>
 <refname>sdl-gnash</refname>
 <refname>gnash-gtk-launcher</refname>

http://git.savannah.gnu.org/cgit//commit/?id=8fd9265da8e381b6697a75a1198f32abc00c5895


commit 8fd9265da8e381b6697a75a1198f32abc00c5895
Author: Benjamin Wolsey <address@hidden>
Date:   Thu Mar 24 12:56:39 2011 +0100

    Fix klash_part.

diff --git a/plugin/klash4/klash_part.cpp b/plugin/klash4/klash_part.cpp
index bcf1150..ece528e 100644
--- a/plugin/klash4/klash_part.cpp
+++ b/plugin/klash4/klash_part.cpp
@@ -172,7 +172,7 @@ KDE_NO_EXPORT void KlashPart::play ()
     QString procname;
     char *gnash_env = getenv("KLASH_PLAYER");
     if (!gnash_env) {
-      procname = GNASHBINDIR "/kde4-gnash";
+      procname = GNASHBINDIR "/qt4-gnash";
     } else {
       procname = gnash_env;
     }

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

Summary of changes:
 desktop/gnash-qt-launcher.in                       |    4 ++--
 doc/C/Makefile.am                                  |   10 +++++-----
 doc/C/gnash.man-xml                                |    2 +-
 doc/C/preformatted/gnash.1.in                      |    2 +-
 .../{kde4-gnash.1.in => qt4-gnash.1.in}            |    0
 plugin/klash4/klash_part.cpp                       |    2 +-
 plugin/npapi/plugin.cpp                            |    2 +-
 7 files changed, 11 insertions(+), 11 deletions(-)
 rename doc/C/preformatted/{kde4-gnash.1.in => qt4-gnash.1.in} (100%)


hooks/post-receive
-- 
Gnash