Changeset 8722 for branches/gajim_0.11.1

Timestamp:

09/04/07 23:47:12 (15 months ago)

Author:

asterix

Message:

catch traceback and show error message when we try to change our nickname with not allowed chars

Files:

• branches/gajim_0.11.1/src/groupchat_control.py (modified) (2 diffs)

branches/gajim_0.11.1/src/groupchat_control.py

@@ -1093 +1093 @@
                         if len(message_array) and message_array[0] != self.nick:
                                 nick = message_array[0]
-                                nick = helpers.parse_resource(nick)
+                                try:
+                                        nick = helpers.parse_resource(nick)
+                                except:
+                                        # Invalid Nickname
+                                        dialogs.ErrorDialog(_('Invalid nickname'),
+                                        _('The nickname has not allowed characters.'))
+                                        return True
                                 gajim.connections[self.account].join_gc(nick, self.room_jid, None)
                                 self.clear(self.msg_textview)
@@ -1374 +1380 @@
                 def on_ok(widget):
                         nick = instance.input_entry.get_text().decode('utf-8')
-                        nick = helpers.parse_resource(nick)
+                        try:
+                                nick = helpers.parse_resource(nick)
+                        except:
+                                # invalid char
+                                dialogs.ErrorDialog(_('Invalid nickname'),
+                                _('The nickname has not allowed characters.'))
+                                return
                         gajim.connections[self.account].join_gc(nick, self.room_jid, None)
                 instance = dialogs.InputDialog(title, prompt, proposed_nick,