Bump version to 3.18.3

Update NEWS.

NEWS

@@ -1,3 +1,11 @@
+3.18.3
+======
+* apps-menu: Fix .desktop entries in subdirectories
+
+3.18.2
+======
+* Fix classic style issues
+
 3.18.1
 ======
 * window-list: Fix accessibility of window buttons

configure.ac

@@ -1,5 +1,5 @@
 AC_PREREQ(2.63)
-AC_INIT([gnome-shell-extensions],[3.18.1],[https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell&component=extensions])
+AC_INIT([gnome-shell-extensions],[3.18.3],[https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell&component=extensions])
 
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_AUX_DIR([config])

extensions/apps-menu/extension.js

@@ -397,18 +397,15 @@ const ApplicationsButton = new Lang.Class({
         while ((nextType = iter.next()) != GMenu.TreeItemType.INVALID) {
             if (nextType == GMenu.TreeItemType.ENTRY) {
                 let entry = iter.get_entry();
-                let appInfo = entry.get_app_info();
                 let id;
                 try {
-                    id = appInfo.get_id(); // catch non-UTF8 filenames
+                    id = entry.get_desktop_file_id(); // catch non-UTF8 filenames
                 } catch(e) {
                     continue;
                 }
                 let app = appSys.lookup_app(id);
-                if (appInfo.should_show()) {
+                if (app.get_app_info().should_show())
-                    let menu_id = dir.get_menu_id();
                     this.applicationsByCategory[categoryId].push(app);
-                }
             } else if (nextType == GMenu.TreeItemType.DIRECTORY) {
                 let subdir = iter.get_directory();
                 if (!subdir.get_is_nodisplay())

extensions/window-list/classic.css

@@ -3,42 +3,49 @@
 #panel.bottom-panel {
     border-top-width: 1px;
     border-bottom-width: 0px;
-    height: 2.25em !important;
+    height: 2.25em ;
   }
 
   .bottom-panel .window-button > StWidget {
-    background-color: #e9e9e9 !important;
+    background-gradient-drection: vertical;
-    background-gradient-direction: vertical;
+    background-color: #fff;
-    background-gradient-end: #d0d0d0;
+    background-gradient-start: #fff;
-    color: #555 !important;
+    background-gradient-end: #eee;
-    border-radius: 2px !important;
+    color: #000;
-    padding: 4px 6px 2px !important;
+    border-radius: 2px;
+    padding: 4px 6px 2px;
     text-shadow: 0 0 transparent;
-    box-shadow: inset -1px -1px 1px rgba(0,0,0,0.5) !important;
+    box-shadow: inset -1px -1px 1px rgba(0,0,0,0.5);
   }
 
   .bottom-panel .window-button:hover > StWidget {
-    background-color: #f9f9f9 !important;
+    background-color: #fff;
-    background-gradient-end: #e0e0e0;
+    background-gradient-start: #fff;
+    background-gradient-end: #fefefe;
   }
 
   .bottom-panel .window-button:active > StWidget {
-    box-shadow: inset 1px 1px 2px rgba(0,0,0,0.5) !important;
+    box-shadow: inset 1px 1px 2px rgba(0,0,0,0.5);
+    background-color: #ededed;
+    background-gradient-start: #ededed;
+    background-gradient-end: #ededed;
   }
 
   .bottom-panel .window-button.focused > StWidget {
-    background-color: #a9a9a9 !important;
+    background-color: #ddd;
-    background-gradient-end: #b0b0b0;
+    background-color: #ddd;
-    box-shadow: inset 1px 1px 2px rgba(0,0,0,0.5) !important;
+    background-gradient-end: #dedede;
+    color: white;
+    box-shadow: inset 1px 1px 2px rgba(0,0,0,0.5);
   }
 
   .bottom-panel .window-button.focused:hover > StWidget {
-    background-color: #b9b9b9 !important;
+    background-color: #b9b9b9;
     background-gradient-end: #c0c0c0;
   }
 
   .bottom-panel .window-button.minimized > StWidget {
-    color: #888 !important;
+    color: #000;
-    box-shadow: inset -1px -1px 1px rgba(0,0,0,0.4) !important;
+    box-shadow: inset -1px -1px 1px rgba(0,0,0,0.4);
   }