[Pkg-xfce-commits] r7931 - in /goodies/trunk/xfce4-fsguard-plugin/debian: changelog control patches/1GB-size.patch patches/series

[Jackson Doak]

Author: noskcaj-guest
Date: Fri Sep 20 07:19:34 2013
New Revision: 7931

URL: http://svn.debian.org/wsvn/pkg-xfce/?sc=1&rev=7931
Log:
Add 1GB-size.patch

Added:
    goodies/trunk/xfce4-fsguard-plugin/debian/patches/1GB-size.patch
    goodies/trunk/xfce4-fsguard-plugin/debian/patches/series
Modified:
    goodies/trunk/xfce4-fsguard-plugin/debian/changelog
    goodies/trunk/xfce4-fsguard-plugin/debian/control

Modified: goodies/trunk/xfce4-fsguard-plugin/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-xfce/goodies/trunk/xfce4-fsguard-plugin/debian/changelog?rev=7931&op=diff
==============================================================================
--- goodies/trunk/xfce4-fsguard-plugin/debian/changelog	(original)
+++ goodies/trunk/xfce4-fsguard-plugin/debian/changelog	Fri Sep 20 07:19:34 2013
@@ -1,8 +1,12 @@
 xfce4-fsguard-plugin (1.0.1-3) UNRELEASED; urgency=low
 
+  [ Evgeni Golov ]
   * Correct Vcs-* URLs to point to anonscm.debian.org
 
- -- Evgeni Golov <evgeni at debian.org>  Mon, 15 Jul 2013 21:57:34 +0200
+  [ Jackson Doak ]
+  * Add 1GB-size.patch. Closes: #722489 
+
+ -- Jackson Doak <noskcaj at ubuntu.com>  Fri, 20 Sep 2013 17:17:25 +1000
 
 xfce4-fsguard-plugin (1.0.1-2) unstable; urgency=low
 

Modified: goodies/trunk/xfce4-fsguard-plugin/debian/control
URL: http://svn.debian.org/wsvn/pkg-xfce/goodies/trunk/xfce4-fsguard-plugin/debian/control?rev=7931&op=diff
==============================================================================
--- goodies/trunk/xfce4-fsguard-plugin/debian/control	(original)
+++ goodies/trunk/xfce4-fsguard-plugin/debian/control	Fri Sep 20 07:19:34 2013
@@ -7,7 +7,7 @@
 Build-Depends: debhelper (>= 9), xfce4-panel-dev,
  libxml2-dev, libxml-parser-perl, intltool, libx11-dev, pkg-config,
  libgtk2.0-dev, libxfce4ui-1-dev, autotools-dev
-Standards-Version: 3.9.3
+Standards-Version: 3.9.4
 Homepage: http://goodies.xfce.org/projects/panel-plugins/xfce4-fsguard-plugin
 Vcs-Svn: svn://anonscm.debian.org/pkg-xfce/goodies/trunk/xfce4-fsguard-plugin/
 Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-xfce/goodies/trunk/xfce4-fsguard-plugin/

Added: goodies/trunk/xfce4-fsguard-plugin/debian/patches/1GB-size.patch
URL: http://svn.debian.org/wsvn/pkg-xfce/goodies/trunk/xfce4-fsguard-plugin/debian/patches/1GB-size.patch?rev=7931&op=file
==============================================================================
--- goodies/trunk/xfce4-fsguard-plugin/debian/patches/1GB-size.patch	(added)
+++ goodies/trunk/xfce4-fsguard-plugin/debian/patches/1GB-size.patch	Fri Sep 20 07:19:34 2013
@@ -0,0 +1,27 @@
+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>
+
+--- a/panel-plugin/fsguard.c
++++ b/panel-plugin/fsguard.c
+@@ -291,10 +291,15 @@
+                     (*(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);
+     }

Added: goodies/trunk/xfce4-fsguard-plugin/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-xfce/goodies/trunk/xfce4-fsguard-plugin/debian/patches/series?rev=7931&op=file
==============================================================================
--- goodies/trunk/xfce4-fsguard-plugin/debian/patches/series	(added)
+++ goodies/trunk/xfce4-fsguard-plugin/debian/patches/series	Fri Sep 20 07:19:34 2013
@@ -0,0 +1 @@
+1GB-size.patch