[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_start-439-g58ccf74

[Sandro Santilli]

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  58ccf74a451598890046f2eeca2b192ed6d14a63 (commit)
       via  42b330f629f5ed0b0d43c4a199ee6d611a61c889 (commit)
       via  ebb9f46c742f24556190ee1d29e03560b4744d9f (commit)
      from  0eb5cf2460dec701ff9bbeb0eb710ec20301450b (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=58ccf74a451598890046f2eeca2b192ed6d14a63


commit 58ccf74a451598890046f2eeca2b192ed6d14a63
Author: Sandro Santilli <address@hidden>
Date:   Wed Mar 30 15:28:41 2011 +0200

    Complete GTK preferences support for script limits

diff --git a/gui/gtk/gtk.cpp b/gui/gtk/gtk.cpp
index 54e8176..26d66cd 100644
--- a/gui/gtk/gtk.cpp
+++ b/gui/gtk/gtk.cpp
@@ -1163,10 +1163,28 @@ PreferencesDialog::handlePrefs(GtkWidget* dialog, gint 
response, gpointer data)
                 
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(prefs->startStoppedToggle)));
         }
 
+        if ( prefs->scriptsTimeout ) {
+            _rcfile.setScriptsTimeout(
+                gtk_spin_button_get_value_as_int(
+                    GTK_SPIN_BUTTON(prefs->scriptsTimeout)));
+        }
+
+        if ( prefs->scriptsRecursionLimit ) {
+            _rcfile.setScriptsRecursionLimit(
+                gtk_spin_button_get_value_as_int(
+                    GTK_SPIN_BUTTON(prefs->scriptsRecursionLimit)));
+        }
+
+        if ( prefs->lockScriptLimitsToggle ) {
+            _rcfile.lockScriptLimits(
+                
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(prefs->lockScriptLimitsToggle)));
+        }
+
         if ( prefs->urlOpenerText ) {
             tmp = gtk_entry_get_text(GTK_ENTRY(prefs->urlOpenerText));         
   
             _rcfile.setURLOpenerFormat(tmp);
         }
+
         
         // Let _rcfile decide which file to update: generally the file
         // being used if specified in GNASHRC environment variable, or in
@@ -1593,7 +1611,7 @@ PreferencesDialog::addPlayerTab()
     gtk_spin_button_set_value(GTK_SPIN_BUTTON(_prefs->librarySize),
             _rcfile.getMovieLibraryLimit());
 
-    // Scripts timeout -- {
+    { // Scripts timeout -- {
 
     GtkWidget *hbox = gtk_hbox_new (FALSE, 2);
     gtk_box_pack_start(GTK_BOX(playervbox), hbox, FALSE, FALSE, 0);
@@ -1610,7 +1628,38 @@ PreferencesDialog::addPlayerTab()
     gtk_spin_button_set_value(GTK_SPIN_BUTTON(_prefs->scriptsTimeout),
             _rcfile.getScriptsTimeout());
 
-    // --}
+    } // --}
+
+    { // Scripts recursion limit -- {
+
+    GtkWidget *hbox = gtk_hbox_new (FALSE, 2);
+    gtk_box_pack_start(GTK_BOX(playervbox), hbox, FALSE, FALSE, 0);
+
+    GtkWidget *lbl = gtk_label_new (
+        _("Max scripts recursion limit (stack depth):"));
+    gtk_misc_set_alignment (GTK_MISC (lbl), 0, 0.5);
+    gtk_box_pack_start(GTK_BOX(hbox), lbl, FALSE, FALSE, 0);
+
+    _prefs->scriptsRecursionLimit = gtk_spin_button_new_with_range(0, 1024, 1);
+    gtk_box_pack_start(GTK_BOX(hbox), _prefs->scriptsRecursionLimit, FALSE,
+            FALSE, 0);
+    // Align to _rcfile value:
+    gtk_spin_button_set_value(GTK_SPIN_BUTTON(_prefs->scriptsRecursionLimit),
+            _rcfile.getScriptsRecursionLimit());
+
+    } // --}
+
+    { // Scripts limits lock -- {
+
+    _prefs->lockScriptLimitsToggle = gtk_check_button_new_with_mnemonic(
+            _("Lock script limits so that SWF tags can't override"));
+    gtk_box_pack_start (GTK_BOX(playervbox), _prefs->lockScriptLimitsToggle,
+            FALSE, FALSE, 0);
+    // Align button state with rcfile
+    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(
+            _prefs->lockScriptLimitsToggle), _rcfile.lockScriptLimits());
+
+    } // --}
 
 
     // Start-stopped toggle

