Search: Allow disabling of search helpers via gsettings.

Author: mtwebster

libnemo-private/nemo-global-preferences.h

@@ -262,6 +262,7 @@ typedef enum
 #define NEMO_PLUGIN_PREFERENCES_DISABLED_EXTENSIONS    "disabled-extensions"
 #define NEMO_PLUGIN_PREFERENCES_DISABLED_ACTIONS       "disabled-actions"
 #define NEMO_PLUGIN_PREFERENCES_DISABLED_SCRIPTS       "disabled-scripts"
+#define NEMO_PLUGIN_PREFERENCES_DISABLED_SEARCH_HELPERS "disabled-search-helpers"
 
 /* Connect-to server dialog last-used method */
 #define NEMO_PREFERENCES_LAST_SERVER_CONNECT_METHOD "last-server-connect-method"

libnemo-private/nemo-search-engine-advanced.c

@@ -44,10 +44,9 @@
 #define SNIPPET_EXTEND_SIZE 100
 
 typedef struct {
+    gchar *filename;
     gchar *def_path;
     gchar *exec_format;
-
-    gint priority;
     /* future? */
 } SearchHelper;
 
@@ -258,6 +257,7 @@ initialize_search_helpers (NemoSearchEngineAdvanced *engine)
         GDir *dir;
         const gchar *filename;
         const gchar *path;
+        gchar **disabled_helpers;
 
         path = (const gchar *) d_iter->data;
         DEBUG ("Checking location '%s' for search helpers", path);
@@ -271,19 +271,28 @@ initialize_search_helpers (NemoSearchEngineAdvanced *engine)
             continue;
         }
 
+        disabled_helpers = g_settings_get_strv (nemo_search_preferences,
+                                                NEMO_PLUGIN_PREFERENCES_DISABLED_SEARCH_HELPERS);
+
         while ((filename = g_dir_read_name (dir)) != NULL) {
             gchar *file_path;
 
             if (!g_str_has_suffix (filename, ".nemo_search_helper")) {
                 continue;
             }
 
+            if (g_strv_contains ((const gchar* const*) disabled_helpers, filename)) {
+                DEBUG ("Skipping disabled search helper: '%s'", filename);
+                continue;
+            }
+
             file_path = g_build_filename (path, filename, NULL);
             process_search_helper_file (file_path);
             g_free (file_path);
         }
 
         g_dir_close (dir);
+        g_strfreev (disabled_helpers);
     }
 
     g_list_free_full (dir_list, g_free);

libnemo-private/org.nemo.gschema.xml

@@ -885,5 +885,9 @@
       <default>false</default>
       <summary>Reverse the direction of the sort when viewing search results</summary>
     </key>
+    <key name="disabled-search-helpers" type="as">
+      <default>[]</default>
+      <summary>List of search helper filenames to skip when using content search.</summary>
+    </key>
   </schema>
 </schemalist>