[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE_3_1_BRANCH: kdebase/kdesktop
From:       Waldo Bastian <bastian () kde ! org>
Date:       2002-12-09 12:25:49
[Download RAW message or body]

CVS commit by waba: 

KIOSK fix


  M +18 -4     krootwm.cc   1.165.2.1


--- kdebase/kdesktop/krootwm.cc  #1.165:1.165.2.1
@@ -88,4 +88,6 @@ KRootWm::KRootWm(KDesktop* _desktop) : Q
   }
 
+  if (kapp->authorizeKAction("bookmarks"))
+  {
   bookmarks = new KActionMenu( i18n("Bookmarks"), "bookmark", m_actionCollection, "bookmarks" );
   bookmarkMenu = new KBookmarkMenu( KonqBookmarkManager::self(), new KBookmarkOwner(),
@@ -93,4 +95,10 @@ KRootWm::KRootWm(KDesktop* _desktop) : Q
                                     m_actionCollection,
                                     true, false );
+  }
+  else
+  {
+     bookmarks = 0;
+     bookmarkMenu = 0;
+  }
 
   // The windowList and desktop menus can be part of a menubar (Mac style)
@@ -333,5 +341,8 @@ void KRootWm::buildMenus()
     }
 
+    if (bookmarks)
+    {
     bookmarks->plug( desktopMenu );
+    }
     desktopMenu->insertSeparator();
 
@@ -402,5 +413,8 @@ void KRootWm::buildMenus()
             menuBar->insertItem(i18n("New"), menuNew->popupMenu());
         }
+        if (bookmarks)
+        {
         menuBar->insertItem(i18n("Bookmarks"), bookmarks->popupMenu());
+        }
         menuBar->insertItem(i18n("Desktop"), desk);
         menuBar->insertItem(i18n("Windows"), windowListMenu);


[prev in list] [next in list] [prev in thread] [next in thread]