diff --git a/ChangeLog b/ChangeLog
index d0699f642..5a498ba39 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2007-03-18  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* UI/Common/UIxToolbar.m ([UIxToolbar -toolbarConfig]): the
+	toolbar can have the special value "none" to indicate there is
+	none attached to the window.
+
 	* SoObjects/Appointments/SOGoCalendarComponent.m
 	([SOGoCalendarComponent -isOrganizer:emailorOwner:login]): new
 	method.
diff --git a/UI/Common/UIxToolbar.m b/UI/Common/UIxToolbar.m
index c36eaece2..e7fd10097 100644
--- a/UI/Common/UIxToolbar.m
+++ b/UI/Common/UIxToolbar.m
@@ -158,7 +158,8 @@
   return tb;
 }
 
-- (id)toolbarConfig {
+- (id) toolbarConfig
+{
   id tb;
   
   if (toolbarConfig != nil)
@@ -167,7 +168,7 @@
   if (toolbar)
     tb = toolbar;
   else
-    tb = [[self clientObject] lookupName:@"toolbar" inContext:[self context]
+    tb = [[self clientObject] lookupName: @"toolbar" inContext:[self context]
                               acquire:NO];
 
   if ([tb isKindOfClass:[NSException class]]) {
@@ -177,11 +178,17 @@
     toolbarConfig = [[NSNull null] retain];
     return nil;
   }
-  
-  if ([tb isKindOfClass:[NSString class]])
-    tb = [self loadToolbarConfigFromResourceNamed:tb];
+
+  if ([tb isKindOfClass: [NSString class]])
+    {
+      if ([tb isEqualToString: @"none"])
+        tb = [NSNull null];
+      else
+        tb = [self loadToolbarConfigFromResourceNamed:tb];
+    }
   
   toolbarConfig = [tb retain];
+
   return toolbarConfig;
 }
 
@@ -240,6 +247,11 @@
   return (amount > 0);
 }
 
+- (BOOL) hasMenu
+{
+  return [[[self buttonInfo] valueForKey:@"hasMenu"] boolValue];
+}
+
 - (void) setToolbar: (NSString *) newToolbar
 {
   ASSIGN(toolbar, newToolbar);