Released 2.12.0.

* NEWS:
        * configure.in:

        Released 2.12.0.

ChangeLog

@@ -1,3 +1,22 @@
+2005-09-04  Benoît Dejean  <benoit@placenet.org>
+
+	* NEWS:
+	* configure.in:
+
+	Released 2.12.0.
+
+2005-08-22  Benoît Dejean  <benoit@placenet.org>
+
+	* configure.in:
+
+	Hum hum, it's better if release number is 2.11.92 too.
+
+2005-08-22  Benoît Dejean  <benoit@placenet.org>
+
+	* NEWS:
+
+	Released 2.11.92.
+
 2005-08-08  Benoît Dejean  <benoit@placenet.org>
 
 	* NEWS:

NEWS

@@ -1,3 +1,13 @@
+September 4, 2005: Overview of changes from 2.11.92 to 2.12.0
+=============================================================
+* Updated translations.
+
+August 22, 2005: Overview of changes from 2.11.91 to 2.11.92
+============================================================
+* Linux:
+  - fixed for 2.6 without /sys
+  - glibtop_get_cpu() : Do not add irq, softirq and iowait to idle.
+
 August 9, 2005: Overview of changes from 2.11.90 to 2.11.91
 ===========================================================
 * All:

configure.in

@@ -7,8 +7,8 @@ AM_CONFIG_HEADER(config.h)
 AC_CANONICAL_SYSTEM
 
 LIBGTOP_MAJOR_VERSION=2
-LIBGTOP_MINOR_VERSION=11
-LIBGTOP_MICRO_VERSION=91
+LIBGTOP_MINOR_VERSION=12
+LIBGTOP_MICRO_VERSION=0
 LIBGTOP_VERSION=$LIBGTOP_MAJOR_VERSION.$LIBGTOP_MINOR_VERSION.$LIBGTOP_MICRO_VERSION
 AM_INIT_AUTOMAKE(libgtop, $LIBGTOP_VERSION)
 

po/ChangeLog

@@ -1,3 +1,12 @@
+2005-08-29  Telsa Gwynne  <hobbit@aloss.ukuu.org.uk>
+
+        * cy.po: Updated Welsh translation.
+	
+2005-08-22  Mugurel Tudor  <mugurelu@gnome.ro>
+
+	* ro.po: Updated Romanian translation
+	by Mişu Moldovan <dumol@gnome.ro>
+
 2005-08-02  Dave Neary  <bolsh@gimp.org>
 
 	* tr.po: Fix a C formatting string translation.

po/ca.po

@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libgtop 2.9.91\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-02-16 10:43+0100\n"
-"PO-Revision-Date: 2005-02-16 10:46+0100\n"
+"POT-Creation-Date: 2005-09-04 01:14+0200\n"
+"PO-Revision-Date: 2005-09-04 01:16+0200\n"
 "Last-Translator: Jordi Mallach <jordi@sindominio.net>\n"
 "Language-Team: Catalan <tradgnome@softcatala.org>\n"
 "MIME-Version: 1.0\n"
@@ -41,47 +41,47 @@ msgid_plural "wrote %d bytes"
 msgstr[0] "s'ha escrit %d octet"
 msgstr[1] "s'ha escrit %d octets"
 
-#: ../src/daemon/gnuserv.c:459
+#: ../src/daemon/gnuserv.c:460
 msgid "Enable debugging"
 msgstr "Activa la depuració"
 
-#: ../src/daemon/gnuserv.c:459
+#: ../src/daemon/gnuserv.c:460
 msgid "DEBUG"
 msgstr "DEPURACIÓ"
 
-#: ../src/daemon/gnuserv.c:461
+#: ../src/daemon/gnuserv.c:462
 msgid "Enable verbose output"
 msgstr "Activa la sortida detallada"
 
-#: ../src/daemon/gnuserv.c:461
+#: ../src/daemon/gnuserv.c:462
 msgid "VERBOSE"
 msgstr "DETALLA"
 
-#: ../src/daemon/gnuserv.c:463
+#: ../src/daemon/gnuserv.c:464
 msgid "Don't fork into background"
