[Pkg-xfce-commits] r4371 - in desktop/branches/experimental/xfce4-session/debian: . patches
Lionel Le Folgoc
mrpouit-guest at alioth.debian.org
Wed Nov 3 11:03:14 UTC 2010
Author: mrpouit-guest
Date: 2010-11-03 23:03:06 +0000 (Wed, 03 Nov 2010)
New Revision: 4371
Removed:
desktop/branches/experimental/xfce4-session/debian/patches/03_gk-start-with-path.patch
desktop/branches/experimental/xfce4-session/debian/patches/04_gk-dont-check-running-use-start.patch
desktop/branches/experimental/xfce4-session/debian/patches/05_reuse-existing-ck-session.patch
Modified:
desktop/branches/experimental/xfce4-session/debian/changelog
desktop/branches/experimental/xfce4-session/debian/patches/series
Log:
* debian/patches:
- 03_gk-start-with-path.patch: dropped, included upstream
- 04_gk-dont-check-running-use-start.patch: ditto
- 05_reuse-existing-ck-session.patch: dropped too.
Modified: desktop/branches/experimental/xfce4-session/debian/changelog
===================================================================
--- desktop/branches/experimental/xfce4-session/debian/changelog 2010-11-03 22:20:26 UTC (rev 4370)
+++ desktop/branches/experimental/xfce4-session/debian/changelog 2010-11-03 23:03:06 UTC (rev 4371)
@@ -1,4 +1,4 @@
-xfce4-session (4.7.0-1) UNRELEASED; urgency=low
+xfce4-session (4.7.1-1) UNRELEASED; urgency=low
[ Yves-Alexis Perez ]
* New upstream development release.
@@ -26,6 +26,10 @@
- Does not use the ConsoleKit interface to shutdown or reboot lp: #496423
- Fails to request necessary permissions from policykit to perform
shutdown/restart when multiple users are logged in lp: #251337
+ * debian/patches:
+ - 03_gk-start-with-path.patch: dropped, included upstream
+ - 04_gk-dont-check-running-use-start.patch: ditto
+ - 05_reuse-existing-ck-session.patch: dropped too.
-- Yves-Alexis Perez <corsac at debian.org> Sun, 05 Sep 2010 16:12:47 +0200
Deleted: desktop/branches/experimental/xfce4-session/debian/patches/03_gk-start-with-path.patch
===================================================================
--- desktop/branches/experimental/xfce4-session/debian/patches/03_gk-start-with-path.patch 2010-11-03 22:20:26 UTC (rev 4370)
+++ desktop/branches/experimental/xfce4-session/debian/patches/03_gk-start-with-path.patch 2010-11-03 23:03:06 UTC (rev 4371)
@@ -1,12 +0,0 @@
---- a/xfce4-session/xfsm-compat-gnome.c
-+++ b/xfce4-session/xfsm-compat-gnome.c
-@@ -128,7 +128,8 @@
- error = NULL;
- argv[0] = GNOME_KEYRING_DAEMON;
- argv[1] = NULL;
-- g_spawn_sync (NULL, argv, NULL, G_SPAWN_LEAVE_DESCRIPTORS_OPEN,
-+ g_spawn_sync (NULL, argv, NULL,
-+ G_SPAWN_SEARCH_PATH | G_SPAWN_LEAVE_DESCRIPTORS_OPEN,
- child_setup, NULL,
- &sout, NULL, &status, &error);
-
Deleted: desktop/branches/experimental/xfce4-session/debian/patches/04_gk-dont-check-running-use-start.patch
===================================================================
--- desktop/branches/experimental/xfce4-session/debian/patches/04_gk-dont-check-running-use-start.patch 2010-11-03 22:20:26 UTC (rev 4370)
+++ desktop/branches/experimental/xfce4-session/debian/patches/04_gk-dont-check-running-use-start.patch 2010-11-03 23:03:06 UTC (rev 4371)
@@ -1,81 +0,0 @@
-diff --git a/xfce4-session/xfsm-compat-gnome.c b/xfce4-session/xfsm-compat-gnome.c
-index b088c6f..cee64ed 100644
---- a/xfce4-session/xfsm-compat-gnome.c
-+++ b/xfce4-session/xfsm-compat-gnome.c
-@@ -104,27 +104,15 @@ child_setup (gpointer user_data)
- static void
- gnome_keyring_daemon_startup (void)
- {
-- const char *old_keyring;
--
- GError *error = NULL;
- gchar *sout;
- gchar **lines;
-+ gsize lineno;
- gint status;
- long pid;
- gchar *pid_str;
- gchar *end;
-- char *argv[2];
--
-- /* If there is already a working keyring, don't start a new daemon */
-- old_keyring = g_getenv ("GNOME_KEYRING_SOCKET");
-- if (old_keyring != NULL && access (old_keyring, R_OK | W_OK) == 0)
-- {
--#ifdef HAVE_GNOME_KEYRING
-- gnome_keyring_daemon_prepare_environment_sync ();
--#endif
-- return;
-- }
--
-+ char *argv[3];
-
- /* Pipe to slave keyring lifetime to */
- if (pipe (keyring_lifetime_pipe))
-@@ -135,7 +123,8 @@ gnome_keyring_daemon_startup (void)
-
- error = NULL;
- argv[0] = GNOME_KEYRING_DAEMON;
-- argv[1] = NULL;
-+ argv[1] = "--start";
-+ argv[2] = NULL;
- g_spawn_sync (NULL, argv, NULL,
- G_SPAWN_SEARCH_PATH | G_SPAWN_LEAVE_DESCRIPTORS_OPEN,
- child_setup, NULL,
-@@ -155,20 +144,22 @@ gnome_keyring_daemon_startup (void)
- {
- if (WIFEXITED (status) && WEXITSTATUS (status) == 0 && sout != NULL)
- {
-- lines = g_strsplit (sout, "\n", 3);
--
-- if (lines[0] != NULL && lines[1] != NULL
-- && g_str_has_prefix (lines[1], "GNOME_KEYRING_PID="))
-- {
-- pid_str = lines[1] + strlen ("GNOME_KEYRING_PID=");
-- pid = strtol (pid_str, &end, 10);
--
-- if (end != pid_str)
-- {
-- gnome_keyring_daemon_pid = pid;
-- xfce_putenv (lines[0]);
-- }
-- }
-+ lines = g_strsplit (sout, "\n", 0);
-+
-+ for (lineno = 0; lines[lineno] != NULL; lineno++)
-+ {
-+ xfce_putenv (lines[lineno]);
-+
-+ if (g_str_has_prefix (lines[lineno], "GNOME_KEYRING_PID="))
-+ {
-+ pid_str = lines[lineno] + strlen ("GNOME_KEYRING_PID=");
-+ pid = strtol (pid_str, &end, 10);
-+ if (end != pid_str)
-+ {
-+ gnome_keyring_daemon_pid = pid;
-+ }
-+ }
-+ }
-
- g_strfreev (lines);
-
Deleted: desktop/branches/experimental/xfce4-session/debian/patches/05_reuse-existing-ck-session.patch
===================================================================
--- desktop/branches/experimental/xfce4-session/debian/patches/05_reuse-existing-ck-session.patch 2010-11-03 22:20:26 UTC (rev 4370)
+++ desktop/branches/experimental/xfce4-session/debian/patches/05_reuse-existing-ck-session.patch 2010-11-03 23:03:06 UTC (rev 4371)
@@ -1,248 +0,0 @@
-From 35c620aa3749581580e0917ff7c2db1c223564a8 Mon Sep 17 00:00:00 2001
-From: Jannis Pohlmann <jannis at xfce.org>
-Date: Wed, 08 Sep 2010 10:02:46 +0000
-Subject: Reuse existing ConsoleKit sessions (bug #6685).
-
-According to the ConsoleKit documentation, only one session leader may
-exist for a session. An application becomes the leader of a session by
-calling org.freedesktop.ConsoleKit.Manager.OpenSession() which returns a
-session identifier. This identifier is then made available to other
-session clients by setting the XDG_SESSION_COOKIE environment variable.
-
-GDM and upstart open ConsoleKit sessions on their own and desktop
-environments are supposed to reuse these sessions instead of opening new
-ones. So with this commit, xfce4-session checks for XDG_SESSION_COOKIE
-and, if it exists, does not try to call OpenSession in order to
-overwrite this environment variable.
-
-I tested this with xfce4-session-logout which finally allows me to
-reboot and shutdown again.
-
-Also fix the indentation, use spaces instead of tabs etc.
----
-diff --git a/xfce4-session/xfsm-manager.c b/xfce4-session/xfsm-manager.c
-index 3eb7696..892b6c6 100644
---- a/xfce4-session/xfsm-manager.c
-+++ b/xfce4-session/xfsm-manager.c
-@@ -1,26 +1,24 @@
--/* $Id$ */
-+/* vi:set et ai sw=2 sts=2 ts=2: */
- /*-
- * Copyright (c) 2003-2006 Benedikt Meurer <benny at xfce.org>
- * Copyright (c) 2008 Brian Tarricone <bjt23 at cornell.edu>
-+ * Copyright (c) 2010 Jannis Pohlmann <jannis at xfce.org>
- * All rights reserved.
- *
-- * This program is free software; you can redistribute it and/or modify
-- * it under the terms of the GNU General Public License as published by
-- * the Free Software Foundation; either version 2, or (at your option)
-- * any later version.
-- *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License as
-+ * published by the Free Software Foundation; either version 2 of
-+ * the License, or (at your option) any later version.
-+ *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public License
-- * along with this program; if not, write to the Free Software
-- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-- * 02111-1307, USA.
- *
-- * The session id generator was taken from the KDE session manager.
-- * Copyright (c) 2000 Matthias Ettrich <ettrich at kde.org>
-+ * You should have received a copy of the GNU General Public
-+ * License along with this program; if not, write to the Free
-+ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-+ * Boston, MA 02110-1301, USA.
- */
-
- #ifdef HAVE_CONFIG_H
-@@ -257,11 +255,11 @@ xfsm_manager_init (XfsmManager *manager)
- #ifdef ENABLE_CONSOLE_KIT
- manager->system_bus = dbus_g_bus_get (DBUS_BUS_SYSTEM, &error);
-
-- if ( G_LIKELY (manager->system_bus != NULL) )
-+ if (G_LIKELY (manager->system_bus != NULL))
- {
- xfsm_manager_consolekit_init (manager);
- }
-- else if ( error )
-+ else if (error)
- {
- g_warning ("Failed to connect to the system bus : %s", error->message);
- g_error_free (error);
-@@ -279,7 +277,7 @@ xfsm_manager_finalize (GObject *obj)
- #ifdef ENABLE_CONSOLE_KIT
- xfsm_manager_consolekit_cleanup (manager);
-
-- if ( manager->system_bus )
-+ if (manager->system_bus)
- dbus_g_connection_unref (manager->system_bus);
- #endif /*ENABLE_CONSOLE_KIT*/
-
-@@ -342,6 +340,7 @@ xfsm_manager_new (void)
- return manager;
- }
-
-+
- #ifdef ENABLE_CONSOLE_KIT
- static void xfsm_manager_consolekit_init (XfsmManager *manager)
- {
-@@ -349,61 +348,83 @@ static void xfsm_manager_consolekit_init (XfsmManager *manager)
- gboolean ret;
-
- manager->consolekit_proxy = dbus_g_proxy_new_for_name_owner (manager->system_bus,
-- "org.freedesktop.ConsoleKit",
-- "/org/freedesktop/ConsoleKit/Manager",
-- "org.freedesktop.ConsoleKit.Manager",
-- NULL);
-+ "org.freedesktop.ConsoleKit",
-+ "/org/freedesktop/ConsoleKit/Manager",
-+ "org.freedesktop.ConsoleKit.Manager",
-+ NULL);
-
-
-- if ( G_UNLIKELY (!manager->consolekit_proxy) )
-+ if (G_UNLIKELY (!manager->consolekit_proxy))
- {
- g_warning ("Failed to create proxy for 'org.freedesktop.ConsoleKit'");
- return;
- }
-
-- ret = dbus_g_proxy_call (manager->consolekit_proxy, "OpenSession", &error,
-- G_TYPE_INVALID,
-- G_TYPE_STRING, &manager->consolekit_cookie,
-- G_TYPE_INVALID);
--
-- if ( G_LIKELY (ret) )
-+ /* check if there is a session to reuse */
-+ if (g_getenv ("XDG_SESSION_COOKIE") != NULL)
- {
-- /*
-- * ConsoleKit doc says that the leader session should set the cookie
-- * on XDG_SESSION_COOKIE env variable.
-- */
-- g_warn_if_fail (g_setenv ("XDG_SESSION_COOKIE",
-- manager->consolekit_cookie,
-- TRUE));
-+#ifdef DEBUG
-+ g_debug ("Reusing existing ConsoleKit session: XDG_SESSION_ID=%s",
-+ g_getenv ("XDG_SESSION_COOKIE"));
-+#endif
- }
-- else if ( error )
-+ else
- {
-- g_warning ("OpenSession on 'org.freedesktop.ConsoleKit' failed with %s", error->message);
-- g_error_free (error);
-+ /* try to open a new session. as its leader we are then responsible for
-+ * setting XDG_SESSION_COOKIE as well as closing the session before we exit */
-+ ret = dbus_g_proxy_call (manager->consolekit_proxy, "OpenSession", &error,
-+ G_TYPE_INVALID,
-+ G_TYPE_STRING, &manager->consolekit_cookie,
-+ G_TYPE_INVALID);
-+
-+ if (G_LIKELY (ret))
-+ {
-+ /*
-+ * ConsoleKit doc says that the leader session should set the cookie
-+ * on XDG_SESSION_COOKIE env variable.
-+ */
-+ if (g_setenv ("XDG_SESSION_COOKIE", manager->consolekit_cookie, TRUE))
-+ {
-+#ifdef DEBUG
-+ g_debug ("Opening a new ConsoleKit session: XDG_SESSION_COOKIE=%s",
-+ manager->consolekit_cookie);
-+#endif
-+ }
-+ else
-+ {
-+ g_warning ("Failed to set XDG_SESSION_COOKIE");
-+ }
-+ }
-+ else if (error)
-+ {
-+ g_warning ("OpenSession on 'org.freedesktop.ConsoleKit' failed with %s", error->message);
-+ g_error_free (error);
-+ }
- }
- }
-
-+
- static void xfsm_manager_consolekit_cleanup (XfsmManager *manager)
- {
-- if ( manager->consolekit_proxy )
-+ GError *error = NULL;
-+ gboolean ret, result;
-+
-+ if (manager->consolekit_proxy)
- {
- if (manager->consolekit_cookie)
-- {
-- GError *error = NULL;
-- gboolean ret, result;
--
-- ret = dbus_g_proxy_call (manager->consolekit_proxy, "CloseSession", &error,
-- G_TYPE_STRING, manager->consolekit_cookie,
-- G_TYPE_INVALID,
-- G_TYPE_BOOLEAN, &result,
-- G_TYPE_INVALID);
-- if ( !ret )
-- {
-- g_warning ("CloseSession on 'org.freedesktop.ConsoleKit' failed with %s", error->message);
-- g_error_free (error);
-- }
-- g_free (manager->consolekit_cookie);
-- }
-+ {
-+ ret = dbus_g_proxy_call (manager->consolekit_proxy, "CloseSession", &error,
-+ G_TYPE_STRING, manager->consolekit_cookie,
-+ G_TYPE_INVALID,
-+ G_TYPE_BOOLEAN, &result,
-+ G_TYPE_INVALID);
-+ if (!ret)
-+ {
-+ g_warning ("CloseSession on 'org.freedesktop.ConsoleKit' failed with %s", error->message);
-+ g_error_free (error);
-+ }
-+ g_free (manager->consolekit_cookie);
-+ }
- g_object_unref (manager->consolekit_proxy);
- }
- }
-@@ -1181,6 +1202,7 @@ xfsm_manager_interact_done (XfsmManager *manager,
- xfsm_manager_start_client_save_timeout (manager, client);
- }
-
-+
- static void
- xfsm_manager_save_yourself_global (XfsmManager *manager,
- gint save_type,
-@@ -1222,8 +1244,8 @@ xfsm_manager_save_yourself_global (XfsmManager *manager,
- shutdown_helper = xfsm_shutdown_helper_new ();
-
- if (!xfsm_shutdown_helper_send_command (shutdown_helper,
-- manager->shutdown_type,
-- &error))
-+ manager->shutdown_type,
-+ &error))
- {
- xfce_message_dialog (NULL, _("Shutdown Failed"),
- GTK_STOCK_DIALOG_ERROR,
-@@ -1237,7 +1259,7 @@ xfsm_manager_save_yourself_global (XfsmManager *manager,
- }
-
- /* clean up and return */
-- g_object_unref (shutdown_helper);
-+ g_object_unref (shutdown_helper);
-
-
- /* at this point, either we failed to suspend/hibernate, or we
---
-cgit v0.8.2.1
Modified: desktop/branches/experimental/xfce4-session/debian/patches/series
===================================================================
--- desktop/branches/experimental/xfce4-session/debian/patches/series 2010-11-03 22:20:26 UTC (rev 4370)
+++ desktop/branches/experimental/xfce4-session/debian/patches/series 2010-11-03 23:03:06 UTC (rev 4371)
@@ -1,5 +1,2 @@
01_correct_shadows.patch
02_fix-fortune-path.patch
-03_gk-start-with-path.patch
-04_gk-dont-check-running-use-start.patch
-05_reuse-existing-ck-session.patch
More information about the Pkg-xfce-commits
mailing list