[gnome-shell/f20] Fix crash when using some Java applications

[Florian Müllner]

commit 7ed93f7a15be9121298b1abe233a5573648b31b1
Author: Florian Müllner <fmuellner at gnome.org>
Date:   Thu Feb 6 18:08:42 2014 +0100

    Fix crash when using some Java applications

 ...ll-app-Don-t-crash-when-trying-to-dispose.patch |   36 ++++++++++++++++++++
 gnome-shell.spec                                   |    7 +++-
 2 files changed, 42 insertions(+), 1 deletions(-)
---
diff --git a/0001-shell-app-Don-t-crash-when-trying-to-dispose.patch b/0001-shell-app-Don-t-crash-when-trying-to-dispose.patch
new file mode 100644
index 0000000..c89d3b5
--- /dev/null
+++ b/0001-shell-app-Don-t-crash-when-trying-to-dispose.patch
@@ -0,0 +1,36 @@
+From a5370ce3bd9092d0909e1f00dc9f1b53ebe40e37 Mon Sep 17 00:00:00 2001
+From: "Jasper St. Pierre" <jstpierre at mecheye.net>
+Date: Tue, 28 Jan 2014 16:47:23 -0500
+Subject: [PATCH] shell-app: Don't crash when trying to dispose
+
+If we dispose a ShellApp that has windows left, then we'll crash
+when we remove the last window, as that frees and NULLs out
+app->running_state.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=723197
+---
+ src/shell-app.c | 8 +++-----
+ 1 file changed, 3 insertions(+), 5 deletions(-)
+
+diff --git a/src/shell-app.c b/src/shell-app.c
+index 99f51ed..f5b647c 100644
+--- a/src/shell-app.c
++++ b/src/shell-app.c
+@@ -1590,11 +1590,9 @@ shell_app_dispose (GObject *object)
+       app->entry = NULL;
+     }
+ 
+-  if (app->running_state)
+-    {
+-      while (app->running_state->windows)
+-        _shell_app_remove_window (app, app->running_state->windows->data);
+-    }
++  while (app->running_state)
++    _shell_app_remove_window (app, app->running_state->windows->data);
++
+   /* We should have been transitioned when we removed all of our windows */
+   g_assert (app->state == SHELL_APP_STATE_STOPPED);
+   g_assert (app->running_state == NULL);
+-- 
+1.8.5.3
+
diff --git a/gnome-shell.spec b/gnome-shell.spec
index 48e38a5..380cb61 100644
--- a/gnome-shell.spec
+++ b/gnome-shell.spec
@@ -1,6 +1,6 @@
 Name:           gnome-shell
 Version:        3.10.3
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Window management and application launching for GNOME
 
 Group:          User Interface/Desktops
@@ -16,6 +16,7 @@ Patch1: gnome-shell-favourite-apps-firefox.patch
 Patch10: fix-app-switcher-regressions.patch
 Patch11: track-skip-taskbar-changes.patch
 Patch12: 0001-window-tracker-Be-more-cautious-when-setting-focus-a.patch
+Patch13: 0001-shell-app-Don-t-crash-when-trying-to-dispose.patch
 
 %define clutter_version 1.13.4
 %define gnome_bluetooth_version 1:3.9.0
@@ -123,6 +124,7 @@ easy to use experience.
 %patch10 -p1 -b .fix-app-switcher
 %patch11 -p1 -b .track-skip-taskbar-changes
 %patch12 -p1 -b .fix-app-menu
+%patch13 -p1 -b .fix-app-dispose-crash
 
 %build
 (if ! test -x configure; then NOCONFIGURE=1 ./autogen.sh; fi;
@@ -182,6 +184,9 @@ glib-compile-schemas --allow-any-name %{_datadir}/glib-2.0/schemas &> /dev/null
 %exclude %{_datadir}/gtk-doc
 
 %changelog
+* Thu Feb 06 2014 Florian Müllner <fmuellner at redhat.com> - 3.10.4-4
+- Backport fix for crash when using some Java applications (#1058314)
+
 * Fri Jan 31 2014 Florian Müllner <fmuellner at redhat.com> - 3.10.3-3
 - Backport upstream fixes:
  - Fix app-menu regression (#1057517)