-msgstr "No bifurquis dintre del fons"
+msgstr "No bifurquis al segon pla"
 
-#: ../src/daemon/gnuserv.c:463
+#: ../src/daemon/gnuserv.c:464
 msgid "NO-DAEMON"
 msgstr "SENSE DIMONI"
 
-#: ../src/daemon/gnuserv.c:465
+#: ../src/daemon/gnuserv.c:466
 msgid "Invoked from inetd"
 msgstr "Ha estat cridat des d'inetd"
 
-#: ../src/daemon/gnuserv.c:465
+#: ../src/daemon/gnuserv.c:466
 msgid "INETD"
 msgstr "INETD"
 
-#: ../src/daemon/gnuserv.c:499
+#: ../src/daemon/gnuserv.c:500
 #, c-format
 msgid ""
 "Error on option %s: %s.\n"
 "Run '%s --help' to see a full list of available command line options.\n"
 msgstr ""
-"Error en l'opció %s: %s.\n"
-"Executa '%s --ajuda' per veure una llista completa de les opcions de línies "
-"d'ordre disponibles.\n"
+"S'ha produït un error en l'opció %s: %s.\n"
+"Executeu '%s --ajuda' per a veure una llista completa de les opcions de "
+"línies d'ordre disponibles.\n"
 
 #: ../sysdeps/osf1/siglist.c:28 ../sysdeps/sun4/siglist.c:28
 msgid "Hangup"
@@ -89,7 +89,7 @@ msgstr "Termina"
 
 #: ../sysdeps/osf1/siglist.c:29 ../sysdeps/sun4/siglist.c:29
 msgid "Interrupt"
-msgstr "Interrumpeix"
+msgstr "Interromp"
 
 #: ../sysdeps/osf1/siglist.c:30 ../sysdeps/sun4/siglist.c:30
 msgid "Quit"
@@ -113,7 +113,7 @@ msgstr "Error EMT"
 
 #: ../sysdeps/osf1/siglist.c:35 ../sysdeps/sun4/siglist.c:35
 msgid "Floating-point exception"
-msgstr "excepció de coma flotant"
+msgstr "Excepció de coma flotant"
 
 #: ../sysdeps/osf1/siglist.c:36 ../sysdeps/sun4/siglist.c:36
 msgid "Kill"
@@ -165,7 +165,7 @@ msgstr "L'estat del fill ha canviat"
 
 #: ../sysdeps/osf1/siglist.c:48 ../sysdeps/sun4/siglist.c:48
 msgid "Background read from tty"
-msgstr "Llegida de tty en segon pla"
+msgstr "Lectura de tty en segon pla"
 
 #: ../sysdeps/osf1/siglist.c:49 ../sysdeps/sun4/siglist.c:49
 msgid "Background write to tty"
@@ -173,7 +173,7 @@ msgstr "Escriptura a tty en segon pla"
 
 #: ../sysdeps/osf1/siglist.c:50 ../sysdeps/sun4/siglist.c:50
 msgid "I/O now possible"
-msgstr "E/E ara possible"
+msgstr "E/S ara és possible"
 
 #: ../sysdeps/osf1/siglist.c:51 ../sysdeps/sun4/siglist.c:51
 msgid "CPU limit exceeded"

sysdeps/linux/ChangeLog

@@ -1,3 +1,9 @@
+2005-08-15  Benoît Dejean  <benoit@placenet.org>
+
+	* cpu.c: (glibtop_get_cpu_s):
+
+	Do not add irq, softirq and iowait to idle.
+
 2005-08-04  Benoît Dejean  <TazForEver@dlfp.org>
 
 	* open.c: (set_linux_version), (glibtop_open_s):

sysdeps/linux/cpu.c

@@ -91,6 +91,7 @@ glibtop_get_cpu_s (glibtop *server, glibtop_cpu *buf)
 	buf->nice = strtoull (p, &p, 0);
 	buf->sys  = strtoull (p, &p, 0);
 	buf->idle = strtoull (p, &p, 0);
+	buf->total = buf->user + buf->nice + buf->sys + buf->idle;
 
 	/* 2.6 kernel */
 	if(server->os_version_code >= LINUX_VERSION_CODE(2, 6, 0))
