diff --git a/src/config.py b/src/config.py
index 77a452f41..e50206875 100644
--- a/src/config.py
+++ b/src/config.py
@@ -131,7 +131,7 @@ class Preferences_window:
#iconset
iconsets_list = os.listdir(os.path.join(gajim.DATA_DIR, 'iconsets/'))
- model = gtk.ListStore(gobject.TYPE_STRING)
+ model = gtk.ListStore(str)
self.iconset_combobox.set_model(model)
l = []
for dir in iconsets_list:
diff --git a/src/gtkgui.glade b/src/gtkgui.glade
index ccafe6864..0b654366e 100644
--- a/src/gtkgui.glade
+++ b/src/gtkgui.glade
@@ -1058,7 +1058,7 @@
True
-
+ None
0
@@ -13254,79 +13254,31 @@ the Jabber network.
True
- 5
+ 6
2
False
6
12
-
+
True
- Nickname:
- False
- False
- GTK_JUSTIFY_LEFT
- False
- False
- 0
- 0.5
- 0
- 0
+ If checked, Gajim will join this groupchat on startup
+ True
+ Auto join
+ True
+ GTK_RELIEF_NORMAL
+ True
+ False
+ False
+ True
+
0
- 1
- 0
- 1
- fill
-
-
-
-
-
-
- True
- Room:
- False
- False
- GTK_JUSTIFY_LEFT
- False
- False
- 0
- 0.5
- 0
- 0
-
-
- 0
- 1
- 1
- 2
- fill
-
-
-
-
-
-
- True
- Server:
- False
- False
- GTK_JUSTIFY_LEFT
- False
- False
- 0
- 0.5
- 0
- 0
-
-
- 0
- 1
- 2
- 3
+ 2
+ 5
+ 6
fill
@@ -13346,6 +13298,72 @@ the Jabber network.
0
0
+
+ 0
+ 1
+ 4
+ 5
+ fill
+
+
+
+
+
+
+ True
+ True
+ True
+ True
+ 0
+
+ True
+ *
+ False
+
+
+ 1
+ 2
+ 4
+ 5
+
+
+
+
+
+
+ True
+ True
+ True
+ True
+ 0
+
+ True
+ *
+ False
+
+
+ 1
+ 2
+ 3
+ 4
+
+
+
+
+
+
+ True
+ Server:
+ False
+ False
+ GTK_JUSTIFY_LEFT
+ False
+ False
+ 0
+ 0.5
+ 0
+ 0
+
0
1
@@ -13357,22 +13375,25 @@ the Jabber network.
-
+
True
- True
- True
- True
- 0
-
- True
- *
- False
+ Room:
+ False
+ False
+ GTK_JUSTIFY_LEFT
+ False
+ False
+ 0
+ 0.5
+ 0
+ 0
- 1
- 2
- 0
- 1
+ 0
+ 1
+ 2
+ 3
+ fill
@@ -13389,27 +13410,6 @@ the Jabber network.
*
False
-
- 1
- 2
- 1
- 2
-
-
-
-
-
-
- True
- True
- True
- True
- 0
-
- True
- *
- False
-
1
2
@@ -13420,7 +13420,7 @@ the Jabber network.
-
+
True
True
True
@@ -13434,35 +13434,80 @@ the Jabber network.
1
2
- 3
- 4
+ 1
+ 2
-
+
True
- If checked, Gajim will join this groupchat on startup
- True
- Auto join
- True
- GTK_RELIEF_NORMAL
- True
- False
- False
- True
-
+ Nickname:
+ False
+ False
+ GTK_JUSTIFY_LEFT
+ False
+ False
+ 0
+ 0.5
+ 0
+ 0
0
- 2
- 4
- 5
+ 1
+ 1
+ 2
fill
+
+
+
+ True
+ Title:
+ False
+ False
+ GTK_JUSTIFY_LEFT
+ False
+ False
+ 0
+ 0.5
+ 0
+ 0
+
+
+ 0
+ 1
+ 0
+ 1
+ fill
+
+
+
+
+
+
+ True
+ True
+ True
+ True
+ 0
+
+ True
+ *
+ False
+
+
+ 1
+ 2
+ 0
+ 1
+
+
+
0
@@ -13520,7 +13565,7 @@ the Jabber network.
-
+
6
Manage Proxy Profiles
GTK_WINDOW_TOPLEVEL