[polari] cleanup: Don't shadow variables

[Florian Müllner <fmuellner src gnome org>]

commit 8a6f43728ffc5203b60fd3ff3cb6ad7349e532a6
Author: Florian Müllner <fmuellner gnome org>
Date:   Tue Aug 6 18:05:19 2019 +0200

    cleanup: Don't shadow variables
    
    Having variables that share the same name in overlapping scopes is
    confusing and error-prone and is best avoided.
    
    https://gitlab.gnome.org/GNOME/polari/merge_requests/133

 src/accountsMonitor.js |  6 +++---
 src/application.js     | 10 +++++-----
 src/chatView.js        | 10 +++++-----
 src/entryArea.js       |  4 ++--
 src/ircParser.js       |  2 +-
 src/pasteManager.js    |  6 +++---
 src/utils.js           |  6 +++---
 7 files changed, 22 insertions(+), 22 deletions(-)
---
diff --git a/src/accountsMonitor.js b/src/accountsMonitor.js
index 344644d..343ad76 100644
--- a/src/accountsMonitor.js
+++ b/src/accountsMonitor.js
@@ -70,7 +70,7 @@ var AccountsMonitor = class {
 
         am.dup_valid_accounts().forEach(this._addAccount.bind(this));
 
-        am.connect('account-validity-changed', (am, account, valid) => {
+        am.connect('account-validity-changed', (o, account, valid) => {
             if (valid) {
                 this._addAccount(account);
                 this._updateAccountReachable(account);
@@ -78,7 +78,7 @@ var AccountsMonitor = class {
                 this._removeAccount(account);
             }
         });
-        am.connect('account-removed', (am, account) => {
+        am.connect('account-removed', (o, account) => {
             this._removeAccount(account);
         });
         am.connect('account-enabled', this._accountEnabledChanged.bind(this));
@@ -99,7 +99,7 @@ var AccountsMonitor = class {
         let presence = Tp.ConnectionPresenceType.OFFLINE;
         this.accounts.filter(a => a.requested_presence_type != presence).forEach(a => {
             this._app.hold();
-            a.request_presence_async(presence, 'offline', '', (a, res) => {
+            a.request_presence_async(presence, 'offline', '', (o, res) => {
                 try {
                     a.request_presence_finish(res);
                 } catch (e) { }
diff --git a/src/application.js b/src/application.js
index a45f97b..a89b883 100644
--- a/src/application.js
+++ b/src/application.js
@@ -765,7 +765,7 @@ var Application = GObject.registerClass({
         let accountPath = parameter.deep_unpack();
         let account = this._accountsMonitor.lookupAccount(accountPath);
 
-        account.set_enabled_async(false, (o, res) => {
+        account.set_enabled_async(false, (a, res) => {
             account.set_enabled_finish(res);
             account.visible = false;
 
@@ -774,13 +774,13 @@ var Application = GObject.registerClass({
             this.notificationQueue.addNotification(n);
 
             n.connect('closed', () => {
-                account.remove_async((a, res) => {
-                    a.remove_finish(res); // TODO: Check for errors
+                account.remove_async((o, r) => {
+                    a.remove_finish(r); // TODO: Check for errors
                 });
             });
             n.connect('undo', () => {
-                account.set_enabled_async(true, (o, res) => {
-                    account.set_enabled_finish(res);
+                account.set_enabled_async(true, (o, r) => {
+                    account.set_enabled_finish(r);
                     account.visible = true;
                 });
             });
diff --git a/src/chatView.js b/src/chatView.js
index 708842a..941bbc5 100644
--- a/src/chatView.js
+++ b/src/chatView.js
@@ -1269,7 +1269,7 @@ var ChatView = GObject.registerClass({
                 tags.push(this._lookupTag('gap'));
         } else {
             if (state.lastNick != message.nick) {
-                let tags = [this._lookupTag('nick')];
+                let nickTags = [this._lookupTag('nick')];
                 let nickTagName = this._getNickTagName(message.nick);
                 let nickTag = this._lookupTag(nickTagName);
                 let buffer = this._view.get_buffer();
@@ -1283,7 +1283,7 @@ var ChatView = GObject.registerClass({
 
                     buffer.get_tag_table().add(nickTag);
                 }
-                tags.push(nickTag);
+                nickTags.push(nickTag);
 
                 let hoverTag = new HoverFilterTag({
                     filtered_tag: nickTag,
@@ -1291,11 +1291,11 @@ var ChatView = GObject.registerClass({
                 });
                 buffer.get_tag_table().add(hoverTag);
 
-                tags.push(hoverTag);
+                nickTags.push(hoverTag);
 
                 if (needsGap)
-                    tags.push(this._lookupTag('gap'));
-                this._insertWithTags(iter, message.nick, tags);
+                    nickTags.push(this._lookupTag('gap'));
+                this._insertWithTags(iter, message.nick, nickTags);
                 buffer.insert(iter, '\t', -1);
             }
             state.lastNick = message.nick;
diff --git a/src/entryArea.js b/src/entryArea.js
index 71f4a69..e28548e 100644
--- a/src/entryArea.js
+++ b/src/entryArea.js
@@ -73,14 +73,14 @@ var ChatEntry = GObject.registerClass({
         }
 
         let clipboard = Gtk.Clipboard.get_default(this.get_display());
-        clipboard.request_uris((clipboard, uris) => {
+        clipboard.request_uris((cb, uris) => {
             if (uris && uris.length)
                 this.emit('file-pasted', Gio.File.new_for_uri(uris[0]));
             else
                 clipboard.request_text(this._onTextReceived.bind(this));
         });
 
-        clipboard.request_image((clipboard, pixbuf) => {
+        clipboard.request_image((cb, pixbuf) => {
             if (pixbuf == null)
                 return;
             this.emit('image-pasted', pixbuf);
diff --git a/src/ircParser.js b/src/ircParser.js
index 6b277d6..2577a37 100644
--- a/src/ircParser.js
+++ b/src/ircParser.js
@@ -64,7 +64,7 @@ var IrcParser = class {
             return true;
         }
 
-        let stripCommand = text => text.substr(text.indexOf(' ')).trimLeft();
+        let stripCommand = txt => txt.substr(txt.indexOf(' ')).trimLeft();
 
         let retval = true;
 
diff --git a/src/pasteManager.js b/src/pasteManager.js
index 53d3401..ab3a526 100644
--- a/src/pasteManager.js
+++ b/src/pasteManager.js
@@ -37,7 +37,7 @@ var PasteManager = class {
         file.query_info_async(
             Gio.FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE,
             Gio.FileQueryInfoFlags.NONE,
-            GLib.PRIORITY_DEFAULT, null, (file, res) => {
+            GLib.PRIORITY_DEFAULT, null, (f, res) => {
                 try {
                     let fileInfo = file.query_info_finish(res);
                     this._handleFilePaste(file, fileInfo, title, callback);
@@ -59,8 +59,8 @@ var PasteManager = class {
         } else if (targetType == DndTargetType.IMAGE) {
             file.read_async(GLib.PRIORITY_DEFAULT, null, (f, res) => {
                 let stream = f.read_finish(res);
-                GdkPixbuf.Pixbuf.new_from_stream_async(stream, null, (s, res) => {
-                    let pixbuf = GdkPixbuf.Pixbuf.new_from_stream_finish(res);
+                GdkPixbuf.Pixbuf.new_from_stream_async(stream, null, (s, r) => {
+                    let pixbuf = GdkPixbuf.Pixbuf.new_from_stream_finish(r);
                     Utils.imgurPaste(pixbuf, title, callback);
                 });
             });
diff --git a/src/utils.js b/src/utils.js
index 2812fc4..b60a753 100644
--- a/src/utils.js
+++ b/src/utils.js
@@ -206,7 +206,7 @@ function _getGpasteExpire(callback) {
     let session = new Soup.Session();
     let paramUrl = `${GPASTE_BASEURL}api/json/parameter/expire`;
     let message = Soup.form_request_new_from_hash('GET', paramUrl, {});
-    session.queue_message(message, (s, message) => {
+    session.queue_message(message, () => {
         if (message.status_code != Soup.KnownStatusCode.OK) {
             callback(false);
             return;
@@ -255,7 +255,7 @@ function gpaste(text, title, callback) {
     let session = new Soup.Session();
     let createUrl = `${GPASTE_BASEURL}api/json/create`;
     let message = Soup.form_request_new_from_hash('POST', createUrl, params);
-    session.queue_message(message, (s, message) => {
+    session.queue_message(message, () => {
         if (message.status_code != Soup.KnownStatusCode.OK) {
             callback(null);
             return;
@@ -292,7 +292,7 @@ function imgurPaste(pixbuf, title, callback) {
 
     let requestHeaders = message.request_headers;
     requestHeaders.append('Authorization', `Client-ID ${IMGUR_CLIENT_ID}`);
-    session.queue_message(message, (s, message) => {
+    session.queue_message(message, () => {
         if (message.status_code != Soup.KnownStatusCode.OK) {
             callback(null);
             return;