[Gnash-commit] gnash ChangeLog gui/kde.cpp

[Markus Gothe]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Markus Gothe <nihilus>  07/06/21 22:30:30

Modified files:
        .              : ChangeLog 
        gui            : kde.cpp 

Log message:
        Applied patch from Antti

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3593&r2=1.3594
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/kde.cpp?cvsroot=gnash&r1=1.16&r2=1.17

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3593
retrieving revision 1.3594
diff -u -b -r1.3593 -r1.3594
--- ChangeLog   21 Jun 2007 09:02:05 -0000      1.3593
+++ ChangeLog   21 Jun 2007 22:30:30 -0000      1.3594
@@ -1,3 +1,7 @@
+2007-06-21 Antti Ajanki
+
+       * gui/kde.cpp: Fix for agg-render premature initialization.
+
 2007-06-21 Tomas Groth Christensen <address@hidden>
 
        * backend/sound_handler_gst.{cpp,h}: Made it threadsafe, fixes 

Index: gui/kde.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/kde.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- gui/kde.cpp 10 Jun 2007 14:46:44 -0000      1.16
+++ gui/kde.cpp 21 Jun 2007 22:30:30 -0000      1.17
@@ -62,12 +62,18 @@
 //    GNASH_REPORT_FUNCTION;
     _qapp.reset(new QApplication(argc, *argv));
     _qwidget.reset(new qwidget(this)); 
+
+    _renderer = _glue.createRenderHandler();
+    if ( ! _renderer ) return false;
+    set_render_handler(_renderer);
+
     if (_xid) {
         QXEmbed::initialize();
         QXEmbed::embedClientIntoWindow(_qwidget.get(), _xid);
     }
 
     _glue.init (argc, argv);
+    _glue.prepDrawingArea(_qwidget.get());
     
     return true;
 }
@@ -83,13 +89,10 @@
     _qapp->setMainWidget(_qwidget.get());
     _qwidget->show();
 
-    _glue.prepDrawingArea(_qwidget.get());
-    _renderer = _glue.createRenderHandler();
     _glue.initBuffer(width, height);
     
     _width = width;
     _height = height;
-    set_render_handler(_renderer);
     
     return true;
 }