[cinnamon-session] fix upower patch again

leigh123linux leigh123linux at fedoraproject.org
Thu Nov 7 22:41:30 UTC 2013


commit b6339532da957b7f8a0ea534386cafd07d198c67
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Thu Nov 7 22:41:46 2013 +0000

    fix upower patch again

 cinnamon-session-upower.patch |   24 ++++++++++++++++++++++++
 1 files changed, 24 insertions(+), 0 deletions(-)
---
diff --git a/cinnamon-session-upower.patch b/cinnamon-session-upower.patch
index 2818ff5..658a389 100644
--- a/cinnamon-session-upower.patch
+++ b/cinnamon-session-upower.patch
@@ -151,3 +151,27 @@ diff -uNrp a/configure.ac b/configure.ac
  
          g_clear_object (&logout_dialog->priv->system);
  
+@@ -176,13 +184,21 @@ csm_logout_dialog_destroy (CsmLogoutDial
+ static gboolean
+ csm_logout_supports_system_suspend (CsmLogoutDialog *logout_dialog)
+ {
+-        return ( csm_system_can_suspend (logout_dialog->priv->system) || up_client_get_can_suspend (logout_dialog->priv->up_client) );
++#ifdef HAVE_OLD_UPOWER
++        return up_client_get_can_suspend (logout_dialog->priv->up_client);
++#else
++        return csm_system_can_suspend (logout_dialog->priv->system);
++#endif
+ }
+ 
+ static gboolean
+ csm_logout_supports_system_hibernate (CsmLogoutDialog *logout_dialog)
+ {
+-        return ( csm_system_can_hibernate (logout_dialog->priv->system) || up_client_get_can_hibernate (logout_dialog->priv->up_client) );
++#ifdef HAVE_OLD_UPOWER
++        return up_client_get_can_hibernate (logout_dialog->priv->up_client);
++#else
++        return csm_system_can_hibernate (logout_dialog->priv->system);
++#endif
+ }
+ 
+ static gboolean


More information about the scm-commits mailing list