Sophie

Sophie

distrib > Mandriva > 2006.0 > i586 > media > main-src > by-pkgid > a6bc312ce50b5c8d0c51736e58ac32bc > files > 363

kdebase-3.4.2-55mdk.src.rpm

--- /home/lmontel/rpm/BUILD/kdebase-3.4.2/kioslave/media/kdedmodule/mediamanager.cpp	2005-05-23 14:14:18.000000000 +0200
+++ kdebase-3.4.2/kioslave/media/kdedmodule/mediamanager.cpp	2005-08-23 13:53:37.000000000 +0200
@@ -172,6 +172,7 @@ void MediaManager::slotMediumAdded(const
 
 	KDirNotify_stub notifier("*", "*");
 	notifier.FilesAdded( KURL("media:/") );
+	notifier.FilesAdded( KURL("device:/") );
 
 	emit mediumAdded(name);
 }
@@ -182,7 +183,7 @@ void MediaManager::slotMediumRemoved(con
 
 	KDirNotify_stub notifier("*", "*");
 	notifier.FilesRemoved( KURL("media:/"+name) );
-
+	notifier.FilesRemoved( KURL("device:/"+name) );
 	emit mediumRemoved(name);
 }
 
@@ -195,8 +196,11 @@ void MediaManager::slotMediumChanged(con
 	if (!mounted)
 	{
 		notifier.FilesRemoved( KURL("media:/"+name) );
+		notifier.FilesRemoved( KURL("device:/"+name) );
 	}
 	notifier.FilesChanged( KURL("media:/"+name) );
+	notifier.FilesChanged( KURL("device:/"+name) );
+	
 
 	emit mediumChanged(name);
 }
--- /home/lmontel/rpm/BUILD/kdebase-3.4.2/kioslave/Makefile.am	2005-05-23 14:14:23.000000000 +0200
+++ kdebase-3.4.2/kioslave/Makefile.am	2005-08-23 13:51:20.000000000 +0200
@@ -8,4 +8,4 @@ endif
 
 SUBDIRS = about cgi floppy filter fish info mac man nfs nntp pop3 smtp \
   sftp tar finger thumbnail $(LDAP_SUBDIR) $(SMB_SUBDIR) settings trash media \
-  remote system
+  remote system mdv-devices
--- kdebase-3.4.2/kdesktop/kdiconview.cc--	2005-08-23 13:58:59.000000000 +0200
+++ kdebase-3.4.2/kdesktop/kdiconview.cc	2005-08-23 13:59:54.000000000 +0200
@@ -117,7 +117,7 @@ KDIconView::KDIconView( QWidget *parent,
 
     setURL( desktopURL() ); // sets m_url
 
-    m_desktopDirs = KGlobal::dirs()->findDirs( "appdata", "Desktop" );
+    //m_desktopDirs = KGlobal::dirs()->findDirs( "appdata", "Desktop" );
 	m_desktopDirs.append(KStandardDirs::mandrake_merge_directory());
     initDotDirectories();