Bump version to 3.18.4

Update NEWS.

NEWS

@@ -1,10 +1,14 @@
-3.19.2
+3.18.4
 ======
-* updated translations (gd)
+* apps-menu: Ignore .desktop entries from legacy dirs
 
-3.19.1
+3.18.3
 ======
-* Fix some theme issues
+* apps-menu: Fix .desktop entries in subdirectories
+
+3.18.2
+======
+* Fix classic style issues
 
 3.18.1
 ======

configure.ac

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

data/gnome-classic.css

@@ -409,9 +409,9 @@ StScrollBar {
   spacing-rows: 15px;
   spacing-columns: 1em; }
 
-/* Popovers/Menus */
+/* Popvers/Menus */
 .popup-menu {
-  min-width: 15em; }
+  min-width: 200px; }
   .popup-menu .popup-sub-menu {
     background-color: #e8e8e8;
     box-shadow: inset 0 -1px 0px #adadad; }
@@ -626,8 +626,6 @@ StScrollBar {
   #panel .panel-status-indicators-box,
   #panel .panel-status-menu-box {
     spacing: 2px; }
-  #panel .power-status.panel-status-indicators-box {
-    spacing: 0; }
   #panel .screencast-indicator {
     color: #f57900; }
 
@@ -755,7 +753,7 @@ StScrollBar {
 
 /* Message list */
 .message-list {
-  width: 31.5em; }
+  width: 420px; }
 
 .message-list-sections {
   spacing: 1.5em; }
@@ -826,7 +824,7 @@ StScrollBar {
     color: transparent; }
 
 .aggregate-menu {
-  min-width: 21em; }
+  width: 280px; }
   .aggregate-menu .popup-menu-icon {
     padding: 0 4px; }
 
