[Pkg-xfce-devel] Bug#722489: [xfce4-fsguard-plugin] Tooltip does not handle FS <1GB size

[Stephen Lyons]

Package: xfce4-fsguard-plugin
Version: 1.0.1-1+b1
Severity: normal
Tags: patch

--- Please enter the report below this line. ---
I believe there is a bug in this plug-in all current Debian (including
my Wheezy) distributions which results in a tool-tip type message of
"could not check mountpoint XXX, please check your config" when the file
system that the path XXX concerns is of size less than around 1GBytes.

From inspection of the source from the latest upstream "master" from its
repository at git://git.xfce.org/panel-plugins/xfce4-fsguard-plugin I
see the problem originates there. I have formulated a patch (attached)
which I think will correct this problem.

--- System information. ---
Architecture: i386
Kernel:       Linux 3.10-0.bpo.2-rt-686-pae

Debian Release: 7.1
  500 wheezy-backports mozilla.debian.net
  500 stable-updates  mirrors.melbourne.co.uk
  500 stable          security.debian.org
  500 stable          mirrors.melbourne.co.uk
  500 stable          apt.spideroak.com
  500 release         apt.spideroak.com
  500 debs            www.duinsoft.nl
  100 wheezy-backports ftp.debian.org

--- Package information. ---
Depends                    (Version) | Installed
====================================-+-==============
libatk1.0-0              (>= 1.12.4) | 2.4.0-2
libc6                       (>= 2.4) | 2.13-38
libcairo2                 (>= 1.2.4) | 1.12.2-3
libfontconfig1            (>= 2.9.0) | 2.9.0-7.1
libfreetype6              (>= 2.2.1) | 2.4.9-1.1
libgdk-pixbuf2.0-0       (>= 2.22.0) | 2.26.1-1
libglib2.0-0             (>= 2.18.0) | 2.33.12+really2.32.4-5
libgtk2.0-0               (>= 2.8.0) | 2.24.10-2
libpango1.0-0            (>= 1.14.0) | 1.30.0-1
libxfce4ui-1-0                       | 4.8.1-1
libxfce4util4          (>= 4.3.99.2) | 4.8.2-1
xfce4-panel               (>= 4.7.7) | 4.8.6-4
xfce4-panel                 (<< 4.9) | 4.8.6-4


Package's Recommends field is empty.

Package's Suggests field is empty.



-------------- next part --------------
commit 7f8c65afe0d7cc658ac453a46c0f4f3bf15d7fb9
Author: Stephen Lyons <slysven at virginmedia.com>
Date:   Mon Sep 9 22:05:21 2013 +0100

    BugFix: Tool-tip giving wrong message for fs size < ~1GB.
    
    Signed-off-by: Stephen Lyons <slysven at virginmedia.com>

diff --git a/panel-plugin/fsguard.c b/panel-plugin/fsguard.c
index 8d97574..10cf6e8 100644
--- a/panel-plugin/fsguard.c
+++ b/panel-plugin/fsguard.c
@@ -291,10 +291,15 @@ fsguard_check_fs (FsGuard *fsguard)
                     (*(fsguard->name) != '\0' && strcmp(fsguard->path, fsguard->name)) ?
                     _("%s/%s space left on %s (%s)") : _("%s/%s space left on %s"),
                     msg_size, msg_total_size, fsguard->path, fsguard->name);
-    } else {
+    } else if (total > 0 ) {
         g_snprintf (msg_total_size, sizeof (msg_total_size), _("%.0f MB"), total);
         g_snprintf (msg_size, sizeof (msg_size), _("%.0f MB"), freespace);
         g_snprintf (msg, sizeof (msg),
+                    (*(fsguard->name) != '\0' && strcmp(fsguard->path, fsguard->name)) ?
+                    _("%s/%s space left on %s (%s)") : _("%s/%s space left on %s"),
+                    msg_size, msg_total_size, fsguard->path, fsguard->name);
+    } else {
+        g_snprintf (msg, sizeof (msg),
                     _("could not check mountpoint %s, please check your config"),
                     fsguard->path);
     }
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 551 bytes
Desc: OpenPGP digital signature
URL: <http://lists.alioth.debian.org/pipermail/pkg-xfce-devel/attachments/20130911/cbfa5f95/attachment.sig>