From 929f7dd5d8110cbe678172dce90447935f871b86 Mon Sep 17 00:00:00 2001
From: edouard <edouard>
Date: Sat, 11 Sep 2010 21:17:44 +0000
Subject: [PATCH] Make Notification plugin sound path portable too.

git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@1579 ebee16cc-31ac-478f-84a7-5cbb03baadba
---
 ground/src/plugins/notify/notifypluginconfiguration.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/ground/src/plugins/notify/notifypluginconfiguration.cpp b/ground/src/plugins/notify/notifypluginconfiguration.cpp
index 1c0c3eb48..7721e688c 100644
--- a/ground/src/plugins/notify/notifypluginconfiguration.cpp
+++ b/ground/src/plugins/notify/notifypluginconfiguration.cpp
@@ -28,6 +28,7 @@
 #include "notifypluginconfiguration.h"
 #include <QtCore/QDataStream>
 #include <QFile>
+#include "utils/pathutils.h"
 
 
 NotifyPluginConfiguration::NotifyPluginConfiguration(QObject *parent) :
@@ -55,7 +56,7 @@ NotifyPluginConfiguration::NotifyPluginConfiguration(QObject *parent) :
 
 void NotifyPluginConfiguration::saveState(QSettings* settings) const
 {
-	settings->setValue("SoundCollectionPath", getSoundCollectionPath());
+        settings->setValue("SoundCollectionPath", Utils::PathUtils().RemoveDataPath(getSoundCollectionPath()));
 	settings->setValue(QLatin1String("CurrentLanguage"), getCurrentLanguage());
 	settings->setValue(QLatin1String("ObjectField"), getObjectField());
 	settings->setValue(QLatin1String("DataObject"), getDataObject());
@@ -72,7 +73,7 @@ void NotifyPluginConfiguration::saveState(QSettings* settings) const
 void NotifyPluginConfiguration::restoreState(QSettings* settings)
 {
 	//settings = Core::ICore::instance()->settings();
-	setSoundCollectionPath(settings->value(QLatin1String("SoundCollectionPath"), tr("")).toString());
+        setSoundCollectionPath(Utils::PathUtils().InsertDataPath(settings->value(QLatin1String("SoundCollectionPath"), tr("")).toString()));
 	setCurrentLanguage(settings->value(QLatin1String("CurrentLanguage"), tr("")).toString());
 	setDataObject(settings->value(QLatin1String("DataObject"), tr("")).toString());
 	setObjectField(settings->value(QLatin1String("ObjectField"), tr("")).toString());