From 38dd7571eda0ae2f608d367fb150e6b1e6f921b2 Mon Sep 17 00:00:00 2001
From: Romain Vigier <romain@romainvigier.fr>
Date: Tue, 25 Feb 2020 21:13:33 +0100
Subject: [PATCH] Code refactoring

---
 src/modules/Nightlighter.js |  9 ++++++++-
 src/modules/Themer.js       | 12 ++++++++----
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/src/modules/Nightlighter.js b/src/modules/Nightlighter.js
index 23010b4..5682d70 100644
--- a/src/modules/Nightlighter.js
+++ b/src/modules/Nightlighter.js
@@ -145,7 +145,10 @@ var Nightlighter = class {
 
 	_listen_to_nightlight_changes() {
 		if ( !this.nightlight_changes_connect ) {
-			this.nightlight_changes_connect = this.dbus_proxy.connect('g-properties-changed', this.emit.bind(this));
+			this.nightlight_changes_connect = this.dbus_proxy.connect(
+				'g-properties-changed',
+				this._on_nightlight_change.bind(this)
+			);
 		}
 	}
 
@@ -156,4 +159,8 @@ var Nightlighter = class {
 		}
 	}
 
+	_on_nightlight_change() {
+		this.emit();
+	}
+
 }
diff --git a/src/modules/Themer.js b/src/modules/Themer.js
index f04f617..9e3a469 100644
--- a/src/modules/Themer.js
+++ b/src/modules/Themer.js
@@ -56,9 +56,15 @@ var Themer = class {
 		this.theme_change_callback = callback;
 	}
 
+	emit() {
+		if ( this.theme_change_callback ) {
+			this.theme_change_callback();
+		}
+	}
+
 	_listen_to_theme_changes() {
 		if ( !this.connect ) {
-			this.connect = this.gsettings.connect('changed::' + config.THEME_GSETTINGS_PROPERTY, this._on_theme_change);
+			this.connect = this.gsettings.connect('changed::' + config.THEME_GSETTINGS_PROPERTY, this._on_theme_change.bind(this));
 		}
 	}
 
@@ -70,9 +76,7 @@ var Themer = class {
 	}
 
 	_on_theme_change() {
-		if ( this.theme_change_callback ) {
-			this.theme_change_callback();
-		}
+		this.emit();
 	}
 
 }