From kde-commits  Mon Dec 09 21:26:53 2002
From: Waldo Bastian <bastian () kde ! org>
Date: Mon, 09 Dec 2002 21:26:53 +0000
To: kde-commits
Subject: KDE_3_1_BRANCH: kdebase/kicker
X-MARC-Message: https://marc.info/?l=kde-commits&m=103946928610618

CVS commit by waba: 

KIOSK fix


  M +1 -1      core/containerarea.cpp   1.131.2.1
  M +5 -2      ui/addspecialbutton_mnu.cpp   1.9.2.1


--- kdebase/kicker/core/containerarea.cpp  #1.131:1.131.2.1
@@ -273,5 +273,5 @@ void ContainerArea::loadContainerConfig(
         else if (appletType == "WindowListButton")
             a = new WindowListButtonContainer(_opMenu, viewport());
-        else if (appletType == "BookmarksButton")
+        else if ((appletType == "BookmarksButton") && kapp->authorizeKAction("bookmarks"))
             a = new BookmarksButtonContainer(_opMenu, viewport());
         else if (appletType == "ServiceButton")

--- kdebase/kicker/ui/addspecialbutton_mnu.cpp  #1.9:1.9.2.1
@@ -47,6 +47,9 @@ PanelAddSpecialButtonMenu::PanelAddSpeci
     insertItem(SmallIconSet("window_list"), i18n("Windowlist"),
                this, SLOT(slotAddWindowList()));
+    if (kapp->authorizeKAction("bookmarks"))
+    {
     insertItem(SmallIconSet("bookmark"), i18n("Bookmarks"),
                this, SLOT(slotAddBookmarks()));
+    }
     insertItem(SmallIconSet("desktop"), i18n("Desktop Access"),
                this, SLOT(slotAddDesktop()));