Hello community, here is the log from the commit of package kdebase3-SuSE checked in at Fri Jun 23 17:09:53 CEST 2006. -------- --- KDE/kdebase3-SuSE/kdebase3-SuSE.changes 2006-06-23 00:19:06.000000000 +0200 +++ kdebase3-SuSE/kdebase3-SuSE.changes 2006-06-23 14:34:33.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Jun 23 14:34:12 CEST 2006 - dmueller@suse.de + +- fix Qt/KDE integration issues + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase3-SuSE.spec ++++++ --- /var/tmp/diff_new_pack.e1tRFc/_old 2006-06-23 17:09:40.000000000 +0200 +++ /var/tmp/diff_new_pack.e1tRFc/_new 2006-06-23 17:09:40.000000000 +0200 @@ -31,7 +31,7 @@ PreReq: %fillup_prereq BuildRoot: %{_tmppath}/%{name}-%{version}-build Version: 10.2 -Release: 5 +Release: 6 Source0: kdebase-SuSE-%{version}.tar.bz2 Source2: kdebase3-SuSE-displaymanager.fillup Source3: kdebase3-SuSE-windowmanager.fillup @@ -186,6 +186,8 @@ %changelog -n kdebase3-SuSE * Fri Jun 23 2006 - dmueller@suse.de +- fix Qt/KDE integration issues +* Fri Jun 23 2006 - dmueller@suse.de - don't set LD_HWCAP_MASK (#187248) * Thu Jun 22 2006 - stbinner@suse.de - update from SVN: ++++++ kdebase-SuSE-10.2.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebase-SuSE/qtkdeintegration/module/module.cpp new/kdebase-SuSE/qtkdeintegration/module/module.cpp --- old/kdebase-SuSE/qtkdeintegration/module/module.cpp 2006-01-12 16:34:39.000000000 +0100 +++ new/kdebase-SuSE/qtkdeintegration/module/module.cpp 2006-06-23 11:37:45.000000000 +0200 @@ -35,6 +35,10 @@ XSetClassHint( qt_xdisplay(), w->winId(), &hints ); KWin::setMainWindow( w, parent ); KWin::setState( w->winId(), NET::Modal ); + KWin::WindowInfo info = KWin::windowInfo( parent, (unsigned long)NET::WMGeometry ); + if( info.valid()) + w->move( info.geometry().x() + ( info.geometry().width() - w->width())/2, + info.geometry().y() + ( info.geometry().height()- w->height())/2 ); } // duped in qtkde @@ -155,7 +159,8 @@ { static const char* const caps[ 4 ] = { I18N_NOOP( "Information" ), I18N_NOOP( "Question" ), I18N_NOOP( "Warning" ), I18N_NOOP( "Error" )}; - int buttons[ 3 ] = { button0, button1, button2 }; + int buttons[ 3 ] = { button0 & QMessageBox::ButtonMask, + button1 & QMessageBox::ButtonMask, button2 & QMessageBox::ButtonMask }; KGuiItem buttonItems[ 3 ]; for( int i = 0; i < 3; @@ -213,8 +218,8 @@ KDialogBase *dialog= new KDialogBase( caption.isEmpty() ? i18n( caps[ type ] ) : caption, KDialogBase::Yes - | ( button1 == QMessageBox::NoButton ? 0 : int( KDialogBase::No )) - | ( button2 == QMessageBox::NoButton ? 0 : int( KDialogBase::Cancel )), + | ( buttons[ 1 ] == QMessageBox::NoButton ? 0 : int( KDialogBase::No )) + | ( buttons[ 2 ] == QMessageBox::NoButton ? 0 : int( KDialogBase::Cancel )), defaultButton, escapeButton, NULL, "messageBox2", true, true, buttonItems[ 0 ], buttonItems[ 1 ],buttonItems[ 2 ] ); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit-unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit-help@opensuse.org