Merge lp:~jamesodhunt/ubuntu/trusty/gnome-session/bug-1256262 into lp:ubuntu/trusty/gnome-session

[James Hunt]

[Dimitri John Ledkov (xnox)]

"Merged" into lp:~ubuntu-desktop/gnome-session/ubuntu sans quilt brain-deadness =)

ANd uploaded.

review: Approve

=== removed file '.pc/103_kill_the_fail_whale.patch/gnome-session/gsm-fail-whale.c'
--- .pc/103_kill_the_fail_whale.patch/gnome-session/gsm-fail-whale.c	2013-06-19 10:37:29 +0000
+++ .pc/103_kill_the_fail_whale.patch/gnome-session/gsm-fail-whale.c	1970-01-01 00:00:00 +0000
@@ -1,47 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
- * gsm-fail-whale.c
- * Copyright (C) 2012 Red Hat, Inc
- *
- * 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 GNU
- * Lesser 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.
- */
-
-#include <config.h>
-
-#include <glib/gi18n.h>
-#include <glib/gstdio.h>
-
-#include "gsm-fail-whale.h"
-
-void
-gsm_fail_whale_dialog_we_failed  (gboolean            debug_mode,
-                                  gboolean            allow_logout,
-                                  GsmShellExtensions *extensions)
-{
-        gint i;
-        gchar *argv[5];
-
-        i = 0;
-        argv[i++] = LIBEXECDIR "/gnome-session-failed";
-        if (debug_mode)
-                argv[i++] = "--debug";
-        if (allow_logout)
-                argv[i++] = "--allow-logout";
-        if (extensions != NULL && gsm_shell_extensions_n_extensions (extensions) > 0)
-                argv[i++] = "--extensions";
-        argv[i++] = NULL;
-
-        g_spawn_async (NULL, argv, NULL, 0, NULL, NULL, NULL, NULL);
-}
 
=== removed directory '.pc/13_display_session_properties.patch'
=== removed directory '.pc/13_display_session_properties.patch/data'
=== removed file '.pc/13_display_session_properties.patch/data/session-properties.desktop.in.in'
--- .pc/13_display_session_properties.patch/data/session-properties.desktop.in.in	2012-09-05 00:53:57 +0000
+++ .pc/13_display_session_properties.patch/data/session-properties.desktop.in.in	1970-01-01 00:00:00 +0000
@@ -1,15 +0,0 @@
-[Desktop Entry]
-_Name=Startup Applications
-_Comment=Choose what applications to start when you log in
-Exec=gnome-session-properties
-Icon=session-properties
-Terminal=false
-Type=Application
-StartupNotify=true
-Categories=GTK;GNOME;Settings;X-GNOME-PersonalSettings;
-OnlyShowIn=GNOME;Unity;
-NoDisplay=true
-X-GNOME-Bugzilla-Bugzilla=GNOME
-X-GNOME-Bugzilla-Product=gnome-session
-X-GNOME-Bugzilla-Component=gnome-session-properties
-X-GNOME-Bugzilla-Version=@VERSION@
 
