diff options
| author | Marco Pesenti Gritti <marco@localhost.localdomain> | 2007-06-14 08:26:21 (GMT) |
|---|---|---|
| committer | Marco Pesenti Gritti <marco@localhost.localdomain> | 2007-06-14 08:26:21 (GMT) |
| commit | e6e649419a9d64e13b3e991721e6f5ff8389aa27 (patch) | |
| tree | 1470512fbeda19fd8b3d09decf8f3a7d49fdedde | |
| parent | 361b8372b69af315dbbab2b8d1662736223a92ff (diff) | |
| parent | a590186e78bf7b68c9f253f83a1b43257dec0611 (diff) | |
Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar
| -rw-r--r-- | services/console/interface/xo/cpu.py | 3 | ||||
| -rw-r--r-- | sugar/objects/Makefile.am | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/services/console/interface/xo/cpu.py b/services/console/interface/xo/cpu.py index 827a2a5..92e1af1 100644 --- a/services/console/interface/xo/cpu.py +++ b/services/console/interface/xo/cpu.py @@ -27,7 +27,6 @@ import procmem from graphics.frequency import HorizontalGraphic class CPU_Usage: - _CPU_HZ = 0 _last_jiffies = 0 _times = 0 @@ -99,7 +98,7 @@ class XO_CPU(gtk.Frame): self.add(fixed) self._DRW_CPU = CPU_Usage() - self._DRW_CPU.frequency = 1200 # 1 Second + self._DRW_CPU.frequency = 1000 # 1 Second gobject.timeout_add(self._DRW_CPU.frequency, self._update_cpu_usage) diff --git a/sugar/objects/Makefile.am b/sugar/objects/Makefile.am index 35d4ddc..fedb749 100644 --- a/sugar/objects/Makefile.am +++ b/sugar/objects/Makefile.am @@ -1,4 +1,6 @@ sugardir = $(pythondir)/sugar/objects sugar_PYTHON = \ __init__.py \ - mime.py + mime.py \ + objecttype.py + |