Rename blacklist to filter-list.

4 files changed, 118 insertions, 118 deletions

diff --git a/data/org.ayatana.indicator.notifications.gschema.xml.in.in b/data/org.ayatana.indicator.notifications.gschema.xml.in.in
index 7c01fee..280cc2b 100644
--- a/data/org.ayatana.indicator.notifications.gschema.xml.in.in
+++ b/data/org.ayatana.indicator.notifications.gschema.xml.in.in
@@ -1,13 +1,13 @@
 <schemalist gettext-domain="@GETTEXT_PACKAGE@">
   <schema id="org.ayatana.indicator.notifications" path="/org/ayatana/indicator/notifications/">
-    <key name="blacklist" type="as">
+    <key name="filter-list" type="as">
       <default>[]</default>
       <_summary>Discard notifications by application name</_summary>
-      <_description>If an application name is in the blacklist, all notifications matching the application name will be discarded.</_description>
+      <_description>If an application name is in the filter list, all notifications matching the application name will be discarded.</_description>
     </key>
-    <key name="blacklist-hints" type="as">
+    <key name="filter-list-hints" type="as">
       <default>[]</default>
-      <summary>Recent application names to suggest for the blacklist</summary>
+      <summary>Recent application names to suggest for the filter list</summary>
       <description>Keeps track of recent application names so we can suggest them in the settings.</description>
     </key>
     <key name="clear-on-middle-click" type="b">
diff --git a/src/indicator-notifications-settings.c b/src/indicator-notifications-settings.c
index 46fd37b..510a0ec 100644
--- a/src/indicator-notifications-settings.c
+++ b/src/indicator-notifications-settings.c
@@ -21,8 +21,8 @@ typedef struct
 
   GSettings *settings;
 
-  GtkWidget *blacklist_treeview;
-  GtkWidget *blacklist_entry;
+  GtkWidget *filter_list_treeview;
+  GtkWidget *filter_list_entry;
 
   /* GtkTreeModel foreach variables */
   gboolean result;
@@ -43,31 +43,31 @@ static void indicator_notifications_settings_dispose(GObject *object);
 static void indicator_notifications_settings_activate(GApplication *app);
 
 /* Utility Functions */
-static void load_blacklist(IndicatorNotificationsSettings *self);
-static void load_blacklist_hints(IndicatorNotificationsSettings *self);
-static void save_blacklist(IndicatorNotificationsSettings *self);
+static void load_filter_list(IndicatorNotificationsSettings *self);
+static void load_filter_list_hints(IndicatorNotificationsSettings *self);
+static void save_filter_list(IndicatorNotificationsSettings *self);
 static gboolean foreach_check_duplicates(GtkTreeModel *model, GtkTreePath *path,
                                          GtkTreeIter *iter, gpointer user_data);
 static gboolean foreach_build_array(GtkTreeModel *model, GtkTreePath *path,
                                     GtkTreeIter *iter, gpointer user_data);
 
 /* Callbacks */
-static void blacklist_add_clicked_cb(GtkButton *button, gpointer user_data);
-static void blacklist_remove_clicked_cb(GtkButton *button, gpointer user_data);
+static void filter_list_add_clicked_cb(GtkButton *button, gpointer user_data);
+static void filter_list_remove_clicked_cb(GtkButton *button, gpointer user_data);
 static void button_toggled_cb(GtkToggleButton *button, gpointer user_data);
 static void max_items_changed_cb(GtkSpinButton *button, gpointer user_data);
-static gboolean blacklist_entry_focus_in_cb(GtkWidget *widget, GdkEvent *event, gpointer user_data);
+static gboolean filter_list_entry_focus_in_cb(GtkWidget *widget, GdkEvent *event, gpointer user_data);
 
 static void
-load_blacklist(IndicatorNotificationsSettings *self)
+load_filter_list(IndicatorNotificationsSettings *self)
 {
-  GtkListStore *list = GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(self->blacklist_treeview)));
+  GtkListStore *list = GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(self->filter_list_treeview)));
   GtkTreeIter iter;
   gchar **items;
 
   gtk_list_store_clear(list);
 
