<html>
<body>
<div style="font-family: Verdana, Arial, Helvetica, Sans-Serif;">
<table bgcolor="#f9f3c9" width="100%" cellpadding="8" style="border: 1px #c9c399 solid;">
<tr>
<td>
This is an automatically generated e-mail. To reply, visit:
<a href="http://git.reviewboard.kde.org/r/106124/">http://git.reviewboard.kde.org/r/106124/</a>
</td>
</tr>
</table>
<br />
<pre style="white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;">how do you plan to merge this? the history is rather messy, discarding and later re-introducing a lot of code, which makes tracking its origin very hard. therefore i'd advocate a squash merge. but then the commit should be cleanly split into a few pieces - for example, the greeter plugin patch is completely unrelated to this change (and, fwiw, you should adjust the other plugins as well).</pre>
<br />
<p>- Oswald</p>
<br />
<p>On September 19th, 2012, 4:57 p.m., Marco Martin wrote:</p>
<table bgcolor="#fefadf" width="100%" cellspacing="0" cellpadding="8" style="background-image: url('http://git.reviewboard.kde.org/media/rb/images/review_request_box_top_bg.png'); background-position: left top; background-repeat: repeat-x; border: 1px black solid;">
<tr>
<td>
<div>Review request for KDE Runtime and Martin Gräßlin.</div>
<div>By Marco Martin.</div>
<p style="color: grey;"><i>Updated Sept. 19, 2012, 4:57 p.m.</i></p>
<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Description </h1>
<table width="100%" bgcolor="#ffffff" cellspacing="0" cellpadding="10" style="border: 1px solid #b8b5a0">
<tr>
<td>
<pre style="margin: 0; padding: 0; white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;">this is the finalization of the old "screenlocker" branch in workspace:
the screen saver goes away (discussed at the time, about one year ago) and the screen locker gets managed by ksmserver, with a greeter that has the ui dine in qml.
The same qml ui gets loaded by the plasma based greeter when the "allow widgets on screen locker" is enabled.
the screensaver kcm is now called "Screen locker" and is way simpler, the screen saver chooser is gone from it.</pre>
</td>
</tr>
</table>
<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Diffs</b> </h1>
<ul style="margin-left: 3em; padding-left: 0;">
<li>kcontrol/screensaver/CMakeLists.txt <span style="color: grey">(e4dcc3a)</span></li>
<li>kcontrol/screensaver/screensaver.ui <span style="color: grey">(0ad5cd8)</span></li>
<li>kcontrol/screensaver/scrnsave.h <span style="color: grey">(7c8deba)</span></li>
<li>kcontrol/screensaver/scrnsave.cpp <span style="color: grey">(c0507d4)</span></li>
<li>krunner/CMakeLists.txt <span style="color: grey">(21eac6f)</span></li>
<li>krunner/dbus/org.freedesktop.ScreenSaver.xml <span style="color: grey">(5efd943)</span></li>
<li>krunner/dbus/org.kde.screensaver.xml <span style="color: grey">(e700b88)</span></li>
<li>krunner/kcfg/kscreensaversettings.kcfg <span style="color: grey">(c8f76f3)</span></li>
<li>krunner/kcfg/kscreensaversettings.kcfgc <span style="color: grey">(af9133d)</span></li>
<li>krunner/krunnerapp.h <span style="color: grey">(040198d)</span></li>
<li>krunner/krunnerapp.cpp <span style="color: grey">(eea6220)</span></li>
<li>krunner/lock/CMakeLists.txt <span style="color: grey">(cf9a67e)</span></li>
<li>krunner/lock/autologout.h <span style="color: grey">(0c444050)</span></li>
<li>krunner/lock/autologout.cc <span style="color: grey">(c86e29a)</span></li>
<li>krunner/lock/config-krunner-lock.h.cmake <span style="color: grey">(7bfdfd6)</span></li>
<li>krunner/lock/kscreenlocker.notifyrc <span style="color: grey">(b3e87c8)</span></li>
<li>krunner/lock/lockdlg.h <span style="color: grey">(f25e55f)</span></li>
<li>krunner/lock/lockdlg.cc <span style="color: grey">(14a9b34)</span></li>
<li>krunner/lock/lockprocess.h <span style="color: grey">(8b6d9a8)</span></li>
<li>krunner/lock/lockprocess.cc <span style="color: grey">(65c7f1d)</span></li>
<li>krunner/lock/main.h <span style="color: grey">(8a60353)</span></li>
<li>krunner/lock/main.cc <span style="color: grey">(7b41024)</span></li>
<li>krunner/main.cpp <span style="color: grey">(84a547b)</span></li>
<li>krunner/screensaver/saverengine.h <span style="color: grey">(3384d4a)</span></li>
<li>krunner/screensaver/saverengine.cpp <span style="color: grey">(4d90faa)</span></li>
<li>krunner/screensaver/xautolock.h <span style="color: grey">(3db3233)</span></li>
<li>krunner/screensaver/xautolock.cpp <span style="color: grey">(7124215)</span></li>
<li>krunner/screensaver/xautolock_c.h <span style="color: grey">(3b82f5c)</span></li>
<li>krunner/screensaver/xautolock_diy.c <span style="color: grey">(b9df2f8)</span></li>
<li>krunner/screensaver/xautolock_engine.c <span style="color: grey">(d6d0cf5)</span></li>
<li>ksmserver/CMakeLists.txt <span style="color: grey">(5f0fd34)</span></li>
<li>ksmserver/config-ksmserver.h.cmake <span style="color: grey">(933da35)</span></li>
<li>ksmserver/ksmserver_shortcuts.upd <span style="color: grey">(04b4118)</span></li>
<li>ksmserver/main.cpp <span style="color: grey">(430a61a)</span></li>
<li>ksmserver/screenlocker/CMakeLists.txt <span style="color: grey">(PRE-CREATION)</span></li>
<li>ksmserver/screenlocker/DESIGN <span style="color: grey">(PRE-CREATION)</span></li>
<li>ksmserver/screenlocker/Messages.sh <span style="color: grey">(PRE-CREATION)</span></li>
<li>ksmserver/screenlocker/autologout.h <span style="color: grey">(PRE-CREATION)</span></li>
<li>ksmserver/screenlocker/autologout.cpp <span style="color: grey">(PRE-CREATION)</span></li>
<li>ksmserver/screenlocker/data/CMakeLists.txt <span style="color: grey">(PRE-CREATION)</span></li>
<li>ksmserver/screenlocker/data/force_krunner_lock_shortcut_unreg.cpp <span style="color: grey">(PRE-CREATION)</span></li>
<li>ksmserver/screenlocker/data/kscreenlocker_locksession-shortcut.upd <span style="color: grey">(PRE-CREATION)</span></li>
<li>ksmserver/screenlocker/dbus/org.freedesktop.ScreenSaver.xml <span style="color: grey">(PRE-CREATION)</span></li>
<li>ksmserver/screenlocker/dbus/org.kde.screensaver.xml <span style="color: grey">(PRE-CREATION)</span></li>
<li>ksmserver/screenlocker/greeter/CMakeLists.txt <span style="color: grey">(PRE-CREATION)</span></li>
<li>ksmserver/screenlocker/greeter/Messages.sh <span style="color: grey">(PRE-CREATION)</span></li>
<li>ksmserver/screenlocker/greeter/greeter.h <span style="color: grey">(PRE-CREATION)</span></li>
<li>ksmserver/screenlocker/greeter/greeter.cpp <span style="color: grey">(PRE-CREATION)</span></li>
<li>ksmserver/screenlocker/greeter/greeterapp.h <span style="color: grey">(PRE-CREATION)</span></li>
<li>ksmserver/screenlocker/greeter/greeterapp.cpp <span style="color: grey">(PRE-CREATION)</span></li>
<li>ksmserver/screenlocker/greeter/main.cpp <span style="color: grey">(PRE-CREATION)</span></li>
<li>ksmserver/screenlocker/greeter/screensaverwindow.h <span style="color: grey">(PRE-CREATION)</span></li>
<li>ksmserver/screenlocker/greeter/screensaverwindow.cpp <span style="color: grey">(PRE-CREATION)</span></li>
<li>ksmserver/screenlocker/greeter/sessions.h <span style="color: grey">(PRE-CREATION)</span></li>
<li>ksmserver/screenlocker/greeter/sessions.cpp <span style="color: grey">(PRE-CREATION)</span></li>
<li>ksmserver/screenlocker/greeter/themes/org.kde.passworddialog/contents/ui/Greeter.qml <span style="color: grey">(PRE-CREATION)</span></li>
<li>ksmserver/screenlocker/greeter/themes/org.kde.passworddialog/contents/ui/SessionSwitching.qml <span style="color: grey">(PRE-CREATION)</span></li>
<li>ksmserver/screenlocker/greeter/themes/org.kde.passworddialog/contents/ui/main.qml <span style="color: grey">(PRE-CREATION)</span></li>
<li>ksmserver/screenlocker/greeter/themes/org.kde.passworddialog/metadata.desktop <span style="color: grey">(PRE-CREATION)</span></li>
<li>ksmserver/screenlocker/interface.h <span style="color: grey">(PRE-CREATION)</span></li>
<li>ksmserver/screenlocker/interface.cpp <span style="color: grey">(PRE-CREATION)</span></li>
<li>ksmserver/screenlocker/kcfg/kscreensaversettings.kcfg <span style="color: grey">(PRE-CREATION)</span></li>
<li>ksmserver/screenlocker/kcfg/kscreensaversettings.kcfgc <span style="color: grey">(PRE-CREATION)</span></li>
<li>ksmserver/screenlocker/kscreenlocker.notifyrc <span style="color: grey">(PRE-CREATION)</span></li>
<li>ksmserver/screenlocker/ksldapp.h <span style="color: grey">(PRE-CREATION)</span></li>
<li>ksmserver/screenlocker/ksldapp.cpp <span style="color: grey">(PRE-CREATION)</span></li>
<li>ksmserver/screenlocker/lockwindow.h <span style="color: grey">(PRE-CREATION)</span></li>
<li>ksmserver/screenlocker/lockwindow.cpp <span style="color: grey">(PRE-CREATION)</span></li>
<li>ksmserver/server.h <span style="color: grey">(8e54221)</span></li>
<li>ksmserver/server.cpp <span style="color: grey">(7073fc9)</span></li>
<li>ksmserver/shutdown.cpp <span style="color: grey">(6f298ec)</span></li>
<li>libs/kdm/kgreet_classic.cpp <span style="color: grey">(691d238)</span></li>
<li>plasma/desktop/applets/kickoff/CMakeLists.txt <span style="color: grey">(4b0d32a)</span></li>
<li>plasma/generic/containmentactions/contextmenu/CMakeLists.txt <span style="color: grey">(5433294)</span></li>
<li>plasma/generic/runners/sessions/CMakeLists.txt <span style="color: grey">(1b8292c)</span></li>
<li>plasma/screensaver/shell/BackgroundDialog.ui <span style="color: grey">(d6d2df7)</span></li>
<li>plasma/screensaver/shell/CMakeLists.txt <span style="color: grey">(8ea4504)</span></li>
<li>plasma/screensaver/shell/backgrounddialog.cpp <span style="color: grey">(1357a50)</span></li>
<li>plasma/screensaver/shell/main.cpp <span style="color: grey">(a1ae939)</span></li>
<li>plasma/screensaver/shell/plasmaapp.h <span style="color: grey">(33137c2)</span></li>
<li>plasma/screensaver/shell/plasmaapp.cpp <span style="color: grey">(ade6c68)</span></li>
<li>plasma/screensaver/shell/savercorona.h <span style="color: grey">(794e50c)</span></li>
<li>plasma/screensaver/shell/savercorona.cpp <span style="color: grey">(6f83859)</span></li>
<li>plasma/screensaver/shell/saverview.h <span style="color: grey">(8500e47)</span></li>
<li>plasma/screensaver/shell/saverview.cpp <span style="color: grey">(b6a709e)</span></li>
<li>powerdevil/daemon/CMakeLists.txt <span style="color: grey">(35a4fd4)</span></li>
<li>startkde.cmake <span style="color: grey">(9adc6f2)</span></li>
</ul>
<p><a href="http://git.reviewboard.kde.org/r/106124/diff/" style="margin-left: 3em;">View Diff</a></p>
</td>
</tr>
</table>
</div>
</body>
</html>