From c8d12224c9df49fa43af50790b118ac54818dc84 Mon Sep 17 00:00:00 2001
From: Yann Leboulanger <asterix@lagaule.org>
Date: Sun, 3 Apr 2005 09:21:26 +0000
Subject: [PATCH] show the correct icon when we activate systray icon reorder
 functions so that they are in the order in which they appear in the window

---
 plugins/gtkgui/config.py | 73 ++++++++++++++++++++--------------------
 1 file changed, 37 insertions(+), 36 deletions(-)

diff --git a/plugins/gtkgui/config.py b/plugins/gtkgui/config.py
index c86ab210d..fc97ca678 100644
--- a/plugins/gtkgui/config.py
+++ b/plugins/gtkgui/config.py
@@ -47,22 +47,11 @@ class Preferences_window:
 	def on_preferences_window_show(self, widget):
 		self.notebook.set_current_page(0)
 
-	def on_before_time_entry_focus_out_event(self, widget, event):
-		self.plugin.config['before_time'] = widget.get_text()
-	
-	def on_after_time_entry_focus_out_event(self, widget, event):
-		self.plugin.config['after_time'] = widget.get_text()
-
-	def on_before_nickname_entry_focus_out_event(self, widget, event):
-		self.plugin.config['before_nickname'] = widget.get_text()
-
-	def on_after_nickname_entry_focus_out_event(self, widget, event):
-		self.plugin.config['after_nickname'] = widget.get_text()
-
 	def on_tray_icon_checkbutton_toggled(self, widget):
 		if widget.get_active():
 			self.plugin.config['trayicon'] = 1
 			self.plugin.show_systray()
+			self.plugin.roster.update_status_comboxbox()
 		else:
 			self.plugin.config['trayicon'] = 0
 			self.plugin.hide_systray()
@@ -241,15 +230,6 @@ class Preferences_window:
 #					self.plugin.windows[acct]['chats'][jid].xmls[jid].\
 #						get_widget('message_textview').set_buffer(buf2[acct][jid])
 	
-	def update_text_tags(self):
-		"""Update color tags in Opened Chat Windows"""
-		for a in self.plugin.accounts.keys():
-			if self.plugin.windows[a]['chats'].has_key('tabbed'):
-				self.plugin.windows[a]['chats']['tabbed'].update_tags()
-			else:
-				for jid in self.plugin.windows[a]['chats'].keys():
-					self.plugin.windows[a]['chats'][jid].update_tags()
-	
 	def update_print_time(self):
 		"""Update time in Opened Chat Windows"""
 		for a in self.plugin.accounts.keys():
@@ -259,6 +239,42 @@ class Preferences_window:
 				for jid in self.plugin.windows[a]['chats'].keys():
 					self.plugin.windows[a]['chats'][jid].update_print_time()
 	
+	def on_time_never_radiobutton_toggled(self, widget):
+		if widget.get_active():
+			self.plugin.config['print_time'] = 'never'
+		self.update_print_time()
+
+	def on_time_sometimes_radiobutton_toggled(self, widget):
+		if widget.get_active():
+			self.plugin.config['print_time'] = 'sometimes'
+		self.update_print_time()
+
+	def on_time_always_radiobutton_toggled(self, widget):
+		if widget.get_active():
+			self.plugin.config['print_time'] = 'always'
+		self.update_print_time()
+
+	def on_before_time_entry_focus_out_event(self, widget, event):
+		self.plugin.config['before_time'] = widget.get_text()
+	
+	def on_after_time_entry_focus_out_event(self, widget, event):
+		self.plugin.config['after_time'] = widget.get_text()
+
+	def on_before_nickname_entry_focus_out_event(self, widget, event):
+		self.plugin.config['before_nickname'] = widget.get_text()
+
+	def on_after_nickname_entry_focus_out_event(self, widget, event):
+		self.plugin.config['after_nickname'] = widget.get_text()
+
+	def update_text_tags(self):
+		"""Update color tags in Opened Chat Windows"""
+		for a in self.plugin.accounts.keys():
+			if self.plugin.windows[a]['chats'].has_key('tabbed'):
+				self.plugin.windows[a]['chats']['tabbed'].update_tags()
+			else:
+				for jid in self.plugin.windows[a]['chats'].keys():
+					self.plugin.windows[a]['chats'][jid].update_tags()
+	
 	def on_incoming_msg_colorbutton_color_set(self, widget):
 		"""Take The Color For The Incoming Messages"""
 		color = widget.get_color()
@@ -296,21 +312,6 @@ class Preferences_window:
 			gtk.gdk.color_parse(defaults['statusmsgcolor']))		
 		self.update_text_tags()
 
-	def on_time_never_radiobutton_toggled(self, widget):
-		if widget.get_active():
-			self.plugin.config['print_time'] = 'never'
-		self.update_print_time()
-
-	def on_time_sometimes_radiobutton_toggled(self, widget):
-		if widget.get_active():
-			self.plugin.config['print_time'] = 'sometimes'
-		self.update_print_time()
-
-	def on_time_always_radiobutton_toggled(self, widget):
-		if widget.get_active():
-			self.plugin.config['print_time'] = 'always'
-		self.update_print_time()
-
 	def on_use_emoticons_checkbutton_toggled(self, widget):
 		self.on_checkbutton_toggled(widget, 'useemoticons',\
 			[self.xml.get_widget('button_new_emoticon'),\