From 3b3bddfeea90ce4d33aa137d6b64b066e81324f3 Mon Sep 17 00:00:00 2001 From: Pedro Martinez-Julia Date: Mon, 7 Mar 2011 22:31:40 +0000 Subject: Fixed #644143, how to convert from percentage to discrete and vice-versa. Signed-off-by: Richard Hughes --- src/egg-discrete.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src') 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); } /** -- cgit v1.2.1 From 3178d77b55f106694ad9aa1e27f437ac1cca862b Mon Sep 17 00:00:00 2001 From: Antoine Jacoutot Date: Tue, 24 May 2011 11:15:08 +0000 Subject: Don't try to close a non-opened fd On OpenBSD we do not use /proc. As a result, gnome-power-manager segfaults on startup due to a reverse logic in the code. Signed-off-by: Richard Hughes --- src/gpm-load.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') 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; } -- cgit v1.2.1