-  items = g_settings_get_strv(self->settings, NOTIFICATIONS_KEY_BLACKLIST);
+  items = g_settings_get_strv(self->settings, NOTIFICATIONS_KEY_FILTER_LIST);
 
   for (int i = 0; items[i] != NULL; i++) {
     gtk_list_store_append(list, &iter);
@@ -78,16 +78,16 @@ load_blacklist(IndicatorNotificationsSettings *self)
 }
 
 static void
-load_blacklist_hints(IndicatorNotificationsSettings *self)
+load_filter_list_hints(IndicatorNotificationsSettings *self)
 {
-  GtkEntryCompletion *completion = gtk_entry_get_completion(GTK_ENTRY(self->blacklist_entry));
+  GtkEntryCompletion *completion = gtk_entry_get_completion(GTK_ENTRY(self->filter_list_entry));
   GtkListStore *list = GTK_LIST_STORE(gtk_entry_completion_get_model(completion));
   GtkTreeIter iter;
   gchar **items;
 
   gtk_list_store_clear(list);
 
-  items = g_settings_get_strv(self->settings, NOTIFICATIONS_KEY_BLACKLIST_HINTS);
+  items = g_settings_get_strv(self->settings, NOTIFICATIONS_KEY_FILTER_LIST_HINTS);
 
   for (int i = 0; items[i] != NULL; i++) {
     gtk_list_store_append(list, &iter);
@@ -98,19 +98,19 @@ load_blacklist_hints(IndicatorNotificationsSettings *self)
 }
 
 static void
-save_blacklist(IndicatorNotificationsSettings *self)
+save_filter_list(IndicatorNotificationsSettings *self)
 {
-  GtkListStore *list = GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(self->blacklist_treeview)));
+  GtkListStore *list = GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(self->filter_list_treeview)));
   gchar **items;
 
-  /* build an array of the blacklist items */
+  /* build an array of the filter list items */
   self->array = g_ptr_array_new();
   gtk_tree_model_foreach(GTK_TREE_MODEL(list), foreach_build_array, self);
   g_ptr_array_add(self->array, NULL);
   items = (gchar **) g_ptr_array_free(self->array, FALSE);
   self->array = NULL;
 
-  g_settings_set_strv(self->settings, NOTIFICATIONS_KEY_BLACKLIST, (const gchar **) items);
+  g_settings_set_strv(self->settings, NOTIFICATIONS_KEY_FILTER_LIST, (const gchar **) items);
 
   g_strfreev(items);
 }
@@ -148,14 +148,14 @@ foreach_build_array(GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, g
 }
 
 static void
-blacklist_add_clicked_cb(GtkButton *button, gpointer user_data)
+filter_list_add_clicked_cb(GtkButton *button, gpointer user_data)
 {
   IndicatorNotificationsSettings *self = (IndicatorNotificationsSettings *) user_data;
-  GtkListStore *list = GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(self->blacklist_treeview)));
+  GtkListStore *list = GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(self->filter_list_treeview)));
   GtkTreeIter iter;
 
   /* strip off the leading and trailing whitespace in case of user error */
-  self->text = g_strdup(gtk_entry_get_text(GTK_ENTRY(self->blacklist_entry)));
+  self->text = g_strdup(gtk_entry_get_text(GTK_ENTRY(self->filter_list_entry)));
   g_strstrip(self->text);
 
   if (strlen(self->text) > 0) {
@@ -166,12 +166,12 @@ blacklist_add_clicked_cb(GtkButton *button, gpointer user_data)
     if (self->result == FALSE) {
       gtk_list_store_append(list, &iter);
       gtk_list_store_set(list, &iter, COLUMN_APPNAME, self->text, -1);
-      save_blacklist(self);
+      save_filter_list(self);
     }
   }
 
   /* clear the entry */
-  gtk_entry_set_text(GTK_ENTRY(self->blacklist_entry), "");
+  gtk_entry_set_text(GTK_ENTRY(self->filter_list_entry), "");
 
   /* cleanup text */
   g_free(self->text);
@@ -179,19 +179,19 @@ blacklist_add_clicked_cb(GtkButton *button, gpointer user_data)
 }
 
 static void
