r35417 - in /desktop/unstable/gnome-shell/debian: changelog patches/03_don-t-show-apps-in-NoDisplay-categories.patch patches/03_fix_nodisplay.patch patches/04_fix_nodisplay.patch patches/series

[joss at users.alioth.debian.org]

Author: joss
Date: Sat Jun 23 19:21:38 2012
New Revision: 35417

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=35417
Log:
Reintroduce 27-don-t-show-apps-in-NoDisplay-categories.patch which is 
still needed, and reorder patches.

Added:
    desktop/unstable/gnome-shell/debian/patches/03_don-t-show-apps-in-NoDisplay-categories.patch
      - copied unchanged from r35415, desktop/unstable/gnome-shell/debian/patches/27-don-t-show-apps-in-NoDisplay-categories.patch
    desktop/unstable/gnome-shell/debian/patches/04_fix_nodisplay.patch
      - copied, changed from r35416, desktop/unstable/gnome-shell/debian/patches/03_fix_nodisplay.patch
Removed:
    desktop/unstable/gnome-shell/debian/patches/03_fix_nodisplay.patch
Modified:
    desktop/unstable/gnome-shell/debian/changelog
    desktop/unstable/gnome-shell/debian/patches/series

Modified: desktop/unstable/gnome-shell/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-shell/debian/changelog?rev=35417&op=diff
==============================================================================
--- desktop/unstable/gnome-shell/debian/changelog [utf-8] (original)
+++ desktop/unstable/gnome-shell/debian/changelog [utf-8] Sat Jun 23 19:21:38 2012
@@ -1,11 +1,12 @@
 gnome-shell (3.4.1-8) unstable; urgency=low
 
-  * 27-don-t-show-apps-in-NoDisplay-categories.patch: drop this patch as 
-    it is not completely functional.
+  * 27-don-t-show-apps-in-NoDisplay-categories.patch: renamed as 
+    03_don-t-show-apps-in-NoDisplay-categories.patch for reordering.
   * 01_slist_cleanup.patch, 02_filter_nodisplay_parents.patch, 
-    03_fix_nodisplay.patch: correctly filter out applications in a 
+    04_fix_nodisplay.patch: correctly filter out applications in a 
     NoDisplay directory, including parent directories. This should 
-    finally fix for good handling of the Debian menu.
+    finally fix for good handling of the Debian menu, including in 
+    searches.  Closes: #677498.
   * Bump the build-dependency on gnome-menus accordingly.
 
  -- Josselin Mouette <joss at debian.org>  Sat, 23 Jun 2012 20:49:32 +0200

Copied: desktop/unstable/gnome-shell/debian/patches/04_fix_nodisplay.patch (from r35416, desktop/unstable/gnome-shell/debian/patches/03_fix_nodisplay.patch)
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-shell/debian/patches/04_fix_nodisplay.patch?rev=35417&op=diff
==============================================================================
--- desktop/unstable/gnome-shell/debian/patches/03_fix_nodisplay.patch [utf-8] (original)
+++ desktop/unstable/gnome-shell/debian/patches/04_fix_nodisplay.patch [utf-8] Sat Jun 23 19:21:38 2012
@@ -7,13 +7,13 @@
 
 https://bugzilla.gnome.org/show_bug.cgi?id=658176
 ---
-Index: gnome-shell-3.4.1/js/ui/appDisplay.js
-===================================================================
---- gnome-shell-3.4.1.orig/js/ui/appDisplay.js	2012-03-19 16:56:49.000000000 +0100
-+++ gnome-shell-3.4.1/js/ui/appDisplay.js	2012-06-23 20:46:52.795294653 +0200
-@@ -207,8 +207,9 @@ const ViewByCategories = new Lang.Class(
-                 if (!entry.get_app_info().get_nodisplay())
+diff --git a/js/ui/appDisplay.js b/js/ui/appDisplay.js
+index ad7b70d..b0ff291 100644
+--- a/js/ui/appDisplay.js
++++ b/js/ui/appDisplay.js
+@@ -208,8 +208,9 @@ const ViewByCategories = new Lang.Class({
                      appList.push(app);
+                 }
              } else if (nextType == GMenu.TreeItemType.DIRECTORY) {
 -                if (!dir.get_is_nodisplay())
 -                    this._loadCategory(iter.get_directory(), appList);
@@ -23,3 +23,5 @@
              }
          }
      },
+--
+cgit v0.9.0.2

Modified: desktop/unstable/gnome-shell/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-shell/debian/patches/series?rev=35417&op=diff
==============================================================================
--- desktop/unstable/gnome-shell/debian/patches/series [utf-8] (original)
+++ desktop/unstable/gnome-shell/debian/patches/series [utf-8] Sat Jun 23 19:21:38 2012
@@ -1,6 +1,7 @@
 01_slist_cleanup.patch
 02_filter_nodisplay_parents.patch
-03_fix_nodisplay.patch
+03_don-t-show-apps-in-NoDisplay-categories.patch
+04_fix_nodisplay.patch
 10-make-NetworkManager-optional.patch
 11-no-gettext.patch
 14_make-GLX-optional.patch