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

List:       kde-commits
Subject:    KDE/kdebase/kdesktop
From:       David Faure <faure () kde ! org>
Date:       2005-06-12 12:24:04
Message-ID: 1118579044.365701.11894.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 424583 by dfaure:

Remove bookmarks from kdesktop RMB popup
BUG: 62791

Fix bug when using "Disable desktop menu", kwin, kicker etc. weren't told about it,
so some gray area remained on top of the desktop. Code taken from kcontrol/konq/desktopbehavior_impl.cpp
CCBUG: 46209


 M  +9 -1      krootwm.cc  


--- trunk/KDE/kdebase/kdesktop/krootwm.cc #424582:424583
@@ -94,6 +94,7 @@
   if (kapp->authorizeKAction("bookmarks"))
   {
      bookmarks = new KActionMenu( i18n("Bookmarks"), "bookmark", m_actionCollection, "bookmarks" );
+     // The KBookmarkMenu is needed to fill the Bookmarks menu in the desktop menubar.
      bookmarkMenu = new KBookmarkMenu( KonqBookmarkManager::self(), new KBookmarkOwner(),
                                     bookmarks->popupMenu(),
                                     m_actionCollection,
@@ -379,11 +380,13 @@
        needSeparator = true;
     }
 
+#if 0
     if (bookmarks)
     {
        bookmarks->plug( desktopMenu );
        needSeparator = true;
     }
+#endif
 
     action = m_actionCollection->action("exec");
     if (action)
@@ -732,7 +735,12 @@
     else
 	appname.sprintf("kdesktop-screen-%d", kdesktop_screen_number);
 
-    kapp->dcopClient()->send( appname.data(), "KDesktopIface", "configure()", "");
+    QByteArray data;
+    kapp->dcopClient()->send( appname.data(), "KDesktopIface", "configure()", data);
+    // for the standalone menubar setting
+    kapp->dcopClient()->send( "menuapplet*", "menuapplet", "configure()", data );
+    kapp->dcopClient()->send( "kicker", "kicker", "configureMenubar()", data );
+    kapp->dcopClient()->send( "kwin*", "", "reconfigure()", data );
 }
 
 
[prev in list] [next in list] [prev in thread] [next in thread]