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

[Alexandre Restovtsev]

commit:     c20becda763333f94700a9495bac0a43a9426b04
Author:     Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Mon Sep 26 17:52:22 2011 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Mon Sep 26 17:52:22 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=c20becda

gnome-base/gnome-session: 3.1.91 → 3.2.0

Bump. Patches were applied upstream.

---
 .../gnome-session-3.1.91-dbus-disconnected.patch   |   39 -------
 .../gnome-session-3.1.91-dbus-disconnected2.patch  |  118 --------------------
 ...on-3.1.91.ebuild => gnome-session-3.2.0.ebuild} |    9 +--
 3 files changed, 1 insertions(+), 165 deletions(-)

diff --git a/gnome-base/gnome-session/files/gnome-session-3.1.91-dbus-disconnected.patch b/gnome-base/gnome-session/files/gnome-session-3.1.91-dbus-disconnected.patch
deleted file mode 100644
index 7d59672..0000000
--- a/gnome-base/gnome-session/files/gnome-session-3.1.91-dbus-disconnected.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 67dd879fbe62bc28d3bbc48b88c3842e2cb827e8 Mon Sep 17 00:00:00 2001
-From: Vincent Untz <vuntz@×××××.org>
-Date: Fri, 09 Sep 2011 07:51:54 +0000
-Subject: gsm: Never mark as handled the Disconnected signal from dbus
-
-Disconnected is emitted when dbus is quitting. And all the dbus filters
-might be interested in this signal, so never mark it as handled when we
-look at it.
----
-diff --git a/gnome-session/gsm-consolekit.c b/gnome-session/gsm-consolekit.c
-index f53993f..66bebd1 100644
---- a/gnome-session/gsm-consolekit.c
-+++ b/gnome-session/gsm-consolekit.c
-@@ -152,7 +152,8 @@ gsm_consolekit_dbus_filter (DBusConnection *connection,
-                                     DBUS_INTERFACE_LOCAL, "Disconnected") &&
-             strcmp (dbus_message_get_path (message), DBUS_PATH_LOCAL) == 0) {
-                 gsm_consolekit_free_dbus (manager);
--                return DBUS_HANDLER_RESULT_HANDLED;
-+                /* let other filters get this disconnected signal, so that they
-+                 * can handle it too */
-         }
- 
-         return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
-diff --git a/gnome-session/gsm-shell.c b/gnome-session/gsm-shell.c
-index 0b26f09..9785160 100644
---- a/gnome-session/gsm-shell.c
-+++ b/gnome-session/gsm-shell.c
-@@ -228,7 +228,8 @@ gsm_shell_bus_filter (DBusConnection *connection,
-                                     DBUS_INTERFACE_LOCAL, "Disconnected") &&
-             strcmp (dbus_message_get_path (message), DBUS_PATH_LOCAL) == 0) {
-                 gsm_shell_disconnect_from_bus (shell);
--                return DBUS_HANDLER_RESULT_HANDLED;
-+                /* let other filters get this disconnected signal, so that they
-+                 * can handle it too */
-         }
- 
-         return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
---
-cgit v0.9.0.2

