[rygel/wip/tracker-3.0: 17/33] core: Drop libtool support from plugin loader



commit 70de8a9e7b4ff09429dd83c50a9d9b8e82614b19
Author: Jens Georg <mail jensge org>
Date:   Sun Apr 19 12:17:34 2020 +0200

    core: Drop libtool support from plugin loader

 src/librygel-core/rygel-plugin-information.vala      | 11 ++---------
 src/librygel-core/rygel-recursive-module-loader.vala |  5 ++---
 2 files changed, 4 insertions(+), 12 deletions(-)
---
diff --git a/src/librygel-core/rygel-plugin-information.vala b/src/librygel-core/rygel-plugin-information.vala
index 787f08a8..8a52a45a 100644
--- a/src/librygel-core/rygel-plugin-information.vala
+++ b/src/librygel-core/rygel-plugin-information.vala
@@ -68,15 +68,8 @@ public class Rygel.PluginInformation : Object {
                                                 Module.SUFFIX));
 
         if (!module_file.query_exists ()) {
-            // try .libs for uninstalled
-            module_file = module_dir.get_child (".libs%clibrygel-%s.%s".printf (
-                                                Path.DIR_SEPARATOR,
-                                                module,
-                                                Module.SUFFIX));
-            if (!module_file.query_exists ()) {
-                throw new FileError.EXIST (_("Plugin module %s does not exist"),
-                                           module_file.get_path ());
-            }
+            throw new FileError.EXIST (_("Plugin module %s does not exist"),
+                                       module_file.get_path ());
         }
 
         return new PluginInformation (module_file.get_path (), name);
diff --git a/src/librygel-core/rygel-recursive-module-loader.vala 
b/src/librygel-core/rygel-recursive-module-loader.vala
index cb9939df..009eadaf 100644
--- a/src/librygel-core/rygel-recursive-module-loader.vala
+++ b/src/librygel-core/rygel-recursive-module-loader.vala
@@ -198,9 +198,8 @@ public abstract class Rygel.RecursiveModuleLoader : Object {
     }
 
     private bool is_folder_eligible (FileInfo file_info) {
-        return file_info.get_file_type () == FileType.DIRECTORY &&
-               (file_info.get_name () == ".libs" ||
-                !file_info.get_is_hidden ());
+        return (file_info.get_file_type () == FileType.DIRECTORY) &&
+                (!file_info.get_is_hidden ());
     }
 
     /**


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]