From 5d686fff46dd451ca283f9b4037331d2efe159a8 Mon Sep 17 00:00:00 2001
From: -f <claudio@open-sankore.org>
Date: Wed, 4 Dec 2013 17:48:07 +0100
Subject: [PATCH] fixed path issue

---
 src/core/UBApplication.cpp | 4 +---
 src/core/UBSettings.cpp    | 8 +-------
 src/core/UBSettings.h      | 1 -
 3 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/src/core/UBApplication.cpp b/src/core/UBApplication.cpp
index e02a987c..25368c7b 100644
--- a/src/core/UBApplication.cpp
+++ b/src/core/UBApplication.cpp
@@ -120,9 +120,7 @@ UBApplication::UBApplication(const QString &id, int &argc, char **argv) : QtSing
 
     staticMemoryCleaner = new QObject(0); // deleted in UBApplication destructor
 
-    setOrganizationName(UBSettings::organizationName());
-    qDebug() << "organization name" << organizationName();
-    qDebug() << "application" << this;
+    setOrganizationName("Open Education Foundation");
     setOrganizationDomain("oe-f.org");
     setApplicationName("OpenBoard");
 
diff --git a/src/core/UBSettings.cpp b/src/core/UBSettings.cpp
index 088a79c9..5f4fba9f 100644
--- a/src/core/UBSettings.cpp
+++ b/src/core/UBSettings.cpp
@@ -787,7 +787,7 @@ QString UBSettings::userDataDirectory()
 
         }
         dataDirPath = UBFileSystemUtils::normalizeFilePath(QDesktopServices::storageLocation(QDesktopServices::DataLocation));
-        dataDirPath.replace(UBSettings::organizationName() + "/", "OpenBoard");
+        dataDirPath.replace(qApp->organizationName() + "/", "");
     }
     return dataDirPath;
 }
@@ -881,12 +881,6 @@ QString UBSettings::userPodcastRecordingDirectory()
     return dirPath;
 }
 
-QString UBSettings::organizationName()
-{
-    return "Open Education Foundation";
-}
-
-
 QString UBSettings::userDocumentDirectory()
 {
     static QString documentDirectory = "";
diff --git a/src/core/UBSettings.h b/src/core/UBSettings.h
index b786219e..9de4c801 100644
--- a/src/core/UBSettings.h
+++ b/src/core/UBSettings.h
@@ -137,7 +137,6 @@ class UBSettings : public QObject
         static QString userInteractiveDirectory();
         static QString userInteractiveFavoritesDirectory();
         static QString userPodcastRecordingDirectory();
-        static QString organizationName();
 
         QString userGipLibraryDirectory();