diff --git a/gnome-base/gnome-session/files/gnome-session-3.1.91-dbus-disconnected2.patch b/gnome-base/gnome-session/files/gnome-session-3.1.91-dbus-disconnected2.patch
deleted file mode 100644
index 7684516..0000000
--- a/gnome-base/gnome-session/files/gnome-session-3.1.91-dbus-disconnected2.patch
+++ /dev/null
@@ -1,118 +0,0 @@
-From ae8fa537262d6bec9c7eaa5a963cba98ec4e2136 Mon Sep 17 00:00:00 2001
-From: Vincent Untz <vuntz@×××××.org>
-Date: Fri, 09 Sep 2011 07:54:14 +0000
-Subject: gsm: Disconnect all dbus clients when dbus is disconnected
-
-When we receive the Disconnected signal from dbus on the session bus,
-then we know we won't be able to talk to dbus clients anymore, so mark
-them as disconnected. Also, do not restart them even if they're supposed
-to be autorestarted, as we won't be able to track them.
-
-At this point, the session is kind of hosed. We could possibly decide
-to simply leave, but we don't do it in case it's a user session and
-there's unsaved data.
-
-This helps a lot in the case of the gdm greeter, see
-https://bugzilla.gnome.org/show_bug.cgi?id=658481
----
-diff --git a/gnome-session/gsm-manager.c b/gnome-session/gsm-manager.c
-index b531197..2d74d40 100644
---- a/gnome-session/gsm-manager.c
-+++ b/gnome-session/gsm-manager.c
-@@ -151,6 +151,7 @@ struct GsmManagerPrivate
- 
-         DBusGProxy             *bus_proxy;
-         DBusGConnection        *connection;
-+        gboolean                dbus_disconnected : 1;
- 
-         /* Interface with other parts of the system */
-         UpClient               *up_client;
-@@ -1814,6 +1815,11 @@ _disconnect_client (GsmManager *manager,
-                                                      "phase");
-         }
- 
-+        if (manager->priv->dbus_disconnected && GSM_IS_DBUS_CLIENT (client)) {
-+                g_debug ("GsmManager: dbus disconnected, not restarting application");
-+                goto out;
-+        }
-+
-         if (app == NULL) {
-                 g_debug ("GsmManager: unable to find application for client - not restarting");
-                 goto out;
-@@ -1872,6 +1878,12 @@ _disconnect_dbus_client (const char       *id,
-                 return FALSE;
-         }
- 
-+        /* If no service name, then we simply disconnect all clients */
-+        if (!data->service_name) {
-+                _disconnect_client (data->manager, client);
-+                return TRUE;
-+        }
-+
-         name = gsm_dbus_client_get_bus_name (GSM_DBUS_CLIENT (client));
-         if (IS_STRING_EMPTY (name)) {
-                 return FALSE;
-@@ -1885,6 +1897,15 @@ _disconnect_dbus_client (const char       *id,
-         return FALSE;
- }
- 
-+/**
-+ * remove_clients_for_connection:
-+ * @manager: a #GsmManager
-+ * @service_name: a service name
-+ *
-+ * Disconnects clients that own @service_name.
-+ *
-+ * If @service_name is NULL, then disconnects all clients for the connection.
-+ */
- static void
- remove_clients_for_connection (GsmManager *manager,
-                                const char *service_name)
-@@ -1968,10 +1989,32 @@ bus_name_owner_changed (DBusGProxy  *bus_proxy,
-         }
- }
- 
-+static DBusHandlerResult
-+gsm_manager_bus_filter (DBusConnection *connection,
-+                        DBusMessage    *message,
-+                        void           *user_data)
-+{
-+        GsmManager *manager;
-+
-+        manager = GSM_MANAGER (user_data);
-+
-+        if (dbus_message_is_signal (message,
-+                                    DBUS_INTERFACE_LOCAL, "Disconnected") &&
-+            strcmp (dbus_message_get_path (message), DBUS_PATH_LOCAL) == 0) {
-+                g_debug ("GsmManager: dbus disconnected; disconnecting dbus clients...");
-+                manager->priv->dbus_disconnected = TRUE;
-+                remove_clients_for_connection (manager, NULL);
-+                /* let other filters get this disconnected signal, so that they
-+                 * can handle it too */
-+        }
-+
-+        return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
-+}
- static gboolean
- register_manager (GsmManager *manager)
- {
-         GError *error = NULL;
-+        DBusConnection *connection;
- 
-         error = NULL;
-         manager->priv->connection = dbus_g_bus_get (DBUS_BUS_SESSION, &error);
-@@ -1983,6 +2026,12 @@ register_manager (GsmManager *manager)
-                 exit (1);
-         }
- 
-+        connection = dbus_g_connection_get_connection (manager->priv->connection);
-+        dbus_connection_add_filter (connection,
-+                                    gsm_manager_bus_filter,
-+                                    manager, NULL);
-+        manager->priv->dbus_disconnected = FALSE;
-+
-         manager->priv->bus_proxy = dbus_g_proxy_new_for_name (manager->priv->connection,
-                                                               DBUS_SERVICE_DBUS,
-                                                               DBUS_PATH_DBUS,
---
-cgit v0.9.0.2

diff --git a/gnome-base/gnome-session/gnome-session-3.1.91.ebuild b/gnome-base/gnome-session/gnome-session-3.2.0.ebuild
similarity index 92%
rename from gnome-base/gnome-session/gnome-session-3.1.91.ebuild
rename to gnome-base/gnome-session/gnome-session-3.2.0.ebuild
index 2074a82..7523909 100644
--- a/gnome-base/gnome-session/gnome-session-3.1.91.ebuild
+++ b/gnome-base/gnome-session/gnome-session-3.2.0.ebuild
@@ -5,7 +5,7 @@
 EAPI="4"
 GCONF_DEBUG="yes"
 
-inherit eutils gnome2
+inherit gnome2
 if [[ ${PV} = 9999 ]]; then
 	inherit gnome2-live
 fi
@@ -80,13 +80,6 @@ pkg_setup() {
 	DOCS="AUTHORS ChangeLog NEWS README"
 }
 
-src_prepare() {
-	gnome2_src_prepare
-	# Upstream patches to deal with dbus disconnection; will be in next release
-	epatch "${FILESDIR}/${P}-dbus-disconnected.patch"
-	epatch "${FILESDIR}/${P}-dbus-disconnected2.patch"
-}
-
 src_install() {
 	gnome2_src_install