Attachment 290143 Details for Bug 443514

[patch] Proposed patch from Gnome's bugzilla

gnome-session-2.26.1-shutdown.patch (text/plain), 4.40 KB, created by Philippe Duchenne on 2009-05-05 16:12:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Philippe Duchenne

Created: 2009-05-05 16:12:43 UTC

Size: 4.40 KB

patch

obsolete

>From 33064e2d245ff1b8462ca250c95d59da9cdc45b1 Mon Sep 17 00:00:00 2001
>From: Gilles Dartiguelongue <eva@gentoo.org>
>Date: Sun, 19 Apr 2009 16:45:29 +0200
>Subject: [PATCH] Allow shutdown without PolicyKit.
>
> Straight forward fix to allow shutdown on systems not using policykit.
>
> If the system really doesn't have policykit, it will make things work
> as in 2.22.
>
> If pk is in gsm but not in ck, it'll still work as in 2.22.
>
> If pk is present in both, you just have to fix the logic to make
> gsm ask pk if the user has the permission to shutdown _before_ showing
> buttons and in case this is not possible, just damn fix pk.
>
> reported as http://bugzilla.gnome.org/show_bug.cgi?id=549150
>---
> gnome-session/gsm-consolekit.c |   38 ++++++++++++++++++++++----------------
> 1 files changed, 22 insertions(+), 16 deletions(-)
>
>diff --git a/gnome-session/gsm-consolekit.c b/gnome-session/gsm-consolekit.c
>index 5fc1b7c..8b5e69c 100644
>--- a/gnome-session/gsm-consolekit.c
>+++ b/gnome-session/gsm-consolekit.c
>@@ -541,7 +541,7 @@ request_restart_priv (GsmConsolekit *manager,
>                 g_free (error_message);
>         }
> #else
>-        g_assert_not_reached ();
>+        g_warning ("Failed to restart and Policykit support not enabled");
> #endif /* HAVE POLKIT */
> }
> 
>@@ -581,7 +581,7 @@ request_stop_priv (GsmConsolekit *manager,
>                 }
>         }
> #else
>-        g_assert_not_reached ();
>+        g_warning ("Failed to shutdown and Policykit support not enabled");
> #endif /* HAVE POLKIT */
> }
> 
>@@ -974,6 +974,15 @@ gsm_consolekit_can_do_action (GsmConsolekit *manager,
> 
>         return result != POLKIT_RESULT_NO && result != POLKIT_RESULT_UNKNOWN;
> }
>+#else
>+static gboolean
>+gsm_consolekit_can_do_action (GsmConsolekit *manager,
>+                              const char    *action_id)
>+{
>+        /* if we got here, res was true */
>+        return TRUE;
>+}
>+#endif
> 
> static gboolean
> gsm_consolekit_is_session_for_other_user (GsmConsolekit *manager,
>@@ -1091,6 +1100,7 @@ gsm_consolekit_is_single_user (GsmConsolekit *manager)
>         return single;
> }
> 
>+#ifdef HAVE_POLKIT_GNOME
> static void
> obtain_privileges_cb (PolKitAction  *action,
>                       gboolean       gained_privilege,
>@@ -1202,8 +1212,11 @@ gsm_consolekit_get_restart_privileges (GsmConsolekit *manager)
>                                                           "org.freedesktop.consolekit.system.restart",
>                                                           "org.freedesktop.consolekit.system.restart-multiple-users");
> #else
>-        g_debug ("GsmConsolekit: built without PolicyKit-gnome support");
>-        return FALSE;
>+        g_signal_emit (G_OBJECT (manager),
>+                       signals [PRIVILEGES_COMPLETED],
>+                       0, TRUE, FALSE, FALSE);
>+        g_debug ("GsmConsolekit: built without PolicyKit-gnome support, granting anyway");
>+        return TRUE;
> #endif
> }
> 
>@@ -1215,33 +1228,26 @@ gsm_consolekit_get_stop_privileges (GsmConsolekit *manager)
>                                                           "org.freedesktop.consolekit.system.stop",
>                                                           "org.freedesktop.consolekit.system.stop-multiple-users");
> #else
>-        g_debug ("GsmConsolekit: built without PolicyKit-gnome support");
>-        return FALSE;
>+        g_signal_emit (G_OBJECT (manager),
>+                       signals [PRIVILEGES_COMPLETED],
>+                       0, TRUE, FALSE, FALSE);
>+        g_debug ("GsmConsolekit: built without PolicyKit-gnome support, granting anyway");
>+        return TRUE;
> #endif
> }
> 
> gboolean
> gsm_consolekit_can_restart (GsmConsolekit *manager)
> {
>-#ifdef HAVE_POLKIT_GNOME
>         return gsm_consolekit_can_do_action (manager, "org.freedesktop.consolekit.system.restart") ||
>                gsm_consolekit_can_do_action (manager, "org.freedesktop.consolekit.system.restart-multiple-users");
>-#else
>-        g_debug ("GsmConsolekit: built without PolicyKit-gnome support - cannot restart system");
>-        return FALSE;
>-#endif
> }
> 
> gboolean
> gsm_consolekit_can_stop (GsmConsolekit *manager)
> {
>-#ifdef HAVE_POLKIT_GNOME
>         return gsm_consolekit_can_do_action (manager, "org.freedesktop.consolekit.system.stop") ||
>                gsm_consolekit_can_do_action (manager, "org.freedesktop.consolekit.system.stop-multiple-users");
>-#else
>-        g_debug ("GsmConsolekit: built without PolicyKit-gnome support - cannot stop system");
>-        return FALSE;
>-#endif
> }
> 
> gchar *
>-- 
>1.6.2.3
>

Actions: View | Diff

Attachments on bug 443514: 290143