Hello community,
here is the log from the commit of package xfce4-power-manager for
openSUSE:Factory checked in at 2013-08-10 11:01:33
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xfce4-power-manager (Old)
and /work/SRC/openSUSE:Factory/.xfce4-power-manager.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xfce4-power-manager"
Changes:
--------
--- /work/SRC/openSUSE:Factory/xfce4-power-manager/xfce4-power-manager.changes
2013-03-14 15:36:30.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.xfce4-power-manager.new/xfce4-power-manager.changes
2013-08-10 11:01:34.000000000 +0200
@@ -1,0 +2,14 @@
+Tue Aug 6 17:39:11 UTC 2013 - g...@opensuse.org
+
+- add xfce4-power-manager-fix-brightness-type.patch in order to use
+ the correct type for prightness property and to fix the screen
+ auto-dimming issue and brightness panel plugin issue (backported
+ from upstream git)
+- add xfce4-power-manager-systemd-shutdown-reboot-support.patch in
+ order to add systemd shutdown/reboot support (bxo#10167)
+- add xfce4-power-manager-systemd-suspend-hibernate-suport.patch in
+ order to add systemd suspend/hibernate support (bxo#9963)
+- explicitly depend on udisks, upower, and polkit which are used
+ via DBus
+
+-------------------------------------------------------------------
New:
----
xfce4-power-manager-fix-brightness-type.patch
xfce4-power-manager-systemd-shutdown-reboot-support.patch
xfce4-power-manager-systemd-suspend-hibernate-suport.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xfce4-power-manager.spec ++++++
--- /var/tmp/diff_new_pack.bEsPs7/_old 2013-08-10 11:01:35.000000000 +0200
+++ /var/tmp/diff_new_pack.bEsPs7/_new 2013-08-10 11:01:35.000000000 +0200
@@ -32,8 +32,14 @@
Patch1: xfce4-power-manager-fix-broken-translations.patch
# PATCH-FEATURE-UPSTREAM xfce4-power-manager-systemd-inhibit.patch bnc#789057
g...@opensuse.org -- Add systemd inhibit support
Patch2: xfce4-power-manager-systemd-inhibit.patch
-# PATCH-FIX-UPSTREAM xfce4-power-manager-automake-1.13.patch pgaj...@suse.cz
+# PATCH-FIX-UPSTREAM xfce4-power-manager-automake-1.13.patch pgaj...@suse.cz
-- Add support for automake 1.13
Patch3: xfce4-power-manager-automake-1.13.patch
+# PATCH-FIX-UPSTREAM xfce4-power-manager-fix-brightness-type.patch
g...@opensuse.org -- Use correct type for prightness property and fix the
screen auto-dimming issue and brightness panel plugin issue (backported from
upstream git)
+Patch4: xfce4-power-manager-fix-brightness-type.patch
+# PATCH-FIX-UPSTREAM xfce4-power-manager-systemd-shutdown-reboot-support.patch
bxo#10167 -- Add systemd shutdown/reboot support
+Patch5: xfce4-power-manager-systemd-shutdown-reboot-support.patch
+# PATCH-FIX-UPSTREAM
xfce4-power-manager-systemd-suspend-hibernate-suport.patch bxo#9963 -- Add
systemd suspend/hibernate support
+Patch6: xfce4-power-manager-systemd-suspend-hibernate-suport.patch
BuildRequires: ed
BuildRequires: fdupes
BuildRequires: intltool
@@ -51,10 +57,20 @@
BuildRequires: pkgconfig(libxfce4ui-1)
BuildRequires: pkgconfig(libxfce4util-1.0)
BuildRequires: pkgconfig(libxfconf-0)
+%if 0%{?suse_version} >= 1230
+BuildRequires: pkgconfig(polkit-gobject-1) >= 0.100
+%endif
BuildRequires: pkgconfig(x11)
BuildRequires: pkgconfig(xext)
BuildRequires: pkgconfig(xrandr)
+Requires: polkit
+Requires: udisks
+Requires: upower
+%if 0%{?suse_version} >= 1230
+Requires: systemd
+%else
Requires: ConsoleKit-x11
+%endif
Recommends: %{name}-lang = %{version}
Provides: xfce4-power-manager-doc = %{version}
Obsoletes: xfce4-power-manager-doc <= 1.2.0
@@ -89,6 +105,9 @@
%patch1 -p1
%patch2 -p1
%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
# show in LXDE as well
ed -s src/xfce4-power-manager.desktop.in 2>/dev/null <<'EOF'
,s/^OnlyShowIn=XFCE;/OnlyShowIn=XFCE;LXDE;/
@@ -98,6 +117,9 @@
%build
xdt-autogen
%configure \
+%if 0%{?suse_version} < 1230
+ --with-sleep-manager=upower \
+%endif
--disable-hal
make %{?_smp_mflags} V=1
++++++ xfce4-power-manager-fix-brightness-type.patch ++++++
>From 05d12e12596512f7a31d3cdb4845a69dc2d4c611 Mon Sep 17 00:00:00 2001
From: Martin Matuska <mar...@matuska.org>
Date: Tue, 23 Jul 2013 09:27:41 +0000
Subject: Change brightness level from glong to gint32
The "Backlight" RandR property is a 32-bit integer. This means that the int32
(gint32) type should be used to represent brightness levels. The attached patch
does nothing else than changing the brightness level representation from glong
to gint32. This fixes the screen auto-dimming issue and brightness panel plugin
issue.
---
diff --git a/common/xfpm-brightness.c b/common/xfpm-brightness.c
index aa1ef33..f1524cb 100644
--- a/common/xfpm-brightness.c
+++ b/common/xfpm-brightness.c
@@ -92,11 +92,11 @@ out:
}
static gboolean
-xfpm_brightness_xrandr_get_level (XfpmBrightness *brightness, RROutput output,
long *current)
+xfpm_brightness_xrandr_get_level (XfpmBrightness *brightness, RROutput output,
gint32 *current)
{
unsigned long nitems;
unsigned long bytes_after;
- long *prop;
+ gint32 *prop;
Atom actual_type;
int actual_format;
gboolean ret = FALSE;
@@ -124,7 +124,7 @@ xfpm_brightness_xrandr_get_level (XfpmBrightness
*brightness, RROutput output, l
}
static gboolean
-xfpm_brightness_xrandr_set_level (XfpmBrightness *brightness, RROutput output,
long level)
+xfpm_brightness_xrandr_set_level (XfpmBrightness *brightness, RROutput output,
gint32 level)
{
gboolean ret = TRUE;
@@ -137,7 +137,7 @@ xfpm_brightness_xrandr_set_level (XfpmBrightness
*brightness, RROutput output, l
if ( gdk_error_trap_pop () )
{
- g_warning ("failed to XRRChangeOutputProperty for brightness %li",
level);
+ g_warning ("failed to XRRChangeOutputProperty for brightness %d",
level);
ret = FALSE;
}
@@ -225,11 +225,11 @@ xfpm_brightness_setup_xrandr (XfpmBrightness *brightness)
}
static gboolean
-xfpm_brightness_xrand_up (XfpmBrightness *brightness, glong *new_level)
+xfpm_brightness_xrand_up (XfpmBrightness *brightness, gint32 *new_level)
{
- long hw_level;
+ gint32 hw_level;
gboolean ret = FALSE;
- long set_level;
+ gint32 set_level;
ret = xfpm_brightness_xrandr_get_level (brightness,
brightness->priv->output, &hw_level);
@@ -250,14 +250,14 @@ xfpm_brightness_xrand_up (XfpmBrightness *brightness,
glong *new_level)
if ( !ret )
{
- g_warning ("xfpm_brightness_xrand_up failed for %li", set_level);
+ g_warning ("xfpm_brightness_xrand_up failed for %d", set_level);
return FALSE;
}
/* Nothing changed in the hardware*/
if ( *new_level == hw_level )
{
- g_warning ("xfpm_brightness_xrand_up did not change the hw level to
%li", set_level);
+ g_warning ("xfpm_brightness_xrand_up did not change the hw level to
%d", set_level);
return FALSE;
}
@@ -265,11 +265,11 @@ xfpm_brightness_xrand_up (XfpmBrightness *brightness,
glong *new_level)
}
static gboolean
-xfpm_brightness_xrand_down (XfpmBrightness *brightness, long *new_level)
+xfpm_brightness_xrand_down (XfpmBrightness *brightness, gint32 *new_level)
{
- long hw_level;
+ gint32 hw_level;
gboolean ret;
- long set_level;
+ gint32 set_level;
ret = xfpm_brightness_xrandr_get_level (brightness,
brightness->priv->output, &hw_level);
@@ -290,14 +290,14 @@ xfpm_brightness_xrand_down (XfpmBrightness *brightness,
long *new_level)
if ( !ret )
{
- g_warning ("xfpm_brightness_xrand_down failed for %li", set_level);
+ g_warning ("xfpm_brightness_xrand_down failed for %d", set_level);
return FALSE;
}
/* Nothing changed in the hardware*/
if ( *new_level == hw_level )
{
- g_warning ("xfpm_brightness_xrand_down did not change the hw level to
%li", set_level);
+ g_warning ("xfpm_brightness_xrand_down did not change the hw level to
%d", set_level);
return FALSE;
}
@@ -361,7 +361,7 @@ xfpm_brightness_setup_helper (XfpmBrightness *brightness)
}
static gboolean
-xfpm_brightness_helper_get_level (XfpmBrightness *brg, glong *level)
+xfpm_brightness_helper_get_level (XfpmBrightness *brg, gint32 *level)
{
int ret;
@@ -406,11 +406,11 @@ out:
}
static gboolean
-xfpm_brightness_helper_up (XfpmBrightness *brightness, glong *new_level)
+xfpm_brightness_helper_up (XfpmBrightness *brightness, gint32 *new_level)
{
- glong hw_level;
+ gint32 hw_level;
gboolean ret = FALSE;
- gint set_level;
+ gint32 set_level;
ret = xfpm_brightness_helper_get_level (brightness, &hw_level);
@@ -446,11 +446,11 @@ xfpm_brightness_helper_up (XfpmBrightness *brightness,
glong *new_level)
}
static gboolean
-xfpm_brightness_helper_down (XfpmBrightness *brightness, glong *new_level)
+xfpm_brightness_helper_down (XfpmBrightness *brightness, gint32 *new_level)
{
- glong hw_level;
+ gint32 hw_level;
gboolean ret;
- gint set_level;
+ gint32 set_level;
ret = xfpm_brightness_helper_get_level (brightness, &hw_level);
@@ -572,7 +572,7 @@ xfpm_brightness_setup (XfpmBrightness *brightness)
return FALSE;
}
-gboolean xfpm_brightness_up (XfpmBrightness *brightness, glong *new_level)
+gboolean xfpm_brightness_up (XfpmBrightness *brightness, gint32 *new_level)
{
gboolean ret = FALSE;
@@ -589,7 +589,7 @@ gboolean xfpm_brightness_up (XfpmBrightness *brightness,
glong *new_level)
return ret;
}
-gboolean xfpm_brightness_down (XfpmBrightness *brightness, glong *new_level)
+gboolean xfpm_brightness_down (XfpmBrightness *brightness, gint32 *new_level)
{
gboolean ret = FALSE;
@@ -618,7 +618,7 @@ gint xfpm_brightness_get_max_level (XfpmBrightness
*brightness)
return brightness->priv->max_level;
}
-gboolean xfpm_brightness_get_level (XfpmBrightness *brightness, glong
*level)
+gboolean xfpm_brightness_get_level (XfpmBrightness *brightness, gint32
*level)
{
gboolean ret = FALSE;
@@ -632,7 +632,7 @@ gboolean xfpm_brightness_get_level (XfpmBrightness
*brightness, glong *level)
return ret;
}
-gboolean xfpm_brightness_set_level (XfpmBrightness *brightness, glong level)
+gboolean xfpm_brightness_set_level (XfpmBrightness *brightness, gint32 level)
{
gboolean ret = FALSE;
diff --git a/common/xfpm-brightness.h b/common/xfpm-brightness.h
index 0c4e3ed..26b3dbe 100644
--- a/common/xfpm-brightness.h
+++ b/common/xfpm-brightness.h
@@ -51,20 +51,20 @@ XfpmBrightness *xfpm_brightness_new
(void);
gboolean xfpm_brightness_setup (XfpmBrightness
*brightness);
gboolean xfpm_brightness_up (XfpmBrightness
*brightness,
- glong
*new_level);
+ gint32
*new_level);
gboolean xfpm_brightness_down (XfpmBrightness
*brightness,
- glong
*new_level);
+ gint32
*new_level);
gboolean xfpm_brightness_has_hw (XfpmBrightness
*brightness);
gint xfpm_brightness_get_max_level (XfpmBrightness
*brightness);
gboolean xfpm_brightness_get_level (XfpmBrightness
*brightness,
- glong *level);
+ gint32 *level);
gboolean xfpm_brightness_set_level (XfpmBrightness
*brightness,
- glong level);
+ gint32 level);
gboolean xfpm_brightness_dim_down (XfpmBrightness
*brightness);
diff --git a/panel-plugins/brightness/brightness-button.c
b/panel-plugins/brightness/brightness-button.c
index 6e60c29..bd466c9 100644
--- a/panel-plugins/brightness/brightness-button.c
+++ b/panel-plugins/brightness/brightness-button.c
@@ -186,7 +186,7 @@ static gboolean
brightness_button_popup_win (GtkWidget *widget, GdkEvent *ev, guint32 ev_time)
{
gint x, y;
- glong current_level = 0;
+ gint32 current_level = 0;
GdkDisplay *display;
GdkScreen *screen;
BrightnessButton *button;
@@ -342,7 +342,7 @@ plus_clicked (GtkWidget *widget, BrightnessButton *button)
static void
range_value_changed (GtkWidget *widget, BrightnessButton *button)
{
- glong range_level, hw_level;
+ gint32 range_level, hw_level;
range_level = (gint) gtk_range_get_value (GTK_RANGE (button->priv->range));
@@ -428,8 +428,8 @@ brightness_button_create_popup (BrightnessButton *button)
static void
brightness_button_up (BrightnessButton *button)
{
- glong level;
- glong max_level;
+ gint32 level;
+ gint32 max_level;
xfpm_brightness_get_level (button->priv->brightness, &level);
max_level = xfpm_brightness_get_max_level (button->priv->brightness);
@@ -443,7 +443,7 @@ brightness_button_up (BrightnessButton *button)
static void
brightness_button_down (BrightnessButton *button)
{
- glong level;
+ gint32 level;
xfpm_brightness_get_level (button->priv->brightness, &level);
if ( level != 0 )
diff --git a/src/xfpm-backlight.c b/src/xfpm-backlight.c
index baeeb43..45c990f 100644
--- a/src/xfpm-backlight.c
+++ b/src/xfpm-backlight.c
@@ -63,8 +63,8 @@ struct XfpmBacklightPrivate
gboolean has_hw;
gboolean on_battery;
- glong last_level;
- glong max_level;
+ gint32 last_level;
+ gint32 max_level;
gboolean dimmed;
gboolean block;
@@ -79,7 +79,7 @@ xfpm_backlight_dim_brightness (XfpmBacklight *backlight)
if (xfpm_power_get_mode (backlight->priv->power) == XFPM_POWER_MODE_NORMAL
)
{
- glong dim_level;
+ gint32 dim_level;
g_object_get (G_OBJECT (backlight->priv->conf),
backlight->priv->on_battery ? BRIGHTNESS_LEVEL_ON_BATTERY
: BRIGHTNESS_LEVEL_ON_AC, &dim_level,
@@ -101,7 +101,7 @@ xfpm_backlight_dim_brightness (XfpmBacklight *backlight)
**/
if (backlight->priv->last_level > dim_level)
{
- XFPM_DEBUG ("Current brightness level before dimming : %li, new
%li", backlight->priv->last_level, dim_level);
+ XFPM_DEBUG ("Current brightness level before dimming : %d, new %d",
backlight->priv->last_level, dim_level);
backlight->priv->dimmed = xfpm_brightness_set_level
(backlight->priv->brightness, dim_level);
}
}
@@ -182,7 +182,7 @@ xfpm_backlight_reset_cb (EggIdletime *idle, XfpmBacklight
*backlight)
{
if ( !backlight->priv->block)
{
- XFPM_DEBUG ("Alarm reset, setting level to %li",
backlight->priv->last_level);
+ XFPM_DEBUG ("Alarm reset, setting level to %d",
backlight->priv->last_level);
xfpm_brightness_set_level (backlight->priv->brightness,
backlight->priv->last_level);
}
backlight->priv->dimmed = FALSE;
@@ -192,7 +192,7 @@ xfpm_backlight_reset_cb (EggIdletime *idle, XfpmBacklight
*backlight)
static void
xfpm_backlight_button_pressed_cb (XfpmButton *button, XfpmButtonKey type,
XfpmBacklight *backlight)
{
- glong level;
+ gint32 level;
gboolean ret = TRUE;
gboolean enable_brightness, show_popup;
--
cgit v0.9.2
++++++ xfce4-power-manager-systemd-shutdown-reboot-support.patch ++++++
++++ 662 lines (skipped)
++++++ xfce4-power-manager-systemd-suspend-hibernate-suport.patch ++++++
>From 244d0f09561eace29cbef819c2deb55b13701e25 Mon Sep 17 00:00:00 2001
From: Mikhail Efremov <s...@altlinux.org>
Date: Mon, 8 Apr 2013 21:04:30 +0400
Subject: [PATCH] Add systemd-logind support for suspend/hibernate.
---
configure.ac.in | 20 +++++++++++++++++
src/xfpm-power-common.h | 8 +++++++
src/xfpm-power.c | 57 ++++++++++++++++++++++++++++++++++++++++++++++++-
3 files changed, 84 insertions(+), 1 deletion(-)
Index: xfce4-power-manager-1.2.0/configure.ac
===================================================================
--- xfce4-power-manager-1.2.0.orig/configure.ac
+++ xfce4-power-manager-1.2.0/configure.ac
@@ -150,6 +150,25 @@ fi
AC_MSG_RESULT([$ac_network_manager])
#=======================================================#
+# Suspend/hibernate support #
+#=======================================================#
+AC_ARG_WITH([sleep-manager],
AS_HELP_STRING([--with-sleep-manager=systemd|upower],
+ [Build with specific suspend/hibernate support (default: systemd)]),
+ [], [with_sleep_manager=systemd])
+AC_MSG_CHECKING([for suspend/hibernate support])
+case "$with_sleep_manager" in
+ systemd)
+ ;;
+ upower)
+ AC_DEFINE(WITH_SLEEP_MANAGER_UPOWER, 1 , [Use upower for
suspend/hibernate])
+ ;;
+ *)
+ AC_MSG_ERROR(--with-sleep-manager must be one of [upower, systemd])
+ ;;
+esac
+AC_MSG_RESULT([$with_sleep_manager])
+
+#=======================================================#
# Panel plugins ? #
#=======================================================#
AC_ARG_ENABLE([panel_plugins],
@@ -250,6 +269,7 @@ echo "xdg autostart: ${sysconfdir}/xdg/
echo "POLKIT: ${polkit}"
echo "DPMS: ${have_dpms}"
echo "Network manager: ${ac_network_manager}"
+echo "Suspend/hibernate: ${with_sleep_manager}"
echo "Build panel plugins: ${build_panel_plugins}"
echo "Debug: ${enable_debug}"
echo "Configuration finished, type make to compile"
Index: xfce4-power-manager-1.2.0/src/xfpm-power-common.h
===================================================================
--- xfce4-power-manager-1.2.0.orig/src/xfpm-power-common.h
+++ xfce4-power-manager-1.2.0/src/xfpm-power-common.h
@@ -33,9 +33,17 @@
#define UPOWER_PATH_WAKEUPS "/org/freedesktop/UPower/Wakeups"
#define UPOWER_IFACE_WAKEUPS "org.freedesktop.UPower.Wakeups"
+#ifdef WITH_SLEEP_MANAGER_UPOWER
#define POLKIT_AUTH_SUSPEND "org.freedesktop.upower.suspend"
#define POLKIT_AUTH_HIBERNATE "org.freedesktop.upower.hibernate"
+#else
+#define LOGIND_NAME "org.freedesktop.login1"
+#define LOGIND_PATH "/org/freedesktop/login1"
+#define LOGIND_IFACE "org.freedesktop.login1.Manager"
+#define POLKIT_AUTH_SUSPEND "org.freedesktop.login1.suspend"
+#define POLKIT_AUTH_HIBERNATE "org.freedesktop.login1.hibernate"
+#endif
GPtrArray *xfpm_power_enumerate_devices (DBusGProxy *proxy);
Index: xfce4-power-manager-1.2.0/src/xfpm-power.c
===================================================================
--- xfce4-power-manager-1.2.0.orig/src/xfpm-power.c
+++ xfce4-power-manager-1.2.0/src/xfpm-power.c
@@ -76,7 +76,10 @@ struct XfpmPowerPrivate
DBusGProxy *proxy;
DBusGProxy *proxy_prop;
-
+#ifndef WITH_SLEEP_MANAGER_UPOWER
+ DBusGProxy *proxy_logind;
+#endif
+
GHashTable *hash;
#ifdef HAVE_SYSTEMD
@@ -160,6 +163,7 @@ xfpm_power_check_polkit_auth (XfpmPower
}
#endif
+#ifdef WITH_SLEEP_MANAGER_UPOWER
static void
xfpm_power_check_pm (XfpmPower *power, GHashTable *props)
{
@@ -193,6 +197,32 @@ xfpm_power_check_pm (XfpmPower *power, G
power->priv->can_hibernate = ret;
}
}
+#else
+static gboolean
+xfpm_power_can_sleep_method (XfpmPower *power, const char *method)
+{
+ GError *error = NULL;
+ char *retstr = NULL;
+ gboolean ret = FALSE;
+
+ if (!dbus_g_proxy_call (power->priv->proxy_logind, method, &error,
+ G_TYPE_INVALID,
+ G_TYPE_STRING, &retstr,
+ G_TYPE_INVALID))
+ {
+ g_warning ("Unable to check %s method: %s", method, error->message);
+ g_error_free (error);
+
+ return FALSE;
+ }
+
+ if (retstr && !strcmp (retstr, "yes"))
+ ret = TRUE;
+ g_free (retstr);
+
+ return ret;
+}
+#endif
static void
xfpm_power_check_power (XfpmPower *power, GHashTable *props)
@@ -283,7 +313,12 @@ xfpm_power_get_properties (XfpmPower *po
props = xfpm_power_get_interface_properties (power->priv->proxy_prop,
UPOWER_IFACE);
+#ifdef WITH_SLEEP_MANAGER_UPOWER
xfpm_power_check_pm (power, props);
+#else
+ power->priv->can_suspend = xfpm_power_can_sleep_method (power,
"CanSuspend");
+ power->priv->can_hibernate = xfpm_power_can_sleep_method (power,
"CanHibernate");
+#endif
xfpm_power_check_lid (power, props);
xfpm_power_check_power (power, props);
@@ -354,9 +389,16 @@ xfpm_power_sleep (XfpmPower *power, cons
xfpm_lock_screen ();
}
+#ifdef WITH_SLEEP_MANAGER_UPOWER
dbus_g_proxy_call (power->priv->proxy, sleep_time, &error,
G_TYPE_INVALID,
G_TYPE_INVALID);
+#else
+ dbus_g_proxy_call (power->priv->proxy_logind, sleep_time, &error,
+ G_TYPE_BOOLEAN, TRUE,
+ G_TYPE_INVALID,
+ G_TYPE_INVALID);
+#endif
if ( error )
{
@@ -1394,12 +1436,20 @@ xfpm_power_init (XfpmPower *power)
UPOWER_NAME,
UPOWER_PATH,
DBUS_INTERFACE_PROPERTIES);
+
if (power->priv->proxy_prop == NULL)
{
g_critical ("Unable to create proxy for %s", UPOWER_NAME);
goto out;
}
+#ifndef WITH_SLEEP_MANAGER_UPOWER
+ power->priv->proxy_logind = dbus_g_proxy_new_for_name (power->priv->bus,
+ LOGIND_NAME,
+ LOGIND_PATH,
+ LOGIND_IFACE);
+#endif
+
xfpm_power_get_power_devices (power);
xfpm_power_get_properties (power);
#ifdef ENABLE_POLKIT
@@ -1506,6 +1556,11 @@ xfpm_power_finalize (GObject *object)
if ( power->priv->proxy_prop )
g_object_unref (power->priv->proxy_prop);
+#ifndef WITH_SLEEP_MANAGER_UPOWER
+ if ( power->priv->proxy_logind )
+ g_object_unref (power->priv->proxy_logind);
+#endif
+
g_hash_table_destroy (power->priv->hash);
#ifdef ENABLE_POLKIT
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
