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

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/11/30 13:36:17

Modified files:
        .              : ChangeLog 
        gui            : kde.cpp kde_glue_agg.cpp 

Log message:
        * gui/kde.cpp (quit): use QApplication::exit.
        * gui/kde_glue_agg.cpp: keep rendering no matter what HAVE_QTOPIA says
          (or rendering would be disabled for normal kde-gnash)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.5028&r2=1.5029
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/kde.cpp?cvsroot=gnash&r1=1.26&r2=1.27
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/kde_glue_agg.cpp?cvsroot=gnash&r1=1.8&r2=1.9

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5028
retrieving revision 1.5029
diff -u -b -r1.5028 -r1.5029
--- ChangeLog   30 Nov 2007 12:55:54 -0000      1.5028
+++ ChangeLog   30 Nov 2007 13:36:17 -0000      1.5029
@@ -1,5 +1,11 @@
 2007-11-30 Sandro Santilli <address@hidden>
 
+       * gui/kde.cpp (quit): use QApplication::exit.
+       * gui/kde_glue_agg.cpp: keep rendering no matter what HAVE_QTOPIA says
+         (or rendering would be disabled for normal kde-gnash)
+
+2007-11-30 Sandro Santilli <address@hidden>
+
        * plugin/plugin.cpp: don't use operator+ on temp string, it seems
          to have weird problems in some cases. See bug #21667.
 

Index: gui/kde.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/kde.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- gui/kde.cpp 29 Nov 2007 03:47:04 -0000      1.26
+++ gui/kde.cpp 30 Nov 2007 13:36:17 -0000      1.27
@@ -320,9 +320,13 @@
 void
 KdeGui::quit()
 {
+#if 1
+    _qapp->exit();
+#else // dunno what this wanted to achive
 #if QT_VERSION > 2312
     _qapp->eventLoop()->exit();
 #endif
+#endif
 }
 
 

Index: gui/kde_glue_agg.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/kde_glue_agg.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- gui/kde_glue_agg.cpp        29 Nov 2007 03:47:04 -0000      1.8
+++ gui/kde_glue_agg.cpp        30 Nov 2007 13:36:17 -0000      1.9
@@ -104,9 +104,9 @@
 {
     // In order to use our buffer in QT, we must copy it into a pixmap. This is
     // an expensive operation, but, as far as I can see, the only way to do it.
-#if HAVE_QTOPIA > 2
+//#if HAVE_QTOPIA > 2
     QPixmap qpixmap(*_qimage);
-#endif
+//#endif
     for (unsigned bno=0; bno < _drawbounds.size(); bno++) {
        geometry::Range2d<int>& bounds = _drawbounds[bno];
 
@@ -116,10 +116,10 @@
        QRect src_rect(bounds.getMinX(), bounds.getMinY(), bounds.width(),
                       bounds.height());
        
-#if HAVE_QTOPIA > 2
+//#if HAVE_QTOPIA > 2
        bitBlt (_drawing_area, dest_point, &qpixmap, src_rect, Qt::CopyROP,
                true /* ignore mask */ );
-#endif
+//#endif
     }
 }