[geary/wip/composer-folks: 16/22] Remove now unused ContactListStoreCache class



commit 7a14f54c79b92a2ae34f16aa9df63a500062f250
Author: Michael Gratton <mike vee net>
Date:   Thu Jun 13 16:54:13 2019 +1000

    Remove now unused ContactListStoreCache class

 po/POTFILES.in                                     |  1 -
 src/client/application/application-controller.vala | 20 +++++----------
 src/client/components/main-window.vala             |  1 -
 src/client/composer/composer-widget.vala           |  7 +++---
 src/client/composer/contact-list-store-cache.vala  | 29 ----------------------
 src/client/meson.build                             |  1 -
 6 files changed, 9 insertions(+), 50 deletions(-)
---
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 20ac4461..f117fa0d 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -51,7 +51,6 @@ src/client/composer/composer-widget.vala
 src/client/composer/composer-window.vala
 src/client/composer/contact-entry-completion.vala
 src/client/composer/contact-list-store.vala
-src/client/composer/contact-list-store-cache.vala
 src/client/composer/email-entry.vala
 src/client/composer/spell-check-popover.vala
 src/client/conversation-list/conversation-list-cell-renderer.vala
diff --git a/src/client/application/application-controller.vala 
b/src/client/application/application-controller.vala
index 205e3fec..d41a5c2e 100644
--- a/src/client/application/application-controller.vala
+++ b/src/client/application/application-controller.vala
@@ -133,11 +133,6 @@ public class Application.Controller : Geary.BaseObject {
         get; private set; default = new Application.AvatarStore();
     }
 
-    /** Contact store cache for the application. */
-    public ContactListStoreCache contact_list_store_cache {
-        get; private set; default = new ContactListStoreCache();
-    }
-
     /** Default main window */
     public MainWindow main_window { get; private set; }
 
@@ -622,12 +617,6 @@ public class Application.Controller : Geary.BaseObject {
         AccountContext? context = this.accounts.get(config);
         if (context != null) {
             Geary.Account account = context.account;
-            Geary.ContactStore contact_store = account.contact_store;
-            ContactListStore list_store =
-                this.contact_list_store_cache.get(contact_store);
-
-            this.contact_list_store_cache.unset(contact_store);
-
             if (this.current_account == account) {
                 this.current_account = null;
 
@@ -2021,10 +2010,13 @@ public class Application.Controller : Geary.BaseObject {
 
         ComposerWidget widget;
         if (mailto != null) {
-            widget = new ComposerWidget.from_mailto(current_account, contact_list_store_cache,
-                mailto, application.config);
+            widget = new ComposerWidget.from_mailto(
+                current_account, mailto, application.config
+            );
         } else {
-            widget = new ComposerWidget(current_account, contact_list_store_cache, compose_type, 
application.config);
+            widget = new ComposerWidget(
+                current_account, compose_type, application.config
+            );
         }
 
         add_composer(widget);
diff --git a/src/client/components/main-window.vala b/src/client/components/main-window.vala
index 3ba877e5..0db53889 100644
--- a/src/client/components/main-window.vala
+++ b/src/client/components/main-window.vala
@@ -132,7 +132,6 @@ public class MainWindow : Gtk.ApplicationWindow, Geary.BaseInterface {
         Application.Controller controller = this.application.controller;
         ComposerWidget composer = new ComposerWidget(
             this.current_folder.account,
-            controller.contact_list_store_cache,
             NEW_MESSAGE,
             this.application.config
         );
diff --git a/src/client/composer/composer-widget.vala b/src/client/composer/composer-widget.vala
index e329a2d2..838292ea 100644
--- a/src/client/composer/composer-widget.vala
+++ b/src/client/composer/composer-widget.vala
@@ -397,7 +397,6 @@ public class ComposerWidget : Gtk.EventBox, Geary.BaseInterface {
 
 
     public ComposerWidget(Geary.Account account,
-                          ContactListStoreCache contact_list_store_cache,
                           ComposeType compose_type,
                           Configuration config) {
         base_ref();
@@ -550,9 +549,9 @@ public class ComposerWidget : Gtk.EventBox, Geary.BaseInterface {
     }
 
     public ComposerWidget.from_mailto(Geary.Account account,
-        ContactListStoreCache contact_list_store_cache, string mailto, Configuration config) {
-
-        this(account, contact_list_store_cache, ComposeType.NEW_MESSAGE, config);
+                                      string mailto,
+                                      Configuration config) {
+        this(account, ComposeType.NEW_MESSAGE, config);
 
         Gee.HashMultiMap<string, string> headers = new Gee.HashMultiMap<string, string>();
         if (mailto.length > Geary.ComposedEmail.MAILTO_SCHEME.length) {
diff --git a/src/client/meson.build b/src/client/meson.build
index 37cbcc34..20802a23 100644
--- a/src/client/meson.build
+++ b/src/client/meson.build
@@ -48,7 +48,6 @@ geary_client_vala_sources = files(
   'composer/composer-window.vala',
   'composer/contact-entry-completion.vala',
   'composer/contact-list-store.vala',
-  'composer/contact-list-store-cache.vala',
   'composer/email-entry.vala',
   'composer/spell-check-popover.vala',
 


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