Daniel Brötzmann pushed to branch master at gajim / gajim

Commits:

1 changed file:

Changes:

  • gajim/gtk/add_contact.py
    ... ... @@ -120,8 +120,7 @@ def _on_button_clicked(self,
    120 120
                     client.get_module('Presence').subscribe(
    
    121 121
                         self._result.jid,
    
    122 122
                         name=self._result.gateway_name,
    
    123
    -                    auto_auth=True,
    
    124
    -                    name=self._nick)
    
    123
    +                    auto_auth=True)
    
    125 124
                 app.window.show_account_page(account)
    
    126 125
                 self.destroy()
    
    127 126
                 return
    
    ... ... @@ -427,7 +426,7 @@ def prepare(self, account: str, result: DiscoInfo) -> None:
    427 426
                     icon_name = 'gajim-agent-irc'
    
    428 427
                 self._ui.gateway_image.set_from_icon_name(
    
    429 428
                     icon_name, Gtk.IconSize.DIALOG)
    
    430
    -            gateway_name = result.gateway_name or self._result.jid
    
    429
    +            gateway_name = result.gateway_name or str(self._result.jid)
    
    431 430
                 if not result.gateway_type:
    
    432 431
                     self._ui.gateway_label.set_text(gateway_name)
    
    433 432
                 else:
    
    ... ... @@ -439,11 +438,11 @@ def prepare(self, account: str, result: DiscoInfo) -> None:
    439 438
                 for identity in result.identities:
    
    440 439
                     if identity.type == 'sms':
    
    441 440
                         icon_name = 'gajim-agent-sms'
    
    442
    -                    identity_name = identity.name or self._result.jid
    
    441
    +                    identity_name = identity.name or str(self._result.jid)
    
    443 442
                         identity_type = identity.type
    
    444 443
                     if identity.type == 'irc':
    
    445 444
                         icon_name = 'gajim-agent-irc'
    
    446
    -                    identity_name = identity.name or self._result.jid
    
    445
    +                    identity_name = identity.name or str(self._result.jid)
    
    447 446
                         identity_type = identity.type
    
    448 447
                 self._ui.gateway_image.set_from_icon_name(
    
    449 448
                     icon_name, Gtk.IconSize.DIALOG)