[meld] actiongutter: Update for meldsettings change



commit 0c3930a348da1e38bcc9a268ce88edde3d21a563
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Fri Jul 5 11:07:24 2019 +1000

    actiongutter: Update for meldsettings change

 meld/actiongutter.py | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)
---
diff --git a/meld/actiongutter.py b/meld/actiongutter.py
index 3d7740d2..ec03f394 100644
--- a/meld/actiongutter.py
+++ b/meld/actiongutter.py
@@ -23,7 +23,7 @@ from gi.repository import Gtk
 
 from meld.conf import _
 from meld.const import ActionMode, ChunkAction
-from meld.settings import meldsettings
+from meld.settings import get_meld_settings
 from meld.style import get_common_theme
 from meld.ui.gtkcompat import get_style
 
@@ -166,7 +166,7 @@ class ActionGutter(Gtk.DrawingArea):
         self.pointer_chunk = None
         self.pressed_chunk = None
 
-    def on_setting_changed(self, meldsettings, key):
+    def on_setting_changed(self, settings, key):
         if key == 'style-scheme':
             self.fill_colors, self.line_colors = get_common_theme()
             alpha = self.fill_colors['current-chunk-highlight'].alpha
@@ -183,8 +183,11 @@ class ActionGutter(Gtk.DrawingArea):
             Gdk.EventMask.BUTTON_RELEASE_MASK
         )
         self.connect('notify::action-mode', lambda *args: self.queue_draw())
-        meldsettings.connect('changed', self.on_setting_changed)
-        self.on_setting_changed(meldsettings, 'style-scheme')
+
+        meld_settings = get_meld_settings()
+        meld_settings.connect('changed', self.on_setting_changed)
+        self.on_setting_changed(meld_settings, 'style-scheme')
+
         return Gtk.DrawingArea.do_realize(self)
 
     def do_motion_notify_event(self, event):


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