[Xfce4-commits] [xfce/xfce4-power-manager] 01/03: Rename variables for xfconf channel and property prefix
noreply at xfce.org
noreply at xfce.org
Sun Apr 14 21:36:14 CEST 2019
This is an automated email from the git hooks/post-receive script.
a n d r e 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 3fcd72c769dc88f27a3aa2a710f78eceb5f2a29c
Author: Kacper Piwiński <vfjpl1 at gmail.com>
Date: Sun Apr 14 16:26:35 2019 -0300
Rename variables for xfconf channel and property prefix
---
common/xfpm-config.h | 6 +-
.../power-manager-plugin/power-manager-button.c | 9 +-
.../xfce/xfce-power-manager-plugin.c | 9 +-
settings/xfpm-settings-app.c | 2 +-
settings/xfpm-settings.c | 115 +++++++++++----------
src/xfce-screensaver.c | 6 +-
src/xfpm-backlight.c | 11 +-
src/xfpm-manager.c | 3 +-
src/xfpm-power.c | 7 +-
src/xfpm-xfconf.c | 19 ++--
10 files changed, 97 insertions(+), 90 deletions(-)
diff --git a/common/xfpm-config.h b/common/xfpm-config.h
index 35f646d..3c5e404 100644
--- a/common/xfpm-config.h
+++ b/common/xfpm-config.h
@@ -1,6 +1,7 @@
/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*-
*
* * Copyright (C) 2008-2011 Ali <aliov at xfce.org>
+ * * Copyright (C) 2019 Kacper Piwiński
*
* Licensed under the GNU General Public License Version 2
*
@@ -30,8 +31,8 @@
G_BEGIN_DECLS
-#define XFPM_CHANNEL_CFG "xfce4-power-manager"
-#define PROPERTIES_PREFIX "/xfce4-power-manager/"
+#define XFPM_CHANNEL "xfce4-power-manager"
+#define XFPM_PROPERTIES_PREFIX "/xfce4-power-manager/"
#define ON_AC_INACTIVITY_TIMEOUT "inactivity-on-ac"
#define ON_BATTERY_INACTIVITY_TIMEOUT "inactivity-on-battery"
@@ -55,6 +56,7 @@ G_BEGIN_DECLS
#define PRESENTATION_MODE "presentation-mode"
#define NETWORK_MANAGER_SLEEP "network-manager-sleep"
#define HEARTBEAT_COMMAND "heartbeat-command"
+#define LOCK_COMMAND "LockCommand"
#define SHOW_TRAY_ICON_CFG "show-tray-icon"
#define POWER_SWITCH_CFG "power-button-action"
diff --git a/panel-plugins/power-manager-plugin/power-manager-button.c b/panel-plugins/power-manager-plugin/power-manager-button.c
index d6e2e69..d59a8bb 100644
--- a/panel-plugins/power-manager-plugin/power-manager-button.c
+++ b/panel-plugins/power-manager-plugin/power-manager-button.c
@@ -1,5 +1,6 @@
/*
* * Copyright (C) 2014 Eric Koegel <eric at xfce.org>
+ * * Copyright (C) 2019 Kacper Piwiński
*
* Licensed under the GNU General Public License Version 2
*
@@ -947,7 +948,7 @@ power_manager_button_init (PowerManagerButton *button)
}
else
{
- button->priv->channel = xfconf_channel_get ("xfce4-power-manager");
+ button->priv->channel = xfconf_channel_get (XFPM_CHANNEL);
}
#ifdef XFCE_PLUGIN
@@ -1032,9 +1033,9 @@ power_manager_button_new (void)
#endif
xfconf_g_property_bind (button->priv->channel,
- PROPERTIES_PREFIX BRIGHTNESS_SLIDER_MIN_LEVEL, G_TYPE_INT,
+ XFPM_PROPERTIES_PREFIX BRIGHTNESS_SLIDER_MIN_LEVEL, G_TYPE_INT,
G_OBJECT (button), BRIGHTNESS_SLIDER_MIN_LEVEL);
- xfconf_g_property_bind (button->priv->channel, PROPERTIES_PREFIX SHOW_PANEL_LABEL, G_TYPE_INT,
+ xfconf_g_property_bind (button->priv->channel, XFPM_PROPERTIES_PREFIX SHOW_PANEL_LABEL, G_TYPE_INT,
G_OBJECT (button), SHOW_PANEL_LABEL);
return GTK_WIDGET (button);
@@ -1651,7 +1652,7 @@ G_GNUC_END_IGNORE_DEPRECATIONS
gtk_widget_show (mi);
gtk_menu_shell_append(GTK_MENU_SHELL(menu), mi);
xfconf_g_property_bind(button->priv->channel,
- PROPERTIES_PREFIX PRESENTATION_MODE,
+ XFPM_PROPERTIES_PREFIX PRESENTATION_MODE,
G_TYPE_BOOLEAN, G_OBJECT(mi), "active");
/* Show any applications currently inhibiting now */
diff --git a/panel-plugins/power-manager-plugin/xfce/xfce-power-manager-plugin.c b/panel-plugins/power-manager-plugin/xfce/xfce-power-manager-plugin.c
index 32ab1f9..2b5db53 100644
--- a/panel-plugins/power-manager-plugin/xfce/xfce-power-manager-plugin.c
+++ b/panel-plugins/power-manager-plugin/xfce/xfce-power-manager-plugin.c
@@ -1,5 +1,6 @@
/*
* * Copyright (C) 2014 Eric Koegel <eric at xfce.org>
+ * * Copyright (C) 2019 Kacper Piwiński
*
* Licensed under the GNU General Public License Version 2
*
@@ -131,7 +132,7 @@ power_manager_plugin_combo_changed (GtkComboBox *combo,
model = gtk_combo_box_get_model (combo);
gtk_tree_model_get (model, &iter, 0, &show_panel_label, -1);
- xfconf_channel_set_int (channel, PROPERTIES_PREFIX SHOW_PANEL_LABEL, show_panel_label);
+ xfconf_channel_set_int (channel, XFPM_PROPERTIES_PREFIX SHOW_PANEL_LABEL, show_panel_label);
}
static void
@@ -148,7 +149,7 @@ power_manager_plugin_configure (XfcePanelPlugin *plugin,
gint i;
gchar *options[] = { _("None"), _("Percentage"), _("Remaining time"), _("Percentage and remaining time") };
- channel = xfconf_channel_get ("xfce4-power-manager");
+ channel = xfconf_channel_get (XFPM_CHANNEL);
/* block the plugin menu */
xfce_panel_plugin_block_menu (plugin);
@@ -179,7 +180,7 @@ power_manager_plugin_configure (XfcePanelPlugin *plugin,
label = gtk_label_new (_("Show label:"));
gtk_label_set_xalign (GTK_LABEL (label), 0.0);
gtk_grid_attach (GTK_GRID (grid), GTK_WIDGET (label), 0, 0, 1, 1);
- show_panel_label = xfconf_channel_get_int (channel, PROPERTIES_PREFIX SHOW_PANEL_LABEL, -1);
+ show_panel_label = xfconf_channel_get_int (channel, XFPM_PROPERTIES_PREFIX SHOW_PANEL_LABEL, -1);
list_store = gtk_list_store_new (N_COLUMNS,
G_TYPE_INT,
@@ -204,7 +205,7 @@ power_manager_plugin_configure (XfcePanelPlugin *plugin,
g_signal_connect (G_OBJECT (combo), "changed",
G_CALLBACK (power_manager_plugin_combo_changed),
channel);
- g_signal_connect (G_OBJECT (channel), "property-changed::" PROPERTIES_PREFIX SHOW_PANEL_LABEL,
+ g_signal_connect (G_OBJECT (channel), "property-changed::" XFPM_PROPERTIES_PREFIX SHOW_PANEL_LABEL,
G_CALLBACK (power_manager_plugin_panel_label_changed),
combo);
diff --git a/settings/xfpm-settings-app.c b/settings/xfpm-settings-app.c
index 9da47da..388405f 100644
--- a/settings/xfpm-settings-app.c
+++ b/settings/xfpm-settings-app.c
@@ -227,7 +227,7 @@ xfpm_settings_app_launch (GApplication *app)
}
- channel = xfconf_channel_new(XFPM_CHANNEL_CFG);
+ channel = xfconf_channel_new(XFPM_CHANNEL);
xfpm_debug_init (priv->debug);
diff --git a/settings/xfpm-settings.c b/settings/xfpm-settings.c
index bdffe16..f227546 100644
--- a/settings/xfpm-settings.c
+++ b/settings/xfpm-settings.c
@@ -1,5 +1,6 @@
/*
* * Copyright (C) 2008-2011 Ali <aliov at xfce.org>
+ * * Copyright (C) 2019 Kacper Piwiński
*
* Licensed under the GNU General Public License Version 2
*
@@ -229,7 +230,7 @@ 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, PROPERTIES_PREFIX BRIGHTNESS_LEVEL_ON_AC, val) )
+ 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 +242,7 @@ 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, PROPERTIES_PREFIX BRIGHTNESS_LEVEL_ON_BATTERY, val) )
+ 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);
}
@@ -267,7 +268,7 @@ battery_critical_changed_cb (GtkWidget *w, XfconfChannel *channel)
&value,
-1);
- if (!xfconf_channel_set_uint (channel, PROPERTIES_PREFIX CRITICAL_BATT_ACTION_CFG, value) )
+ 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 +279,7 @@ 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, PROPERTIES_PREFIX ON_AC_INACTIVITY_TIMEOUT, value))
+ 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 +292,7 @@ inactivity_on_battery_value_changed_cb (GtkWidget *widget, XfconfChannel *channe
{
gint value = (gint)gtk_range_get_value (GTK_RANGE (widget));
- if (!xfconf_channel_set_uint (channel, PROPERTIES_PREFIX ON_BATTERY_INACTIVITY_TIMEOUT, value))
+ 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);
}
@@ -317,7 +318,7 @@ button_sleep_changed_cb (GtkWidget *w, XfconfChannel *channel)
&value,
-1);
- if (!xfconf_channel_set_uint (channel, PROPERTIES_PREFIX SLEEP_SWITCH_CFG, value ) )
+ 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);
}
@@ -341,7 +342,7 @@ button_power_changed_cb (GtkWidget *w, XfconfChannel *channel)
&value,
-1);
- if (!xfconf_channel_set_uint (channel, PROPERTIES_PREFIX POWER_SWITCH_CFG, value) )
+ 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);
}
@@ -365,7 +366,7 @@ button_hibernate_changed_cb (GtkWidget *w, XfconfChannel *channel)
&value,
-1);
- if (!xfconf_channel_set_uint (channel, PROPERTIES_PREFIX HIBERNATE_SWITCH_CFG, value ) )
+ 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);
}
@@ -389,7 +390,7 @@ button_battery_changed_cb (GtkWidget *w, XfconfChannel *channel)
&value,
-1);
- if (!xfconf_channel_set_uint (channel, PROPERTIES_PREFIX BATTERY_SWITCH_CFG, value ) )
+ if (!xfconf_channel_set_uint (channel, XFPM_PROPERTIES_PREFIX BATTERY_SWITCH_CFG, value ) )
{
g_critical ("Cannot set value for property %s\n", BATTERY_SWITCH_CFG);
}
@@ -413,7 +414,7 @@ on_ac_sleep_mode_changed_cb (GtkWidget *w, XfconfChannel *channel)
&value,
-1);
- if (!xfconf_channel_set_uint (channel, PROPERTIES_PREFIX INACTIVITY_SLEEP_MODE_ON_AC, value) )
+ if (!xfconf_channel_set_uint (channel, XFPM_PROPERTIES_PREFIX INACTIVITY_SLEEP_MODE_ON_AC, value) )
{
g_critical ("Cannot set value for property %s\n", INACTIVITY_SLEEP_MODE_ON_AC);
}
@@ -437,7 +438,7 @@ on_battery_sleep_mode_changed_cb (GtkWidget *w, XfconfChannel *channel)
&value,
-1);
- if (!xfconf_channel_set_uint (channel, PROPERTIES_PREFIX INACTIVITY_SLEEP_MODE_ON_BATTERY, value) )
+ if (!xfconf_channel_set_uint (channel, XFPM_PROPERTIES_PREFIX INACTIVITY_SLEEP_MODE_ON_BATTERY, value) )
{
g_critical ("Cannot set value for property %s\n", INACTIVITY_SLEEP_MODE_ON_BATTERY);
}
@@ -446,7 +447,7 @@ on_battery_sleep_mode_changed_cb (GtkWidget *w, XfconfChannel *channel)
void
dpms_toggled_cb (GtkWidget *w, gboolean is_active, XfconfChannel *channel)
{
- xfconf_channel_set_bool (channel, PROPERTIES_PREFIX DPMS_ENABLED_CFG, is_active);
+ 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);
@@ -526,7 +527,7 @@ sleep_on_battery_value_changed_cb (GtkWidget *w, XfconfChannel *channel)
}
}
- if (!xfconf_channel_set_uint (channel, PROPERTIES_PREFIX ON_BATT_DPMS_SLEEP, sleep_value))
+ 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);
}
@@ -548,7 +549,7 @@ off_on_battery_value_changed_cb (GtkWidget *w, XfconfChannel *channel)
}
}
- if (!xfconf_channel_set_uint (channel, PROPERTIES_PREFIX ON_BATT_DPMS_OFF, off_value))
+ 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);
}
@@ -627,7 +628,7 @@ sleep_on_ac_value_changed_cb (GtkWidget *w, XfconfChannel *channel)
}
}
- if (!xfconf_channel_set_uint (channel, PROPERTIES_PREFIX ON_AC_DPMS_SLEEP, sleep_value))
+ if (!xfconf_channel_set_uint (channel, XFPM_PROPERTIES_PREFIX ON_AC_DPMS_SLEEP, sleep_value))
{
g_critical ("Cannot set value for property %s\n", ON_AC_DPMS_SLEEP);
}
@@ -652,7 +653,7 @@ off_on_ac_value_changed_cb (GtkWidget *w, XfconfChannel *channel)
}
}
- if (!xfconf_channel_set_uint (channel, PROPERTIES_PREFIX ON_AC_DPMS_OFF, off_value))
+ if (!xfconf_channel_set_uint (channel, XFPM_PROPERTIES_PREFIX ON_AC_DPMS_OFF, off_value))
{
g_critical ("Cannot set value for property %s\n", ON_AC_DPMS_OFF);
}
@@ -734,7 +735,7 @@ brightness_on_battery_value_changed_cb (GtkWidget *w, XfconfChannel *channel)
}
}
- if (!xfconf_channel_set_uint (channel, PROPERTIES_PREFIX BRIGHTNESS_ON_BATTERY, value))
+ 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);
}
@@ -756,7 +757,7 @@ brightness_on_ac_value_changed_cb (GtkWidget *w, XfconfChannel *channel)
}
}
- if (!xfconf_channel_set_uint (channel, PROPERTIES_PREFIX BRIGHTNESS_ON_AC, value))
+ if (!xfconf_channel_set_uint (channel, XFPM_PROPERTIES_PREFIX BRIGHTNESS_ON_AC, value))
{
g_critical ("Cannot set value for property %s\n", BRIGHTNESS_ON_AC);
}
@@ -794,7 +795,7 @@ on_battery_lid_changed_cb (GtkWidget *w, XfconfChannel *channel)
&value,
-1);
- if (!xfconf_channel_set_uint (channel, PROPERTIES_PREFIX LID_SWITCH_ON_BATTERY_CFG, value) )
+ 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);
}
@@ -819,7 +820,7 @@ on_ac_lid_changed_cb (GtkWidget *w, XfconfChannel *channel)
&value,
-1);
- if (!xfconf_channel_set_uint (channel, PROPERTIES_PREFIX LID_SWITCH_ON_AC_CFG, value) )
+ 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);
}
@@ -831,7 +832,7 @@ critical_level_value_changed_cb (GtkSpinButton *w, XfconfChannel *channel)
{
guint val = (guint) gtk_spin_button_get_value (w);
- if (!xfconf_channel_set_uint (channel, PROPERTIES_PREFIX CRITICAL_POWER_LEVEL, val) )
+ 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);
}
@@ -848,7 +849,7 @@ lock_screen_toggled_cb (GtkWidget *w, XfconfChannel *channel)
g_critical ("Unable to set value for property %s\n", LOCK_SCREEN_ON_SLEEP);
}
- if ( !xfconf_channel_set_bool (channel, PROPERTIES_PREFIX LOCK_SCREEN_ON_SLEEP, val) )
+ if ( !xfconf_channel_set_bool (channel, XFPM_PROPERTIES_PREFIX LOCK_SCREEN_ON_SLEEP, val) )
{
g_critical ("Unable to set value for property %s\n", LOCK_SCREEN_ON_SLEEP);
}
@@ -870,12 +871,12 @@ lock_screen_toggled_cb (GtkWidget *w, XfconfChannel *channel)
void
xfpm_update_logind_handle_lid_switch (XfconfChannel *channel)
{
- gboolean lock_on_suspend = xfconf_channel_get_bool (channel, PROPERTIES_PREFIX LOCK_SCREEN_ON_SLEEP, TRUE);
- guint lid_switch_on_ac = xfconf_channel_get_uint (channel, PROPERTIES_PREFIX LID_SWITCH_ON_AC_CFG, LID_TRIGGER_LOCK_SCREEN);
- guint lid_switch_on_battery = xfconf_channel_get_uint (channel, PROPERTIES_PREFIX LID_SWITCH_ON_BATTERY_CFG, LID_TRIGGER_LOCK_SCREEN);
+ gboolean lock_on_suspend = xfconf_channel_get_bool (channel, XFPM_PROPERTIES_PREFIX LOCK_SCREEN_ON_SLEEP, TRUE);
+ guint lid_switch_on_ac = xfconf_channel_get_uint (channel, XFPM_PROPERTIES_PREFIX LID_SWITCH_ON_AC_CFG, LID_TRIGGER_LOCK_SCREEN);
+ guint lid_switch_on_battery = xfconf_channel_get_uint (channel, XFPM_PROPERTIES_PREFIX LID_SWITCH_ON_BATTERY_CFG, LID_TRIGGER_LOCK_SCREEN);
// logind-handle-lid-switch = true when: lock_on_suspend == true and (lid_switch_on_ac == suspend or lid_switch_on_battery == suspend)
- xfconf_channel_set_bool (channel, PROPERTIES_PREFIX LOGIND_HANDLE_LID_SWITCH, lock_on_suspend && (lid_switch_on_ac == 1 || lid_switch_on_battery == 1));
+ xfconf_channel_set_bool (channel, XFPM_PROPERTIES_PREFIX LOGIND_HANDLE_LID_SWITCH, lock_on_suspend && (lid_switch_on_ac == 1 || lid_switch_on_battery == 1));
}
/* END Light Locker Integration */
@@ -935,7 +936,7 @@ xfpm_settings_on_battery (XfconfChannel *channel, gboolean auth_suspend,
gtk_combo_box_set_active (GTK_COMBO_BOX (inact_action), 0);
val = xfconf_channel_get_uint (channel,
- PROPERTIES_PREFIX INACTIVITY_SLEEP_MODE_ON_BATTERY,
+ XFPM_PROPERTIES_PREFIX INACTIVITY_SLEEP_MODE_ON_BATTERY,
XFPM_DO_HIBERNATE);
for ( valid = gtk_tree_model_get_iter_first (GTK_TREE_MODEL (list_store), &iter);
@@ -967,7 +968,7 @@ xfpm_settings_on_battery (XfconfChannel *channel, gboolean auth_suspend,
gtk_widget_set_tooltip_text (inact_timeout, _("Hibernate and suspend operations not permitted"));
}
- val = xfconf_channel_get_uint (channel, PROPERTIES_PREFIX ON_BATTERY_INACTIVITY_TIMEOUT, 14);
+ val = xfconf_channel_get_uint (channel, XFPM_PROPERTIES_PREFIX ON_BATTERY_INACTIVITY_TIMEOUT, 14);
gtk_range_set_value (GTK_RANGE (inact_timeout), val);
@@ -1004,7 +1005,7 @@ xfpm_settings_on_battery (XfconfChannel *channel, gboolean auth_suspend,
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, PROPERTIES_PREFIX CRITICAL_BATT_ACTION_CFG, XFPM_DO_NOTHING);
+ 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;
@@ -1022,13 +1023,13 @@ xfpm_settings_on_battery (XfconfChannel *channel, gboolean auth_suspend,
/*
* DPMS settings when running on battery power
*/
- handle_dpms = xfconf_channel_get_bool (channel, PROPERTIES_PREFIX DPMS_ENABLED_CFG, TRUE);
+ handle_dpms = xfconf_channel_get_bool (channel, XFPM_PROPERTIES_PREFIX DPMS_ENABLED_CFG, TRUE);
- val = xfconf_channel_get_uint (channel, PROPERTIES_PREFIX ON_BATT_DPMS_SLEEP, 5);
+ 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, PROPERTIES_PREFIX ON_BATT_DPMS_OFF, 10);
+ 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);
@@ -1062,7 +1063,7 @@ xfpm_settings_on_battery (XfconfChannel *channel, gboolean auth_suspend,
gtk_combo_box_set_active (GTK_COMBO_BOX (lid), 0);
- val = xfconf_channel_get_uint (channel, PROPERTIES_PREFIX LID_SWITCH_ON_BATTERY_CFG, LID_TRIGGER_LOCK_SCREEN);
+ 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;
@@ -1091,10 +1092,10 @@ xfpm_settings_on_battery (XfconfChannel *channel, gboolean auth_suspend,
brg_level = GTK_WIDGET (gtk_builder_get_object (xml ,"brightness-level-on-battery"));
if ( has_lcd_brightness )
{
- val = xfconf_channel_get_uint (channel, PROPERTIES_PREFIX BRIGHTNESS_ON_BATTERY, 120);
+ val = xfconf_channel_get_uint (channel, XFPM_PROPERTIES_PREFIX BRIGHTNESS_ON_BATTERY, 120);
gtk_range_set_value (GTK_RANGE(brg), val);
- val = xfconf_channel_get_uint (channel, PROPERTIES_PREFIX BRIGHTNESS_LEVEL_ON_BATTERY, 20);
+ val = xfconf_channel_get_uint (channel, XFPM_PROPERTIES_PREFIX BRIGHTNESS_LEVEL_ON_BATTERY, 20);
gtk_range_set_value (GTK_RANGE (brg_level), val);
}
else
@@ -1174,7 +1175,7 @@ xfpm_settings_on_ac (XfconfChannel *channel, gboolean auth_suspend,
gtk_combo_box_set_active (GTK_COMBO_BOX (inact_action), 0);
val = xfconf_channel_get_uint (channel,
- PROPERTIES_PREFIX INACTIVITY_SLEEP_MODE_ON_AC,
+ XFPM_PROPERTIES_PREFIX INACTIVITY_SLEEP_MODE_ON_AC,
XFPM_DO_SUSPEND);
for ( valid = gtk_tree_model_get_iter_first (GTK_TREE_MODEL (list_store), &iter);
@@ -1206,19 +1207,19 @@ xfpm_settings_on_ac (XfconfChannel *channel, gboolean auth_suspend,
gtk_widget_set_tooltip_text (inact_timeout, _("Hibernate and suspend operations not permitted"));
}
- val = xfconf_channel_get_uint (channel, PROPERTIES_PREFIX ON_AC_INACTIVITY_TIMEOUT, 14);
+ val = xfconf_channel_get_uint (channel, XFPM_PROPERTIES_PREFIX ON_AC_INACTIVITY_TIMEOUT, 14);
gtk_range_set_value (GTK_RANGE (inact_timeout), val);
/*
* DPMS settings when running on AC power
*/
- handle_dpms = xfconf_channel_get_bool (channel, PROPERTIES_PREFIX DPMS_ENABLED_CFG, TRUE);
+ handle_dpms = xfconf_channel_get_bool (channel, XFPM_PROPERTIES_PREFIX DPMS_ENABLED_CFG, TRUE);
- val = xfconf_channel_get_uint (channel, PROPERTIES_PREFIX ON_AC_DPMS_SLEEP, 10);
+ 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, PROPERTIES_PREFIX ON_AC_DPMS_OFF, 15);
+ 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);
@@ -1252,7 +1253,7 @@ xfpm_settings_on_ac (XfconfChannel *channel, gboolean auth_suspend,
gtk_combo_box_set_active (GTK_COMBO_BOX (lid), 0);
- val = xfconf_channel_get_uint (channel, PROPERTIES_PREFIX LID_SWITCH_ON_AC_CFG, LID_TRIGGER_LOCK_SCREEN);
+ 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;
valid = gtk_tree_model_iter_next (GTK_TREE_MODEL (list_store), &iter) )
@@ -1282,10 +1283,10 @@ xfpm_settings_on_ac (XfconfChannel *channel, gboolean auth_suspend,
brg_level = GTK_WIDGET (gtk_builder_get_object (xml ,"brightness-level-on-ac"));
if ( has_lcd_brightness )
{
- val = xfconf_channel_get_uint (channel, PROPERTIES_PREFIX BRIGHTNESS_ON_AC, 9);
+ val = xfconf_channel_get_uint (channel, XFPM_PROPERTIES_PREFIX BRIGHTNESS_ON_AC, 9);
gtk_range_set_value (GTK_RANGE(brg), val);
- val = xfconf_channel_get_uint (channel, PROPERTIES_PREFIX BRIGHTNESS_LEVEL_ON_AC, 80);
+ val = xfconf_channel_get_uint (channel, XFPM_PROPERTIES_PREFIX BRIGHTNESS_LEVEL_ON_AC, 80);
gtk_range_set_value (GTK_RANGE (brg_level), val);
}
@@ -1340,7 +1341,7 @@ xfpm_settings_general (XfconfChannel *channel, gboolean auth_suspend,
/*
* Global dpms settings (enable/disable)
*/
- val = xfconf_channel_get_bool (channel, PROPERTIES_PREFIX DPMS_ENABLED_CFG, TRUE);
+ val = xfconf_channel_get_bool (channel, XFPM_PROPERTIES_PREFIX DPMS_ENABLED_CFG, TRUE);
gtk_switch_set_state (GTK_SWITCH (dpms), val);
/*
@@ -1380,7 +1381,7 @@ xfpm_settings_general (XfconfChannel *channel, gboolean auth_suspend,
gtk_combo_box_set_active (GTK_COMBO_BOX (power), 0);
- value = xfconf_channel_get_uint (channel, PROPERTIES_PREFIX POWER_SWITCH_CFG, XFPM_DO_NOTHING);
+ 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;
valid = gtk_tree_model_iter_next (GTK_TREE_MODEL (list_store), &iter) )
@@ -1429,7 +1430,7 @@ xfpm_settings_general (XfconfChannel *channel, gboolean auth_suspend,
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, PROPERTIES_PREFIX HIBERNATE_SWITCH_CFG, XFPM_DO_NOTHING);
+ 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);
@@ -1483,7 +1484,7 @@ xfpm_settings_general (XfconfChannel *channel, gboolean auth_suspend,
gtk_combo_box_set_active (GTK_COMBO_BOX (sleep_w), 0);
- value = xfconf_channel_get_uint (channel, PROPERTIES_PREFIX SLEEP_SWITCH_CFG, XFPM_DO_NOTHING);
+ 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;
valid = gtk_tree_model_iter_next (GTK_TREE_MODEL (list_store), &iter) )
@@ -1534,7 +1535,7 @@ xfpm_settings_general (XfconfChannel *channel, gboolean auth_suspend,
gtk_combo_box_set_active (GTK_COMBO_BOX (battery_w), 0);
- value = xfconf_channel_get_uint (channel, PROPERTIES_PREFIX BATTERY_SWITCH_CFG, XFPM_DO_NOTHING);
+ value = xfconf_channel_get_uint (channel, XFPM_PROPERTIES_PREFIX BATTERY_SWITCH_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) )
@@ -1574,7 +1575,7 @@ xfpm_settings_advanced (XfconfChannel *channel, gboolean auth_suspend,
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, PROPERTIES_PREFIX CRITICAL_POWER_LEVEL, 10);
+ val = xfconf_channel_get_uint (channel, XFPM_PROPERTIES_PREFIX CRITICAL_POWER_LEVEL, 10);
if ( val > 20 || val < 1)
{
@@ -1608,7 +1609,7 @@ xfpm_settings_advanced (XfconfChannel *channel, gboolean auth_suspend,
gtk_widget_set_tooltip_text (lock, _("Hibernate and suspend operations not permitted"));
}
- val = xfconf_channel_get_bool (channel, PROPERTIES_PREFIX LOCK_SCREEN_ON_SLEEP, TRUE);
+ val = xfconf_channel_get_bool (channel, XFPM_PROPERTIES_PREFIX LOCK_SCREEN_ON_SLEEP, TRUE);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(lock), val);
}
@@ -1749,7 +1750,7 @@ static void xfpm_settings_light_locker (XfconfChannel *channel,
variant = g_settings_get_value (light_locker_settings, "lock-on-suspend");
lock_on_suspend = g_variant_get_boolean (variant);
- xfpm_lock_on_suspend = xfconf_channel_get_bool (channel, PROPERTIES_PREFIX LOCK_SCREEN_ON_SLEEP, TRUE);
+ xfpm_lock_on_suspend = xfconf_channel_get_bool (channel, XFPM_PROPERTIES_PREFIX LOCK_SCREEN_ON_SLEEP, TRUE);
if (lock_on_suspend != xfpm_lock_on_suspend) {
variant = g_variant_new_boolean (xfpm_lock_on_suspend);
if (!g_settings_set_value (light_locker_settings, "lock-on-suspend", variant)) {
@@ -2373,27 +2374,27 @@ xfpm_settings_dialog_new (XfconfChannel *channel, gboolean auth_suspend,
on_ac_dpms_off = GTK_WIDGET (gtk_builder_get_object (xml, "dpms-off-on-ac"));
on_battery_display_blank = GTK_WIDGET (gtk_builder_get_object (xml, "display-blank-on-battery"));
- val = xfconf_channel_get_uint (channel, PROPERTIES_PREFIX ON_BATTERY_BLANK, 1);
+ val = xfconf_channel_get_uint (channel, XFPM_PROPERTIES_PREFIX ON_BATTERY_BLANK, 1);
gtk_range_set_value (GTK_RANGE (on_battery_display_blank), val);
- xfconf_g_property_bind (channel, PROPERTIES_PREFIX ON_BATTERY_BLANK,
+ xfconf_g_property_bind (channel, XFPM_PROPERTIES_PREFIX ON_BATTERY_BLANK,
G_TYPE_INT, gtk_range_get_adjustment (GTK_RANGE (on_battery_display_blank)),
"value");
on_ac_display_blank = GTK_WIDGET (gtk_builder_get_object (xml, "display-blank-on-ac"));
- xfconf_g_property_bind (channel, PROPERTIES_PREFIX ON_AC_BLANK,
+ xfconf_g_property_bind (channel, XFPM_PROPERTIES_PREFIX ON_AC_BLANK,
G_TYPE_INT, gtk_range_get_adjustment (GTK_RANGE (on_ac_display_blank)),
"value");
switch_widget = GTK_WIDGET (gtk_builder_get_object (xml, "handle-brightness-keys"));
- xfconf_g_property_bind (channel, PROPERTIES_PREFIX HANDLE_BRIGHTNESS_KEYS,
+ xfconf_g_property_bind (channel, XFPM_PROPERTIES_PREFIX HANDLE_BRIGHTNESS_KEYS,
G_TYPE_BOOLEAN, switch_widget, "active");
switch_widget = GTK_WIDGET (gtk_builder_get_object (xml, "show-notifications"));
- xfconf_g_property_bind (channel, PROPERTIES_PREFIX GENERAL_NOTIFICATION_CFG,
+ xfconf_g_property_bind (channel, XFPM_PROPERTIES_PREFIX GENERAL_NOTIFICATION_CFG,
G_TYPE_BOOLEAN, switch_widget, "active");
switch_widget = GTK_WIDGET (gtk_builder_get_object (xml, "show-systray"));
- xfconf_g_property_bind (channel, PROPERTIES_PREFIX SHOW_TRAY_ICON_CFG,
+ xfconf_g_property_bind (channel, XFPM_PROPERTIES_PREFIX SHOW_TRAY_ICON_CFG,
G_TYPE_BOOLEAN, switch_widget, "active");
dialog = GTK_WIDGET (gtk_builder_get_object (xml, "xfpm-settings-dialog"));
diff --git a/src/xfce-screensaver.c b/src/xfce-screensaver.c
index 594aec9..ebfaf8f 100644
--- a/src/xfce-screensaver.c
+++ b/src/xfce-screensaver.c
@@ -1,5 +1,6 @@
/*
* * Copyright (C) 2016 Eric Koegel <eric at xfce.org>
+ * * Copyright (C) 2019 Kacper Piwiński
*
* Licensed under the GNU General Public License Version 2
*
@@ -41,13 +42,10 @@
#include <libxfce4util/libxfce4util.h>
#include <xfconf/xfconf.h>
+#include "xfpm-config.h"
#include "xfce-screensaver.h"
-#define HEARTBEAT_COMMAND "heartbeat-command"
-#define LOCK_COMMAND "LockCommand"
-#define XFPM_CHANNEL "xfce4-power-manager"
-#define XFPM_PROPERTIES_PREFIX "/xfce4-power-manager/"
#define XFSM_CHANNEL "xfce4-session"
#define XFSM_PROPERTIES_PREFIX "/general/"
diff --git a/src/xfpm-backlight.c b/src/xfpm-backlight.c
index 811a4b1..adf1d82 100644
--- a/src/xfpm-backlight.c
+++ b/src/xfpm-backlight.c
@@ -1,5 +1,6 @@
/*
* * Copyright (C) 2009-2011 Ali <aliov at xfce.org>
+ * * Copyright (C) 2019 Kacper Piwiński
*
* Licensed under the GNU General Public License Version 2
*
@@ -365,7 +366,7 @@ xfpm_backlight_init (XfpmBacklight *backlight)
backlight->priv->brightness_switch = -1;
xfconf_g_property_bind (xfpm_xfconf_get_channel(backlight->priv->conf),
- PROPERTIES_PREFIX BRIGHTNESS_SWITCH, G_TYPE_INT,
+ XFPM_PROPERTIES_PREFIX BRIGHTNESS_SWITCH, G_TYPE_INT,
G_OBJECT(backlight), BRIGHTNESS_SWITCH);
ret = xfpm_brightness_get_switch (backlight->priv->brightness,
@@ -386,13 +387,13 @@ xfpm_backlight_init (XfpmBacklight *backlight)
*/
backlight->priv->brightness_switch_save =
xfconf_channel_get_int (xfpm_xfconf_get_channel(backlight->priv->conf),
- PROPERTIES_PREFIX BRIGHTNESS_SWITCH_SAVE,
+ XFPM_PROPERTIES_PREFIX BRIGHTNESS_SWITCH_SAVE,
-1);
if (backlight->priv->brightness_switch_save == -1)
{
if (!xfconf_channel_set_int (xfpm_xfconf_get_channel(backlight->priv->conf),
- PROPERTIES_PREFIX BRIGHTNESS_SWITCH_SAVE,
+ XFPM_PROPERTIES_PREFIX BRIGHTNESS_SWITCH_SAVE,
backlight->priv->brightness_switch))
g_critical ("Cannot set value for property %s\n", BRIGHTNESS_SWITCH_SAVE);
@@ -407,7 +408,7 @@ xfpm_backlight_init (XfpmBacklight *backlight)
/* check whether to change the brightness switch */
handle_keys = xfconf_channel_get_bool (xfpm_xfconf_get_channel(backlight->priv->conf),
- PROPERTIES_PREFIX HANDLE_BRIGHTNESS_KEYS,
+ XFPM_PROPERTIES_PREFIX HANDLE_BRIGHTNESS_KEYS,
TRUE);
backlight->priv->brightness_switch = handle_keys ? 0 : 1;
g_object_set (G_OBJECT (backlight),
@@ -518,7 +519,7 @@ xfpm_backlight_finalize (GObject *object)
backlight->priv->brightness_switch_save);
/* unset the xfconf saved value after the restore */
if (!xfconf_channel_set_int (xfpm_xfconf_get_channel(backlight->priv->conf),
- PROPERTIES_PREFIX BRIGHTNESS_SWITCH_SAVE, -1))
+ XFPM_PROPERTIES_PREFIX BRIGHTNESS_SWITCH_SAVE, -1))
g_critical ("Cannot set value for property %s\n", BRIGHTNESS_SWITCH_SAVE);
if (ret)
diff --git a/src/xfpm-manager.c b/src/xfpm-manager.c
index 1890058..ad96a5b 100644
--- a/src/xfpm-manager.c
+++ b/src/xfpm-manager.c
@@ -1,5 +1,6 @@
/*
* * Copyright (C) 2008-2011 Ali <aliov at xfce.org>
+ * * Copyright (C) 2019 Kacper Piwiński
*
* Licensed under the GNU General Public License Version 2
*
@@ -932,7 +933,7 @@ void xfpm_manager_start (XfpmManager *manager)
G_CALLBACK (xfpm_manager_shutdown), manager);
xfconf_g_property_bind(xfpm_xfconf_get_channel (manager->priv->conf),
- PROPERTIES_PREFIX SHOW_TRAY_ICON_CFG,
+ XFPM_PROPERTIES_PREFIX SHOW_TRAY_ICON_CFG,
G_TYPE_INT,
G_OBJECT(manager),
SHOW_TRAY_ICON_CFG);
diff --git a/src/xfpm-power.c b/src/xfpm-power.c
index 3552ba8..766a705 100644
--- a/src/xfpm-power.c
+++ b/src/xfpm-power.c
@@ -1,5 +1,6 @@
/*
* * Copyright (C) 2009-2011 Ali <aliov at xfce.org>
+ * * Copyright (C) 2019 Kacper Piwiński
*
* Licensed under the GNU General Public License Version 2
*
@@ -1359,15 +1360,15 @@ xfpm_power_new (void)
XfpmPower *power = XFPM_POWER(g_object_new (XFPM_TYPE_POWER, NULL));
xfconf_g_property_bind (xfpm_xfconf_get_channel(power->priv->conf),
- PROPERTIES_PREFIX PRESENTATION_MODE, G_TYPE_BOOLEAN,
+ XFPM_PROPERTIES_PREFIX PRESENTATION_MODE, G_TYPE_BOOLEAN,
G_OBJECT(power), PRESENTATION_MODE);
xfconf_g_property_bind (xfpm_xfconf_get_channel(power->priv->conf),
- PROPERTIES_PREFIX ON_BATTERY_BLANK, G_TYPE_INT,
+ XFPM_PROPERTIES_PREFIX ON_BATTERY_BLANK, G_TYPE_INT,
G_OBJECT (power), ON_BATTERY_BLANK);
xfconf_g_property_bind (xfpm_xfconf_get_channel(power->priv->conf),
- PROPERTIES_PREFIX ON_AC_BLANK, G_TYPE_INT,
+ XFPM_PROPERTIES_PREFIX ON_AC_BLANK, G_TYPE_INT,
G_OBJECT (power), ON_AC_BLANK);
return power;
diff --git a/src/xfpm-xfconf.c b/src/xfpm-xfconf.c
index 1697266..4e9472a 100644
--- a/src/xfpm-xfconf.c
+++ b/src/xfpm-xfconf.c
@@ -1,5 +1,6 @@
/*
* * Copyright (C) 2009-2011 Ali <aliov at xfce.org>
+ * * Copyright (C) 2019 Kacper Piwiński
*
* Licensed under the GNU General Public License Version 2
*
@@ -156,7 +157,7 @@ xfpm_xfconf_load (XfpmXfconf *conf, gboolean channel_valid)
for ( i = 0; i < nspecs; i++)
{
gchar *prop_name;
- prop_name = g_strdup_printf ("%s%s", PROPERTIES_PREFIX, specs[i]->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)
@@ -187,23 +188,23 @@ xfpm_xfconf_property_changed_cb (XfconfChannel *channel, gchar *property,
if ( G_VALUE_TYPE(value) == G_TYPE_INVALID )
return;
- if ( !g_str_has_prefix (property, PROPERTIES_PREFIX) || strlen (property) <= strlen (PROPERTIES_PREFIX) )
+ if ( !g_str_has_prefix (property, XFPM_PROPERTIES_PREFIX) || strlen (property) <= strlen (XFPM_PROPERTIES_PREFIX) )
return;
/* We handle presentation mode and blank-times in xfpm-power directly */
- if ( g_strcmp0 (property, PROPERTIES_PREFIX PRESENTATION_MODE) == 0 ||
- g_strcmp0 (property, PROPERTIES_PREFIX ON_AC_BLANK) == 0 ||
- g_strcmp0 (property, PROPERTIES_PREFIX ON_BATTERY_BLANK) == 0)
+ if ( g_strcmp0 (property, XFPM_PROPERTIES_PREFIX PRESENTATION_MODE) == 0 ||
+ g_strcmp0 (property, XFPM_PROPERTIES_PREFIX ON_AC_BLANK) == 0 ||
+ g_strcmp0 (property, XFPM_PROPERTIES_PREFIX ON_BATTERY_BLANK) == 0)
return;
/* We handle brightness switch in xfpm-backlight directly */
- if ( g_strcmp0 (property, PROPERTIES_PREFIX BRIGHTNESS_SWITCH) == 0 ||
- g_strcmp0 (property, PROPERTIES_PREFIX BRIGHTNESS_SWITCH_SAVE) == 0 )
+ if ( g_strcmp0 (property, XFPM_PROPERTIES_PREFIX BRIGHTNESS_SWITCH) == 0 ||
+ g_strcmp0 (property, XFPM_PROPERTIES_PREFIX BRIGHTNESS_SWITCH_SAVE) == 0 )
return;
XFPM_DEBUG ("Property modified: %s\n", property);
- g_object_set_property (G_OBJECT (conf), property + strlen (PROPERTIES_PREFIX), value);
+ g_object_set_property (G_OBJECT (conf), property + strlen (XFPM_PROPERTIES_PREFIX), value);
}
static void
@@ -227,7 +228,7 @@ xfpm_xfsession_property_changed_cb (XfconfChannel *channel, gchar *property,
/* update xfconf which will update xfpm and keep things in sync */
xfconf_channel_set_bool (conf->priv->channel,
- PROPERTIES_PREFIX LOCK_SCREEN_ON_SLEEP,
+ XFPM_PROPERTIES_PREFIX LOCK_SCREEN_ON_SLEEP,
g_value_get_boolean(value));
}
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Xfce4-commits
mailing list