From c7e6f397eea0f96466ac93a1f7e4e07ae5c24a50 Mon Sep 17 00:00:00 2001
From: Mattias Bengtsson <mattias.jc.bengtsson@gmail.com>
Date: Tue, 24 Mar 2015 01:30:18 +0100
Subject: [PATCH] MainWindow: Use params pattern for _init

This makes MainWindow consistent with most other classes in Maps.

https://bugzilla.gnome.org/show_bug.cgi?id=740647
---
 src/application.js |  3 ++-
 src/mainWindow.js  | 12 ++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/application.js b/src/application.js
index 03e2e789..375633f6 100644
--- a/src/application.js
+++ b/src/application.js
@@ -212,7 +212,8 @@ const Application = new Lang.Class({
                                                                              'icons']));
         let overlay = new Gtk.Overlay({ visible: true, can_focus: false });
         notificationManager = new NotificationManager.NotificationManager(overlay);
-        this._mainWindow = new MainWindow.MainWindow(this, overlay);
+        this._mainWindow = new MainWindow.MainWindow({ application: this,
+                                                       overlay: overlay });
         this._mainWindow.connect('destroy', this._onWindowDestroy.bind(this));
     },
 
diff --git a/src/mainWindow.js b/src/mainWindow.js
index 89f2b12b..1862d015 100644
--- a/src/mainWindow.js
+++ b/src/mainWindow.js
@@ -58,16 +58,16 @@ const MainWindow = new Lang.Class({
                         'layersButton',
                         'favoritesButton' ],
 
-    _init: function(app, overlay) {
-        this.parent();
+    _init: function(params) {
+        this._overlay = params.overlay;
+        delete params.overlay;
 
-        this._configureId = 0;
+        this.parent(params);
 
-        this.application = app;
-        this._overlay = overlay;
+        this._configureId = 0;
 
         this.mapView = new MapView.MapView();
-        overlay.add(this.mapView);
+        this._overlay.add(this.mapView);
 
         this.mapView.gotoUserLocation(false);
 
-- 
GitLab