Mercurial Mercurial > upstream > oracle > spec-files / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patches/gnome-applets-04-make-multiload-network-available.diff
author bc99092
Fri, 15 Sep 2006 23:24:14 +0000
changeset 8155 578ea9f1b4db
parent 7953 patches/gnome-applets-05-make-multiload-network-available.diff@82fcab7379dd
child 8181 4565c28a04fd
permissions -rw-r--r--
2006-09-15 Brian Cameron <[email protected]> * patches/gnome-applets-06-multiload-Xau.diff: Patch was only needed if building applets against build 48 of libgtop since libgtop used to include -lXau. It no longer does, so simply rebuilding libgtop and rebuilding gnome-applets works better if you run into this problem.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
7953
82fcab7379dd 2006-08-22 Damien Carbery <[email protected]>
dc144907
parents:
diff changeset 
     1
 
diff -Nrup gnome-applets-2.14.1/multiload/linux-proc.c gnome-applets-2.14.1.mod/multiload/linux-proc.c
82fcab7379dd 2006-08-22 Damien Carbery <[email protected]>
dc144907
parents:
diff changeset 
     2
 
--- gnome-applets-2.14.1/multiload/linux-proc.c	2006-01-15 17:31:02.000000000 +0800
82fcab7379dd 2006-08-22 Damien Carbery <[email protected]>
dc144907
parents:
diff changeset 
     3
 
+++ gnome-applets-2.14.1.mod/multiload/linux-proc.c	2006-07-28 11:22:34.324755000 +0800
82fcab7379dd 2006-08-22 Damien Carbery <[email protected]>
dc144907
parents:
diff changeset 
     4
 
@@ -306,7 +306,8 @@ GetNet (int Maximum, int data [5], LoadG
82fcab7379dd 2006-08-22 Damien Carbery <[email protected]>
dc144907
parents:
diff changeset 
     5
82fcab7379dd 2006-08-22 Damien Carbery <[email protected]>
dc144907
parents:
diff changeset 
     6
 
 	glibtop_get_netload(&netload, devices[i]);
82fcab7379dd 2006-08-22 Damien Carbery <[email protected]>
dc144907
parents:
diff changeset 
     7
82fcab7379dd 2006-08-22 Damien Carbery <[email protected]>
dc144907
parents:
diff changeset 
     8
 
-	g_return_if_fail((netload.flags & needed_netload_flags) == needed_netload_flags);
82fcab7379dd 2006-08-22 Damien Carbery <[email protected]>
dc144907
parents:
diff changeset 
     9
 
+        if ((netload.flags & needed_netload_flags) != needed_netload_flags)
82fcab7379dd 2006-08-22 Damien Carbery <[email protected]>
dc144907
parents:
diff changeset 
    10
 
+           continue;
82fcab7379dd 2006-08-22 Damien Carbery <[email protected]>
dc144907
parents:
diff changeset 
    11
82fcab7379dd 2006-08-22 Damien Carbery <[email protected]>
dc144907
parents:
diff changeset 
    12
 
 	if (!(netload.if_flags & (1L << GLIBTOP_IF_FLAGS_UP)))
82fcab7379dd 2006-08-22 Damien Carbery <[email protected]>
dc144907
parents:
diff changeset 
    13
 
 	    continue;
upstream/oracle/spec-files