=== removed directory '.pc/git_fix_wrong_unref_call.patch'
=== removed directory '.pc/git_fix_wrong_unref_call.patch/gnome-session'
=== removed file '.pc/git_fix_wrong_unref_call.patch/gnome-session/gsm-shell.c'
--- .pc/git_fix_wrong_unref_call.patch/gnome-session/gsm-shell.c	2013-10-11 15:45:25 +0000
+++ .pc/git_fix_wrong_unref_call.patch/gnome-session/gsm-shell.c	1970-01-01 00:00:00 +0000
@@ -1,700 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
- *
- * Copyright (C) 2010 Red Hat, Inc
- *
- * 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 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
- * 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.
- */
-
-#include "config.h"
-
-#include <errno.h>
-#include <string.h>
-#include <unistd.h>
-
-#include <glib.h>
-#include <glib-object.h>
-#include <glib/gi18n.h>
-
-#include <dbus/dbus-glib.h>
-#include <dbus/dbus-glib-lowlevel.h>
-
-#include "gsm-inhibitor.h"
-#include "gsm-shell.h"
-
-#define SHELL_NAME      "org.gnome.Shell"
-#define SHELL_PATH      "/org/gnome/Shell"
-#define SHELL_INTERFACE "org.gnome.Shell"
-
-#define SHELL_END_SESSION_DIALOG_PATH      "/org/gnome/SessionManager/EndSessionDialog"
-#define SHELL_END_SESSION_DIALOG_INTERFACE "org.gnome.SessionManager.EndSessionDialog"
-
-#define GSM_SHELL_DBUS_TYPE_G_OBJECT_PATH_ARRAY (dbus_g_type_get_collection ("GPtrArray", DBUS_TYPE_G_OBJECT_PATH))
-
-#define AUTOMATIC_ACTION_TIMEOUT 60
-
-#define GSM_SHELL_GET_PRIVATE(o)                                   \
-        (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSM_TYPE_SHELL, GsmShellPrivate))
-
-struct _GsmShellPrivate
-{
-        DBusGConnection *bus_connection;
-        DBusGProxy      *bus_proxy;
-        DBusGProxy      *proxy;
-        DBusGProxy      *end_session_dialog_proxy;
-        GsmStore        *inhibitors;
-
-        guint32          is_running : 1;
-
-        DBusGProxyCall  *end_session_open_call;
-        GsmShellEndSessionDialogType end_session_dialog_type;
-
-        guint            update_idle_id;
-};
-
-enum {
-        PROP_0,
-        PROP_IS_RUNNING
-};
-
-enum {
-        END_SESSION_DIALOG_OPENED = 0,
-        END_SESSION_DIALOG_OPEN_FAILED,
-        END_SESSION_DIALOG_CLOSED,
-        END_SESSION_DIALOG_CANCELED,
-        END_SESSION_DIALOG_CONFIRMED_LOGOUT,
-        END_SESSION_DIALOG_CONFIRMED_SHUTDOWN,
-        END_SESSION_DIALOG_CONFIRMED_REBOOT,
-        NUMBER_OF_SIGNALS
-};
-
-static guint signals[NUMBER_OF_SIGNALS] = { 0 };
-
-static void     gsm_shell_class_init   (GsmShellClass *klass);
-static void     gsm_shell_init         (GsmShell      *ck);
-static void     gsm_shell_finalize     (GObject            *object);
-
-static void     gsm_shell_disconnect_from_bus    (GsmShell      *shell);
-
-static DBusHandlerResult gsm_shell_bus_filter (DBusConnection *connection,
-                                                DBusMessage    *message,
-                                                void           *user_data);
-
-static void     gsm_shell_on_name_owner_changed (DBusGProxy *bus_proxy,
-                                                 const char *name,
-                                                 const char *prev_owner,
-                                                 const char *new_owner,
-                                                 GsmShell   *shell);
-static void     queue_end_session_dialog_update (GsmShell *shell);
-
-G_DEFINE_TYPE (GsmShell, gsm_shell, G_TYPE_OBJECT);
-
-static void
-gsm_shell_get_property (GObject    *object,
-                             guint       prop_id,
-                             GValue     *value,
-                             GParamSpec *pspec)
-{
-        GsmShell *shell = GSM_SHELL (object);
-
-        switch (prop_id) {
-        case PROP_IS_RUNNING:
-                g_value_set_boolean (value,
-                                     shell->priv->is_running);
-                break;
-
-        default:
-                G_OBJECT_WARN_INVALID_PROPERTY_ID (object,
-                                                   prop_id,
-                                                   pspec);
-        }
-}
-
-static void
-gsm_shell_class_init (GsmShellClass *shell_class)
-{
-        GObjectClass *object_class;
-        GParamSpec   *param_spec;
-
-        object_class = G_OBJECT_CLASS (shell_class);
-
-        object_class->finalize = gsm_shell_finalize;
-        object_class->get_property = gsm_shell_get_property;
-
-        param_spec = g_param_spec_boolean ("is-running",
-                                           "Is running",
-                                           "Whether GNOME Shell is running in the session",
-                                           FALSE,
-                                           G_PARAM_READABLE);
-
-        g_object_class_install_property (object_class, PROP_IS_RUNNING,
-                                         param_spec);
-
-        signals [END_SESSION_DIALOG_OPENED] =
-                g_signal_new ("end-session-dialog-opened",
-                              G_OBJECT_CLASS_TYPE (object_class),
-                              G_SIGNAL_RUN_LAST,
-                              G_STRUCT_OFFSET (GsmShellClass, end_session_dialog_opened),
-                              NULL, NULL, NULL,
-                              G_TYPE_NONE, 0);
-
-        signals [END_SESSION_DIALOG_OPEN_FAILED] =
-                g_signal_new ("end-session-dialog-open-failed",
-                              G_OBJECT_CLASS_TYPE (object_class),
-                              G_SIGNAL_RUN_LAST,
-                              G_STRUCT_OFFSET (GsmShellClass, end_session_dialog_open_failed),
-                              NULL, NULL, NULL,
-                              G_TYPE_NONE, 0);
-
-        signals [END_SESSION_DIALOG_CLOSED] =
-                g_signal_new ("end-session-dialog-closed",
-                              G_OBJECT_CLASS_TYPE (object_class),
-                              G_SIGNAL_RUN_LAST,
-                              G_STRUCT_OFFSET (GsmShellClass, end_session_dialog_closed),
-                              NULL, NULL, NULL,
-                              G_TYPE_NONE, 0);
-
-        signals [END_SESSION_DIALOG_CANCELED] =
-                g_signal_new ("end-session-dialog-canceled",
-                              G_OBJECT_CLASS_TYPE (object_class),
-                              G_SIGNAL_RUN_LAST,
-                              G_STRUCT_OFFSET (GsmShellClass, end_session_dialog_canceled),
-                              NULL, NULL, NULL,
-                              G_TYPE_NONE, 0);
-
-        signals [END_SESSION_DIALOG_CONFIRMED_LOGOUT] =
-                g_signal_new ("end-session-dialog-confirmed-logout",
-                              G_OBJECT_CLASS_TYPE (object_class),
-                              G_SIGNAL_RUN_LAST,
-                              G_STRUCT_OFFSET (GsmShellClass, end_session_dialog_confirmed_logout),
-                              NULL, NULL, NULL,
-                              G_TYPE_NONE, 0);
-
-        signals [END_SESSION_DIALOG_CONFIRMED_SHUTDOWN] =
-                g_signal_new ("end-session-dialog-confirmed-shutdown",
-                              G_OBJECT_CLASS_TYPE (object_class),
-                              G_SIGNAL_RUN_LAST,
-                              G_STRUCT_OFFSET (GsmShellClass, end_session_dialog_confirmed_shutdown),
-                              NULL, NULL, NULL,
-                              G_TYPE_NONE, 0);
-
-        signals [END_SESSION_DIALOG_CONFIRMED_REBOOT] =
-                g_signal_new ("end-session-dialog-confirmed-reboot",
-                              G_OBJECT_CLASS_TYPE (object_class),
-                              G_SIGNAL_RUN_LAST,
-                              G_STRUCT_OFFSET (GsmShellClass, end_session_dialog_confirmed_reboot),
-                              NULL, NULL, NULL,
-                              G_TYPE_NONE, 0);
-
-        g_type_class_add_private (shell_class, sizeof (GsmShellPrivate));
-}
-
-static DBusHandlerResult
-gsm_shell_bus_filter (DBusConnection *connection,
-                       DBusMessage    *message,
-                       void           *user_data)
-{
-        GsmShell *shell;
-
-        shell = GSM_SHELL (user_data);
-
-        if (dbus_message_is_signal (message,
-                                    DBUS_INTERFACE_LOCAL, "Disconnected") &&
-            strcmp (dbus_message_get_path (message), DBUS_PATH_LOCAL) == 0) {
-                gsm_shell_disconnect_from_bus (shell);
-                /* let other filters get this disconnected signal, so that they
-                 * can handle it too */
-        }
-
-        return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
-}
-
-static gboolean
-gsm_shell_ensure_connection (GsmShell  *shell,
-                             GError   **error)
-{
-        GError  *connection_error;
-        gboolean is_running;
-
-        connection_error = NULL;
-
-        if (shell->priv->bus_connection == NULL) {
-                DBusConnection *connection;
-
-                shell->priv->bus_connection = dbus_g_bus_get (DBUS_BUS_SESSION,
-                                                               &connection_error);
-
-                if (shell->priv->bus_connection == NULL) {
-                        g_propagate_error (error, connection_error);
-                        is_running = FALSE;
-                        goto out;
-                }
-
-                connection = dbus_g_connection_get_connection (shell->priv->bus_connection);
-                dbus_connection_set_exit_on_disconnect (connection, FALSE);
-                dbus_connection_add_filter (connection,
-                                            gsm_shell_bus_filter,
-                                            shell, NULL);
-        }
-
-        if (shell->priv->bus_proxy == NULL) {
-                shell->priv->bus_proxy =
-                        dbus_g_proxy_new_for_name_owner (shell->priv->bus_connection,
-                                                         DBUS_SERVICE_DBUS,
-                                                         DBUS_PATH_DBUS,
-                                                         DBUS_INTERFACE_DBUS,
-                                                         &connection_error);
-
-                if (shell->priv->bus_proxy == NULL) {
-                        g_propagate_error (error, connection_error);
-                        is_running = FALSE;
-                        goto out;
-                }
-
-                dbus_g_proxy_add_signal (shell->priv->bus_proxy,
-                                         "NameOwnerChanged",
-                                         G_TYPE_STRING,
-                                         G_TYPE_STRING,
-                                         G_TYPE_STRING,
-                                         G_TYPE_INVALID);
-
-                dbus_g_proxy_connect_signal (shell->priv->bus_proxy,
-                                             "NameOwnerChanged",
-                                             G_CALLBACK (gsm_shell_on_name_owner_changed),
-                                             shell, NULL);
-        }
-
-        if (shell->priv->proxy == NULL) {
-                shell->priv->proxy =
-                        dbus_g_proxy_new_for_name_owner (shell->priv->bus_connection,
-                                                         SHELL_NAME,
-                                                         SHELL_PATH,
-                                                         SHELL_INTERFACE,
-                                                         &connection_error);
-
-                if (shell->priv->proxy == NULL) {
-                        g_propagate_error (error, connection_error);
-                        is_running = FALSE;
-                        goto out;
-                }
-        }
-
-        g_debug ("GsmShell: Connected to the shell");
-
-        is_running = TRUE;
-
- out:
-        if (shell->priv->is_running != is_running) {
-                shell->priv->is_running = is_running;
-                g_object_notify (G_OBJECT (shell), "is-running");
-        }
-
-        if (!is_running) {
-                g_debug ("GsmShell: Not connected to the shell");
-
-                if (shell->priv->bus_connection == NULL) {
-                        g_clear_object (&shell->priv->bus_proxy);
-                        g_clear_object (&shell->priv->proxy);
-                } else if (shell->priv->bus_proxy == NULL) {
-                        g_clear_object (&shell->priv->proxy);
-                }
-        }
-
-        return is_running;
-}
-
-static void
-gsm_shell_on_name_owner_changed (DBusGProxy    *bus_proxy,
-                                 const char    *name,
-                                 const char    *prev_owner,
-                                 const char    *new_owner,
-                                 GsmShell      *shell)
-{
-        if (name != NULL && strcmp (name, SHELL_NAME) != 0) {
-                return;
-        }
-
-        g_clear_object (&shell->priv->proxy);
-
-        gsm_shell_ensure_connection (shell, NULL);
-}
-
-static void
-gsm_shell_init (GsmShell *shell)
-{
-        shell->priv = GSM_SHELL_GET_PRIVATE (shell);
-
-        gsm_shell_ensure_connection (shell, NULL);
-}
-
-static void
-gsm_shell_disconnect_from_bus (GsmShell *shell)
-{
-        g_clear_object (&shell->priv->bus_proxy);
-        g_clear_object (&shell->priv->proxy);
-
-        if (shell->priv->bus_connection != NULL) {
-                DBusConnection *connection;
-                connection = dbus_g_connection_get_connection (shell->priv->bus_connection);
-                dbus_connection_remove_filter (connection,
-                                               gsm_shell_bus_filter,
-                                               shell);
-
-                dbus_g_connection_unref (shell->priv->bus_connection);
-                shell->priv->bus_connection = NULL;
-        }
-}
-
-static void
-gsm_shell_finalize (GObject *object)
-{
-        GsmShell *shell;
-        GObjectClass  *parent_class;
-
-        shell = GSM_SHELL (object);
-
-        parent_class = G_OBJECT_CLASS (gsm_shell_parent_class);
-
-        g_object_unref (shell->priv->inhibitors);
-
-        gsm_shell_disconnect_from_bus (shell);
-
-        if (parent_class->finalize != NULL) {
-                parent_class->finalize (object);
-        }
-}
-
-GsmShell *
-gsm_shell_new (void)
-{
-        GsmShell *shell;
-
-        shell = g_object_new (GSM_TYPE_SHELL, NULL);
-
-        return shell;
-}
-
-GsmShell *
-gsm_get_shell (void)
-{
-        static GsmShell *shell = NULL;
-
-        if (shell == NULL) {
-                shell = gsm_shell_new ();
-        }
-
-        return g_object_ref (shell);
-}
-
-gboolean
-gsm_shell_is_running (GsmShell *shell)
-{
-        gsm_shell_ensure_connection (shell, NULL);
-
-        return shell->priv->is_running;
-}
-
-static gboolean
-add_inhibitor_to_array (const char   *id,
-                        GsmInhibitor *inhibitor,
-                        GPtrArray    *array)
-{
-
-        g_ptr_array_add (array,
-                         g_strdup (gsm_inhibitor_peek_id (inhibitor)));
-        return FALSE;
-}
-
-static GPtrArray *
-get_array_from_store (GsmStore *inhibitors)
-{
-        GPtrArray *array;
-
-        array = g_ptr_array_new ();
-
-        gsm_store_foreach (inhibitors,
-                           (GsmStoreFunc) add_inhibitor_to_array,
-                           array);
-
-        return array;
-}
-
-static void
-on_open_finished (DBusGProxy     *proxy,
-                  DBusGProxyCall *call,
-                  GsmShell       *shell)
-{
-        GError         *error;
-        gboolean        res;
-
-        g_assert (shell->priv->end_session_open_call == call);
-
-        error = NULL;
-        res = dbus_g_proxy_end_call (proxy,
-                                     call,
-                                     &error,
-                                     G_TYPE_INVALID);
-        shell->priv->end_session_open_call = NULL;
-
-        if (shell->priv->update_idle_id != 0) {
-                g_source_remove (shell->priv->update_idle_id);
-                shell->priv->update_idle_id = 0;
-        }
-
-        if (!res) {
-                g_warning ("Unable to open shell end session dialog");
-                g_signal_emit (G_OBJECT (shell), signals[END_SESSION_DIALOG_OPEN_FAILED], 0);
-                return;
-        }
-
-        g_signal_emit (G_OBJECT (shell), signals[END_SESSION_DIALOG_OPENED], 0);
-}
-
-static void
-on_end_session_dialog_closed (DBusGProxy *proxy,
-                              GsmShell   *shell)
-{
-        if (shell->priv->update_idle_id != 0) {
-                g_source_remove (shell->priv->update_idle_id);
-                shell->priv->update_idle_id = 0;
-        }
-
-        g_signal_handlers_disconnect_by_func (shell->priv->inhibitors,
-                                              G_CALLBACK (queue_end_session_dialog_update),
-                                              shell);
-
-        g_signal_emit (G_OBJECT (shell), signals[END_SESSION_DIALOG_CLOSED], 0);
-}
-
-static void
-on_end_session_dialog_canceled (DBusGProxy *proxy,
-                                GsmShell   *shell)
-{
-        if (shell->priv->update_idle_id != 0) {
-                g_source_remove (shell->priv->update_idle_id);
-                shell->priv->update_idle_id = 0;
-        }
-
-        g_signal_handlers_disconnect_by_func (shell->priv->inhibitors,
-                                              G_CALLBACK (queue_end_session_dialog_update),
-                                              shell);
-
-        g_signal_emit (G_OBJECT (shell), signals[END_SESSION_DIALOG_CANCELED], 0);
-}
-
-static void
-on_end_session_dialog_confirmed_logout (DBusGProxy *proxy,
-                                        GsmShell   *shell)
-{
-        if (shell->priv->update_idle_id != 0) {
-                g_source_remove (shell->priv->update_idle_id);
-                shell->priv->update_idle_id = 0;
-        }
-
-        g_signal_emit (G_OBJECT (shell), signals[END_SESSION_DIALOG_CONFIRMED_LOGOUT], 0);
-}
-
-static void
-on_end_session_dialog_confirmed_shutdown (DBusGProxy *proxy,
-                                          GsmShell   *shell)
-{
-        if (shell->priv->update_idle_id != 0) {
-                g_source_remove (shell->priv->update_idle_id);
-                shell->priv->update_idle_id = 0;
-        }
-
-        g_signal_emit (G_OBJECT (shell), signals[END_SESSION_DIALOG_CONFIRMED_SHUTDOWN], 0);
-}
-
-static void
-on_end_session_dialog_confirmed_reboot (DBusGProxy *proxy,
-                                        GsmShell   *shell)
-{
-        if (shell->priv->update_idle_id != 0) {
-                g_source_remove (shell->priv->update_idle_id);
-                shell->priv->update_idle_id = 0;
-        }
-
-        g_signal_emit (G_OBJECT (shell), signals[END_SESSION_DIALOG_CONFIRMED_REBOOT], 0);
-}
-
-static void
-on_end_session_dialog_proxy_destroyed (DBusGProxy *proxy,
-                                       GsmShell   *shell)
-{
-        /* FIXME - is this right? */
-        if (shell->priv->end_session_dialog_proxy != NULL) {
-                g_object_unref (shell->priv->proxy);
-                shell->priv->end_session_dialog_proxy = NULL;
-        }
-}
-
-static gboolean
-on_need_end_session_dialog_update (GsmShell *shell)
-{
-        /* No longer need an update */
-        if (shell->priv->update_idle_id == 0)
-                return FALSE;
-
-        shell->priv->update_idle_id = 0;
-
-        gsm_shell_open_end_session_dialog (shell,
-                                           shell->priv->end_session_dialog_type,
-                                           shell->priv->inhibitors);
-        return FALSE;
-}
-
-static void
-queue_end_session_dialog_update (GsmShell *shell)
-{
-        if (shell->priv->update_idle_id != 0)
-                return;
-
-        shell->priv->update_idle_id = g_idle_add ((GSourceFunc) on_need_end_session_dialog_update,
-                                                  shell);
-}
-
-gboolean
-gsm_shell_open_end_session_dialog (GsmShell *shell,
-                                   GsmShellEndSessionDialogType type,
-                                   GsmStore *inhibitors)
-{
-        DBusGProxyCall  *call;
-        GPtrArray *inhibitor_array;
-        GError *error;
-
-        error = NULL;
-        if (!gsm_shell_ensure_connection (shell, &error)) {
-                g_warning ("Could not connect to the shell: %s",
-                           error->message);
-                g_error_free (error);
-                return FALSE;
-        }
-
-        if (shell->priv->end_session_open_call != NULL) {
-                g_return_val_if_fail (shell->priv->end_session_dialog_type == type,
-                                      FALSE);
-
-                return TRUE;
-        }
-
-        if (shell->priv->end_session_dialog_proxy == NULL) {
-                DBusGProxy *proxy;
-
-                proxy = dbus_g_proxy_new_for_name (shell->priv->bus_connection,
-                                                   SHELL_NAME,
-                                                   SHELL_END_SESSION_DIALOG_PATH,
-                                                   SHELL_END_SESSION_DIALOG_INTERFACE);
-
-                g_assert (proxy != NULL);
-
-                shell->priv->end_session_dialog_proxy = proxy;
-
-                g_signal_connect (proxy, "destroy",
-                                  G_CALLBACK (on_end_session_dialog_proxy_destroyed),
-                                  shell);
-
-                dbus_g_proxy_add_signal (shell->priv->end_session_dialog_proxy,
-                                         "Closed", G_TYPE_INVALID);
-                dbus_g_proxy_connect_signal (shell->priv->end_session_dialog_proxy,
-                                             "Closed",
-                                             G_CALLBACK (on_end_session_dialog_closed),
-                                             shell, NULL);
-
-                dbus_g_proxy_add_signal (shell->priv->end_session_dialog_proxy,
-                                         "Canceled", G_TYPE_INVALID);
-                dbus_g_proxy_connect_signal (shell->priv->end_session_dialog_proxy,
-                                             "Canceled",
-                                             G_CALLBACK (on_end_session_dialog_canceled),
-                                             shell, NULL);
-                dbus_g_proxy_add_signal (shell->priv->end_session_dialog_proxy,
-                                         "ConfirmedLogout", G_TYPE_INVALID);
-                dbus_g_proxy_connect_signal (shell->priv->end_session_dialog_proxy,
-                                             "ConfirmedLogout",
-                                             G_CALLBACK (on_end_session_dialog_confirmed_logout),
-                                             shell, NULL);
-                dbus_g_proxy_add_signal (shell->priv->end_session_dialog_proxy,
-                                         "ConfirmedShutdown", G_TYPE_INVALID);
-                dbus_g_proxy_connect_signal (shell->priv->end_session_dialog_proxy,
-                                             "ConfirmedShutdown",
-                                             G_CALLBACK (on_end_session_dialog_confirmed_shutdown),
-                                             shell, NULL);
-                dbus_g_proxy_add_signal (shell->priv->end_session_dialog_proxy,
-                                         "ConfirmedReboot", G_TYPE_INVALID);
-                dbus_g_proxy_connect_signal (shell->priv->end_session_dialog_proxy,
-                                             "ConfirmedReboot",
-                                             G_CALLBACK (on_end_session_dialog_confirmed_reboot),
-                                             shell, NULL);
-        }
-
-        inhibitor_array = get_array_from_store (inhibitors);
-
-        call = dbus_g_proxy_begin_call_with_timeout (shell->priv->end_session_dialog_proxy,
-                                                     "Open",
-                                                     (DBusGProxyCallNotify)
-                                                     on_open_finished,
-                                                     shell,
-                                                     NULL,
-                                                     INT_MAX,
-                                                     G_TYPE_UINT,
-                                                     (guint) type,
-                                                     G_TYPE_UINT,
-                                                     (guint) 0,
-                                                     G_TYPE_UINT,
-                                                     AUTOMATIC_ACTION_TIMEOUT,
-                                                     GSM_SHELL_DBUS_TYPE_G_OBJECT_PATH_ARRAY,
-                                                     inhibitor_array,
-                                                     G_TYPE_INVALID);
-        g_ptr_array_foreach (inhibitor_array, (GFunc) g_free, NULL);
-        g_ptr_array_free (inhibitor_array, TRUE);
-
-        if (call == NULL) {
-                g_warning ("Unable to make Open call");
-                return FALSE;
-        }
-
-        g_object_ref (inhibitors);
-
-        if (shell->priv->inhibitors != NULL) {
-                g_signal_handlers_disconnect_by_func (shell->priv->inhibitors,
-                                                      G_CALLBACK (queue_end_session_dialog_update),
-                                                      shell);
-                g_object_unref (shell->priv->inhibitors);
-        }
-
-        shell->priv->inhibitors = inhibitors;
-
-        g_signal_connect_swapped (inhibitors, "added",
-                                  G_CALLBACK (queue_end_session_dialog_update),
-                                  shell);
-
-        g_signal_connect_swapped (inhibitors, "removed",
-                                  G_CALLBACK (queue_end_session_dialog_update),
-                                  shell);
-
-        shell->priv->end_session_open_call = call;
-        shell->priv->end_session_dialog_type = type;
-
-        return TRUE;
-}
-
-void
-gsm_shell_close_end_session_dialog (GsmShell *shell)
-{
-        if (!shell->priv->end_session_dialog_proxy)
-                return;
-
-        dbus_g_proxy_call_no_reply (shell->priv->end_session_dialog_proxy, "Close", G_TYPE_INVALID);
-}
 
