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



commit 4e37121fc40ce2fa94cee5509bb65f89cc4f3823
Author: Sam Thursfield <sam afuera me uk>
Date:   Wed Jun 17 11:42:18 2020 +0200

    Use 'blocklist' instead of 'blacklist'
    
    The word 'blacklist' comes from the medieval term 'black book'. However,
    since 'black' is now used to describe people we should avoid additional
    negative associations with it. Use 'blocklist'.
    
    See also: 
https://www.zdnet.com/article/github-to-replace-master-with-alternative-term-to-avoid-slavery-references/

 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 4a3db49f0..76c45ba7f 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 blacklisted here</description>
+      <description>Avoid any directory containing a file blocklisted 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 4894ee02b..1567e81f2 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 *blacklisted[] = {
+       const gchar *blocklisted[] = {
                "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 (blacklisted); i++) {
+       for (i = 0; i < G_N_ELEMENTS (blocklisted); i++) {
                GstPlugin *plugin =
                        gst_registry_find_plugin (registry,
-                                                 blacklisted[i]);
+                                                 blocklisted[i]);
                if (plugin)
                        gst_registry_remove_plugin (registry, plugin);
        }


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