Review Request: Allow autostart .desktop files to be merged

[Aaron Seigo]

-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
http://reviewboard.kde.org/r/1857/
-----------------------------------------------------------

Review request for kdelibs.


Summary
-------

KAutostart in libkdecore uses KDesktopFile to manage the autostart entries and relies on KConfig's merging system to do so. However, klauncher was passing absolute paths to KService (which passes that to KDesktopFile) which prevents such merging. This patch uses the file name only to allow KDesktopFile to merge the entries. This breakage was recently discovered with the new desktop vs netbook shell setting in system settings.


Diffs
-----

  /trunk/KDE/kdelibs/kinit/autostart.cpp 1032509 
  /trunk/KDE/kdelibs/kinit/klauncher.cpp 1032509 

Diff: http://reviewboard.kde.org/r/1857/diff


Testing
-------


Thanks,

Aaron