Merge lp:~darkxst/ubuntu/raring/gnome-shell/lp1064584 into lp:ubuntu/raring/gnome-shell

[Tim Lunn]

[Brian Murray (brian-murray)]

I've uploaded this to raring-proposed.

=== modified file 'debian/changelog'
--- debian/changelog	2013-04-22 08:38:14 +0000
+++ debian/changelog	2013-05-27 07:15:36 +0000
@@ -1,3 +1,10 @@
+gnome-shell (3.6.3.1-0ubuntu6.1) raring; urgency=low
+
+  * debian/patches/git_relock_screen_after_crash.patch:
+    - backport upstream patch to relock session after crash (LP: #1064584)
+
+ -- Tim Lunn <[e-mail]>  Mon, 27 May 2013 09:33:11 +1000
+
 gnome-shell (3.6.3.1-0ubuntu6) raring; urgency=low
 
   * debian/patches:

=== added file 'debian/patches/git_relock_screen_after_crash.patch'
--- debian/patches/git_relock_screen_after_crash.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/git_relock_screen_after_crash.patch	2013-05-27 07:15:36 +0000
@@ -0,0 +1,210 @@
+From 90e0e3410b94c9b3221c881ea1af1e579249913e Mon Sep 17 00:00:00 2001
+From: Colin Walters <[e-mail]>
+Date: Thu, 17 Jan 2013 14:39:54 -0500
+Subject: [PATCH] Re-lock the screen if we're restarted from a previously crashed shell
+
+This way we "fail closed", which is better for security.
+
+See https://bugs.launchpad.net/ubuntu/+source/gdm/+bug/1064584
+
+https://bugzilla.gnome.org/show_bug.cgi?id=691987
+---
+ js/ui/main.js         |    3 +
+ js/ui/screenShield.js |   13 ++++++
+ src/shell-global.c    |  100 +++++++++++++++++++++++++++++++++++++++++++++++++
+ src/shell-global.h    |    8 ++++
+ 4 files changed, 124 insertions(+), 0 deletions(-)
+
+--- a/js/ui/screenShield.js
++++ b/js/ui/screenShield.js
+@@ -28,6 +28,8 @@
+ const LOCK_ENABLED_KEY = 'lock-enabled';
+ const LOCK_DELAY_KEY = 'lock-delay';
+ 
++const LOCKED_STATE_STR = 'screenShield.locked';
++
+ const CURTAIN_SLIDE_TIME = 0.3;
+ // fraction of screen height the arrow must reach before completing
+ // the slide up automatically
+@@ -882,6 +884,7 @@
+         this._isActive = false;
+         this._isLocked = false;
+         this.emit('lock-status-changed');
++        global.set_runtime_state(LOCKED_STATE_STR, null);
+     },
+ 
+     lock: function(animate) {
+@@ -905,11 +908,22 @@
+         }
+ 
+         this._resetLockScreen(animate, animate);
++        global.set_runtime_state(LOCKED_STATE_STR, GLib.Variant.new('b', true));
+ 
+         this._isActive = true;
+         this._isLocked = true;
+         this.emit('lock-status-changed');
+     },
++
++    // If the previous shell crashed, and gnome-session restarted us, then re-lock
++    lockIfWasLocked: function() {
++        let wasLocked = global.get_runtime_state('b', LOCKED_STATE_STR);
++        if (wasLocked === null)
++            return;
++        Meta.later_add(Meta.LaterType.BEFORE_REDRAW, Lang.bind(this, function() {
++            this.lock(false);
++        }));
++    }
+ });
+ Signals.addSignalMethods(ScreenShield.prototype);
+ 
+--- a/src/shell-global.c
++++ b/src/shell-global.c
+@@ -82,6 +82,8 @@
+   const char *userdatadir;
+   StFocusManager *focus_manager;
+ 
++  GFile *runtime_state_path;
++
+   guint work_count;
+   GSList *leisure_closures;
+   guint leisure_function_id;
+@@ -236,6 +238,8 @@
+   const char *datadir = g_getenv ("GNOME_SHELL_DATADIR");
+   const char *shell_js = g_getenv("GNOME_SHELL_JS");
+   char *imagedir, **search_path;
++  char *path;
++  const char *byteorder_string;
+ 
+   if (!datadir)
+     datadir = GNOME_SHELL_DATADIR;
+@@ -258,6 +262,20 @@
+   global->userdatadir = g_build_filename (g_get_user_data_dir (), "gnome-shell", NULL);
+   g_mkdir_with_parents (global->userdatadir, 0700);
+ 
++#if G_BYTE_ORDER == G_LITTLE_ENDIAN
++  byteorder_string = "LE";
++#else
++  byteorder_string = "BE";
++#endif
++
++  /* And the runtime state */
++  path = g_strdup_printf ("%s/gnome-shell/runtime-state-%s.%s",
++                          g_get_user_runtime_dir (),
++                          byteorder_string,
++                          XDisplayName (NULL));
++  (void) g_mkdir_with_parents (path, 0700);
++  global->runtime_state_path = g_file_new_for_path (path);
++
+   global->settings = g_settings_new ("org.gnome.shell");
+   
+   global->grab_notifier = GTK_WINDOW (gtk_window_new (GTK_WINDOW_TOPLEVEL));
+@@ -294,6 +312,8 @@
+ 
+   the_object = NULL;
+ 
++  g_clear_object (&global->runtime_state_path);
++
+   G_OBJECT_CLASS(shell_global_parent_class)->finalize (object);
+ }
+ 
+@@ -1733,3 +1753,83 @@
+   else
+     return NULL;
+ }
++
++static GFile *
++get_runtime_state_path (ShellGlobal  *global,
++                        const char   *property_name)
++{
++  return g_file_get_child (global->runtime_state_path, property_name);
++}
++
++/**
++ * shell_global_set_runtime_state:
++ * @global: a #ShellGlobal
++ * @property_name: Name of the property
++ * @variant: (allow-none): A #GVariant, or %NULL to unset
++ *
++ * Change the value of serialized runtime state.
++ */
++void
++shell_global_set_runtime_state (ShellGlobal  *global,
++                                const char   *property_name,
++                                GVariant     *variant)
++{
++  GFile *path;
++
++  path = get_runtime_state_path (global, property_name);
++
++  if (variant == NULL)
++    (void) g_file_delete (path, NULL, NULL);
++  else
++    {
++      gsize size = g_variant_get_size (variant);
++      g_file_replace_contents (path, g_variant_get_data (variant), size,
++                               NULL, FALSE, G_FILE_CREATE_REPLACE_DESTINATION,
++                               NULL, NULL, NULL);
++    }
++}
++
++/**
++ * shell_global_get_runtime_state:
++ * @global: a #ShellGlobal
++ * @property_type: Expected data type
++ * @property_name: Name of the property
++ *
++ * The shell maintains "runtime" state which does not persist across
++ * logout or reboot.
++ *
++ * Returns: The value of a serialized property, or %NULL if none stored
++ */
++GVariant *
++shell_global_get_runtime_state (ShellGlobal  *global,
++                                const char   *property_type,
++                                const char   *property_name)
++{
++  GVariant *res = NULL;
++  GMappedFile *mfile;
++  GFile *path;
++  char *pathstr;
++  GError *local_error = NULL;
++
++  path = get_runtime_state_path (global, property_name);
++  pathstr = g_file_get_path (path);
++  mfile = g_mapped_file_new (pathstr, FALSE, &local_error);
++  if (!mfile)
++    {
++      if (!g_error_matches (local_error, G_FILE_ERROR, G_FILE_ERROR_NOENT))
++        {
++          g_warning ("Failed to open runtime state: %s", local_error->message);
++        }
++      g_clear_error (&local_error);
++    }
++  else
++    {
++      GBytes *bytes = g_mapped_file_get_bytes (mfile);
++      res = g_variant_new_from_bytes ((GVariantType*)property_type, bytes, TRUE);
++      g_bytes_unref (bytes);
++      g_mapped_file_unref (mfile);
++    }
++
++ out:
++  return res;
++}
+--- a/src/shell-global.h
++++ b/src/shell-global.h
+@@ -138,6 +138,14 @@
+ 
+ ClutterActor * shell_global_create_xrootpmap_texture (ShellGlobal *global);
+ 
++void     shell_global_set_runtime_state      (ShellGlobal  *global,
++                                              const char   *property_name,
++                                              GVariant     *variant);
++GVariant * shell_global_get_runtime_state       (ShellGlobal  *global,
++                                                 const char   *property_type,
++                                                 const char   *property_name);
++
++
+ G_END_DECLS
+ 
+ #endif /* __SHELL_GLOBAL_H__ */

=== modified file 'debian/patches/series'
--- debian/patches/series	2013-04-22 08:38:14 +0000
+++ debian/patches/series	2013-05-27 07:15:36 +0000
@@ -12,3 +12,4 @@
 git_fix_dialog_activate_signals.patch
 git_add_stylesheets_signal.patch
 git_fix_theme_node_crash.patch
+git_relock_screen_after_crash.patch