[Goodies-commits] r5599 - xfce4-power-manager/trunk/src

[Ali Abdallah]

Author: aliov
Date: 2008-10-13 08:14:07 +0000 (Mon, 13 Oct 2008)
New Revision: 5599

Modified:
   xfce4-power-manager/trunk/src/xfpm-dpms-spins.c
   xfce4-power-manager/trunk/src/xfpm-dpms-spins.h
   xfce4-power-manager/trunk/src/xfpm-driver.c
   xfce4-power-manager/trunk/src/xfpm-settings.c
   xfce4-power-manager/trunk/src/xfpm-settings.h
Log:
Cpu property settings fixes

Modified: xfce4-power-manager/trunk/src/xfpm-dpms-spins.c
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-dpms-spins.c	2008-10-12 21:28:23 UTC (rev 5598)
+++ xfce4-power-manager/trunk/src/xfpm-dpms-spins.c	2008-10-13 08:14:07 UTC (rev 5599)
@@ -19,7 +19,24 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include <gtk/gtk.h>
+#include <stdio.h>
+
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
+
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
+
+#ifdef HAVE_ERRNO_H
+#include <errno.h>
+#endif
+
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
 #include <glib/gi18n.h>
 
 #include "xfpm-dpms-spins.h"

Modified: xfce4-power-manager/trunk/src/xfpm-dpms-spins.h
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-dpms-spins.h	2008-10-12 21:28:23 UTC (rev 5598)
+++ xfce4-power-manager/trunk/src/xfpm-dpms-spins.h	2008-10-13 08:14:07 UTC (rev 5599)
@@ -23,9 +23,11 @@
 #define __XFPM_DPMS_SPINS_H
 
 #include <glib-object.h>
-#include <gtk/gtkvbox.h>
+#include <gtk/gtk.h>
 
-#include "config.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #ifdef HAVE_DPMS
 

Modified: xfce4-power-manager/trunk/src/xfpm-driver.c
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-driver.c	2008-10-12 21:28:23 UTC (rev 5598)
+++ xfce4-power-manager/trunk/src/xfpm-driver.c	2008-10-13 08:14:07 UTC (rev 5599)
@@ -289,7 +289,7 @@
     if ( !strcmp(property,CPU_FREQ_SCALING_CFG) ) 
     {
         gboolean val = g_value_get_boolean(value);
-        g_object_set(G_OBJECT(priv->cpu),"cpu-freq-scaling-enabled",val,NULL);
+        g_object_set(G_OBJECT(priv->cpu),"cpu-freq",val,NULL);
         return;
     }
     
@@ -433,8 +433,13 @@
     gchar **govs;
     govs = xfpm_hal_get_available_cpu_governors(priv->hal);
     int i = 0;
-    guint8 gov[4] = { -1, };
+    gint8 gov[4] = { 0, };
     
+    for ( i = 0 ; i <= 4 ; i++ )
+    {
+        g_print("gov[%d]=%d\n",i,gov[i]);
+    }
+    
     if ( govs ) 
     {
         for ( i = 0 ; govs[i] ; i++ )

Modified: xfce4-power-manager/trunk/src/xfpm-settings.c
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-settings.c	2008-10-12 21:28:23 UTC (rev 5598)
+++ xfce4-power-manager/trunk/src/xfpm-settings.c	2008-10-13 08:14:07 UTC (rev 5599)
@@ -439,7 +439,7 @@
 }
 
 static GtkWidget *
-xfpm_settings_cpu_on_ac_adapter(XfconfChannel *channel,guint8 *govs,const gchar *label)
+xfpm_settings_cpu_on_ac_adapter(XfconfChannel *channel,gint8 *govs,const gchar *label)
 {
     GtkWidget *frame;
     GtkWidget *align;
@@ -532,7 +532,7 @@
 }
 
 static GtkWidget *
-xfpm_settings_cpu_on_battery_power(XfconfChannel *channel,guint8 *govs)
+xfpm_settings_cpu_on_battery_power(XfconfChannel *channel,gint8 *govs)
 {
     GtkWidget *frame;
     GtkWidget *align;
@@ -626,7 +626,7 @@
 }
 
 static GtkWidget *
-xfpm_settings_cpu_freq(XfconfChannel *channel,guint8 *govs,gboolean laptop)
+xfpm_settings_cpu_freq(XfconfChannel *channel,gint8 *govs,gboolean laptop)
 {
     GtkWidget *hbox;
     hbox = gtk_hbox_new(FALSE,2);
@@ -1027,7 +1027,7 @@
 GtkWidget *
 xfpm_settings_new(XfconfChannel *channel,gboolean is_laptop,
                   gboolean can_hibernate,gboolean can_suspend,
-                  gboolean dpms_capable,guint8 *govs)
+                  gboolean dpms_capable,gint8 *govs)
 {
     GtkWidget *Dialog;  /* Main dialog window */
     GtkWidget *mainbox; /* Box to get (Dialog)->vbox */

Modified: xfce4-power-manager/trunk/src/xfpm-settings.h
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-settings.h	2008-10-12 21:28:23 UTC (rev 5598)
+++ xfce4-power-manager/trunk/src/xfpm-settings.h	2008-10-13 08:14:07 UTC (rev 5599)
@@ -24,7 +24,7 @@
 
 GtkWidget *xfpm_settings_new(XfconfChannel *channel,gboolean is_laptop,
                              gboolean can_hibernate,gboolean can_suspend,
-                             gboolean dpms_capable,guint8 *govs);
+                             gboolean dpms_capable,gint8 *govs);
 
 
 #endif /* __XFPM_SETTINGS_H */