From 8834a7df103ab6dfac310de7614fb55954251e9d Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Tue, 21 Jun 2011 18:26:57 -0400
Subject: [PATCH] Consistently exit the overview when launching external
 applications

We were doing this in one or two places, but not most of them.

https://bugzilla.gnome.org/show_bug.cgi?id=653095
---
 js/ui/dateMenu.js             | 1 +
 js/ui/status/accessibility.js | 2 ++
 js/ui/status/bluetooth.js     | 1 +
 js/ui/status/keyboard.js      | 3 +++
 js/ui/status/network.js       | 1 +
 js/ui/status/power.js         | 2 ++
 js/ui/status/volume.js        | 2 ++
 7 files changed, 12 insertions(+)

diff --git a/js/ui/dateMenu.js b/js/ui/dateMenu.js
index b3ae9f450..a6a519633 100644
--- a/js/ui/dateMenu.js
+++ b/js/ui/dateMenu.js
@@ -198,6 +198,7 @@ DateMenuButton.prototype = {
 
     _onPreferencesActivate: function() {
         this.menu.close();
+        Main.overview.hide();
         let app = Shell.AppSystem.get_default().get_app('gnome-datetime-panel.desktop');
         app.activate(-1);
     },
diff --git a/js/ui/status/accessibility.js b/js/ui/status/accessibility.js
index 5f61aec16..560042c27 100644
--- a/js/ui/status/accessibility.js
+++ b/js/ui/status/accessibility.js
@@ -10,6 +10,7 @@ const Shell = imports.gi.Shell;
 const Signals = imports.signals;
 const St = imports.gi.St;
 
+const Main = imports.ui.main;
 const PanelMenu = imports.ui.panelMenu;
 const PopupMenu = imports.ui.popupMenu;
 const Util = imports.misc.util;
@@ -88,6 +89,7 @@ ATIndicator.prototype = {
 
         this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
         this.menu.addAction(_("Universal Access Settings"), function() {
+            Main.overview.hide();
             let app = Shell.AppSystem.get_default().get_app('gnome-universal-access-panel.desktop');
             app.activate(-1);
         });
diff --git a/js/ui/status/bluetooth.js b/js/ui/status/bluetooth.js
index f2bcc491b..ed06d1658 100644
--- a/js/ui/status/bluetooth.js
+++ b/js/ui/status/bluetooth.js
@@ -90,6 +90,7 @@ Indicator.prototype = {
         this._updateFullMenu();
 
         this.menu.addAction(_("Bluetooth Settings"), function() {
+            Main.overview.hide()
             let app = Shell.AppSystem.get_default().get_app('bluetooth-properties.desktop');
             app.activate(-1);
         });
diff --git a/js/ui/status/keyboard.js b/js/ui/status/keyboard.js
index 77e52a882..3048da091 100644
--- a/js/ui/status/keyboard.js
+++ b/js/ui/status/keyboard.js
@@ -9,6 +9,7 @@ const Lang = imports.lang;
 const Shell = imports.gi.Shell;
 const St = imports.gi.St;
 
+const Main = imports.ui.main;
 const PopupMenu = imports.ui.popupMenu;
 const PanelMenu = imports.ui.panelMenu;
 const Util = imports.misc.util;
@@ -68,9 +69,11 @@ XKBIndicator.prototype = {
 
         this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
         this.menu.addAction(_("Show Keyboard Layout..."), Lang.bind(this, function() {
+            Main.overview.hide();
             Util.spawn(['gkbd-keyboard-display', '-g', String(this._config.get_current_group() + 1)]);
         }));
         this.menu.addAction(_("Localization Settings"), function() {
+            Main.overview.hide();
             let app = Shell.AppSystem.get_default().get_app('gnome-region-panel.desktop');
             app.activate(-1);
         });
diff --git a/js/ui/status/network.js b/js/ui/status/network.js
index 44f66b750..454b67392 100644
--- a/js/ui/status/network.js
+++ b/js/ui/status/network.js
@@ -1632,6 +1632,7 @@ NMApplet.prototype = {
         this.menu.addMenuItem(this._devices.vpn.section);
 
         this.menu.addAction(_("Network Settings"), function() {
+            Main.overview.hide();
             let app = Shell.AppSystem.get_default().get_app('gnome-network-panel.desktop');
             app.activate(-1);
         });
diff --git a/js/ui/status/power.js b/js/ui/status/power.js
index 1b8df7cce..196170262 100644
--- a/js/ui/status/power.js
+++ b/js/ui/status/power.js
@@ -7,6 +7,7 @@ const Mainloop = imports.mainloop;
 const Shell = imports.gi.Shell;
 const St = imports.gi.St;
 
+const Main = imports.ui.main;
 const PanelMenu = imports.ui.panelMenu;
 const PopupMenu = imports.ui.popupMenu;
 const Util = imports.misc.util;
@@ -80,6 +81,7 @@ Indicator.prototype = {
         this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
 
         this.menu.addAction(_("Power Settings"),function() {
+            Main.overview.hide();
             let app = Shell.AppSystem.get_default().get_app('gnome-power-panel.desktop');
             app.activate(-1);
         });
diff --git a/js/ui/status/volume.js b/js/ui/status/volume.js
index 1db2cc9a6..bd74cd9d5 100644
--- a/js/ui/status/volume.js
+++ b/js/ui/status/volume.js
@@ -9,6 +9,7 @@ const Gvc = imports.gi.Gvc;
 const Signals = imports.signals;
 const St = imports.gi.St;
 
+const Main = imports.ui.main;
 const PanelMenu = imports.ui.panelMenu;
 const PopupMenu = imports.ui.popupMenu;
 const Util = imports.misc.util;
@@ -61,6 +62,7 @@ Indicator.prototype = {
 
         this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
         this.menu.addAction(_("Sound Settings"), function() {
+            Main.overview.hide();
             let app = Shell.AppSystem.get_default().get_app('gnome-sound-panel.desktop');
             app.activate(-1);
         });