Hello community, here is the log from the commit of package konquest for openSUSE:Factory checked in at 2013-04-18 10:31:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/konquest (Old) and /work/SRC/openSUSE:Factory/.konquest.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "konquest", Maintainer is "konquest" Changes: -------- --- /work/SRC/openSUSE:Factory/konquest/konquest.changes 2013-03-14 13:07:34.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.konquest.new/konquest.changes 2013-04-18 10:31:58.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Apr 1 19:42:51 UTC 2013 - tittiatc...@gmail.com + +- Update to 4.10.2 \n * Bugfixes + +------------------------------------------------------------------- Old: ---- konquest-4.10.1.tar.xz New: ---- konquest-4.10.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ konquest.spec ++++++ --- /var/tmp/diff_new_pack.BUN96w/_old 2013-04-18 10:31:59.000000000 +0200 +++ /var/tmp/diff_new_pack.BUN96w/_new 2013-04-18 10:31:59.000000000 +0200 @@ -23,7 +23,7 @@ License: GPL-2.0+ Group: Amusements/Games/Board/Puzzle Url: http://www.kde.org -Version: 4.10.1 +Version: 4.10.2 Release: 0 Source0: konquest-%{version}.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ konquest-4.10.1.tar.xz -> konquest-4.10.2.tar.xz ++++++ Files old/konquest-4.10.1/doc/index.cache.bz2 and new/konquest-4.10.2/doc/index.cache.bz2 differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/konquest-4.10.1/gameview.cc new/konquest-4.10.2/gameview.cc --- old/konquest-4.10.1/gameview.cc 2013-03-01 08:15:30.000000000 +0100 +++ new/konquest-4.10.2/gameview.cc 2013-03-29 08:08:35.000000000 +0100 @@ -438,6 +438,16 @@ } } +//************************************************************************ +// Confirm aborting existing game +//************************************************************************ +bool GameView::confirmNewGame() +{ + if( m_game->isRunning() ) + return shutdownGame(); + + return true; +} //************************************************************************ // Set up the game board for a new game @@ -445,10 +455,6 @@ void GameView::startNewGame() { - if (m_game->isRunning()) - if (!shutdownGame()) - return; - NewGameDlg *newGame = new NewGameDlg( this, m_game ); if( !newGame->exec() ) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/konquest-4.10.1/gameview.h new/konquest-4.10.2/gameview.h --- old/konquest-4.10.1/gameview.h 2013-03-01 08:15:30.000000000 +0100 +++ new/konquest-4.10.2/gameview.h 2013-03-29 08:08:35.000000000 +0100 @@ -79,6 +79,7 @@ public: explicit GameView( QWidget *parent, Game *game ); virtual ~GameView(); + bool confirmNewGame(); protected slots: bool shutdownGame(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/konquest-4.10.1/konquest.desktop new/konquest-4.10.2/konquest.desktop --- old/konquest-4.10.1/konquest.desktop 2013-03-01 08:15:30.000000000 +0100 +++ new/konquest-4.10.2/konquest.desktop 2013-03-29 08:08:35.000000000 +0100 @@ -36,6 +36,7 @@ Name[lt]=Užkariautojas Name[lv]=Konquest Name[mk]=Konquest +Name[mr]=काँक्वेस्ट Name[nb]=Konquest Name[nds]=Konquest Name[ne]=कनक्वेष्ट @@ -103,6 +104,7 @@ GenericName[lt]=Galaktikos strateginis žaidimas GenericName[lv]=Stratēģiska kosmiskā spēle GenericName[mk]=Игра на галактичка стратегија +GenericName[mr]=आकाशगंगेतील रणनीतिक खेळ GenericName[nb]=Strategispillet Galactic GenericName[nds]=Galaktsch Strategiespeel GenericName[ne]=ग्यालाक्टिक रणनीति खेल diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/konquest-4.10.1/mainwin.cc new/konquest-4.10.2/mainwin.cc --- old/konquest-4.10.1/mainwin.cc 2013-03-01 08:15:30.000000000 +0100 +++ new/konquest-4.10.2/mainwin.cc 2013-03-29 08:08:35.000000000 +0100 @@ -122,10 +122,13 @@ void MainWindow::startNewGame() { - m_gameView->deleteLater(); - m_game->deleteLater(); - setupGameView(); - m_gameView->startNewGame(); + if (m_gameView->confirmNewGame()) + { + m_gameView->deleteLater(); + m_game->deleteLater(); + setupGameView(); + m_gameView->startNewGame(); + } } void -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
