summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2016-01-22 02:06:59 +0100
committerSlávek Banko <slavek.banko@axis.cz>2016-01-22 02:06:59 +0100
commitb62b2d3a077be091b693fecb52f65cbc1ac2681e (patch)
tree2d444960da8fc9070018398a225bc8af5c21523e
parentea5e81fbea7b7e5f8fbc9c0603be329d0d7322e9 (diff)
downloadksensors-b62b2d3a.tar.gz
ksensors-b62b2d3a.zip
Strictly use autostart-enabled .desktop
This resolves Bug 2577 Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
-rw-r--r--src/Makefile.am6
-rw-r--r--src/ksensors.desktop6
-rw-r--r--src/main.cpp2
3 files changed, 12 insertions, 2 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 8128f46..7c17c10 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -45,10 +45,14 @@ ksensors_SOURCES = main.cpp ksensors.cpp aboutcfgdesign.ui \
ksensors_LDFLAGS = $(TDE_RPATH) $(all_libraries)
ksensors_LDADD = $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT) -lsensors -lm
-# this is where the desktop file will go
+# this is where the desktop file will go
shelldesktopdir = $(kde_appsdir)/System
shelldesktop_DATA = ksensors.desktop
+# and for autostart
+autostartdir = $(prefix)/share/autostart
+autostart_DATA = ksensors.desktop
+
# this is where the shell's XML-GUI resource file goes
shellrcdir = $(kde_datadir)/ksensors
shellrc_DATA = ksensorsui.rc
diff --git a/src/ksensors.desktop b/src/ksensors.desktop
index 07eff55..a32adfc 100644
--- a/src/ksensors.desktop
+++ b/src/ksensors.desktop
@@ -16,4 +16,8 @@ Comment[pl]=Ładny frondend lmsensors dla TDE
Comment[sv]=Ett trevligt gränssnitt mot lmsensors för TDE
GenericName=Lm-Sensors Frontend
X-DocPath=ksensors/index.html
-Categories=Qt;TDE;System;;
+X-TDE-autostart-after=panel
+X-TDE-StartupNotify=false
+X-TDE-UniqueApplet=true
+X-TDE-autostart-condition=ksensorsrc:General:AutoStart:true
+Categories=Qt;TDE;System;Applet;
diff --git a/src/main.cpp b/src/main.cpp
index 035b0fc..708db35 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -56,6 +56,8 @@ int main(int argc, char *argv[])
if(!KUniqueApplication::start()) return 0;
KUniqueApplication a;
+ // We handle autostart via standard autostart-enabled .desktop file instead of the session
+ a.disableSessionManagement();
TDEConfig *cfg= kapp->config();
cfg->setGroup("General");