diff --git a/ChangeLog b/ChangeLog
index 7152aa7c8d9cbb9b112580998a187ed51b0deed2..1d63b386a19abe4de6c3d462f2f0e70f86ef3e3b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-11-08  olivier
+
+	* src/settings.c: Do not display warnings for "workspace_names", for
+	  real this time... 
+
 2008-11-08  olivier
 
 	* settings-dialogs/workspace-settings.c: Fix workspaces names not being
diff --git a/src/settings.c b/src/settings.c
index 156cc8b2f66887881e0844fffbd0da131fe1ceee..2fa3a08083c8ffec7f573c3f175a0cafd9dfc36f 100644
--- a/src/settings.c
+++ b/src/settings.c
@@ -1138,8 +1138,7 @@ cb_xfwm4_channel_property_changed(XfconfChannel *channel, const gchar *property_
                     set_placement_mode (screen_info, g_value_get_string (value));
                 }
                 else if ((!strcmp (name, "title_shadow_active"))
-                      || (!strcmp (name, "title_shadow_inactive"))
-                      || (!strcmp (name, "workspace_names")))
+                      || (!strcmp (name, "title_shadow_inactive")))
                 {
                     /* These properties are not configurable via xfconf */
                 }
@@ -1378,7 +1377,14 @@ cb_xfwm4_channel_property_changed(XfconfChannel *channel, const gchar *property_
                 }
                 break;
             default:
-                g_warning("The type of property '%s' is not supported", property_name);
+                if (!strcmp (name, "workspace_names"))
+                {
+                    /* These properties are not configurable via xfconf */
+                }
+                else
+                {
+                    g_warning("The property '%s' is not supported", property_name);
+                }
                 break;
         }
     }