Hello community, here is the log from the commit of package kde3-gtk-qt-engine for openSUSE:Factory checked in at Tue Sep 20 09:31:59 CEST 2011.
-------- New Changes file: --- /dev/null 2010-08-26 16:28:41.000000000 +0200 +++ /mounts/work_src_done/STABLE/kde3-gtk-qt-engine/kde3-gtk-qt-engine.changes 2010-12-20 16:48:44.000000000 +0100 @@ -0,0 +1,207 @@ +------------------------------------------------------------------- +Mon Dec 20 15:41:06 UTC 2010 - dims...@opensuse.org + +- Add glib2.25-signals-conflict.patch to fix build with newer + glib >= 2.25. A conflicting 'signals' is declared between glib + and Qt. + +------------------------------------------------------------------- +Tue Apr 21 08:56:08 CEST 2009 - bein...@opensuse.org + +- rename to kde3-gtk-qt-engine + +------------------------------------------------------------------- +Sat Mar 14 12:44:35 CET 2009 - buschman...@opensuse.org + +- use debug_package macro outside the Build Service +- changing obsolete suse version check + +------------------------------------------------------------------- +Tue Jan 29 10:01:16 CET 2008 - stbin...@suse.de + +- add patch from online updates to not theme/crash nspluginviewer + +------------------------------------------------------------------- +Sun Apr 29 00:32:32 UTC + 7, G 2007 - dsbhayangk...@gmail.com + +- Update to new svn repository: + Changes since 0.7cvs20061120: + * GTK apps will now respect KDE's toolbar icon display settings (thanks + Bastian Venthur) + * Merge fix-iconpaths.patch from suse. This fixes icon loading issues with + inherited icon themes. + * Highlighted menu items are now always white. + * Italian translation from Davide Madrisan + * Fix button appearance in the Motif Plus style + * Turkish translation by S.Çağlar Onur + * Patch from Martin Michlmayr to fix compilation on GCC 4.3 + * Bulgarian translation by Zlatko Popov + * Russian translation by Viktor Ponasenkov + +------------------------------------------------------------------- +Mon Jan 8 14:20:32 CET 2007 - dmuel...@suse.de + +- typo fix + +------------------------------------------------------------------- +Mon Jan 8 10:14:37 CET 2007 - dmuel...@suse.de + +- adjust paths for changed GNOME install prefix + +------------------------------------------------------------------- +Mon Nov 20 19:52:09 CET 2006 - wstephen...@suse.de + +- Update to new svn repository: +Changes since 0.7: + * Switch the buildsystem from autotools to CMake. CMake 2.4 is now required + to build the project. + * Fix scrollbar sliders in the Domino widget style + * Fix a bug that caused Qt colours not to be applied to GTK applications. + This fixes several graphical problems when using dark colour schemes. + * Fix a bug that would disable Bonobo support even when the correct packages + were installed + * The control center module will now write a configuration file that will + only affect applications inside KDE. Applications running in GNOME can be + themed separately using the GNOME tools. + * Add a setting for emacs keyboard shortcuts + * Fix OpenOffice detection on Fedora Core. + * Draw default buttons properly. + * Provide a fallback icon even when one of the right size doesn't exist + * Fix invalid CSS comments. + * When the Qt theme can't be found, display a dialog allowing the user to + modify the search paths. + * Respect KDE's "Show icons on buttons" setting + * Fix icon themes in GNOME apps such as evolution on Fedora Core 5 and 6 + +------------------------------------------------------------------- +Thu Aug 3 09:50:56 CEST 2006 - stbin...@suse.de + +- fix build + +------------------------------------------------------------------- +Fri Jun 23 14:57:31 CEST 2006 - dmuel...@suse.de + +- add fix for crashes with Baghira (#187765) + +------------------------------------------------------------------- +Tue May 9 10:53:46 CEST 2006 - stbin...@suse.de + +- fix Firefox/Thunderbird not starting with ThinKeramik (#172681) + +------------------------------------------------------------------- +Tue Mar 21 16:31:14 CET 2006 - llu...@suse.cz + +- fix icon paths handling (#157455) + +------------------------------------------------------------------- +Fri Mar 17 10:23:17 CET 2006 - stbin...@suse.de + +- hide the obsolete Mozilla scrollbar workaroudn groupbox in kcm + +------------------------------------------------------------------- +Tue Mar 14 22:30:57 CET 2006 - dmuel...@suse.de + +- updated patch by Lubos for scrollbars (#143263) + +------------------------------------------------------------------- +Wed Mar 1 11:52:51 CET 2006 - stbin...@suse.de + +- add patch to don't mess with the user's .bashrc / GTK2_RC_FILES + +------------------------------------------------------------------- +Fri Feb 10 12:35:01 CET 2006 - llu...@suse.cz + +- update from CVS +- fix slider size (#118667) +- workaround for Mozilla scrollbars (#143263) + +------------------------------------------------------------------- +Wed Jan 25 21:36:22 CET 2006 - m...@suse.de + +- converted neededforbuild to BuildRequires + +------------------------------------------------------------------- +Mon Jan 16 15:38:58 CET 2006 - stbin...@suse.de + +- update from CVS for more complete translations +- fix "gtk-qt-engine not in KDE control center" (#121876) + +------------------------------------------------------------------- +Mon Oct 3 15:56:05 CEST 2005 - lti...@suse.cz + +- fix config file writing for some icon themes (e.g. iKons) (#63853) + +------------------------------------------------------------------- +Fri Sep 9 07:24:58 CEST 2005 - m...@suse.de + +- Fix build on lib64 platforms. + +------------------------------------------------------------------- +Wed Sep 7 18:33:46 CEST 2005 - cla...@suse.de + +- In all cases where we create a pixmap, bail if either parameter + is less than 1. Fixes #113936. + +------------------------------------------------------------------- +Thu Aug 11 00:36:59 CEST 2005 - cla...@suse.de + +- Set a colormap on the backing pixbuf we set. + +------------------------------------------------------------------- +Wed Apr 27 16:55:43 CEST 2005 - adr...@suse.de + +- fix compile with gcc 4 on 64bit + +------------------------------------------------------------------- +Mon Feb 28 10:44:56 CET 2005 - adr...@suse.de + +- update to current cvs snapshot + * memory leak fix + +------------------------------------------------------------------- +Wed Jan 5 16:52:03 CET 2005 - adr...@suse.de + +- update to version 0.6 + +------------------------------------------------------------------- +Tue Nov 30 09:48:38 CET 2004 - adr...@suse.de + +- complete last fix (#45222) + +------------------------------------------------------------------- +Tue Nov 23 13:59:30 CET 2004 - adr...@suse.de + +- crash fix by matz (#45222) + +------------------------------------------------------------------- +Mon Oct 4 15:24:06 CEST 2004 - m...@suse.de + +- Fix inverted sliders and the file box of the file dialog + (look at inverted flag of ranges and new types of rows) (#45930, #44868). + +------------------------------------------------------------------- +Fri Aug 27 07:52:00 CEST 2004 - adr...@suse.de + +- disable kcm modul since it is not translated + +------------------------------------------------------------------- +Mon Aug 16 16:33:45 CEST 2004 - sch...@suse.de + +- Fix last change. + +------------------------------------------------------------------- +Mon Aug 16 14:34:00 CEST 2004 - adr...@suse.de + +- fix build error + +------------------------------------------------------------------- ++++ 10 more lines (skipped) ++++ between /dev/null ++++ and /mounts/work_src_done/STABLE/kde3-gtk-qt-engine/kde3-gtk-qt-engine.changes calling whatdependson for head-i586 New: ---- fix-nspluginviewer-crash.diff glib2.25-signals-conflict.patch gtk-qt-engine-kcmgtk.desktop-icon.patch gtk-qt-engine-small-pixmaps.patch gtk-qt-engine_0.8~svn-rev36.orig.tar.gz hide-mozilla-groupbox.diff kde3-gtk-qt-engine.changes kde3-gtk-qt-engine.spec mozilla-scrollbars.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kde3-gtk-qt-engine.spec ++++++ # # spec file for package kde3-gtk-qt-engine (Version 0.8svn20071009) # # Copyright 2004-2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright 2007 dsbhayangk...@gmail.com # Copyright 2009 Buschmann <buschman...@opensuse.org> # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # # Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild Name: kde3-gtk-qt-engine BuildRequires: cmake gtk2-devel kdebase3 kdelibs3-devel kdesdk3 libbonoboui-devel License: GNU General Public License (GPL) Group: System/Libraries Summary: GTK-Style Engine for Use with Qt Plug-Ins and Settings Version: 0.8svn20071009 Release: 1.1 Url: http://gtk-qt.ecs.soton.ac.uk Source: gtk-qt-engine_0.8~svn-rev36.orig.tar.gz #Patch1: gtk-qt-engine-small-pixmaps.patch #Patch2: mozilla-scrollbars.patch Patch3: hide-mozilla-groupbox.diff #Patch4: fix-slider.patch #Patch5: gtk-qt-engine-kcmgtk.desktop-icon.patch Patch6: fix-nspluginviewer-crash.diff Patch7: glib2.25-signals-conflict.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Provides: gtk-qt-engine = 0.8svn20071009 Obsoletes: gtk-qt-engine <= 0.8svn20071009 %description This engine is for use by GTK applications running in KDE. It applies all Qt settings to the GTK application and uses Qt style plug-ins directly. Authors: -------- David Sansome <m...@davidsansome.com> %define prefix /opt/kde3 %if !0%{?opensuse_bs} %debug_package %endif %prep %setup -q -n "gtk-qt-engine" #%patch1 -p1 #%patch2 %patch3 # This code seems to have changed, need to check if the problem reoccurs #%patch4 #. /etc/opt/kde3/common_options #update_admin #%patch5 sed -i 's/Icon=gnome_apps.png/Icon=gnome_apps/g' ./kcm_gtk/kcmgtk.desktop %patch6 %patch7 -p1 %build export CFLAGS="$RPM_OPT_FLAGS" export CXXFLAGS="$CFLAGS" #mkdir build #cd build cmake -DCMAKE_INSTALL_PREFIX=%prefix -DCMAKE_BUILD_TYPE=debugfull . make %{?jobs:-j %jobs} #. /etc/opt/kde3/common_options #./configure $configkde %install . /etc/opt/kde3/common_options #cd build make install DESTDIR=$RPM_BUILD_ROOT # WS: what did this do? #rm -rf $RPM_BUILD_ROOT/usr/lib # WS: removing older version? #rm $RPM_BUILD_ROOT/opt/gnome/%{_lib}/gtk-2.0/*/engines/libqtengine.la # moving wrong default location? # mkdir -p $RPM_BUILD_ROOT/opt/kde3/share/applications #cp $RPM_BUILD_ROOT/usr/share/applications/kcmgtk-xdg.desktop $RPM_BUILD_ROOT/opt/kde3/share/applications kde_post_install %find_lang gtkqtengine %clean rm -rf $RPM_BUILD_ROOT %files -f gtkqtengine.lang %defattr(-,root,root) %doc AUTHORS README NEWS COPYING ChangeLog %if %suse_version >= 1030 %_libdir/gtk-*/*/engines/* /usr/share/themes/Qt /usr/share/themes/Qt/gtk-* /usr/share/themes/Qt/gtk-*/gtkrc %else /opt/gnome/%_lib/gtk-*/*/engines/* /opt/gnome/share/themes/Qt /opt/gnome/share/themes/Qt/gtk-* /opt/gnome/share/themes/Qt/gtk-*/gtkrc %endif /opt/kde3/share/applications/*.desktop /opt/kde3/%_lib/kde3/kcm_kcmgtk.* %changelog * Tue Apr 21 2009 bein...@opensuse.org - rename to kde3-gtk-qt-engine * Sat Mar 14 2009 Buschmann <buschman...@opensuse.org> - use debug_package macro outside the Build Service - changing obsolete suse version check * Tue Jan 29 2008 stbin...@suse.de - add patch from online updates to not theme/crash nspluginviewer * Sun Apr 29 2007 dsbhayangk...@gmail.com - Update to new svn repository: Changes since 0.7cvs20061120: * GTK apps will now respect KDE's toolbar icon display settings (thanks Bastian Venthur) * Merge fix-iconpaths.patch from suse. This fixes icon loading issues with inherited icon themes. * Highlighted menu items are now always white. * Italian translation from Davide Madrisan * Fix button appearance in the Motif Plus style * Turkish translation by S.Çağlar Onur * Patch from Martin Michlmayr to fix compilation on GCC 4.3 * Bulgarian translation by Zlatko Popov * Russian translation by Viktor Ponasenkov * Mon Jan 08 2007 dmuel...@suse.de - typo fix * Mon Jan 08 2007 dmuel...@suse.de - adjust paths for changed GNOME install prefix * Mon Nov 20 2006 wstephen...@suse.de - Update to new svn repository: Changes since 0.7: * Switch the buildsystem from autotools to CMake. CMake 2.4 is now required to build the project. * Fix scrollbar sliders in the Domino widget style * Fix a bug that caused Qt colours not to be applied to GTK applications. This fixes several graphical problems when using dark colour schemes. * Fix a bug that would disable Bonobo support even when the correct packages were installed * The control center module will now write a configuration file that will only affect applications inside KDE. Applications running in GNOME can be themed separately using the GNOME tools. * Add a setting for emacs keyboard shortcuts * Fix OpenOffice detection on Fedora Core. * Draw default buttons properly. * Provide a fallback icon even when one of the right size doesn't exist * Fix invalid CSS comments. * When the Qt theme can't be found, display a dialog allowing the user to modify the search paths. * Respect KDE's "Show icons on buttons" setting * Fix icon themes in GNOME apps such as evolution on Fedora Core 5 and 6 * Thu Aug 03 2006 stbin...@suse.de - fix build * Fri Jun 23 2006 dmuel...@suse.de - add fix for crashes with Baghira (#187765) * Tue May 09 2006 stbin...@suse.de - fix Firefox/Thunderbird not starting with ThinKeramik (#172681) * Tue Mar 21 2006 llu...@suse.cz - fix icon paths handling (#157455) * Fri Mar 17 2006 stbin...@suse.de - hide the obsolete Mozilla scrollbar workaroudn groupbox in kcm * Tue Mar 14 2006 dmuel...@suse.de - updated patch by Lubos for scrollbars (#143263) * Wed Mar 01 2006 stbin...@suse.de - add patch to don't mess with the user's .bashrc / GTK2_RC_FILES * Fri Feb 10 2006 llu...@suse.cz - update from CVS - fix slider size (#118667) - workaround for Mozilla scrollbars (#143263) * Wed Jan 25 2006 m...@suse.de - converted neededforbuild to BuildRequires * Mon Jan 16 2006 stbin...@suse.de - update from CVS for more complete translations - fix "gtk-qt-engine not in KDE control center" (#121876) * Mon Oct 03 2005 lti...@suse.cz - fix config file writing for some icon themes (e.g. iKons) (#63853) * Fri Sep 09 2005 m...@suse.de - Fix build on lib64 platforms. * Wed Sep 07 2005 cla...@suse.de - In all cases where we create a pixmap, bail if either parameter is less than 1. Fixes #113936. * Thu Aug 11 2005 cla...@suse.de - Set a colormap on the backing pixbuf we set. * Wed Apr 27 2005 adr...@suse.de - fix compile with gcc 4 on 64bit * Mon Feb 28 2005 adr...@suse.de - update to current cvs snapshot * memory leak fix * Wed Jan 05 2005 adr...@suse.de - update to version 0.6 * Tue Nov 30 2004 adr...@suse.de - complete last fix (#45222) * Tue Nov 23 2004 adr...@suse.de - crash fix by matz (#45222) * Mon Oct 04 2004 m...@suse.de - Fix inverted sliders and the file box of the file dialog (look at inverted flag of ranges and new types of rows) (#45930, #44868). * Fri Aug 27 2004 adr...@suse.de - disable kcm modul since it is not translated * Mon Aug 16 2004 sch...@suse.de - Fix last change. * Mon Aug 16 2004 adr...@suse.de - fix build error * Fri Aug 13 2004 adr...@suse.de - update to version 0.5 * new kcm module * Wed Feb 11 2004 adr...@suse.de - initial packaging of version 0.3 ++++++ fix-nspluginviewer-crash.diff ++++++ --- src/qt_qt_wrapper.cpp +++ src/qt_qt_wrapper.cpp @@ -293,8 +293,10 @@ void createQApp() printf("createQApp()\n"); char* sessionEnv = getenv("SESSION_MANAGER"); - if (QString(sessionEnv).endsWith(QString::number(getpid())) || cmdLine.contains("gnome-wm") || cmdLine.contains("metacity") || cmdLine.contains("xfwm4") || (getenv("GTK_QT_ENGINE_DISABLE") != NULL) || - ((qApp) && (qApp->type() == QApplication::Tty))) + if (QString(sessionEnv).endsWith(QString::number(getpid())) || cmdLine.contains("gnome-wm") + || cmdLine.contains("metacity") || cmdLine.contains("xfwm4") + || cmdLine.contains("nspluginviewer") || (getenv("GTK_QT_ENGINE_DISABLE") != NULL) + || ((qApp) && (qApp->type() == QApplication::Tty))) { printf("Not initializing the Gtk-Qt theme engine\n"); } ++++++ glib2.25-signals-conflict.patch ++++++ Index: gtk-qt-engine-0.8svn20071009/src/qt_qt_wrapper.cpp =================================================================== --- gtk-qt-engine-0.8svn20071009.orig/src/qt_qt_wrapper.cpp +++ gtk-qt-engine-0.8svn20071009/src/qt_qt_wrapper.cpp @@ -15,6 +15,11 @@ #include <qapplication.h> #include <qdir.h> #include <qregexp.h> + +//work around compile issue with glib >= 2.25 +#ifdef signals + #undef signals +#endif #include <gdk/gdkx.h> #include <cstdlib> ++++++ gtk-qt-engine-kcmgtk.desktop-icon.patch ++++++ Index: kcm_gtk/kcmgtk.desktop =================================================================== --- kcm_gtk/kcmgtk.desktop (revision 25) +++ kcm_gtk/kcmgtk.desktop (working copy) @@ -3,7 +3,7 @@ Comment=Control the style and fonts used by GTK applications Exec=kcmshell kcmgtk Terminal=false -Icon=gnome_apps.png +Icon=gnome_apps OnlyShowIn=KDE; Encoding=UTF-8++++++ gtk-qt-engine-small-pixmaps.patch ++++++ diff -pruN gtk-qt-engine-old/src/qt_qt_wrapper.cpp gtk-qt-engine/src/qt_qt_wrapper.cpp --- gtk-qt-engine-old/src/qt_qt_wrapper.cpp 2005-02-23 11:57:22.000000000 +0100 +++ gtk-qt-engine/src/qt_qt_wrapper.cpp 2005-09-07 18:16:51.573554934 +0200 @@ -528,6 +528,9 @@ void drawButton(GdkWindow* window, GtkSt if (!gtkQtEnable) return; + if ((w < 1) || (h < 1)) + return; + QPixmap pixmap(w, h); QPainter painter(&pixmap); QPushButton button(meepWidget); @@ -577,6 +580,10 @@ void drawToolbar(GdkWindow* window, GtkS h1 = h * 3; } + if ((w1 < 1) || (h1 < 1) || + (w < 1) || (h < 1)) + return; + QPixmap pixmap(w1, h1); QPixmap p(w, h); QPainter painter(&pixmap); @@ -628,6 +635,10 @@ void drawMenubar(GdkWindow* window, GtkS h1 = h * 3; } + if ((w1 < 1) || (h1 < 1) || + (w < 1) || (h < 1)) + return; + QPixmap pixmap(w1, h1); QPixmap p(w, h); QPainter painter(&pixmap); @@ -652,6 +663,9 @@ void drawTab(GdkWindow* window, GtkStyle if (!gtkQtEnable) return; + if ((w < 1) || (h < 1)) + return; + QPixmap pixmap(w,h); QPainter painter(&pixmap); @@ -685,6 +699,9 @@ void drawVLine(GdkWindow* window, GtkSty if (width < 2) width = 2; + if ((width < 1) || (height < 1)) + return; + QPixmap pixmap(width, height); QPainter painter(&pixmap); @@ -707,6 +724,9 @@ void drawHLine(GdkWindow* window, GtkSty int width = abs(xSource-xDest); int height = style->ythickness; + if ((width < 1) || (height < 1)) + return; + QPixmap pixmap(width, height); QPainter painter(&pixmap); @@ -726,6 +746,9 @@ void drawLineEdit(GdkWindow* window, Gtk if (!gtkQtEnable) return; + if ((w < 1) || (h < 1)) + return; + QPixmap pixmap(w, h); QPainter painter(&pixmap); @@ -773,6 +796,9 @@ void drawComboBox(GdkWindow* window, Gtk if (!gtkQtEnable) return; + if ((w < 1) || (h < 1)) + return; + QPixmap pixmap(w,h); QPainter painter(&pixmap); QComboBox cb(false, 0); @@ -801,6 +827,9 @@ void drawCheckBox(GdkWindow* window, Gtk int realH = qApp->style().pixelMetric(QStyle::PM_IndicatorHeight); int realW = qApp->style().pixelMetric(QStyle::PM_IndicatorWidth); + if ((realW < 1) || (realH < 1)) + return; + QPixmap pixmap(realW, realH); QPainter painter(&pixmap); QCheckBox checkbox(0); @@ -834,6 +863,9 @@ void drawMenuCheck(GdkWindow* window, Gt int w1 = checkbox.sizeHint().width(); int h1 = checkbox.sizeHint().height(); */ + if ((w < 1) || (h < 1)) + return; + QPixmap pixmap(w,h); QPainter painter(&pixmap); @@ -864,6 +896,9 @@ void drawRadioButton(GdkWindow* window, int realH = qApp->style().pixelMetric(QStyle::PM_IndicatorHeight); int realW = qApp->style().pixelMetric(QStyle::PM_IndicatorWidth); + if ((realW < 1) || (realH < 1)) + return; + QPixmap pixmap(realH, realW); QPainter painter(&pixmap); QRadioButton radio(0); @@ -896,6 +931,9 @@ void drawScrollBarSlider(GdkWindow* wind if (!gtkQtEnable) return; + if ((w < 1) || (h < 1)) + return; + QPixmap pixmap(w, h); QPainter painter(&pixmap); @@ -915,6 +953,9 @@ void drawScrollBar(GdkWindow* window, Gt if (!gtkQtEnable) return; + if ((w < 1) || (h < 1)) + return; + if (scrollBar != 0) delete scrollBar; scrollBar = new QScrollBar(NULL); @@ -955,6 +996,8 @@ void drawScrollBar(GdkWindow* window, Gt scrollBar, QStyle::SC_ScrollBarSlider); offset = r.y(); thumbSize = r.height(); + if (thumbSize < 0) + thumbSize = -thumbSize; if (!r.isValid()) // Fix a crash bug in Eclipse where it was trying to draw tiny scrollbars. return; @@ -978,6 +1021,8 @@ void drawScrollBar(GdkWindow* window, Gt scrollBar, QStyle::SC_ScrollBarSlider); offset = r.x(); thumbSize = r.width(); + if (thumbSize < 0) + thumbSize = -thumbSize; if (!r.isValid()) // Fix a crash bug in Eclipse when it was trying to draw tiny scrollbars. return; @@ -1007,6 +1052,9 @@ void drawToolButton(GdkWindow* window, G if (!gtkQtEnable) return; + if ((w < 1) || (h < 1)) + return; + QToolButton button(NULL); button.resize(w, h); @@ -1043,6 +1091,9 @@ void drawMenuBarItem(GdkWindow* window, if (!gtkQtEnable) return; + if ((w < 1) || (h < 1)) + return; + QPixmap pixmap(w, h); QPainter painter(&pixmap); QMenuItem mi; @@ -1062,6 +1113,9 @@ void drawMenuItem(GdkWindow* window, Gtk if (!gtkQtEnable) return; + if ((w < 1) || (h < 1)) + return; + QPixmap pixmap(w,h); QPainter painter(&pixmap); QPopupMenu pm; @@ -1084,6 +1138,9 @@ void drawSplitter(GdkWindow* window, Gtk if (!gtkQtEnable) return; + if ((w < 1) || (h < 1)) + return; + QPixmap pixmap(w,h); QPainter painter(&pixmap); @@ -1104,6 +1161,9 @@ void drawTabFrame(GdkWindow* window, Gtk if (!gtkQtEnable) return; + if ((w < 1) || (h < 1)) + return; + QStyle::SFlags sflags = stateToSFlags(state); QPixmap pixmap(w, h); @@ -1123,9 +1183,10 @@ void drawTabFrame(GdkWindow* window, Gtk // Drawing tab base int th = qApp->style().pixelMetric(QStyle::PM_TabBarBaseHeight, meepTabBar); int tw = w; - if (!th || !tw) - return; + if ((tw < 1) || (th < 1)) + return; + QPixmap pixmap1(tw,th); QPainter painter1(&pixmap1); if ((backgroundTile) && (!backgroundTile->isNull())) @@ -1158,6 +1219,9 @@ void drawMenu(GdkWindow* window, GtkStyl if (!gtkQtEnable) return; + if ((w < 1) || (h < 1)) + return; + QPixmap pixmap(w, h); QPainter painter(&pixmap); QStyle::SFlags sflags = stateToSFlags(state); @@ -1207,6 +1271,9 @@ void drawProgressChunk(GdkWindow * windo bar.setPercentageVisible(false); bar.setFrameStyle(QFrame::NoFrame); + if ((w2 < 1) || (h2 < 1)) + return; + QPixmap pixmap(w2, h2); QPainter painter(&pixmap); @@ -1304,6 +1371,9 @@ void drawSpinButton(GdkWindow * window, if (!gtkQtEnable) return; + if ((w < 1) || (h < 1)) + return; + QPixmap pixmap(w, h); QPainter painter(&pixmap); @@ -1322,6 +1392,9 @@ void drawListHeader(GdkWindow* window, G if (!gtkQtEnable) return; + if ((w < 1) || (h < 1)) + return; + QPixmap pixmap(w,h); QPainter painter(&pixmap); @@ -1341,6 +1414,9 @@ void drawListViewItem(GdkWindow* window, if (!gtkQtEnable) return; + if ((w < 1) || (h < 1)) + return; + QPixmap pixmap(w, h); QPainter painter(&pixmap); @@ -1437,6 +1513,9 @@ void drawTabNG(GdkWindow *window, GtkSty h -= 3; } + if ((w < 1) || (h < 1)) + return; + QPixmap pixmap(w,h); QPainter painter(&pixmap); @@ -1466,6 +1545,9 @@ void drawArrow(GdkWindow* window, GtkSty if (!gtkQtEnable) return; + if ((w < 1) || (h < 1)) + return; + QStyle::SFlags sflags = stateToSFlags(state); if (state == GTK_STATE_INSENSITIVE) sflags |= QStyle::Style_Off; ++++++ hide-mozilla-groupbox.diff ++++++ --- kcm_gtk/kcmgtk.cpp 2006/03/17 09:14:55 1.1 +++ kcm_gtk/kcmgtk.cpp 2006/03/17 09:16:08 @@ -148,6 +148,9 @@ QBoxLayout* l = new QVBoxLayout(this); widget = new KcmGtkWidget(this); l->addWidget(widget); + + // Hide "Firefox and Thunderbird" groupbox + widget->groupBox1->setHidden(true); // Load the icons KIconLoader iconLoader; ++++++ mozilla-scrollbars.patch ++++++ --- src/qt_qt_wrapper.cpp.orig 2007-08-27 22:44:17.000000000 +0700 +++ src/qt_qt_wrapper.cpp 2007-08-27 23:14:38.000000000 +0700 @@ -19,6 +19,7 @@ #include <cstdlib> #include <fcntl.h> +#include <dlfcn.h> #ifdef USE_FREEBSD #include <kvm.h> @@ -148,6 +149,29 @@ { return 0; } + +typedef void (*kstyle_fn)( void* ); + +static kstyle_fn get_set_scrollbar_fn() +{ + void* handle = dlopen( "libkdefx.so.4", RTLD_LAZY ); + if( handle == NULL ) + return NULL; + kstyle_fn ret = (kstyle_fn) dlsym( handle, "kde_kstyle_set_scrollbar_type_windows" ); + dlclose( handle ); + return ret; +} + +static void initStyle( QStyle* style ) +{ + if( !style->inherits("KStyle" ) || !mozillaFix ) + return; + if( QCString(style->name()).lower() == "thinkeramik" ) + return; // this one has its own kdefx :-/ + static kstyle_fn set_scrollbar = get_set_scrollbar_fn(); + if( set_scrollbar != NULL ) + set_scrollbar( style ); +} void createQApp() { @@ -317,7 +341,7 @@ #endif // USE_FREEBSD #endif // USE_SOLARIS - mozillaFix = (cmdLine.contains("mozilla") || cmdLine.contains("firefox")); + mozillaFix = (cmdLine.contains("mozilla") || cmdLine.contains("firefox") || cmdLine.contains("thunderbird")); openOfficeFix = (cmdLine.endsWith("soffice.bin")) | (cmdLine.endsWith("swriter.bin")) @@ -431,6 +455,8 @@ backgroundTile = meepWidget->paletteBackgroundPixmap(); if (backgroundTile != NULL) backgroundTileGdk = gdk_pixmap_foreign_new(backgroundTile->handle()); + + initStyle( &qApp->style()); } void destroyQApp() @@ -473,6 +499,7 @@ // Tell the QApplication about this new style qApp->setStyle(style); + initStyle(style); // Now we need to update GTK's properties setRcProperties(gtkRcStyle, 1); // Rewrite our cache file ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
