[Goodies-commits] r5617 - xfce4-power-manager/trunk/src
Ali Abdallah
aliov at xfce.org
Tue Oct 14 17:37:58 CEST 2008
Author: aliov
Date: 2008-10-14 15:37:58 +0000 (Tue, 14 Oct 2008)
New Revision: 5617
Modified:
xfce4-power-manager/trunk/src/xfpm-cpu.c
xfce4-power-manager/trunk/src/xfpm-driver.c
xfce4-power-manager/trunk/src/xfpm-enums.h
xfce4-power-manager/trunk/src/xfpm-settings.c
xfce4-power-manager/trunk/src/xfpm-settings.h
Log:
Cpu freq enum property changed to flags type
Modified: xfce4-power-manager/trunk/src/xfpm-cpu.c
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-cpu.c 2008-10-14 14:45:45 UTC (rev 5616)
+++ xfce4-power-manager/trunk/src/xfpm-cpu.c 2008-10-14 15:37:58 UTC (rev 5617)
@@ -119,7 +119,7 @@
g_object_class_install_property(gobject_class,
PROP_ON_AC_CPU_GOV,
- g_param_spec_enum("on-ac-cpu-gov",
+ g_param_spec_flags("on-ac-cpu-gov",
"On ac cpu gov",
"Cpu governor on AC power",
XFPM_TYPE_CPU_GOVERNOR,
@@ -127,7 +127,7 @@
G_PARAM_READWRITE));
g_object_class_install_property(gobject_class,
PROP_ON_BATT_CPU_GOV,
- g_param_spec_enum("on-batt-cpu-gov",
+ g_param_spec_flags("on-batt-cpu-gov",
"On battery cpu gov",
"Cpu governor on battery power",
XFPM_TYPE_CPU_GOVERNOR,
@@ -173,10 +173,10 @@
cpu->cpu_freq_enabled = g_value_get_boolean(value);
break;
case PROP_ON_AC_CPU_GOV:
- cpu->on_ac_cpu_gov = g_value_get_enum(value);
+ cpu->on_ac_cpu_gov = g_value_get_flags(value);
break;
case PROP_ON_BATT_CPU_GOV:
- cpu->on_batt_cpu_gov = g_value_get_enum(value);
+ cpu->on_batt_cpu_gov = g_value_get_flags(value);
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID(object,prop_id,pspec);
@@ -201,10 +201,10 @@
g_value_set_boolean(value,cpu->cpu_freq_enabled);
break;
case PROP_ON_AC_CPU_GOV:
- g_value_set_enum(value,cpu->on_ac_cpu_gov);
+ g_value_set_flags(value,cpu->on_ac_cpu_gov);
break;
case PROP_ON_BATT_CPU_GOV:
- g_value_set_enum(value,cpu->on_batt_cpu_gov);
+ g_value_set_flags(value,cpu->on_batt_cpu_gov);
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID(object,prop_id,pspec);
Modified: xfce4-power-manager/trunk/src/xfpm-driver.c
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-driver.c 2008-10-14 14:45:45 UTC (rev 5616)
+++ xfce4-power-manager/trunk/src/xfpm-driver.c 2008-10-14 15:37:58 UTC (rev 5617)
@@ -439,8 +439,7 @@
G_CALLBACK(xfpm_driver_property_changed_cb),drv);
gchar **govs;
- int i = 0;
- gint8 gov[5] = { 0, };
+ guint8 gov = 0;
govs = xfpm_hal_get_available_cpu_governors(priv->hal,&g_error);
if ( g_error )
@@ -449,16 +448,16 @@
g_error_free(g_error);
goto no_gov;
}
-
+ int i = 0;
if ( govs )
{
for ( i = 0 ; govs[i] ; i++ )
{
- if ( !strcmp(govs[i],"powersave") ) gov[0] = 1;
- if ( !strcmp(govs[i],"ondemand") ) gov[1] = 1;
- if ( !strcmp(govs[i],"performance") ) gov[2] = 1;
- if ( !strcmp(govs[i],"conservative") ) gov[3] = 1;
- if ( !strcmp(govs[i],"userspace") ) gov[4] = 1;
+ if ( !strcmp(govs[i],"powersave") ) gov |= POWERSAVE;
+ if ( !strcmp(govs[i],"ondemand") ) gov |= ONDEMAND;
+ if ( !strcmp(govs[i],"performance") ) gov |= PERFORMANCE;
+ if ( !strcmp(govs[i],"conservative") ) gov |= CONSERVATIVE;
+ if ( !strcmp(govs[i],"userspace") ) gov |= USERSPACE;
}
libhal_free_string_array(govs);
}
Modified: xfce4-power-manager/trunk/src/xfpm-enums.h
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-enums.h 2008-10-14 14:45:45 UTC (rev 5616)
+++ xfce4-power-manager/trunk/src/xfpm-enums.h 2008-10-14 15:37:58 UTC (rev 5617)
@@ -47,11 +47,11 @@
/* CPU Freq Linux governors */
typedef enum
{
- POWERSAVE,
- ONDEMAND,
- PERFORMANCE,
- CONSERVATIVE,
- USERSPACE
+ POWERSAVE = (1<<0),
+ ONDEMAND = (1<<1),
+ PERFORMANCE = (1<<2),
+ CONSERVATIVE = (1<<3),
+ USERSPACE = (1<<4)
} XfpmCpuGovernor;
Modified: xfce4-power-manager/trunk/src/xfpm-settings.c
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-settings.c 2008-10-14 14:45:45 UTC (rev 5616)
+++ xfce4-power-manager/trunk/src/xfpm-settings.c 2008-10-14 15:37:58 UTC (rev 5617)
@@ -466,7 +466,7 @@
}
static GtkWidget *
-xfpm_settings_cpu_on_ac_adapter(XfconfChannel *channel,gint8 *govs,const gchar *label)
+xfpm_settings_cpu_on_ac_adapter(XfconfChannel *channel,guint8 govs,const gchar *label)
{
GtkWidget *frame;
GtkWidget *align;
@@ -504,7 +504,7 @@
conservative_on_ac = gtk_radio_button_new_with_label(list,_("Conservative"));
gtk_box_pack_start (GTK_BOX (vbox), conservative_on_ac, FALSE, FALSE, 0);
- if ( govs[0] == 1 )
+ if ( govs & POWERSAVE )
{
gtk_widget_set_sensitive(powersave_on_ac,enable);
g_signal_connect(powersave_on_ac,"pressed",G_CALLBACK(set_powersave_on_ac_cb),channel);
@@ -514,7 +514,7 @@
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(powersave_on_ac),TRUE);
}
}
- if ( govs[1] == 1 )
+ if ( govs & ONDEMAND )
{
gtk_widget_set_sensitive(ondemand_on_ac,enable);
g_signal_connect(ondemand_on_ac,"pressed",G_CALLBACK(set_ondemand_on_ac_cb),channel);
@@ -524,7 +524,7 @@
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(ondemand_on_ac),TRUE);
}
}
- if ( govs[2] == 1 )
+ if ( govs & PERFORMANCE )
{
gtk_widget_set_sensitive(performance_on_ac,enable);
g_signal_connect(performance_on_ac,"pressed",G_CALLBACK(set_performance_on_ac_cb),channel);
@@ -534,7 +534,7 @@
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(performance_on_ac),TRUE);
}
}
- if ( govs[3] == 1 )
+ if ( govs & CONSERVATIVE )
{
gtk_widget_set_sensitive(conservative_on_ac,enable);
g_signal_connect(conservative_on_ac,"pressed",G_CALLBACK(set_conservative_on_ac_cb),channel);
@@ -544,7 +544,7 @@
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(conservative_on_ac),TRUE);
}
}
- if ( govs[4] == 1 )
+ if ( govs & USERSPACE )
{
gtk_widget_set_sensitive(userspace_on_ac,enable);
g_signal_connect(userspace_on_ac,"pressed",G_CALLBACK(set_userspace_on_ac_cb),channel);
@@ -559,7 +559,7 @@
}
static GtkWidget *
-xfpm_settings_cpu_on_battery_power(XfconfChannel *channel,gint8 *govs)
+xfpm_settings_cpu_on_battery_power(XfconfChannel *channel,guint8 govs)
{
GtkWidget *frame;
GtkWidget *align;
@@ -597,7 +597,7 @@
conservative_on_batt = gtk_radio_button_new_with_label(list,_("Conservative"));
gtk_box_pack_start (GTK_BOX (vbox), conservative_on_batt, FALSE, FALSE, 0);
- if ( govs[0] == 1 )
+ if ( govs & POWERSAVE )
{
gtk_widget_set_sensitive(powersave_on_batt,enable);
g_signal_connect(powersave_on_batt,"pressed",G_CALLBACK(set_powersave_on_batt_cb),channel);
@@ -607,7 +607,7 @@
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(powersave_on_batt),TRUE);
}
}
- if ( govs[1] == 1 )
+ if ( govs & ONDEMAND )
{
gtk_widget_set_sensitive(ondemand_on_batt,enable);
g_signal_connect(ondemand_on_batt,"pressed",G_CALLBACK(set_ondemand_on_batt_cb),channel);
@@ -617,7 +617,7 @@
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(ondemand_on_batt),TRUE);
}
}
- if ( govs[2] == 1 )
+ if ( govs & PERFORMANCE )
{
gtk_widget_set_sensitive(performance_on_batt,enable);
g_signal_connect(performance_on_batt,"pressed",G_CALLBACK(set_performance_on_batt_cb),channel);
@@ -627,7 +627,7 @@
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(performance_on_batt),TRUE);
}
}
- if ( govs[3] == 1 )
+ if ( govs & CONSERVATIVE )
{
gtk_widget_set_sensitive(conservative_on_batt,enable);
g_signal_connect(conservative_on_batt,"pressed",G_CALLBACK(set_conservative_on_batt_cb),channel);
@@ -637,7 +637,7 @@
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(conservative_on_batt),TRUE);
}
}
- if ( govs[4] == 1 )
+ if ( govs & USERSPACE )
{
gtk_widget_set_sensitive(userspace_on_batt,enable);
g_signal_connect(userspace_on_batt,"pressed",G_CALLBACK(set_userspace_on_batt_cb),channel);
@@ -653,7 +653,7 @@
}
static GtkWidget *
-xfpm_settings_cpu_freq(XfconfChannel *channel,gint8 *govs,gboolean laptop)
+xfpm_settings_cpu_freq(XfconfChannel *channel,guint8 govs,gboolean laptop)
{
GtkWidget *hbox;
hbox = gtk_hbox_new(FALSE,2);
@@ -665,8 +665,7 @@
gtk_box_pack_start(GTK_BOX(vbox),hbox,TRUE,TRUE,0);
- gboolean found_governor = govs[0] || govs[1] || govs[2] || govs[3] || govs[4];
- if (!found_governor)
+ if ( !govs )
{
GtkWidget *label;
label = gtk_label_new(_("No CPU governor found"));
@@ -1115,7 +1114,7 @@
GtkWidget *
xfpm_settings_new(XfconfChannel *channel,gboolean is_laptop,
gboolean can_hibernate,gboolean can_suspend,
- gboolean dpms_capable,gint8 *govs)
+ gboolean dpms_capable,guint8 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-14 14:45:45 UTC (rev 5616)
+++ xfce4-power-manager/trunk/src/xfpm-settings.h 2008-10-14 15:37:58 UTC (rev 5617)
@@ -24,7 +24,7 @@
GtkWidget *xfpm_settings_new(XfconfChannel *channel,gboolean is_laptop,
gboolean can_hibernate,gboolean can_suspend,
- gboolean dpms_capable,gint8 *govs);
+ gboolean dpms_capable,guint8 govs);
#endif /* __XFPM_SETTINGS_H */
More information about the Goodies-commits
mailing list