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

List:       kde-commits
Subject:    kdebase/kioslave/devices/kdedmodule
From:       Kévin Ottens <ervin () ipsquad ! net>
Date:       2004-08-25 21:40:55
Message-ID: 20040825214055.2749790E7 () office ! kde ! org
[Download RAW message or body]

CVS commit by ervin: 

This fix avoid to screw up the user descriptions for the devices when a
new one appears in the system.


  M +24 -8     mountwatcher.cpp   1.36


--- kdebase/kioslave/devices/kdedmodule/mountwatcher.cpp  #1.35:1.36
@@ -356,8 +356,16 @@ void MountWatcherModule::readDFDone()
                         mountList<<(entryName);
                         QString name = ent->niceDescription();
+
+                        if(ent->userDescription()!="")
+                        {
+                                name = ent->userDescription();
+                        }
+                        else
+                        {
                         if (descriptionToDeviceMap[ent->niceDescription()] != ent->deviceName())
                                 name += filename;
                         if (descriptionToMountMap[ent->niceDescription()] != ent->mountPoint())
                                 name = i18n("%1 [%2]").arg(name).arg(ent->mountPoint());
+                        }
                         mountList<<name;
                         mountList<<ent->deviceName();
@@ -372,8 +380,16 @@ void MountWatcherModule::readDFDone()
                         mountList<<entryName;
                         QString name = ent->niceDescription();
+
+                        if(ent->userDescription()!="")
+                        {
+                                name = ent->userDescription();
+                        }
+                        else
+                        {
                         if (descriptionToDeviceMap[ent->niceDescription()] != ent->deviceName())
                                 name += filename;
                         if (descriptionToMountMap[ent->niceDescription()] != ent->mountPoint())
                                 name = i18n("%1 [%2]").arg(name).arg(ent->mountPoint());
+                        }
                         mountList<<name;
                         mountList<<ent->deviceName();


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