Hello community, here is the log from the commit of package gtk-qt-engine checked in at Fri Jun 23 17:09:04 CEST 2006. -------- --- gtk-qt-engine/gtk-qt-engine.changes 2006-05-09 10:54:38.000000000 +0200 +++ gtk-qt-engine/gtk-qt-engine.changes 2006-06-23 14:57:47.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Jun 23 14:57:31 CEST 2006 - dmueller@suse.de + +- add fix for crashes with Baghira (#187765) + +------------------------------------------------------------------- New: ---- fix-baghira-crash.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gtk-qt-engine.spec ++++++ --- /var/tmp/diff_new_pack.4Lstt4/_old 2006-06-23 17:08:50.000000000 +0200 +++ /var/tmp/diff_new_pack.4Lstt4/_new 2006-06-23 17:08:50.000000000 +0200 @@ -16,7 +16,7 @@ Group: System/Libraries Summary: GTK-Style Engine for Use with Qt Plug-Ins and Settings Version: 0.7cvs20060209 -Release: 21 +Release: 22 URL: http://www.freedesktop.org/Software/gtk-qt Source: %{name}-%{version}.tar.bz2 Patch: %name.diff @@ -26,6 +26,7 @@ Patch7: dont-touch-bashrc.diff Patch8: hide-mozilla-groupbox.diff Patch9: fix-iconpaths.patch +Patch10: fix-baghira-crash.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -48,6 +49,7 @@ %patch7 %patch8 %patch9 +%patch10 . /etc/opt/kde3/common_options update_admin @@ -80,6 +82,8 @@ /usr/share/applications/*.desktop %changelog -n gtk-qt-engine +* Fri Jun 23 2006 - dmueller@suse.de +- add fix for crashes with Baghira (#187765) * Tue May 09 2006 - stbinner@suse.de - fix Firefox/Thunderbird not starting with ThinKeramik (#172681) * Tue Mar 21 2006 - llunak@suse.cz ++++++ fix-baghira-crash.diff ++++++ --- src/qt_qt_wrapper.cpp +++ src/qt_qt_wrapper.cpp @@ -79,9 +79,7 @@ QColor alternateBackgroundColour; const QPixmap* backgroundTile; -GdkPixmap* backgroundTileGdk; QPixmap* menuBackgroundPixmap; -GdkPixmap* menuBackgroundPixmapGdk; QPixmap* fillPixmap; @@ -372,10 +370,7 @@ meepTabBar = new QTabBar(meepWidget); - menuBackgroundPixmap = NULL; backgroundTile = meepWidget->paletteBackgroundPixmap(); - if (backgroundTile != NULL) - backgroundTileGdk = gdk_pixmap_foreign_new(backgroundTile->handle()); initStyle( &qApp->style()); } @@ -1904,8 +1899,6 @@ if (!gtkQtEnable) return; - if (menuBackgroundPixmap == NULL) - { // Get the menu background image menuBackgroundPixmap = new QPixmap(1024, 25); // Meh QPainter painter(menuBackgroundPixmap); @@ -1924,10 +1917,7 @@ painter.fillRect(0, 0, 1024, 25, qApp->palette().active().brush(QColorGroup::Background)); qApp->style().drawControl(QStyle::CE_PopupMenuItem, &painter, &pm, QRect(0,0,1024,25), qApp->palette().active(), sflags, opt); - menuBackgroundPixmapGdk = gdk_pixmap_foreign_new(menuBackgroundPixmap->handle()); - } - - QTENGINE_STYLE(style)->menuBackground = menuBackgroundPixmapGdk; + QTENGINE_STYLE(style)->menuBackground = gdk_pixmap_foreign_new(menuBackgroundPixmap->handle()); } // It has a 'u' damnit @@ -1996,7 +1986,7 @@ mapColour(&style->base[4], qApp->palette().disabled().background()); if (useBg) - style->bg_pixmap[GTK_STATE_NORMAL] = backgroundTileGdk; + style->bg_pixmap[GTK_STATE_NORMAL] = gdk_pixmap_foreign_new(backgroundTile->handle()); setMenuBackground(style); } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit-unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit-help@opensuse.org