[Gnash-commit] gnash ChangeLog gui/gnash.cpp libbase/rc.h plug... [release_0_7_2]

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Branch:         release_0_7_2
Changes by:     Sandro Santilli <strk>  06/11/09 17:03:34

Modified files:
        .              : ChangeLog 
        gui            : gnash.cpp 
        libbase        : rc.h 
        plugin/klash   : klash.cpp 
        utilities      : parser.cpp processor.cpp 

Log message:
                * gui/gnash.cpp, libbase/rc.h, plugin/klash/klash.cpp,
                  utilities/parser.cpp, utilities/processor.cpp:
                  Reverted privatization of RcFile.loadFiles().
                  We actually want to keep control of that call, at
                  least for the unit testing...

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.1412.2.137&r2=1.1412.2.138
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gnash.cpp?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.53.2.4&r2=1.53.2.5
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/rc.h?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.7.2.2&r2=1.7.2.3
http://cvs.savannah.gnu.org/viewcvs/gnash/plugin/klash/klash.cpp?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.17.2.4&r2=1.17.2.5
http://cvs.savannah.gnu.org/viewcvs/gnash/utilities/parser.cpp?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.24.2.2&r2=1.24.2.3
http://cvs.savannah.gnu.org/viewcvs/gnash/utilities/processor.cpp?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.29.2.3&r2=1.29.2.4

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1412.2.137
retrieving revision 1.1412.2.138
diff -u -b -r1.1412.2.137 -r1.1412.2.138
--- ChangeLog   9 Nov 2006 16:31:31 -0000       1.1412.2.137
+++ ChangeLog   9 Nov 2006 17:03:33 -0000       1.1412.2.138
@@ -1,5 +1,13 @@
 2006-11-09 Sandro Santilli <address@hidden>
 
+       * gui/gnash.cpp, libbase/rc.h, plugin/klash/klash.cpp,
+         utilities/parser.cpp, utilities/processor.cpp:
+         Reverted privatization of RcFile.loadFiles().
+         We actually want to keep control of that call, at
+         least for the unit testing...
+
+2006-11-09 Sandro Santilli <address@hidden>
+
        * plugin/klash/klash.cpp, utilities/: parser.cpp, processor.cpp:
          remove explicit rcfile.loadFiles() call.
        * libbase/rc.cpp: set pluginSound on by default

Index: gui/gnash.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/gnash.cpp,v
retrieving revision 1.53.2.4
retrieving revision 1.53.2.5
diff -u -b -r1.53.2.4 -r1.53.2.5
--- gui/gnash.cpp       9 Nov 2006 16:14:15 -0000       1.53.2.4
+++ gui/gnash.cpp       9 Nov 2006 17:03:33 -0000       1.53.2.5
@@ -311,6 +311,8 @@
 {
        gnash::Player player;
 
+       rcfile.loadFiles();
+
        parseCommandLine(argc, argv, player);
 
        // No file name was supplied

Index: libbase/rc.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/rc.h,v
retrieving revision 1.7.2.2
retrieving revision 1.7.2.3
diff -u -b -r1.7.2.2 -r1.7.2.3
--- libbase/rc.h        9 Nov 2006 16:14:15 -0000       1.7.2.2
+++ libbase/rc.h        9 Nov 2006 17:03:33 -0000       1.7.2.3
@@ -37,6 +37,8 @@
     RcInitFile();
     ~RcInitFile();
 
+    bool loadFiles();
+
     bool parseFile(std::string filespec);
     bool updateFile(std::string filespec);
     
@@ -92,8 +94,6 @@
     
 private:
 
-    bool loadFiles();
-
     int  _delay;                // the timer delay
     bool _debug;                // enable debugging of this class
     bool _debugger;             // enable the Flash movie debugger

Index: plugin/klash/klash.cpp
===================================================================
RCS file: /sources/gnash/gnash/plugin/klash/klash.cpp,v
retrieving revision 1.17.2.4
retrieving revision 1.17.2.5
diff -u -b -r1.17.2.4 -r1.17.2.5
--- plugin/klash/klash.cpp      9 Nov 2006 16:31:31 -0000       1.17.2.4
+++ plugin/klash/klash.cpp      9 Nov 2006 17:03:33 -0000       1.17.2.5
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: klash.cpp,v 1.17.2.4 2006/11/09 16:31:31 strk Exp $ */
+/* $Id: klash.cpp,v 1.17.2.5 2006/11/09 17:03:33 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -279,6 +279,9 @@
 
     dbglogfile.setWriteDisk(false);
     
+    rcfile.loadFiles();
+//    rcfile.dump();
+
     if (rcfile.useWriteLog()) {
         dbglogfile.setWriteDisk(true);
     }

Index: utilities/parser.cpp
===================================================================
RCS file: /sources/gnash/gnash/utilities/parser.cpp,v
retrieving revision 1.24.2.2
retrieving revision 1.24.2.3
diff -u -b -r1.24.2.2 -r1.24.2.3
--- utilities/parser.cpp        9 Nov 2006 16:31:32 -0000       1.24.2.2
+++ utilities/parser.cpp        9 Nov 2006 17:03:33 -0000       1.24.2.3
@@ -16,7 +16,7 @@
 // 
 //
 
-/* $Id: parser.cpp,v 1.24.2.2 2006/11/09 16:31:32 strk Exp $ */
+/* $Id: parser.cpp,v 1.24.2.3 2006/11/09 17:03:33 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -625,6 +625,7 @@
 
     std::vector<const char*> infiles;
       
+    rcfile.loadFiles();
     if (rcfile.verbosityLevel() > 0) {
         dbglogfile.setVerbosity(rcfile.verbosityLevel());
     }

Index: utilities/processor.cpp
===================================================================
RCS file: /sources/gnash/gnash/utilities/processor.cpp,v
retrieving revision 1.29.2.3
retrieving revision 1.29.2.4
diff -u -b -r1.29.2.3 -r1.29.2.4
--- utilities/processor.cpp     9 Nov 2006 16:31:32 -0000       1.29.2.3
+++ utilities/processor.cpp     9 Nov 2006 17:03:33 -0000       1.29.2.4
@@ -17,7 +17,7 @@
 //
 //
 
-/* $Id: processor.cpp,v 1.29.2.3 2006/11/09 16:31:32 strk Exp $ */
+/* $Id: processor.cpp,v 1.29.2.4 2006/11/09 17:03:33 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -108,6 +108,8 @@
  
     std::vector<const char*> infiles;
  
+    rcfile.loadFiles();
+    
     if (rcfile.verbosityLevel() > 0) {
         dbglogfile.setVerbosity(rcfile.verbosityLevel());
     }