Hello community, here is the log from the commit of package kdebase4-workspace for openSUSE:12.3 checked in at 2013-02-12 16:39:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.3/kdebase4-workspace (Old) and /work/SRC/openSUSE:12.3/.kdebase4-workspace.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdebase4-workspace", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:12.3/kdebase4-workspace/kdebase4-workspace.changes 2013-02-10 14:36:43.000000000 +0100 +++ /work/SRC/openSUSE:12.3/.kdebase4-workspace.new/kdebase4-workspace.changes 2013-02-12 16:39:21.000000000 +0100 @@ -1,0 +2,25 @@ +Mon Feb 11 20:54:07 UTC 2013 - [email protected] + +- Added pager.diff, fixes bnc#799875 + +------------------------------------------------------------------- +Mon Feb 11 19:19:52 UTC 2013 - [email protected] + +- changed plasma-kickoff-newly-collapsing.diff: + * sort entries by genericName if "Show applications by name" + is switched off (bnc#803179) + +------------------------------------------------------------------- +Mon Feb 11 18:05:48 UTC 2013 - [email protected] + +- Added upstream patch respect_screenlock_settings.diff. This would + allow again the old behavior of the screensaver and the new + screenlocker respects now all the settings (e.g. no password, + etc) (bnc#802704) + +------------------------------------------------------------------- +Mon Feb 11 16:44:43 UTC 2013 - [email protected] + +- Remove the kio-mtp package, moved to KDE4-DESKTOP pattern instead + +------------------------------------------------------------------- New: ---- pager.diff respect_screenlock_settings.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase4-workspace.spec ++++++ --- /var/tmp/diff_new_pack.hrkY86/_old 2013-02-12 16:39:22.000000000 +0100 +++ /var/tmp/diff_new_pack.hrkY86/_new 2013-02-12 16:39:22.000000000 +0100 @@ -133,6 +133,10 @@ Patch402: opensuse-kinfocenter.diff # PATCH-FIX-OPENSUSE storage.diff (created by Alin M. Elena to add unique names for partitions in kinfocenter) Patch403: storage.diff +# PATCH-FIX-UPSTREAM respect_screenlock_settings.diff Upstream fix for the screenlocker to respect its settings. +Patch404: respect_screenlock_settings.diff +# PATCH-FIX-OPENSUSE pager.diff Use plasma theme color for pager text +Patch405: pager.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %if %suse_version > 1200 Requires: %{name}-branding = %{version} @@ -197,8 +201,6 @@ #Akonadi plasma engine is no longer provided Obsoletes: kdebase4-workspace-plasma-engine-akonadi < %{version} Provides: kdebase4-workspace-plasma-engine-akonadi = %{version} -#Recommend the kio-mtp package so that solid can communicate with Android phones -Recommends: kio-mtp %kde4_runtime_requires %define _dminitdir %{_kde4_prefix}/lib/X11/displaymanagers @@ -381,6 +383,8 @@ %patch401 -p1 %patch402 -p1 %patch403 -p1 +%patch404 -p1 +%patch405 -p1 cp %{SOURCE3} kwin/effects/cube/data/cubecap.png %build ++++++ pager.diff ++++++ --- kde-workspace-4.10.0/plasma/desktop/applets/pager/pager.cpp 2013-01-23 22:46:44.000000000 +0100 +++ new.kde-workspace-4.10.0/plasma/desktop/applets/pager/pager.cpp 2013-02-11 21:36:34.747311896 +0100 @@ -789,7 +789,7 @@ void Pager::changeDesktop(int newDesktop QPixmap Pager::shadowText(const QString &text) { - QColor textColor = m_pagerStyle["textColor"].value<QColor>(); + QColor textColor = Plasma::Theme::defaultTheme()->color(Plasma::Theme::TextColor); return Plasma::PaintUtils::shadowText(text, KGlobalSettings::smallestReadableFont(), ++++++ plasma-kickoff-newly-collapsing.diff ++++++ --- /var/tmp/diff_new_pack.hrkY86/_old 2013-02-12 16:39:22.000000000 +0100 +++ /var/tmp/diff_new_pack.hrkY86/_new 2013-02-12 16:39:22.000000000 +0100 @@ -121,7 +121,7 @@ static QHash<QString, QString> iconNameMap(); ApplicationModel *q; -@@ -132,78 +137,118 @@ public: +@@ -132,78 +137,122 @@ public: QStringList systemApplications; DisplayOrder displayOrder; bool allowSeparators; @@ -198,7 +198,9 @@ - if (service->noDisplay()) { - continue; - } -+ slist.insert( service->name().toLocal8Bit(), p); ++ if( primaryNamePolicy == ApplicationModel::GenericNamePrimary && !service->genericName().isEmpty() ) ++ slist.insert( service->genericName().toLocal8Bit(), p); ++ else slist.insert( service->name().toLocal8Bit(), p); + } + else if (p->isType(KST_KServiceGroup)) + { @@ -224,7 +226,9 @@ + } + specialTitle.insert( _e->name(), key ); + categoryIcon.insert( _e->name(), s->icon() ); -+ slist.insert( key.toLocal8Bit(), _e ); ++ if( primaryNamePolicy == ApplicationModel::GenericNamePrimary && !s->genericName().isEmpty() ) ++ slist.insert( s->genericName().toLocal8Bit(), _e ); ++ else slist.insert( key.toLocal8Bit(), _e ); + shortenedMenuPath.insert( _e->name(), serviceGroup->relPath() ); + // and escape from here + continue; @@ -286,7 +290,7 @@ } if (systemApplicationPolicy == ApplicationModel::ShowSystemOnlyPolicy && -@@ -213,9 +258,33 @@ void ApplicationModelPrivate::fillNode(c +@@ -213,9 +262,33 @@ void ApplicationModelPrivate::fillNode(c continue; } @@ -322,7 +326,7 @@ if (serviceGroup->noDisplay() || serviceGroup->childCount() == 0) { continue; -@@ -224,41 +293,42 @@ void ApplicationModelPrivate::fillNode(c +@@ -224,41 +297,42 @@ void ApplicationModelPrivate::fillNode(c kDebug(250) << "Service group" << serviceGroup->entryPath() << serviceGroup->icon() << serviceGroup->relPath() << serviceGroup->directoryEntryPath(); @@ -380,7 +384,7 @@ } // set the subTitleMandatory field for nodes that do not provide a unique generic -@@ -273,6 +343,20 @@ void ApplicationModelPrivate::fillNode(c +@@ -273,6 +347,20 @@ void ApplicationModelPrivate::fillNode(c } } @@ -401,7 +405,7 @@ ApplicationModel::ApplicationModel(QObject *parent, bool allowSeparators) : KickoffAbstractModel(parent), d(new ApplicationModelPrivate(this, allowSeparators)) -@@ -282,6 +366,7 @@ ApplicationModel::ApplicationModel(QObje +@@ -282,6 +370,7 @@ ApplicationModel::ApplicationModel(QObje QDBusConnection::sessionBus().registerObject("/kickoff", this); dbus.connect(QString(), "/kickoff", "org.kde.plasma", "reloadMenu", this, SLOT(reloadMenu())); connect(KSycoca::self(), SIGNAL(databaseChanged(QStringList)), this, SLOT(checkSycocaChange(QStringList))); @@ -409,7 +413,7 @@ } ApplicationModel::~ApplicationModel() -@@ -308,6 +393,32 @@ DisplayOrder ApplicationModel::nameDispl +@@ -308,6 +397,32 @@ DisplayOrder ApplicationModel::nameDispl return d->displayOrder; } @@ -442,7 +446,7 @@ int ApplicationModel::columnCount(const QModelIndex &parent) const { Q_UNUSED(parent) -@@ -515,8 +626,9 @@ void ApplicationModel::reloadMenu() +@@ -515,8 +630,9 @@ void ApplicationModel::reloadMenu() { delete d->root; d->root = new AppNode(); @@ -453,7 +457,7 @@ } void ApplicationModel::checkSycocaChange(const QStringList &changes) -@@ -536,6 +648,104 @@ ApplicationModel::SystemApplicationPolic +@@ -536,6 +652,104 @@ ApplicationModel::SystemApplicationPolic return d->systemApplicationPolicy; } ++++++ respect_screenlock_settings.diff ++++++ [kde-workspace/KDE/4.10] ksmserver/screenlocker: Refactor grace time tracking From: Oliver Henshaw <[email protected]> To: [email protected] Date: Today 18:34:17 Git commit 1739d32d2d2a9c02d742c0aff4c91c46ab974692 by Oliver Henshaw. Committed on 12/01/2013 at 18:30. Pushed by oliverhenshaw into branch 'KDE/4.10'. Refactor grace time tracking Set a boolean instead of checking whether timer is active. This is required for the following commits. REVIEW: 108425 M +11 -3 ksmserver/screenlocker/ksldapp.cpp M +6 -1 ksmserver/screenlocker/ksldapp.h http://commits.kde.org/kde-workspace/1739d32d2d2a9c02d742c0aff4c91c46ab974692 diff --git a/ksmserver/screenlocker/ksldapp.cpp b/ksmserver/screenlocker/ksldapp.cpp index b3eebf5..10f808a 100644 --- a/ksmserver/screenlocker/ksldapp.cpp +++ b/ksmserver/screenlocker/ksldapp.cpp @@ -70,6 +70,7 @@ KSldApp::KSldApp(QObject * parent) , m_lockedTimer(QElapsedTimer()) , m_idleId(0) , m_lockGrace(0) + , m_inGraceTime(false) , m_graceTimer(new QTimer(this)) , m_inhibitCounter(0) , m_plasmaEnabled(false) @@ -130,6 +131,7 @@ void KSldApp::initialize() connect(m_lockProcess, SIGNAL(finished(int,QProcess::ExitStatus)), SLOT(lockProcessFinished(int,QProcess::ExitStatus))); m_lockedTimer.invalidate(); m_graceTimer->setSingleShot(true); + connect(m_graceTimer, SIGNAL(timeout()), SLOT(endGraceTime())); // create our D-Bus interface new Interface(this); @@ -315,7 +317,8 @@ void KSldApp::idleTimeout(int identifier) // there is at least one process blocking the auto lock of screen locker return; } - if (m_lockGrace) { + if (m_lockGrace) { // short-circuit if grace time is zero + m_inGraceTime = true; m_graceTimer->start(m_lockGrace); } lock(); @@ -323,12 +326,17 @@ void KSldApp::idleTimeout(int identifier) bool KSldApp::isGraceTime() const { - return m_graceTimer->isActive(); + return m_inGraceTime; +} + +void KSldApp::endGraceTime() +{ + m_inGraceTime = false; } void KSldApp::unlock() { - if (!m_graceTimer->isActive()) { + if (!isGraceTime()) { return; } s_graceTimeKill = true; diff --git a/ksmserver/screenlocker/ksldapp.h b/ksmserver/screenlocker/ksldapp.h index 51c0906..3047c00 100644 --- a/ksmserver/screenlocker/ksldapp.h +++ b/ksmserver/screenlocker/ksldapp.h @@ -85,6 +85,7 @@ Q_SIGNALS: private Q_SLOTS: void cleanUp(); void idleTimeout(int identifier); + void endGraceTime(); private: void initialize(); @@ -112,7 +113,11 @@ private: **/ int m_lockGrace; /** - * while this timer is active user activity may remove the lock. Only used after idle timeout. + * Controls whether user activity may remove the lock. Only enabled after idle timeout. + **/ + bool m_inGraceTime; + /** + * Grace time ends when timer expires. **/ QTimer *m_graceTimer; int m_inhibitCounter; --- [kde-workspace/KDE/4.10] ksmserver/screenlocker: Use qBound for succinctness From: Oliver Henshaw <[email protected]> To: [email protected] Date: Today 18:34:17 Git commit 9c841a55667d4b6679a34e744586e097c820710d by Oliver Henshaw. Committed on 11/02/2013 at 16:13. Pushed by oliverhenshaw into branch 'KDE/4.10'. Use qBound for succinctness REVIEW: 108425 M +1 -6 ksmserver/screenlocker/ksldapp.cpp http://commits.kde.org/kde-workspace/9c841a55667d4b6679a34e744586e097c820710d diff --git a/ksmserver/screenlocker/ksldapp.cpp b/ksmserver/screenlocker/ksldapp.cpp index c07ac0e..b3eebf5 100644 --- a/ksmserver/screenlocker/ksldapp.cpp +++ b/ksmserver/screenlocker/ksldapp.cpp @@ -150,12 +150,7 @@ void KSldApp::configure() // timeout stored in seconds m_idleId = KIdleTime::instance()->addIdleTimeout(timeout*1000); } - m_lockGrace = KScreenSaverSettings::lockGrace(); - if (m_lockGrace < 0) { - m_lockGrace = 0; - } else if (m_lockGrace > 300000) { - m_lockGrace = 300000; // 5 minutes, keep the value sane - } + m_lockGrace = qBound(0, KScreenSaverSettings::lockGrace(), 300000); // max 5 minutes, keep the value sane m_autoLogoutTimeout = KScreenSaverSettings::autoLogout() ? KScreenSaverSettings::autoLogoutTimeout() * 1000 : 0; m_plasmaEnabled = KScreenSaverSettings::plasmaEnabled(); } --- [kde-workspace/KDE/4.10] ksmserver/screenlocker: Respect Lock boolean in configuration From: Oliver Henshaw <[email protected]> To: [email protected] Date: Today 18:34:17 Git commit 72ca24bb6484b014ea4d91a323b8a7c8a44085aa by Oliver Henshaw. Committed on 11/01/2013 at 21:04. Pushed by oliverhenshaw into branch 'KDE/4.10'. Respect Lock boolean in configuration If not set to require password, don't start the grace period timer and always consider in grace period. REVIEW: 108425 BUG: 310871 FIXED-IN: 4.10.1 M +7 -1 ksmserver/screenlocker/ksldapp.cpp http://commits.kde.org/kde-workspace/72ca24bb6484b014ea4d91a323b8a7c8a44085aa diff --git a/ksmserver/screenlocker/ksldapp.cpp b/ksmserver/screenlocker/ksldapp.cpp index d940a95..7f2e671 100644 --- a/ksmserver/screenlocker/ksldapp.cpp +++ b/ksmserver/screenlocker/ksldapp.cpp @@ -152,7 +152,11 @@ void KSldApp::configure() // timeout stored in seconds m_idleId = KIdleTime::instance()->addIdleTimeout(timeout*1000); } - m_lockGrace = qBound(0, KScreenSaverSettings::lockGrace(), 300000); // max 5 minutes, keep the value sane + if (KScreenSaverSettings::lock()) { + m_lockGrace = qBound(0, KScreenSaverSettings::lockGrace(), 300000); // max 5 minutes, keep the value sane + } else { + m_lockGrace = -1; + } m_autoLogoutTimeout = KScreenSaverSettings::autoLogout() ? KScreenSaverSettings::autoLogoutTimeout() * 1000 : 0; m_plasmaEnabled = KScreenSaverSettings::plasmaEnabled(); } @@ -321,6 +325,8 @@ void KSldApp::idleTimeout(int identifier) if (m_lockGrace) { // short-circuit if grace time is zero m_inGraceTime = true; m_graceTimer->start(m_lockGrace); + } else if (m_lockGrace == -1) { + m_inGraceTime = true; // if no timeout configured, grace time lasts forever } lock(); } --- [kde-workspace/KDE/4.10] ksmserver/screenlocker: Stop grace period on unlock From: Oliver Henshaw <[email protected]> To: [email protected] Date: Today 18:34:17 Git commit d06e15a7b03a2391b5bc38e458e118ab673b8c61 by Oliver Henshaw. Committed on 14/01/2013 at 13:51. Pushed by oliverhenshaw into branch 'KDE/4.10'. Stop grace period on unlock It was safe to leak the grace timer when it was in the lock process, since it was killed on unlock. Now it is not. A password should always be required if the screenlocker is explicitly triggered; but a screenlocker invoked while the grace timer from a previous invocation is still active can be dismissed without a password, at least for a short while. This also meant that the screenlocker keyboard shortcut would not work until the grace timer expired. REVIEW: 108425 BUG: 313997 FIXED-IN: 4.10.1 M +2 -0 ksmserver/screenlocker/ksldapp.cpp http://commits.kde.org/kde-workspace/d06e15a7b03a2391b5bc38e458e118ab673b8c61 diff --git a/ksmserver/screenlocker/ksldapp.cpp b/ksmserver/screenlocker/ksldapp.cpp index 10f808a..d940a95 100644 --- a/ksmserver/screenlocker/ksldapp.cpp +++ b/ksmserver/screenlocker/ksldapp.cpp @@ -243,6 +243,7 @@ void KSldApp::doUnlock() m_lockWindow = NULL; m_locked = false; m_lockedTimer.invalidate(); + endGraceTime(); KDisplayManager().setLock(false); emit unlocked(); KNotification::event( QLatin1String("unlocked")); @@ -331,6 +332,7 @@ bool KSldApp::isGraceTime() const void KSldApp::endGraceTime() { + m_graceTimer->stop(); m_inGraceTime = false; } -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
