From f4636621631f68a3d7d40b28fe23dd2814316939 Mon Sep 17 00:00:00 2001
From: John Foerch <jjfoerch@earthlink.net>
Date: Tue, 13 Oct 2009 15:05:30 -0400
Subject: [PATCH] rename buffer.destructor to buffer.destroy

..to be consistent with convention elsewhere in conkeror
---
 modules/buffer.js         | 6 +++---
 modules/content-buffer.js | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/modules/buffer.js b/modules/buffer.js
index 908b7dd..02bb223 100644
--- a/modules/buffer.js
+++ b/modules/buffer.js
@@ -164,7 +164,7 @@ buffer.prototype = {
         }
     },
 
-    destructor: function () {},
+    destroy: function () {},
 
     /* Browser accessors */
     get top_frame () { return this.browser.contentWindow; },
@@ -379,11 +379,11 @@ buffer_container.prototype = {
         }
         this._switch_away_from(this.current);
         // The removeChild call below may trigger events in progress
-        // listeners.  This call to `destructor' gives buffer subclasses a
+        // listeners.  This call to `destroy' gives buffer subclasses a
         // chance to remove such listeners, so that they cannot try to
         // perform UI actions based upon a xul:browser that no longer
         // exists.
-        b.destructor();
+        b.destroy();
         this.container.removeChild(b.element);
         this.buffer_list.splice(this.buffer_list.indexOf(b), 1);
         this._switch_to(new_buffer);
diff --git a/modules/content-buffer.js b/modules/content-buffer.js
index 265146c..fcec445 100644
--- a/modules/content-buffer.js
+++ b/modules/content-buffer.js
@@ -127,9 +127,9 @@ function content_buffer (window, element) {
 content_buffer.prototype = {
     constructor : content_buffer,
 
-    destructor: function () {
+    destroy: function () {
         this.browser.removeProgressListener(this);
-        buffer.prototype.destructor.call(this);
+        buffer.prototype.destroy.call(this);
     },
 
     get scrollX () { return this.top_frame.scrollX; },
-- 
2.11.4.GIT