-blacklist_remove_clicked_cb(GtkButton *button, gpointer user_data)
+filter_list_remove_clicked_cb(GtkButton *button, gpointer user_data)
 {
   IndicatorNotificationsSettings *self = (IndicatorNotificationsSettings *) user_data;
-  GtkListStore *list = GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(self->blacklist_treeview)));
+  GtkListStore *list = GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(self->filter_list_treeview)));
   GtkTreeIter iter;
   GtkTreeSelection *selection;
 
-  selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(self->blacklist_treeview));
+  selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(self->filter_list_treeview));
 
   if (gtk_tree_selection_get_selected(selection, NULL, &iter) == TRUE) {
     gtk_list_store_remove(list, &iter);
 
-    save_blacklist(self);
+    save_filter_list(self);
   }
 }
 
@@ -214,10 +214,10 @@ max_items_changed_cb(GtkSpinButton *button, gpointer user_data)
 }
 
 static gboolean
-blacklist_entry_focus_in_cb(GtkWidget *widget, GdkEvent *event, gpointer user_data)
+filter_list_entry_focus_in_cb(GtkWidget *widget, GdkEvent *event, gpointer user_data)
 {
   IndicatorNotificationsSettings *self = (IndicatorNotificationsSettings *) user_data;
-  load_blacklist_hints(self);
+  load_filter_list_hints(self);
   g_signal_emit_by_name(widget, "changed", NULL);
   return FALSE;
 }
@@ -234,14 +234,14 @@ indicator_notifications_settings_activate(GApplication *app)
   GtkWidget *button_swap_clr_s;
   GtkWidget *spin;
   GtkWidget *spin_label;
-  GtkWidget *blacklist_label;
-  GtkListStore *blacklist_list;
-  GtkWidget *blacklist_scroll;
+  GtkWidget *filter_list_label;
+  GtkListStore *filter_list_list;
+  GtkWidget *filter_list_scroll;
   GtkTreeViewColumn *column;
   GtkCellRenderer *renderer;
   GtkWidget *hbox;
-  GtkWidget *button_blacklist_rem;
-  GtkWidget *button_blacklist_add;
+  GtkWidget *button_filter_list_rem;
+  GtkWidget *button_filter_list_add;
   GtkEntryCompletion *entry_completion;
   GtkListStore *entry_list;
 
@@ -323,55 +323,55 @@ indicator_notifications_settings_activate(GApplication *app)
   gtk_box_pack_start(GTK_BOX(vbox), spin, FALSE, FALSE, 4);
   gtk_widget_show(spin);
 
-  /* blacklist */
-  blacklist_label = gtk_label_new(_("Discard notifications by application name"));
-  gtk_box_pack_start(GTK_BOX(vbox), blacklist_label, FALSE, FALSE, 4);
-  gtk_widget_show(blacklist_label);
+  /* filter-list */
+  filter_list_label = gtk_label_new(_("Discard notifications by application name"));
+  gtk_box_pack_start(GTK_BOX(vbox), filter_list_label, FALSE, FALSE, 4);
+  gtk_widget_show(filter_list_label);
 
-  blacklist_scroll = gtk_scrolled_window_new(NULL, NULL);
-  gtk_box_pack_start(GTK_BOX(vbox), blacklist_scroll, TRUE, TRUE, 4);
-  gtk_widget_show(blacklist_scroll);
+  filter_list_scroll = gtk_scrolled_window_new(NULL, NULL);
+  gtk_box_pack_start(GTK_BOX(vbox), filter_list_scroll, TRUE, TRUE, 4);
+  gtk_widget_show(filter_list_scroll);
 
-  blacklist_list = gtk_list_store_new(1, G_TYPE_STRING);
+  filter_list_list = gtk_list_store_new(1, G_TYPE_STRING);
 
   renderer = gtk_cell_renderer_text_new();
   column = gtk_tree_view_column_new_with_attributes("appname", renderer, "text", COLUMN_APPNAME, NULL);
 
