[geary/bug/728002-webkit2: 36/140] Remove some reduncant method calls and related code.



commit a77a19c101a21d81b0263466482a7bfc1256d2f3
Author: Michael James Gratton <mike vee net>
Date:   Thu Dec 1 12:12:31 2016 +1100

    Remove some reduncant method calls and related code.

 .../conversation-viewer/conversation-message.vala  |   18 +-----------------
 .../conversation-viewer/conversation-web-view.vala |   12 ------------
 2 files changed, 1 insertions(+), 29 deletions(-)
---
diff --git a/src/client/conversation-viewer/conversation-message.vala 
b/src/client/conversation-viewer/conversation-message.vala
index 0b3e65f..fe9629f 100644
--- a/src/client/conversation-viewer/conversation-message.vala
+++ b/src/client/conversation-viewer/conversation-message.vala
@@ -452,23 +452,7 @@ public class ConversationMessage : Gtk.Grid {
         }
 
         load_cancelled.cancelled.connect(() => { web_view.stop_loading(); });
-        // XXX Hook up unset_controllable_quotes() to size_allocate
-        // and check if loaded since we need to accurately know
-        // what the sizes of the quote and its container is to
-        // determine if it should be unhidden. However this means that
-        // when the user expands a hidden quote, this handler gets
-        // executed again and since the expanded quote will meet the
-        // criteria for being unset as controllable, that will
-        // happen. That's actually okay for now though, because if the
-        // user could collapse the quote again the space wouldn't be
-        // reclaimed, which is worse than this.
-        this.web_view.size_allocate.connect(() => {
-                if (this.web_view.is_loaded) {
-                    this.web_view.unset_controllable_quotes();
-                }
-            });
-
-        this.web_view.clean_and_load(body_text ?? "");
+        this.web_view.load_html(body_text ?? "", null);
     }
 
     /**
diff --git a/src/client/conversation-viewer/conversation-web-view.vala 
b/src/client/conversation-viewer/conversation-web-view.vala
index 0a84c18..bc28fa4 100644
--- a/src/client/conversation-viewer/conversation-web-view.vala
+++ b/src/client/conversation-viewer/conversation-web-view.vala
@@ -34,11 +34,6 @@ public class ConversationWebView : ClientWebView {
         }
     }
 
-    public void clean_and_load(string html) {
-        // XXX clean me
-        load_html(html, null);
-    }
-
     /**
      * Returns the current selection, for prefill as find text.
      */
@@ -55,11 +50,4 @@ public class ConversationWebView : ClientWebView {
         return get_string_result(result);
     }
 
-    /**
-     * XXX
-     */
-    public void unset_controllable_quotes() {
-        // XXX
-    }
-
 }


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