aboutsummaryrefslogtreecommitdiffstats
path: root/src/xsettings.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/xsettings.c')
-rw-r--r--src/xsettings.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/xsettings.c b/src/xsettings.c
index 45f8435d9f4..b5d5f4db59b 100644
--- a/src/xsettings.c
+++ b/src/xsettings.c
@@ -756,8 +756,7 @@ read_and_apply_settings (struct x_display_info *dpyinfo, int send_event_p)
756void 756void
757xft_settings_event (struct x_display_info *dpyinfo, XEvent *event) 757xft_settings_event (struct x_display_info *dpyinfo, XEvent *event)
758{ 758{
759 int check_window_p = 0; 759 bool check_window_p = 0, apply_settings_p = 0;
760 int apply_settings = 0;
761 760
762 switch (event->type) 761 switch (event->type)
763 { 762 {
@@ -777,7 +776,7 @@ xft_settings_event (struct x_display_info *dpyinfo, XEvent *event)
777 if (event->xproperty.window == dpyinfo->xsettings_window 776 if (event->xproperty.window == dpyinfo->xsettings_window
778 && event->xproperty.state == PropertyNewValue 777 && event->xproperty.state == PropertyNewValue
779 && event->xproperty.atom == dpyinfo->Xatom_xsettings_prop) 778 && event->xproperty.atom == dpyinfo->Xatom_xsettings_prop)
780 apply_settings = 1; 779 apply_settings_p = 1;
781 break; 780 break;
782 } 781 }
783 782
@@ -787,10 +786,10 @@ xft_settings_event (struct x_display_info *dpyinfo, XEvent *event)
787 dpyinfo->xsettings_window = None; 786 dpyinfo->xsettings_window = None;
788 get_prop_window (dpyinfo); 787 get_prop_window (dpyinfo);
789 if (dpyinfo->xsettings_window != None) 788 if (dpyinfo->xsettings_window != None)
790 apply_settings = 1; 789 apply_settings_p = 1;
791 } 790 }
792 791
793 if (apply_settings) 792 if (apply_settings_p)
794 read_and_apply_settings (dpyinfo, True); 793 read_and_apply_settings (dpyinfo, True);
795} 794}
796 795