@@ -963,14 +961,10 @@ StScrollBar {
 .search-entry {
   width: 320px;
   padding: 7px 9px;
-  border-radius: 6px;
-  border-color: #747467;
-  color: #eeeeec;
-  background-color: #2e3436; }
+  border-radius: 6px; }
   .search-entry:focus {
     padding: 6px 8px;
-    border-width: 2px;
-    border-color: #4a90d9; }
+    border-width: 2px; }
   .search-entry .search-entry-icon {
     icon-size: 1em;
     padding: 0 4px;

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()) {
-                    let menu_id = dir.get_menu_id();
+                if (app && app.get_app_info().should_show())
                     this.applicationsByCategory[categoryId].push(app);
-                }
             } else if (nextType == GMenu.TreeItemType.DIRECTORY) {
                 let subdir = iter.get_directory();
                 if (!subdir.get_is_nodisplay())

po/LINGUAS

@@ -20,7 +20,6 @@ fa
 fi
 fr
 fur
-gd
 gl
 gu
 he

po/gd.po

@@ -1,369 +0,0 @@
-# Scottish Gaelic translation for gnome-shell-extensions.
-# Copyright (C) 2015 gnome-shell-extensions's COPYRIGHT HOLDER
-# This file is distributed under the same license as the gnome-shell-extensions package.
-# GunChleoc <fios@foramnagaidhlig.net>, 2015.
-msgid ""
-msgstr ""
-"Project-Id-Version: gnome-shell-extensions master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
-"shell&keywords=I18N+L10N&component=extensions\n"
-"POT-Creation-Date: 2015-11-17 16:36+0000\n"
-"PO-Revision-Date: 2015-11-17 17:12+0100\n"
-"Last-Translator: GunChleoc <fios@foramnagaidhlig.net>\n"
-"Language-Team: Fòram na Gàidhlig\n"
-"Language: gd\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=4; plural=(n==1 || n==11) ? 0 : (n==2 || n==12) ? 1 : "
-"(n > 2 && n < 20) ? 2 : 3;\n"
-"X-Generator: Virtaal 0.7.1\n"
-"X-DamnedLies-Scope: partial\n"
-"X-Project-Style: gnome\n"
-
-#: ../data/gnome-classic.desktop.in.h:1
-#: ../data/gnome-classic.session.desktop.in.in.h:1
-msgid "GNOME Classic"
-msgstr "GNOME clasaigeach"
-
-#: ../data/gnome-classic.desktop.in.h:2
-msgid "This session logs you into GNOME Classic"
-msgstr "Clàraidh an seisean seo a-steach gu GNOME clasaigeach thu"
-
-#: ../data/org.gnome.shell.extensions.classic-overrides.gschema.xml.in.h:6
-#| msgid "Workspace Indicator"
-msgid "Workspaces only on primary monitor"
-msgstr "Rumannan-obrach air a' phrìomh-sgrìn a-mhàin"
-
-#: ../extensions/alternate-tab/prefs.js:20
-msgid "Thumbnail only"
-msgstr "Dealbhagan a-mhàin"
-
-#: ../extensions/alternate-tab/prefs.js:21
-msgid "Application icon only"
-msgstr "Ìomhaigheag na h-aplacaid a-mhàin"
-
-#: ../extensions/alternate-tab/prefs.js:22
-msgid "Thumbnail and application icon"
-msgstr "Dealbhag is ìomhaigheag na h-aplacaid"
-
-#: ../extensions/alternate-tab/prefs.js:38
-msgid "Present windows as"
-msgstr "Seall uinneagan mar"
-
-#: ../extensions/alternate-tab/prefs.js:69
-msgid "Show only windows in the current workspace"
-msgstr "Na seall ach na h-uinneagan san rum-obrach làithreach"
-
-#: ../extensions/apps-menu/extension.js:38
-msgid "Activities Overview"
-msgstr "Foir-shealladh nan gnìomhachdan"
-
-#: ../extensions/apps-menu/extension.js:109
-msgid "Favorites"
-msgstr "Annsachdan"
-
-#: ../extensions/apps-menu/extension.js:266
-msgid "Applications"
-msgstr "Aplacaidean"
-
-#: ../extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml.in.h:1
-#| msgid "Application icon only"
-msgid "Application and workspace list"
-msgstr "Ìomhaigheag na h-aplacaid is liosta nan rumannan-obrach"
-
-#: ../extensions/auto-move-windows/prefs.js:60
-msgid "Application"
-msgstr "Aplacaid"
-
-#: ../extensions/auto-move-windows/prefs.js:69
-#: ../extensions/auto-move-windows/prefs.js:127
-msgid "Workspace"
-msgstr "Rum-obrach"
-
-#: ../extensions/auto-move-windows/prefs.js:85
-msgid "Add Rule"
-msgstr "Cuir riaghailt ris"
-
-#: ../extensions/auto-move-windows/prefs.js:106
-msgid "Create new matching rule"
-msgstr "Cruthaich riaghailt maidsidh ùr"
-
-#: ../extensions/auto-move-windows/prefs.js:111
-msgid "Add"
-msgstr "Cuir ris"
-
-#: ../extensions/drive-menu/extension.js:106
-#, javascript-format
-msgid "Ejecting drive '%s' failed:"
-msgstr "Cha deach leinn draibh \"%s\" a ghluasad a-mach:"
-
-#: ../extensions/drive-menu/extension.js:124
-msgid "Removable devices"
-msgstr "Draibhean so-ghiùlain"
-
-#: ../extensions/drive-menu/extension.js:149
-msgid "Open File"
-msgstr "Fosgail am faidhle"
-
-#: ../extensions/example/extension.js:17
-msgid "Hello, world!"
-msgstr "Shin thu, a shaoghail!"
-
-#: ../extensions/example/prefs.js:30
-msgid "Message"
-msgstr "Teachdaireachd"
-
-#. TRANSLATORS: Example is the name of the extension, should not be
-#. translated
-#: ../extensions/example/prefs.js:43
-msgid ""
-"Example aims to show how to build well behaved extensions for the Shell and "
-"as such it has little functionality on its own.\n"
-"Nevertheless it's possible to customize the greeting message."
-msgstr ""
-"Tha am ball-eisimpleir airson sealltainn dhut mar a thogas tu leudachain le "
-"deagh-ghiùlan airson na Slige agus mar sin cha dèan e fhèin mòran.\n"
-"'S urrainn dhut an teachdaireachd fàilteachaidh a ghnàthachadh co-dhiù."
-
-#: ../extensions/places-menu/extension.js:78
-#: ../extensions/places-menu/extension.js:81
-msgid "Places"
-msgstr "Ionadan"
-
-#: ../extensions/places-menu/placeDisplay.js:59
-#, javascript-format
-msgid "Failed to launch \"%s\""
-msgstr "Cha b' urrainn dhuinn \"%s\" a chur gu dol"
-
-#: ../extensions/places-menu/placeDisplay.js:101
-#: ../extensions/places-menu/placeDisplay.js:124
-msgid "Computer"
-msgstr "Coimpiutair"
-
-#: ../extensions/places-menu/placeDisplay.js:267
-msgid "Home"
-msgstr "Dachaigh"
-
-#: ../extensions/places-menu/placeDisplay.js:311
-msgid "Browse Network"
-msgstr "Brabhsaich an lìonra"
-
-#: ../extensions/window-list/extension.js:110
-msgid "Close"
-msgstr "Dùin"
-
-#: ../extensions/window-list/extension.js:120
-msgid "Unminimize"
-msgstr "Neo-fhìor-lùghdaich"
-
-#: ../extensions/window-list/extension.js:121
-msgid "Minimize"
-msgstr "Fìor-lùghdaich"
-
-#: ../extensions/window-list/extension.js:127
-msgid "Unmaximize"
-msgstr "Neo-làn-mheudaich"
-
-#: ../extensions/window-list/extension.js:128
-msgid "Maximize"
-msgstr "Làn-mheudaich"
-
-#: ../extensions/window-list/extension.js:403
-msgid "Minimize all"
-msgstr "Fìor-lùghdaich na h-uile"
-
-#: ../extensions/window-list/extension.js:411
-msgid "Unminimize all"
-msgstr "Neo-fhìor-lùghdaich na h-uile"
-
-#: ../extensions/window-list/extension.js:419
-msgid "Maximize all"
-msgstr "Làn-mheudaich na h-uile"
-
-#: ../extensions/window-list/extension.js:428
-msgid "Unmaximize all"
-msgstr "Neo-làn-mheudaich na h-uile"
-
-#: ../extensions/window-list/extension.js:437
-msgid "Close all"
-msgstr "Dùin na h-uile"
-
-#: ../extensions/window-list/extension.js:661
-#: ../extensions/workspace-indicator/extension.js:30
-msgid "Workspace Indicator"
-msgstr "Taisbeanair ruim-obrach"
-
-#: ../extensions/window-list/extension.js:820
-msgid "Window List"
-msgstr "Liosta nan uinneagan"
-
-#: ../extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml.in.h:1
-#| msgid "Never group windows"
-msgid "When to group windows"
-msgstr "Cuin a thèid na h-uinneagan a bhuidhneachadh"
-
-#: ../extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml.in.h:3
-#| msgid "Show on all monitors"
-msgid "Show the window list on all monitors"
-msgstr "Seall liosta nan uinneagan air a h-uile sgrìn"
-
-#: ../extensions/window-list/prefs.js:32
-msgid "Window Grouping"
-msgstr "Buidhneachadh nan uinneagan"
-
-#: ../extensions/window-list/prefs.js:50
-msgid "Never group windows"
-msgstr "Na buidhnich na h-uinneagan idir"
-
-#: ../extensions/window-list/prefs.js:51
-msgid "Group windows when space is limited"
-msgstr "Buidhnich na h-uinneagan nuair a bhios an rum gann"
-
-#: ../extensions/window-list/prefs.js:52
-msgid "Always group windows"
-msgstr "Buidhnich na h-uinneagan an-còmhnaidh"
-
-#: ../extensions/window-list/prefs.js:75
-msgid "Show on all monitors"
-msgstr "Seall air a h-uile sgrìn"
-
-#: ../extensions/workspace-indicator/prefs.js:141
-msgid "Workspace Names"
-msgstr "Ainmean nan rumannan-obrach"
-
-#: ../extensions/workspace-indicator/prefs.js:157
-msgid "Name"
-msgstr "Ainm"
-
-#: ../extensions/workspace-indicator/prefs.js:198
-#, javascript-format
-msgid "Workspace %d"
-msgstr "Rum-obrach %d"
-
-#~ msgid "Notifications"
-#~ msgstr "Brathan"
-
-#~ msgid "Online Accounts"
-#~ msgstr "Cunntasan air loidhne"
-
-#~ msgid "System Settings"
-#~ msgstr "Roghainnean an t-siostaim"
-
-#~ msgid "Lock Screen"
-#~ msgstr "Glais an sgrìn"
-
-#~ msgid "Switch User"
-#~ msgstr "Gearr leum gu cleachdaiche eile"
-
-#~ msgid "Log Out..."
-#~ msgstr "Clàraich a-mach..."
-
-#~ msgid "Suspend"
-#~ msgstr "Cuir 'na dhàil"
-
-#~ msgid "Hibernate"
-#~ msgstr "Dèan cadal-geamhraidh"
-
-#~ msgid "Power Off..."
-#~ msgstr "Cuir a' chumhachd dheth..."
-
-#~ msgid ""
-#~ "This is the first time you use the Alternate Tab extension. \n"
-#~ "Please choose your preferred behaviour:\n"
-#~ "\n"
-#~ "All & Thumbnails:\n"
-#~ "    This mode presents all applications from all workspaces in one "
-#~ "selection \n"
-#~ "    list. Instead of using the application icon of every window, it uses "
-#~ "small \n"
-#~ "    thumbnails resembling the window itself. \n"
-#~ "\n"
-#~ "Workspace & Icons:\n"
-#~ "    This mode let's you switch between the applications of your current \n"
-#~ "    workspace and gives you additionally the option to switch to the last "
-#~ "used \n"
-#~ "    application of your previous workspace. This is always the last "
-#~ "symbol in \n"
-#~ "    the list and is segregated by a separator/vertical line if "
-#~ "available. \n"
-#~ "    Every window is represented by its application icon.  \n"
-#~ "\n"
-#~ "Native:\n"
-#~ "    This mode is the native GNOME 3 behaviour or in other words: "
-#~ "Clicking \n"
-#~ "    native switches the Alternate Tab extension off. \n"
-#~ msgstr ""
-#~ "Seo a' chiad turas a chì thu leudachan Alt Taba chaochlaidich. \n"
-#~ "Tagh an giùlan as fhearr leat:\n"
-#~ "\n"
-#~ "Na h-uile ⁊ dealbhagan:\n"
-#~ "    Seallaidh am modh seo dhut a h-uile aplacaid on a h-uile rum-obrach "
-#~ "san aon\n"
-#~ "    liosta taghaidh. An àite a bhith a' cleachdadh ìomhaigheag na h-"
-#~ "aplacaide aig\n"
-#~ "    gach uinneag, cleachdaidh e dealbhagan beaga a bhios coltach ris an "
-#~ "uinneag \n"
-#~ "    fhèin.\n"
-#~ "\n"
-#~ "Rum-obrach ⁊ dealbhagan:\n"
-#~ "    Leis a' mhodh seo, 's urrainn ghut leum a ghearradh eadar aplacaidean "
-#~ "an\n"
-#~ "    ruim-obrach làithrich agad is gheibh thu roghainn a bharrachd gus "
-#~ "leum a\n"
-#~ "    ghearradh dhan aplacaid mu dheireadh a chleachd thu san rum-obrach "
-#~ "roimhe.\n"
-#~ "    'S e an samhla mu dheireadh air an liosta a bhios ann an-còmhnaidh "
-#~ "agus thèid\n"
-#~ "    e a sgaradh le sgaradair/loidhne inghearach ma bhios seo ri làimh. \n"
-#~ "    Thèid gach uinneag a riochdachadh le ìomhaigheag a h-aplacaide.  \n"
-#~ "\n"
-#~ "Tùsail:\n"
-#~ "    'S e an giùlan tùsail aig GNOME 3 a tha sa mhodh seo agus is ciall "
-#~ "dha: Ma nì \n"
-#~ "    thu briogadh air \"tùsail\", cuiridh seo leudachan Alt Taba dheth. \n"
-
-#~ msgid "Alt Tab Behaviour"
-#~ msgstr "Giùlan aig Alt Tab"
-
-#~ msgid "Native"
-#~ msgstr "Tùsail"
-
-#~ msgid "Cancel"
-#~ msgstr "Sguir dheth"
-
-#~ msgid "Drag here to add favorites"
-#~ msgstr "Slaod an-seo gus annsachdan a chur ris"
-
-#~ msgid "New Window"
-#~ msgstr "Uinneag ùr"
-
-#~ msgid "Remove from Favorites"
-#~ msgstr "Thoir air falbh o na h-annsachdan"
-
-#~ msgid "%s is away."
-#~ msgstr "Tha %s air falbh."
-
-#~ msgid "%s is offline."
-#~ msgstr "Tha %s far loidhne."
-
-#~ msgid "%s is online."
-#~ msgstr "Tha %s air loidhne."
-
-#~ msgid "%s is busy."
-#~ msgstr "Tha %s trang."
-
-#~ msgid "Normal"
-#~ msgstr "Àbhaisteach"
-
-#~ msgid "Left"
-#~ msgstr "Clì"
-
-#~ msgid "Right"
-#~ msgstr "Deas"
-
-#~ msgid "Upside-down"
-#~ msgstr "Bun os cionn"
-
-#~ msgid "Configure display settings..."
-#~ msgstr "Rèitich roghainnean an uidheim-thaisbeanaidh..."