[polari/wip/kunaljain/multiple-server: 4/4] test

[Kunal Jain <kunaljain src gnome org>]

commit 35aa3c5f6f2a31f4309c837fd41acc2044d9af23
Author: Kunaal Jain <kunaalus gmail com>
Date:   Sun Apr 17 13:39:19 2016 +0530

    test

 0001-configure-bump-gtk-version.patch |   26 ++++++++++++++++++++++++++
 data/resources/networks.json          |    8 ++++----
 src/application.js                    |    6 ++++++
 src/chatroomManager.js                |    5 ++++-
 4 files changed, 40 insertions(+), 5 deletions(-)
---
diff --git a/0001-configure-bump-gtk-version.patch b/0001-configure-bump-gtk-version.patch
new file mode 100644
index 0000000..0dcb329
--- /dev/null
+++ b/0001-configure-bump-gtk-version.patch
@@ -0,0 +1,26 @@
+From 3c70c7366b2d03094e25103090a6d541ce53763a Mon Sep 17 00:00:00 2001
+From: Kunaal Jain <kunaalus gmail com>
+Date: Sat, 16 Apr 2016 02:20:30 +0530
+Subject: [PATCH] configure: bump gtk+ version
+
+https://bugzilla.gnome.org/show_bug.cgi?id=765124
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index e53aab8..f1dbb0a 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -33,7 +33,7 @@ GLIB_GSETTINGS
+ PKG_CHECK_MODULES(POLARI,
+                   gio-2.0 >= 2.43.4
+                   gobject-introspection-1.0
+-                  gtk+-3.0 >= 3.15.6
++                  gtk+-3.0 >= 3.19.12
+                   telepathy-glib);
+ 
+ AC_CHECK_FUNCS([strcasestr])
+-- 
+2.5.5
+
diff --git a/data/resources/networks.json b/data/resources/networks.json
index e358341..9ced913 100644
--- a/data/resources/networks.json
+++ b/data/resources/networks.json
@@ -308,10 +308,10 @@
     "name": "GNOME",
     "id": "gimpnet",
     "servers": [
-      { "ssl": false, "port": 6667, "address": "irc.gnome.org" },
-      { "ssl": false, "port": 6667, "address": "irc.gimp.net" },
-      { "ssl": false, "port": 6667, "address": "irc.gimp.org" },
-      { "ssl": false, "port": 6667, "address": "irc.us.gimp.org" },
+      { "ssl": false, "port": 6667, "address": "irc.gnome1.org" },
+      { "ssl": false, "port": 6667, "address": "irc.gimp1.net" },
+      { "ssl": false, "port": 6667, "address": "irc.gimp1.org" },
+      { "ssl": false, "port": 6667, "address": "irc.us.gimp1.org" },
       { "ssl": true, "port": 6697, "address": "irc.eagle.y.se" },
       { "ssl": true, "port": 6697, "address": "irc.acc.umu.se" },
       { "ssl": true, "port": 6697, "address": "irc.gimp.ca" },
diff --git a/src/application.js b/src/application.js
index 37b6b38..a05c2f7 100644
--- a/src/application.js
+++ b/src/application.js
@@ -438,6 +438,7 @@ const Application = new Lang.Class({
         let channel = null;
 
         try {
+            Utils.debug("trying channel");
             channel = req.ensure_and_observe_channel_finish(res);
         } catch (e if e.matches(Tp.Error, Tp.Error.DISCONNECTED)) {
             let error = account.connection_error;
@@ -448,6 +449,7 @@ const Application = new Lang.Class({
                 return;
             if (error == ConnectionError.ALREADY_CONNECTED &&
                 requestData.retry++ < MAX_RETRIES) {
+                    Utils.debug(requestData.retry);
                     this._retryNickRequest(requestData);
                     return;
             }
@@ -473,6 +475,10 @@ const Application = new Lang.Class({
 
         if (requestData.retry > 0)
             this._updateAccountName(account, requestData.originalNick, null);
+
+        print("Here");
+        print(channel);
+
         delete this._pendingRequests[requestData.roomId];
     },
 
diff --git a/src/chatroomManager.js b/src/chatroomManager.js
index 1f295df..18219b7 100644
--- a/src/chatroomManager.js
+++ b/src/chatroomManager.js
@@ -279,12 +279,15 @@ const _ChatroomManager = new Lang.Class({
     },
 
     _onReconnectAccountActivated: function(action, parameter) {
+        print("this called");
         let accountPath = parameter.deep_unpack();
         let factory = Tp.AccountManager.dup().get_factory();
         let account = factory.ensure_account(accountPath, []);
         account.reconnect_async(Lang.bind(this,
             function (a, res){
-                a.reconnect_finish(res);
+                try {
+                    a.reconnect_finish(res);
+                }
             }));
     },