From 2664d8c98cc4eacfa30803a32abb2d476aa5aa57 Mon Sep 17 00:00:00 2001 From: Alistair Buxton Date: Mon, 21 Mar 2016 21:49:04 +0000 Subject: [PATCH 1/3] Revert "Prevent a weird cycle in GSettings use" This reverts commit f07cc75f2aa77d14f16b5506321ac6a2413706ba. --- mousepad/mousepad-view.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/mousepad/mousepad-view.c b/mousepad/mousepad-view.c index 03f4609..bd0e37c 100644 --- a/mousepad/mousepad-view.c +++ b/mousepad/mousepad-view.c @@ -324,16 +324,10 @@ mousepad_view_init (MousepadView *view) BIND_ (SHOW_RIGHT_MARGIN, "show-right-margin"); BIND_ (SMART_HOME_END, "smart-home-end"); BIND_ (TAB_WIDTH, "tab-width"); + BIND_ (COLOR_SCHEME, "color-scheme"); BIND_ (WORD_WRAP, "word-wrap"); BIND_ (MATCH_BRACES, "match-braces"); - /* for color-scheme, use G_SETTINGS_BIND_GET_NO_CHANGES to stop - * a cycle that was causing DBus thrashing. See: - * https://bugzilla.xfce.org/show_bug.cgi?id=12134 */ - MOUSEPAD_SETTING_BIND (COLOR_SCHEME, view, "color-scheme", - G_SETTINGS_BIND_DEFAULT | - G_SETTINGS_BIND_GET_NO_CHANGES); - /* override with default font when the setting is enabled */ MOUSEPAD_SETTING_CONNECT_OBJECT (USE_DEFAULT_FONT, G_CALLBACK (mousepad_view_use_default_font_setting_changed), -- 2.5.0