Merge pull request #415 from bobufa/message-search

Message search

1 files changed, 5 insertions, 16 deletions

diff --git a/libdino/src/plugin/registry.vala b/libdino/src/plugin/registry.vala
index 7b4410aa..2b496288 100644
--- a/libdino/src/plugin/registry.vala
+++ b/libdino/src/plugin/registry.vala
@@ -7,8 +7,7 @@ public class Registry {
     internal ArrayList<AccountSettingsEntry> account_settings_entries = new ArrayList<AccountSettingsEntry>();
     internal ArrayList<ContactDetailsProvider> contact_details_entries = new ArrayList<ContactDetailsProvider>();
     internal Map<string, TextCommand> text_commands = new HashMap<string, TextCommand>();
-    internal Gee.List<MessageDisplayProvider> message_displays = new ArrayList<MessageDisplayProvider>();
-    internal Gee.List<ConversationItemPopulator> conversation_item_populators = new ArrayList<ConversationItemPopulator>();
+    internal Gee.List<ConversationAdditionPopulator> conversation_addition_populators = new ArrayList<ConversationAdditionPopulator>();
     internal Gee.Collection<ConversationTitlebarEntry> conversation_titlebar_entries = new Gee.TreeSet<ConversationTitlebarEntry>((a, b) => {
         if (a.order < b.order) {
             return -1;
@@ -70,22 +69,12 @@ public class Registry {
         }
     }
 
-    public bool register_message_display(MessageDisplayProvider provider) {
-        lock (message_displays) {
-            foreach(MessageDisplayProvider p in message_displays) {
-                if (p.id == provider.id) return false;
-            }
-            message_displays.add(provider);
-            return true;
-        }
-    }
-
-    public bool register_conversation_item_populator(ConversationItemPopulator populator) {
-        lock (conversation_item_populators) {
-            foreach(ConversationItemPopulator p in conversation_item_populators) {
+    public bool register_conversation_addition_populator(ConversationAdditionPopulator populator) {
+        lock (conversation_addition_populators) {
+            foreach(ConversationItemPopulator p in conversation_addition_populators) {
                 if (p.id == populator.id) return false;
             }
-            conversation_item_populators.add(populator);
+            conversation_addition_populators.add(populator);
             return true;
         }
     }