File beebeep-5.6.8-data.patch of Package beebeep

Index: beebeep-code-r1557/src/core/Settings.cpp
===================================================================
--- beebeep-code-r1557.orig/src/core/Settings.cpp
+++ beebeep-code-r1557/src/core/Settings.cpp
@@ -265,8 +265,6 @@ QStringList Settings::resourceFolders()
 #ifdef Q_OS_UNIX
   system_folders.append( QLatin1String( "/etc/beebeep/" ) );
   system_folders.append( QLatin1String( "/usr/local/etc/beebeep/" ) );
-  system_folders.append( QLatin1String( "/usr/lib/beebeep/" ) );
-  system_folders.append( QLatin1String( "/usr/local/lib/beebeep/" ) );
 #endif
   system_folders.removeDuplicates();
   return system_folders;
@@ -327,7 +325,7 @@ void Settings::setDefaultFolders()
   else
     m_resourceFolder = app_folder;
 #else
-  m_resourceFolder = app_folder;
+  m_resourceFolder = "/usr/share/beebeep";
 #endif
   qDebug() << "Resource folder:" << qPrintable( m_resourceFolder );
 
@@ -2456,15 +2454,17 @@ QString Settings::defaultPluginFolderPat
 {
   QStringList data_folders;
   data_folders.append( Bee::convertToNativeFolderSeparator( QString( "%1/%2" ).arg( dataFolder(), QLatin1String( "plugins" ) ) ) );
-  data_folders.append( dataFolders() );
 #ifndef Q_OS_MAC
   data_folders.append( Bee::convertToNativeFolderSeparator( QString( "%1/%2" ).arg( resourceFolder(), QLatin1String( "plugins" ) ) ) );
 #endif
-  data_folders.append( resourceFolders() );
+  QString test_app_path = QApplication::applicationDirPath();
+  QDir test_plugins_dir( test_app_path );
+  QString test_plugins_folder = QString( "%1/%2" ).arg( test_plugins_dir.absolutePath() ).arg( QLatin1String( "plugins" ) );
+  data_folders.append( test_plugins_folder );
   data_folders.removeDuplicates();
   QString test_plugin_file = QLatin1String( "libnumbertextmarker." ) + Bee::pluginFileExtension();
   QString test_plugin_path = findFileInFolders( test_plugin_file, data_folders, true );
-  return test_plugin_path.isNull() ? resourceFolder() : test_plugin_path;
+  return test_plugin_path.isNull() ? test_plugins_folder : test_plugin_path;
 }
 
 QString Settings::defaultLanguageFolderPath() const
Index: beebeep-code-r1557/src/desktop/GuiLanguage.cpp
===================================================================
--- beebeep-code-r1557.orig/src/desktop/GuiLanguage.cpp
+++ beebeep-code-r1557/src/desktop/GuiLanguage.cpp
@@ -137,7 +137,7 @@ void GuiLanguage::selectLanguage()
 
 void GuiLanguage::restoreDefault()
 {
-  m_folderSelected = ".";
+  m_folderSelected = "/usr/share/beebeep/languages";
   m_languageSelected = "";
   accept();
 }