From 39c221775eae661c30bcd05e8fd3919b62daa955 Mon Sep 17 00:00:00 2001
From: Giovanni Campagna <gcampagna@src.gnome.org>
Date: Thu, 6 Sep 2012 19:32:26 +0200
Subject: [PATCH] places-menu: recognize if apps-menu is present, and place to
 the right of it

If apps-menu is enabled at the same time as places-menu, the right order
is activities, apps-menu, places-menu, app-menu. Previously we used the
extension activation order to obtain this, but it's not reliable enough,
so make it explicit in code.
---
 extensions/places-menu/extension.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/extensions/places-menu/extension.js b/extensions/places-menu/extension.js
index 27a0d2fe..2a7e179a 100644
--- a/extensions/places-menu/extension.js
+++ b/extensions/places-menu/extension.js
@@ -106,7 +106,11 @@ let _indicator;
 
 function enable() {
     _indicator = new PlacesMenu;
-    Main.panel.addToStatusArea('places-menu', _indicator, 1, 'left');
+
+    let pos = 1;
+    if ('apps-menu' in Main.panel.statusArea)
+	pos = 2;
+    Main.panel.addToStatusArea('places-menu', _indicator, pos, 'left');
 }
 
 function disable() {