From 1bb2648cde916ac27d3dd75d7b64a4ddc89787b7 Mon Sep 17 00:00:00 2001
From: root <root@rshg054.dnsready.net>
Date: Sun, 10 Feb 2013 01:12:52 -0800
Subject: Sun Feb 10 01:12:35 PST 2013

---
 extra/gnome-control-center/systemd-fallback.patch | 81 -----------------------
 1 file changed, 81 deletions(-)
 delete mode 100644 extra/gnome-control-center/systemd-fallback.patch

(limited to 'extra/gnome-control-center')

diff --git a/extra/gnome-control-center/systemd-fallback.patch b/extra/gnome-control-center/systemd-fallback.patch
deleted file mode 100644
index 709e54019..000000000
--- a/extra/gnome-control-center/systemd-fallback.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-commit 9873a7536844f5c38c2a123be58175c2774e5dcc
-Author: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-Date:   Mon Mar 12 01:12:11 2012 +0100
-
-    Fallback to CK if systemd is not available
-    
-    Be nice to distributions where systemd is optional. This will select
-    the code path at runtime depending on whether the system was booted
-    using systemd.
-
-diff --git a/configure.ac b/configure.ac
-index aee97ac..867f061 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -56,7 +56,7 @@ AC_ARG_ENABLE([systemd],
-               [with_systemd=$enableval],
-               [with_systemd=no])
- if test "$with_systemd" = "yes" ; then
--  SYSTEMD=libsystemd-login
-+  SYSTEMD="libsystemd-login libsystemd-daemon"
-   AC_DEFINE(HAVE_SYSTEMD, 1, [Define to 1 if systemd is available])
- else
-   SYSTEMD=
-diff --git a/panels/user-accounts/um-user.c b/panels/user-accounts/um-user.c
-index f027754..5ebbe29 100644
---- a/panels/user-accounts/um-user.c
-+++ b/panels/user-accounts/um-user.c
-@@ -37,6 +37,11 @@
- 
- #include <gio/gunixoutputstream.h>
- 
-+#ifdef HAVE_SYSTEMD
-+#  include <systemd/sd-login.h>
-+#  include <systemd/sd-daemon.h>
-+#endif
-+
- #include "um-user.h"
- #include "um-account-type.h"
- #include "um-utils.h"
-@@ -1003,25 +1008,18 @@ um_user_set_password (UmUser      *user,
-         }
- }
- 
--#ifdef HAVE_SYSTEMD
--
--#include <systemd/sd-login.h>
--
- gboolean
- um_user_is_logged_in (UmUser *user)
- {
--  int n_sessions;
--
--  n_sessions = sd_uid_get_sessions (um_user_get_uid (user), 0, NULL) > 0;
--
--  return n_sessions > 0;
--}
-+#ifdef HAVE_SYSTEMD
-+        if (sd_booted () > 0) {
-+                int n_sessions;
- 
--#else
-+                n_sessions = sd_uid_get_sessions (um_user_get_uid (user), 0, NULL);
- 
--gboolean
--um_user_is_logged_in (UmUser *user)
--{
-+                return n_sessions > 0;
-+        }
-+#endif
-         GVariant *result;
-         GVariantIter *iter;
-         gint n_sessions;
-@@ -1052,8 +1050,6 @@ um_user_is_logged_in (UmUser *user)
-         return n_sessions > 0;
- }
- 
--#endif
--
- void
- um_user_set_automatic_login (UmUser   *user,
-                              gboolean  enabled)
-- 
cgit v1.2.3-54-g00ecf