[packages/xfce4-session] - fix condition nesting in systemd support patch - rel 6

baggins baggins at pld-linux.org
Wed Aug 7 13:13:45 CEST 2013


commit e980f6ba495cff66081e89d87a8d52e0d3e0e6a6
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Wed Aug 7 13:12:39 2013 +0200

    - fix condition nesting in systemd support patch
    - rel 6

 xfce4-session-add-systemd-support.patch | 8 ++++----
 xfce4-session.spec                      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/xfce4-session.spec b/xfce4-session.spec
index 5dc6694..2afec89 100644
--- a/xfce4-session.spec
+++ b/xfce4-session.spec
@@ -6,7 +6,7 @@ Summary:	Xfce session manager
 Summary(pl.UTF-8):	Zarządca sesji Xfce
 Name:		xfce4-session
 Version:	4.10.0
-Release:	5
+Release:	6
 License:	GPL v2
 Group:		X11/Applications
 Source0:	http://archive.xfce.org/xfce/4.10/src/%{name}-%{version}.tar.bz2
diff --git a/xfce4-session-add-systemd-support.patch b/xfce4-session-add-systemd-support.patch
index 620bdca..75eb6c0 100644
--- a/xfce4-session-add-systemd-support.patch
+++ b/xfce4-session-add-systemd-support.patch
@@ -170,10 +170,10 @@ diff -up xfce4-session-4.10.0/xfce4-session/xfsm-shutdown.c.systemd xfce4-sessio
      }
  
 +#ifdef HAVE_SYSTEMD
-+  if (shutdown->systemd_proxy)
++  if (shutdown->systemd_proxy) {
 +    if (systemd_proxy_can_restart (shutdown->systemd_proxy, can_restart, error))
 +      return TRUE;
-+  else
++  } else
 +#endif
    if (xfsm_consolekit_can_restart (shutdown->consolekit, can_restart, error))
      return TRUE;
@@ -183,10 +183,10 @@ diff -up xfce4-session-4.10.0/xfce4-session/xfsm-shutdown.c.systemd xfce4-sessio
      }
  
 +#ifdef HAVE_SYSTEMD
-+  if (shutdown->systemd_proxy)
++  if (shutdown->systemd_proxy) {
 +    if (systemd_proxy_can_shutdown (shutdown->systemd_proxy, can_shutdown, error))
 +      return TRUE;
-+  else
++  } else
 +#endif
    if (xfsm_consolekit_can_shutdown (shutdown->consolekit, can_shutdown, error))
      return TRUE;
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/xfce4-session.git/commitdiff/e980f6ba495cff66081e89d87a8d52e0d3e0e6a6



More information about the pld-cvs-commit mailing list