diff --git a/src/config.py b/src/config.py
index 9345a597b..737ade9c0 100644
--- a/src/config.py
+++ b/src/config.py
@@ -102,19 +102,6 @@ class PreferencesWindow:
else:
self.trayicon_checkbutton.set_sensitive(False)
- #Show roster on Gajim startup
- st = gajim.config.get('show_roster_on_startup')
- show_roster_on_startup_checkbutton = self.xml.get_widget(
- 'show_roster_on_startup_checkbutton')
- if os.name == 'nt':
- show_roster_on_startup_checkbutton.set_no_show_all(True)
- else:
- if gajim.config.get('trayicon'): # allow it only when trayicon ON
- show_roster_on_startup_checkbutton.set_active(st)
- else:
- show_roster_on_startup_checkbutton.set_sensitive(False)
- show_roster_on_startup_checkbutton.set_active(st)
-
#Save position
st = gajim.config.get('saveposition')
self.xml.get_widget('save_position_checkbutton').set_active(st)
@@ -470,17 +457,10 @@ class PreferencesWindow:
gajim.config.set('trayicon', True)
self.plugin.show_systray()
self.plugin.roster.update_status_comboxbox()
-
- self.xml.get_widget(
- 'show_roster_on_startup_checkbutton').set_sensitive(True)
else:
gajim.config.set('trayicon', False)
self.plugin.hide_systray()
- show_roster_on_startup_checkbutton = self.xml.get_widget(
- 'show_roster_on_startup_checkbutton')
gajim.config.set('show_roster_on_startup', True) # no tray, show roster!
- show_roster_on_startup_checkbutton.set_active(True)
- show_roster_on_startup_checkbutton.set_sensitive(False)
self.plugin.roster.draw_roster()
self.plugin.save_config()
@@ -597,11 +577,6 @@ class PreferencesWindow:
buf2[jid])
window.load_var(jid, saved_var[jid])
- def on_show_roster_on_startup_checkbutton_toggled(self, widget):
- active = widget.get_active()
- gajim.config.set('show_roster_on_startup', active)
- self.plugin.save_config()
-
def on_use_tabbed_chat_window_checkbutton_toggled(self, widget):
tabs_pos_label = self.xml.get_widget('tabs_pos_label')
tabs_pos_combobox = self.xml.get_widget('tabs_pos_combobox')
diff --git a/src/gtkgui.glade b/src/gtkgui.glade
index f894cc5d8..46d048690 100644
--- a/src/gtkgui.glade
+++ b/src/gtkgui.glade
@@ -5172,7 +5172,7 @@ Disabled
GTK_UPDATE_ALWAYS
False
False
- 12 1 100 1 10 10
+ 12 1 720 1 10 10
@@ -5210,7 +5210,7 @@ Disabled
GTK_UPDATE_ALWAYS
False
False
- 20 1 100 1 10 10
+ 20 1 1440 1 10 10
@@ -6039,25 +6039,6 @@ Custom
False
6
-
-
- True
- Show roster window on Gajim startup
- True
- GTK_RELIEF_NORMAL
- True
- True
- False
- True
-
-
-
- 0
- False
- False
-
-
-
True