Strictly use autostart-enabled .desktop

This resolves Bug 2577

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit b62b2d3a07)

src/Makefile.am

@@ -49,6 +49,10 @@ ksensors_LDADD = $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT) -lsensors -lm
 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

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;

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");