[cinnamon-session] fix upower patch

[leigh123linux]

commit 2d6c4a98331379ad0e0dacf6bbfac1122a3e3688
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Thu Nov 7 22:08:11 2013 +0000

    fix upower patch

 cinnamon-session-upower.patch |   48 ++++++++++++++++++++++++++++++++++++++++-
 cinnamon-session.spec         |    3 +-
 2 files changed, 49 insertions(+), 2 deletions(-)
---
diff --git a/cinnamon-session-upower.patch b/cinnamon-session-upower.patch
index 2368fb2..b55d0ee 100644
--- a/cinnamon-session-upower.patch
+++ b/cinnamon-session-upower.patch
@@ -88,7 +88,7 @@ diff -uNrp a/configure.ac b/configure.ac
  
 +dnl We can only support old upower
 +dnl https://bugzilla.gnome.org/show_bug.cgi?id=710383
-+PKG_CHECK_MODULES(UPOWER, upower-glib <= 0.9.22, have_old_upower=yes, have_old_upower=no)
++PKG_CHECK_MODULES(UPOWER, upower-glib <= 0.99.0, have_old_upower=yes, have_old_upower=no)
 +AS_IF([test x$have_old_upower = xyes], [
 +  AC_DEFINE([HAVE_OLD_UPOWER], [1], [Define if we have an older upower])
 +])
@@ -105,3 +105,49 @@ diff -uNrp a/configure.ac b/configure.ac
          Build documentation:      ${enable_docbook_docs}
  
  "
+--- a/cinnamon-session/csm-logout-dialog.c	2013-10-31 13:35:04.000000000 +0000
++++ b/cinnamon-session/csm-logout-dialog.c	2013-11-07 22:03:23.592826827 +0000
+@@ -26,8 +26,10 @@
+ 
+ #include <glib/gi18n.h>
+ #include <gtk/gtk.h>
++#if ! UP_CHECK_VERSION(0,99,0)
+ #define UPOWER_ENABLE_DEPRECATED 1
+ #include <upower.h>
++#endif
+ 
+ #include "csm-logout-dialog.h"
+ #include "csm-system.h"
+@@ -47,7 +49,9 @@ struct _CsmLogoutDialogPrivate
+ {
+         CsmDialogLogoutType  type;
+ 
++#if ! UP_CHECK_VERSION(0,99,0)
+         UpClient            *up_client;
++#endif
+         CsmSystem           *system;
+ 
+         int                  timeout;
+@@ -139,7 +143,9 @@ csm_logout_dialog_init (CsmLogoutDialog
+         gtk_window_set_keep_above (GTK_WINDOW (logout_dialog), TRUE);
+         gtk_window_stick (GTK_WINDOW (logout_dialog));
+ 
++#if ! UP_CHECK_VERSION(0,99,0)
+         logout_dialog->priv->up_client = up_client_new ();
++#endif
+ 
+         logout_dialog->priv->system = csm_get_system ();
+ 
+@@ -163,10 +169,12 @@ csm_logout_dialog_destroy (CsmLogoutDial
+                 logout_dialog->priv->timeout_id = 0;
+         }
+ 
++#if ! UP_CHECK_VERSION(0,99,0)
+         if (logout_dialog->priv->up_client) {
+                 g_object_unref (logout_dialog->priv->up_client);
+                 logout_dialog->priv->up_client = NULL;
+         }
++#endif
+ 
+         g_clear_object (&logout_dialog->priv->system);
+ 
diff --git a/cinnamon-session.spec b/cinnamon-session.spec
index efaf35e..2731bea 100644
--- a/cinnamon-session.spec
+++ b/cinnamon-session.spec
@@ -73,7 +73,8 @@ NOCONFIGURE=1 ./autogen.sh
 %else
            --docdir=%{_datadir}/doc/%{name}                     \
 %endif
-           --enable-systemd
+           --enable-systemd                                     \
+           --enable-compile-warnings=yes
 
 make %{?_smp_mflags} V=1