Aloha all, I'm no C man, but with a little guidance I've knocked up the attached patch to get panel-devices to work with upower instead of the deprecated devicekit-power.
Problem is it fails to build for me on openSUSE which I think is something to do with the tests, but I'm not sure. Any chance someone could advise on what I'm missing, but also crucially what are the plans for moving to upower? Thanks, Andy -- Andrew Wafaa IRC: FunkyPenguin GPG: 0x3A36312F openSUSE: Get It, Discover It, Create It at http://www.opensuse.org
Index: meego-panel-devices-0.2.5/configure.ac
===================================================================
--- meego-panel-devices-0.2.5.orig/configure.ac
+++ meego-panel-devices-0.2.5/configure.ac
@@ -70,7 +70,7 @@ PKG_CHECK_MODULES(MPD,
$gvc_deps
clutter-1.0
clutter-gtk-0.10
- devkit-power-gobject
+ upower-glib >= 0.9.0
gconf-2.0
gio-2.0
libcanberra-gtk
@@ -115,7 +115,7 @@ PKG_CHECK_MODULES(MPI,
$eck_deps
clutter-1.0
clutter-gtk-0.10
- devkit-power-gobject
+ upower-glib >= 0.9.0
gconf-2.0
gdk-x11-2.0
libnotify
Index: meego-panel-devices-0.2.5/power-icon/src/mpd-idle-manager.c
===================================================================
--- meego-panel-devices-0.2.5.orig/power-icon/src/mpd-idle-manager.c
+++ meego-panel-devices-0.2.5/power-icon/src/mpd-idle-manager.c
@@ -20,7 +20,7 @@
*/
#include <dbus/dbus-glib.h>
-#include <devkit-power-gobject/devicekit-power.h>
+#include <upower.h>
#include "mpd-conf.h"
#include "mpd-gobject.h"
@@ -39,7 +39,7 @@ typedef struct
DBusGProxy *presence;
DBusGProxy *screensaver;
- DkpClient *power_client;
+ UpClient *power_client;
guint suspend_source_id;
} MpdIdleManagerPrivate;
@@ -162,7 +162,7 @@ mpd_idle_manager_init (MpdIdleManager *s
g_signal_connect (priv->conf, "notify::suspend-idle-time",
G_CALLBACK (_suspend_timeout_changed_cb), self);
- priv->power_client = dkp_client_new ();
+ priv->power_client = up_client_new ();
conn = dbus_g_bus_get (DBUS_BUS_SESSION, &error);
if (!conn)
@@ -225,7 +225,7 @@ mpd_idle_manager_suspend (MpdIdleManager
if (!ret)
return false;
- ret = dkp_client_suspend (priv->power_client, error);
+ ret = up_client_suspend_sync (priv->power_client, NULL, error);
dbus_g_proxy_call_no_reply (priv->screensaver, "SimulateUserActivity",
G_TYPE_INVALID);
Index: meego-panel-devices-0.2.5/power-icon/src/mpd-lid-device.c
===================================================================
--- meego-panel-devices-0.2.5.orig/power-icon/src/mpd-lid-device.c
+++ meego-panel-devices-0.2.5/power-icon/src/mpd-lid-device.c
@@ -18,7 +18,7 @@
* Inc., 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#include <devkit-power-gobject/devicekit-power.h>
+#include <upower.h>
#include "mpd-gobject.h"
#include "mpd-lid-device.h"
@@ -42,12 +42,12 @@ enum
typedef struct
{
- DkpClient *client;
+ UpClient *client;
bool closed;
} MpdLidDevicePrivate;
static void
-_client_changed_cb (DkpClient *client,
+_client_changed_cb (UpClient *client,
MpdLidDevice *self)
{
bool closed;
@@ -128,7 +128,7 @@ mpd_lid_device_init (MpdLidDevice *self)
{
MpdLidDevicePrivate *priv = GET_PRIVATE (self);
- priv->client = dkp_client_new ();
+ priv->client = up_client_new ();
g_signal_connect (priv->client, "changed",
G_CALLBACK (_client_changed_cb), self);
g_object_get (priv->client,
Index: meego-panel-devices-0.2.5/src/mpd-battery-device.c
===================================================================
--- meego-panel-devices-0.2.5.orig/src/mpd-battery-device.c
+++ meego-panel-devices-0.2.5/src/mpd-battery-device.c
@@ -18,7 +18,7 @@
* Inc., 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#include <devkit-power-gobject/devicekit-power.h>
+#include <upower.h>
#include <glib/gi18n.h>
#include "mpd-battery-device.h"
@@ -40,8 +40,8 @@ enum
typedef struct
{
- DkpClient *client;
- DkpDevice *device;
+ UpClient *client;
+ UpDevice *device;
unsigned int percentage;
MpdBatteryDeviceState state;
} MpdBatteryDevicePrivate;
@@ -54,12 +54,12 @@ mpd_battery_device_set_state (MpdBa
MpdBatteryDeviceState state);
static void
-_client_device_added_cb (DkpClient *client,
- DkpDevice *device,
+_client_device_added_cb (UpClient *client,
+ UpDevice *device,
MpdBatteryDevice *self)
{
MpdBatteryDevicePrivate *priv = GET_PRIVATE (self);
- DkpDeviceType device_type;
+ UpDeviceKind device_type;
if (NULL == priv->device)
{
@@ -67,7 +67,7 @@ _client_device_added_cb (DkpClient
"type", &device_type,
NULL);
- if (DKP_DEVICE_TYPE_BATTERY == device_type)
+ if (UP_DEVICE_KIND_BATTERY == device_type)
{
priv->device = g_object_ref (device);
@@ -80,15 +80,15 @@ _client_device_added_cb (DkpClient
}
static void
-_client_device_removed_cb (DkpClient *client,
- DkpDevice *device,
+_client_device_removed_cb (UpClient *client,
+ UpDevice *device,
MpdBatteryDevice *self)
{
MpdBatteryDevicePrivate *priv = GET_PRIVATE (self);
if (priv->device &&
- 0 == g_strcmp0 (dkp_device_get_object_path (device),
- dkp_device_get_object_path (priv->device)))
+ 0 == g_strcmp0 (up_device_get_object_path (device),
+ up_device_get_object_path (priv->device)))
{
g_object_unref (priv->device);
priv->device = NULL;
@@ -99,15 +99,15 @@ _client_device_removed_cb (DkpClient
}
static void
-_client_device_changed_cb (DkpClient *client,
- DkpDevice *device,
+_client_device_changed_cb (UpClient *client,
+ UpDevice *device,
MpdBatteryDevice *self)
{
MpdBatteryDevicePrivate *priv = GET_PRIVATE (self);
if (priv->device &&
- 0 == g_strcmp0 (dkp_device_get_object_path (device),
- dkp_device_get_object_path (priv->device)))
+ 0 == g_strcmp0 (up_device_get_object_path (device),
+ up_device_get_object_path (priv->device)))
{
mpd_battery_device_set_percentage (self,
mpd_battery_device_get_percentage (self));
@@ -133,7 +133,7 @@ _constructor (GType typ
/* Look up battery device. */
- devices = dkp_client_enumerate_devices (priv->client, &error);
+ devices = up_client_enumerate_devices_sync (priv->client, NULL, &error);
if (error)
{
g_critical ("%s : %s", G_STRLOC, error->message);
@@ -144,13 +144,13 @@ _constructor (GType typ
for (i = 0; i < devices->len; i++)
{
- DkpDevice *device = g_ptr_array_index (devices, i);
- DkpDeviceType device_type;
+ UpDevice *device = g_ptr_array_index (devices, i);
+ UpDeviceKind device_type;
g_object_get (device,
"type", &device_type,
NULL);
- if (DKP_DEVICE_TYPE_BATTERY == device_type)
+ if (UP_DEVICE_KIND_BATTERY == device_type)
priv->device = g_object_ref (device);
}
@@ -252,7 +252,7 @@ mpd_battery_device_init (MpdBatteryDevic
{
MpdBatteryDevicePrivate *priv = GET_PRIVATE (self);
- priv->client = dkp_client_new ();
+ priv->client = up_client_new ();
g_signal_connect (priv->client, "device-added",
G_CALLBACK (_client_device_added_cb), self);
g_signal_connect (priv->client, "device-removed",
@@ -309,7 +309,7 @@ mpd_battery_device_get_state (MpdBattery
{
MpdBatteryDevicePrivate *priv = GET_PRIVATE (self);
MpdBatteryDeviceState state;
- DkpDeviceState device_state;
+ UpDeviceState device_state;
g_return_val_if_fail (MPD_IS_BATTERY_DEVICE (self),
MPD_BATTERY_DEVICE_STATE_UNKNOWN);
@@ -325,14 +325,14 @@ mpd_battery_device_get_state (MpdBattery
switch (device_state)
{
- case DKP_DEVICE_STATE_CHARGING:
+ case UP_DEVICE_STATE_CHARGING:
state = MPD_BATTERY_DEVICE_STATE_CHARGING;
break;
- case DKP_DEVICE_STATE_DISCHARGING:
- case DKP_DEVICE_STATE_EMPTY:
+ case UP_DEVICE_STATE_DISCHARGING:
+ case UP_DEVICE_STATE_EMPTY:
state = MPD_BATTERY_DEVICE_STATE_DISCHARGING;
break;
- case DKP_DEVICE_STATE_FULLY_CHARGED:
+ case UP_DEVICE_STATE_FULLY_CHARGED:
state = MPD_BATTERY_DEVICE_STATE_FULLY_CHARGED;
break;
default:
Index: meego-panel-devices-0.2.5/configure
===================================================================
--- meego-panel-devices-0.2.5.orig/configure
+++ meego-panel-devices-0.2.5/configure
@@ -13459,7 +13459,7 @@ if test -n "$PKG_CONFIG"; then
\$gvc_deps
clutter-1.0
clutter-gtk-0.10
- devkit-power-gobject
+ upower-glib >= 0.9.0
gconf-2.0
gio-2.0
libcanberra-gtk
@@ -13470,7 +13470,7 @@ if test -n "$PKG_CONFIG"; then
$gvc_deps
clutter-1.0
clutter-gtk-0.10
- devkit-power-gobject
+ upower-glib >= 0.9.0
gconf-2.0
gio-2.0
libcanberra-gtk
@@ -13484,7 +13484,7 @@ if test -n "$PKG_CONFIG"; then
$gvc_deps
clutter-1.0
clutter-gtk-0.10
- devkit-power-gobject
+ upower-glib >= 0.9.0
gconf-2.0
gio-2.0
libcanberra-gtk
@@ -13507,7 +13507,7 @@ if test -n "$PKG_CONFIG"; then
\$gvc_deps
clutter-1.0
clutter-gtk-0.10
- devkit-power-gobject
+ upower-glib >= 0.9.0
gconf-2.0
gio-2.0
libcanberra-gtk
@@ -13518,7 +13518,7 @@ if test -n "$PKG_CONFIG"; then
$gvc_deps
clutter-1.0
clutter-gtk-0.10
- devkit-power-gobject
+ upower-glib >= 0.9.0
gconf-2.0
gio-2.0
libcanberra-gtk
@@ -13532,7 +13532,7 @@ if test -n "$PKG_CONFIG"; then
$gvc_deps
clutter-1.0
clutter-gtk-0.10
- devkit-power-gobject
+ upower-glib >= 0.9.0
gconf-2.0
gio-2.0
libcanberra-gtk
@@ -13561,7 +13561,7 @@ fi
$gvc_deps
clutter-1.0
clutter-gtk-0.10
- devkit-power-gobject
+ upower-glib >= 0.9.0
gconf-2.0
gio-2.0
libcanberra-gtk
@@ -13573,7 +13573,7 @@ fi
$gvc_deps
clutter-1.0
clutter-gtk-0.10
- devkit-power-gobject
+ upower-glib >= 0.9.0
gconf-2.0
gio-2.0
libcanberra-gtk
@@ -13588,7 +13588,7 @@ fi
$gvc_deps
clutter-1.0
clutter-gtk-0.10
- devkit-power-gobject
+ upower-glib >= 0.9.0
gconf-2.0
gio-2.0
libcanberra-gtk
@@ -13816,7 +13816,7 @@ if test -n "$PKG_CONFIG"; then
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$eck_deps
clutter-1.0
clutter-gtk-0.10
- devkit-power-gobject
+ upower-glib >= 0.9.0
gconf-2.0
gdk-x11-2.0
libnotify
@@ -13825,7 +13825,7 @@ if test -n "$PKG_CONFIG"; then
($PKG_CONFIG --exists --print-errors "$eck_deps
clutter-1.0
clutter-gtk-0.10
- devkit-power-gobject
+ upower-glib >= 0.9.0
gconf-2.0
gdk-x11-2.0
libnotify
@@ -13837,7 +13837,7 @@ if test -n "$PKG_CONFIG"; then
pkg_cv_MPI_CFLAGS=`$PKG_CONFIG --cflags "$eck_deps
clutter-1.0
clutter-gtk-0.10
- devkit-power-gobject
+ upower-glib >= 0.9.0
gconf-2.0
gdk-x11-2.0
libnotify
@@ -13858,7 +13858,7 @@ if test -n "$PKG_CONFIG"; then
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$eck_deps
clutter-1.0
clutter-gtk-0.10
- devkit-power-gobject
+ upower-glib >= 0.9.0
gconf-2.0
gdk-x11-2.0
libnotify
@@ -13867,7 +13867,7 @@ if test -n "$PKG_CONFIG"; then
($PKG_CONFIG --exists --print-errors "$eck_deps
clutter-1.0
clutter-gtk-0.10
- devkit-power-gobject
+ upower-glib >= 0.9.0
gconf-2.0
gdk-x11-2.0
libnotify
@@ -13879,7 +13879,7 @@ if test -n "$PKG_CONFIG"; then
pkg_cv_MPI_LIBS=`$PKG_CONFIG --libs "$eck_deps
clutter-1.0
clutter-gtk-0.10
- devkit-power-gobject
+ upower-glib >= 0.9.0
gconf-2.0
gdk-x11-2.0
libnotify
@@ -13906,7 +13906,7 @@ fi
MPI_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$eck_deps
clutter-1.0
clutter-gtk-0.10
- devkit-power-gobject
+ upower-glib >= 0.9.0
gconf-2.0
gdk-x11-2.0
libnotify
@@ -13916,7 +13916,7 @@ fi
MPI_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$eck_deps
clutter-1.0
clutter-gtk-0.10
- devkit-power-gobject
+ upower-glib >= 0.9.0
gconf-2.0
gdk-x11-2.0
libnotify
@@ -13929,7 +13929,7 @@ fi
as_fn_error "Package requirements ($eck_deps
clutter-1.0
clutter-gtk-0.10
- devkit-power-gobject
+ upower-glib >= 0.9.0
gconf-2.0
gdk-x11-2.0
libnotify
signature.asc
Description: This is a digitally signed message part
_______________________________________________ MeeGo-dev mailing list [email protected] http://lists.meego.com/listinfo/meego-dev
