[Xfce4-commits] [xfce/xfce4-power-manager] 01/01: Whitespace fixes
noreply at xfce.org
noreply at xfce.org
Sun Apr 14 23:47:38 CEST 2019
This is an automated email from the git hooks/post-receive script.
o c h o s i p u s h e d a c o m m i t t o b r a n c h m a s t e r
in repository xfce/xfce4-power-manager.
commit ee9422d7ad470cd3599777bdb0d45b702e56f069
Author: Simon Steinbeiss <simon.steinbeiss at elfenbeinturm.at>
Date: Sun Apr 14 23:47:34 2019 +0200
Whitespace fixes
---
panel-plugins/power-manager-plugin/scalemenuitem.c | 2 +-
settings/xfpm-settings.c | 262 ++++++++++-----------
src/egg-idletime.c | 1 -
src/xfce-screensaver.c | 6 +-
src/xfpm-backlight.h | 4 +-
src/xfpm-button.c | 66 +++---
src/xfpm-button.h | 6 +-
src/xfpm-console-kit.c | 32 +--
src/xfpm-console-kit.h | 4 +-
src/xfpm-dpms.c | 56 ++---
src/xfpm-dpms.h | 4 +-
src/xfpm-errors.h | 2 +-
src/xfpm-inhibit.c | 74 +++---
src/xfpm-inhibit.h | 4 +-
src/xfpm-main.c | 82 +++----
src/xfpm-manager.h | 4 +-
src/xfpm-network-manager.c | 16 +-
src/xfpm-polkit.c | 82 +++----
src/xfpm-polkit.h | 6 +-
src/xfpm-power.h | 20 +-
src/xfpm-xfconf.c | 66 +++---
src/xfpm-xfconf.h | 4 +-
22 files changed, 401 insertions(+), 402 deletions(-)
diff --git a/panel-plugins/power-manager-plugin/scalemenuitem.c b/panel-plugins/power-manager-plugin/scalemenuitem.c
index 8d85c8c..13383b1 100644
--- a/panel-plugins/power-manager-plugin/scalemenuitem.c
+++ b/panel-plugins/power-manager-plugin/scalemenuitem.c
@@ -114,7 +114,7 @@ scale_menu_item_class_init (ScaleMenuItemClass *item_class)
* ScaleMenuItem::slider-grabbed:
* @menuitem: The #ScaleMenuItem emitting the signal.
*
- * The ::slider-grabbed signal is emitted when the pointer selects the slider.
+ * The ::slider-grabbed signal is emitted when the pointer selects the slider.
*/
signals[SLIDER_GRABBED] = g_signal_new ("slider-grabbed",
G_OBJECT_CLASS_TYPE (gobject_class),
diff --git a/settings/xfpm-settings.c b/settings/xfpm-settings.c
index 45b56c2..26dbfc1 100644
--- a/settings/xfpm-settings.c
+++ b/settings/xfpm-settings.c
@@ -119,25 +119,25 @@ enum
void brightness_level_on_ac (GtkWidget *w,
XfconfChannel *channel);
-void brightness_level_on_battery (GtkWidget *w,
+void brightness_level_on_battery (GtkWidget *w,
XfconfChannel *channel);
-void battery_critical_changed_cb (GtkWidget *w,
+void battery_critical_changed_cb (GtkWidget *w,
XfconfChannel *channel);
-void inactivity_on_ac_value_changed_cb (GtkWidget *widget,
+void inactivity_on_ac_value_changed_cb (GtkWidget *widget,
XfconfChannel *channel);
-void inactivity_on_battery_value_changed_cb (GtkWidget *widget,
+void inactivity_on_battery_value_changed_cb (GtkWidget *widget,
XfconfChannel *channel);
-void button_sleep_changed_cb (GtkWidget *w,
+void button_sleep_changed_cb (GtkWidget *w,
XfconfChannel *channel);
-void button_power_changed_cb (GtkWidget *w,
+void button_power_changed_cb (GtkWidget *w,
XfconfChannel *channel);
-void button_hibernate_changed_cb (GtkWidget *w,
+void button_hibernate_changed_cb (GtkWidget *w,
XfconfChannel *channel);
void button_battery_changed_cb (GtkWidget *w,
@@ -150,22 +150,22 @@ void dpms_toggled_cb (GtkWidget *w,
gboolean is_active,
XfconfChannel *channel);
-void sleep_on_battery_value_changed_cb (GtkWidget *w,
+void sleep_on_battery_value_changed_cb (GtkWidget *w,
XfconfChannel *channel);
void display_blank_on_battery_value_changed_cb (GtkWidget *w,
XfconfChannel *channel);
-void off_on_battery_value_changed_cb (GtkWidget *w,
+void off_on_battery_value_changed_cb (GtkWidget *w,
XfconfChannel *channel);
void display_blank_on_ac_value_changed_cb (GtkWidget *w,
XfconfChannel *channel);
-void sleep_on_ac_value_changed_cb (GtkWidget *w,
+void sleep_on_ac_value_changed_cb (GtkWidget *w,
XfconfChannel *channel);
-void off_on_ac_value_changed_cb (GtkWidget *w,
+void off_on_ac_value_changed_cb (GtkWidget *w,
XfconfChannel *channel);
gchar *format_dpms_value_cb (gint value);
@@ -176,25 +176,25 @@ gchar *format_brightness_value_cb (gint value);
gchar *format_brightness_percentage_cb (gint value);
-void brightness_on_battery_value_changed_cb (GtkWidget *w,
+void brightness_on_battery_value_changed_cb (GtkWidget *w,
XfconfChannel *channel);
-void brightness_on_ac_value_changed_cb (GtkWidget *w,
+void brightness_on_ac_value_changed_cb (GtkWidget *w,
XfconfChannel *channel);
-gboolean critical_spin_output_cb (GtkSpinButton *w,
+gboolean critical_spin_output_cb (GtkSpinButton *w,
gpointer data);
-void on_battery_lid_changed_cb (GtkWidget *w,
+void on_battery_lid_changed_cb (GtkWidget *w,
XfconfChannel *channel);
-void on_ac_lid_changed_cb (GtkWidget *w,
+void on_ac_lid_changed_cb (GtkWidget *w,
XfconfChannel *channel);
-void critical_level_value_changed_cb (GtkSpinButton *w,
+void critical_level_value_changed_cb (GtkSpinButton *w,
XfconfChannel *channel);
-void lock_screen_toggled_cb (GtkWidget *w,
+void lock_screen_toggled_cb (GtkWidget *w,
XfconfChannel *channel);
static void view_cursor_changed_cb (GtkTreeView *view,
@@ -229,7 +229,7 @@ update_label (GtkWidget *label, GtkWidget *scale, gchar* (*format)(gint))
void brightness_level_on_ac (GtkWidget *w, XfconfChannel *channel)
{
guint val = (guint) gtk_range_get_value (GTK_RANGE (w));
-
+
if (!xfconf_channel_set_uint (channel, XFPM_PROPERTIES_PREFIX BRIGHTNESS_LEVEL_ON_AC, val) )
{
g_critical ("Unable to set value %u for property %s\n", val, BRIGHTNESS_LEVEL_ON_AC);
@@ -241,7 +241,7 @@ void brightness_level_on_ac (GtkWidget *w, XfconfChannel *channel)
void brightness_level_on_battery (GtkWidget *w, XfconfChannel *channel)
{
guint val = (guint) gtk_range_get_value (GTK_RANGE (w));
-
+
if (!xfconf_channel_set_uint (channel, XFPM_PROPERTIES_PREFIX BRIGHTNESS_LEVEL_ON_BATTERY, val) )
{
g_critical ("Unable to set value %u for property %s\n", val, BRIGHTNESS_LEVEL_ON_BATTERY);
@@ -256,18 +256,18 @@ battery_critical_changed_cb (GtkWidget *w, XfconfChannel *channel)
GtkTreeModel *model;
GtkTreeIter selected_row;
gint value = 0;
-
+
if (!gtk_combo_box_get_active_iter (GTK_COMBO_BOX (w), &selected_row))
return;
-
+
model = gtk_combo_box_get_model (GTK_COMBO_BOX(w));
-
+
gtk_tree_model_get(model,
&selected_row,
1,
&value,
-1);
-
+
if (!xfconf_channel_set_uint (channel, XFPM_PROPERTIES_PREFIX CRITICAL_BATT_ACTION_CFG, value) )
{
g_critical ("Cannot set value for property %s\n", CRITICAL_BATT_ACTION_CFG);
@@ -278,7 +278,7 @@ void
inactivity_on_ac_value_changed_cb (GtkWidget *widget, XfconfChannel *channel)
{
gint value = (gint)gtk_range_get_value (GTK_RANGE (widget));
-
+
if (!xfconf_channel_set_uint (channel, XFPM_PROPERTIES_PREFIX ON_AC_INACTIVITY_TIMEOUT, value))
{
g_critical ("Cannot set value for property %s\n", ON_AC_INACTIVITY_TIMEOUT);
@@ -291,7 +291,7 @@ void
inactivity_on_battery_value_changed_cb (GtkWidget *widget, XfconfChannel *channel)
{
gint value = (gint)gtk_range_get_value (GTK_RANGE (widget));
-
+
if (!xfconf_channel_set_uint (channel, XFPM_PROPERTIES_PREFIX ON_BATTERY_INACTIVITY_TIMEOUT, value))
{
g_critical ("Cannot set value for property %s\n", ON_BATTERY_INACTIVITY_TIMEOUT);
@@ -306,18 +306,18 @@ button_sleep_changed_cb (GtkWidget *w, XfconfChannel *channel)
GtkTreeModel *model;
GtkTreeIter selected_row;
gint value = 0;
-
+
if (!gtk_combo_box_get_active_iter (GTK_COMBO_BOX (w), &selected_row))
return;
-
+
model = gtk_combo_box_get_model (GTK_COMBO_BOX(w));
-
+
gtk_tree_model_get(model,
&selected_row,
1,
&value,
-1);
-
+
if (!xfconf_channel_set_uint (channel, XFPM_PROPERTIES_PREFIX SLEEP_SWITCH_CFG, value ) )
{
g_critical ("Cannot set value for property %s\n", SLEEP_SWITCH_CFG);
@@ -330,18 +330,18 @@ button_power_changed_cb (GtkWidget *w, XfconfChannel *channel)
GtkTreeModel *model;
GtkTreeIter selected_row;
gint value = 0;
-
+
if (!gtk_combo_box_get_active_iter (GTK_COMBO_BOX (w), &selected_row))
return;
-
+
model = gtk_combo_box_get_model (GTK_COMBO_BOX(w));
-
+
gtk_tree_model_get(model,
&selected_row,
1,
&value,
-1);
-
+
if (!xfconf_channel_set_uint (channel, XFPM_PROPERTIES_PREFIX POWER_SWITCH_CFG, value) )
{
g_critical ("Cannot set value for property %s\n", POWER_SWITCH_CFG);
@@ -354,18 +354,18 @@ button_hibernate_changed_cb (GtkWidget *w, XfconfChannel *channel)
GtkTreeModel *model;
GtkTreeIter selected_row;
gint value = 0;
-
+
if (!gtk_combo_box_get_active_iter (GTK_COMBO_BOX (w), &selected_row))
return;
-
+
model = gtk_combo_box_get_model (GTK_COMBO_BOX(w));
-
+
gtk_tree_model_get(model,
&selected_row,
1,
&value,
-1);
-
+
if (!xfconf_channel_set_uint (channel, XFPM_PROPERTIES_PREFIX HIBERNATE_SWITCH_CFG, value ) )
{
g_critical ("Cannot set value for property %s\n", HIBERNATE_SWITCH_CFG);
@@ -448,12 +448,12 @@ void
dpms_toggled_cb (GtkWidget *w, gboolean is_active, XfconfChannel *channel)
{
xfconf_channel_set_bool (channel, XFPM_PROPERTIES_PREFIX DPMS_ENABLED_CFG, is_active);
-
+
gtk_widget_set_sensitive (on_ac_dpms_off, is_active);
gtk_widget_set_sensitive (on_ac_dpms_sleep, is_active);
gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (xml, "dpms-sleep-label")), is_active);
gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (xml, "dpms-off-label")), is_active);
-
+
if ( GTK_IS_WIDGET (on_battery_dpms_off ) )
{
gtk_widget_set_sensitive (on_battery_dpms_off, is_active);
@@ -499,7 +499,7 @@ sleep_on_battery_value_changed_cb (GtkWidget *w, XfconfChannel *channel)
gint sleep_value = (gint) gtk_range_get_value (GTK_RANGE (w));
gint blank_value = (gint) gtk_range_get_value (GTK_RANGE (on_battery_display_blank));
gint brightness_value;
-
+
if ( off_value != 0 )
{
if ( sleep_value >= off_value )
@@ -520,13 +520,13 @@ sleep_on_battery_value_changed_cb (GtkWidget *w, XfconfChannel *channel)
{
brg = GTK_WIDGET (gtk_builder_get_object (xml, "brightness-inactivity-on-battery"));
brightness_value = (gint) gtk_range_get_value (GTK_RANGE (brg));
-
+
if ( sleep_value * 60 <= brightness_value && brightness_value != BRIGHTNESS_DISABLED)
{
gtk_range_set_value (GTK_RANGE (brg), BRIGHTNESS_DISABLED);
}
}
-
+
if (!xfconf_channel_set_uint (channel, XFPM_PROPERTIES_PREFIX ON_BATT_DPMS_SLEEP, sleep_value))
{
g_critical ("Cannot set value for property %s\n", ON_BATT_DPMS_SLEEP);
@@ -540,7 +540,7 @@ off_on_battery_value_changed_cb (GtkWidget *w, XfconfChannel *channel)
{
gint off_value = (gint)gtk_range_get_value (GTK_RANGE(w));
gint sleep_value = (gint)gtk_range_get_value (GTK_RANGE(on_battery_dpms_sleep));
-
+
if ( sleep_value != 0 )
{
if ( off_value <= sleep_value )
@@ -548,7 +548,7 @@ off_on_battery_value_changed_cb (GtkWidget *w, XfconfChannel *channel)
gtk_range_set_value (GTK_RANGE(on_battery_dpms_sleep), off_value -1 );
}
}
-
+
if (!xfconf_channel_set_uint (channel, XFPM_PROPERTIES_PREFIX ON_BATT_DPMS_OFF, off_value))
{
g_critical ("Cannot set value for property %s\n", ON_BATT_DPMS_OFF);
@@ -596,10 +596,10 @@ sleep_on_ac_value_changed_cb (GtkWidget *w, XfconfChannel *channel)
gint off_value = (gint)gtk_range_get_value (GTK_RANGE (on_ac_dpms_off));
gint sleep_value = (gint)gtk_range_get_value (GTK_RANGE (w));
gint blank_value = (gint)gtk_range_get_value (GTK_RANGE (on_ac_display_blank));
-
+
if ( off_value > 60 || sleep_value > 60 )
return;
-
+
if ( off_value != 0 )
{
if ( sleep_value >= off_value )
@@ -619,9 +619,9 @@ sleep_on_ac_value_changed_cb (GtkWidget *w, XfconfChannel *channel)
if ( lcd_brightness )
{
brg = GTK_WIDGET (gtk_builder_get_object (xml, "brightness-inactivity-on-ac"));
-
+
brightness_value = (gint) gtk_range_get_value (GTK_RANGE (brg));
-
+
if ( sleep_value * 60 <= brightness_value && brightness_value != BRIGHTNESS_DISABLED)
{
gtk_range_set_value (GTK_RANGE (brg), BRIGHTNESS_DISABLED);
@@ -641,10 +641,10 @@ off_on_ac_value_changed_cb (GtkWidget *w, XfconfChannel *channel)
{
gint off_value = (gint)gtk_range_get_value (GTK_RANGE(w));
gint sleep_value = (gint)gtk_range_get_value (GTK_RANGE(on_ac_dpms_sleep));
-
+
if ( off_value > 60 || sleep_value > 60 )
return;
-
+
if ( sleep_value != 0 )
{
if ( off_value <= sleep_value )
@@ -734,7 +734,7 @@ brightness_on_battery_value_changed_cb (GtkWidget *w, XfconfChannel *channel)
gtk_range_set_value (GTK_RANGE (on_battery_dpms_sleep), (value / 60) + 1);
}
}
-
+
if (!xfconf_channel_set_uint (channel, XFPM_PROPERTIES_PREFIX BRIGHTNESS_ON_BATTERY, value))
{
g_critical ("Cannot set value for property %s\n", BRIGHTNESS_ON_BATTERY);
@@ -770,10 +770,10 @@ critical_spin_output_cb (GtkSpinButton *w, gpointer data)
{
gint val = (gint) gtk_spin_button_get_value (w);
gchar *text = g_strdup_printf ("%d %%", val);
-
+
gtk_entry_set_text (GTK_ENTRY(w), text);
g_free (text);
-
+
return TRUE;
}
@@ -783,18 +783,18 @@ on_battery_lid_changed_cb (GtkWidget *w, XfconfChannel *channel)
GtkTreeModel *model;
GtkTreeIter selected_row;
gint value = 0;
-
+
if (!gtk_combo_box_get_active_iter (GTK_COMBO_BOX (w), &selected_row))
return;
-
+
model = gtk_combo_box_get_model (GTK_COMBO_BOX(w));
-
+
gtk_tree_model_get(model,
&selected_row,
1,
&value,
-1);
-
+
if (!xfconf_channel_set_uint (channel, XFPM_PROPERTIES_PREFIX LID_SWITCH_ON_BATTERY_CFG, value) )
{
g_critical ("Cannot set value for property %s\n", LID_SWITCH_ON_BATTERY_CFG);
@@ -808,30 +808,30 @@ on_ac_lid_changed_cb (GtkWidget *w, XfconfChannel *channel)
GtkTreeModel *model;
GtkTreeIter selected_row;
gint value = 0;
-
+
if (!gtk_combo_box_get_active_iter (GTK_COMBO_BOX (w), &selected_row))
return;
-
+
model = gtk_combo_box_get_model (GTK_COMBO_BOX(w));
-
+
gtk_tree_model_get(model,
&selected_row,
1,
&value,
-1);
-
+
if (!xfconf_channel_set_uint (channel, XFPM_PROPERTIES_PREFIX LID_SWITCH_ON_AC_CFG, value) )
{
g_critical ("Cannot set value for property %s\n", LID_SWITCH_ON_AC_CFG);
}
xfpm_update_logind_handle_lid_switch (channel);
-}
+}
void
critical_level_value_changed_cb (GtkSpinButton *w, XfconfChannel *channel)
{
guint val = (guint) gtk_spin_button_get_value (w);
-
+
if (!xfconf_channel_set_uint (channel, XFPM_PROPERTIES_PREFIX CRITICAL_POWER_LEVEL, val) )
{
g_critical ("Unable to set value %d for property %s\n", val, CRITICAL_POWER_LEVEL);
@@ -976,20 +976,20 @@ xfpm_settings_on_battery (XfconfChannel *channel, gboolean auth_suspend,
* Battery critical
*/
battery_critical = GTK_WIDGET (gtk_builder_get_object (xml, "critical-power-action-combo"));
-
+
list_store = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_INT);
-
+
gtk_combo_box_set_model (GTK_COMBO_BOX(battery_critical), GTK_TREE_MODEL(list_store));
-
+
gtk_list_store_append(list_store, &iter);
gtk_list_store_set (list_store, &iter, 0, _("Do nothing"), 1, XFPM_DO_NOTHING, -1);
-
+
if ( can_suspend && auth_suspend )
{
gtk_list_store_append(list_store, &iter);
gtk_list_store_set (list_store, &iter, 0, _("Suspend"), 1, XFPM_DO_SUSPEND, -1);
}
-
+
if ( can_hibernate && auth_hibernate )
{
gtk_list_store_append(list_store, &iter);
@@ -1001,12 +1001,12 @@ xfpm_settings_on_battery (XfconfChannel *channel, gboolean auth_suspend,
gtk_list_store_append(list_store, &iter);
gtk_list_store_set (list_store, &iter, 0, _("Shutdown"), 1, XFPM_DO_SHUTDOWN, -1);
}
-
+
gtk_list_store_append(list_store, &iter);
gtk_list_store_set (list_store, &iter, 0, _("Ask"), 1, XFPM_ASK, -1);
-
+
val = xfconf_channel_get_uint (channel, XFPM_PROPERTIES_PREFIX CRITICAL_BATT_ACTION_CFG, XFPM_DO_NOTHING);
-
+
for ( valid = gtk_tree_model_get_iter_first (GTK_TREE_MODEL (list_store), &iter);
valid;
valid = gtk_tree_model_iter_next (GTK_TREE_MODEL (list_store), &iter) )
@@ -1019,7 +1019,7 @@ xfpm_settings_on_battery (XfconfChannel *channel, gboolean auth_suspend,
break;
}
}
-
+
/*
* DPMS settings when running on battery power
*/
@@ -1028,7 +1028,7 @@ xfpm_settings_on_battery (XfconfChannel *channel, gboolean auth_suspend,
val = xfconf_channel_get_uint (channel, XFPM_PROPERTIES_PREFIX ON_BATT_DPMS_SLEEP, 5);
gtk_range_set_value (GTK_RANGE(on_battery_dpms_sleep), val);
gtk_widget_set_sensitive (on_battery_dpms_sleep, handle_dpms);
-
+
val = xfconf_channel_get_uint (channel, XFPM_PROPERTIES_PREFIX ON_BATT_DPMS_OFF, 10);
gtk_range_set_value (GTK_RANGE(on_battery_dpms_off), val);
gtk_widget_set_sensitive (on_battery_dpms_off, handle_dpms);
@@ -1040,31 +1040,31 @@ xfpm_settings_on_battery (XfconfChannel *channel, gboolean auth_suspend,
if ( has_lid )
{
list_store = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_INT);
-
+
gtk_combo_box_set_model (GTK_COMBO_BOX(lid), GTK_TREE_MODEL(list_store));
-
+
gtk_list_store_append(list_store, &iter);
gtk_list_store_set (list_store, &iter, 0, _("Switch off display"), 1, LID_TRIGGER_NOTHING, -1);
-
+
if ( can_suspend && auth_suspend )
{
gtk_list_store_append(list_store, &iter);
gtk_list_store_set (list_store, &iter, 0, _("Suspend"), 1, LID_TRIGGER_SUSPEND, -1);
}
-
+
if ( can_hibernate && auth_hibernate)
{
gtk_list_store_append(list_store, &iter);
gtk_list_store_set (list_store, &iter, 0, _("Hibernate"), 1, LID_TRIGGER_HIBERNATE, -1);
}
-
+
gtk_list_store_append(list_store, &iter);
gtk_list_store_set (list_store, &iter, 0, _("Lock screen"), 1, LID_TRIGGER_LOCK_SCREEN, -1);
-
+
gtk_combo_box_set_active (GTK_COMBO_BOX (lid), 0);
-
+
val = xfconf_channel_get_uint (channel, XFPM_PROPERTIES_PREFIX LID_SWITCH_ON_BATTERY_CFG, LID_TRIGGER_LOCK_SCREEN);
-
+
for ( valid = gtk_tree_model_get_iter_first (GTK_TREE_MODEL (list_store), &iter);
valid;
valid = gtk_tree_model_iter_next (GTK_TREE_MODEL (list_store), &iter) )
@@ -1076,7 +1076,7 @@ xfpm_settings_on_battery (XfconfChannel *channel, gboolean auth_suspend,
gtk_combo_box_set_active_iter (GTK_COMBO_BOX (lid), &iter);
break;
}
- }
+ }
}
else
{
@@ -1136,7 +1136,7 @@ xfpm_settings_on_ac (XfconfChannel *channel, gboolean auth_suspend,
GtkTreeIter iter;
guint val;
guint list_value;
-
+
/*
* Inactivity sleep mode on AC
*/
@@ -1211,14 +1211,14 @@ xfpm_settings_on_ac (XfconfChannel *channel, gboolean auth_suspend,
gtk_range_set_value (GTK_RANGE (inact_timeout), val);
/*
- * DPMS settings when running on AC power
+ * DPMS settings when running on AC power
*/
handle_dpms = xfconf_channel_get_bool (channel, XFPM_PROPERTIES_PREFIX DPMS_ENABLED_CFG, TRUE);
val = xfconf_channel_get_uint (channel, XFPM_PROPERTIES_PREFIX ON_AC_DPMS_SLEEP, 10);
gtk_range_set_value (GTK_RANGE (on_ac_dpms_sleep), val);
gtk_widget_set_sensitive (on_ac_dpms_sleep, handle_dpms);
-
+
val = xfconf_channel_get_uint (channel, XFPM_PROPERTIES_PREFIX ON_AC_DPMS_OFF, 15);
gtk_range_set_value (GTK_RANGE(on_ac_dpms_off), val);
gtk_widget_set_sensitive (on_ac_dpms_off, handle_dpms);
@@ -1230,29 +1230,29 @@ xfpm_settings_on_ac (XfconfChannel *channel, gboolean auth_suspend,
if ( has_lid )
{
list_store = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_INT);
-
+
gtk_combo_box_set_model (GTK_COMBO_BOX(lid), GTK_TREE_MODEL(list_store));
-
+
gtk_list_store_append(list_store, &iter);
gtk_list_store_set (list_store, &iter, 0, _("Switch off display"), 1, LID_TRIGGER_NOTHING, -1);
-
+
if ( can_suspend && auth_suspend )
{
gtk_list_store_append(list_store, &iter);
gtk_list_store_set (list_store, &iter, 0, _("Suspend"), 1, LID_TRIGGER_SUSPEND, -1);
}
-
+
if ( can_hibernate && auth_hibernate )
{
gtk_list_store_append(list_store, &iter);
gtk_list_store_set (list_store, &iter, 0, _("Hibernate"), 1, LID_TRIGGER_HIBERNATE, -1);
}
-
+
gtk_list_store_append(list_store, &iter);
gtk_list_store_set (list_store, &iter, 0, _("Lock screen"), 1, LID_TRIGGER_LOCK_SCREEN, -1);
-
+
gtk_combo_box_set_active (GTK_COMBO_BOX (lid), 0);
-
+
val = xfconf_channel_get_uint (channel, XFPM_PROPERTIES_PREFIX LID_SWITCH_ON_AC_CFG, LID_TRIGGER_LOCK_SCREEN);
for ( valid = gtk_tree_model_get_iter_first (GTK_TREE_MODEL (list_store), &iter);
valid;
@@ -1265,7 +1265,7 @@ xfpm_settings_on_ac (XfconfChannel *channel, gboolean auth_suspend,
gtk_combo_box_set_active_iter (GTK_COMBO_BOX (lid), &iter);
break;
}
- }
+ }
}
else
{
@@ -1275,7 +1275,7 @@ xfpm_settings_on_ac (XfconfChannel *channel, gboolean auth_suspend,
gtk_widget_hide (lid);
gtk_widget_hide (frame);
}
-
+
/*
* Brightness on AC power
*/
@@ -1350,37 +1350,37 @@ xfpm_settings_general (XfconfChannel *channel, gboolean auth_suspend,
list_store = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_INT);
power = GTK_WIDGET (gtk_builder_get_object (xml, "button-power-combo"));
power_label = GTK_WIDGET (gtk_builder_get_object (xml, "button-power-label"));
-
+
if ( has_power_button )
{
gtk_combo_box_set_model (GTK_COMBO_BOX(power), GTK_TREE_MODEL(list_store));
gtk_list_store_append (list_store, &iter);
gtk_list_store_set (list_store, &iter, 0, _("Do nothing"), 1, XFPM_DO_NOTHING, -1);
-
+
if ( can_suspend && auth_suspend)
{
gtk_list_store_append (list_store, &iter);
gtk_list_store_set (list_store, &iter, 0, _("Suspend"), 1, XFPM_DO_SUSPEND, -1);
}
-
+
if ( can_hibernate && auth_hibernate )
{
gtk_list_store_append (list_store, &iter);
gtk_list_store_set (list_store, &iter, 0, _("Hibernate"), 1, XFPM_DO_HIBERNATE, -1);
}
-
+
if ( can_shutdown )
{
gtk_list_store_append (list_store, &iter);
gtk_list_store_set (list_store, &iter, 0, _("Shutdown"), 1, XFPM_DO_SHUTDOWN, -1);
}
-
+
gtk_list_store_append (list_store, &iter);
gtk_list_store_set (list_store, &iter, 0, _("Ask"), 1, XFPM_ASK, -1);
-
+
gtk_combo_box_set_active (GTK_COMBO_BOX (power), 0);
-
+
value = xfconf_channel_get_uint (channel, XFPM_PROPERTIES_PREFIX POWER_SWITCH_CFG, XFPM_DO_NOTHING);
for ( valid = gtk_tree_model_get_iter_first (GTK_TREE_MODEL (list_store), &iter);
valid;
@@ -1393,47 +1393,47 @@ xfpm_settings_general (XfconfChannel *channel, gboolean auth_suspend,
gtk_combo_box_set_active_iter (GTK_COMBO_BOX (power), &iter);
break;
}
- }
+ }
}
else
{
gtk_widget_hide (power);
gtk_widget_hide (power_label);
}
-
+
/*
* Hibernate button
*/
list_store = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_INT);
hibernate = GTK_WIDGET (gtk_builder_get_object (xml, "button-hibernate-combo"));
hibernate_label = GTK_WIDGET (gtk_builder_get_object (xml, "button-hibernate-label"));
-
+
if (has_hibernate_button )
{
gtk_combo_box_set_model (GTK_COMBO_BOX(hibernate), GTK_TREE_MODEL(list_store));
gtk_list_store_append (list_store, &iter);
gtk_list_store_set (list_store, &iter, 0, _("Do nothing"), 1, XFPM_DO_NOTHING, -1);
-
+
if ( can_suspend && auth_suspend)
{
gtk_list_store_append (list_store, &iter);
gtk_list_store_set (list_store, &iter, 0, _("Suspend"), 1, XFPM_DO_SUSPEND, -1);
}
-
+
if ( can_hibernate && auth_hibernate )
{
gtk_list_store_append (list_store, &iter);
gtk_list_store_set (list_store, &iter, 0, _("Hibernate"), 1, XFPM_DO_HIBERNATE, -1);
}
-
+
gtk_list_store_append (list_store, &iter);
gtk_list_store_set (list_store, &iter, 0, _("Ask"), 1, XFPM_ASK, -1);
-
+
value = xfconf_channel_get_uint (channel, XFPM_PROPERTIES_PREFIX HIBERNATE_SWITCH_CFG, XFPM_DO_NOTHING);
-
+
gtk_combo_box_set_active (GTK_COMBO_BOX (hibernate), 0);
-
+
for ( valid = gtk_tree_model_get_iter_first (GTK_TREE_MODEL (list_store), &iter);
valid;
valid = gtk_tree_model_iter_next (GTK_TREE_MODEL (list_store), &iter) )
@@ -1445,7 +1445,7 @@ xfpm_settings_general (XfconfChannel *channel, gboolean auth_suspend,
gtk_combo_box_set_active_iter (GTK_COMBO_BOX (hibernate), &iter);
break;
}
- }
+ }
}
else
{
@@ -1454,36 +1454,36 @@ xfpm_settings_general (XfconfChannel *channel, gboolean auth_suspend,
}
/*
- * Sleep button
+ * Sleep button
*/
list_store = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_INT);
sleep_w = GTK_WIDGET (gtk_builder_get_object (xml, "button-sleep-combo"));
sleep_label = GTK_WIDGET (gtk_builder_get_object (xml, "button-sleep-label"));
-
+
if ( has_sleep_button )
{
gtk_combo_box_set_model (GTK_COMBO_BOX(sleep_w), GTK_TREE_MODEL(list_store));
gtk_list_store_append (list_store, &iter);
gtk_list_store_set (list_store, &iter, 0, _("Do nothing"), 1, XFPM_DO_NOTHING, -1);
-
+
if ( can_suspend && auth_suspend )
{
gtk_list_store_append (list_store, &iter);
gtk_list_store_set (list_store, &iter, 0, _("Suspend"), 1, XFPM_DO_SUSPEND, -1);
}
-
+
if ( can_hibernate && auth_hibernate)
{
gtk_list_store_append (list_store, &iter);
gtk_list_store_set (list_store, &iter, 0, _("Hibernate"), 1, XFPM_DO_HIBERNATE, -1);
}
-
+
gtk_list_store_append (list_store, &iter);
gtk_list_store_set (list_store, &iter, 0, _("Ask"), 1, XFPM_ASK, -1);
-
+
gtk_combo_box_set_active (GTK_COMBO_BOX (sleep_w), 0);
-
+
value = xfconf_channel_get_uint (channel, XFPM_PROPERTIES_PREFIX SLEEP_SWITCH_CFG, XFPM_DO_NOTHING);
for ( valid = gtk_tree_model_get_iter_first (GTK_TREE_MODEL (list_store), &iter);
valid;
@@ -1496,7 +1496,7 @@ xfpm_settings_general (XfconfChannel *channel, gboolean auth_suspend,
gtk_combo_box_set_active_iter (GTK_COMBO_BOX (sleep_w), &iter);
break;
}
- }
+ }
}
else
{
@@ -1572,9 +1572,9 @@ xfpm_settings_advanced (XfconfChannel *channel, gboolean auth_suspend,
critical_level = GTK_WIDGET (gtk_builder_get_object (xml, "critical-power-level-spin"));
if ( has_battery )
{
- gtk_widget_set_tooltip_text (critical_level,
+ gtk_widget_set_tooltip_text (critical_level,
_("When all the power sources of the computer reach this charge level"));
-
+
val = xfconf_channel_get_uint (channel, XFPM_PROPERTIES_PREFIX CRITICAL_POWER_LEVEL, 10);
if ( val > 20 || val < 1)
@@ -1592,12 +1592,12 @@ xfpm_settings_advanced (XfconfChannel *channel, gboolean auth_suspend,
gtk_widget_hide (critical_level);
gtk_widget_hide (label);
}
-
+
/*
* Lock screen for suspend/hibernate
*/
lock = GTK_WIDGET (gtk_builder_get_object (xml, "lock-screen"));
-
+
if ( !can_suspend && !can_hibernate )
{
gtk_widget_set_sensitive (lock, FALSE);
@@ -1608,7 +1608,7 @@ xfpm_settings_advanced (XfconfChannel *channel, gboolean auth_suspend,
gtk_widget_set_sensitive (lock, FALSE);
gtk_widget_set_tooltip_text (lock, _("Hibernate and suspend operations not permitted"));
}
-
+
val = xfconf_channel_get_bool (channel, XFPM_PROPERTIES_PREFIX LOCK_SCREEN_ON_SLEEP, TRUE);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(lock), val);
}
@@ -2361,16 +2361,16 @@ xfpm_settings_dialog_new (XfconfChannel *channel, gboolean auth_suspend,
xfpm_bool_to_string (has_power_button), xfpm_bool_to_string (has_battery_button));
xml = xfpm_builder_new_from_string (xfpm_settings_ui, &error);
-
+
if ( G_UNLIKELY (error) )
{
xfce_dialog_show_error (NULL, error, "%s", _("Check your power manager installation"));
g_error ("%s", error->message);
}
-
+
lcd_brightness = has_lcd_brightness;
starting_device_id = device_id;
-
+
on_battery_dpms_sleep = GTK_WIDGET (gtk_builder_get_object (xml, "dpms-sleep-on-battery"));
on_battery_dpms_off = GTK_WIDGET (gtk_builder_get_object (xml, "dpms-off-on-battery"));
on_ac_dpms_sleep = GTK_WIDGET (gtk_builder_get_object (xml, "dpms-sleep-on-ac"));
@@ -2504,7 +2504,7 @@ xfpm_settings_dialog_new (XfconfChannel *channel, gboolean auth_suspend,
gtk_widget_hide (GTK_WIDGET (gtk_builder_get_object (xml ,"lid-on-battery-combo")));
gtk_widget_hide (GTK_WIDGET (gtk_builder_get_object (xml ,"lid-plugged-in-header")));
}
-
+
xfpm_settings_general (channel, auth_suspend, auth_hibernate, can_suspend, can_hibernate, can_shutdown,
has_sleep_button, has_hibernate_button, has_power_button, has_battery_button);
@@ -2537,7 +2537,7 @@ xfpm_settings_dialog_new (XfconfChannel *channel, gboolean auth_suspend,
g_object_unref (plugged_box);
}
- g_signal_connect (plug, "delete-event",
+ g_signal_connect (plug, "delete-event",
G_CALLBACK (delete_event_cb), channel);
gdk_notify_startup_complete ();
}
@@ -2546,7 +2546,7 @@ xfpm_settings_dialog_new (XfconfChannel *channel, gboolean auth_suspend,
g_signal_connect (dialog, "response", G_CALLBACK (dialog_response_cb), channel);
gtk_widget_show (dialog);
}
-
+
gtk_builder_connect_signals (xml, channel);
/* If we passed in a device to display, show the devices tab now, otherwise hide it */
diff --git a/src/egg-idletime.c b/src/egg-idletime.c
index cb23ba8..c5d2b6d 100644
--- a/src/egg-idletime.c
+++ b/src/egg-idletime.c
@@ -685,4 +685,3 @@ egg_idletime_test (gpointer data)
}
#endif
-
diff --git a/src/xfce-screensaver.c b/src/xfce-screensaver.c
index 35dc49d..63ba6e7 100644
--- a/src/xfce-screensaver.c
+++ b/src/xfce-screensaver.c
@@ -352,7 +352,7 @@ xfce_screensaver_new (void)
G_OBJECT(saver),
LOCK_COMMAND);
}
-
+
return XFCE_SCREENSAVER (saver);
}
@@ -393,7 +393,7 @@ xfce_reset_screen_saver (XfceScreenSaver *saver)
* Calling this function with inhibit as TRUE will prevent the user's
* screensaver from activating. This is useful when the user is watching
* a movie or giving a presentation.
- *
+ *
* Calling this function with inhibit as FALSE will remove any current
* screensaver inhibit the XfceScreenSaver object has.
*
@@ -544,7 +544,7 @@ xfce_screensaver_lock (XfceScreenSaver *saver)
{
ret = g_spawn_command_line_async ("xdg-screensaver lock", NULL);
}
-
+
if (!ret)
{
ret = g_spawn_command_line_async ("xscreensaver-command -lock", NULL);
diff --git a/src/xfpm-backlight.h b/src/xfpm-backlight.h
index f54beb6..9741fec 100644
--- a/src/xfpm-backlight.h
+++ b/src/xfpm-backlight.h
@@ -35,13 +35,13 @@ typedef struct
{
GObject parent;
XfpmBacklightPrivate *priv;
-
+
} XfpmBacklight;
typedef struct
{
GObjectClass parent_class;
-
+
} XfpmBacklightClass;
GType xfpm_backlight_get_type (void) G_GNUC_CONST;
diff --git a/src/xfpm-button.c b/src/xfpm-button.c
index e7b017c..ed72ea8 100644
--- a/src/xfpm-button.c
+++ b/src/xfpm-button.c
@@ -22,7 +22,7 @@
/*
* Based on code from gpm-button (gnome power manager)
* Copyright (C) 2006-2007 Richard Hughes <richard at hughsie.com>
- *
+ *
*/
#ifdef HAVE_CONFIG_H
@@ -64,7 +64,7 @@ struct XfpmButtonPrivate
{
GdkScreen *screen;
GdkWindow *window;
-
+
guint16 mapped_buttons;
};
@@ -85,13 +85,13 @@ xfpm_button_get_key (unsigned int keycode)
{
XfpmButtonKey key = BUTTON_UNKNOWN;
guint i;
-
+
for ( i = 0; i < G_N_ELEMENTS (xfpm_key_map); i++)
{
if ( xfpm_key_map [i].key_code == keycode )
key = xfpm_key_map [i].key;
}
-
+
return key;
}
@@ -100,24 +100,24 @@ xfpm_button_filter_x_events (GdkXEvent *xevent, GdkEvent *ev, gpointer data)
{
XfpmButtonKey key;
XfpmButton *button;
-
+
XEvent *xev = (XEvent *) xevent;
-
+
if ( xev->type != KeyPress )
return GDK_FILTER_CONTINUE;
-
+
key = xfpm_button_get_key (xev->xkey.keycode);
-
+
if ( key != BUTTON_UNKNOWN )
{
button = (XfpmButton *) data;
-
+
XFPM_DEBUG_ENUM (key, XFPM_TYPE_BUTTON_KEY, "Key press");
-
+
g_signal_emit (G_OBJECT(button), signals[BUTTON_PRESSED], 0, key);
return GDK_FILTER_REMOVE;
}
-
+
return GDK_FILTER_CONTINUE;
}
@@ -131,24 +131,24 @@ xfpm_button_grab_keystring (XfpmButton *button, guint keycode)
display = gdk_x11_get_default_xdisplay ();
gdisplay = gdk_display_get_default ();
-
+
gdk_x11_display_error_trap_push (gdisplay);
ret = XGrabKey (display, keycode, modmask,
GDK_WINDOW_XID (button->priv->window), True,
GrabModeAsync, GrabModeAsync);
-
+
if ( ret == BadAccess )
{
g_warning ("Failed to grab modmask=%u, keycode=%li",
modmask, (long int) keycode);
return FALSE;
}
-
+
ret = XGrabKey (display, keycode, LockMask | modmask,
GDK_WINDOW_XID (button->priv->window), True,
GrabModeAsync, GrabModeAsync);
-
+
if (ret == BadAccess)
{
g_warning ("Failed to grab modmask=%u, keycode=%li",
@@ -172,18 +172,18 @@ xfpm_button_xevent_key (XfpmButton *button, guint keysym , XfpmButtonKey key)
g_warning ("could not map keysym %x to keycode\n", keysym);
return FALSE;
}
-
- if ( !xfpm_button_grab_keystring(button, keycode))
+
+ if ( !xfpm_button_grab_keystring(button, keycode))
{
g_warning ("Failed to grab %i\n", keycode);
return FALSE;
}
-
+
XFPM_DEBUG_ENUM (key, XFPM_TYPE_BUTTON_KEY, "Grabbed key %li ", (long int) keycode);
-
+
xfpm_key_map [key].key_code = keycode;
xfpm_key_map [key].key = key;
-
+
return TRUE;
}
@@ -192,29 +192,29 @@ xfpm_button_setup (XfpmButton *button)
{
button->priv->screen = gdk_screen_get_default ();
button->priv->window = gdk_screen_get_root_window (button->priv->screen);
-
+
if ( xfpm_button_xevent_key (button, XF86XK_PowerOff, BUTTON_POWER_OFF) )
button->priv->mapped_buttons |= POWER_KEY;
-
+
#ifdef HAVE_XF86XK_HIBERNATE
if ( xfpm_button_xevent_key (button, XF86XK_Hibernate, BUTTON_HIBERNATE) )
button->priv->mapped_buttons |= HIBERNATE_KEY;
-#endif
+#endif
#ifdef HAVE_XF86XK_SUSPEND
if ( xfpm_button_xevent_key (button, XF86XK_Suspend, BUTTON_HIBERNATE) )
button->priv->mapped_buttons |= HIBERNATE_KEY;
-#endif
+#endif
if ( xfpm_button_xevent_key (button, XF86XK_Sleep, BUTTON_SLEEP) )
button->priv->mapped_buttons |= SLEEP_KEY;
-
+
if ( xfpm_button_xevent_key (button, XF86XK_MonBrightnessUp, BUTTON_MON_BRIGHTNESS_UP) )
button->priv->mapped_buttons |= BRIGHTNESS_KEY_UP;
if (xfpm_button_xevent_key (button, XF86XK_MonBrightnessDown, BUTTON_MON_BRIGHTNESS_DOWN) )
button->priv->mapped_buttons |= BRIGHTNESS_KEY_DOWN;
-
+
if (xfpm_button_xevent_key (button, XF86XK_Battery, BUTTON_BATTERY))
button->priv->mapped_buttons |= BATTERY_KEY;
@@ -224,7 +224,7 @@ xfpm_button_setup (XfpmButton *button)
if (xfpm_button_xevent_key (button, XF86XK_KbdBrightnessDown, BUTTON_KBD_BRIGHTNESS_DOWN) )
button->priv->mapped_buttons |= KBD_BRIGHTNESS_KEY_DOWN;
- gdk_window_add_filter (button->priv->window,
+ gdk_window_add_filter (button->priv->window,
xfpm_button_filter_x_events, button);
}
@@ -233,7 +233,7 @@ xfpm_button_class_init(XfpmButtonClass *klass)
{
GObjectClass *object_class = G_OBJECT_CLASS(klass);
- signals [BUTTON_PRESSED] =
+ signals [BUTTON_PRESSED] =
g_signal_new ("button-pressed",
XFPM_TYPE_BUTTON,
G_SIGNAL_RUN_LAST,
@@ -249,11 +249,11 @@ static void
xfpm_button_init (XfpmButton *button)
{
button->priv = xfpm_button_get_instance_private (button);
-
+
button->priv->mapped_buttons = 0;
button->priv->screen = NULL;
button->priv->window = NULL;
-
+
xfpm_button_setup (button);
}
@@ -267,7 +267,7 @@ XfpmButton *
xfpm_button_new (void)
{
static gpointer xfpm_button_object = NULL;
-
+
if ( G_LIKELY (xfpm_button_object != NULL) )
{
g_object_ref (xfpm_button_object);
@@ -277,13 +277,13 @@ xfpm_button_new (void)
xfpm_button_object = g_object_new (XFPM_TYPE_BUTTON, NULL);
g_object_add_weak_pointer (xfpm_button_object, &xfpm_button_object);
}
-
+
return XFPM_BUTTON (xfpm_button_object);
}
guint16 xfpm_button_get_mapped (XfpmButton *button)
{
g_return_val_if_fail (XFPM_IS_BUTTON (button), 0);
-
+
return button->priv->mapped_buttons;
}
diff --git a/src/xfpm-button.h b/src/xfpm-button.h
index 11ed187..9458517 100644
--- a/src/xfpm-button.h
+++ b/src/xfpm-button.h
@@ -37,16 +37,16 @@ typedef struct
{
GObject parent;
XfpmButtonPrivate *priv;
-
+
} XfpmButton;
typedef struct
{
GObjectClass parent_class;
-
+
void (*button_pressed) (XfpmButton *button,
XfpmButtonKey type);
-
+
} XfpmButtonClass;
GType xfpm_button_get_type (void) G_GNUC_CONST;
diff --git a/src/xfpm-console-kit.c b/src/xfpm-console-kit.c
index 2909a30..fc317e6 100644
--- a/src/xfpm-console-kit.c
+++ b/src/xfpm-console-kit.c
@@ -45,9 +45,9 @@ struct XfpmConsoleKitPrivate
{
GDBusConnection *bus;
GDBusProxy *proxy;
-
+
XfpmDBusMonitor *monitor;
-
+
gboolean can_shutdown;
gboolean can_restart;
gboolean can_suspend;
@@ -91,7 +91,7 @@ xfpm_console_kit_get_info (XfpmConsoleKit *console)
g_warning ("'CanStop' method failed : %s", error->message);
g_clear_error (&error);
}
-
+
var = g_dbus_proxy_call_sync (console->priv->proxy, "CanRestart",
NULL,
G_DBUS_CALL_FLAGS_NONE,
@@ -173,7 +173,7 @@ xfpm_console_kit_class_init (XfpmConsoleKitClass *klass)
object_class->finalize = xfpm_console_kit_finalize;
object_class->get_property = xfpm_console_kit_get_property;
-
+
g_object_class_install_property (object_class,
PROP_CAN_RESTART,
g_param_spec_boolean ("can-restart",
@@ -207,23 +207,23 @@ static void
xfpm_console_kit_init (XfpmConsoleKit *console)
{
GError *error = NULL;
-
+
console->priv = xfpm_console_kit_get_instance_private (console);
console->priv->can_shutdown = FALSE;
console->priv->can_restart = FALSE;
-
+
console->priv->bus = NULL;
console->priv->proxy = NULL;
-
+
console->priv->bus = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, &error);
-
+
if ( error )
{
g_critical ("Unable to get system bus connection : %s", error->message);
g_error_free (error);
return;
}
-
+
console->priv->proxy = g_dbus_proxy_new_sync (console->priv->bus,
G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES |
G_DBUS_PROXY_FLAGS_DO_NOT_CONNECT_SIGNALS,
@@ -239,7 +239,7 @@ xfpm_console_kit_init (XfpmConsoleKit *console)
g_warning ("Unable to create proxy for 'org.freedesktop.ConsoleKit'");
return;
}
-
+
xfpm_console_kit_get_info (console);
}
@@ -277,10 +277,10 @@ xfpm_console_kit_finalize (GObject *object)
XfpmConsoleKit *console;
console = XFPM_CONSOLE_KIT (object);
-
+
if ( console->priv->bus )
g_object_unref (console->priv->bus);
-
+
if ( console->priv->proxy )
g_object_unref (console->priv->proxy);
@@ -291,7 +291,7 @@ XfpmConsoleKit *
xfpm_console_kit_new (void)
{
static gpointer console_obj = NULL;
-
+
if ( G_LIKELY (console_obj != NULL ) )
{
g_object_ref (console_obj);
@@ -301,7 +301,7 @@ xfpm_console_kit_new (void)
console_obj = g_object_new (XFPM_TYPE_CONSOLE_KIT, NULL);
g_object_add_weak_pointer (console_obj, &console_obj);
}
-
+
return XFPM_CONSOLE_KIT (console_obj);
}
@@ -310,7 +310,7 @@ void xfpm_console_kit_shutdown (XfpmConsoleKit *console, GError **error)
GVariant *var;
g_return_if_fail (console->priv->proxy != NULL );
-
+
var = g_dbus_proxy_call_sync (console->priv->proxy, "Stop",
NULL,
G_DBUS_CALL_FLAGS_NONE,
@@ -326,7 +326,7 @@ void xfpm_console_kit_reboot (XfpmConsoleKit *console, GError **error)
GVariant *var;
g_return_if_fail (console->priv->proxy != NULL );
-
+
var = g_dbus_proxy_call_sync (console->priv->proxy, "Restart",
NULL,
G_DBUS_CALL_FLAGS_NONE,
diff --git a/src/xfpm-console-kit.h b/src/xfpm-console-kit.h
index c48bf8c..b4910ae 100644
--- a/src/xfpm-console-kit.h
+++ b/src/xfpm-console-kit.h
@@ -35,13 +35,13 @@ typedef struct
{
GObject parent;
XfpmConsoleKitPrivate *priv;
-
+
} XfpmConsoleKit;
typedef struct
{
GObjectClass parent_class;
-
+
} XfpmConsoleKitClass;
GType xfpm_console_kit_get_type (void) G_GNUC_CONST;
diff --git a/src/xfpm-dpms.c b/src/xfpm-dpms.c
index e18d4b3..2e3b72b 100644
--- a/src/xfpm-dpms.c
+++ b/src/xfpm-dpms.c
@@ -51,9 +51,9 @@ struct XfpmDpmsPrivate
gboolean dpms_capable;
gboolean inhibited;
-
+
gboolean on_battery;
-
+
gulong switch_off_timeout_id;
gulong switch_on_timeout_id;
};
@@ -64,9 +64,9 @@ static void
xfpm_dpms_set_timeouts (XfpmDpms *dpms, guint16 standby, guint16 suspend, guint off)
{
CARD16 x_standby = 0 , x_suspend = 0, x_off = 0;
-
+
DPMSGetTimeouts (gdk_x11_get_default_xdisplay(), &x_standby, &x_suspend, &x_off);
-
+
if ( standby != x_standby || suspend != x_suspend || off != x_off )
{
XFPM_DEBUG ("Settings dpms: standby=%d suspend=%d off=%d\n", standby, suspend, off);
@@ -84,10 +84,10 @@ xfpm_dpms_disable (XfpmDpms *dpms)
{
BOOL state;
CARD16 power_level;
-
+
if (!DPMSInfo (gdk_x11_get_default_xdisplay(), &power_level, &state) )
g_warning ("Cannot get DPMSInfo");
-
+
if ( state )
DPMSDisable (gdk_x11_get_default_xdisplay());
}
@@ -100,10 +100,10 @@ xfpm_dpms_enable (XfpmDpms *dpms)
{
BOOL state;
CARD16 power_level;
-
+
if (!DPMSInfo (gdk_x11_get_default_xdisplay(), &power_level, &state) )
g_warning ("Cannot get DPMSInfo");
-
+
if ( !state )
DPMSEnable (gdk_x11_get_default_xdisplay());
}
@@ -120,16 +120,16 @@ static void
xfpm_dpms_get_sleep_mode (XfpmDpms *dpms, gboolean *ret_standby_mode)
{
gchar *sleep_mode;
-
+
g_object_get (G_OBJECT (dpms->priv->conf),
DPMS_SLEEP_MODE, &sleep_mode,
NULL);
-
+
if ( !g_strcmp0 (sleep_mode, "Standby"))
*ret_standby_mode = TRUE;
else
*ret_standby_mode = FALSE;
-
+
g_free (sleep_mode);
}
@@ -137,12 +137,12 @@ static void
xfpm_dpms_get_configuration_timeouts (XfpmDpms *dpms, guint16 *ret_sleep, guint16 *ret_off )
{
guint sleep_time, off_time;
-
+
g_object_get (G_OBJECT (dpms->priv->conf),
dpms->priv->on_battery ? ON_BATT_DPMS_SLEEP : ON_AC_DPMS_SLEEP, &sleep_time,
dpms->priv->on_battery ? ON_BATT_DPMS_OFF : ON_AC_DPMS_OFF, &off_time,
NULL);
-
+
*ret_sleep = sleep_time * 60;
*ret_off = off_time * 60;
}
@@ -160,9 +160,9 @@ xfpm_dpms_refresh (XfpmDpms *dpms)
xfpm_dpms_disable (dpms);
return;
}
-
+
xfpm_dpms_get_enabled (dpms, &enabled);
-
+
if ( !enabled )
{
xfpm_dpms_disable (dpms);
@@ -175,14 +175,14 @@ xfpm_dpms_refresh (XfpmDpms *dpms)
if (sleep_mode == TRUE )
{
- xfpm_dpms_set_timeouts (dpms,
+ xfpm_dpms_set_timeouts (dpms,
sleep_timeout,
0,
off_timeout);
}
else
{
- xfpm_dpms_set_timeouts (dpms,
+ xfpm_dpms_set_timeouts (dpms,
0,
sleep_timeout,
off_timeout );
@@ -203,7 +203,7 @@ static void
xfpm_dpms_class_init(XfpmDpmsClass *klass)
{
GObjectClass *object_class = G_OBJECT_CLASS(klass);
-
+
object_class->finalize = xfpm_dpms_finalize;
}
@@ -214,7 +214,7 @@ static void
xfpm_dpms_init(XfpmDpms *dpms)
{
dpms->priv = xfpm_dpms_get_instance_private(dpms);
-
+
dpms->priv->dpms_capable = DPMSCapable (gdk_x11_get_default_xdisplay());
dpms->priv->switch_off_timeout_id = 0;
dpms->priv->switch_on_timeout_id = 0;
@@ -240,7 +240,7 @@ xfpm_dpms_finalize(GObject *object)
XfpmDpms *dpms;
dpms = XFPM_DPMS (object);
-
+
g_object_unref (dpms->priv->conf);
G_OBJECT_CLASS(xfpm_dpms_parent_class)->finalize(object);
@@ -250,7 +250,7 @@ XfpmDpms *
xfpm_dpms_new (void)
{
static gpointer xfpm_dpms_object = NULL;
-
+
if ( G_LIKELY (xfpm_dpms_object != NULL ) )
{
g_object_ref (xfpm_dpms_object);
@@ -260,14 +260,14 @@ xfpm_dpms_new (void)
xfpm_dpms_object = g_object_new (XFPM_TYPE_DPMS, NULL);
g_object_add_weak_pointer (xfpm_dpms_object, &xfpm_dpms_object);
}
-
+
return XFPM_DPMS (xfpm_dpms_object);
}
gboolean xfpm_dpms_capable (XfpmDpms *dpms)
{
g_return_val_if_fail (XFPM_IS_DPMS(dpms), FALSE);
-
+
return dpms->priv->dpms_capable;
}
@@ -275,12 +275,12 @@ void xfpm_dpms_force_level (XfpmDpms *dpms, CARD16 level)
{
CARD16 current_level;
BOOL current_state;
-
+
XFPM_DEBUG ("start");
-
+
if ( !dpms->priv->dpms_capable )
goto out;
-
+
if ( G_UNLIKELY (!DPMSInfo (gdk_x11_get_default_xdisplay (), ¤t_level, ¤t_state)) )
{
g_warning ("Cannot get DPMSInfo");
@@ -296,7 +296,7 @@ void xfpm_dpms_force_level (XfpmDpms *dpms, CARD16 level)
if ( current_level != level )
{
XFPM_DEBUG ("Forcing DPMS mode %d", level);
-
+
if ( !DPMSForceLevel (gdk_x11_get_default_xdisplay (), level ) )
{
g_warning ("Cannot set Force DPMS level %d", level);
@@ -310,7 +310,7 @@ void xfpm_dpms_force_level (XfpmDpms *dpms, CARD16 level)
{
XFPM_DEBUG ("No need to change DPMS mode, current_level=%d requested_level=%d", current_level, level);
}
-
+
out:
;
}
diff --git a/src/xfpm-dpms.h b/src/xfpm-dpms.h
index 19cdc83..5fa0085 100644
--- a/src/xfpm-dpms.h
+++ b/src/xfpm-dpms.h
@@ -45,13 +45,13 @@ typedef struct
{
GObject parent;
XfpmDpmsPrivate *priv;
-
+
} XfpmDpms;
typedef struct
{
GObjectClass parent_class;
-
+
} XfpmDpmsClass;
GType xfpm_dpms_get_type (void) G_GNUC_CONST;
diff --git a/src/xfpm-errors.h b/src/xfpm-errors.h
index 4cc2b23..8485936 100644
--- a/src/xfpm-errors.h
+++ b/src/xfpm-errors.h
@@ -36,7 +36,7 @@ typedef enum
XFPM_ERROR_COOKIE_NOT_FOUND,
XFPM_ERROR_INVALID_ARGUMENTS,
XFPM_ERROR_SLEEP_FAILED
-
+
} XfpmError;
GQuark xfpm_get_error_quark (void);
diff --git a/src/xfpm-inhibit.c b/src/xfpm-inhibit.c
index 510b24e..4a66332 100644
--- a/src/xfpm-inhibit.c
+++ b/src/xfpm-inhibit.c
@@ -56,7 +56,7 @@ typedef struct
gchar *app_name;
gchar *unique_name;
guint cookie;
-
+
} Inhibitor;
enum
@@ -74,9 +74,9 @@ static void
xfpm_inhibit_free_inhibitor (XfpmInhibit *inhibit, Inhibitor *inhibitor)
{
g_return_if_fail (inhibitor != NULL );
-
+
g_ptr_array_remove (inhibit->priv->array, inhibitor);
-
+
g_free (inhibitor->app_name);
g_free (inhibitor->unique_name);
g_free (inhibitor);
@@ -111,7 +111,7 @@ xfpm_inhibit_get_cookie (XfpmInhibit *inhibit)
guint max = 0;
guint i;
Inhibitor *inhibitor;
-
+
for ( i = 0; i<inhibit->priv->array->len; i++)
{
inhibitor = g_ptr_array_index (inhibit->priv->array, i);
@@ -125,17 +125,17 @@ xfpm_inhibit_add_application (XfpmInhibit *inhibit, const gchar *app_name, const
{
guint cookie;
Inhibitor *inhibitor;
-
+
inhibitor = g_new0 (Inhibitor, 1);
-
+
cookie = xfpm_inhibit_get_cookie (inhibit);
-
+
inhibitor->cookie = cookie;
inhibitor->app_name = g_strdup (app_name);
inhibitor->unique_name = g_strdup (unique_name);
-
+
g_ptr_array_add (inhibit->priv->array, inhibitor);
-
+
return cookie;
}
@@ -175,9 +175,9 @@ static gboolean
xfpm_inhibit_remove_application_by_cookie (XfpmInhibit *inhibit, guint cookie)
{
Inhibitor *inhibitor;
-
+
inhibitor = xfpm_inhibit_find_application_by_cookie (inhibit, cookie);
-
+
if ( inhibitor )
{
xfpm_dbus_monitor_remove_unique_name (inhibit->priv->monitor, G_BUS_TYPE_SESSION, inhibitor->unique_name);
@@ -188,16 +188,16 @@ xfpm_inhibit_remove_application_by_cookie (XfpmInhibit *inhibit, guint cookie)
}
static void
-xfpm_inhibit_connection_lost_cb (XfpmDBusMonitor *monitor, gchar *unique_name,
+xfpm_inhibit_connection_lost_cb (XfpmDBusMonitor *monitor, gchar *unique_name,
gboolean on_session, XfpmInhibit *inhibit)
{
Inhibitor *inhibitor;
-
+
if ( !on_session)
return;
-
+
inhibitor = xfpm_inhibit_find_application_by_unique_connection_name (inhibit, unique_name );
-
+
if ( inhibitor )
{
XFPM_DEBUG ("Application=%s with unique connection name=%s disconnected", inhibitor->app_name, inhibitor->unique_name);
@@ -230,7 +230,7 @@ xfpm_inhibit_class_init(XfpmInhibitClass *klass)
G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
object_class->finalize = xfpm_inhibit_finalize;
-
+
xfpm_inhibit_dbus_class_init (klass);
}
@@ -238,13 +238,13 @@ static void
xfpm_inhibit_init (XfpmInhibit *inhibit)
{
inhibit->priv = xfpm_inhibit_get_instance_private (inhibit);
-
+
inhibit->priv->array = g_ptr_array_new ();
inhibit->priv->monitor = xfpm_dbus_monitor_new ();
-
+
g_signal_connect (inhibit->priv->monitor, "unique-name-lost",
G_CALLBACK (xfpm_inhibit_connection_lost_cb), inhibit);
-
+
xfpm_inhibit_dbus_init (inhibit);
}
@@ -256,15 +256,15 @@ xfpm_inhibit_finalize (GObject *object)
guint i;
inhibit = XFPM_INHIBIT(object);
-
+
g_object_unref (inhibit->priv->monitor);
-
+
for ( i = 0; i<inhibit->priv->array->len; i++)
{
inhibitor = g_ptr_array_index (inhibit->priv->array, i);
xfpm_inhibit_free_inhibitor (inhibit, inhibitor);
}
-
+
g_ptr_array_free (inhibit->priv->array, TRUE);
G_OBJECT_CLASS(xfpm_inhibit_parent_class)->finalize(object);
@@ -274,7 +274,7 @@ XfpmInhibit *
xfpm_inhibit_new(void)
{
static gpointer xfpm_inhibit_object = NULL;
-
+
if ( G_LIKELY (xfpm_inhibit_object != NULL) )
{
g_object_ref (xfpm_inhibit_object);
@@ -302,24 +302,24 @@ xfpm_inhibit_get_inhibit_list (XfpmInhibit *inhibit)
const gchar **OUT_inhibitors;
XFPM_DEBUG ("entering xfpm_inhibit_get_inhibit_list");
-
+
OUT_inhibitors = g_new (const gchar *, inhibit->priv->array->len + 1);
-
+
for ( i = 0; i<inhibit->priv->array->len; i++)
{
inhibitor = g_ptr_array_index (inhibit->priv->array, i);
OUT_inhibitors[i] = inhibitor->app_name;
}
-
+
OUT_inhibitors[inhibit->priv->array->len] = NULL;
return OUT_inhibitors;
}
/*
- *
+ *
* DBus server implementation for org.freedesktop.PowerManagement.Inhibit
- *
+ *
*/
static gboolean xfpm_inhibit_inhibit (XfpmInhibit *inhibit,
GDBusMethodInvocation *invocation,
@@ -383,7 +383,7 @@ static gboolean xfpm_inhibit_inhibit (XfpmInhibit *inhibit,
{
const gchar *sender;
guint cookie;
-
+
if ( IN_appname == NULL || IN_reason == NULL )
{
g_dbus_method_invocation_return_error (invocation,
@@ -396,13 +396,13 @@ static gboolean xfpm_inhibit_inhibit (XfpmInhibit *inhibit,
sender = g_dbus_method_invocation_get_sender (invocation);
cookie = xfpm_inhibit_add_application (inhibit, IN_appname, sender);
-
+
XFPM_DEBUG("Inhibit send application name=%s reason=%s sender=%s", IN_appname, IN_reason ,sender);
-
+
xfpm_inhibit_has_inhibit_changed (inhibit);
-
+
xfpm_dbus_monitor_add_unique_name (inhibit->priv->monitor, G_BUS_TYPE_SESSION, sender);
-
+
xfpm_power_management_inhibit_complete_inhibit (user_data,
invocation,
cookie);
@@ -425,9 +425,9 @@ static gboolean xfpm_inhibit_un_inhibit (XfpmInhibit *inhibit,
_("Invalid cookie"));
return TRUE;
}
-
+
xfpm_inhibit_has_inhibit_changed (inhibit);
-
+
xfpm_power_management_inhibit_complete_un_inhibit (user_data, invocation);
return TRUE;
@@ -453,7 +453,7 @@ static gboolean xfpm_inhibit_get_inhibitors (XfpmInhibit *inhibit,
const gchar **OUT_inhibitors;
XFPM_DEBUG ("Get Inhibitors message received");
-
+
OUT_inhibitors = xfpm_inhibit_get_inhibit_list (inhibit);
xfpm_power_management_inhibit_complete_get_inhibitors (user_data,
@@ -461,6 +461,6 @@ static gboolean xfpm_inhibit_get_inhibitors (XfpmInhibit *inhibit,
OUT_inhibitors);
g_free (OUT_inhibitors);
-
+
return TRUE;
}
diff --git a/src/xfpm-inhibit.h b/src/xfpm-inhibit.h
index 9f22dce..66de5bf 100644
--- a/src/xfpm-inhibit.h
+++ b/src/xfpm-inhibit.h
@@ -35,7 +35,7 @@ typedef struct
{
GObject parent;
XfpmInhibitPrivate *priv;
-
+
} XfpmInhibit;
typedef struct
@@ -47,7 +47,7 @@ typedef struct
gboolean is_inhibit);
void (*inhibitors_list_changed) (XfpmInhibit *inhibit,
gboolean is_inhibit);
-
+
} XfpmInhibitClass;
GType xfpm_inhibit_get_type (void) G_GNUC_CONST;
diff --git a/src/xfpm-main.c b/src/xfpm-main.c
index d2621c2..fe4aa43 100644
--- a/src/xfpm-main.c
+++ b/src/xfpm-main.c
@@ -64,9 +64,9 @@ static void
xfpm_quit_signal (gint sig, gpointer data)
{
XfpmManager *manager = (XfpmManager *) data;
-
+
XFPM_DEBUG ("sig %d", sig);
-
+
if ( sig != SIGHUP )
xfpm_manager_stop (manager);
}
@@ -92,7 +92,7 @@ xfpm_dump (GHashTable *hash)
gboolean has_power_button;
gboolean has_battery_button;
gboolean has_lid;
-
+
has_battery = xfpm_string_to_bool (g_hash_table_lookup (hash, "has-battery"));
has_lid = xfpm_string_to_bool (g_hash_table_lookup (hash, "has-lid"));
can_suspend = xfpm_string_to_bool (g_hash_table_lookup (hash, "can-suspend"));
@@ -105,7 +105,7 @@ xfpm_dump (GHashTable *hash)
has_hibernate_button = xfpm_string_to_bool (g_hash_table_lookup (hash, "hibernate-button"));
has_battery_button = xfpm_string_to_bool (g_hash_table_lookup (hash, "battery-button"));
can_shutdown = xfpm_string_to_bool (g_hash_table_lookup (hash, "can-shutdown"));
-
+
g_print ("---------------------------------------------------\n");
g_print (" Xfce power manager version %s\n", VERSION);
#ifdef ENABLE_POLKIT
@@ -166,7 +166,7 @@ xfpm_dump_remote (GDBusConnection *bus)
GVariantIter *iter;
GHashTable *hash;
gchar *key, *value;
-
+
proxy = xfpm_power_manager_proxy_new_sync (bus,
G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES |
G_DBUS_PROXY_FLAGS_DO_NOT_CONNECT_SIGNALS,
@@ -174,14 +174,14 @@ xfpm_dump_remote (GDBusConnection *bus)
"/org/xfce/PowerManager",
NULL,
NULL);
-
+
xfpm_power_manager_call_get_config_sync (proxy,
&config,
NULL,
&error);
-
+
g_object_unref (proxy);
-
+
if ( error )
{
g_error ("%s", error->message);
@@ -196,7 +196,7 @@ xfpm_dump_remote (GDBusConnection *bus)
}
g_variant_iter_free (iter);
g_variant_unref (config);
-
+
xfpm_dump (hash);
g_hash_table_destroy (hash);
}
@@ -206,12 +206,12 @@ xfpm_start (GDBusConnection *bus, const gchar *client_id, gboolean dump)
{
XfpmManager *manager;
GError *error = NULL;
-
+
XFPM_DEBUG ("Starting the power manager");
-
+
manager = xfpm_manager_new (bus, client_id);
- if ( xfce_posix_signal_handler_init (&error))
+ if ( xfce_posix_signal_handler_init (&error))
{
xfce_posix_signal_handler_set_handler (SIGHUP,
xfpm_quit_signal,
@@ -224,15 +224,15 @@ xfpm_start (GDBusConnection *bus, const gchar *client_id, gboolean dump)
xfce_posix_signal_handler_set_handler (SIGTERM,
xfpm_quit_signal,
manager, NULL);
- }
- else
+ }
+ else
{
g_warning ("Unable to set up POSIX signal handlers: %s", error->message);
g_error_free (error);
}
xfpm_manager_start (manager);
-
+
if ( dump )
{
GHashTable *hash;
@@ -241,9 +241,9 @@ xfpm_start (GDBusConnection *bus, const gchar *client_id, gboolean dump)
g_hash_table_destroy (hash);
}
-
+
gtk_main ();
-
+
g_object_unref (manager);
exit (EXIT_SUCCESS);
@@ -255,7 +255,7 @@ int main (int argc, char **argv)
GError *error = NULL;
XfpmPowerManager *proxy;
GOptionContext *octx;
-
+
gboolean run = FALSE;
gboolean quit = FALSE;
gboolean config = FALSE;
@@ -265,8 +265,8 @@ int main (int argc, char **argv)
gboolean debug = FALSE;
gboolean dump = FALSE;
gchar *client_id = NULL;
-
- GOptionEntry option_entries[] =
+
+ GOptionEntry option_entries[] =
{
{ "run",'r', G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_NONE, &run, NULL, NULL },
{ "no-daemon",'\0' , G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, &no_daemon, N_("Do not daemonize"), NULL },
@@ -300,7 +300,7 @@ int main (int argc, char **argv)
g_option_context_free(octx);
- if ( version )
+ if ( version )
show_version ();
/* Fork if needed */
@@ -330,20 +330,20 @@ int main (int argc, char **argv)
return EXIT_FAILURE;
}
-
+
xfpm_debug_init (debug);
-
+
bus = g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, &error);
-
+
if ( error )
{
- xfce_dialog_show_error (NULL,
- error,
+ xfce_dialog_show_error (NULL,
+ error,
"%s",
_("Unable to get connection to the message bus session"));
g_error ("%s: \n", error->message);
}
-
+
if ( quit )
{
if (!xfpm_dbus_name_has_owner (bus, "org.xfce.PowerManager") )
@@ -361,7 +361,7 @@ int main (int argc, char **argv)
"/org/xfce/PowerManager",
NULL,
NULL);
- if ( !proxy )
+ if ( !proxy )
{
g_critical ("Failed to get proxy");
g_object_unref(bus);
@@ -369,7 +369,7 @@ int main (int argc, char **argv)
}
xfpm_power_manager_call_quit_sync (proxy, NULL, &error);
g_object_unref (proxy);
-
+
if ( error)
{
g_critical ("Failed to send quit message %s:\n", error->message);
@@ -378,11 +378,11 @@ int main (int argc, char **argv)
}
return EXIT_SUCCESS;
}
-
+
if ( config )
{
g_spawn_command_line_async ("xfce4-power-manager-settings", &error);
-
+
if ( error )
{
g_critical ("Failed to execute xfce4-power-manager-settings: %s", error->message);
@@ -391,7 +391,7 @@ int main (int argc, char **argv)
}
return EXIT_SUCCESS;
}
-
+
if ( reload )
{
if (!xfpm_dbus_name_has_owner (bus, "org.xfce.PowerManager") &&
@@ -400,7 +400,7 @@ int main (int argc, char **argv)
g_print ("Xfce power manager is not running\n");
xfpm_start (bus, client_id, dump);
}
-
+
proxy = xfpm_power_manager_proxy_new_sync (bus,
G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES |
G_DBUS_PROXY_FLAGS_DO_NOT_CONNECT_SIGNALS,
@@ -408,13 +408,13 @@ int main (int argc, char **argv)
"/org/xfce/PowerManager",
NULL,
NULL);
- if ( !proxy )
+ if ( !proxy )
{
g_critical ("Failed to get proxy");
g_object_unref (bus);
return EXIT_FAILURE;
}
-
+
if ( !xfpm_power_manager_call_restart_sync (proxy, NULL, NULL) )
{
g_critical ("Unable to send reload message");
@@ -424,7 +424,7 @@ int main (int argc, char **argv)
}
return EXIT_SUCCESS;
}
-
+
if (dump)
{
if (xfpm_dbus_name_has_owner (bus, "org.xfce.PowerManager"))
@@ -433,13 +433,13 @@ int main (int argc, char **argv)
return EXIT_SUCCESS;
}
}
-
+
if (xfpm_dbus_name_has_owner (bus, "org.freedesktop.PowerManagement") )
{
- g_print ("%s: %s\n",
+ g_print ("%s: %s\n",
_("Xfce Power Manager"),
_("Another power manager is already running"));
-
+
}
else if (xfpm_dbus_name_has_owner (bus, "org.xfce.PowerManager"))
{
@@ -448,9 +448,9 @@ int main (int argc, char **argv)
return EXIT_SUCCESS;
}
else
- {
+ {
xfpm_start (bus, client_id, dump);
}
-
+
return EXIT_SUCCESS;
}
diff --git a/src/xfpm-manager.h b/src/xfpm-manager.h
index 2ca9af1..a56840b 100644
--- a/src/xfpm-manager.h
+++ b/src/xfpm-manager.h
@@ -36,13 +36,13 @@ typedef struct
{
GObject parent;
XfpmManagerPrivate *priv;
-
+
} XfpmManager;
typedef struct
{
GObjectClass parent_class;
-
+
} XfpmManagerClass;
GType xfpm_manager_get_type (void) G_GNUC_CONST;
diff --git a/src/xfpm-network-manager.c b/src/xfpm-network-manager.c
index ff6fbd3..2883665 100644
--- a/src/xfpm-network-manager.c
+++ b/src/xfpm-network-manager.c
@@ -28,7 +28,7 @@
#include "xfpm-network-manager.h"
/*
- * Inform the Network Manager when we do suspend/hibernate
+ * Inform the Network Manager when we do suspend/hibernate
*/
gboolean xfpm_network_manager_sleep (gboolean sleep)
{
@@ -37,16 +37,16 @@ gboolean xfpm_network_manager_sleep (gboolean sleep)
GDBusConnection *bus = NULL;
GDBusProxy *proxy = NULL;
GError *error = NULL;
-
+
bus = g_bus_get_sync ( G_BUS_TYPE_SYSTEM, NULL, &error);
-
+
if ( error )
{
g_warning("%s", error->message);
g_error_free (error);
return FALSE;
}
-
+
proxy = g_dbus_proxy_new_sync (bus,
G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES |
G_DBUS_PROXY_FLAGS_DO_NOT_CONNECT_SIGNALS,
@@ -56,21 +56,21 @@ gboolean xfpm_network_manager_sleep (gboolean sleep)
"org.freedesktop.NetworkManager",
NULL,
NULL);
-
+
if (!proxy)
{
g_warning ("Failed to create proxy for Network Manager interface");
return FALSE;
}
-
+
g_dbus_proxy_call (proxy, "Sleep", g_variant_new("(b)", sleep),
G_DBUS_CALL_FLAGS_NONE, -1, NULL, NULL, NULL);
g_object_unref (G_OBJECT(proxy));
g_object_unref (bus);
-
+
/* Sleep 0.5 second to allow the nm applet to disconnect*/
g_usleep (500000);
-
+
#endif /* WITH_NETWORK_MANAGER */
return TRUE;
}
diff --git a/src/xfpm-polkit.c b/src/xfpm-polkit.c
index 2183170..12d60f9 100644
--- a/src/xfpm-polkit.c
+++ b/src/xfpm-polkit.c
@@ -102,13 +102,13 @@ get_kinfo_proc (pid_t pid, struct kinfo_proc *p)
{
int mib[4];
size_t len;
-
+
len = 4;
sysctlnametomib ("kern.proc.pid", mib, &len);
-
+
len = sizeof (struct kinfo_proc);
mib[3] = pid;
-
+
if (sysctl (mib, 4, p, &len, NULL, 0) == -1)
return FALSE;
@@ -128,12 +128,12 @@ get_start_time_for_pid (pid_t pid)
guint num_tokens;
gchar *p;
gchar *endp;
-
+
start_time = 0;
contents = NULL;
-
+
filename = g_strdup_printf ("/proc/%d/stat", pid);
-
+
if (!g_file_get_contents (filename, &contents, &length, NULL))
goto out;
@@ -146,7 +146,7 @@ get_start_time_for_pid (pid_t pid)
{
goto out;
}
-
+
p += 2; /* skip ') ' */
if (p - contents >= (int) length)
@@ -154,11 +154,11 @@ get_start_time_for_pid (pid_t pid)
g_warning ("Error parsing file %s", filename);
goto out;
}
-
+
tokens = g_strsplit (p, " ", 0);
-
+
num_tokens = g_strv_length (tokens);
-
+
if (num_tokens < 20)
{
g_warning ("Error parsing file %s", filename);
@@ -176,11 +176,11 @@ get_start_time_for_pid (pid_t pid)
out:
g_free (filename);
g_free (contents);
-
+
#elif defined(__FreeBSD__)
struct kinfo_proc p;
-
+
start_time = 0;
if (! get_kinfo_proc (pid, &p))
@@ -192,7 +192,7 @@ get_start_time_for_pid (pid_t pid)
}
start_time = (guint64) p.ki_start.tv_sec;
-
+
out:
#elif defined(__SVR4) && defined(__sun)
@@ -222,7 +222,7 @@ out:
out:
g_free (filename);
#endif
-
+
return start_time;
}
#endif /*ENABLE_POLKIT*/
@@ -233,7 +233,7 @@ static gboolean
xfpm_polkit_free_data (gpointer data)
{
XfpmPolkit *polkit;
-
+
polkit = XFPM_POLKIT (data);
g_assert (polkit->priv->subject_valid);
@@ -242,13 +242,13 @@ xfpm_polkit_free_data (gpointer data)
g_variant_unref (polkit->priv->details);
g_variant_unref (polkit->priv->subject);
-
+
polkit->priv->details = NULL;
polkit->priv->subject = NULL;
polkit->priv->destroy_id = 0;
polkit->priv->subject_valid = FALSE;
-
+
return FALSE;
}
@@ -292,7 +292,7 @@ xfpm_polkit_init_data (XfpmPolkit *polkit)
g_variant_ref_sink (g_variant_new ("(sa{sv})",
subject_kind,
&builder));
-
+
/**
* Polkit details, will leave it empty.
**/
@@ -300,11 +300,11 @@ xfpm_polkit_init_data (XfpmPolkit *polkit)
polkit->priv->details =
g_variant_ref_sink (g_variant_new ("a{ss}",
&builder));
-
+
/*Clean these data after 1 minute*/
- polkit->priv->destroy_id =
+ polkit->priv->destroy_id =
g_timeout_add_seconds (60, (GSourceFunc) xfpm_polkit_free_data, polkit);
-
+
polkit->priv->subject_valid = TRUE;
}
#endif /*ENABLE_POLKIT*/
@@ -316,19 +316,19 @@ xfpm_polkit_check_auth_intern (XfpmPolkit *polkit, const gchar *action_id)
GError *error = NULL;
gboolean is_authorized = FALSE;
GVariant *var;
-
+
/**
- * <method name="CheckAuthorization">
- * <arg type="(sa{sv})" name="subject" direction="in"/>
- * <arg type="s" name="action_id" direction="in"/>
- * <arg type="a{ss}" name="details" direction="in"/>
- * <arg type="u" name="flags" direction="in"/>
- * <arg type="s" name="cancellation_id" direction="in"/>
- * <arg type="(bba{ss})" name="result" direction="out"/>
+ * <method name="CheckAuthorization">
+ * <arg type="(sa{sv})" name="subject" direction="in"/>
+ * <arg type="s" name="action_id" direction="in"/>
+ * <arg type="a{ss}" name="details" direction="in"/>
+ * <arg type="u" name="flags" direction="in"/>
+ * <arg type="s" name="cancellation_id" direction="in"/>
+ * <arg type="(bba{ss})" name="result" direction="out"/>
* </method>
*
**/
-
+
g_return_val_if_fail (polkit->priv->proxy != NULL, FALSE);
g_return_val_if_fail (polkit->priv->subject_valid, FALSE);
@@ -346,7 +346,7 @@ xfpm_polkit_check_auth_intern (XfpmPolkit *polkit, const gchar *action_id)
G_DBUS_CALL_FLAGS_NONE,
-1, NULL,
&error);
-
+
if ( G_LIKELY (var) )
{
g_variant_get (var, "((bba{ss}))",
@@ -359,9 +359,9 @@ xfpm_polkit_check_auth_intern (XfpmPolkit *polkit, const gchar *action_id)
g_warning ("'CheckAuthorization' failed with %s", error->message);
g_error_free (error);
}
-
+
XFPM_DEBUG ("Action=%s is authorized=%s", action_id, xfpm_bool_to_string (is_authorized));
-
+
return is_authorized;
#endif /*ENABLE_POLKIT*/
return TRUE;
@@ -383,7 +383,7 @@ xfpm_polkit_class_init (XfpmPolkitClass *klass)
object_class->finalize = xfpm_polkit_finalize;
- signals [AUTH_CHANGED] =
+ signals [AUTH_CHANGED] =
g_signal_new ("auth-changed",
XFPM_TYPE_POLKIT,
G_SIGNAL_RUN_LAST,
@@ -397,7 +397,7 @@ static void
xfpm_polkit_init (XfpmPolkit *polkit)
{
GError *error = NULL;
-
+
polkit->priv = xfpm_polkit_get_instance_private (polkit);
#ifdef ENABLE_POLKIT
@@ -407,9 +407,9 @@ xfpm_polkit_init (XfpmPolkit *polkit)
polkit->priv->subject = NULL;
polkit->priv->details = NULL;
#endif /*ENABLE_POLKIT*/
-
+
polkit->priv->bus = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, &error);
-
+
if ( error )
{
g_critical ("Error getting system bus connection : %s", error->message);
@@ -418,7 +418,7 @@ xfpm_polkit_init (XfpmPolkit *polkit)
}
#ifdef ENABLE_POLKIT
- polkit->priv->proxy =
+ polkit->priv->proxy =
g_dbus_proxy_new_sync (polkit->priv->bus,
G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES,
NULL,
@@ -427,7 +427,7 @@ xfpm_polkit_init (XfpmPolkit *polkit)
"org.freedesktop.PolicyKit1.Authority",
NULL,
NULL);
-
+
if (G_LIKELY (polkit->priv->proxy) )
{
g_signal_connect (polkit->priv->proxy, "Changed",
@@ -477,7 +477,7 @@ XfpmPolkit *
xfpm_polkit_get (void)
{
static gpointer xfpm_polkit_obj = NULL;
-
+
if ( G_LIKELY (xfpm_polkit_obj) )
{
g_object_ref (xfpm_polkit_obj);
@@ -487,7 +487,7 @@ xfpm_polkit_get (void)
xfpm_polkit_obj = g_object_new (XFPM_TYPE_POLKIT, NULL);
g_object_add_weak_pointer (xfpm_polkit_obj, &xfpm_polkit_obj);
}
-
+
return XFPM_POLKIT (xfpm_polkit_obj);
}
diff --git a/src/xfpm-polkit.h b/src/xfpm-polkit.h
index bc3267d..6cc082d 100644
--- a/src/xfpm-polkit.h
+++ b/src/xfpm-polkit.h
@@ -35,15 +35,15 @@ typedef struct
{
GObject parent;
XfpmPolkitPrivate *priv;
-
+
} XfpmPolkit;
typedef struct
{
GObjectClass parent_class;
-
+
void (*auth_changed) (XfpmPolkit *polkit);
-
+
} XfpmPolkitClass;
GType xfpm_polkit_get_type (void) G_GNUC_CONST;
diff --git a/src/xfpm-power.h b/src/xfpm-power.h
index b3a1860..7d5bbcb 100644
--- a/src/xfpm-power.h
+++ b/src/xfpm-power.h
@@ -35,32 +35,32 @@ typedef struct XfpmPowerPrivate XfpmPowerPrivate;
typedef struct
{
GObject parent;
-
+
XfpmPowerPrivate *priv;
-
+
} XfpmPower;
typedef struct
{
GObjectClass parent_class;
-
+
void (*on_battery_changed) (XfpmPower *power,
gboolean on_battery);
-
+
void (*low_battery_changed) (XfpmPower *power,
gboolean low_battery);
-
+
void (*lid_changed) (XfpmPower *power,
gboolean lid_is_closed);
-
+
void (*waking_up) (XfpmPower *power);
-
+
void (*sleeping) (XfpmPower *power);
-
+
void (*ask_shutdown) (XfpmPower *power);
-
+
void (*shutdown) (XfpmPower *power);
-
+
} XfpmPowerClass;
GType xfpm_power_get_type (void) G_GNUC_CONST;
diff --git a/src/xfpm-xfconf.c b/src/xfpm-xfconf.c
index 3218a5f..df4f4fb 100644
--- a/src/xfpm-xfconf.c
+++ b/src/xfpm-xfconf.c
@@ -96,7 +96,7 @@ enum
G_DEFINE_TYPE_WITH_PRIVATE (XfpmXfconf, xfpm_xfconf, G_TYPE_OBJECT)
-static void
+static void
xfpm_xfconf_set_property (GObject *object,
guint prop_id,
const GValue *value,
@@ -104,17 +104,17 @@ xfpm_xfconf_set_property (GObject *object,
{
XfpmXfconf *conf;
GValue *dst;
-
+
conf = XFPM_XFCONF (object);
-
+
dst = conf->priv->values + prop_id;
-
+
if ( !G_IS_VALUE (dst) )
{
g_value_init (dst, pspec->value_type);
g_param_value_set_default (pspec, dst);
}
-
+
if ( g_param_values_cmp (pspec, value, dst) != 0)
{
g_value_copy (value, dst);
@@ -122,7 +122,7 @@ xfpm_xfconf_set_property (GObject *object,
}
}
-static void
+static void
xfpm_xfconf_get_property (GObject *object,
guint prop_id,
GValue *value,
@@ -130,9 +130,9 @@ xfpm_xfconf_get_property (GObject *object,
{
XfpmXfconf *conf;
GValue *src;
-
+
conf = XFPM_XFCONF (object);
-
+
src = conf->priv->values + prop_id;
if ( G_VALUE_HOLDS (src, pspec->value_type) )
@@ -148,15 +148,15 @@ xfpm_xfconf_load (XfpmXfconf *conf, gboolean channel_valid)
GValue value = { 0, };
guint nspecs;
guint i;
-
+
specs = g_object_class_list_properties (G_OBJECT_GET_CLASS (conf), &nspecs);
-
+
for ( i = 0; i < nspecs; i++)
{
gchar *prop_name;
prop_name = g_strdup_printf ("%s%s", XFPM_PROPERTIES_PREFIX, specs[i]->name);
g_value_init (&value, specs[i]->value_type);
-
+
if (channel_valid)
{
if ( !xfconf_channel_get_property (conf->priv->channel, prop_name, &value) )
@@ -200,7 +200,7 @@ xfpm_xfconf_property_changed_cb (XfconfChannel *channel, gchar *property,
return;
XFPM_DEBUG ("Property modified: %s\n", property);
-
+
g_object_set_property (G_OBJECT (conf), property + strlen (XFPM_PROPERTIES_PREFIX), value);
}
@@ -233,12 +233,12 @@ static void
xfpm_xfconf_class_init (XfpmXfconfClass *klass)
{
GObjectClass *object_class = G_OBJECT_CLASS(klass);
-
+
object_class->set_property = xfpm_xfconf_set_property;
object_class->get_property = xfpm_xfconf_get_property;
-
+
object_class->finalize = xfpm_xfconf_finalize;
-
+
/**
* XfpmXfconf::general-notification
**/
@@ -269,7 +269,7 @@ xfpm_xfconf_class_init (XfpmXfconfClass *klass)
20,
5,
G_PARAM_READWRITE));
-
+
/**
* XfpmXfconf::show-brightness-popup
**/
@@ -279,7 +279,7 @@ xfpm_xfconf_class_init (XfpmXfconfClass *klass)
NULL, NULL,
TRUE,
G_PARAM_READWRITE));
-
+
/**
* XfpmXfconf::handle-brightness-keys
**/
@@ -300,7 +300,7 @@ xfpm_xfconf_class_init (XfpmXfconfClass *klass)
NEVER_SHOW_ICON,
SHOW_ICON_WHEN_BATTERY_PRESENT,
G_PARAM_READWRITE));
-
+
/**
* XfpmXfconf::critical-battery-action
**/
@@ -323,7 +323,7 @@ xfpm_xfconf_class_init (XfpmXfconfClass *klass)
XFPM_DO_SHUTDOWN,
XFPM_DO_NOTHING,
G_PARAM_READWRITE));
-
+
/**
* XfpmXfconf::sleep-switch-action
**/
@@ -335,7 +335,7 @@ xfpm_xfconf_class_init (XfpmXfconfClass *klass)
XFPM_DO_SHUTDOWN,
XFPM_DO_NOTHING,
G_PARAM_READWRITE));
-
+
/**
* XfpmXfconf::hibernate-switch-action
**/
@@ -359,7 +359,7 @@ xfpm_xfconf_class_init (XfpmXfconfClass *klass)
XFPM_DO_SHUTDOWN,
XFPM_DO_NOTHING,
G_PARAM_READWRITE));
-
+
/**
* XfpmXfconf::lid-action-on-ac
**/
@@ -371,7 +371,7 @@ xfpm_xfconf_class_init (XfpmXfconfClass *klass)
LID_TRIGGER_LOCK_SCREEN,
LID_TRIGGER_LOCK_SCREEN,
G_PARAM_READWRITE));
-
+
/**
* XfpmXfconf::brightness-level-on-ac
**/
@@ -383,7 +383,7 @@ xfpm_xfconf_class_init (XfpmXfconfClass *klass)
100,
80,
G_PARAM_READWRITE));
-
+
/**
* XfpmXfconf::brightness-level-on-battery
**/
@@ -395,7 +395,7 @@ xfpm_xfconf_class_init (XfpmXfconfClass *klass)
100,
20,
G_PARAM_READWRITE));
-
+
/**
* XfpmXfconf::lid-action-on-battery
**/
@@ -625,17 +625,17 @@ xfpm_xfconf_init (XfpmXfconf *conf)
GError *error = NULL;
gboolean channel_valid;
gboolean lock_screen;
-
+
conf->priv = xfpm_xfconf_get_instance_private (conf);
-
+
conf->priv->values = g_new0 (GValue, N_PROPERTIES);
-
+
if ( !xfconf_init (&error) )
{
g_critical ("xfconf_init failed: %s\n", error->message);
g_error_free (error);
channel_valid = FALSE;
- }
+ }
else
{
conf->priv->channel = xfconf_channel_get (XFPM_CHANNEL);
@@ -670,15 +670,15 @@ xfpm_xfconf_finalize(GObject *object)
{
XfpmXfconf *conf;
guint i;
-
+
conf = XFPM_XFCONF(object);
-
+
for ( i = 0; i < N_PROPERTIES; i++)
{
if ( G_IS_VALUE (conf->priv->values + i) )
g_value_unset (conf->priv->values + i);
}
-
+
g_free (conf->priv->values);
G_OBJECT_CLASS(xfpm_xfconf_parent_class)->finalize(object);
@@ -688,11 +688,11 @@ XfpmXfconf *
xfpm_xfconf_new (void)
{
static gpointer xfpm_xfconf_object = NULL;
-
+
if ( G_LIKELY (xfpm_xfconf_object != NULL) )
{
g_object_ref (xfpm_xfconf_object);
- }
+ }
else
{
xfpm_xfconf_object = g_object_new (XFPM_TYPE_XFCONF, NULL);
diff --git a/src/xfpm-xfconf.h b/src/xfpm-xfconf.h
index a6f9f6f..f593939 100644
--- a/src/xfpm-xfconf.h
+++ b/src/xfpm-xfconf.h
@@ -36,13 +36,13 @@ typedef struct
{
GObject parent;
XfpmXfconfPrivate *priv;
-
+
} XfpmXfconf;
typedef struct
{
GObjectClass parent_class;
-
+
} XfpmXfconfClass;
GType xfpm_xfconf_get_type (void) G_GNUC_CONST;
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Xfce4-commits
mailing list