[Gnash-commit] gnash ./ChangeLog doc/C/gnash-C.omf doc/C/sourc...

[Rob Savoye]

CVSROOT:        /sources/gnash
Module name:    gnash
Branch:         
Changes by:     Rob Savoye <address@hidden>     06/04/10 01:18:11

Modified files:
        .              : ChangeLog 
        doc/C          : gnash-C.omf sources.xml 
        packaging/debian: control gnash-klash.install 
        plugin         : Makefile.am 
        plugin/klash   : klash_part.cpp 
        server         : NetConnection.cpp 

Log message:
        * plugin/klash/klash_part.cpp: Use the new options to set the
        window size of the browser window correctly.
        * server/NetConnection.cpp: Catch trying to access a URL that is
        set to "null", instead of zero.
        * packaging/debian/gnash-klash.install: Add klash_part.desktop to
        the package.
        * packaging/debian/control: Add more dependancies.
        * doc/C/gnash-C.omf: Install in "Sound and Video" instead of
        Multimedia.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/ChangeLog.diff?tr1=1.206&tr2=1.207&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/doc/C/gnash-C.omf.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/doc/C/sources.xml.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/packaging/debian/control.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/packaging/debian/gnash-klash.install.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/plugin/Makefile.am.diff?tr1=1.18&tr2=1.19&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/plugin/klash/klash_part.cpp.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/NetConnection.cpp.diff?tr1=1.6&tr2=1.7&r1=text&r2=text

Patches:
Index: gnash/ChangeLog
diff -u gnash/ChangeLog:1.206 gnash/ChangeLog:1.207
--- gnash/ChangeLog:1.206       Fri Apr  7 17:11:00 2006
+++ gnash/ChangeLog     Mon Apr 10 01:18:11 2006
@@ -1,6 +1,19 @@
+2006-04-09  Rob Savoye  <address@hidden>
+
+       * plugin/klash/klash_part.cpp: Use the new options to set the
+       window size of the browser window correctly.
+       * server/NetConnection.cpp: Catch trying to access a URL that is
+       set to "null", instead of zero.
+       * packaging/debian/gnash-klash.install: Add klash_part.desktop to
+       the package.
+       * packaging/debian/control: Add more dependancies.
+       * doc/C/gnash-C.omf: Install in "Sound and Video" instead of
+       Multimedia.
 
 2006-04-07  Rob Savoye  <address@hidden>
 
+       * packaging/debian/: Add packaging files. 
+
        * macros/kde.m4: Also look for QT with qt-3.3 as well as qt3.
        * README: minor typo corrections.
        * packaging/redhat/gnash.spec: Build klash, add additional
@@ -8,13 +21,13 @@
 
 2006-04-07  Patrice Dumas <pertusus at free.fr>
 
-       * macros/ghelp.m4: Don't warn if the user doing ./configure
-       isn't root.
-       * doc/omf.make, doc/xmldocs.make, doc/C/Makefile.am: use '-hook'
-       targets for omf files installation, and '-local' targets for xml
-       files installation. Remove intermediate useless targets. If ghelp
-       isn't enabled, disableonly the omf files installation. Remove
-       the @ in front of make rules.
+       * macros/ghelp.m4: Don't warn if the user doing ./configure
+       isn't root.
+       * doc/omf.make, doc/xmldocs.make, doc/C/Makefile.am: use '-hook'
+       targets for omf files installation, and '-local' targets for xml
+       files installation. Remove intermediate useless targets. If ghelp
+       isn't enabled, disable only the omf files installation. Remove
+       the @ in front of make rules.
 
 2006-04-06  Rob Savoye  <address@hidden>
        
Index: gnash/doc/C/gnash-C.omf
diff -u gnash/doc/C/gnash-C.omf:1.2 gnash/doc/C/gnash-C.omf:1.3
--- gnash/doc/C/gnash-C.omf:1.2 Fri Apr  7 00:59:43 2006
+++ gnash/doc/C/gnash-C.omf     Mon Apr 10 01:18:11 2006
@@ -14,7 +14,7 @@
      2006-02-06
     </date>
     <version identifier="0.1.1" date="2006-02-06" description="First 
release."/>
-    <subject category="GNOME|Applications|Multimedia"/>
+    <subject category="GNOME|Applications|Sound and Video"/>
     <description>
        This is the manual for Gnash, a Free flash movie player.
     </description>
Index: gnash/doc/C/sources.xml
diff -u gnash/doc/C/sources.xml:1.6 gnash/doc/C/sources.xml:1.7
--- gnash/doc/C/sources.xml:1.6 Sun Apr  2 21:45:55 2006
+++ gnash/doc/C/sources.xml     Mon Apr 10 01:18:11 2006
@@ -80,7 +80,7 @@
       </para>
       <para>
        To install a binary package using apt-get (on Debian based
-       systems), install caito-dev. For RPM or Yum based
+       systems), install cairo-dev. For RPM or Yum based
        systems, install the cairo-devel package.
       </para>
     </sect3>
