[Xfce4-commits] <xfce4-settings:master> Avoid setting the workspace names twice.

[Nick Schermer]

Updating branch refs/heads/master
         to bb904ca83f71912bf02a8d9b117d20bf018764c5 (commit)
       from c8d430de0462f8ffa3006fe50969a22dadcc0175 (commit)

commit bb904ca83f71912bf02a8d9b117d20bf018764c5
Author: Nick Schermer <nick at xfce.org>
Date:   Sun Dec 25 15:35:57 2011 +0100

    Avoid setting the workspace names twice.
    
    For some reason the property-changed is triggered while we still
    wait for a window manager. If this is the case, skip the update
    since in a short while we'll set the names anyway.

 xfsettingsd/workspaces.c |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/xfsettingsd/workspaces.c b/xfsettingsd/workspaces.c
index 8e480b5..3237504 100644
--- a/xfsettingsd/workspaces.c
+++ b/xfsettingsd/workspaces.c
@@ -575,5 +575,10 @@ xfce_workspaces_helper_prop_changed (XfconfChannel        *channel,
                                      XfceWorkspacesHelper *helper)
 {
     g_return_if_fail (XFCE_IS_WORKSPACES_HELPER (helper));
-    xfce_workspaces_helper_set_names (helper, TRUE);
+
+    if (helper->wait_for_wm_timeout_id == 0)
+    {
+        /* only set the names if the initial start is not running anymore */
+        xfce_workspaces_helper_set_names (helper, TRUE);
+    }
 }