[gentoo-commits] proj/gnome:gnome-next commit in: gnome-base/gdm/, gnome-base/gdm/files/

[Alexandre Restovtsev]

commit:     9684e809a3b5f4cc043578cea3d70b2692dd0554
Author:     Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Mon Sep 26 18:39:59 2011 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Mon Sep 26 18:39:59 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=9684e809

gnome-base/gdm: 3.1.91 → 3.1.92

---
 .../gdm/files/gdm-3.1.91-daemon-autologin.patch    |  103 --------------------
 .../gdm-3.1.91-gdm-slave-dbus_error_init.patch     |   22 ----
 .../files/gdm-3.1.91-gdm-slave-memory-leak.patch   |   21 ----
 .../gdm/{gdm-3.1.91.ebuild => gdm-3.1.92.ebuild}   |    5 -
 4 files changed, 0 insertions(+), 151 deletions(-)

diff --git a/gnome-base/gdm/files/gdm-3.1.91-daemon-autologin.patch b/gnome-base/gdm/files/gdm-3.1.91-daemon-autologin.patch
deleted file mode 100644
index 71a4546..0000000
--- a/gnome-base/gdm/files/gdm-3.1.91-daemon-autologin.patch
+++ /dev/null
@@ -1,103 +0,0 @@
-From aad28c8bce222e9d5461c3b35dbf5f9eb4a86e82 Mon Sep 17 00:00:00 2001
-From: Ray Strode <rstrode@××××××.com>
-Date: Tue, 13 Sep 2011 14:26:59 +0000
-Subject: daemon: fix autologin
-
-In commit 6849f6f3b8a199bed5427b8d6f1e2dedbe035d6c
-the code was changed to stop the greeter asynchronously
-and start the session following its completion.
-
-Autologin doesn't have a greeter though, so this broke
-it.
-
-This commit fixes autologin.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=658899
----
-diff --git a/daemon/gdm-simple-slave.c b/daemon/gdm-simple-slave.c
-index 2f38bf6..ab69194 100644
---- a/daemon/gdm-simple-slave.c
-+++ b/daemon/gdm-simple-slave.c
-@@ -108,6 +108,7 @@ G_DEFINE_TYPE (GdmSimpleSlave, gdm_simple_slave, GDM_TYPE_SLAVE)
- static void create_new_session (GdmSimpleSlave *slave);
- static void destroy_session    (GdmSimpleSlave *slave);
- static void start_greeter      (GdmSimpleSlave *slave);
-+static void start_session      (GdmSimpleSlave *slave);
- static void queue_start_session (GdmSimpleSlave *slave,
-                                  const char     *service_name);
- 
-@@ -449,6 +450,29 @@ stop_greeter (GdmSimpleSlave *slave)
-         gdm_welcome_session_stop (GDM_WELCOME_SESSION (slave->priv->greeter));
- }
- 
-+static void
-+start_session (GdmSimpleSlave *slave)
-+{
-+        char    *auth_file;
-+        auth_file = NULL;
-+        add_user_authorization (slave, &auth_file);
-+
-+        g_assert (auth_file != NULL);
-+
-+        g_object_set (slave->priv->session,
-+                      "user-x11-authority-file", auth_file,
-+                      NULL);
-+
-+        g_free (auth_file);
-+
-+        gdm_session_start_session (GDM_SESSION (slave->priv->session),
-+                                   slave->priv->start_session_service_name);
-+
-+        slave->priv->start_session_id = 0;
-+        g_free (slave->priv->start_session_service_name);
-+        slave->priv->start_session_service_name = NULL;
-+}
-+
- static gboolean
- start_session_timeout (GdmSimpleSlave *slave)
- {
-@@ -472,8 +496,13 @@ start_session_timeout (GdmSimpleSlave *slave)
-                 g_free (slave->priv->start_session_service_name);
-                 slave->priv->start_session_service_name = NULL;
-         } else {
--                /* Session actually gets started from on_greeter_session_stopped */
--                stop_greeter (slave);
-+                if (slave->priv->greeter == NULL) {
-+                        /* auto login */
-+                        start_session (slave);
-+                } else {
-+                        /* Session actually gets started from on_greeter_session_stop */
-+                        stop_greeter (slave);
-+                }
-         }
- 
-         return FALSE;
-@@ -972,25 +1001,7 @@ on_greeter_session_stop (GdmGreeterSession *greeter,
-                 gdm_slave_stopped (GDM_SLAVE (slave));
-         } else {
-                 gdm_greeter_server_stop (slave->priv->greeter_server);
--
--                char    *auth_file;
--                auth_file = NULL;
--                add_user_authorization (slave, &auth_file);
--
--                g_assert (auth_file != NULL);
--
--                g_object_set (slave->priv->session,
--                              "user-x11-authority-file", auth_file,
--                              NULL);
--
--                g_free (auth_file);
--
--                gdm_session_start_session (GDM_SESSION (slave->priv->session),
--                                           slave->priv->start_session_service_name);
--
--                slave->priv->start_session_id = 0;
--                g_free (slave->priv->start_session_service_name);
--                slave->priv->start_session_service_name = NULL;
-+                start_session (slave);
-         }
- 
-         g_object_unref (slave->priv->greeter);
---
-cgit v0.9.0.2

