[Gnash-commit] /srv/bzr/gnash/trunk r12135: Drop signal handler and flag.

[Benjamin Wolsey]

------------------------------------------------------------
revno: 12135 [merge]
committer: Benjamin Wolsey <address@hidden>
branch nick: trunk
timestamp: Mon 2010-04-05 15:25:47 +0200
message:
  Drop signal handler and flag.
modified:
  gui/Player.h
  gui/gnash.cpp
  gui/gui.cpp
  gui/gui.h

=== modified file 'gui/Player.h'
--- a/gui/Player.h      2010-03-17 19:56:02 +0000
+++ b/gui/Player.h      2010-04-05 10:49:02 +0000
@@ -37,9 +37,6 @@
 #include <boost/shared_ptr.hpp>
 #include <map>
 
-// Flag for signal handlers to allow Gnash to quit gracefully.
-extern bool globalQuit;
-
 // Forward declarations
 namespace gnash
 {

=== modified file 'gui/gnash.cpp'
--- a/gui/gnash.cpp     2010-03-19 18:41:21 +0000
+++ b/gui/gnash.cpp     2010-04-05 10:49:02 +0000
@@ -25,7 +25,6 @@
 #include <string>
 #include <iostream>
 #include <ios>
-#include <csignal>
 #include <boost/format.hpp>
 #ifdef ENABLE_NLS
 # include <clocale>
@@ -548,19 +547,10 @@
 
 }
 
-void
-quitGnash(int)
-{
-    globalQuit = true;
-}
-
 int
 gnash_main(int argc, char *argv[])
 {
     
-    // Handle sigterm gracefully.
-    signal(SIGTERM, quitGnash);
-
     std::ios::sync_with_stdio(false);
 
     gnash::Player player;

=== modified file 'gui/gui.cpp'
--- a/gui/gui.cpp       2010-03-19 00:27:58 +0000
+++ b/gui/gui.cpp       2010-04-05 10:49:02 +0000
@@ -78,8 +78,6 @@
 //#define SKIP_RENDERING_IF_LATE 1
 
 
-bool globalQuit = false;
-
 namespace gnash {
 
 Gui::Gui(RunResources& r) :
@@ -938,16 +936,13 @@
 bool
 Gui::advanceMovie()
 {
-    if (globalQuit) {
-       quit();
-    }
 
     if (isStopped()) {
-       return true;
+        return true;
     }
 
     if (!_started) {
-       start();
+        start();
     }
 
     gnash::movie_root* m = _stage;

=== modified file 'gui/gui.h'
--- a/gui/gui.h 2010-03-19 00:27:58 +0000
+++ b/gui/gui.h 2010-04-05 10:49:02 +0000
@@ -71,12 +71,6 @@
     class movie_definition;
 }
 
-/// Quit flag for C signal handlers.
-//
-/// If set to true, Gnash will exit at the next opportunity.
-/// This is not part of any API.
-extern bool globalQuit;
-
 namespace gnash {
 
 /// Enumerates mouse cursor types.