@@ -16,8 +16,7 @@ this.App =

       App._dispatcher = new WebSocketRails('www.xmpp.dev:3000/websocket')

       App._dispatcher.on_open = =>

         @_setupBackboneComponents()

-        @_bindListeners()

-        callback?()

+        @_bindListeners(callback)

     trigger: (options) ->

       _.defaults(options, {data: {} })

@@ -109,7 +108,15 @@ this.App =

       App.Views.tabbar = new Xmpp.Views.Tabbar.TabbarView()

-    _bindListeners: ->

+    _bindListeners: (callback) ->

+      App._dispatcher.bind('app.client.connected', (jid) ->

+        callback?(jid)

+      )

+

+      App._dispatcher.bind('app.client.cannot_connect', (jid) ->

+        alert('cannot connect to ' + jid)

+      )

+

       App._dispatcher.bind('app.roster.statusChanged', (result) ->

         App.debug 'change contact state'

         App.Collections.contacts.updateStatus(result)

@@ -10,7 +10,7 @@

 #= require _main

 #= require chat

-App.Com.connect(->

+App.Com.connect( (connected_jid) ->

   App.Com.initRoster(->

     App.Com.startFetchingVcards()

     App.Com.startPollingRoster()

@@ -38,11 +38,16 @@ class WsRosterController < WsController

         end

         clients.each do |client|

-            begin

-                client = Signin.try_login(client[:jid], client[:pass])

-                connection_store[:clients] << client

-            rescue Signin::LoginError

-                send_message 'app.client.cannot_connect', true

+            Thread.new do

+                begin

+                    client = Signin.try_login(client[:jid], client[:pass])

+                    connection_store[:clients] << client

+                    send_message 'app.client.connected', client.jid.strip.to_s

+                    #Rails.logger.debug '!!!!! finished for ' + client_id.to_s

+                rescue Signin::LoginError

+                    #Rails.logger.debug '!!!!! finished FAILED for ' + client_id.to_s

+                    send_message 'app.client.cannot_connect', client.jid.strip.to_s

+                end

             end

         end

     end

@@ -1,4 +1,3 @@

-#require 'json/pure'

 require 'xmpp4r'

 require 'xmpp4r/roster'

 require 'cgi'

@@ -12,8 +11,8 @@ module Signin

         begin

             connect(pass)

             @client

-        rescue

-            raise LoginError

+        rescue Exception => e

+            raise LoginError, e.message

         end

     end