[Xfce4-commits] [xfce/xfce4-power-manager] 29/63: UPower 0.99.0 is the new minimum
noreply at xfce.org
noreply at xfce.org
Sun Mar 22 13:02:24 CET 2015
This is an automated email from the git hooks/post-receive script.
eric pushed a commit to branch master
in repository xfce/xfce4-power-manager.
commit 7c5ae951b4f3cf2392b51fb9d8d9aef7274f1d04
Author: Eric Koegel <eric.koegel at gmail.com>
Date: Sun Mar 15 14:26:02 2015 +0300
UPower 0.99.0 is the new minimum
Per the 4.14 roadmap, Upower 0.99 is the new minimum so drop support
for older versions.
---
configure.ac.in | 2 +-
.../power-manager-plugin/power-manager-button.c | 35 ++++------------
settings/xfpm-settings.c | 22 ----------
src/xfpm-battery.c | 7 +---
src/xfpm-power.c | 44 +-------------------
5 files changed, 11 insertions(+), 99 deletions(-)
diff --git a/configure.ac.in b/configure.ac.in
index 4c93cd7..bac8e09 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -70,7 +70,7 @@ m4_define([libxfce4util_minimum_version],[4.10.0])
m4_define([libxfce4panel_minimum_version],[4.11.0])
m4_define([libnotify_minimum_version], [0.4.1])
-m4_define([upower_minimum_version], [0.9.7])
+m4_define([upower_minimum_version], [0.99.0])
m4_define([xrandr_minimum_version], [1.2.0])
m4_define([x11_minimum_version], [1.0.0])
diff --git a/panel-plugins/power-manager-plugin/power-manager-button.c b/panel-plugins/power-manager-plugin/power-manager-button.c
index d4e11cd..48f6c36 100644
--- a/panel-plugins/power-manager-plugin/power-manager-button.c
+++ b/panel-plugins/power-manager-plugin/power-manager-button.c
@@ -434,11 +434,7 @@ G_GNUC_END_IGNORE_DEPRECATIONS
}
static void
-#if UP_CHECK_VERSION(0, 99, 0)
device_changed_cb (UpDevice *device, GParamSpec *pspec, PowerManagerButton *button)
-#else
-device_changed_cb (UpDevice *device, PowerManagerButton *button)
-#endif
{
power_manager_button_update_device_icon_and_details (button, device);
}
@@ -466,11 +462,7 @@ power_manager_button_add_device (UpDevice *device, PowerManagerButton *button)
"kind", &type,
NULL);
-#if UP_CHECK_VERSION(0, 99, 0)
signal_id = g_signal_connect (device, "notify", G_CALLBACK (device_changed_cb), button);
-#else
- signal_id = g_signal_connect (device, "changed", G_CALLBACK (device_changed_cb), button);
-#endif
/* populate the struct */
battery_device->object_path = g_strdup (object_path);
@@ -571,28 +563,16 @@ device_added_cb (UpClient *upower, UpDevice *device, PowerManagerButton *button)
power_manager_button_add_device (device, button);
}
-#if UP_CHECK_VERSION(0, 99, 0)
static void
device_removed_cb (UpClient *upower, const gchar *object_path, PowerManagerButton *button)
{
power_manager_button_remove_device (button, object_path);
}
-#else
-static void
-device_removed_cb (UpClient *upower, UpDevice *device, PowerManagerButton *button)
-{
- const gchar *object_path = up_device_get_object_path (device);
- power_manager_button_remove_device (button, object_path);
-}
-#endif
+
static void
power_manager_button_add_all_devices (PowerManagerButton *button)
{
-#if !UP_CHECK_VERSION(0, 99, 0)
- /* the device-add callback is called for each device */
- up_client_enumerate_devices_sync (button->priv->upower, NULL, NULL);
-#else
GPtrArray *array = NULL;
guint i;
@@ -603,15 +583,14 @@ power_manager_button_add_all_devices (PowerManagerButton *button)
if (array)
{
- for (i = 0; i < array->len; i++)
- {
- UpDevice *device = g_ptr_array_index (array, i);
+ for (i = 0; i < array->len; i++)
+ {
+ UpDevice *device = g_ptr_array_index (array, i);
- power_manager_button_add_device (device, button);
- }
- g_ptr_array_free (array, TRUE);
+ power_manager_button_add_device (device, button);
+ }
+ g_ptr_array_free (array, TRUE);
}
-#endif
}
static void
diff --git a/settings/xfpm-settings.c b/settings/xfpm-settings.c
index d7e9457..ec2256d 100644
--- a/settings/xfpm-settings.c
+++ b/settings/xfpm-settings.c
@@ -2022,11 +2022,7 @@ update_device_details (UpDevice *device)
}
static void
-#if UP_CHECK_VERSION(0, 99, 0)
device_changed_cb (UpDevice *device, GParamSpec *pspec, gpointer user_data)
-#else
-device_changed_cb (UpDevice *device, gpointer user_data)
-#endif
{
update_device_details (device);
}
@@ -2057,11 +2053,7 @@ add_device (UpDevice *device)
/* Make sure the devices tab is shown */
gtk_widget_show (gtk_notebook_get_nth_page (GTK_NOTEBOOK (nt), devices_page_num));
-#if UP_CHECK_VERSION(0, 99, 0)
signal_id = g_signal_connect (device, "notify", G_CALLBACK (device_changed_cb), NULL);
-#else
- signal_id = g_signal_connect (device, "changed", G_CALLBACK (device_changed_cb), NULL);
-#endif
sideview_store = GTK_LIST_STORE (gtk_tree_view_get_model (GTK_TREE_VIEW (sideview)));
@@ -2162,28 +2154,15 @@ device_added_cb (UpClient *upclient, UpDevice *device, gpointer user_data)
add_device (device);
}
-#if UP_CHECK_VERSION(0, 99, 0)
static void
device_removed_cb (UpClient *upclient, const gchar *object_path, gpointer user_data)
{
remove_device (object_path);
}
-#else
-static void
-device_removed_cb (UpClient *upclient, UpDevice *device, gpointer user_data)
-{
- const gchar *object_path = up_device_get_object_path(device);
- remove_device (object_path);
-}
-#endif
static void
add_all_devices (void)
{
-#if !UP_CHECK_VERSION(0, 99, 0)
- /* the device-add callback is called for each device */
- up_client_enumerate_devices_sync(upower, NULL, NULL);
-#else
GPtrArray *array = NULL;
guint i;
@@ -2199,7 +2178,6 @@ add_all_devices (void)
}
g_ptr_array_free (array, TRUE);
}
-#endif
}
static void
diff --git a/src/xfpm-battery.c b/src/xfpm-battery.c
index ac88249..981ad0f 100644
--- a/src/xfpm-battery.c
+++ b/src/xfpm-battery.c
@@ -306,9 +306,7 @@ xfpm_battery_refresh (XfpmBattery *battery, UpDevice *device)
static void
xfpm_battery_changed_cb (UpDevice *device,
-#if UP_CHECK_VERSION(0, 99, 0)
GParamSpec *pspec,
-#endif
XfpmBattery *battery)
{
xfpm_battery_refresh (battery, device);
@@ -473,11 +471,8 @@ void xfpm_battery_monitor_device (XfpmBattery *battery,
device = up_device_new();
up_device_set_object_path_sync (device, object_path, NULL, NULL);
battery->priv->device = device;
-#if UP_CHECK_VERSION(0, 99, 0)
battery->priv->sig_up = g_signal_connect (battery->priv->device, "notify", G_CALLBACK (xfpm_battery_changed_cb), battery);
-#else
- battery->priv->sig_up = g_signal_connect (battery->priv->device, "changed", G_CALLBACK (xfpm_battery_changed_cb), battery);
-#endif
+
g_object_set (G_OBJECT (battery),
"has-tooltip", TRUE,
NULL);
diff --git a/src/xfpm-power.c b/src/xfpm-power.c
index c2620c4..b374dc9 100644
--- a/src/xfpm-power.c
+++ b/src/xfpm-power.c
@@ -215,11 +215,6 @@ xfpm_power_check_polkit_auth (XfpmPower *power)
}
else
{
-#if !UP_CHECK_VERSION(0, 99, 0)
- XFPM_DEBUG ("using upower suspend backend");
- suspend = POLKIT_AUTH_SUSPEND_UPOWER;
- hibernate = POLKIT_AUTH_HIBERNATE_UPOWER;
-#else
if (power->priv->console != NULL)
{
/* ConsoleKit2 supports suspend and hibernate */
@@ -236,7 +231,6 @@ xfpm_power_check_polkit_auth (XfpmPower *power)
hibernate = POLKIT_AUTH_HIBERNATE_XFPM;
}
}
-#endif
}
power->priv->auth_suspend = xfpm_polkit_check_auth (power->priv->polkit,
suspend);
@@ -303,10 +297,6 @@ xfpm_power_get_properties (XfpmPower *power)
gboolean lid_is_closed;
gboolean lid_is_present;
-#if !UP_CHECK_VERSION(0, 99, 0)
- power->priv->can_suspend = up_client_get_can_suspend(power->priv->upower);
- power->priv->can_hibernate = up_client_get_can_hibernate(power->priv->upower);
-#else
if ( LOGIND_RUNNING () )
{
g_object_get (G_OBJECT (power->priv->systemd),
@@ -333,7 +323,7 @@ xfpm_power_get_properties (XfpmPower *power)
power->priv->can_hibernate = xfpm_suspend_can_hibernate ();
}
}
-#endif
+
g_object_get (power->priv->upower,
"on-battery", &on_battery,
"lid-is-closed", &lid_is_closed,
@@ -468,16 +458,6 @@ xfpm_power_sleep (XfpmPower *power, const gchar *sleep_time, gboolean force)
}
else
{
-#if !UP_CHECK_VERSION(0, 99, 0)
- if (!g_strcmp0 (sleep_time, "Hibernate"))
- {
- up_client_hibernate_sync(power->priv->upower, NULL, &error);
- }
- else
- {
- up_client_suspend_sync(power->priv->upower, NULL, &error);
- }
-#else
if (!g_strcmp0 (sleep_time, "Hibernate"))
{
if (check_for_consolekit2 (power))
@@ -500,7 +480,6 @@ xfpm_power_sleep (XfpmPower *power, const gchar *sleep_time, gboolean force)
xfpm_suspend_try_action (XFPM_SUSPEND);
}
}
-#endif
}
if ( error )
@@ -945,10 +924,6 @@ xfpm_power_add_device (UpDevice *device, XfpmPower *power)
static void
xfpm_power_get_power_devices (XfpmPower *power)
{
-#if !UP_CHECK_VERSION(0, 99, 0)
- /* the device-add callback is called for each device */
- up_client_enumerate_devices_sync(power->priv->upower, NULL, NULL);
-#else
GPtrArray *array = NULL;
guint i;
@@ -965,7 +940,6 @@ xfpm_power_get_power_devices (XfpmPower *power)
}
g_ptr_array_free (array, TRUE);
}
-#endif
}
static void
@@ -982,9 +956,7 @@ xfpm_power_inhibit_changed_cb (XfpmInhibit *inhibit, gboolean is_inhibit, XfpmPo
static void
xfpm_power_changed_cb (UpClient *upower,
-#if UP_CHECK_VERSION(0, 99, 0)
GParamSpec *pspec,
-#endif
XfpmPower *power)
{
xfpm_power_get_properties (power);
@@ -996,20 +968,11 @@ xfpm_power_device_added_cb (UpClient *upower, UpDevice *device, XfpmPower *power
xfpm_power_add_device (device, power);
}
-#if UP_CHECK_VERSION(0, 99, 0)
static void
xfpm_power_device_removed_cb (UpClient *upower, const gchar *object_path, XfpmPower *power)
{
xfpm_power_remove_device (power, object_path);
}
-#else
-static void
-xfpm_power_device_removed_cb (UpClient *upower, UpDevice *device, XfpmPower *power)
-{
- const gchar *object_path = up_device_get_object_path(device);
- xfpm_power_remove_device (power, object_path);
-}
-#endif
#ifdef ENABLE_POLKIT
static void
@@ -1238,11 +1201,8 @@ xfpm_power_init (XfpmPower *power)
g_signal_connect (power->priv->upower, "device-added", G_CALLBACK (xfpm_power_device_added_cb), power);
g_signal_connect (power->priv->upower, "device-removed", G_CALLBACK (xfpm_power_device_removed_cb), power);
-#if UP_CHECK_VERSION(0, 99, 0)
g_signal_connect (power->priv->upower, "notify", G_CALLBACK (xfpm_power_changed_cb), power);
-#else
- g_signal_connect (power->priv->upower, "changed", G_CALLBACK (xfpm_power_changed_cb), power);
-#endif
+
xfpm_power_get_power_devices (power);
xfpm_power_get_properties (power);
#ifdef ENABLE_POLKIT
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Xfce4-commits
mailing list