[gnome-shell/overlay-design02: 3/3] Merge branch 'master' into overlay-design02

[Colin Walters <walters src gnome org>]

commit 75da772d052b3491186357b35f88b069bbf3ff2b
Merge: df9cf98... e7771b4...
Author: Colin Walters <walters verbum org>
Date:   Thu Jun 18 13:12:21 2009 -0400

    Merge branch 'master' into overlay-design02
    
    Conflicts:
    	js/ui/appDisplay.js

 js/misc/appInfo.js      |    2 +-
 js/ui/appDisplay.js     |   59 ++++++++++++++++++----------------------------
 src/shell-app-monitor.c |   16 ++++++++++++
 src/shell-app-monitor.h |    2 +-
 src/shell-app-system.c  |   16 ++++++++++++
 src/shell-app-system.h  |    2 +-
 6 files changed, 58 insertions(+), 39 deletions(-)
---
diff --cc js/ui/appDisplay.js
index 0f49f5d,889fa53..1f2a6b7
--- a/js/ui/appDisplay.js
+++ b/js/ui/appDisplay.js
@@@ -328,8 -300,16 +300,14 @@@ AppDisplay.prototype = 
          }
      },
  
-     //// Protected method overrides ////
+     _addApp: function(appInfo) {
+         let appId = appInfo.id;
+         this._allItems[appId] = appInfo;
+         // [] is returned if we could not get the categories or the list of categories was empty
+         let categories = Shell.get_categories_for_desktop_file(appId);
+         this._appCategories[appId] = categories;
+     },
  
 -    //// Protected method overrides //// 
 -
      // Gets information about all applications by calling Gio.app_info_get_all().
      _refreshCache : function() {
          let me = this;
@@@ -356,8 -336,17 +334,17 @@@
          let settings = this._appSystem.get_all_settings();
          for (let i = 0; i < settings.length; i++) {
              let appId = settings[i];
-             this._addApp(appId);
+             this._addAppForId(appId);
+         }
+ 
+         // Some applications, such as Evince, might not be in the menus,
+         // but might be returned by the applications monitor as most used
+         // applications, in which case we include them.
+         let mostUsedAppInfos = AppInfo.getMostUsedApps(MAX_ITEMS);
+         for (let i = 0; i < mostUsedAppInfos.length; i++) {
+             let appInfo = mostUsedAppInfos[i];
+             this._addApp(appInfo);
 -        }         
 +        }
  
          this._appsStale = false;
      },