From 7a8ff6d6f52b1c19dd2ecef087101bf343bd6c69 Mon Sep 17 00:00:00 2001
From: Nikos Kouremenos <kourem@gmail.com>
Date: Sat, 10 Sep 2005 21:57:02 +0000
Subject: [PATCH] bye bye show_roster_on_startup_checkbutton. power users can
 use ACE

---
 src/config.py    | 25 -------------------------
 src/gtkgui.glade | 23 ++---------------------
 2 files changed, 2 insertions(+), 46 deletions(-)

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</property>
 			  <property name="update_policy">GTK_UPDATE_ALWAYS</property>
 			  <property name="snap_to_ticks">False</property>
 			  <property name="wrap">False</property>
-			  <property name="adjustment">12 1 100 1 10 10</property>
+			  <property name="adjustment">12 1 720 1 10 10</property>
 			  <signal name="value_changed" handler="on_auto_away_time_spinbutton_value_changed" last_modification_time="Wed, 09 Mar 2005 09:46:53 GMT"/>
 			</widget>
 		      </child>
@@ -5210,7 +5210,7 @@ Disabled</property>
 			  <property name="update_policy">GTK_UPDATE_ALWAYS</property>
 			  <property name="snap_to_ticks">False</property>
 			  <property name="wrap">False</property>
-			  <property name="adjustment">20 1 100 1 10 10</property>
+			  <property name="adjustment">20 1 1440 1 10 10</property>
 			  <signal name="value_changed" handler="on_auto_xa_time_spinbutton_value_changed" last_modification_time="Wed, 09 Mar 2005 09:46:59 GMT"/>
 			</widget>
 		      </child>
@@ -6039,25 +6039,6 @@ Custom</property>
 			  <property name="homogeneous">False</property>
 			  <property name="spacing">6</property>
 
-			  <child>
-			    <widget class="GtkCheckButton" id="show_roster_on_startup_checkbutton">
-			      <property name="can_focus">True</property>
-			      <property name="label" translatable="yes">Show roster window on Gajim startup</property>
-			      <property name="use_underline">True</property>
-			      <property name="relief">GTK_RELIEF_NORMAL</property>
-			      <property name="focus_on_click">True</property>
-			      <property name="active">True</property>
-			      <property name="inconsistent">False</property>
-			      <property name="draw_indicator">True</property>
-			      <signal name="toggled" handler="on_show_roster_on_startup_checkbutton_toggled" last_modification_time="Wed, 01 Jun 2005 01:24:38 GMT"/>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">False</property>
-			      <property name="fill">False</property>
-			    </packing>
-			  </child>
-
 			  <child>
 			    <widget class="GtkCheckButton" id="send_os_info_checkbutton">
 			      <property name="visible">True</property>