I have made the following changes intended for : CE:MW:Shared / mthemedaemon
Please review and accept or decline. BOSS has already run some checks on this request. See the "Messages from BOSS" section below. https://build.pub.meego.com//request/show/8200 Thank You, Pekka Lundstrom [This message was auto-generated] --- Request # 8200: Messages from BOSS: State: review at 2013-02-26T10:23:01 by bossbot Reviews: accepted by bossbot : Prechecks succeeded. new for CE-maintainers : Please replace this text with a review and approve/reject the review (not the SR). BOSS will take care of the rest Changes: submit: home:plundstr:branches:CE:MW:Shared / mthemedaemon -> CE:MW:Shared / mthemedaemon changes files: -------------- --- mthemedaemon.changes +++ mthemedaemon.changes @@ -0,0 +1,7 @@ +* Tue Feb 26 2013 Pekka Lundstrom <[email protected]> - 1.0.2 +- Added feedback to systemd when initialization is ready. Fixes NEMO#636 + +* Fri Feb 22 2013 Pekka Lundstrom <[email protected]> - 1.0.1 +- systemd service file changed so that we can start this before xorg.target if + required. Now this needs only xorg.service, not full xorg.target + old: ---- mthemedaemon-1.0.1.tar.bz2 new: ---- mthemedaemon-1.0.2.tar.bz2 spec files: ----------- --- mthemedaemon.spec +++ mthemedaemon.spec @@ -9,7 +9,7 @@ # << macros Summary: Shared theme resource loader -Version: 1.0.1 +Version: 1.0.2 Release: 1 Group: System/Libraries License: LGPLv2.1 @@ -21,6 +21,7 @@ Requires: nemo-theme-default BuildRequires: pkgconfig(QtOpenGL) BuildRequires: pkgconfig(mlite) +BuildRequires: pkgconfig(systemd) BuildRequires: fdupes %description @@ -29,7 +30,7 @@ %prep -%setup -q -n %{name} +%setup -q -n %{name}-%{version} # >> setup # << setup other changes: -------------- ++++++ mthemedaemon-1.0.1.tar.bz2 -> mthemedaemon-1.0.2.tar.bz2 --- main.cpp +++ main.cpp @@ -14,6 +14,7 @@ #include <QDebug> #include <QApplication> #include <signal.h> +#include <systemd/sd-daemon.h> #ifdef CLOSE_ON_ENTER #include "keypresswaiter.h" @@ -134,6 +135,11 @@ keyWaiter.start(); #endif + /* Notify systemd if requested */ + if (app.arguments().indexOf("-systemd") >= 0) { + sd_notify(0, "READY=1"); + } + if (app.arguments().indexOf("-quitimmediately") >= 0) { QTimer::singleShot(0, &app, SLOT(quit())); } --- mthemedaemon.pro +++ mthemedaemon.pro @@ -20,6 +20,7 @@ !win32:CONFIG += link_pkgconfig PKGCONFIG += x11 PKGCONFIG += mlite +PKGCONFIG += libsystemd-daemon # Input SOURCES += main.cpp \ ++++++ mthemedaemon.service --- mthemedaemon.service +++ mthemedaemon.service @@ -1,10 +1,11 @@ [Unit] Description=The MTF theme daemon -After=xorg.target -Requires=dbus.socket xorg.target +After=xorg.service +Requires=dbus.socket xorg.service [Service] -ExecStart=/usr/bin/mthemedaemon +Type=notify +ExecStart=/usr/bin/mthemedaemon -systemd Restart=always ++++++ mthemedaemon.yaml --- mthemedaemon.yaml +++ mthemedaemon.yaml @@ -1,6 +1,6 @@ Name: mthemedaemon Summary: Shared theme resource loader -Version: 1.0.1 +Version: 1.0.2 Release: 1 Group: System/Libraries License: LGPLv2.1 @@ -14,6 +14,7 @@ PkgConfigBR: - QtOpenGL - mlite + - systemd Configure: none Builder: qmake ExtraSources:
