![](https://seccdn.libravatar.org/avatar/e2145bc5cf53dda95c308a3c75e8fef3.jpg?s=120&d=mm&r=g)
Hello community, here is the log from the commit of package kdenetwork4 checked in at Tue Nov 18 13:28:07 CET 2008. -------- --- KDE/kdenetwork4/kdenetwork4.changes 2008-11-05 01:47:46.000000000 +0100 +++ /mounts/work_src_done/STABLE/kdenetwork4/kdenetwork4.changes 2008-11-18 10:21:20.000000000 +0100 @@ -1,0 +2,6 @@ +Tue Nov 18 10:16:44 CET 2008 - stbinner@suse.de + +- fix krdc cancelling KDE logout (bnc#442767) +- update Kopete logout crash fix (bnc#435155) + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- r881699-kopete-logout.diff r881947-krdc-logout.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdenetwork4.spec ++++++ --- /var/tmp/diff_new_pack.l13013/_old 2008-11-18 13:27:40.000000000 +0100 +++ /var/tmp/diff_new_pack.l13013/_new 2008-11-18 13:27:40.000000000 +0100 @@ -26,13 +26,15 @@ Summary: KDE Network Base Package Url: http://www.kde.org Version: 4.1.3 -Release: 2 +Release: 3 Source0: kdenetwork-%version.tar.bz2 Source1: _upstream Patch: 4_1_BRANCH.diff Patch1: disable-kopete.diff Patch2: knewsticker.diff Patch4: FIXME.diff +Patch5: r881699-kopete-logout.diff +Patch6: r881947-krdc-logout.diff #remove on 4.1.2 update BuildRoot: %{_tmppath}/%{name}-%{version}-build %kde4_runtime_requires @@ -75,6 +77,8 @@ %endif %patch2 #%patch4 +%patch5 +%patch6 # icon fixups pushd kget/ui/icons # rename ox hi ox*apps-kget.{png,svgz} @@ -375,6 +379,9 @@ %doc COPYING COPYING.DOC README %changelog +* Tue Nov 18 2008 stbinner@suse.de +- fix krdc cancelling KDE logout (bnc#442767) +- update Kopete logout crash fix (bnc#435155) * Wed Nov 05 2008 dmueller@suse.de - use minimal-toc to fix build for ppc(64) * Fri Oct 31 2008 dmueller@suse.de ++++++ r881699-kopete-logout.diff ++++++ Index: kopete/libkopete/kopetepluginmanager.cpp =================================================================== --- kopete/libkopete/kopetepluginmanager.cpp (revision 881698) +++ kopete/libkopete/kopetepluginmanager.cpp (revision 881699) @@ -62,14 +62,17 @@ if ( shutdownMode != DoneShutdown ) kWarning( 14010 ) << "Destructing plugin manager without going through the shutdown process! Backtrace is: " << endl << kBacktrace(); - // Quick cleanup of the remaining plugins, hope it helps - // Note that deleting it.value() causes slotPluginDestroyed to be called, which - // removes the plugin from the list of loaded plugins. + // Clean up loadedPlugins manually, because PluginManager can't access our global + // static once this destructor has started. while ( !loadedPlugins.empty() ) { InfoToPluginMap::ConstIterator it = loadedPlugins.begin(); kWarning( 14010 ) << "Deleting stale plugin '" << it.value()->objectName() << "'"; - delete it.value(); + KPluginInfo info = it.key(); + Plugin *plugin = it.value(); + loadedPlugins.remove(info); + plugin->disconnect(&instance, SLOT(slotPluginDestroyed(QObject*))); + delete plugin; } } @@ -245,10 +248,6 @@ { kDebug( 14010 ) ; - // Disconnect any remaining plugins (bug 172011). - for ( PluginManagerPrivate::InfoToPluginMap::ConstIterator it = _kpmp->loadedPlugins.begin(); it != _kpmp->loadedPlugins.end(); ++it ) - disconnect( it.value(), SIGNAL(destroyed(QObject*)), this, 0 ); - _kpmp->shutdownMode = PluginManagerPrivate::DoneShutdown; KGlobal::deref(); ++++++ r881947-krdc-logout.diff ++++++ Index: krdc/mainwindow.cpp =================================================================== --- krdc/mainwindow.cpp (revision 881946) +++ krdc/mainwindow.cpp (revision 881947) @@ -777,10 +777,10 @@ } } -void MainWindow::quit() +void MainWindow::quit(bool systemEvent) { bool haveRemoteConnections = m_remoteViewList.count(); - if (!haveRemoteConnections || KMessageBox::warningContinueCancel(this, + if (systemEvent || !haveRemoteConnections || KMessageBox::warningContinueCancel(this, i18n("Are you sure you want to quit the KDE Remote Desktop Client?"), i18n("Confirm Quit"), KStandardGuiItem::quit(), KStandardGuiItem::cancel(), @@ -828,12 +828,15 @@ void MainWindow::closeEvent(QCloseEvent *event) { - event->ignore(); - - if (Settings::systemTrayIcon()) { - hide(); // just hide the mainwindow, keep it in systemtray + if (event->spontaneous()) { // Returns true if the event originated outside the application (a system event); otherwise returns false. + event->ignore(); + if (Settings::systemTrayIcon()) { + hide(); // just hide the mainwindow, keep it in systemtray + } else { + quit(); + } } else { - quit(); + quit(true); } } Index: krdc/mainwindow.h =================================================================== --- krdc/mainwindow.h (revision 881946) +++ krdc/mainwindow.h (revision 881947) @@ -59,7 +59,7 @@ private slots: void restoreOpenSessions(); - void quit(); + void quit(bool systemEvent = false); void preferences(); void configureNotifications(); void configureKeys(); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org