12373N/Adiff -Nur gnome-power-manager-2.21.1-org/src/gpm-array-float.c gnome-power-manager-2.21.1/src/gpm-array-float.c

12373N/A--- gnome-power-manager-2.21.1-org/src/gpm-array-float.c 2007-12-17 17:12:56.275650000 +0800

12373N/A+++ gnome-power-manager-2.21.1/src/gpm-array-float.c 2007-12-17 17:02:07.642824000 +0800

12373N/A@@ -75,7 +75,7 @@

12373N/A *

12373N/A * @array: input array

12373N/A **/

12373N/A-inline gfloat

12373N/A+gfloat

12373N/A gpm_array_float_get (GArray *array, guint i)

12373N/A {

12373N/A if (i >= array->len) {

12373N/A@@ -89,7 +89,7 @@

12373N/A *

12373N/A * @array: input array

12373N/A **/

12373N/A-inline void

12373N/A+void

12373N/A gpm_array_float_set (GArray *array, guint i, gfloat value)

12373N/A {

12373N/A g_array_index (array, gfloat, i) = value;

12373N/Adiff -Nur gnome-power-manager-2.21.1-org/src/gpm-array-float.h gnome-power-manager-2.21.1/src/gpm-array-float.h

12373N/A--- gnome-power-manager-2.21.1-org/src/gpm-array-float.h 2007-12-17 17:12:56.277090000 +0800

12373N/A+++ gnome-power-manager-2.21.1/src/gpm-array-float.h 2007-12-17 17:02:07.643637000 +0800

12373N/A@@ -49,9 +49,9 @@

12373N/A gboolean gpm_array_float_print (GArray *array);

12373N/A GArray *gpm_array_float_convolve (GArray *data,

12373N/A GArray *kernel);

12373N/A-inline gfloat gpm_array_float_get (GArray *array,

12373N/A+gfloat gpm_array_float_get (GArray *array,

12373N/A guint i);

12373N/A-inline void gpm_array_float_set (GArray *array,

12373N/A+void gpm_array_float_set (GArray *array,

12373N/A guint i,

12373N/A gfloat value);

12373N/A

12373N/Adiff -Nur gnome-power-manager-2.21.1-org/src/gpm-debug.h gnome-power-manager-2.21.1/src/gpm-debug.h

12373N/A--- gnome-power-manager-2.21.1-org/src/gpm-debug.h 2007-12-17 17:12:56.284090000 +0800

12373N/A+++ gnome-power-manager-2.21.1/src/gpm-debug.h 2007-12-17 17:02:07.650493000 +0800

12373N/A@@ -28,7 +28,7 @@

12373N/A

12373N/A G_BEGIN_DECLS

12373N/A

12373N/A-#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L

12373N/A+#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199409L

12373N/A #define gpm_debug(...) gpm_debug_real (__func__, __FILE__, __LINE__, __VA_ARGS__)

12373N/A #define gpm_warning(...) gpm_warning_real (__func__, __FILE__, __LINE__, __VA_ARGS__)

12373N/A #define gpm_error(...) gpm_error_real (__func__, __FILE__, __LINE__, __VA_ARGS__)

12373N/A+dnl ---------------------------------------------------------------------------

12373N/A dnl - Where should we put documentation ?

12373N/A dnl ---------------------------------------------------------------------------

12373N/A AC_ARG_WITH(doc-dir,

14093N/A--- gnome-power-manager-2.23.91/configure.ac.orig 2008-09-02 10:39:13.239161437 +0800

14093N/A+++ gnome-power-manager-2.23.91/configure.ac 2008-09-02 10:39:31.005118555 +0800

14093N/A@@ -246,7 +246,7 @@

14093N/A AC_ARG_ENABLE(gconf-defaults,

14093N/A AS_HELP_STRING([--disable-gconf-defaults],

14093N/A [Allow setting gconf default settings]),

13307N/A- enable_gconfdefaults=$enableval,enable_gconfdefaults=yes)

13307N/A+ enable_gconfdefaults=$enableval,enable_gconfdefaults=no)

14093N/A

13307N/A AC_MSG_CHECKING([whether to support gconf defaults])

13307N/A have_gconfdefaults=no