on xenial help sign in
address minor issues in MP 262575
commit5d26443806beebe46de4434c35abf89d414824be authorLukáš Tinkl <lukas.tinkl@canonical.com> dateMon 29 Jun 2015, 17:01 (11 years ago) parent4b0ca66
3 files changed+1−29
plugins/Unity/Session/dbusunitysessionservice.cpp−4 plugins/Utils/relativetimeformatter.cpp+1−1 tests/plugins/Unity/Session/sessionbackendtest.cpp−24
plugins/Unity/Session/dbusunitysessionservice.cpp−4
@@ -12,10 +12,6 @@
1212 *
1313 * You should have received a copy of the GNU Lesser General Public License
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15− *
16− * Authors: Lukáš Tinkl <ltinkl@canonical.com>
17− * Christopher Townsend <christopher.townsend@canonical.com>
18− * Ying-Chun Liu (PaulLiu) <paul.liu@canonical.com>
1915 */
2016
2117// local
plugins/Utils/relativetimeformatter.cpp+1−1
@@ -121,7 +121,7 @@ getDateProximity(GDateTime* now, GDateTime* time)
121121const char*
122122dgettext_datetime(const char *text)
123123{
124− return dgettext("unity8", text);
124+ return dgettext("indicator-datetime", text);
125125}
126126
127127/**
tests/plugins/Unity/Session/sessionbackendtest.cpp−24
@@ -156,30 +156,6 @@ private Q_SLOTS:
156156 QCOMPARE(dbusUnitySessionService.CanHybridSleep(), (login1face.call("CanHybridSleep").arguments().first().toString() != "no"));
157157 }
158158
159−// void testLock() {
160−// DBusUnitySessionService dbusUnitySessionService;
161−// DBusScreensaverWrapper saverIface;
162−// QDBusInterface saverCompatIface("org.freedesktop.ScreenSaver", "/ScreenSaver", "org.freedesktop.ScreenSaver", QDBusConnection::sessionBus());
163−// QSignalSpy spy(&saverIface, &DBusScreensaverWrapper::ActiveChanged);
164−// QCoreApplication::processEvents(); // to let the service register on DBus
165−
166−// QTRY_COMPARE(saverCompatIface.isValid(), true);
167−
168−// qDebug() << "Locking up...";
169−// dbusUnitySessionService.Lock();
170−
171−// QTRY_COMPARE(spy.count(), 1);
172−// QList<QVariant> arguments = spy.takeFirst(); // take the first signal
173−// QVERIFY(arguments.at(0).toBool() == true); // verify the first argument
174−
175−// // verify the session is locked
176−// QCOMPARE(saverIface.GetActive(), true);
177−
178−// sleep(5);
179−// qDebug() << "Screensaver has been active for" << saverIface.GetActiveTime() << "seconds";
180−// qDebug() << "Session has been idle for" << saverIface.GetSessionIdleTime() << "seconds";
181−// }
182−
183159private:
184160 QDBusInterface *dbusUnitySession;
185161};