[tracker-miners/sam/2.3-blocklist-revert] Revert "Use 'blocklist' instead of 'blacklist'"



commit 9faf823d75083b3e23bdecb347af87131fccf2e6
Author: Sam Thursfield <sam afuera me uk>
Date:   Wed Jun 24 20:15:04 2020 +0200

    Revert "Use 'blocklist' instead of 'blacklist'"
    
    This reverts commit 4e37121fc40ce2fa94cee5509bb65f89cc4f3823.
    
    I didn't realise that as 2.3 is stable and released, this
    is a string freeze break.

 data/org.freedesktop.Tracker.Miner.Files.gschema.xml | 2 +-
 src/tracker-extract/tracker-extract-gstreamer.c      | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/data/org.freedesktop.Tracker.Miner.Files.gschema.xml 
b/data/org.freedesktop.Tracker.Miner.Files.gschema.xml
index 76c45ba7f..4a3db49f0 100644
--- a/data/org.freedesktop.Tracker.Miner.Files.gschema.xml
+++ b/data/org.freedesktop.Tracker.Miner.Files.gschema.xml
@@ -155,7 +155,7 @@ Boston, MA  02110-1301, USA.
 
     <key name="ignored-directories-with-content" type="as">
       <summary>Ignored directories with content</summary>
-      <description>Avoid any directory containing a file blocklisted here</description>
+      <description>Avoid any directory containing a file blacklisted here</description>
       <default>[ '.trackerignore', '.git', '.hg', '.nomedia' ]</default>
     </key>
   </schema>
diff --git a/src/tracker-extract/tracker-extract-gstreamer.c b/src/tracker-extract/tracker-extract-gstreamer.c
index 1567e81f2..4894ee02b 100644
--- a/src/tracker-extract/tracker-extract-gstreamer.c
+++ b/src/tracker-extract/tracker-extract-gstreamer.c
@@ -1310,7 +1310,7 @@ G_MODULE_EXPORT gboolean
 tracker_extract_module_init (GError **error)
 {
        /* Lifted from totem-video-thumbnailer */
-       const gchar *blocklisted[] = {
+       const gchar *blacklisted[] = {
                "bcmdec",
                "vaapi",
                "video4linux2"
@@ -1321,10 +1321,10 @@ tracker_extract_module_init (GError **error)
        gst_init (NULL, NULL);
        registry = gst_registry_get ();
 
-       for (i = 0; i < G_N_ELEMENTS (blocklisted); i++) {
+       for (i = 0; i < G_N_ELEMENTS (blacklisted); i++) {
                GstPlugin *plugin =
                        gst_registry_find_plugin (registry,
-                                                 blocklisted[i]);
+                                                 blacklisted[i]);
                if (plugin)
                        gst_registry_remove_plugin (registry, plugin);
        }


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