gnome-system-monitor r2489 - in branches/gnome-2-22: . src

[bdejean svn gnome org]

Author: bdejean
Date: Sat Sep  6 07:06:19 2008
New Revision: 2489
URL: http://svn.gnome.org/viewvc/gnome-system-monitor?rev=2489&view=rev

Log:
Released 2.22.4 with workaround for #549383.
Proper fix is in trunk at r2485.


Modified:
   branches/gnome-2-22/NEWS
   branches/gnome-2-22/configure.in
   branches/gnome-2-22/src/load-graph.cpp

Modified: branches/gnome-2-22/NEWS
==============================================================================
--- branches/gnome-2-22/NEWS	(original)
+++ branches/gnome-2-22/NEWS	Sat Sep  6 07:06:19 2008
@@ -1,3 +1,6 @@
+New in 2.22.4 - 6 September 2008
+* Fixed 549383 â network assertion in the resource tab.
+
 New in 2.22.3 - 30 June 2008
 * Fixed network speed when there are pseudo-devices with no address (#535544).
 

Modified: branches/gnome-2-22/configure.in
==============================================================================
--- branches/gnome-2-22/configure.in	(original)
+++ branches/gnome-2-22/configure.in	Sat Sep  6 07:06:19 2008
@@ -2,7 +2,7 @@
 
 AC_PREREQ(2.52)
 
-AC_INIT([gnome-system-monitor], [2.22.3],
+AC_INIT([gnome-system-monitor], [2.22.4],
         [http://bugzilla.gnome.org/enter_bug.cgi?product=system-monitor])
 AC_CONFIG_SRCDIR(configure.in)
 AC_CONFIG_HEADERS(config.h)

Modified: branches/gnome-2-22/src/load-graph.cpp
==============================================================================
--- branches/gnome-2-22/src/load-graph.cpp	(original)
+++ branches/gnome-2-22/src/load-graph.cpp	Sat Sep  6 07:06:19 2008
@@ -416,7 +416,11 @@
 
 	new_max = coef10 * (1UL << (base10 * 10));
 	procman_debug("bak %u new_max %u pow2 %u coef10 %u", bak_max, new_max, pow2, coef10);
-	g_assert(bak_max <= new_max);
+
+	if (bak_max > new_max) {
+		procman_debug("overflow detected: bak=%u > new=%u", bak_max, new_max);
+		new_max = bak_max;
+	}
 
 	if (new_max == g->net.max)
 		return;