Index: gnash/packaging/debian/control
diff -u gnash/packaging/debian/control:1.1 gnash/packaging/debian/control:1.2
--- gnash/packaging/debian/control:1.1  Sat Apr  8 04:09:44 2006
+++ gnash/packaging/debian/control      Mon Apr 10 01:18:11 2006
@@ -1,7 +1,7 @@
 Source: gnash
 Priority: optional
 Maintainer: Miriam Ruiz <address@hidden>
-Build-Depends: debhelper (>= 4.0.0), autoconf, automake, libxmu-dev, dejagnu, 
autotools-dev, libxml2-dev, libjpeg-dev, libpng-dev, libsdl1.2-dev, 
libsdl-mixer1.2-dev, libgl1-mesa-dev, libglu1-mesa-dev, libmad0-dev, mozilla-dev
+Build-Depends: debhelper (>= 4.0.0), autoconf, automake, libxmu-dev, dejagnu, 
autotools-dev, libxml2-dev, libjpeg-dev, libpng-dev, libsdl1.2-dev, 
libsdl-mixer1.2-dev, libgl1-mesa-dev | xlibmesa-gl-dev, libglu1-mesa-dev | 
libglu1-xorg-dev, libmad0-dev, mozilla-dev
 Standards-Version: 3.6.2
 Section: utils
 
@@ -60,7 +60,7 @@
 Package: gnash-klash
 Section: utils
 Architecture: any
-Depends: libgnash0 (= ${Source-Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends: libgnash0 (= ${Source-Version}), gnash (= ${Source-Version}), 
${shlibs:Depends}, ${misc:Depends}
 Description: free Flash movie player - Plugin
  Gnash is a Free Flash movie player, which works either standalone, or as a
  Firefox/Mozilla plugin. This package includes the plugin for the Konqueror
Index: gnash/packaging/debian/gnash-klash.install
diff -u gnash/packaging/debian/gnash-klash.install:1.1 
gnash/packaging/debian/gnash-klash.install:1.2
--- gnash/packaging/debian/gnash-klash.install:1.1      Sat Apr  8 04:09:44 2006
+++ gnash/packaging/debian/gnash-klash.install  Mon Apr 10 01:18:11 2006
@@ -1,3 +1,3 @@
 usr/share/apps/klash/*
 usr/lib/kde3/*
-
+usr/share/services/klash_part.desktop
Index: gnash/plugin/Makefile.am
diff -u gnash/plugin/Makefile.am:1.18 gnash/plugin/Makefile.am:1.19
--- gnash/plugin/Makefile.am:1.18       Fri Mar 31 00:57:33 2006
+++ gnash/plugin/Makefile.am    Mon Apr 10 01:18:11 2006
@@ -106,9 +106,9 @@
 
 plugin_LTLIBRARIES = libgnashplugin.la
 
-noinst_HEADERS = plugin.h player.h 
+noinst_HEADERS = plugin.h #player.h 
 
-libgnashplugin_la_SOURCES  = plugin.cpp player.cpp 
+libgnashplugin_la_SOURCES  = plugin.cpp #player.cpp 
 libgnashplugin_la_LIBADD   = $(AM_LDFLAGS) \
        mozilla-sdk/libmozsdk.la\
        ../backend/libgnashbackend.la\
Index: gnash/plugin/klash/klash_part.cpp
diff -u gnash/plugin/klash/klash_part.cpp:1.2 
gnash/plugin/klash/klash_part.cpp:1.3
--- gnash/plugin/klash/klash_part.cpp:1.2       Thu Mar  9 19:29:06 2006
+++ gnash/plugin/klash/klash_part.cpp   Mon Apr 10 01:18:11 2006
@@ -111,6 +111,8 @@
    m_browserextension (new KlashBrowserExtension (this)),
    m_liveconnectextension (new KlashLiveConnectExtension (this)),
    m_process (0L),
+   m_width (0),
+   m_height (0),
    m_autostart (false),
    m_fullscreen (false),
    m_started_emited (false) {
@@ -178,7 +180,14 @@
     m_process = new KProcess;
     m_process->setUseShell (true);
     m_process->setEnvironment (QString::fromLatin1 ("SESSION_MANAGER"), 
QString::fromLatin1 (""));
-    QString cmd = "gnash -x " + QString::number (static_cast <KlashView *> 
(widget ())->embedId()) + QString (" ") + m_src_url;
+    QString dim;
+    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::number (static_cast <KlashView *> (widget ())->embedId()) +
+        QChar (' ') + dim +
+        QChar (' ') + KProcess::quote (m_src_url);
     kdDebug () << cmd << endl;
     *m_process << cmd;
     connect (m_process, SIGNAL (processExited (KProcess *)),
Index: gnash/server/NetConnection.cpp
diff -u gnash/server/NetConnection.cpp:1.6 gnash/server/NetConnection.cpp:1.7
--- gnash/server/NetConnection.cpp:1.6  Thu Mar  9 19:29:06 2006
+++ gnash/server/NetConnection.cpp      Mon Apr 10 01:18:11 2006
@@ -94,6 +94,10 @@
     string::size_type double_slash;
 
     if (arg != 0) {
+        if (strcmp(arg, "null") == 0) {
+            log_warning("No URL specified!\n");
+            return;
+        }
         _url = arg;
         // protocol:[//host][:port]/appname/[instanceName]
         first_colon = _url.find(':', 0);