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

List:       kde-commits
Subject:    kdebase/kdesktop
From:       Waldo Bastian <bastian () kde ! org>
Date:       2003-11-14 22:35:11
[Download RAW message or body]

CVS commit by waba: 

KIOSK: Make it possible to disable RMB on desktop / desktop-icons


  M +4 -2      desktop.cc   1.287
  M +1 -0      kdiconview.cc   1.99
  M +1 -0      krootwm.cc   1.183


--- kdebase/kdesktop/desktop.cc  #1.286:1.287
@@ -706,5 +706,6 @@ void KDesktop::handleImageDropEvent(QDro
         KTempFile tmpFile(QString::null, filename);
         i.save(tmpFile.name(), "PNG");
-        KIO::NetAccess::copy(tmpFile.name(), KGlobalSettings::desktopPath() + "/" + filename);
+        // We pass 0 as parent window because passing the desktop is not a good idea
+        KIO::NetAccess::copy(tmpFile.name(), KGlobalSettings::desktopPath() + "/" + filename, 0);
         tmpFile.unlink();
     }
@@ -725,5 +726,6 @@ void KDesktop::slotNewWallpaper(const KU
     // (called by KonqOperations)
     QString tmpFile;
-    KIO::NetAccess::download( url, tmpFile );
+    // We pass 0 as parent window because passing the desktop is not a good idea
+    KIO::NetAccess::download( url, tmpFile, 0 ); 
     bgMgr->setWallpaper(tmpFile);
 }

--- kdebase/kdesktop/kdiconview.cc  #1.98:1.99
@@ -566,4 +566,5 @@ void KDIconView::slotShred()
 void KDIconView::popupMenu( const QPoint &_global, KFileItemList _items )
 {
+    if (!kapp->authorize("action/kdesktop_rmb")) return;
     if (!m_dirLister) return;
     if ( _items.count() == 1 )

--- kdebase/kdesktop/krootwm.cc  #1.182:1.183
@@ -537,4 +537,5 @@ void KRootWm::mousePressed( const QPoint
         break;
     case RightButton:
+        if (!kapp->authorize("action/kdesktop_rmb")) return;
         activateMenu( rightButtonChoice, _global );
         break;


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