Your message dated Sun, 08 May 2011 13:34:42 +0000
with message-id <[email protected]>
and subject line Bug#551305: fixed in matchbox-panel 0.9.3-5
has caused the Debian Bug report #551305,
regarding matchbox-panel: Improvements for mb-applet-system-monitor's RAM 
display
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)


-- 
551305: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=551305
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Package: matchbox-panel
Version: 0.9.3-3
Severity: minor
Tags: patch

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

mb-applet-system-monitor's memory part is not really useful; it's
assumptions about /proc/meminfo don't fit neither on my desktop
machine nor on my openmoko (where I'm using it), and the calculations
are also debatable.

Find attached a patch that make at least me happier with the output
:)

Cheers,
gregor
 


-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)

iEYEARECAAYFAkrZK4gACgkQOzKYnQDzz+ToXwCgybDsOvX9Xzj8O0i+V847ISde
UBYAoJLRNSV3bfrhczlQTGa34DLD6YE/
=AD6K
-----END PGP SIGNATURE-----
--- matchbox-panel-0.9.3.orig/applets/mb-applet-system-monitor.c
+++ matchbox-panel-0.9.3/applets/mb-applet-system-monitor.c
@@ -55,9 +55,6 @@
    /* memory data  */
    u_int64_t mem_used;
    u_int64_t mem_max;
-   u_int64_t swap_used;
-   u_int64_t swap_max;
-   unsigned int swap_percent;  /* swap used, in percent */
    unsigned int mem_percent;   /* memory used, in percent */
 
 } msd;   
@@ -132,7 +129,6 @@
     cache_total, cache_free, cache_used, uneeded = 0;
   
   u_int64_t my_mem_used, my_mem_max;
-  u_int64_t my_swap_max;
   
   static int mem_delay = 0;
   FILE      *mem;
@@ -158,22 +154,25 @@
 	  fscanf (mem, "%*s %Ld %*s", &mfree);
 	  fscanf (mem, "%*s %Ld %*s", &buffers);
 	  fscanf (mem, "%*s %Ld %*s", &cached);
-	  fscanf (mem, "%*s %Ld %*s", &shared);
-	  fscanf (mem, "%*s %Ld %*s", &used);
+
+	  fscanf (mem, "%*s %Ld %*s", &uneeded);
+	  fscanf (mem, "%*s %Ld %*s", &uneeded);
 	  fscanf (mem, "%*s %Ld %*s", &uneeded);
 	  fscanf (mem, "%*s %Ld %*s", &uneeded);
 	  fscanf (mem, "%*s %Ld %*s", &uneeded);
 	  fscanf (mem, "%*s %Ld %*s", &uneeded);
 	  fscanf (mem, "%*s %Ld %*s", &uneeded);
+	  fscanf (mem, "%*s %Ld %*s", &uneeded);
+	  fscanf (mem, "%*s %Ld %*s", &uneeded);
+
 	  fscanf (mem, "%*s %Ld %*s", &cache_total);
 	  fscanf (mem, "%*s %Ld %*s", &cache_free);
       
 	  total = total * 1024;
 	  mfree = mfree * 1024;
+	  used = total - mfree;
 	  buffers = buffers * 1024;
 	  cached = cached * 1024;
-	  used = used * 1024;
-	  shared = shared * 1024;
 	  cache_total = cache_total * 1024;
 	  cache_used = cache_total - (cache_free * 1024);
 	}
@@ -192,8 +191,7 @@
       mem_delay = 25;
       
       /* calculate it */
-      my_mem_max      = total;
-      my_swap_max     = cache_total;
+      my_mem_max      = cache_total + total;
       my_mem_used     = cache_used + used - cached - buffers;
       msd.mem_used    = my_mem_used;
       msd.mem_max     = my_mem_max;

--- End Message ---
--- Begin Message ---
Source: matchbox-panel
Source-Version: 0.9.3-5

We believe that the bug you reported is fixed in the latest version of
matchbox-panel, which is due to be installed in the Debian FTP archive:

matchbox-panel_0.9.3-5.diff.gz
  to main/m/matchbox-panel/matchbox-panel_0.9.3-5.diff.gz
matchbox-panel_0.9.3-5.dsc
  to main/m/matchbox-panel/matchbox-panel_0.9.3-5.dsc
matchbox-panel_0.9.3-5_amd64.deb
  to main/m/matchbox-panel/matchbox-panel_0.9.3-5_amd64.deb



A summary of the changes between this version and the previous one is
attached.

Thank you for reporting the bug, which will now be closed.  If you
have further comments please address them to [email protected],
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Moray Allan <[email protected]> (supplier of updated matchbox-panel package)

(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing [email protected])


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Format: 1.8
Date: Sun, 08 May 2011 14:18:57 +0100
Source: matchbox-panel
Binary: matchbox-panel
Architecture: source amd64
Version: 0.9.3-5
Distribution: unstable
Urgency: low
Maintainer: Moray Allan <[email protected]>
Changed-By: Moray Allan <[email protected]>
Description: 
 matchbox-panel - desktop panel for resource-limited systems
Closes: 551305
Changes: 
 matchbox-panel (0.9.3-5) unstable; urgency=low
 .
   * Apply patch for mb-applet-system-monitor.c memory display from
     gregor herrmann <[email protected]>.  Closes: #551305.
Checksums-Sha1: 
 ccf38d6bb1fd920625a1ce8494f161364ff52ac3 1148 matchbox-panel_0.9.3-5.dsc
 c84675fe024061cb05278ebd691a89c72a958feb 81357 matchbox-panel_0.9.3-5.diff.gz
 68cbbd3ab47fd51cd34ffc1fb1f46f2454edc448 85454 matchbox-panel_0.9.3-5_amd64.deb
Checksums-Sha256: 
 75fadbdf9bfb1c8e15de83e2b8ef03c4a9faea822abb373c195c4398c18f7a14 1148 
matchbox-panel_0.9.3-5.dsc
 4749a00473a8280ca59057ca8d1b49a792b31dbe57eeaf6a6f38fbb87cf2e823 81357 
matchbox-panel_0.9.3-5.diff.gz
 75bb0219770c16ca5621fb38e94cdd6c201cc2bb0e58a673aa8557c42bab6f65 85454 
matchbox-panel_0.9.3-5_amd64.deb
Files: 
 0200415eba82ab5b2ee3e8de5502e7f4 1148 embedded optional 
matchbox-panel_0.9.3-5.dsc
 b5b7f042c0c3962822dd35955a722e7a 81357 embedded optional 
matchbox-panel_0.9.3-5.diff.gz
 c8f6d4bfa21030c9dbbc5ef232bf3eb1 85454 embedded optional 
matchbox-panel_0.9.3-5_amd64.deb

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)

iEYEARECAAYFAk3GmckACgkQ500puCvhbQEKVQCfRaSSTx0J+mH/CZ67dA5Z559L
I9UAnizcnF8YamHom75kWXsR7s2X05mE
=5PzV
-----END PGP SIGNATURE-----



--- End Message ---

Reply via email to