[Xfce4-commits] <xfce4-settings:master> remove any leftover apply property at startup

[Nick Schermer]

Updating branch refs/heads/master
         to dc512719bd9e981e9c40358ce73967daaf026ea2 (commit)
       from 0349a0c71135a4980fa149a86c8e48b1564f48be (commit)

commit dc512719bd9e981e9c40358ce73967daaf026ea2
Author: Lionel Le Folgoc <mrpouit at gmail.com>
Date:   Sun Jun 13 16:44:36 2010 +0200

    remove any leftover apply property at startup
    
    If such a property already exists, xfce4-settings-helper will never be notified
    when xfce4-display-settings makes a config change. So let xfce4-settings-helper
    reset it at startup.

 xfce4-settings-helper/displays.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/xfce4-settings-helper/displays.c b/xfce4-settings-helper/displays.c
index b4d9090..4b4fbef 100644
--- a/xfce4-settings-helper/displays.c
+++ b/xfce4-settings-helper/displays.c
@@ -117,7 +117,10 @@ xfce_displays_helper_init (XfceDisplaysHelper *helper)
         {
             /* open the channel */
             helper->channel = xfconf_channel_new ("displays");
-        
+
+            /* remove any leftover apply property before setting the monitor */
+            xfconf_channel_reset_property (helper->channel, "/Schemes/Apply", FALSE);
+
             /* monitor channel changes */
             g_signal_connect (G_OBJECT (helper->channel), "property-changed", 
                               G_CALLBACK (xfce_displays_helper_channel_property_changed), helper);