[Gnash-commit] gnash ChangeLog gui/gtk.cpp libbase/rc.cpp

[Benjamin Wolsey]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Benjamin Wolsey <bwy>   08/01/23 12:10:22

Modified files:
        .              : ChangeLog 
        gui            : gtk.cpp 
        libbase        : rc.cpp 

Log message:
        libbbase/rc.cpp: Don't increment verbosity automatically when some
         debugging output is enabled.
        gui/gtk.cpp: Use 'program-name' in about dialogue.
        
        Not sure why this stopped working (about dialogue), but the property 
'name' was changed to 'program-name' in GTK 2.12 to avoid a conflict, and 
indeed has always said 'gtk-gnash' rather than the value it's given.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.5475&r2=1.5476
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gtk.cpp?cvsroot=gnash&r1=1.137&r2=1.138
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/rc.cpp?cvsroot=gnash&r1=1.56&r2=1.57

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5475
retrieving revision 1.5476
diff -u -b -r1.5475 -r1.5476
--- ChangeLog   23 Jan 2008 09:35:20 -0000      1.5475
+++ ChangeLog   23 Jan 2008 12:10:21 -0000      1.5476
@@ -1,3 +1,9 @@
+2008-01-23 Benjamin Wolsey <address@hidden>
+
+       * libbase/rc.cpp: Don't increment verbosity automatically when some
+         debugging output is enabled.
+       * gui/gtk.cpp: Use 'program-name' in about dialogue.
+
 2008-01-23 Sandro Santilli <address@hidden>
 
        * server/sprite_instance.cpp (pointInVisibleShape): static masks

Index: gui/gtk.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/gtk.cpp,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -b -r1.137 -r1.138
--- gui/gtk.cpp 22 Jan 2008 14:53:19 -0000      1.137
+++ gui/gtk.cpp 23 Jan 2008 12:10:22 -0000      1.138
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: gtk.cpp,v 1.137 2008/01/22 14:53:19 bwy Exp $ */
+/* $Id: gtk.cpp,v 1.138 2008/01/23 12:10:22 bwy Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "gnashconfig.h"
@@ -1345,7 +1345,7 @@
 
     gtk_show_about_dialog (
                   NULL,
-                   "name", _("GNASH flash movie player"), 
+                   "program-name", _("GNASH flash movie player"), 
                    "version", VERSION,
                    "copyright", "Copyright (C) 2005, 2006, 2007, 2008 The Free 
Software Foundation",
                   "comments", comments.c_str(),

Index: libbase/rc.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/rc.cpp,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -b -r1.56 -r1.57
--- libbase/rc.cpp      21 Jan 2008 20:55:45 -0000      1.56
+++ libbase/rc.cpp      23 Jan 2008 12:10:22 -0000      1.57
@@ -674,46 +674,25 @@
 void
 RcInitFile::useActionDump(bool value)
 {
-//    GNASH_REPORT_FUNCTION;
     _actionDump = value;
-    if (value) {
-        _verbosity++;
-    }
 }
 
 void
 RcInitFile::showASCodingErrors(bool value)
 {
-//    GNASH_REPORT_FUNCTION;
-    
     _verboseASCodingErrors = value;
-    
-    if (value) {
-        _verbosity++;
-    }
 }
 
 void
 RcInitFile::showMalformedSWFErrors(bool value)
 {
-//    GNASH_REPORT_FUNCTION;
-    
     _verboseMalformedSWF = value;
-    
-    if (value) {
-        _verbosity++;
-    }
 }
 
 void
 RcInitFile::useParserDump(bool value)
 {
-//    GNASH_REPORT_FUNCTION;
-    
     _parserDump = value;
-    if (value) {
-        _verbosity++;
-    }
 }
 
 void
@@ -727,49 +706,52 @@
 void
 RcInitFile::dump()
 {
-    std::cerr << endl << "Dump RcInitFile:" << endl;
-    std::cerr << "\tTimer interupt delay value: " << _delay << endl;
-    std::cerr << "\tFlash debugger: "
+
+    using std::cerr;
+    
+    cerr << endl << "Dump RcInitFile:" << endl;
+    cerr << "\tTimer interupt delay value: " << _delay << endl;
+    cerr << "\tFlash debugger: "
          << ((_debugger)?"enabled":"disabled") << endl;
-    std::cerr << "\tVerbosity Level: " << _verbosity << endl;
-    std::cerr << "\tDump ActionScript processing: "
+    cerr << "\tVerbosity Level: " << _verbosity << endl;
+    cerr << "\tDump ActionScript processing: "
          << ((_actionDump)?"enabled":"disabled") << endl;
-    std::cerr << "\tDump parser info: "
+    cerr << "\tDump parser info: "
          << ((_parserDump)?"enabled":"disabled") << endl;
-    std::cerr << "\tActionScript coding errors verbosity: "
+    cerr << "\tActionScript coding errors verbosity: "
          << ((_verboseASCodingErrors)?"enabled":"disabled") << endl;
-    std::cerr << "\tMalformed SWF verbosity: "
+    cerr << "\tMalformed SWF verbosity: "
          << ((_verboseASCodingErrors)?"enabled":"disabled") << endl;
-    std::cerr << "\tUse Splash Screen: "
+    cerr << "\tUse Splash Screen: "
          << ((_splashScreen)?"enabled":"disabled") << endl;
-    std::cerr << "\tUse Local Domain Only: "
+    cerr << "\tUse Local Domain Only: "
          << ((_localdomainOnly)?"enabled":"disabled") << endl;
-    std::cerr << "\tUse Localhost Only: "
+    cerr << "\tUse Localhost Only: "
          << ((_localhostOnly)?"enabled":"disabled") << endl;
-    std::cerr << "\tWrite Debug Log To Disk: "
+    cerr << "\tWrite Debug Log To Disk: "
          << ((_writeLog)?"enabled":"disabled") << endl;
-    std::cerr << "\tAllow insecure SSL connections: "
+    cerr << "\tAllow insecure SSL connections: "
          << ((_insecureSSL)?"yes":"no") << endl;
-    std::cerr << "\tEnable sound: "
+    cerr << "\tEnable sound: "
          << ((_sound)?"enabled":"disabled") << endl;
-    std::cerr << "\tEnable Plugin sound: "
+    cerr << "\tEnable Plugin sound: "
          << ((_pluginSound)?"enabled":"disabled") << endl;
-    std::cerr << "\tEnable Extensions: "
+    cerr << "\tEnable Extensions: "
          << ((_extensionsEnabled)?"enabled":"disabled") << endl;
     if (_log.size()) {
-        std::cerr << "\tDebug Log name is: " << _log << endl;
+        cerr << "\tDebug Log name is: " << _log << endl;
     }
     if (_flashVersionString.size()) {
-        std::cerr << "\tFlash Version String is: " << _flashVersionString << 
endl;
+        cerr << "\tFlash Version String is: " << _flashVersionString << endl;
     }
-    std::cerr << "\tWhitelist: ";
-    writeList (_whitelist, std::cerr);
+    cerr << "\tWhitelist: ";
+    writeList (_whitelist, cerr);
     
-    std::cerr << "\tBlacklist: ";
-    writeList (_blacklist, std::cerr);
+    cerr << "\tBlacklist: ";
+    writeList (_blacklist, cerr);
     
-    std::cerr << "\tSandbox: ";
-    writeList (_localSandboxPath, std::cerr);
+    cerr << "\tSandbox: ";
+    writeList (_localSandboxPath, cerr);
 }