Author: tgoettlicher Date: Fri May 11 16:42:27 2007 New Revision: 5537 URL: http://svn.opensuse.org/viewcvs/zypp?rev=5537&view=rev Log: Fixed application crash when plugin is selected that does not exist. Modified: branches/work/updater-kde-refactoring/updater-kde/updater/ConfigWidget.cpp branches/work/updater-kde-refactoring/updater-kde/updater/MainWindow.cpp branches/work/updater-kde-refactoring/updater-kde/updater/UpdaterApplication.cpp branches/work/updater-kde-refactoring/updater-kde/updater/dummy/DummyUpdater.cpp branches/work/updater-kde-refactoring/updater-kde/updater/dummy/DummyUpdater.h Modified: branches/work/updater-kde-refactoring/updater-kde/updater/ConfigWidget.cpp URL: http://svn.opensuse.org/viewcvs/zypp/branches/work/updater-kde-refactoring/updater-kde/updater/ConfigWidget.cpp?rev=5537&r1=5536&r2=5537&view=diff ============================================================================== --- branches/work/updater-kde-refactoring/updater-kde/updater/ConfigWidget.cpp (original) +++ branches/work/updater-kde-refactoring/updater-kde/updater/ConfigWidget.cpp Fri May 11 16:42:27 2007 @@ -58,7 +58,6 @@ void ConfigWidget::addBackendPlugins() { - // add all available backend plugins to the combobox QString backend = UpdaterSettings::self()->backendPlugin(); @@ -78,7 +77,7 @@ comboBackendPlugin->setCurrentItem(comboBackendPlugin->count()-1); } - // when the config file contains no valid plugin name (e.g. empty cause first program start)) + // when the config file contains no valid plugin name (e.g. empty because of first program start)) // we write the selected combobox item to the config file UpdaterSettings::self()->setBackendPlugin(pluginMap[comboBackendPlugin->currentItem()]); UpdaterSettings::self()->writeConfig(); Modified: branches/work/updater-kde-refactoring/updater-kde/updater/MainWindow.cpp URL: http://svn.opensuse.org/viewcvs/zypp/branches/work/updater-kde-refactoring/updater-kde/updater/MainWindow.cpp?rev=5537&r1=5536&r2=5537&view=diff ============================================================================== --- branches/work/updater-kde-refactoring/updater-kde/updater/MainWindow.cpp (original) +++ branches/work/updater-kde-refactoring/updater-kde/updater/MainWindow.cpp Fri May 11 16:42:27 2007 @@ -328,8 +328,6 @@ confWidget = new ConfigWidget(0, "settings"); configDialog->addPage(confWidget, PROGRAM_DISPLAY_NAME, PROGRAM_DISPLAY_NAME, i18n("Settings")); - KConfigDialog* dialog = new KConfigDialog( this, "updater-settings", UpdaterSettings::self() ); - connect( configDialog, SIGNAL(settingsChanged()), this, SLOT(slotConfigChanged()) ); // dirty hack Modified: branches/work/updater-kde-refactoring/updater-kde/updater/UpdaterApplication.cpp URL: http://svn.opensuse.org/viewcvs/zypp/branches/work/updater-kde-refactoring/updater-kde/updater/UpdaterApplication.cpp?rev=5537&r1=5536&r2=5537&view=diff ============================================================================== --- branches/work/updater-kde-refactoring/updater-kde/updater/UpdaterApplication.cpp (original) +++ branches/work/updater-kde-refactoring/updater-kde/updater/UpdaterApplication.cpp Fri May 11 16:42:27 2007 @@ -59,24 +59,23 @@ _updater->shutdown(); delete _updater; + _updater = NULL; + } // read new plugin form config and connect to it KService::Ptr service = selectPlugin(UpdaterSettings::self()->backendPlugin()); - - if ( service != NULL) + if ( service ) loadPlugin(service); else - { emit(pluginError(i18n("Backend plugin is not properly configured.\nPlease use the configuration dialog to choose the correct one."))); - } - if (_updater != NULL ) + if ( _updater ) + { setupUpdater(_updater); - - - _main->checkUpdates(); + _main->checkUpdates(); + } } Modified: branches/work/updater-kde-refactoring/updater-kde/updater/dummy/DummyUpdater.cpp URL: http://svn.opensuse.org/viewcvs/zypp/branches/work/updater-kde-refactoring/updater-kde/updater/dummy/DummyUpdater.cpp?rev=5537&r1=5536&r2=5537&view=diff ============================================================================== --- branches/work/updater-kde-refactoring/updater-kde/updater/dummy/DummyUpdater.cpp (original) +++ branches/work/updater-kde-refactoring/updater-kde/updater/dummy/DummyUpdater.cpp Fri May 11 16:42:27 2007 @@ -136,7 +136,7 @@ { } -void DummyUpdater::doCheckForUpdates(bool lastattempt) +void DummyUpdater::doCheckForUpdates() { kdDebug() << "Starting check for updates ..." << endl; Modified: branches/work/updater-kde-refactoring/updater-kde/updater/dummy/DummyUpdater.h URL: http://svn.opensuse.org/viewcvs/zypp/branches/work/updater-kde-refactoring/updater-kde/updater/dummy/DummyUpdater.h?rev=5537&r1=5536&r2=5537&view=diff ============================================================================== --- branches/work/updater-kde-refactoring/updater-kde/updater/dummy/DummyUpdater.h (original) +++ branches/work/updater-kde-refactoring/updater-kde/updater/dummy/DummyUpdater.h Fri May 11 16:42:27 2007 @@ -108,7 +108,7 @@ int getNetworkStatus() const; - void doCheckForUpdates(bool lastattempt=false); + void doCheckForUpdates(); KProcess *_process; QString _buffer; -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org