diff options
| author | Steve Zesch <[email protected]> | 2012-03-17 10:23:09 -0700 |
|---|---|---|
| committer | Steve Zesch <[email protected]> | 2012-03-17 10:23:09 -0700 |
| commit | ccfcf2483ffb52d0af9caaf52db4be44ec6ac160 (patch) | |
| tree | f5b0cca4773de2ad8de12ab8c91f70dc95830ee1 | |
| parent | 285e040fd7ba4bedc25054790b4de9eb0fcb6410 (diff) | |
| parent | 3178d77b55f106694ad9aa1e27f437ac1cca862b (diff) | |
| download | mate-power-manager-ccfcf2483ffb52d0af9caaf52db4be44ec6ac160.tar.bz2 mate-power-manager-ccfcf2483ffb52d0af9caaf52db4be44ec6ac160.tar.xz | |
Merge pull request #6 from benpicco/master
sync with upstream
| -rw-r--r-- | src/egg-discrete.c | 4 | ||||
| -rw-r--r-- | src/gpm-load.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/egg-discrete.c b/src/egg-discrete.c index a051282..fe910cc 100644 --- a/src/egg-discrete.c +++ b/src/egg-discrete.c @@ -47,7 +47,7 @@ egg_discrete_from_percent (guint percentage, guint levels) egg_warning ("levels is 0!"); return 0; } - return ((gfloat) percentage * (gfloat) (levels - 1)) / 100.0f; + return (guint) ((((gfloat) percentage * (gfloat) (levels - 1)) / 100.0f) + 0.5f); } /** @@ -69,7 +69,7 @@ egg_discrete_to_percent (guint discrete, guint levels) egg_warning ("levels is 0!"); return 0; } - return (guint) ((gfloat) discrete * (100.0f / (gfloat) (levels - 1))); + return (guint) (((gfloat) discrete * (100.0f / (gfloat) (levels - 1))) + 0.5f); } /** diff --git a/src/gpm-load.c b/src/gpm-load.c index eab0129..3b0f572 100644 --- a/src/gpm-load.c +++ b/src/gpm-load.c @@ -192,7 +192,7 @@ gpm_load_get_cpu_values (long unsigned *cpu_idle, long unsigned *cpu_total) *cpu_total = cpu_user + cpu_nice + cpu_system + *cpu_idle; ret = TRUE; out: - if (!fd) + if (fd) fclose (fd); return ret; } |