Author: tgoettlicher Date: Mon Jan 21 17:47:14 2008 New Revision: 43802 URL: http://svn.opensuse.org/viewcvs/yast?rev=43802&view=rev Log: fix 352845 and 352198 Modified: branches/SuSE-SLE-10-SP2-Branch/qt/VERSION branches/SuSE-SLE-10-SP2-Branch/qt/package/yast2-qt.changes branches/SuSE-SLE-10-SP2-Branch/qt/src/YQPkgConflictList.cc branches/SuSE-SLE-10-SP2-Branch/qt/src/YQUI_x11.cc Modified: branches/SuSE-SLE-10-SP2-Branch/qt/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/qt/VERSION?rev=43802&r1=43801&r2=43802&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/qt/VERSION (original) +++ branches/SuSE-SLE-10-SP2-Branch/qt/VERSION Mon Jan 21 17:47:14 2008 @@ -1 +1 @@ -2.13.82 +2.13.83 Modified: branches/SuSE-SLE-10-SP2-Branch/qt/package/yast2-qt.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/qt/package/yast2-qt.changes?rev=43802&r1=43801&r2=43802&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/qt/package/yast2-qt.changes (original) +++ branches/SuSE-SLE-10-SP2-Branch/qt/package/yast2-qt.changes Mon Jan 21 17:47:14 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Jan 21 17:35:58 CET 2008 - tgoettlicher@suse.de + +- Fixed Bug #352845: UI qt segfault after closing opened window +- Fixed Bug #352198: saved information is corrupted for dependency conflict information +- V 2.13.83 + +------------------------------------------------------------------- Thu Jan 17 13:09:15 CET 2008 - jsrain@suse.cz - merged texts from proofread Modified: branches/SuSE-SLE-10-SP2-Branch/qt/src/YQPkgConflictList.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/qt/src/YQPkgConflictList.cc?rev=43802&r1=43801&r2=43802&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/qt/src/YQPkgConflictList.cc (original) +++ branches/SuSE-SLE-10-SP2-Branch/qt/src/YQPkgConflictList.cc Mon Jan 21 17:47:14 2008 @@ -216,7 +216,7 @@ } } - fprintf( file, "%s\n", (const char *) item->text(0) ); + fprintf( file, "%s\n", toUTF8( item->text(0) ).c_str() ); if ( item->isOpen() ) Modified: branches/SuSE-SLE-10-SP2-Branch/qt/src/YQUI_x11.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/qt/src/YQUI_x11.cc?rev=43802&r1=43801&r2=43802&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/qt/src/YQUI_x11.cc (original) +++ branches/SuSE-SLE-10-SP2-Branch/qt/src/YQUI_x11.cc Mon Jan 21 17:47:14 2008 @@ -344,7 +344,7 @@ objDialog = objDialog->topLevelWidget(); } - if ( objDialog && + if ( objDialog && (QObject*) currentDialog() && ( objDialog == mainWidget() || objDialog == (QObject *) currentDialog()->widgetRep() ) ) { -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org