Author: sh-sh-sh Date: Tue Mar 4 17:55:07 2008 New Revision: 45192 URL: http://svn.opensuse.org/viewcvs/yast?rev=45192&view=rev Log: - Fixed segfault if SelectionBox value is set to nil (bnc #363251) - Fixed segfault if user clicks in empty area of a SelectionBox Modified: trunk/qt/VERSION.cmake trunk/qt/package/yast2-qt.changes trunk/qt/src/YQSelectionBox.cc Modified: trunk/qt/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/VERSION.cmake?rev=45192&r1=45191&r2=45192&view=diff ============================================================================== --- trunk/qt/VERSION.cmake (original) +++ trunk/qt/VERSION.cmake Tue Mar 4 17:55:07 2008 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "16") -SET(VERSION_PATCH "31") +SET(VERSION_PATCH "32") Modified: trunk/qt/package/yast2-qt.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/package/yast2-qt.changes?rev=45192&r1=45191&r2=45192&view=diff ============================================================================== --- trunk/qt/package/yast2-qt.changes (original) +++ trunk/qt/package/yast2-qt.changes Tue Mar 4 17:55:07 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Mar 4 17:53:00 CET 2008 - sh@suse.de + +- Fixed segfault if SelectionBox value is set to nil (bnc #363251) +- Fixed segfault if user clicks in empty area of a SelectionBox +- V 2.16.32 + +------------------------------------------------------------------- Wed Feb 27 14:20:40 CET 2008 - sh@suse.de - Removed obsolete Unicode fonts (now in separate pkg gnu-unifonts) Modified: trunk/qt/src/YQSelectionBox.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQSelectionBox.cc?rev=45192&r1=45191&r2=45192&view=diff ============================================================================== --- trunk/qt/src/YQSelectionBox.cc (original) +++ trunk/qt/src/YQSelectionBox.cc Tue Mar 4 17:55:07 2008 @@ -146,7 +146,7 @@ if ( item ) { #ifdef VERBOSE_SELECTION - yuiDebug() << this << ": Selecting item \"" << item->label() << "\"" << endl; + yuiDebug() << this << ": Selecting item \"" << item << "\"" << endl; #endif item->setSelected( true ); @@ -160,18 +160,22 @@ { YSelectionBox::deselectAllItems(); _qt_listWidget->clearSelection(); + _qt_listWidget->setCurrentRow( -1 ); if ( _qt_listWidget->currentRow() > -1 ) { // Some item is selected after all; the Qt documtation says this // happens if the QListBox is in single selection mode (which it is) - // and has the keyboard focus. + // and has the keyboard focus. setCurrentRow( -1 ) does the trick for + // now, but who knows how this might change in future Qt versions. // // Synchronize internal "selected" flags with what the QListBox // displays. This has a small performance penalty because it calls // YSelectionBox::deselectAllItems() again which again iterates over // all items. - selectItem( _qt_listWidget->row(_qt_listWidget->currentItem()) ); + + int index = _qt_listWidget->row( _qt_listWidget->currentItem() ); + selectItem( index ); } } @@ -264,8 +268,10 @@ void YQSelectionBox::slotSelectionChanged() { - QList items = _qt_listWidget->selectedItems (); - selectItem( _qt_listWidget->row( items.first() ) ); + QList items = _qt_listWidget->selectedItems(); + + if ( ! items.empty() ) + selectItem( _qt_listWidget->row( items.first() ) ); if ( notify() ) { -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org