[Xfce4-commits] repair disk classification to continue supporting BSD with other device naming schemes

[Fabian]

Updating branch refs/heads/master
         to 49734aca84404c5b77cdda0c4f46bb60c5e965bc (commit)
       from ab6e7bad5da07324fa6e51ad18c3fd7bbe3af40f (commit)

commit 49734aca84404c5b77cdda0c4f46bb60c5e965bc
Author: Fabian <timyst...@arcor.de>
Date:   Mon May 14 23:54:36 2012 +0200

    repair disk classification to continue supporting BSD with other device 
naming schemes

 panel-plugin/devices.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/panel-plugin/devices.c b/panel-plugin/devices.c
index 1cf7734..1bd8880 100644
--- a/panel-plugin/devices.c
+++ b/panel-plugin/devices.c
@@ -723,9 +723,9 @@ disk_classify (char *device, char *mountpoint)
             dc = REMOTE;
         }
     }
-    else if ( strstr(device, "cdrom") || strstr(device, "cdrw") 
-                || strstr(device, "dvd") || strstr(mountpoint, "cdrom")
-                || strstr(mountpoint, "cdrw") || strstr(mountpoint, "dvd")) {
+               /* it needs to be said _here_ that BSDs use cd0, cd1 etc., so 
we hope cd* works for cdrw, cdrom and cd0,1,... nd no other devices */
+    else if ( strstr(device, "cd") 
+                || strstr(device, "dvd") || strstr(mountpoint, "cd") || 
strstr(mountpoint, "dvd")) {
         dc = CD_DVD;
     }
     else if ( strstr(mountpoint, "usr") || strstr(mountpoint, "var")
_______________________________________________
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits