diff --git a/data/glade/account_creation_wizard_window.glade b/data/glade/account_creation_wizard_window.glade
index 8ec190ed6..087bc69d4 100644
--- a/data/glade/account_creation_wizard_window.glade
+++ b/data/glade/account_creation_wizard_window.glade
@@ -14,7 +14,6 @@
True
- False
False
@@ -134,58 +133,29 @@ to the Jabber network.
12
6
-
- True
-
-
-
-
-
-
-
- 3
- 4
- GTK_FILL
- GTK_FILL
-
-
-
-
- True
- 0
- @
-
-
- 2
- 3
-
-
-
-
-
- True
- 0
- _Jabber ID:
- True
- username_entry
-
-
- GTK_FILL
-
-
-
-
-
+
True
True
- False
- True
+
1
2
+
+
+
+
+
+ True
+ 0
+ _Password:
+ True
+ password_entry
+
+
1
2
+ GTK_FILL
@@ -212,31 +182,58 @@ to the Jabber network.
-
+
True
- 0
- _Password:
- True
- password_entry
+ True
+ False
+ True
+ 1
+ 2
1
2
+
+
+
+
+
+ True
+ 0
+ _Jabber ID:
+ True
+ username_entry
+
+
GTK_FILL
-
+
True
- True
-
-
+ 0
+ @
- 1
- 2
-
+ 2
+ 3
+
+
+
+
+
+ True
+
+
+
+
+
+
+ 3
+ 4
+ GTK_FILL
+ GTK_FILL
@@ -324,6 +321,62 @@ to the Jabber network.
3
5
5
+
+
+ True
+ 0
+ Prox_y:
+ True
+
+
+ GTK_FILL
+
+
+
+
+
+ True
+ None
+
+
+ 1
+ 2
+ GTK_FILL
+
+
+
+
+ True
+ True
+ Manage...
+ True
+ 0
+
+
+
+ 2
+ 3
+
+
+
+
+
+
+ True
+ True
+ Use custom hostname/port
+ True
+ 0
+ True
+
+
+
+ 3
+ 1
+ 2
+
+
+
True
@@ -386,62 +439,6 @@ to the Jabber network.
GTK_FILL
-
-
- True
- True
- Use custom hostname/port
- True
- 0
- True
-
-
-
- 3
- 1
- 2
-
-
-
-
-
- True
- True
- Manage...
- True
- 0
-
-
-
- 2
- 3
-
-
-
-
-
-
- True
- None
-
-
- 1
- 2
- GTK_FILL
-
-
-
-
- True
- 0
- Prox_y:
- True
-
-
- GTK_FILL
-
-
-
diff --git a/src/config.py b/src/config.py
index f8eb7323f..113340d73 100644
--- a/src/config.py
+++ b/src/config.py
@@ -3369,12 +3369,6 @@ class AccountCreationWizardWindow:
if go_online:
gajim.interface.roster.send_status(self.account, 'online', '')
- def on_username_entry_changed(self, widget):
- self.update_jid(widget)
-
- def on_server_comboboxentry_changed(self, widget):
- self.update_jid(widget)
-
def on_username_entry_key_press_event(self, widget, event):
# Check for pressed @ and jump to combobox if found
if event.keyval == gtk.keysyms.at:
@@ -3393,18 +3387,6 @@ class AccountCreationWizardWindow:
username_entry.set_position(-1)
return True
- def update_jid(self,widget):
- username_entry = self.xml.get_widget('username_entry')
- name = username_entry.get_text().decode('utf-8')
- combobox = self.xml.get_widget('server_comboboxentry')
- server = combobox.get_active_text()
- jid_label = self.xml.get_widget('jid_label')
- if len(name) == 0 or len(server) == 0:
- jid_label.set_label('')
- else:
- string = '%s@%s' % (name, server)
- jid_label.set_label(string)
-
def get_config(self, login, server, savepass, password):
config = {}
config['name'] = login