deduce plugin directory from a plugin that actually still exists

qgis · Apr 7, 2013 · 22cb38b · 22cb38b
1 parent 5e39bac
commit 22cb38b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/cmake/FindQGIS.cmake b/cmake/FindQGIS.cmake
@@ -15,7 +15,7 @@ IF(WIN32)
   #MESSAGE("Searching for QGIS in $ENV{PROGRAMFILES}/Quantum GIS")
   IF (MINGW)
     FIND_PATH(QGIS_PLUGIN_DIR
-      NAMES libnortharrowplugin.dll
+      NAMES libdelimitedtextplugin.dll
       PATHS
         "$ENV{PROGRAMFILES}/Quantum GIS/plugins"
     )
@@ -38,7 +38,7 @@ IF(WIN32)
 
   IF (MSVC)
     FIND_PATH(QGIS_PLUGIN_DIR
-      NAMES northarrowplugin.dll
+      NAMES delimitedtextplugin.dll
       PATHS
         "$ENV{OSGEO4W_ROOT}/apps/qgis/plugins"
         "$ENV{PROGRAMFILES}/Quantum GIS/plugins"
@@ -82,7 +82,7 @@ ELSE(WIN32)
     SET (QGIS_MAC_PATH /Applications/QGIS.app/Contents)
     #MESSAGE("Searching for QGIS in /usr/bin; /usr/local/bin")
     FIND_PATH(QGIS_PLUGIN_DIR
-      NAMES libnortharrowplugin.so
+      NAMES libdelimitedtextplugin.so
       PATHS
         /usr/lib64/qgis/plugins
         /usr/lib/qgis

diff --git a/python/plugins/sextante/grass/GrassUtils.py b/python/plugins/sextante/grass/GrassUtils.py
@@ -340,10 +340,10 @@ def checkGrassIsInstalled(ignoreRegistrySettings=False):
                 return ("The specified GRASS folder does not contain a valid set of GRASS modules.\n"
                         + "Please, go to the SEXTANTE settings dialog, and check that the GRASS\n"
                         + "folder is correctly configured")
-                            
+
         settings = QSettings()
         if not ignoreRegistrySettings:
-            GRASS_INSTALLED = "/SextanteQGIS/GrassInstalled"            
+            GRASS_INSTALLED = "/SextanteQGIS/GrassInstalled"
             if settings.contains(GRASS_INSTALLED):
                 return
 

diff --git a/python/plugins/sextante/saga/SagaUtils.py b/python/plugins/sextante/saga/SagaUtils.py
@@ -137,7 +137,7 @@ def checkSagaIsInstalled(ignoreRegistrySettings=False):
 
         settings = QSettings()
         if not ignoreRegistrySettings:
-            SAGA_INSTALLED = "/SextanteQGIS/SagaInstalled"            
+            SAGA_INSTALLED = "/SextanteQGIS/SagaInstalled"
             if settings.contains(SAGA_INSTALLED):
                 return