[gnome-shell-extensions] places-menu: Update to work with GNOME Shell git
- From: Jasper St. Pierre <jstpierre src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-shell-extensions] places-menu: Update to work with GNOME Shell git
- Date: Sat, 2 Jun 2012 09:11:48 +0000 (UTC)
commit dca49d662d747029efb165689cc17b563465c052
Author: Jasper St. Pierre <jstpierre mecheye net>
Date: Fri May 11 16:02:57 2012 -0300
places-menu: Update to work with GNOME Shell git
https://bugzilla.gnome.org/show_bug.cgi?id=677289
extensions/places-menu/extension.js | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
---
diff --git a/extensions/places-menu/extension.js b/extensions/places-menu/extension.js
index dcb724a..a84c6d7 100644
--- a/extensions/places-menu/extension.js
+++ b/extensions/places-menu/extension.js
@@ -10,6 +10,7 @@ const Main = imports.ui.main;
const PanelMenu = imports.ui.panelMenu;
const PopupMenu = imports.ui.popupMenu;
const Panel = imports.ui.panel;
+const PlaceDisplay = imports.ui.placeDisplay;
const Gettext = imports.gettext.domain('gnome-shell-extensions');
const _ = Gettext.gettext;
@@ -26,6 +27,7 @@ const PlacesMenu = new Lang.Class({
_init: function() {
this.parent('folder');
+ this.placesManager = new PlaceDisplay.PlacesManager();
this.defaultItems = [];
this.bookmarkItems = [];
@@ -38,13 +40,13 @@ const PlacesMenu = new Lang.Class({
this.menu.addMenuItem(this._devicesMenuItem);
this._createDevices();
- this._bookmarksId = Main.placesManager.connect('bookmarks-updated',Lang.bind(this,this._redisplayBookmarks));
- this._mountsId = Main.placesManager.connect('mounts-updated',Lang.bind(this,this._redisplayDevices));
+ this._bookmarksId = this.placesManager.connect('bookmarks-updated',Lang.bind(this,this._redisplayBookmarks));
+ this._mountsId = this.placesManager.connect('mounts-updated',Lang.bind(this,this._redisplayDevices));
},
destroy: function() {
- Main.placesManager.disconnect(this._bookmarksId);
- Main.placesManager.disconnect(this._mountsId);
+ this.placesManager.disconnect(this._bookmarksId);
+ this.placesManager.disconnect(this._mountsId);
this.parent();
},
@@ -60,7 +62,7 @@ const PlacesMenu = new Lang.Class({
},
_createDefaultPlaces : function() {
- this.defaultPlaces = Main.placesManager.getDefaultPlaces();
+ this.defaultPlaces = this.placesManager.getDefaultPlaces();
for (let placeid = 0; placeid < this.defaultPlaces.length; placeid++) {
this.defaultItems[placeid] = new PopupMenu.PopupMenuItem(this.defaultPlaces[placeid].name);
@@ -76,7 +78,7 @@ const PlacesMenu = new Lang.Class({
},
_createBookmarks : function() {
- this.bookmarks = Main.placesManager.getBookmarks();
+ this.bookmarks = this.placesManager.getBookmarks();
for (let bookmarkid = 0; bookmarkid < this.bookmarks.length; bookmarkid++) {
this.bookmarkItems[bookmarkid] = new PopupMenu.PopupMenuItem(this.bookmarks[bookmarkid].name);
@@ -91,7 +93,7 @@ const PlacesMenu = new Lang.Class({
},
_createDevices : function() {
- this.devices = Main.placesManager.getMounts();
+ this.devices = this.placesManager.getMounts();
for (let devid = 0; devid < this.devices.length; devid++) {
this.deviceItems[devid] = new PopupMenu.PopupMenuItem(this.devices[devid].name);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]