rev 5114 - in trunk/packages/kdebase/debian: . patches

[Modestas Vainius]

Author: modax-guest
Date: 2006-12-11 15:00:47 +0100 (Mon, 11 Dec 2006)
New Revision: 5114

Added:
   trunk/packages/kdebase/debian/patches/35_hal_fix_floppy_support.diff
Modified:
   trunk/packages/kdebase/debian/changelog
Log:
Patch from kde bug #120619 comment #34: resolves issues with floppies. Floppy handling is now working properly in all (known) cases.


Modified: trunk/packages/kdebase/debian/changelog
===================================================================
--- trunk/packages/kdebase/debian/changelog	2006-12-10 21:25:38 UTC (rev 5113)
+++ trunk/packages/kdebase/debian/changelog	2006-12-11 14:00:47 UTC (rev 5114)
@@ -18,6 +18,10 @@
   +++ Changes by Josh Metzler
   * Restore default user face.  (Closes: #267722)
 
+  +++ Changes by Modestas Vainius:
+  * Add patch from KDE bug #120619 comment #34, which fixes mounting and
+    unmounting of floppy devices managed by HAL. (Closes: #350097)
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri,  8 Dec 2006 08:19:29 -0500
 
 kdebase (4:3.5.5a.dfsg.1-2) unstable; urgency=medium

Added: trunk/packages/kdebase/debian/patches/35_hal_fix_floppy_support.diff
===================================================================
--- trunk/packages/kdebase/debian/patches/35_hal_fix_floppy_support.diff	2006-12-10 21:25:38 UTC (rev 5113)
+++ trunk/packages/kdebase/debian/patches/35_hal_fix_floppy_support.diff	2006-12-11 14:00:47 UTC (rev 5114)
@@ -0,0 +1,54 @@
+diff -uNr kdebase-3.5.5a.dfsg.1/kioslave/media/mediamanager/halbackend.cpp kdebase-3.5.5a.dfsg.1/kioslave/media/mediamanager/halbackend.cpp
+--- kdebase-3.5.5a.dfsg.1/kioslave/media/mediamanager/halbackend.cpp	2006-12-11 14:27:21.000000000 +0200
++++ kdebase-3.5.5a.dfsg.1/kioslave/media/mediamanager/halbackend.cpp	2006-12-11 14:32:03.000000000 +0200
+@@ -635,7 +635,7 @@
+     {
+         // HAL hates floppies - so we have to do it twice ;(
+         medium->mountableState(libhal_drive_get_device_file(halDrive), QString::null, QString::null, false);
+-        setFstabProperties( medium );
++        setFloppyMountState( medium );
+     }
+ 
+     if (libhal_device_get_property_QString(m_halContext, udi, "storage.drive_type") == "floppy")
+@@ -670,6 +670,30 @@
+     libhal_volume_free(halVolume);
+ }
+ 
++void HALBackend::setFloppyMountState( Medium *medium )
++{
++    if ( !medium->id().startsWith( "/org/kde" ) )
++    {
++        KMountPoint::List mtab = KMountPoint::currentMountPoints();
++        KMountPoint::List::iterator it = mtab.begin();
++        KMountPoint::List::iterator end = mtab.end();
++
++        QString fstype;
++        QString mountpoint;
++        for (; it!=end; ++it)
++        {
++            if ((*it)->mountedFrom() == medium->deviceNode() )
++            {
++                fstype = (*it)->mountType().isNull() ? (*it)->mountType() : "auto";
++                mountpoint = (*it)->mountPoint();
++                medium->mountableState( medium->deviceNode(), mountpoint, fstype, true );
++                return;
++            }
++        }
++    }
++}
++
++
+ void HALBackend::setCameraProperties(Medium* medium)
+ {
+     kdDebug(1219) << "HALBackend::setCameraProperties for " << medium->id() << endl;
+diff -uNr kdebase-3.5.5a.dfsg.1/kioslave/media/mediamanager/halbackend.h kdebase-3.5.5a.dfsg.1/kioslave/media/mediamanager/halbackend.h
+--- kdebase-3.5.5a.dfsg.1/kioslave/media/mediamanager/halbackend.h	2006-12-11 14:27:21.000000000 +0200
++++ kdebase-3.5.5a.dfsg.1/kioslave/media/mediamanager/halbackend.h	2006-12-11 14:32:03.000000000 +0200
+@@ -152,6 +152,7 @@
+ 	QString generateName(const QString &devNode);
+ 	static QString isInFstab(const Medium *medium);
+ 	static QString listUsingProcesses(const Medium *medium);
++	void setFloppyMountState(Medium* medium);
+ 
+ private slots:
+ 	void slotResult(KIO::Job *job);