-  self->blacklist_treeview = gtk_tree_view_new_with_model(GTK_TREE_MODEL(blacklist_list));
-  g_object_unref(blacklist_list);
-  gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(self->blacklist_treeview), FALSE);
-  gtk_tree_view_append_column(GTK_TREE_VIEW(self->blacklist_treeview), column);
-  load_blacklist(self);
-  gtk_container_add(GTK_CONTAINER(blacklist_scroll), self->blacklist_treeview);
-  gtk_widget_show(self->blacklist_treeview);
+  self->filter_list_treeview = gtk_tree_view_new_with_model(GTK_TREE_MODEL(filter_list_list));
+  g_object_unref(filter_list_list);
+  gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(self->filter_list_treeview), FALSE);
+  gtk_tree_view_append_column(GTK_TREE_VIEW(self->filter_list_treeview), column);
+  load_filter_list(self);
+  gtk_container_add(GTK_CONTAINER(filter_list_scroll), self->filter_list_treeview);
+  gtk_widget_show(self->filter_list_treeview);
 
   hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
   gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
   gtk_widget_show(hbox);
 
-  button_blacklist_rem = gtk_button_new_with_label(_("Remove"));
-  g_signal_connect(button_blacklist_rem, "clicked", G_CALLBACK(blacklist_remove_clicked_cb), self);
-  gtk_box_pack_start(GTK_BOX(hbox), button_blacklist_rem, FALSE, FALSE, 2);
-  gtk_widget_show(button_blacklist_rem);
+  button_filter_list_rem = gtk_button_new_with_label(_("Remove"));
+  g_signal_connect(button_filter_list_rem, "clicked", G_CALLBACK(filter_list_remove_clicked_cb), self);
+  gtk_box_pack_start(GTK_BOX(hbox), button_filter_list_rem, FALSE, FALSE, 2);
+  gtk_widget_show(button_filter_list_rem);
 
-  button_blacklist_add = gtk_button_new_with_label(_("Add"));
-  g_signal_connect(button_blacklist_add, "clicked", G_CALLBACK(blacklist_add_clicked_cb), self);
-  gtk_box_pack_start(GTK_BOX(hbox), button_blacklist_add, FALSE, FALSE, 2);
-  gtk_widget_show(button_blacklist_add);
+  button_filter_list_add = gtk_button_new_with_label(_("Add"));
+  g_signal_connect(button_filter_list_add, "clicked", G_CALLBACK(filter_list_add_clicked_cb), self);
+  gtk_box_pack_start(GTK_BOX(hbox), button_filter_list_add, FALSE, FALSE, 2);
+  gtk_widget_show(button_filter_list_add);
 
-  self->blacklist_entry = gtk_entry_new();
-  gtk_box_pack_start(GTK_BOX(hbox), self->blacklist_entry, TRUE, TRUE, 0);
-  gtk_widget_show(self->blacklist_entry);
+  self->filter_list_entry = gtk_entry_new();
+  gtk_box_pack_start(GTK_BOX(hbox), self->filter_list_entry, TRUE, TRUE, 0);
+  gtk_widget_show(self->filter_list_entry);
 
   entry_completion = gtk_entry_completion_new();
   entry_list = gtk_list_store_new(1, G_TYPE_STRING);
   gtk_entry_completion_set_model(entry_completion, GTK_TREE_MODEL(entry_list));
   gtk_entry_completion_set_text_column(entry_completion, 0);
   gtk_entry_completion_set_minimum_key_length(entry_completion, 0);
-  gtk_entry_set_completion(GTK_ENTRY(self->blacklist_entry), entry_completion);
+  gtk_entry_set_completion(GTK_ENTRY(self->filter_list_entry), entry_completion);
   /* When we focus the entry, emit the changed signal so we get the hints immediately */
-  /* also update the blacklist hints from gsettings */
-  g_signal_connect(self->blacklist_entry, "focus-in-event", G_CALLBACK(blacklist_entry_focus_in_cb), self);
+  /* also update the filter list hints from gsettings */
+  g_signal_connect(self->filter_list_entry, "focus-in-event", G_CALLBACK(filter_list_entry_focus_in_cb), self);
 }
 
 static void
diff --git a/src/indicator-notifications.c b/src/indicator-notifications.c
index 67dcb96..e5f2951 100644
--- a/src/indicator-notifications.c
+++ b/src/indicator-notifications.c
@@ -77,9 +77,9 @@ struct _IndicatorNotificationsPrivate {
 
   DBusSpy     *spy;
 
-  GHashTable  *blacklist;
+  GHashTable  *filter_list;
 
-  GList       *blacklist_hints;
+  GList       *filter_list_hints;
 
   GSettings   *settings;
 };
