Merge lp:~mateo-salta/nitroshare/0.2 into lp:nitroshare/0.2

[Mateo Salta]

Fix of extras-nitroshare.desktop load at startup persistence.

Part of code that was changed in "settings.cpp"

<code>

#elif defined(Q_OS_LINUX)
    QString desktop_file = GetStartupDir().absoluteFilePath("extras-nitroshare.desktop");
    QString bugdesktop_file = GetStartupDir().absoluteFilePath("nitroshare.desktop");
    if(load) QFile::copy(":/other/extras-nitroshare.desktop", desktop_file);
    else QFile::remove(desktop_file);
    QFile::remove(bugdesktop_file);

</code>

This should fix the persistence, as well as prevent problems in updating, and keeps the "extras-nitroshare.desktop" naming convention.

To verify, Open unchanged linux version of NitroShare, and Check "Load at startup" in Settings, this will create the "nitroshare.desktop" file in `~/.config/autostart`, now with the startup file still there change to version with fix. The new version should detect the old startup file when launching the "settings". Also It will delete the old one and replace it(if you want it to still load at startup) once you click "Ok".

Unmerged revisions

140. By Mateo Salta on 2012-12-04

Fix first run with old .desktop file not detecting startup value

139. By Mateo Salta on 2012-12-04

Fix for startup persistence, and fix of possible duplicate startup problem

=== modified file 'src/util/settings.cpp'
--- src/util/settings.cpp	2012-07-06 18:54:00 +0000
+++ src/util/settings.cpp	2012-12-04 23:28:22 +0000
@@ -79,7 +79,7 @@
 
     return registry.contains("NitroShare");
 #elif defined(Q_OS_LINUX)
-    return GetStartupDir().exists("extras-nitroshare.desktop");
+    return GetStartupDir().exists("extras-nitroshare.desktop") or GetStartupDir().exists("nitroshare.desktop");
 #endif
 
     /* Just return false on other platforms. */
@@ -96,10 +96,11 @@
     if(load) registry.setValue("NitroShare", QCoreApplication::applicationFilePath());
     else     registry.remove("NitroShare");
 #elif defined(Q_OS_LINUX)
-    QString desktop_file = GetStartupDir().absoluteFilePath("nitroshare.desktop");
-
+    QString desktop_file = GetStartupDir().absoluteFilePath("extras-nitroshare.desktop");
+    QString bugdesktop_file = GetStartupDir().absoluteFilePath("nitroshare.desktop");
     if(load) QFile::copy(":/other/extras-nitroshare.desktop", desktop_file);
     else     QFile::remove(desktop_file);
+    QFile::remove(bugdesktop_file);
 #else
     /* Mark the variable as unused. */
     Q_UNUSED(load);