diff --git a/gnome-base/gdm/files/gdm-3.1.91-gdm-slave-dbus_error_init.patch b/gnome-base/gdm/files/gdm-3.1.91-gdm-slave-dbus_error_init.patch
deleted file mode 100644
index 201359b..0000000
--- a/gnome-base/gdm/files/gdm-3.1.91-gdm-slave-dbus_error_init.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From b8f1c67f7db3f86f631420b057ae08fc5f053819 Mon Sep 17 00:00:00 2001
-From: Lennart Poettering <lennart@××××××××××.net>
-Date: Tue, 26 Jul 2011 01:11:20 +0000
-Subject: gdm-slave: fix double dbus_error_init()
-
-https://bugzilla.gnome.org/show_bug.cgi?id=655380
----
-diff --git a/daemon/gdm-slave.c b/daemon/gdm-slave.c
-index fad7c96..e7553ad 100644
---- a/daemon/gdm-slave.c
-+++ b/daemon/gdm-slave.c
-@@ -1376,8 +1376,6 @@ activate_session_id (GdmSlave   *slave,
-                 goto out;
-         }
- 
--
--        dbus_error_init (&local_error);
-         reply = dbus_connection_send_with_reply_and_block (dbus_g_connection_get_connection (slave->priv->connection),
-                                                            message,
-                                                            -1,
---
-cgit v0.9.0.2

diff --git a/gnome-base/gdm/files/gdm-3.1.91-gdm-slave-memory-leak.patch b/gnome-base/gdm/files/gdm-3.1.91-gdm-slave-memory-leak.patch
deleted file mode 100644
index a61f4f9..0000000
--- a/gnome-base/gdm/files/gdm-3.1.91-gdm-slave-memory-leak.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From b669aa14d85a0d011fd25093f8e4f4da531ee679 Mon Sep 17 00:00:00 2001
-From: Lennart Poettering <lennart@××××××××××.net>
-Date: Tue, 26 Jul 2011 01:10:36 +0000
-Subject: gdm-slave: fix memory leak
-
-https://bugzilla.gnome.org/show_bug.cgi?id=655380
----
-diff --git a/daemon/gdm-slave.c b/daemon/gdm-slave.c
-index 2dc0323..fad7c96 100644
---- a/daemon/gdm-slave.c
-+++ b/daemon/gdm-slave.c
-@@ -1432,6 +1432,7 @@ session_unlock (GdmSlave   *slave,
- 
-         if (dbus_error_is_set (&error)) {
-                 g_debug ("GdmSlave: ConsoleKit %s raised:\n %s\n\n", error.name, error.message);
-+                dbus_error_free (&error);
-                 return FALSE;
-         }
- 
---
-cgit v0.9.0.2

diff --git a/gnome-base/gdm/gdm-3.1.91.ebuild b/gnome-base/gdm/gdm-3.1.92.ebuild
similarity index 97%
rename from gnome-base/gdm/gdm-3.1.91.ebuild
rename to gnome-base/gdm/gdm-3.1.92.ebuild
index 8d692ea..6ef8993 100644
--- a/gnome-base/gdm/gdm-3.1.91.ebuild
+++ b/gnome-base/gdm/gdm-3.1.92.ebuild
@@ -168,11 +168,6 @@ src_prepare() {
 		rm -f data/dconf-override-db
 	fi
 
-	# Useful upstream patches, will be in next release
-	epatch "${FILESDIR}/${P}-gdm-slave-memory-leak.patch"
-	epatch "${FILESDIR}/${P}-gdm-slave-dbus_error_init.patch"
-	epatch "${FILESDIR}/${P}-daemon-autologin.patch"
-
 	mkdir -p "${S}"/m4
 	intltoolize --force --copy --automake || die "intltoolize failed"
 	eautoreconf