cherry pick upower 0.99 support for mate-session-manager && mate-power-manager, and force them to link only against it, dropping upower-pm-utils

9 files changed, 1396 insertions, 0 deletions

diff --git a/mate-extra/mate-power-manager/Manifest b/mate-extra/mate-power-manager/Manifest
new file mode 100644
index 00000000..f7b22cfa
--- /dev/null
+++ b/mate-extra/mate-power-manager/Manifest
@@ -0,0 +1 @@
+DIST mate-power-manager-1.8.0.tar.xz 3339588 SHA256 3d83b7736b0b6256242db3b9efaa18530b4ba6d80b146eafaf511230ae926d9f SHA512 f91b195e384138ce0881f53f4d3e8924d422445ac258de2138da16ab29999cd367b2e37c226e5d56e698bc54b82c8996b3263a638702f45b2f96ffabbceca479 WHIRLPOOL 31a423d25abd488bceb13354cabc3f80844f791060339ea38d4fa12f8ac80d1d4a4c94c8e07af7ba489fd5da98f7bbdfbf4edebe339926e91e0d39747ddb3a34
diff --git a/mate-extra/mate-power-manager/files/mate-power-manager-1.6-libsecret.patch b/mate-extra/mate-power-manager/files/mate-power-manager-1.6-libsecret.patch
new file mode 100644
index 00000000..b36ce4e6
--- /dev/null
+++ b/mate-extra/mate-power-manager/files/mate-power-manager-1.6-libsecret.patch
@@ -0,0 +1,144 @@
+diff --git a/README b/README
+index 77e1213..3f6a122 100644
+--- a/README
++++ b/README
+@@ -15,7 +15,7 @@ To build, MATE Power Manager requires
+ 
+ 	- Glib (2.13.0 or later)
+ 	- Gtk2+ (2.11.0 or later)
+-	- MATE Keyring (1.1.0 or later)
++	- GNOME Keyring (3.0.0 or later)
+ 	- DBus (0.70 or later)
+ 	- libnotify (0.7.0 or later)
+ 	- Cairo (1.0.0 or later)
+diff --git a/configure.ac b/configure.ac
+index 89309ff..912c362 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -102,7 +102,7 @@ GLIB_REQUIRED=2.13.0
+ GIO_REQUIRED=2.25.0
+ GTK_REQUIRED=2.17.7
+ GDK_REQUIRED=2.11.0
+-MATE_KEYRING_REQUIRED=1.1.0
++GNOME_KEYRING_REQUIRED=3.0.0
+ DBUS_REQUIRED=1.0
+ DBUS_GLIB_REQUIRED=0.70
+ LIBNOTIFY_REQUIRED=0.7.0
+@@ -249,18 +249,18 @@ fi
+ AM_CONDITIONAL([HAVE_TESTS], [test $have_tests = yes])
+ 
+ dnl ---------------------------------------------------------------------------
+-dnl - Build mate-keyring support
++dnl - Build gnome-keyring support
+ dnl ---------------------------------------------------------------------------
+ AC_ARG_WITH(keyring,
+         [AS_HELP_STRING([--without-keyring],
+-                        [Disable the use of mate-keyring])],
++                        [Disable the use of gnome-keyring])],
+         [],
+         [with_keyring=yes])
+ 
+ AM_CONDITIONAL([WITH_KEYRING],[test "$with_keyring" = "yes"])
+ 
+ if test "$with_keyring" = "yes"; then
+-        PKG_CHECK_MODULES(KEYRING, mate-keyring-1 >= $MATE_KEYRING_REQUIRED)
++        PKG_CHECK_MODULES(KEYRING, gnome-keyring-1 >= $GNOME_KEYRING_REQUIRED)
+         AC_DEFINE([WITH_KEYRING],[1],[Define if KEYRING support is enabled])
+ fi
+ 
+@@ -393,7 +393,7 @@ echo "
+         datadir:                   ${datadir}
+         compiler:                  ${CC}
+         cflags:                    ${CFLAGS}
+-        mate-keyring support:      ${with_keyring}
++        gnome-keyring support:     ${with_keyring}
+         Building extra applets:    ${enable_applets}
+         Self test support:         ${have_tests}
+         Use libunique:             ${enable_libunique}
+diff --git a/data/org.mate.power-manager.gschema.xml.in b/data/org.mate.power-manager.gschema.xml.in
+index dcd2cd4..adecce0 100644
+--- a/data/org.mate.power-manager.gschema.xml.in
++++ b/data/org.mate.power-manager.gschema.xml.in
+@@ -183,13 +183,13 @@
+     </key>
+     <key name="lock-keyring-suspend" type="b">
+       <default>false</default>
+-      <_summary>Lock MATE keyring on sleep</_summary>
+-      <_description>Whether the MATE keyring is locked before the computer enters suspend. This means the keyring will have to be unlocked on resume.</_description>
++      <_summary>Lock GNOME keyring on sleep</_summary>
++      <_description>Whether the GNOME keyring is locked before the computer enters suspend. This means the keyring will have to be unlocked on resume.</_description>
+     </key>
+     <key name="lock-keyring-hibernate" type="b">
+       <default>true</default>
+-      <_summary>Lock MATE keyring on sleep</_summary>
+-      <_description>Whether the MATE keyring is locked before the computer enters hibernate. This means the keyring will have to be unlocked on resume.</_description>
++      <_summary>Lock GNOME keyring on sleep</_summary>
++      <_description>Whether the GNOME keyring is locked before the computer enters hibernate. This means the keyring will have to be unlocked on resume.</_description>
+     </key>
+     <key name="spindown-enable-ac" type="b">
+       <default>false</default>
+diff --git a/src/gpm-control.c b/src/gpm-control.c
+index cb84814..8253336 100644
+--- a/src/gpm-control.c
++++ b/src/gpm-control.c
+@@ -42,7 +42,7 @@
+ #include <libupower-glib/upower.h>
+ 
+ #ifdef WITH_KEYRING
+-#include <mate-keyring.h>
++#include <gnome-keyring.h>
+ #endif /* WITH_KEYRING */
+ 
+ #include "egg-debug.h"
+@@ -212,8 +212,8 @@ enum {
+ 	GpmScreensaver *screensaver;
+ 	guint32 throttle_cookie = 0;
+ #ifdef WITH_KEYRING
+-	gboolean lock_mate_keyring;
+-	MateKeyringResult keyres;
++	gboolean lock_gnome_keyring;
++	GnomeKeyringResult keyres;
+ #endif /* WITH_KEYRING */
+ 
+ 	GError *dbus_error = NULL;
+@@ -234,10 +234,10 @@ enum {
+ 
+ #ifdef WITH_KEYRING
+ 	/* we should perhaps lock keyrings when sleeping #375681 */
+-	lock_mate_keyring = g_settings_get_boolean (control->priv->settings, GPM_SETTINGS_LOCK_KEYRING_SUSPEND);
+-	if (lock_mate_keyring) {
+-		keyres = mate_keyring_lock_all_sync ();
+-		if (keyres != MATE_KEYRING_RESULT_OK)
++	lock_gnome_keyring = g_settings_get_boolean (control->priv->settings, GPM_SETTINGS_LOCK_KEYRING_SUSPEND);
++	if (lock_gnome_keyring) {
++		keyres = gnome_keyring_lock_all_sync ();
++		if (keyres != GNOME_KEYRING_RESULT_OK)
+ 			egg_warning ("could not lock keyring");
+ 	}
+ #endif /* WITH_KEYRING */
+@@ -323,8 +323,8 @@ enum {
+ 	GpmScreensaver *screensaver;
+ 	guint32 throttle_cookie = 0;
+ #ifdef WITH_KEYRING
+-	gboolean lock_mate_keyring;
+-	MateKeyringResult keyres;
++	gboolean lock_gnome_keyring;
++	GnomeKeyringResult keyres;
+ #endif /* WITH_KEYRING */
+ 
+ 	GError *dbus_error = NULL;
+@@ -345,10 +345,10 @@ enum {
+ 
+ #ifdef WITH_KEYRING
+ 	/* we should perhaps lock keyrings when sleeping #375681 */
+-	lock_mate_keyring = g_settings_get_boolean (control->priv->settings, GPM_SETTINGS_LOCK_KEYRING_HIBERNATE);
+-	if (lock_mate_keyring) {
+-		keyres = mate_keyring_lock_all_sync ();
+-		if (keyres != MATE_KEYRING_RESULT_OK) {
++	lock_gnome_keyring = g_settings_get_boolean (control->priv->settings, GPM_SETTINGS_LOCK_KEYRING_HIBERNATE);
++	if (lock_gnome_keyring) {
++		keyres = gnome_keyring_lock_all_sync ();
++		if (keyres != GNOME_KEYRING_RESULT_OK) {
+ 			egg_warning ("could not lock keyring");
+ 		}
+ 	}
diff --git a/mate-extra/mate-power-manager/files/mate-power-manager-1.8.0-r1-avoid-levels-is-0-warning.patch b/mate-extra/mate-power-manager/files/mate-power-manager-1.8.0-r1-avoid-levels-is-0-warning.patch
new file mode 100644
index 00000000..9bccb5c9
--- /dev/null
+++ b/mate-extra/mate-power-manager/files/mate-power-manager-1.8.0-r1-avoid-levels-is-0-warning.patch
@@ -0,0 +1,15 @@
+diff --git a/src/gpm-kbd-backlight.c b/src/gpm-kbd-backlight.c
+index 0ac6801..a439e94 100644
+--- a/src/gpm-kbd-backlight.c
++++ b/src/gpm-kbd-backlight.c
+@@ -113,6 +113,9 @@ gpm_kbd_backlight_set (GpmKbdBacklight *backlight,
+    guint goal;
+ 
+    g_return_val_if_fail (GPM_IS_KBD_BACKLIGHT (backlight), FALSE);
++   /* avoid warnings if no keyboard brightness is available */
++   if (backlight->priv->max_brightness < 1)
++       return FALSE;
+    /* if we're setting the same we are, don't bother */
+    //g_return_val_if_fail (backlight->priv->brightness_percent != percentage, FALSE);
+ 
+
diff --git a/mate-extra/mate-power-manager/files/mate-power-manager-1.8.0-r1-dbus_interface_keyboard_backlight_controls.patch b/mate-extra/mate-power-manager/files/mate-power-manager-1.8.0-r1-dbus_interface_keyboard_backlight_controls.patch
new file mode 100644
index 00000000..689192ff
--- /dev/null
+++ b/mate-extra/mate-power-manager/files/mate-power-manager-1.8.0-r1-dbus_interface_keyboard_backlight_controls.patch
@@ -0,0 +1,160 @@
+diff -uprN mate-power-manager-orig/src/gpm-common.h mate-power-manager/src/gpm-common.h
+--- mate-power-manager-orig/src/gpm-common.h	2013-10-03 13:56:55.000000000 +0200
++++ mate-power-manager/src/gpm-common.h	2013-10-13 19:54:10.649901214 +0200
+@@ -33,6 +33,7 @@ G_BEGIN_DECLS
+ #define	GPM_DBUS_SERVICE		"org.mate.PowerManager"
+ #define	GPM_DBUS_INTERFACE		"org.mate.PowerManager"
+ #define	GPM_DBUS_INTERFACE_BACKLIGHT	"org.mate.PowerManager.Backlight"
++#define	GPM_DBUS_INTERFACE_KBD_BACKLIGHT	"org.mate.PowerManager.KbdBacklight"
+ #define	GPM_DBUS_PATH			"/org/mate/PowerManager"
+ #define	GPM_DBUS_PATH_BACKLIGHT		"/org/mate/PowerManager/Backlight"
+ #define GPM_DBUS_PATH_KBD_BACKLIGHT    "/org/mate/PowerManager/KbdBacklight"
+diff -uprN mate-power-manager-orig/src/gpm-kbd-backlight.c mate-power-manager/src/gpm-kbd-backlight.c
+--- mate-power-manager-orig/src/gpm-kbd-backlight.c	2013-10-03 13:56:55.000000000 +0200
++++ mate-power-manager/src/gpm-kbd-backlight.c	2013-10-13 19:58:07.154258855 +0200
+@@ -31,21 +31,6 @@
+ #include "gpm-kbd-backlight.h"
+ #include "gsd-media-keys-window.h"
+ 
+-static const gchar *kbd_backlight_introspection = ""
+-"<?xml version=\"1.0\" encoding=\"UTF-8\"?>""<node name=\"/\">"
+-  "<interface name=\"org.mate.PowerManager.Backlight\">"
+-    "<method name=\"GetBrightness\">"
+-      "<arg type=\"u\" name=\"percentage_brightness\" direction=\"out\"/>"
+-    "</method>"
+-    "<method name=\"SetBrightness\">"
+-      "<arg type=\"u\" name=\"percentage_brightness\" direction=\"in\"/>"
+-    "</method>"
+-    "<signal name=\"BrightnessChanged\">"
+-      "<arg type=\"u\" name=\"percentage_brightness\" direction=\"out\"/>"
+-    "</signal>"
+-  "</interface>"
+-"</node>";
+-
+ #define GPM_KBD_BACKLIGHT_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GPM_TYPE_KBD_BACKLIGHT, GpmKbdBacklightPrivate))
+ 
+ struct GpmKbdBacklightPrivate
+@@ -430,40 +415,6 @@ gpm_kbd_backlight_dbus_property_set (GDB
+    return FALSE;
+ }
+ 
+-/**
+- * gpm_kbd_backlight_register_dbus:
+- * @backlight:
+- * @connection:
+- * @error:
+- **/
+-void
+-gpm_kbd_backlight_register_dbus (GpmKbdBacklight *backlight,
+-                GDBusConnection *connection,
+-                GError **error)
+-{
+-   GDBusNodeInfo *node_info;
+-   GDBusInterfaceInfo *interface_info;
+-   GDBusInterfaceVTable interface_vtable = {
+-           gpm_kbd_backlight_dbus_method_call,
+-           gpm_kbd_backlight_dbus_property_get,
+-           gpm_kbd_backlight_dbus_property_set
+-   };
+-
+-   node_info = g_dbus_node_info_new_for_xml (kbd_backlight_introspection, NULL);
+-   interface_info = g_dbus_node_info_lookup_interface (node_info, GPM_DBUS_INTERFACE_BACKLIGHT);
+-
+-   backlight->priv->bus_connection = g_object_ref (connection);
+-   backlight->priv->bus_object_id =
+-       g_dbus_connection_register_object (connection,
+-                          GPM_DBUS_PATH_KBD_BACKLIGHT,
+-                          interface_info,
+-                          &interface_vtable,
+-                          backlight,
+-                          NULL,
+-                          error);
+-   g_dbus_node_info_unref (node_info);
+-}
+-
+ static gboolean
+ gpm_kbd_backlight_evaluate_power_source_and_set (GpmKbdBacklight *backlight)
+ {
+diff -uprN mate-power-manager-orig/src/gpm-manager.c mate-power-manager/src/gpm-manager.c
+--- mate-power-manager-orig/src/gpm-manager.c	2013-10-03 13:56:55.000000000 +0200
++++ mate-power-manager/src/gpm-manager.c	2013-10-13 20:05:11.449488592 +0200
+@@ -63,6 +63,7 @@
+ #include "gpm-disks.h"
+ 
+ #include "org.mate.PowerManager.Backlight.h"
++#include "org.mate.PowerManager.KbdBacklight.h"
+ 
+ static void     gpm_manager_finalize	(GObject	 *object);
+ 
+@@ -1986,12 +1987,13 @@ gpm_manager_init (GpmManager *manager)
+ 						     G_OBJECT (manager->priv->backlight));
+ 	}
+ 
+-    manager->priv->kbd_backlight = gpm_kbd_backlight_new ();
+-    if (manager->priv->kbd_backlight != NULL) {
+-        gpm_kbd_backlight_register_dbus (manager->priv->kbd_backlight,
+-                                        g_connection,
+-                                        NULL);
+-    }
++        manager->priv->kbd_backlight = gpm_kbd_backlight_new ();
++        if (manager->priv->kbd_backlight != NULL) {
++            dbus_g_object_type_install_info (GPM_TYPE_KBD_BACKLIGHT,
++                                             &dbus_glib_gpm_kbd_backlight_object_info);
++        dbus_g_connection_register_g_object (connection, GPM_DBUS_PATH_KBD_BACKLIGHT,
++                                             G_OBJECT (manager->priv->kbd_backlight));
++        }
+ 
+ 	manager->priv->idle = gpm_idle_new ();
+ 	g_signal_connect (manager->priv->idle, "idle-changed",
+diff -uprN mate-power-manager-orig/src/Makefile.am mate-power-manager/src/Makefile.am
+--- mate-power-manager-orig/src/Makefile.am	2013-10-03 13:56:55.000000000 +0200
++++ mate-power-manager/src/Makefile.am	2013-10-13 20:10:17.374533688 +0200
+@@ -6,6 +6,7 @@ NULL =
+ EXTRA_DIST =						\
+ 	org.mate.PowerManager.xml			\
+ 	org.mate.PowerManager.Backlight.xml		\
++	org.mate.PowerManager.KbdBacklight.xml		\
+ 	gpm-marshal.list				\
+ 	$(NULL)
+ 
+@@ -270,6 +271,7 @@ endif
+ BUILT_SOURCES = 					\
+ 	org.mate.PowerManager.h			\
+ 	org.mate.PowerManager.Backlight.h		\
++	org.mate.PowerManager.KbdBacklight.h		\
+ 	gpm-marshal.c					\
+ 	gpm-marshal.h					\
+ 	$(NULL)
+@@ -295,6 +297,13 @@ org.mate.PowerManager.Backlight.h: org.m
+ 		--output=org.mate.PowerManager.Backlight.h	\
+ 		$(srcdir)/org.mate.PowerManager.Backlight.xml
+ 
++org.mate.PowerManager.KbdBacklight.h: org.mate.PowerManager.KbdBacklight.xml
++	libtool --mode=execute dbus-binding-tool	\
++		--prefix=gpm_kbd_backlight			\
++		--mode=glib-server			\
++		--output=org.mate.PowerManager.KbdBacklight.h	\
++		$(srcdir)/org.mate.PowerManager.KbdBacklight.xml
++
+ clean-local:
+ 	rm -f *~
+ 	rm -f gpm-marshal.c gpm-marshal.h
+diff -uprN mate-power-manager-orig/src/org.mate.PowerManager.KbdBacklight.xml mate-power-manager/src/org.mate.PowerManager.KbdBacklight.xml
+--- mate-power-manager-orig/src/org.mate.PowerManager.KbdBacklight.xml	2013-10-13 20:12:11.556667787 +0200
++++ mate-power-manager/src/org.mate.PowerManager.KbdBacklight.xml	2013-10-13 20:11:45.972413654 +0200
+@@ -0,0 +1,15 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<node name="/">
++  <interface name="org.mate.PowerManager.KbdBacklight">
++    <method name="GetBrightness">
++      <arg type="u" name="percentage_brightness" direction="out"/>
++    </method>
++    <method name="SetBrightness">
++      <arg type="u" name="percentage_brightness" direction="in"/>
++    </method>
++    <signal name="BrightnessChanged">
++      <arg type="u" name="percentage_brightness" direction="out"/>
++    </signal>
++  </interface>
++</node>
++
diff --git a/mate-extra/mate-power-manager/files/mate-power-manager-1.8.0-r1-improve-UPower1-support.patch b/mate-extra/mate-power-manager/files/mate-power-manager-1.8.0-r1-improve-UPower1-support.patch
new file mode 100644
index 00000000..d3e9d855
--- /dev/null
+++ b/mate-extra/mate-power-manager/files/mate-power-manager-1.8.0-r1-improve-UPower1-support.patch
@@ -0,0 +1,102 @@
+diff --git a/src/gpm-engine.c b/src/gpm-engine.c
+index e6c6bf2..fe458e3 100644
+--- a/src/gpm-engine.c
++++ b/src/gpm-engine.c
+@@ -82,6 +82,9 @@ G_DEFINE_TYPE (GpmEngine, gpm_engine, G_TYPE_OBJECT)
+ 
+ static UpDevice *gpm_engine_get_composite_device (GpmEngine *engine, UpDevice *original_device);
+ static UpDevice *gpm_engine_update_composite_device (GpmEngine *engine, UpDevice *original_device);
++#if UP_CHECK_VERSION (0, 99, 0)
++static void gpm_engine_device_changed_cb (UpDevice *device, GParamSpec *pspec, GpmEngine *engine);
++#endif
+ 
+ typedef enum {
+ 	GPM_ENGINE_WARNING_NONE = 0,
+@@ -757,6 +760,13 @@ gpm_engine_device_add (GpmEngine *engine, UpDevice *device)
+ 		g_object_get (composite, "state", &state, NULL);
+ 		g_object_set_data (G_OBJECT(composite), "engine-state-old", GUINT_TO_POINTER(state));
+ 	}
++
++#if UP_CHECK_VERSION (0, 99, 0)
++	if (kind == UP_DEVICE_KIND_BATTERY || kind == UP_DEVICE_KIND_UPS || kind == UP_DEVICE_KIND_LINE_POWER)
++		return;
++	g_signal_connect (device, "notify", G_CALLBACK (gpm_engine_device_changed_cb), engine);
++#endif
++
+ }
+ 
+ /**
+@@ -851,19 +861,20 @@ gpm_engine_device_removed_cb (UpClient *client, UpDevice *device, GpmEngine *eng
+  **/
+ static void
+ #if UP_CHECK_VERSION(0, 99, 0)
+-gpm_engine_device_changed_cb (UpClient *client, GParamSpec *pspec, GpmEngine *engine)
+-{
+-	gpm_engine_recalculate_state (engine);
+-}
++gpm_engine_device_changed_cb (UpDevice *device, GParamSpec *pspec, GpmEngine *engine)
+ #else
+ gpm_engine_device_changed_cb (UpClient *client, UpDevice *device, GpmEngine *engine)
++#endif
+ {
++#if !UP_CHECK_VERSION(0, 99, 0)
+ 	UpDeviceKind kind;
++#endif
+ 	UpDeviceState state;
+ 	UpDeviceState state_old;
+ 	GpmEngineWarning warning_old;
+ 	GpmEngineWarning warning;
+ 
++#if !UP_CHECK_VERSION(0, 99, 0)
+ 	/* get device properties */
+ 	g_object_get (device,
+ 		      "kind", &kind,
+@@ -874,6 +885,7 @@ gpm_engine_device_changed_cb (UpClient *client, UpDevice *device, GpmEngine *eng
+ 		egg_debug ("updating because %s changed", up_device_get_object_path (device));
+ 		device = gpm_engine_update_composite_device (engine, device);
+ 	}
++#endif
+ 
+ 	/* get device properties (may be composite) */
+ 	g_object_get (device,
+@@ -917,7 +929,6 @@ gpm_engine_device_changed_cb (UpClient *client, UpDevice *device, GpmEngine *eng
+ 
+ 	gpm_engine_recalculate_state (engine);
+ }
+-#endif
+ 
+ /**
+  * gpm_engine_get_devices:
+@@ -1042,10 +1053,7 @@ gpm_engine_init (GpmEngine *engine)
+ 			  G_CALLBACK (gpm_engine_device_added_cb), engine);
+ 	g_signal_connect (engine->priv->client, "device-removed",
+ 			  G_CALLBACK (gpm_engine_device_removed_cb), engine);
+-#if UP_CHECK_VERSION(0, 99, 0)
+-	g_signal_connect (engine->priv->client, "notify",
+-			  G_CALLBACK (gpm_engine_device_changed_cb), engine);
+-#else
++#if !UP_CHECK_VERSION(0, 99, 0)
+ 	g_signal_connect (engine->priv->client, "device-changed",
+ 			  G_CALLBACK (gpm_engine_device_changed_cb), engine);
+ #endif
+@@ -1075,6 +1083,11 @@ gpm_engine_init (GpmEngine *engine)
+ #endif
+ 
+ 	/* create a fake virtual composite battery */
++#if UP_CHECK_VERSION(0, 99, 0)
++	engine->priv->battery_composite = up_client_get_display_device (engine->priv->client);
++	g_signal_connect (engine->priv->client, "notify",
++			  G_CALLBACK (gpm_engine_device_changed_cb), engine);
++#else
+ 	engine->priv->battery_composite = up_device_new ();
+ 	g_object_set (engine->priv->battery_composite,
+ 		      "kind", UP_DEVICE_KIND_BATTERY,
+@@ -1083,6 +1096,7 @@ gpm_engine_init (GpmEngine *engine)
+ 		      "power-supply", TRUE,
+ 		      "is-present", TRUE,
+ 		      NULL);
++#endif
+ 
+ 	engine->priv->previous_icon = NULL;
+ 	engine->priv->previous_summary = NULL;
+
diff --git a/mate-extra/mate-power-manager/files/mate-power-manager-1.8.0-r1-other-round-of-fixes-for-UPower-0.99-API-changes.patch b/mate-extra/mate-power-manager/files/mate-power-manager-1.8.0-r1-other-round-of-fixes-for-UPower-0.99-API-changes.patch
new file mode 100644
index 00000000..83447294
--- /dev/null
+++ b/mate-extra/mate-power-manager/files/mate-power-manager-1.8.0-r1-other-round-of-fixes-for-UPower-0.99-API-changes.patch
@@ -0,0 +1,217 @@
+diff --git a/src/gpm-engine.c b/src/gpm-engine.c
+index fe458e3..56d19e2 100644
+--- a/src/gpm-engine.c
++++ b/src/gpm-engine.c
+@@ -84,7 +84,29 @@ static UpDevice *gpm_engine_get_composite_device (GpmEngine *engine, UpDevice *o
+ static UpDevice *gpm_engine_update_composite_device (GpmEngine *engine, UpDevice *original_device);
+ #if UP_CHECK_VERSION (0, 99, 0)
+ static void gpm_engine_device_changed_cb (UpDevice *device, GParamSpec *pspec, GpmEngine *engine);
+-#endif
++
++#define GPM_ENGINE_WARNING_NONE UP_DEVICE_LEVEL_NONE
++#define GPM_ENGINE_WARNING_DISCHARGING UP_DEVICE_LEVEL_DISCHARGING
++#define GPM_ENGINE_WARNING_LOW UP_DEVICE_LEVEL_LOW
++#define GPM_ENGINE_WARNING_CRITICAL UP_DEVICE_LEVEL_CRITICAL
++#define GPM_ENGINE_WARNING_ACTION UP_DEVICE_LEVEL_ACTION
++
++/**
++ * gpm_engine_get_warning:
++ *
++ * This gets the possible engine state for the device according to the
++ * policy, which could be per-percent, or per-time.
++ *
++ * Return value: A GpmEngine state, e.g. GPM_ENGINE_WARNING_DISCHARGING
++ **/
++static UpDeviceLevel
++gpm_engine_get_warning (GpmEngine *engine, UpDevice *device)
++{
++	UpDeviceLevel warning;
++	g_object_get (device, "warning-level", &warning, NULL);
++	return warning;
++}
++#else
+ 
+ typedef enum {
+ 	GPM_ENGINE_WARNING_NONE = 0,
+@@ -226,6 +248,7 @@ gpm_engine_get_warning (GpmEngine *engine, UpDevice *device)
+  out:
+ 	return warning_type;
+ }
++#endif
+ 
+ /**
+  * gpm_engine_get_summary:
+@@ -282,12 +305,20 @@ gpm_engine_get_summary (GpmEngine *engine)
+  * Returns the icon
+  **/
+ static gchar *
++#if UP_CHECK_VERSION (0, 99, 0)
++gpm_engine_get_icon_priv (GpmEngine *engine, UpDeviceKind device_kind, UpDeviceLevel warning, gboolean use_state)
++#else
+ gpm_engine_get_icon_priv (GpmEngine *engine, UpDeviceKind device_kind, GpmEngineWarning warning, gboolean use_state)
++#endif
+ {
+ 	guint i;
+ 	GPtrArray *array;
+ 	UpDevice *device;
++#if UP_CHECK_VERSION (0, 99, 0)
++	UpDeviceLevel warning_temp;
++#else
+ 	GpmEngineWarning warning_temp;
++#endif
+ 	UpDeviceKind kind;
+ 	UpDeviceState state;
+ 	gboolean is_present;
+@@ -572,6 +603,9 @@ gpm_engine_device_check_capacity (GpmEngine *engine, UpDevice *device)
+ static UpDevice *
+ gpm_engine_get_composite_device (GpmEngine *engine, UpDevice *original_device)
+ {
++#if UP_CHECK_VERSION (0, 99, 0)
++	return engine->priv->battery_composite;
++#else
+ 	guint battery_devices = 0;
+ 	GPtrArray *array;
+ 	UpDevice *device;
+@@ -601,6 +635,7 @@ gpm_engine_get_composite_device (GpmEngine *engine, UpDevice *original_device)
+ out:
+ 	/* return composite device or original device */
+ 	return device;
++#endif
+ }
+ 
+ /**
+@@ -609,6 +644,18 @@ gpm_engine_get_composite_device (GpmEngine *engine, UpDevice *original_device)
+ static UpDevice *
+ gpm_engine_update_composite_device (GpmEngine *engine, UpDevice *original_device)
+ {
++#if UP_CHECK_VERSION (0, 99, 0)
++	gchar *text;
++
++	text = up_device_to_text (engine->priv->battery_composite);
++	egg_debug ("composite:\n%s", text);
++	g_free (text);
++
++	/* force update of icon */
++	gpm_engine_recalculate_state_icon (engine);
++
++	return engine->priv->battery_composite;
++#else
+ 	guint i;
+ 	gdouble percentage = 0.0;
+ 	gdouble energy = 0.0;
+@@ -720,6 +767,7 @@ gpm_engine_update_composite_device (GpmEngine *engine, UpDevice *original_device
+ out:
+ 	/* return composite device or original device */
+ 	return device;
++#endif
+ }
+ 
+ /**
+@@ -728,7 +776,11 @@ gpm_engine_update_composite_device (GpmEngine *engine, UpDevice *original_device
+ static void
+ gpm_engine_device_add (GpmEngine *engine, UpDevice *device)
+ {
++#if UP_CHECK_VERSION (0, 99, 0)
++	UpDeviceLevel warning;
++#else
+ 	GpmEngineWarning warning;
++#endif
+ 	UpDeviceState state;
+ 	UpDeviceKind kind;
+ 	UpDevice *composite;
+@@ -762,9 +814,9 @@ gpm_engine_device_add (GpmEngine *engine, UpDevice *device)
+ 	}
+ 
+ #if UP_CHECK_VERSION (0, 99, 0)
+-	if (kind == UP_DEVICE_KIND_BATTERY || kind == UP_DEVICE_KIND_UPS || kind == UP_DEVICE_KIND_LINE_POWER)
+-		return;
+ 	g_signal_connect (device, "notify", G_CALLBACK (gpm_engine_device_changed_cb), engine);
++	g_ptr_array_add (engine->priv->array, g_object_ref (device));
++	gpm_engine_recalculate_state (engine);
+ #endif
+ 
+ }
+@@ -820,10 +872,14 @@ gpm_engine_coldplug_idle_cb (GpmEngine *engine)
+ static void
+ gpm_engine_device_added_cb (UpClient *client, UpDevice *device, GpmEngine *engine)
+ {
++#if UP_CHECK_VERSION (0, 99, 0)
++	gpm_engine_device_add (engine, device);
++#else
+ 	/* add to list */
+ 	g_ptr_array_add (engine->priv->array, g_object_ref (device));
+ 
+ 	gpm_engine_recalculate_state (engine);
++#endif
+ }
+ 
+ /**
+@@ -866,15 +922,17 @@ gpm_engine_device_changed_cb (UpDevice *device, GParamSpec *pspec, GpmEngine *en
+ gpm_engine_device_changed_cb (UpClient *client, UpDevice *device, GpmEngine *engine)
+ #endif
+ {
+-#if !UP_CHECK_VERSION(0, 99, 0)
+ 	UpDeviceKind kind;
+-#endif
+ 	UpDeviceState state;
+ 	UpDeviceState state_old;
++#if UP_CHECK_VERSION(0, 99, 0)
++	UpDeviceLevel warning_old;
++	UpDeviceLevel warning;
++#else
+ 	GpmEngineWarning warning_old;
+ 	GpmEngineWarning warning;
++#endif
+ 
+-#if !UP_CHECK_VERSION(0, 99, 0)
+ 	/* get device properties */
+ 	g_object_get (device,
+ 		      "kind", &kind,
+@@ -885,7 +943,6 @@ gpm_engine_device_changed_cb (UpClient *client, UpDevice *device, GpmEngine *eng
+ 		egg_debug ("updating because %s changed", up_device_get_object_path (device));
+ 		device = gpm_engine_update_composite_device (engine, device);
+ 	}
+-#endif
+ 
+ 	/* get device properties (may be composite) */
+ 	g_object_get (device,
+@@ -1070,22 +1127,10 @@ gpm_engine_init (GpmEngine *engine)
+ 	g_signal_connect (engine->priv->phone, "device-refresh",
+ 			  G_CALLBACK (phone_device_refresh_cb), engine);
+ 
+-#if UP_CHECK_VERSION(0, 99, 0)
+-	/* coldplug */
+-	array = up_client_get_devices(engine->priv->client);
+-	if (array) {
+-		for (i = 0; i < array->len; i++) {
+-			UpDevice *device = g_ptr_array_index (array, i);
+-			gpm_engine_device_added_cb(engine->priv->client, device, engine);
+-		}
+-		g_ptr_array_free (array, TRUE);
+-	}
+-#endif
+-
+ 	/* create a fake virtual composite battery */
+ #if UP_CHECK_VERSION(0, 99, 0)
+ 	engine->priv->battery_composite = up_client_get_display_device (engine->priv->client);
+-	g_signal_connect (engine->priv->client, "notify",
++	g_signal_connect (engine->priv->battery_composite, "notify",
+ 			  G_CALLBACK (gpm_engine_device_changed_cb), engine);
+ #else
+ 	engine->priv->battery_composite = up_device_new ();
+diff --git a/src/gpm-manager.c b/src/gpm-manager.c
+index df84cac..09bd0c0 100644
+--- a/src/gpm-manager.c
++++ b/src/gpm-manager.c
+@@ -1858,7 +1858,9 @@ gpm_manager_init (GpmManager *manager)
+ 			  G_CALLBACK (gpm_manager_settings_changed_cb), manager);
+ 	manager->priv->client = up_client_new ();
+ #if UP_CHECK_VERSION(0, 99, 0)
+-	g_signal_connect (manager->priv->client, "notify",
++	g_signal_connect (manager->priv->client, "notify::lid-is-closed",
++			  G_CALLBACK (gpm_manager_client_changed_cb), manager);
++	g_signal_connect (manager->priv->client, "notify::on-battery",
+ 			  G_CALLBACK (gpm_manager_client_changed_cb), manager);
+ #else
+ 	g_signal_connect (manager->priv->client, "changed",
+
diff --git a/mate-extra/mate-power-manager/files/mate-power-manager-1.8.0-r1-port-to-upower-0.99-API.patch b/mate-extra/mate-power-manager/files/mate-power-manager-1.8.0-r1-port-to-upower-0.99-API.patch
new file mode 100644
index 00000000..72025758
--- /dev/null
+++ b/mate-extra/mate-power-manager/files/mate-power-manager-1.8.0-r1-port-to-upower-0.99-API.patch
@@ -0,0 +1,390 @@
+diff --git a/src/gpm-backlight.c b/src/gpm-backlight.c
+index 1f1d834..d2938a4 100644
+--- a/src/gpm-backlight.c
++++ b/src/gpm-backlight.c
+@@ -410,7 +410,11 @@ gpm_settings_key_changed_cb (GSettings *settings, const gchar *key, GpmBacklight
+  * Does the actions when the ac power source is inserted/removed.
+  **/
+ static void
++#if UP_CHECK_VERSION(0, 99, 0)
++gpm_backlight_client_changed_cb (UpClient *client, GParamSpec *pspec, GpmBacklight *backlight)
++#else
+ gpm_backlight_client_changed_cb (UpClient *client, GpmBacklight *backlight)
++#endif
+ {
+ 	gpm_backlight_brightness_evaluate_and_set (backlight, FALSE, TRUE);
+ }
+@@ -727,8 +731,13 @@ gpm_backlight_init (GpmBacklight *backlight)
+ 
+ 	/* we use up_client for the ac-adapter-changed signal */
+ 	backlight->priv->client = up_client_new ();
++#if UP_CHECK_VERSION(0, 99, 0)
++	g_signal_connect (backlight->priv->client, "notify",
++			  G_CALLBACK (gpm_backlight_client_changed_cb), backlight);
++#else
+ 	g_signal_connect (backlight->priv->client, "changed",
+ 			  G_CALLBACK (gpm_backlight_client_changed_cb), backlight);
++#endif
+ 
+ 	/* gets caps */
+ 	backlight->priv->can_dim = gpm_brightness_has_hw (backlight->priv->brightness);
+diff --git a/src/gpm-button.c b/src/gpm-button.c
+index 1e38173..b331cf6 100644
+--- a/src/gpm-button.c
++++ b/src/gpm-button.c
+@@ -324,7 +324,11 @@ gpm_button_reset_time (GpmButton *button)
+  * gpm_button_client_changed_cb
+  **/
+ static void
++#if UP_CHECK_VERSION(0, 99, 0)
++gpm_button_client_changed_cb (UpClient *client, GParamSpec *pspec, GpmButton *button)
++#else
+ gpm_button_client_changed_cb (UpClient *client, GpmButton *button)
++#endif
+ {
+ 	gboolean lid_is_closed;
+ 
+@@ -363,9 +367,13 @@ gpm_button_init (GpmButton *button)
+ 
+ 	button->priv->client = up_client_new ();
+ 	button->priv->lid_is_closed = up_client_get_lid_is_closed (button->priv->client);
++#if UP_CHECK_VERSION(0, 99, 0)
++	g_signal_connect (button->priv->client, "notify",
++			  G_CALLBACK (gpm_button_client_changed_cb), button);
++#else
+ 	g_signal_connect (button->priv->client, "changed",
+ 			  G_CALLBACK (gpm_button_client_changed_cb), button);
+-
++#endif
+ 	/* register the brightness keys */
+ 	gpm_button_xevent_key (button, XF86XK_PowerOff, GPM_BUTTON_POWER);
+ #ifdef HAVE_XF86XK_SUSPEND
+diff --git a/src/gpm-control.c b/src/gpm-control.c
+index ec50136..0562d38 100644
+--- a/src/gpm-control.c
++++ b/src/gpm-control.c
+@@ -289,10 +289,11 @@ gpm_control_suspend (GpmControl *control, GError **error)
+ 		}
+ 		g_object_unref(proxy);
+ 	}
++#if !UP_CHECK_VERSION(0, 99, 0)
+ 	else {
+ 		ret = up_client_suspend_sync (control->priv->client, NULL, error);
+ 	}
+-
++#endif
+ 	egg_debug ("emitting resume");
+ 	g_signal_emit (control, signals [RESUME], 0, GPM_CONTROL_ACTION_SUSPEND);
+ 
+@@ -399,10 +400,11 @@ gpm_control_hibernate (GpmControl *control, GError **error)
+ 			ret = TRUE;
+ 		}
+ 	}
++#if !UP_CHECK_VERSION(0, 99, 0)
+ 	else {
+ 		ret = up_client_hibernate_sync (control->priv->client, NULL, error);
+ 	}
+-
++#endif
+ 	egg_debug ("emitting resume");
+ 	g_signal_emit (control, signals [RESUME], 0, GPM_CONTROL_ACTION_HIBERNATE);
+ 
+diff --git a/src/gpm-engine.c b/src/gpm-engine.c
+index 96a043e..e6c6bf2 100644
+--- a/src/gpm-engine.c
++++ b/src/gpm-engine.c
+@@ -768,12 +768,14 @@ gpm_engine_coldplug_idle_cb (GpmEngine *engine)
+ 	guint i;
+ 	GPtrArray *array = NULL;
+ 	UpDevice *device;
++#if !UP_CHECK_VERSION(0, 99, 0)
+ 	gboolean ret;
+ 	GError *error = NULL;
++#endif
+ 
+ 	g_return_val_if_fail (engine != NULL, FALSE);
+ 	g_return_val_if_fail (GPM_IS_ENGINE (engine), FALSE);
+-
++#if !UP_CHECK_VERSION(0, 99, 0)
+ 	/* get devices from UPower */
+ 	ret = up_client_enumerate_devices_sync (engine->priv->client, NULL, &error);
+ 	if (!ret) {
+@@ -781,7 +783,7 @@ gpm_engine_coldplug_idle_cb (GpmEngine *engine)
+ 		g_error_free (error);
+ 		goto out;
+ 	}
+-
++#endif
+ 	/* connected mobile phones */
+ 	gpm_phone_coldplug (engine->priv->phone);
+ 
+@@ -793,7 +795,9 @@ gpm_engine_coldplug_idle_cb (GpmEngine *engine)
+ 		device = g_ptr_array_index (array, i);
+ 		gpm_engine_device_add (engine, device);
+ 	}
++#if !UP_CHECK_VERSION(0, 99, 0)
+ out:
++#endif
+ 	if (array != NULL)
+ 		g_ptr_array_unref (array);
+ 	/* never repeat */
+@@ -816,6 +820,22 @@ gpm_engine_device_added_cb (UpClient *client, UpDevice *device, GpmEngine *engin
+  * gpm_engine_device_removed_cb:
+  **/
+ static void
++#if UP_CHECK_VERSION(0, 99, 0)
++gpm_engine_device_removed_cb (UpClient *client, const char *object_path, GpmEngine *engine)
++{
++	guint i;
++
++	for (i = 0; i < engine->priv->array->len; i++) {
++		UpDevice *device = g_ptr_array_index (engine->priv->array, i);
++
++		if (g_strcmp0 (object_path, up_device_get_object_path (device)) == 0) {
++			g_ptr_array_remove_index (engine->priv->array, i);
++			break;
++		}
++	}
++	gpm_engine_recalculate_state (engine);
++}
++#else
+ gpm_engine_device_removed_cb (UpClient *client, UpDevice *device, GpmEngine *engine)
+ {
+ 	gboolean ret;
+@@ -824,12 +844,18 @@ gpm_engine_device_removed_cb (UpClient *client, UpDevice *device, GpmEngine *eng
+ 		return;
+ 	gpm_engine_recalculate_state (engine);
+ }
+-
++#endif
+ 
+ /**
+  * gpm_engine_device_changed_cb:
+  **/
+ static void
++#if UP_CHECK_VERSION(0, 99, 0)
++gpm_engine_device_changed_cb (UpClient *client, GParamSpec *pspec, GpmEngine *engine)
++{
++	gpm_engine_recalculate_state (engine);
++}
++#else
+ gpm_engine_device_changed_cb (UpClient *client, UpDevice *device, GpmEngine *engine)
+ {
+ 	UpDeviceKind kind;
+@@ -891,6 +917,7 @@ gpm_engine_device_changed_cb (UpClient *client, UpDevice *device, GpmEngine *eng
+ 
+ 	gpm_engine_recalculate_state (engine);
+ }
++#endif
+ 
+ /**
+  * gpm_engine_get_devices:
+@@ -1003,7 +1030,10 @@ phone_device_refresh_cb (GpmPhone *phone, guint idx, GpmEngine *engine)
+ static void
+ gpm_engine_init (GpmEngine *engine)
+ {
+-
++#if UP_CHECK_VERSION(0, 99, 0)
++	GPtrArray *array = NULL;
++	guint i;
++#endif
+ 	engine->priv = GPM_ENGINE_GET_PRIVATE (engine);
+ 
+ 	engine->priv->array = g_ptr_array_new_with_free_func (g_object_unref);
+@@ -1012,8 +1042,13 @@ gpm_engine_init (GpmEngine *engine)
+ 			  G_CALLBACK (gpm_engine_device_added_cb), engine);
+ 	g_signal_connect (engine->priv->client, "device-removed",
+ 			  G_CALLBACK (gpm_engine_device_removed_cb), engine);
++#if UP_CHECK_VERSION(0, 99, 0)
++	g_signal_connect (engine->priv->client, "notify",
++			  G_CALLBACK (gpm_engine_device_changed_cb), engine);
++#else
+ 	g_signal_connect (engine->priv->client, "device-changed",
+ 			  G_CALLBACK (gpm_engine_device_changed_cb), engine);
++#endif
+ 
+ 	engine->priv->settings = g_settings_new (GPM_SETTINGS_SCHEMA);
+ 	g_signal_connect (engine->priv->settings, "changed",
+@@ -1027,6 +1062,18 @@ gpm_engine_init (GpmEngine *engine)
+ 	g_signal_connect (engine->priv->phone, "device-refresh",
+ 			  G_CALLBACK (phone_device_refresh_cb), engine);
+ 
++#if UP_CHECK_VERSION(0, 99, 0)
++	/* coldplug */
++	array = up_client_get_devices(engine->priv->client);
++	if (array) {
++		for (i = 0; i < array->len; i++) {
++			UpDevice *device = g_ptr_array_index (array, i);
++			gpm_engine_device_added_cb(engine->priv->client, device, engine);
++		}
++		g_ptr_array_free (array, TRUE);
++	}
++#endif
++
+ 	/* create a fake virtual composite battery */
+ 	engine->priv->battery_composite = up_device_new ();
+ 	g_object_set (engine->priv->battery_composite,
+diff --git a/src/gpm-kbd-backlight.c b/src/gpm-kbd-backlight.c
+index a439e94..3a0f6e6 100644
+--- a/src/gpm-kbd-backlight.c
++++ b/src/gpm-kbd-backlight.c
+@@ -486,6 +486,9 @@ gpm_kbd_backlight_control_resume_cb (GpmControl *control,
+  **/
+ static void
+ gpm_kbd_backlight_client_changed_cb (UpClient *client,
++#if UP_CHECK_VERSION(0, 99, 0)
++                    GParamSpec *pspec,
++#endif
+                     GpmKbdBacklight *backlight)
+ {
+    gpm_kbd_backlight_evaluate_power_source_and_set (backlight);
+@@ -755,8 +758,13 @@ gpm_kbd_backlight_init (GpmKbdBacklight *backlight)
+ 
+    /* Use upower for ac changed signal */
+    backlight->priv->client = up_client_new ();
++#if UP_CHECK_VERSION(0, 99, 0)
++   g_signal_connect (backlight->priv->client, "notify",
++             G_CALLBACK (gpm_kbd_backlight_client_changed_cb), backlight);
++#else
+    g_signal_connect (backlight->priv->client, "changed",
+              G_CALLBACK (gpm_kbd_backlight_client_changed_cb), backlight);
++#endif
+ 
+     backlight->priv->settings = g_settings_new (GPM_SETTINGS_SCHEMA);
+ 	//g_signal_connect (backlight->priv->settings, "changed", G_CALLBACK (gpm_settings_key_changed_cb), backlight);
+diff --git a/src/gpm-manager.c b/src/gpm-manager.c
+index c4d0530..df84cac 100644
+--- a/src/gpm-manager.c
++++ b/src/gpm-manager.c
+@@ -971,7 +971,11 @@ gpm_manager_get_spindown_timeout (GpmManager *manager)
+  * gpm_manager_client_changed_cb:
+  **/
+ static void
++#if UP_CHECK_VERSION(0, 99, 0)
++gpm_manager_client_changed_cb (UpClient *client, GParamSpec *pspec, GpmManager *manager)
++#else
+ gpm_manager_client_changed_cb (UpClient *client, GpmManager *manager)
++#endif
+ {
+ 	gboolean event_when_closed;
+ 	gint timeout;
+@@ -1853,8 +1857,13 @@ gpm_manager_init (GpmManager *manager)
+ 	g_signal_connect (manager->priv->settings, "changed",
+ 			  G_CALLBACK (gpm_manager_settings_changed_cb), manager);
+ 	manager->priv->client = up_client_new ();
++#if UP_CHECK_VERSION(0, 99, 0)
++	g_signal_connect (manager->priv->client, "notify",
++			  G_CALLBACK (gpm_manager_client_changed_cb), manager);
++#else
+ 	g_signal_connect (manager->priv->client, "changed",
+ 			  G_CALLBACK (gpm_manager_client_changed_cb), manager);
++#endif
+ 
+ 	/* use libmatenotify */
+ 	notify_init (GPM_NAME);
+diff --git a/src/gpm-prefs-core.c b/src/gpm-prefs-core.c
+index 7a2662d..6abb792 100644
+--- a/src/gpm-prefs-core.c
++++ b/src/gpm-prefs-core.c
+@@ -811,7 +811,9 @@ gpm_prefs_init (GpmPrefs *prefs)
+ 	UpDevice *device;
+ 	UpDeviceKind kind;
+ 	GpmBrightness *brightness;
++#if !UP_CHECK_VERSION(0, 99, 0)
+ 	gboolean ret;
++#endif
+ 	guint i;
+ 
+ 	GDBusProxy *proxy;
+@@ -897,9 +899,11 @@ gpm_prefs_init (GpmPrefs *prefs)
+ 	else {
+ 		/* are we allowed to shutdown? */
+ 		egg_console_kit_can_stop (prefs->priv->console, &prefs->priv->can_shutdown, NULL);
++#if !UP_CHECK_VERSION(0, 99, 0)
+ 		/* get values from UpClient */
+ 		prefs->priv->can_suspend = up_client_get_can_suspend (prefs->priv->client);
+ 		prefs->priv->can_hibernate = up_client_get_can_hibernate (prefs->priv->client);
++#endif
+ 	}
+ 
+ 	if (LOGIND_RUNNING()) {
+@@ -953,14 +957,14 @@ gpm_prefs_init (GpmPrefs *prefs)
+ 	brightness = gpm_brightness_new ();
+ 	prefs->priv->has_lcd = gpm_brightness_has_hw (brightness);
+ 	g_object_unref (brightness);
+-
++#if !UP_CHECK_VERSION(0, 99, 0)
+ 	/* get device list */
+ 	ret = up_client_enumerate_devices_sync (prefs->priv->client, NULL, &error);
+ 	if (!ret) {
+ 		egg_warning ("failed to get device list: %s", error->message);
+ 		g_error_free (error);
+ 	}
+-
++#endif
+ 	devices = up_client_get_devices (prefs->priv->client);
+ 	for (i=0; i<devices->len; i++) {
+ 		device = g_ptr_array_index (devices, i);
+diff --git a/src/gpm-statistics.c b/src/gpm-statistics.c
+index 98b5632..13489dc 100644
+--- a/src/gpm-statistics.c
++++ b/src/gpm-statistics.c
+@@ -1236,6 +1236,12 @@ gpm_stats_device_added_cb (UpClient *client, UpDevice *device, gpointer user_dat
+  * gpm_stats_device_changed_cb:
+  **/
+ static void
++#if UP_CHECK_VERSION(0, 99, 0)
++gpm_stats_device_changed_cb (UpClient *client, GParamSpec *pspec, gpointer user_data)
++{
++	gpm_stats_button_update_ui();
++}
++#else
+ gpm_stats_device_changed_cb (UpClient *client, UpDevice *device, gpointer user_data)
+ {
+ 	const gchar *object_path;
+@@ -1246,6 +1252,7 @@ gpm_stats_device_changed_cb (UpClient *client, UpDevice *device, gpointer user_d
+ 	if (g_strcmp0 (current_device, object_path) == 0)
+ 		gpm_stats_update_info_data (device);
+ }
++#endif
+ 
+ /**
+  * gpm_stats_device_removed_cb:
+@@ -1794,11 +1801,12 @@ main (int argc, char *argv[])
+ 
+ 	wakeups = up_wakeups_new ();
+ 	g_signal_connect (wakeups, "data-changed", G_CALLBACK (gpm_stats_data_changed_cb), NULL);
+-
++#if !UP_CHECK_VERSION(0, 99, 0)
+ 	/* coldplug */
+ 	ret = up_client_enumerate_devices_sync (client, NULL, NULL);
+ 	if (!ret)
+ 		goto out;
++#endif
+ 	devices = up_client_get_devices (client);
+ 
+ 	/* add devices in visually pleasing order */
+@@ -1814,7 +1822,11 @@ main (int argc, char *argv[])
+ 	/* connect now the coldplug is done */
+ 	g_signal_connect (client, "device-added", G_CALLBACK (gpm_stats_device_added_cb), NULL);
+ 	g_signal_connect (client, "device-removed", G_CALLBACK (gpm_stats_device_removed_cb), NULL);
++#if UP_CHECK_VERSION(0, 99, 0)
++	g_signal_connect (client, "notify", G_CALLBACK (gpm_stats_device_changed_cb), NULL);
++#else
+ 	g_signal_connect (client, "device-changed", G_CALLBACK (gpm_stats_device_changed_cb), NULL);
++#endif
+ 
+ 	/* set current device */
+ 	if (devices->len > 0) {
+@@ -1854,8 +1866,9 @@ main (int argc, char *argv[])
+ 	gtk_widget_show (widget);
+ 
+ 	gtk_main ();
+-
++#if !UP_CHECK_VERSION(0, 99, 0)
+ out:
++#endif
+ 	g_object_unref (settings);
+ 	g_object_unref (client);
+ 	g_object_unref (wakeups);
+
diff --git a/mate-extra/mate-power-manager/files/mate-power-manager-1.8.0-r1-remove-battery-recall-logic.patch b/mate-extra/mate-power-manager/files/mate-power-manager-1.8.0-r1-remove-battery-recall-logic.patch
new file mode 100644
index 00000000..6d462b93
--- /dev/null
+++ b/mate-extra/mate-power-manager/files/mate-power-manager-1.8.0-r1-remove-battery-recall-logic.patch
@@ -0,0 +1,263 @@
+diff --git a/data/org.mate.power-manager.gschema.xml.in b/data/org.mate.power-manager.gschema.xml.in
+index adecce0..ca009b5 100644
+--- a/data/org.mate.power-manager.gschema.xml.in
++++ b/data/org.mate.power-manager.gschema.xml.in
+@@ -211,11 +211,6 @@
+       <_summary>Seconds of inactivity to spin down when on battery</_summary>
+       <_description>The number of seconds of inactivity to spin down the disks when on battery power.</_description>
+     </key>
+-    <key name="notify-perhaps-recall" type="b">
+-      <default>true</default>
+-      <_summary>If we should show the recalled battery warning for a broken battery</_summary>
+-      <_description>If we should show the recalled battery warning for a broken battery. Set this to false only if you know your battery is okay.</_description>
+-    </key>
+     <key name="notify-low-capacity" type="b">
+       <default>true</default>
+       <_summary>If we should show the low capacity warning for a broken battery</_summary>
+diff --git a/src/gpm-common.h b/src/gpm-common.h
+index ef20f88..303bdd1 100644
+--- a/src/gpm-common.h
++++ b/src/gpm-common.h
+@@ -98,7 +98,6 @@ G_BEGIN_DECLS
+ #define GPM_SETTINGS_SPINDOWN_TIMEOUT_BATT		"spindown-timeout-battery"
+ 
+ /* notify */
+-#define GPM_SETTINGS_NOTIFY_PERHAPS_RECALL		"notify-perhaps-recall"
+ #define GPM_SETTINGS_NOTIFY_LOW_CAPACITY		"notify-low-capacity"
+ #define GPM_SETTINGS_NOTIFY_DISCHARGING			"notify-discharging"
+ #define GPM_SETTINGS_NOTIFY_FULLY_CHARGED		"notify-fully-charged"
+diff --git a/src/gpm-engine.c b/src/gpm-engine.c
+index 0f9d0c1..96a043e 100644
+--- a/src/gpm-engine.c
++++ b/src/gpm-engine.c
+@@ -72,7 +72,6 @@ enum {
+ 	CHARGE_ACTION,
+ 	DISCHARGING,
+ 	LOW_CAPACITY,
+-	PERHAPS_RECALL,
+ 	LAST_SIGNAL
+ };
+ 
+@@ -761,42 +760,6 @@ gpm_engine_device_add (GpmEngine *engine, UpDevice *device)
+ }
+ 
+ /**
+- * gpm_engine_check_recall:
+- **/
+-static gboolean
+-gpm_engine_check_recall (GpmEngine *engine, UpDevice *device)
+-{
+-	UpDeviceKind kind;
+-	gboolean recall_notice = FALSE;
+-	gchar *recall_vendor = NULL;
+-	gchar *recall_url = NULL;
+-
+-	/* get device properties */
+-	g_object_get (device,
+-		      "kind", &kind,
+-		      "recall-notice", &recall_notice,
+-		      "recall-vendor", &recall_vendor,
+-		      "recall-url", &recall_url,
+-		      NULL);
+-
+-	/* not battery */
+-	if (kind != UP_DEVICE_KIND_BATTERY)
+-		goto out;
+-
+-	/* no recall data */
+-	if (!recall_notice)
+-		goto out;
+-
+-	/* emit signal for manager */
+-	egg_debug ("** EMIT: perhaps-recall");
+-	g_signal_emit (engine, signals [PERHAPS_RECALL], 0, device, recall_vendor, recall_url);
+-out:
+-	g_free (recall_vendor);
+-	g_free (recall_url);
+-	return recall_notice;
+-}
+-
+-/**
+  * gpm_engine_coldplug_idle_cb:
+  **/
+ static gboolean
+@@ -829,7 +792,6 @@ gpm_engine_coldplug_idle_cb (GpmEngine *engine)
+ 	for (i=0;i<array->len;i++) {
+ 		device = g_ptr_array_index (array, i);
+ 		gpm_engine_device_add (engine, device);
+-		gpm_engine_check_recall (engine, device);
+ 	}
+ out:
+ 	if (array != NULL)
+@@ -846,7 +808,6 @@ gpm_engine_device_added_cb (UpClient *client, UpDevice *device, GpmEngine *engin
+ {
+ 	/* add to list */
+ 	g_ptr_array_add (engine->priv->array, g_object_ref (device));
+-	gpm_engine_check_recall (engine, device);
+ 
+ 	gpm_engine_recalculate_state (engine);
+ }
+@@ -1134,14 +1095,6 @@ gpm_engine_class_init (GpmEngineClass *klass)
+ 			      G_STRUCT_OFFSET (GpmEngineClass, low_capacity),
+ 			      NULL, NULL, g_cclosure_marshal_VOID__POINTER,
+ 			      G_TYPE_NONE, 1, G_TYPE_POINTER);
+-	signals [PERHAPS_RECALL] =
+-		g_signal_new ("perhaps-recall",
+-			      G_TYPE_FROM_CLASS (object_class),
+-			      G_SIGNAL_RUN_LAST,
+-			      G_STRUCT_OFFSET (GpmEngineClass, perhaps_recall),
+-			      NULL, NULL, gpm_marshal_VOID__POINTER_STRING_STRING,
+-			      G_TYPE_NONE,
+-			      3, G_TYPE_POINTER, G_TYPE_STRING, G_TYPE_STRING);
+ 	signals [FULLY_CHARGED] =
+ 		g_signal_new ("fully-charged",
+ 			      G_TYPE_FROM_CLASS (object_class),
+diff --git a/src/gpm-engine.h b/src/gpm-engine.h
+index be1ccd6..43f8956 100644
+--- a/src/gpm-engine.h
++++ b/src/gpm-engine.h
+@@ -49,10 +49,6 @@ typedef struct
+ 						 gchar		*icon);
+ 	void		(* summary_changed)	(GpmEngine	*engine,
+ 						 gchar		*status);
+-	void		(* perhaps_recall)	(GpmEngine	*engine,
+-						 UpDevice	*device,
+-						 const gchar	*oem_vendor,
+-						 const gchar	*website);
+ 	void		(* low_capacity)	(GpmEngine	*engine,
+ 						 UpDevice	*device);
+ 	void		(* charge_low)		(GpmEngine	*engine,
+diff --git a/src/gpm-manager.c b/src/gpm-manager.c
+index 6ca9dea..c4d0530 100644
+--- a/src/gpm-manager.c
++++ b/src/gpm-manager.c
+@@ -68,7 +68,6 @@
+ static void     gpm_manager_finalize	(GObject	 *object);
+ 
+ #define GPM_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GPM_TYPE_MANAGER, GpmManagerPrivate))
+-#define GPM_MANAGER_RECALL_DELAY		30 /* seconds */
+ #define GPM_MANAGER_NOTIFY_TIMEOUT_NEVER	0 /* ms */
+ #define GPM_MANAGER_NOTIFY_TIMEOUT_SHORT	10 * 1000 /* ms */
+ #define GPM_MANAGER_NOTIFY_TIMEOUT_LONG		30 * 1000 /* ms */
+@@ -1092,111 +1091,6 @@ gpm_manager_settings_changed_cb (GSettings *settings, const gchar *key, GpmManag
+ }
+ 
+ /**
+- * gpm_manager_perhaps_recall_response_cb:
+- */
+-static void
+-gpm_manager_perhaps_recall_response_cb (GtkDialog *dialog, gint response_id, GpmManager *manager)
+-{
+-	GdkScreen *screen;
+-	GtkWidget *dialog_error;
+-	GError *error = NULL;
+-	gboolean ret;
+-	const gchar *website;
+-
+-	/* don't show this again */
+-	if (response_id == GTK_RESPONSE_CANCEL) {
+-		g_settings_set_boolean (manager->priv->settings, GPM_SETTINGS_NOTIFY_PERHAPS_RECALL, FALSE);
+-		goto out;
+-	}
+-
+-	/* visit recall website */
+-	if (response_id == GTK_RESPONSE_OK) {
+-		screen = gdk_screen_get_default();
+-		website = (const gchar *) g_object_get_data (G_OBJECT (manager), "recall-oem-website");
+-		ret = gtk_show_uri (screen, website, gtk_get_current_event_time (), &error);
+-		if (!ret) {
+-			dialog_error = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL, GTK_MESSAGE_INFO, GTK_BUTTONS_OK,
+-							       "Failed to show url %s", error->message);
+-			gtk_dialog_run (GTK_DIALOG (dialog_error));
+-			g_error_free (error);
+-		}
+-		goto out;
+-	}
+-out:
+-	gtk_widget_destroy (GTK_WIDGET (dialog));
+-	return;
+-}
+-
+-/**
+- * gpm_manager_perhaps_recall_delay_cb:
+- */
+-static gboolean
+-gpm_manager_perhaps_recall_delay_cb (GpmManager *manager)
+-{
+-	const gchar *oem_vendor;
+-	gchar *title = NULL;
+-	gchar *message = NULL;
+-	GtkWidget *dialog;
+-
+-	oem_vendor = (const gchar *) g_object_get_data (G_OBJECT (manager), "recall-oem-vendor");
+-
+-	/* TRANSLATORS: the battery may be recalled by it's vendor */
+-	title = g_strdup_printf ("%s: %s", GPM_NAME, _("Battery may be recalled"));
+-	message = g_strdup_printf (_("A battery in your computer may have been "
+-				     "recalled by %s and you may be at risk.\n\n"
+-				     "For more information visit the battery recall website."), oem_vendor);
+-	dialog = gtk_message_dialog_new_with_markup (NULL, GTK_DIALOG_DESTROY_WITH_PARENT,
+-						     GTK_MESSAGE_INFO, GTK_BUTTONS_CLOSE,
+-						     "<span size='larger'><b>%s</b></span>", title);
+-
+-	gtk_message_dialog_format_secondary_markup (GTK_MESSAGE_DIALOG (dialog), "%s", message);
+-
+-	/* TRANSLATORS: button text, visit the manufacturers recall website */
+-	gtk_dialog_add_button (GTK_DIALOG (dialog), _("Visit recall website"), GTK_RESPONSE_OK);
+-
+-	/* TRANSLATORS: button text, do not show this bubble again */
+-	gtk_dialog_add_button (GTK_DIALOG (dialog), _("Do not show me this again"), GTK_RESPONSE_CANCEL);
+-
+-	/* wait async for response */
+-	gtk_widget_show (dialog);
+-	g_signal_connect (dialog, "response", G_CALLBACK (gpm_manager_perhaps_recall_response_cb), manager);
+-
+-	g_free (title);
+-	g_free (message);
+-
+-	/* never repeat */
+-	return FALSE;
+-}
+-
+-/**
+- * gpm_manager_engine_perhaps_recall_cb:
+- */
+-static void
+-gpm_manager_engine_perhaps_recall_cb (GpmEngine *engine, UpDevice *device, gchar *oem_vendor, gchar *website, GpmManager *manager)
+-{
+-	gboolean ret;
+-
+-	/* don't show when running under GDM */
+-	if (g_getenv ("RUNNING_UNDER_GDM") != NULL) {
+-		egg_debug ("running under gdm, so no notification");
+-		return;
+-	}
+-
+-	/* already shown, and dismissed */
+-	ret = g_settings_get_boolean (manager->priv->settings, GPM_SETTINGS_NOTIFY_PERHAPS_RECALL);
+-	if (!ret) {
+-		egg_debug ("Gsettings prevents notification: %s", GPM_SETTINGS_NOTIFY_PERHAPS_RECALL);
+-		return;
+-	}
+-
+-	g_object_set_data_full (G_OBJECT (manager), "recall-oem-vendor", (gpointer) g_strdup (oem_vendor), (GDestroyNotify) g_free);
+-	g_object_set_data_full (G_OBJECT (manager), "recall-oem-website", (gpointer) g_strdup (website), (GDestroyNotify) g_free);
+-
+-	/* delay by a few seconds so the panel can load */
+-	g_timeout_add_seconds (GPM_MANAGER_RECALL_DELAY, (GSourceFunc) gpm_manager_perhaps_recall_delay_cb, manager);
+-}
+-
+-/**
+  * gpm_manager_engine_icon_changed_cb:
+  */
+ static void
+@@ -2023,8 +1917,6 @@ gpm_manager_init (GpmManager *manager)
+ 	gpm_manager_sync_policy_sleep (manager);
+ 
+ 	manager->priv->engine = gpm_engine_new ();
+-	g_signal_connect (manager->priv->engine, "perhaps-recall",
+-			  G_CALLBACK (gpm_manager_engine_perhaps_recall_cb), manager);
+ 	g_signal_connect (manager->priv->engine, "low-capacity",
+ 			  G_CALLBACK (gpm_manager_engine_low_capacity_cb), manager);
+ 	g_signal_connect (manager->priv->engine, "icon-changed",
+
diff --git a/mate-extra/mate-power-manager/mate-power-manager-1.8.0-r1.ebuild b/mate-extra/mate-power-manager/mate-power-manager-1.8.0-r1.ebuild
new file mode 100644
index 00000000..b7eacc84
--- /dev/null
+++ b/mate-extra/mate-power-manager/mate-power-manager-1.8.0-r1.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mate-extra/mate-power-manager/mate-power-manager-1.8.0-r1.ebuild,v 1.7 2014/09/19 17:04:21 ssuominen Exp $
+
+EAPI="5"
+
+GCONF_DEBUG="no"
+
+inherit autotools gnome2 versionator
+
+MATE_BRANCH="$(get_version_component_range 1-2)"
+
+SRC_URI="http://pub.mate-desktop.org/releases/${MATE_BRANCH}/${P}.tar.xz"
+DESCRIPTION="A session daemon for MATE that makes it easy to manage your laptop or desktop system"
+HOMEPAGE="http://mate-desktop.org"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+IUSE="+applet gnome-keyring man policykit test unique"
+
+# Interactive testsuite.
+RESTRICT="test"
+
+COMMON_DEPEND="app-text/rarian:0
+	>=dev-libs/dbus-glib-0.70:0
+	>=dev-libs/glib-2.13:2
+	>=media-libs/libcanberra-0.10:0[gtk]
+	>=sys-apps/dbus-1:0
+	>=sys-power/upower-0.9.23
+	>=x11-apps/xrandr-1.2:0
+	>=x11-libs/cairo-1:0
+	>=x11-libs/gdk-pixbuf-2.11:2
+	>=x11-libs/gtk+-2.17.7:2
+	x11-libs/libX11:0
+	x11-libs/libXext:0
+	x11-libs/libXrandr:0
+	>=x11-libs/libnotify-0.7:0
+	x11-libs/pango:0
+	applet? ( >=mate-base/mate-panel-1.6:0 )
+	gnome-keyring? ( >=gnome-base/gnome-keyring-3:0 )
+	unique? ( >=dev-libs/libunique-0.9.4:1 )"
+
+RDEPEND="${COMMON_DEPEND}
+	policykit? ( >=mate-extra/mate-polkit-1.6:0 )"
+
+DEPEND="${COMMON_DEPEND}
+	app-text/docbook-xml-dtd:4.3
+	>=app-text/scrollkeeper-dtd-1:1.0
+	app-text/yelp-tools:0
+	>=dev-util/intltool-0.35:*
+	x11-proto/randrproto:0
+	>=x11-proto/xproto-7.0.15:0
+	sys-devel/gettext:*
+	virtual/pkgconfig:*
+	man? ( app-text/docbook-sgml-utils:0
+		>=app-text/docbook-sgml-dtd-4.3 )"
+
+src_prepare() {
+	# Upstreamed patches
+	epatch "${FILESDIR}"/${PF}-dbus_interface_keyboard_backlight_controls.patch
+	epatch "${FILESDIR}"/${PF}-avoid-levels-is-0-warning.patch
+
+	# Upower 1.0 fixes
+	# https://github.com/mate-desktop/mate-power-manager/commit/220a4e0
+	epatch "${FILESDIR}"/${PF}-remove-battery-recall-logic.patch
+	# https://github.com/mate-desktop/mate-power-manager/commit/d59f4b8
+	epatch "${FILESDIR}"/${PF}-port-to-upower-0.99-API.patch
+	# https://github.com/mate-desktop/mate-power-manager/commit/1fb2870
+	epatch "${FILESDIR}"/${PF}-improve-UPower1-support.patch
+	# https://github.com/mate-desktop/mate-power-manager/commit/8f734c6
+	epatch "${FILESDIR}"/${PF}-other-round-of-fixes-for-UPower-0.99-API-changes.patch
+
+	eautoreconf
+	gnome2_src_prepare
+
+	# This needs to be after eautoreconf to prevent problems like bug #356277
+	# Remove the docbook2man rules here since it's not handled by a proper
+	# parameter in configure.in.
+	if ! use man; then
+		sed -e 's:@HAVE_DOCBOOK2MAN_TRUE@.*::' -i man/Makefile.in \
+			|| die "docbook sed failed"
+	fi
+}
+
+src_configure() {
+	gnome2_src_configure \
+		$(use_enable applet applets) \
+		$(use_enable test tests) \
+		$(use_enable unique) \
+		$(use_with gnome-keyring keyring) \
+		--enable-compile-warnings=minimum \
+		--enable-unique \
+		--with-gtk=2.0
+}
+
+DOCS="AUTHORS HACKING NEWS README TODO"
+
+src_test() {
+	unset DBUS_SESSION_BUS_ADDRESS
+
+	dbus-launch Xemake check || die "Test phase failed"
+}