[Xfce4-commits] [xfce/xfce4-power-manager] 01/01: Remove conditional DPMS support
noreply at xfce.org
noreply at xfce.org
Tue Aug 5 16:00:42 CEST 2014
This is an automated email from the git hooks/post-receive script.
hjudt pushed a commit to branch master
in repository xfce/xfce4-power-manager.
commit 1d24b7553d7cf915e0548d9a92f4b5d8701eb4bc
Author: Harald Judt <h.judt at gmx.at>
Date: Tue Aug 5 14:24:03 2014 +0200
Remove conditional DPMS support
DPMS should be available on all systems nowadays, at least where
xfce4-power-manager is expected to run. So make it a hard requirement.
---
configure.ac.in | 10 ----------
settings/xfpm-settings.c | 34 +++-------------------------------
src/xfpm-dpms.c | 3 ---
src/xfpm-dpms.h | 3 ---
src/xfpm-main.c | 5 -----
src/xfpm-manager.c | 12 ++----------
src/xfpm-power.c | 14 ++++----------
src/xfpm-xfconf.c | 7 +++----
8 files changed, 12 insertions(+), 76 deletions(-)
diff --git a/configure.ac.in b/configure.ac.in
index 0a1ecd4..87c0268 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -110,15 +110,6 @@ AM_CONDITIONAL([ENABLE_POLKIT], [test "x$polkit" = "xyes"])
#=======================================================#
# Check for DPMS support #
#=======================================================#
-DPMS_LIBS=
-AC_ARG_ENABLE([dpms],
-AS_HELP_STRING([--enable-dpms],[use dpms extension])
-AS_HELP_STRING([--disable-dpms],[don't use dpms extension]),
- [], [enable_dpms=yes])
-if test x"$enable_dpms" = x"yes"; then
- AC_DEFINE([HAVE_DPMS], [1], [Define to enable dpms])
-fi
-
AC_CHECK_LIB([Xext], [DPMSQueryExtension], [DPMS_LIBS=" -lXext -lX11"],[])
AC_SUBST([DPMS_LIBS])
@@ -242,7 +233,6 @@ AC_OUTPUT
echo "prefix: ${prefix}"
echo "xdg autostart: ${sysconfdir}/xdg/autostart"
echo "POLKIT: ${polkit}"
-echo "DPMS: ${enable_dpms}"
echo "Network manager: ${ac_network_manager}"
echo "Build panel plugins: ${build_panel_plugins}"
if test "x$build_panel_plugins" = "xyes"; then
diff --git a/settings/xfpm-settings.c b/settings/xfpm-settings.c
index 9f08373..d2f91a7 100644
--- a/settings/xfpm-settings.c
+++ b/settings/xfpm-settings.c
@@ -380,7 +380,6 @@ on_battery_sleep_mode_changed_cb (GtkWidget *w, XfconfChannel *channel)
void
dpms_toggled_cb (GtkWidget *w, XfconfChannel *channel)
{
-#ifdef HAVE_DPMS
gboolean val = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(w));
xfconf_channel_set_bool (channel, PROPERTIES_PREFIX DPMS_ENABLED_CFG, val);
@@ -395,13 +394,11 @@ dpms_toggled_cb (GtkWidget *w, XfconfChannel *channel)
gtk_widget_set_sensitive (on_battery_dpms_off, val);
gtk_widget_set_sensitive (on_battery_dpms_sleep, val);
}
-#endif
}
void
sleep_on_battery_value_changed_cb (GtkWidget *w, XfconfChannel *channel)
{
-#ifdef HAVE_DPMS
GtkWidget *brg;
gint off_value = (gint)gtk_range_get_value (GTK_RANGE (on_battery_dpms_off));
gint sleep_value = (gint)gtk_range_get_value (GTK_RANGE (w));
@@ -430,13 +427,11 @@ sleep_on_battery_value_changed_cb (GtkWidget *w, XfconfChannel *channel)
{
g_critical ("Cannot set value for property %s\n", ON_BATT_DPMS_SLEEP);
}
-#endif
}
void
off_on_battery_value_changed_cb (GtkWidget *w, XfconfChannel *channel)
{
-#ifdef HAVE_DPMS
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));
@@ -452,13 +447,11 @@ off_on_battery_value_changed_cb (GtkWidget *w, XfconfChannel *channel)
{
g_critical ("Cannot set value for property %s\n", ON_BATT_DPMS_OFF);
}
-#endif
}
void
sleep_on_ac_value_changed_cb (GtkWidget *w, XfconfChannel *channel)
{
-#ifdef HAVE_DPMS
GtkWidget *brg;
gint brightness_value;
@@ -492,13 +485,11 @@ sleep_on_ac_value_changed_cb (GtkWidget *w, XfconfChannel *channel)
{
g_critical ("Cannot set value for property %s\n", ON_AC_DPMS_SLEEP);
}
-#endif
}
void
off_on_ac_value_changed_cb (GtkWidget *w, XfconfChannel *channel)
{
-#ifdef HAVE_DPMS
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));
@@ -517,7 +508,6 @@ off_on_ac_value_changed_cb (GtkWidget *w, XfconfChannel *channel)
{
g_critical ("Cannot set value for property %s\n", ON_AC_DPMS_OFF);
}
-#endif
}
/*
@@ -599,7 +589,6 @@ void
brightness_on_battery_value_changed_cb (GtkWidget *w, XfconfChannel *channel)
{
gint value = (gint)gtk_range_get_value (GTK_RANGE (w));
-#ifdef HAVE_DPMS
gint dpms_sleep = (gint) gtk_range_get_value (GTK_RANGE (on_battery_dpms_sleep) );
if ( value != BRIGHTNESS_DISABLED )
@@ -609,7 +598,6 @@ brightness_on_battery_value_changed_cb (GtkWidget *w, XfconfChannel *channel)
gtk_range_set_value (GTK_RANGE (on_battery_dpms_sleep), (value / 60) + 1);
}
}
-#endif
if (!xfconf_channel_set_uint (channel, PROPERTIES_PREFIX BRIGHTNESS_ON_BATTERY, value))
{
@@ -621,7 +609,6 @@ void
brightness_on_ac_value_changed_cb (GtkWidget *w, XfconfChannel *channel)
{
gint value = (gint)gtk_range_get_value (GTK_RANGE (w));
-#ifdef HAVE_DPMS
gint dpms_sleep = (gint) gtk_range_get_value (GTK_RANGE (on_ac_dpms_sleep) );
if ( value != BRIGHTNESS_DISABLED )
@@ -631,7 +618,7 @@ brightness_on_ac_value_changed_cb (GtkWidget *w, XfconfChannel *channel)
gtk_range_set_value (GTK_RANGE (on_ac_dpms_sleep), (value / 60) + 1);
}
}
-#endif
+
if (!xfconf_channel_set_uint (channel, PROPERTIES_PREFIX BRIGHTNESS_ON_AC, value))
{
g_critical ("Cannot set value for property %s\n", BRIGHTNESS_ON_AC);
@@ -869,16 +856,11 @@ xfpm_settings_on_battery (XfconfChannel *channel, gboolean auth_suspend,
/*
* DPMS settings when running on battery power
*/
-#ifdef HAVE_DPMS
val = xfconf_channel_get_uint (channel, PROPERTIES_PREFIX ON_BATT_DPMS_SLEEP, 5);
gtk_range_set_value (GTK_RANGE(on_battery_dpms_sleep), val);
val = xfconf_channel_get_uint (channel, PROPERTIES_PREFIX ON_BATT_DPMS_OFF, 10);
gtk_range_set_value (GTK_RANGE(on_battery_dpms_off), val);
-#else
- gtk_widget_set_sensitive (GTK_WIDGET(on_battery_dpms_sleep), FALSE);
- gtk_widget_set_sensitive (GTK_WIDGET(on_battery_dpms_off), FALSE);
-#endif
/*
* Lid switch settings on battery
@@ -1044,20 +1026,15 @@ xfpm_settings_on_ac (XfconfChannel *channel, gboolean auth_suspend,
val = xfconf_channel_get_uint (channel, PROPERTIES_PREFIX ON_AC_INACTIVITY_TIMEOUT, 14);
gtk_range_set_value (GTK_RANGE (inact_timeout), val);
-#ifdef HAVE_DPMS
/*
* DPMS settings when running on AC power
*/
-
val = xfconf_channel_get_uint (channel, PROPERTIES_PREFIX ON_AC_DPMS_SLEEP, 10);
gtk_range_set_value (GTK_RANGE (on_ac_dpms_sleep), val);
val = xfconf_channel_get_uint (channel, PROPERTIES_PREFIX ON_AC_DPMS_OFF, 15);
gtk_range_set_value (GTK_RANGE(on_ac_dpms_off), val);
-#else
- gtk_widget_set_sensitive (GTK_WIDGET(on_ac_dpms_sleep),FALSE);
- gtk_widget_set_sensitive (GTK_WIDGET(on_ac_dpms_off),FALSE);
-#endif
+
/*
* Lid switch settings on AC power
*/
@@ -1158,17 +1135,12 @@ xfpm_settings_general (XfconfChannel *channel, gboolean auth_suspend,
GtkTreeIter iter;
dpms = GTK_WIDGET (gtk_builder_get_object (xml, "handle-dpms"));
-#ifdef HAVE_DPMS
+
/*
* Global dpms settings (enable/disable)
*/
-
val = xfconf_channel_get_bool (channel, PROPERTIES_PREFIX DPMS_ENABLED_CFG, TRUE);
-
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(dpms), val);
-#else
- gtk_widget_hide (dpms);
-#endif
/*
* Power button
diff --git a/src/xfpm-dpms.c b/src/xfpm-dpms.c
index 0bd5771..9ca307d 100644
--- a/src/xfpm-dpms.c
+++ b/src/xfpm-dpms.c
@@ -42,7 +42,6 @@
#include "xfpm-config.h"
#include "xfpm-debug.h"
-#ifdef HAVE_DPMS
static void xfpm_dpms_finalize (GObject *object);
@@ -348,5 +347,3 @@ xfpm_dpms_set_on_battery (XfpmDpms *dpms, gboolean on_battery)
xfpm_dpms_refresh (dpms);
XFPM_DEBUG ("dpms on battery %s", on_battery ? "TURE" : "FALSE");
}
-
-#endif /* HAVE_DPMS */
diff --git a/src/xfpm-dpms.h b/src/xfpm-dpms.h
index 57237ad..19cdc83 100644
--- a/src/xfpm-dpms.h
+++ b/src/xfpm-dpms.h
@@ -29,8 +29,6 @@
#include <xfconf/xfconf.h>
-#ifdef HAVE_DPMS
-
#include <gdk/gdkx.h>
#include <X11/Xproto.h>
#include <X11/extensions/dpms.h>
@@ -74,6 +72,5 @@ void xfpm_dpms_set_on_battery (XfpmDpms *dpms, gboolean on_battery);
G_END_DECLS
-#endif /* HAVE_DPMS */
#endif /* __XFPM_DPMS_H */
diff --git a/src/xfpm-main.c b/src/xfpm-main.c
index 21c5533..b0af887 100644
--- a/src/xfpm-main.c
+++ b/src/xfpm-main.c
@@ -119,11 +119,6 @@ xfpm_dump (GHashTable *hash)
#else
g_print (_("Without network manager support\n"));
#endif
-#ifdef HAVE_DPMS
- g_print (_("With DPMS support\n"));
-#else
- g_print (_("Without DPMS support\n"));
-#endif
g_print ("---------------------------------------------------\n");
g_print ( "%s: %s\n"
"%s: %s\n"
diff --git a/src/xfpm-manager.c b/src/xfpm-manager.c
index fed0553..a7417a5 100644
--- a/src/xfpm-manager.c
+++ b/src/xfpm-manager.c
@@ -93,9 +93,8 @@ struct XfpmManagerPrivate
XfpmDBusMonitor *monitor;
XfpmInhibit *inhibit;
EggIdletime *idle;
-#ifdef HAVE_DPMS
+
XfpmDpms *dpms;
-#endif
GTimer *timer;
@@ -154,9 +153,7 @@ xfpm_manager_finalize (GObject *object)
g_timer_destroy (manager->priv->timer);
-#ifdef HAVE_DPMS
g_object_unref (manager->priv->dpms);
-#endif
g_object_unref (manager->priv->backlight);
@@ -356,10 +353,8 @@ xfpm_manager_lid_changed_cb (XfpmPower *power, gboolean lid_is_closed, XfpmManag
if ( action == LID_TRIGGER_NOTHING )
{
-#ifdef HAVE_DPMS
if ( !xfpm_is_multihead_connected () )
xfpm_dpms_force_level (manager->priv->dpms, DPMSModeOff);
-#endif
}
else if ( action == LID_TRIGGER_LOCK_SCREEN )
{
@@ -388,9 +383,8 @@ xfpm_manager_lid_changed_cb (XfpmPower *power, gboolean lid_is_closed, XfpmManag
else
{
XFPM_DEBUG_ENUM (action, XFPM_TYPE_LID_TRIGGER_ACTION, "LID opened");
-#ifdef HAVE_DPMS
+
xfpm_dpms_force_level (manager->priv->dpms, DPMSModeOn);
-#endif
}
}
@@ -740,9 +734,7 @@ void xfpm_manager_start (XfpmManager *manager)
manager->priv->kbd_backlight = xfpm_kbd_backlight_new ();
-#ifdef HAVE_DPMS
manager->priv->dpms = xfpm_dpms_new ();
-#endif
g_signal_connect (manager->priv->button, "button_pressed",
G_CALLBACK (xfpm_manager_button_pressed_cb), manager);
diff --git a/src/xfpm-power.c b/src/xfpm-power.c
index 83a6639..df44cf5 100644
--- a/src/xfpm-power.c
+++ b/src/xfpm-power.c
@@ -108,9 +108,7 @@ struct XfpmPowerPrivate
XfpmBatteryCharge overall_state;
gboolean critical_action_done;
-#ifdef HAVE_DPMS
XfpmDpms *dpms;
-#endif
gboolean presentation_mode;
gint on_ac_blank;
gint on_battery_blank;
@@ -207,9 +205,9 @@ xfpm_power_check_power (XfpmPower *power, gboolean on_battery)
GList *list;
guint len, i;
g_signal_emit (G_OBJECT (power), signals [ON_BATTERY_CHANGED], 0, on_battery);
-#ifdef HAVE_DPMS
+
xfpm_dpms_set_on_battery (power->priv->dpms, on_battery);
-#endif
+
power->priv->on_battery = on_battery;
list = g_hash_table_get_values (power->priv->hash);
len = g_list_length (list);
@@ -1128,9 +1126,9 @@ xfpm_power_init (XfpmPower *power)
power->priv->dialog = NULL;
power->priv->overall_state = XFPM_BATTERY_CHARGE_OK;
power->priv->critical_action_done = FALSE;
-#ifdef HAVE_DPMS
+
power->priv->dpms = xfpm_dpms_new ();
-#endif
+
power->priv->presentation_mode = FALSE;
power->priv->on_ac_blank = 15;
power->priv->on_battery_blank = 10;
@@ -1286,9 +1284,7 @@ xfpm_power_finalize (GObject *object)
g_object_unref (power->priv->polkit);
#endif
-#ifdef HAVE_DPMS
g_object_unref(power->priv->dpms);
-#endif
G_OBJECT_CLASS (xfpm_power_parent_class)->finalize (object);
}
@@ -1391,7 +1387,6 @@ xfpm_update_blank_time (XfpmPower *power)
static void
xfpm_power_change_presentation_mode (XfpmPower *power, gboolean presentation_mode)
{
-#ifdef HAVE_DPMS
/* no change, exit */
if (power->priv->presentation_mode == presentation_mode)
return;
@@ -1415,7 +1410,6 @@ xfpm_power_change_presentation_mode (XfpmPower *power, gboolean presentation_mod
}
xfpm_update_blank_time (power);
-#endif
}
gboolean
diff --git a/src/xfpm-xfconf.c b/src/xfpm-xfconf.c
index bd4cde4..cfae423 100644
--- a/src/xfpm-xfconf.c
+++ b/src/xfpm-xfconf.c
@@ -71,14 +71,14 @@ enum
PROP_BRIGHTNESS_LEVEL_ON_AC,
PROP_BRIGHTNESS_LEVEL_ON_BATTERY,
PROP_BRIGHTNESS_SLIDER_MIN_LEVEL,
-#ifdef HAVE_DPMS
+
PROP_ENABLE_DPMS,
PROP_DPMS_SLEEP_ON_AC,
PROP_DPMS_OFF_ON_AC,
PROP_DPMS_SLEEP_ON_BATTERY,
PROP_DPMS_OFF_ON_BATTERY,
PROP_DPMS_SLEEP_MODE,
-#endif
+
PROP_IDLE_ON_AC,
PROP_IDLE_ON_BATTERY,
PROP_IDLE_SLEEP_MODE_ON_AC,
@@ -405,7 +405,7 @@ xfpm_xfconf_class_init (XfpmXfconfClass *klass)
LID_TRIGGER_LOCK_SCREEN,
LID_TRIGGER_LOCK_SCREEN,
G_PARAM_READWRITE));
-#ifdef HAVE_DPMS
+
/**
* XfpmXfconf::dpms-enabled
**/
@@ -468,7 +468,6 @@ xfpm_xfconf_class_init (XfpmXfconfClass *klass)
NULL, NULL,
"Standby",
G_PARAM_READWRITE));
-#endif /* HAVE_DPMS */
/**
* XfpmXfconf::inactivity-on-ac
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Xfce4-commits
mailing list