[Xfce4-commits] [xfce/xfce4-settings] 01/01: display: Disable auto-enabling profiles by default

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

o   c   h   o   s   i       p   u   s   h   e   d       a       c   o   m   m   i   t       t   o       b   r   a   n   c   h       m   a   s   t   e   r   
   in repository xfce/xfce4-settings.

commit 1f94a8b0890d2c3228e5c70b24c5cc9979ebb9d5
Author: Simon Steinbeiss <simon.steinbeiss at elfenbeinturm.at>
Date:   Sun May 26 22:55:26 2019 +0200

    display: Disable auto-enabling profiles by default
    
    As this setting is uninitialized and depends on the Notify property and
    is thus disabled in the settings UI we should also treat is as disabled
    by default in the backend.
    This should also mitigate Bug #15437, especially for users upgrading
    from Xfce 4.12. (The actual resolution of this bug is still a todo.)
---
 xfsettingsd/displays.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/xfsettingsd/displays.c b/xfsettingsd/displays.c
index ffbfced..ac990fe 100644
--- a/xfsettingsd/displays.c
+++ b/xfsettingsd/displays.c
@@ -293,7 +293,8 @@ xfce_displays_helper_init (XfceDisplaysHelper *helper)
 #endif
 
             /*  check if we can auto-enable a profile */
-            if (xfconf_channel_get_bool (helper->channel, AUTO_ENABLE_PROFILES, TRUE))
+            if (xfconf_channel_get_bool (helper->channel, AUTO_ENABLE_PROFILES, FALSE) &&
+                xfconf_channel_get_bool (helper->channel, NOTIFY_PROP, FALSE))
             {
                 gchar *matching_profile = NULL;
 
@@ -507,7 +508,8 @@ xfce_displays_helper_screen_on_event (GdkXEvent *xevent,
         if (old_outputs->len > helper->outputs->len ||
             old_outputs->len < helper->outputs->len)
         {
-            if (xfconf_channel_get_bool (helper->channel, AUTO_ENABLE_PROFILES, TRUE))
+            if (xfconf_channel_get_bool (helper->channel, AUTO_ENABLE_PROFILES, FALSE) &&
+                xfconf_channel_get_bool (helper->channel, NOTIFY_PROP, FALSE))
             {
                 gchar *matching_profile = NULL;
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.