@@ -117,12 +117,12 @@ static void insert_menuitem(IndicatorNotifications *self, GtkWidget *item);
 static void remove_menuitem(IndicatorNotifications *self, GtkWidget *item);
 static void set_unread(IndicatorNotifications *self, gboolean unread);
 static void update_unread(IndicatorNotifications *self);
-static void update_blacklist(IndicatorNotifications *self);
+static void update_filter_list(IndicatorNotifications *self);
 static void update_clear_item_markup(IndicatorNotifications *self);
 static void update_indicator_visibility(IndicatorNotifications *self);
-static void load_blacklist_hints(IndicatorNotifications *self);
-static void save_blacklist_hints(IndicatorNotifications *self);
-static void update_blacklist_hints(IndicatorNotifications *self, Notification *notification);
+static void load_filter_list_hints(IndicatorNotifications *self);
+static void save_filter_list_hints(IndicatorNotifications *self);
+static void update_filter_list_hints(IndicatorNotifications *self, Notification *notification);
 static void update_do_not_disturb(IndicatorNotifications *self);
 static void settings_try_set_boolean(const gchar *schema, const gchar *key, gboolean value);
 static void swap_clear_settings_items(IndicatorNotifications *self);
@@ -208,8 +208,8 @@ indicator_notifications_init(IndicatorNotifications *self)
   self->priv->spy = dbus_spy_new();
   g_signal_connect(self->priv->spy, DBUS_SPY_SIGNAL_MESSAGE_RECEIVED, G_CALLBACK(message_received_cb), self);
 
-  /* Initialize an empty blacklist */
-  self->priv->blacklist = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, NULL);
+  /* Initialize an empty filter list */
+  self->priv->filter_list = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, NULL);
 
   /* Connect to GSettings */
   self->priv->settings = g_settings_new(NOTIFICATIONS_SCHEMA);
@@ -217,15 +217,15 @@ indicator_notifications_init(IndicatorNotifications *self)
   self->priv->do_not_disturb = g_settings_get_boolean(self->priv->settings, NOTIFICATIONS_KEY_DND);
   self->priv->hide_indicator = g_settings_get_boolean(self->priv->settings, NOTIFICATIONS_KEY_HIDE_INDICATOR);
   self->priv->max_items = g_settings_get_int(self->priv->settings, NOTIFICATIONS_KEY_MAX_ITEMS);
-  update_blacklist(self);
+  update_filter_list(self);
   self->priv->swap_clear_settings = g_settings_get_boolean(self->priv->settings, NOTIFICATIONS_KEY_SWAP_CLEAR_SETTINGS);
   if(self->priv->swap_clear_settings)
     swap_clear_settings_items(self);
   g_signal_connect(self->priv->settings, "changed", G_CALLBACK(setting_changed_cb), self);
 
-  /* Set up blacklist hints */
-  self->priv->blacklist_hints = NULL;
-  load_blacklist_hints(self);
+  /* Set up filter-list hints */
+  self->priv->filter_list_hints = NULL;
+  load_filter_list_hints(self);
 }
 
 static void
@@ -263,14 +263,14 @@ indicator_notifications_dispose(GObject *object)
     self->priv->settings = NULL;
   }
 