=== modified file 'debian/changelog'
--- debian/changelog	2013-10-11 15:45:25 +0000
+++ debian/changelog	2013-12-04 09:35:55 +0000
@@ -1,3 +1,10 @@
+gnome-session (3.9.90-0ubuntu4) UNRELEASED; urgency=low
+
+  * debian/gnome-session.user-session.upstart: Unset Upstart event
+    variables to avoid stop(8) from stopping the users session (LP: #1256262).
+
+ -- James Hunt <[e-mail]>  Wed, 04 Dec 2013 09:31:07 +0000
+
 gnome-session (3.9.90-0ubuntu3) saucy; urgency=low
 
   * debian/patches/git_fix_wrong_unref_call.patch: 
 
=== modified file 'debian/gnome-session.user-session.upstart'
--- debian/gnome-session.user-session.upstart	2013-05-22 12:55:52 +0000
+++ debian/gnome-session.user-session.upstart	2013-12-04 09:35:55 +0000
@@ -9,7 +9,10 @@
 emits desktop-start
 emits desktop-end
 
+script
+unset UPSTART_EVENTS UPSTART_INSTANCE UPSTART_JOB
 exec gnome-session --session=$DESKTOP_SESSION
+end script
 
 post-start exec initctl emit desktop-start DESKTOP_SESSION=$DESKTOP_SESSION