@@ -99,12 +100,9 @@ glibtop_get_cpu_s (glibtop *server, glibtop_cpu *buf)
 		buf->irq     = strtoull(p, &p, 0);
 		buf->softirq = strtoull(p, &p, 0);
 
-		buf->idle += buf->iowait;
-		buf->sys  += buf->irq + buf->softirq;
+		buf->total += buf->iowait + buf->irq + buf->softirq;
 	}
 
-	buf->total = buf->user + buf->nice + buf->sys + buf->idle;
-
 	buf->frequency = 100;
 	buf->flags = _glibtop_sysdeps_cpu;
 
@@ -125,6 +123,10 @@ glibtop_get_cpu_s (glibtop *server, glibtop_cpu *buf)
 		buf->xcpu_nice [i] = strtoull (p, &p, 0);
 		buf->xcpu_sys  [i] = strtoull (p, &p, 0);
 		buf->xcpu_idle [i] = strtoull (p, &p, 0);
+		buf->xcpu_total[i] = buf->xcpu_user [i] \
+			+ buf->xcpu_nice [i] \
+			+ buf->xcpu_sys  [i] \
+			+ buf->xcpu_idle [i];
 
 		/* 2.6 kernel */
 		if(server->os_version_code >= LINUX_VERSION_CODE(2, 6, 0))
@@ -133,14 +135,10 @@ glibtop_get_cpu_s (glibtop *server, glibtop_cpu *buf)
 			buf->xcpu_irq [i]     = strtoull(p, &p, 0);
 			buf->xcpu_softirq [i] = strtoull(p, &p, 0);
 
-			buf->xcpu_idle [i]  += buf->xcpu_iowait [i];
-			buf->xcpu_sys  [i]  += buf->xcpu_irq [i] + buf->xcpu_softirq [i];
+			buf->xcpu_total [i] += buf->xcpu_iowait [i] \
+				+ buf->xcpu_irq [i] \
+				+ buf->xcpu_softirq [i];
 		}
-
-		buf->xcpu_total[i] = buf->xcpu_user [i] \
-			+ buf->xcpu_nice [i] \
-			+ buf->xcpu_sys  [i] \
-			+ buf->xcpu_idle [i];
 	}
 
 	if(i >= 2) /* ok, that's a real SMP */

sysdeps/solaris/ChangeLog

@@ -1,3 +1,13 @@
+2005-08-12  Benoît Dejean  <benoit@placenet.org>
+
+	* glibtop_server.h:
+	* open.c:
+	* open_suid.c:
+	* procdata.c:
+
+	Added missing includes.
+	Added missing GLIBTOP_SUID_NETLIST.
+
 2004-10-11  Benoît Dejean  <tazforever@dlfp.org>
 
 	* cpu.c: (glibtop_init_cpu_s), (glibtop_get_cpu_s):

sysdeps/solaris/glibtop_server.h

@@ -45,6 +45,7 @@ G_BEGIN_DECLS
 #define GLIBTOP_SUID_PROC_ARGS		0
 #define GLIBTOP_SUID_PROC_MAP		0
 #define GLIBTOP_SUID_NETLOAD		0
+#define GLIBTOP_SUID_NETLIST		0
 #define GLIBTOP_SUID_PPP		0
 
 G_END_DECLS

sysdeps/solaris/open.c

@@ -23,6 +23,7 @@
 
 #include <glibtop/open.h>
 #include <glibtop/cpu.h>
+#include <glibtop/error.h>
 
 #include <unistd.h>
 #include <dlfcn.h>

sysdeps/solaris/open_suid.c

@@ -24,6 +24,7 @@
 #include <glibtop.h>
 #include <glibtop/open.h>
 #include <glibtop/init_hooks.h>
+#include <glibtop/error.h>
 #include <glibtop_suid.h>
 
 #include <unistd.h>

sysdeps/solaris/procdata.c

@@ -24,6 +24,7 @@
 #include <glibtop.h>
 #include <glibtop_private.h>
 #include <glibtop/procuid.h>
+#include <glibtop/error.h>
 
 #include <errno.h>