-  if(self->priv->blacklist != NULL) {
-    g_hash_table_unref(self->priv->blacklist);
-    self->priv->blacklist = NULL;
+  if(self->priv->filter_list != NULL) {
+    g_hash_table_unref(self->priv->filter_list);
+    self->priv->filter_list = NULL;
   }
 
-  if(self->priv->blacklist_hints != NULL) {
-    g_list_free_full(self->priv->blacklist_hints, g_free);
-    self->priv->blacklist_hints = NULL;
+  if(self->priv->filter_list_hints != NULL) {
+    g_list_free_full(self->priv->filter_list_hints, g_free);
+    self->priv->filter_list_hints = NULL;
   }
 
   G_OBJECT_CLASS (indicator_notifications_parent_class)->dispose (object);
@@ -480,24 +480,24 @@ update_unread(IndicatorNotifications *self)
 }
 
 /**
- * update_blacklist:
+ * update_filter_list:
  * @self: the indicator object
  *
- * Updates the blacklist from GSettings. This currently does not filter already
+ * Updates the filter list from GSettings. This currently does not filter already
  * allowed messages. It only applies to messages received in the future.
  **/
 static void
-update_blacklist(IndicatorNotifications *self)
+update_filter_list(IndicatorNotifications *self)
 {
   g_return_if_fail(IS_INDICATOR_NOTIFICATIONS(self));
-  g_return_if_fail(self->priv->blacklist != NULL);
+  g_return_if_fail(self->priv->filter_list != NULL);
 
-  g_hash_table_remove_all(self->priv->blacklist);
-  gchar **items = g_settings_get_strv(self->priv->settings, NOTIFICATIONS_KEY_BLACKLIST);
+  g_hash_table_remove_all(self->priv->filter_list);
+  gchar **items = g_settings_get_strv(self->priv->settings, NOTIFICATIONS_KEY_FILTER_LIST);
   int i;
 
   for(i = 0; items[i] != NULL; i++) {
-    g_hash_table_insert(self->priv->blacklist, g_strdup(items[i]), NULL);
+    g_hash_table_insert(self->priv->filter_list, g_strdup(items[i]), NULL);
   }
 
   g_strfreev(items);
@@ -553,35 +553,35 @@ update_indicator_visibility(IndicatorNotifications *self)
 }
 
 /**
- * load_blacklist_hints:
+ * load_filter_list_hints:
  * @self: the indicator object
  *
- * Loads the blacklist hints from gsettings
+ * Loads the filter list hints from gsettings
  **/
 static void
-load_blacklist_hints(IndicatorNotifications *self)
+load_filter_list_hints(IndicatorNotifications *self)
 {
   g_return_if_fail(IS_INDICATOR_NOTIFICATIONS(self));
-  g_return_if_fail(self->priv->blacklist_hints == NULL);
+  g_return_if_fail(self->priv->filter_list_hints == NULL);
 
-  gchar **items = g_settings_get_strv(self->priv->settings, NOTIFICATIONS_KEY_BLACKLIST_HINTS);
+  gchar **items = g_settings_get_strv(self->priv->settings, NOTIFICATIONS_KEY_FILTER_LIST_HINTS);
   int i;
 
   for (i = 0; items[i] != NULL; i++) {
-    self->priv->blacklist_hints = g_list_prepend(self->priv->blacklist_hints, items[i]);
+    self->priv->filter_list_hints = g_list_prepend(self->priv->filter_list_hints, items[i]);
   }
 
   g_free(items);
 }
 
 /**
- * save_blacklist_hints:
+ * save_filter_list_hints:
  * @self: the indicator object
  *
- * Saves the blacklist hints to gsettings
+ * Saves the filter list hints to gsettings
  **/
 static void
-save_blacklist_hints(IndicatorNotifications *self)
+save_filter_list_hints(IndicatorNotifications *self)
 {
   g_return_if_fail(IS_INDICATOR_NOTIFICATIONS(self));
 
@@ -589,23 +589,23 @@ save_blacklist_hints(IndicatorNotifications *self)
   int i = 0;
 
   GList *l;
-  for (l = self->priv->blacklist_hints; (l != NULL) && (i < HINT_MAX); l = l->next, i++) {
+  for (l = self->priv->filter_list_hints; (l != NULL) && (i < HINT_MAX); l = l->next, i++) {
     hints[i] = (gchar *) l->data;
   }
 
   hints[i] = NULL;
 
-  g_settings_set_strv(self->priv->settings, NOTIFICATIONS_KEY_BLACKLIST_HINTS, (const gchar **) hints);
+  g_settings_set_strv(self->priv->settings, NOTIFICATIONS_KEY_FILTER_LIST_HINTS, (const gchar **) hints);
 }
 
 /**
- * update_blacklist_hints:
+ * update_filter_list_hints:
  * @self: the indicator object
  *
  * Adds an application name to the hints
  **/
 static void
-update_blacklist_hints(IndicatorNotifications *self, Notification *notification)
+update_filter_list_hints(IndicatorNotifications *self, Notification *notification)
 {
   g_return_if_fail(IS_INDICATOR_NOTIFICATIONS(self));
   g_return_if_fail(IS_NOTIFICATION(notification));
@@ -614,24 +614,24 @@ update_blacklist_hints(IndicatorNotifications *self, Notification *notification)
 
   /* Avoid duplicates */
   GList *l;
-  for (l = self->priv->blacklist_hints; l != NULL; l = l->next) {
+  for (l = self->priv->filter_list_hints; l != NULL; l = l->next) {
     if (g_strcmp0(appname, (const gchar *) l->data) == 0)
       return;
   }
 
   /* Add the appname */
-  self->priv->blacklist_hints = g_list_prepend(self->priv->blacklist_hints, g_strdup(appname));
+  self->priv->filter_list_hints = g_list_prepend(self->priv->filter_list_hints, g_strdup(appname));
 
   /* Keep only a reasonable number */
-  while (g_list_length(self->priv->blacklist_hints) > HINT_MAX) {
-    GList *last = g_list_last(self->priv->blacklist_hints);
+  while (g_list_length(self->priv->filter_list_hints) > HINT_MAX) {
+    GList *last = g_list_last(self->priv->filter_list_hints);
     g_free(last->data);
-    self->priv->blacklist_hints = g_list_delete_link(self->priv->blacklist_hints, last);
+    self->priv->filter_list_hints = g_list_delete_link(self->priv->filter_list_hints, last);
   }
 
   /* Save the hints */
   /* FIXME: maybe don't do this every update */
-  save_blacklist_hints(self);
+  save_filter_list_hints(self);
 }
 
 /**
@@ -786,8 +786,8 @@ setting_changed_cb(GSettings *settings, gchar *key, gpointer user_data)
   else if(g_strcmp0(key, NOTIFICATIONS_KEY_CLEAR_MC) == 0) {
     self->priv->clear_on_middle_click = g_settings_get_boolean(self->priv->settings, NOTIFICATIONS_KEY_CLEAR_MC);
   }
-  else if(g_strcmp0(key, NOTIFICATIONS_KEY_BLACKLIST) == 0) {
-    update_blacklist(self);
+  else if(g_strcmp0(key, NOTIFICATIONS_KEY_FILTER_LIST) == 0) {
+    update_filter_list(self);
   }
   else if(g_strcmp0(key, NOTIFICATIONS_KEY_SWAP_CLEAR_SETTINGS) == 0) {
     self->priv->swap_clear_settings = g_settings_get_boolean(self->priv->settings, NOTIFICATIONS_KEY_SWAP_CLEAR_SETTINGS);
@@ -847,15 +847,15 @@ message_received_cb(DBusSpy *spy, Notification *note, gpointer user_data)
     return;
   }
 
-  /* Discard notifications on the blacklist */
-  if(self->priv->blacklist != NULL && g_hash_table_contains(self->priv->blacklist,
+  /* Discard notifications on the filter list */
+  if(self->priv->filter_list != NULL && g_hash_table_contains(self->priv->filter_list,
         notification_get_app_name(note))) {
     g_object_unref(note);
     return;
   }
 
   /* Save a hint for the appname */
-  update_blacklist_hints(self, note);
+  update_filter_list_hints(self, note);
 
   /* Create the menuitem */
   GtkWidget *item = notification_menuitem_new();
diff --git a/src/settings.h b/src/settings.h
index 4eb0030..43f0383 100644
--- a/src/settings.h
+++ b/src/settings.h
@@ -6,8 +6,8 @@
 #define __SETTINGS_H__
 
 #define NOTIFICATIONS_SCHEMA                  "org.ayatana.indicator.notifications"
-#define NOTIFICATIONS_KEY_BLACKLIST           "blacklist"
-#define NOTIFICATIONS_KEY_BLACKLIST_HINTS     "blacklist-hints"
+#define NOTIFICATIONS_KEY_BLACKLIST           "filter-list"
+#define NOTIFICATIONS_KEY_BLACKLIST_HINTS     "filter-list-hints"
 #define NOTIFICATIONS_KEY_CLEAR_MC            "clear-on-middle-click"
 #define NOTIFICATIONS_KEY_DND                 "do-not-disturb"
 #define NOTIFICATIONS_KEY_HIDE_INDICATOR      "hide-indicator"