http://git.savannah.gnu.org/cgit//commit/?id=42b330f629f5ed0b0d43c4a199ee6d611a61c889


commit 42b330f629f5ed0b0d43c4a199ee6d611a61c889
Author: Sandro Santilli <address@hidden>
Date:   Wed Mar 30 15:15:10 2011 +0200

    Don't write integers rcdirectives in hex form (after LCKey, that is)

diff --git a/libbase/rc.cpp b/libbase/rc.cpp
index 55b8d81..01f1a83 100644
--- a/libbase/rc.cpp
+++ b/libbase/rc.cpp
@@ -774,7 +774,8 @@ RcInitFile::updateFile(const std::string& filespec)
     cmd << "SOLSafeDir " << _solsandbox << endl <<
     cmd << "localConnection " << _lcdisabled << endl <<
     cmd << "LCTrace " << _lctrace << endl <<
-    cmd << "LCShmkey " << std::hex << (boost::uint32_t) _lcshmkey << endl <<
+    cmd << "LCShmkey " << std::hex << (boost::uint32_t) _lcshmkey
+        << std::dec << endl <<
     cmd << "ignoreFSCommand " << _ignoreFSCommand << endl <<    
     cmd << "ignoreShowMenu " << _ignoreShowMenu << endl <<
     cmd << "saveStreamingMedia " << _saveStreamingMedia << endl <<    

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


commit ebb9f46c742f24556190ee1d29e03560b4744d9f
Author: Sandro Santilli <address@hidden>
Date:   Wed Mar 30 14:51:39 2011 +0200

    Add support for scriptTimeouts in GTK preference window

diff --git a/gui/gtk/gtk.cpp b/gui/gtk/gtk.cpp
index fe79e20..54e8176 100644
--- a/gui/gtk/gtk.cpp
+++ b/gui/gtk/gtk.cpp
@@ -954,6 +954,9 @@ private:
         GtkWidget *mediaDir;
         GtkWidget *saveStreamingMediaToggle;
         GtkWidget *saveLoadedMediaToggle;
+        GtkWidget *scriptsTimeout;
+        GtkWidget *scriptsRecursionLimit;
+        GtkWidget *lockScriptLimitsToggle;
 
         PrefWidgets()
             :
@@ -980,7 +983,10 @@ private:
             startStoppedToggle(0),
             mediaDir(0),
             saveStreamingMediaToggle(0),
-            saveLoadedMediaToggle(0)
+            saveLoadedMediaToggle(0),
+            scriptsTimeout(0),
+            scriptsRecursionLimit(0),
+            lockScriptLimitsToggle(0)
         {}
 
     };
@@ -1587,6 +1593,27 @@ PreferencesDialog::addPlayerTab()
     gtk_spin_button_set_value(GTK_SPIN_BUTTON(_prefs->librarySize),
             _rcfile.getMovieLibraryLimit());
 
+    // Scripts timeout -- {
+
+    GtkWidget *hbox = gtk_hbox_new (FALSE, 2);
+    gtk_box_pack_start(GTK_BOX(playervbox), hbox, FALSE, FALSE, 0);
+
+    GtkWidget *lbl = gtk_label_new (
+        _("Max scripts execution time (in seconds):"));
+    gtk_misc_set_alignment (GTK_MISC (lbl), 0, 0.5);
+    gtk_box_pack_start(GTK_BOX(hbox), lbl, FALSE, FALSE, 0);
+
+    _prefs->scriptsTimeout = gtk_spin_button_new_with_range(0, 60, 1);
+    gtk_box_pack_start(GTK_BOX(hbox), _prefs->scriptsTimeout, FALSE,
+            FALSE, 0);
+    // Align to _rcfile value:
+    gtk_spin_button_set_value(GTK_SPIN_BUTTON(_prefs->scriptsTimeout),
+            _rcfile.getScriptsTimeout());
+
+    // --}
+
+
+    // Start-stopped toggle
     _prefs->startStoppedToggle = gtk_check_button_new_with_mnemonic (
                     _("Start _Gnash in pause mode"));
     gtk_box_pack_start(GTK_BOX(playervbox), _prefs->startStoppedToggle,

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

Summary of changes:
 gui/gtk/gtk.cpp |   78 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 libbase/rc.cpp  |    3 +-
 2 files changed, 79 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
Gnash