[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_final-1993-gd414f29

[Bastiaan Jacques]

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  d414f295dac153b4999a7c9dca0038fc81ae74d6 (commit)
       via  8ee595b9b32efe85699373e305a4d75554dd6adb (commit)
       via  8f7cc7e53891ac8ed80397820d16d9e0eb7e21ab (commit)
      from  4a15e8fcf035380799cf2135e6e2665cf89297a2 (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=d414f295dac153b4999a7c9dca0038fc81ae74d6


commit d414f295dac153b4999a7c9dca0038fc81ae74d6
Author: Bastiaan Jacques <address@hidden>
Date:   Sun May 18 15:28:05 2014 +0200

    Fix use after free: when run() returns after the gtk_main_quit() is
    called, a callback is still registered with then-deleted GtkGui,
    and it is invoked when a new GtkGui calls gtk_main(). This commit
    unregisters the callback.
    
    It should now be possible to pass multiple SWFs to Gnash without
    segfaulting.

diff --git a/gui/gtk/gtk.cpp b/gui/gtk/gtk.cpp
index 67ccdd5..d2f5ceb 100644
--- a/gui/gtk/gtk.cpp
+++ b/gui/gtk/gtk.cpp
@@ -584,6 +584,7 @@ GtkGui::grabFocus()
 void
 GtkGui::quitUI() 
 {
+    stopAdvanceTimer();
     gtk_widget_destroy(_window);
     gtk_main_quit();
 }

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


commit 8ee595b9b32efe85699373e305a4d75554dd6adb
Author: Bastiaan Jacques <address@hidden>
Date:   Sun May 18 15:18:42 2014 +0200

    Fix the assertion that happens since the Gnash window is being explicitly 
destroyed:
      Gtk-CRITICAL **: IA__gtk_style_detach: assertion 'style->attach_count > 
0' failed
    by attaching a style to the gnash_canvas GdkWindow, rather than just 
referencing one.

diff --git a/gui/gtk/gtk_canvas.cpp b/gui/gtk/gtk_canvas.cpp
index aeeae3a..1a87c44 100644
--- a/gui/gtk/gtk_canvas.cpp
+++ b/gui/gtk/gtk_canvas.cpp
@@ -177,6 +177,9 @@ gnash_canvas_realize(GtkWidget *widget)
                                     &attributes, attributes_mask);
     gdk_window_set_user_data (widget->window, widget);
 
+    widget->style = gtk_style_attach (widget->style, widget->window);
+    gtk_style_set_background (widget->style, widget->window, GTK_STATE_NORMAL);
+
 #if defined(RENDERER_CAIRO) || defined(RENDERER_AGG)
     GnashCanvas *canvas = GNASH_CANVAS(widget);
     // cairo needs the _drawingArea.window to prepare it ..

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


commit 8f7cc7e53891ac8ed80397820d16d9e0eb7e21ab
Author: Bastiaan Jacques <address@hidden>
Date:   Sun May 18 14:53:09 2014 +0200

    Explicitly destroy the main window. This implicit in a normal run, but
    doesn't happen when multiple SWFs are given for Gnash to play.

diff --git a/gui/gtk/gtk.cpp b/gui/gtk/gtk.cpp
index 3311a70..67ccdd5 100644
--- a/gui/gtk/gtk.cpp
+++ b/gui/gtk/gtk.cpp
@@ -584,6 +584,7 @@ GtkGui::grabFocus()
 void
 GtkGui::quitUI() 
 {
+    gtk_widget_destroy(_window);
     gtk_main_quit();
 }
 

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

Summary of changes:
 gui/gtk/gtk.cpp        |    2 ++
 gui/gtk/gtk_canvas.cpp |    3 +++
 2 files changed, 5 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
Gnash