+2007-01-09 Henry Zhang <
[email protected]>
+
+ * patches/gnome-applets-03-make-multiload-network-available.diff:
+ bug fix to 6510961
--- a/ChangeLog Tue Jan 09 11:35:53 2007 +0000
+++ b/ChangeLog Tue Jan 09 11:46:13 2007 +0000
@@ -1,3 +1,8 @@
+2007-01-09 Henry Zhang <[email protected]>
+
+ * patches/gnome-applets-03-make-multiload-network-available.diff:
+ bug fix to 6510961
+
2007-01-09 Wang Xin <[email protected]>
* patches/evolution-12-awk.diff: Added.
--- a/patches/gnome-applets-03-make-multiload-network-available.diff Tue Jan 09 11:35:53 2007 +0000
+++ b/patches/gnome-applets-03-make-multiload-network-available.diff Tue Jan 09 11:46:13 2007 +0000
@@ -1,6 +1,5 @@
-diff -Nrup gnome-applets-2.16.0.1/multiload/linux-proc.c gnome-applets-2.16.0.1.mod/multiload/linux-proc.c
---- gnome-applets-2.16.0.1/multiload/linux-proc.c 2006-09-22 15:05:23.951580000 +0800
-+++ gnome-applets-2.16.0.1.mod/multiload/linux-proc.c 2006-09-22 15:15:46.740769000 +0800
+--- gnome-applets-2.17.1/multiload/linux-proc.c 2006-12-31 10:07:39.000000000 +0800
++++ gnome-applets-2.17.1.mod/multiload/linux-proc.c 2007-01-09 19:15:24.881474000 +0800
@@ -115,6 +115,13 @@ GetDiskLoad (int Maximum, int data [3],
read = write = 0;
@@ -35,3 +34,17 @@
devices = glibtop_get_netlist(&netlist);
for(i = 0; i < netlist.number; ++i)
+@@ -310,7 +321,12 @@ GetNet (int Maximum, int data [5], LoadG
+
+ glibtop_get_netload(&netload, devices[i]);
+
+- g_return_if_fail((netload.flags & needed_netload_flags) == needed_netload_flags);
++ /* this is not correct, because after run get netlist, there are lots of net devices,
++ not all of them meet the requirement of needed_netload_flags, but we don't need to
++ exit, we can just ignore them, and try to continue with the next one */
++ if ((netload.flags & needed_netload_flags) != needed_netload_flags)
++ continue;
++
+
+ if (!(netload.if_flags & (1L << GLIBTOP_IF_FLAGS_UP)))
+ continue;