Handle mozilla-firefox.desktop to firefox.desktop transition for user config

- Change gnome-shell-favourite-apps-firefox.patch to also patch the JS code
  to handle the transition from mozilla-firefox.desktop to firefox.desktop.
  (#808894, reported by Jonathan Kamens)

gnome-shell-favourite-apps-firefox.patch

@@ -9,3 +9,18 @@
        <_summary>List of desktop file IDs for favorite applications</_summary>
        <_description>
          The applications corresponding to these identifiers
+--- a/js/ui/appFavorites.js
++++ b/js/ui/appFavorites.js
+@@ -24,6 +24,12 @@ const AppFavorites = new Lang.Class({
+ 
+     _reload: function() {
+         let ids = global.settings.get_strv(this.FAVORITE_APPS_KEY);
++        // Fedora: Replace old mozilla-firefox.desktop with firefox.desktop,
++        for (let i = 0; i < ids.length; i++) {
++            if (ids[i] == 'mozilla-firefox.desktop')
++                ids[i] = 'firefox.desktop'
++        }
++
+         let appSys = Shell.AppSystem.get_default();
+         let apps = ids.map(function (id) {
+                 return appSys.lookup_app(id);

gnome-shell.spec

@@ -1,6 +1,6 @@
 Name:           gnome-shell
 Version:        3.4.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Window management and application launching for GNOME
 
 Group:          User Interface/Desktops
@@ -147,6 +147,11 @@ glib-compile-schemas --allow-any-name %{_datadir}/glib-2.0/schemas ||:
 %exclude %{_datadir}/gtk-doc
 
 %changelog
+* Thu Apr  5 2012 Owen Taylor <otaylor@redhat.com> - 3.4.0-2
+- Change gnome-shell-favourite-apps-firefox.patch to also patch the JS code
+  to handle the transition from mozilla-firefox.desktop to firefox.desktop.
+  (#808894, reported by Jonathan Kamens)
+
 * Tue Mar 27 2012 Richard Hughes <hughsient@gmail.com> - 3.4.0-1
 - Update to 3.4.0