Merge remote-tracking branch 'origin/master'

1 files changed, 13 insertions, 6 deletions

diff --git a/src-qt5/core/libLumina/LuminaXDG.h b/src-qt5/core/libLumina/LuminaXDG.h
index 996e5a20..5c012b9a 100644
--- a/src-qt5/core/libLumina/LuminaXDG.h
+++ b/src-qt5/core/libLumina/LuminaXDG.h
@@ -35,8 +35,8 @@
 // ======================
 // FreeDesktop Desktop Actions Framework (data structure)
 // ======================
-class XDGDesktopAction{
-public:
+struct XDGDesktopAction{
+//public:
   //Admin variables
   QString ID; //The ID name for this action (should correspond to an entry in the "actionList" for the XDGDesktop below)
   //General Variables
@@ -46,9 +46,10 @@ public:
 // ======================
 //  FreeDesktop Desktop Entry Framework (data structure)
 // ======================
-class XDGDesktop{
-public:
+struct XDGDesktop{
+//public:
   enum XDGDesktopType { BAD, APP, LINK, DIR };
+
   //Admin variables
   QString filePath; //which file this structure contains the information for (absolute path)
   QDateTime lastRead; //when this structure was created from the file
@@ -64,10 +65,15 @@ public:
   QList<XDGDesktopAction> actions;
   //Type 2 (LINK) variables
   QString url;
-  
+
   //Constructor/destructor
   XDGDesktop(){}
-  ~XDGDesktop(){}
+  ~XDGDesktop(){
+    actions.clear();
+    showInList.clear(); notShowInList.clear(); actionList.clear(); mimeList.clear(); catList.clear(); keyList.clear();
+    name.clear(); genericName.clear(); comment.clear(); icon.clear();
+    exec.clear(); tryexec.clear(); path.clear(); startupWM.clear(); url.clear();
+  }
 };
 
 // ========================
@@ -93,6 +99,7 @@ public slots:
 private:
 	QFileSystemWatcher *watcher;
 	QTimer *synctimer;
+	bool keepsynced;
 
 private slots:
 	void watcherChanged();