From 20edeaf030ebaf8d56ef3ed4df92a2bdae49f858 Mon Sep 17 00:00:00 2001
From: bigpod <bigpod@no-mail.com>
Date: Sun, 6 Mar 2005 01:58:42 +0000
Subject: [PATCH] some fixes in config.py

---
 plugins/gtkgui/config.py    | 13 +++++++------
 plugins/gtkgui/gtkgui.glade |  8 ++++----
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/plugins/gtkgui/config.py b/plugins/gtkgui/config.py
index 692bcd053..59e970018 100644
--- a/plugins/gtkgui/config.py
+++ b/plugins/gtkgui/config.py
@@ -340,7 +340,7 @@ class preferences_window:
 		iter = model.get_iter_from_string(row)
 		model.set_value(iter, 0, new_text)
 
-	def on_button_set_image_clicked(self, widget, data=None):
+	def on_set_image_button_clicked(self, widget, data=None):
 		(model, iter) = self.emot_tree.get_selection().get_selected()
 		if not iter:
 			return
@@ -560,7 +560,7 @@ class preferences_window:
 		self.xml.get_widget('button_new_emoticon').set_sensitive(st)
 		self.xml.get_widget('button_remove_emoticon').set_sensitive(st)
 		self.xml.get_widget('treeview_emoticons').set_sensitive(st)
-		self.xml.get_widget('button_set_image').set_sensitive(st)
+		self.xml.get_widget('set_image_button').set_sensitive(st)
 
 		#emoticons
 		self.emot_tree = self.xml.get_widget('treeview_emoticons')
@@ -709,7 +709,7 @@ class preferences_window:
 		fontStr = self.plugin.config['userfont']
 		self.xml.get_widget('fontbutton_user_text').set_font_name(fontStr)
 		
-		self.xml.signal_connect('on_chk_autopopup_toggled', \
+		self.xml.signal_connect('on_auto_pop_up_checkbox_toggled', \
 			self.on_chk_toggled, [self.auto_pp_away_checkbutton])
 		self.xml.signal_connect('on_auto_away_checkbutton_toggled', \
 			self.on_chk_toggled, [self.auto_away_time_spinbutton])
@@ -719,9 +719,10 @@ class preferences_window:
 			self.on_chk_toggled, [self.xml.get_widget('button_new_emoticon'),
 					self.xml.get_widget('button_remove_emoticon'),
 					self.xml.get_widget('treeview_emoticons'),
-					self.xml.get_widget('entry_emoticons'),
-					self.xml.get_widget('button_emoticons'),
-					self.xml.get_widget('image_emoticon')])
+					#self.xml.get_widget('entry_emoticons'),	#FIXME: Are this two supposed to be here ?
+					#self.xml.get_widget('button_emoticons'),
+					self.xml.get_widget('set_image_button'),
+					self.xml.get_widget('emoticons_image')])
 
 		self.plugin.send('ASK_CONFIG', None, ('GtkGui', 'Logger', {'lognotsep':1,\
 			'lognotusr':1}))
diff --git a/plugins/gtkgui/gtkgui.glade b/plugins/gtkgui/gtkgui.glade
index dfda27c9f..50ebed1f9 100644
--- a/plugins/gtkgui/gtkgui.glade
+++ b/plugins/gtkgui/gtkgui.glade
@@ -3897,13 +3897,13 @@ on the server as a vCard</property>
 		      </child>
 
 		      <child>
-			<widget class="GtkButton" id="button_set_image">
+			<widget class="GtkButton" id="set_image_button">
 			  <property name="visible">True</property>
 			  <property name="can_default">True</property>
 			  <property name="can_focus">True</property>
 			  <property name="relief">GTK_RELIEF_NORMAL</property>
 			  <property name="focus_on_click">True</property>
-			  <signal name="clicked" handler="on_button_set_image_clicked" last_modification_time="Sun, 13 Feb 2005 14:32:31 GMT"/>
+			  <signal name="clicked" handler="on_set_image_button_clicked" last_modification_time="Sun, 06 Mar 2005 01:57:33 GMT"/>
 
 			  <child>
 			    <widget class="GtkAlignment" id="alignment38">
@@ -4052,7 +4052,7 @@ on the server as a vCard</property>
 		  <property name="active">False</property>
 		  <property name="inconsistent">False</property>
 		  <property name="draw_indicator">True</property>
-		  <signal name="toggled" handler="on_chk_autopopup_toggled" last_modification_time="Thu, 28 Oct 2004 11:01:25 GMT"/>
+		  <signal name="toggled" handler="on_auto_pop_up_checkbox_toggled" last_modification_time="Sun, 06 Mar 2005 01:20:06 GMT"/>
 		</widget>
 		<packing>
 		  <property name="padding">0</property>
@@ -4314,7 +4314,7 @@ on the server as a vCard</property>
 		  <property name="column_spacing">20</property>
 
 		  <child>
-		    <widget class="GtkCheckButton" id="autoaway_checkbutton">
+		    <widget class="GtkCheckButton" id="auto_away_checkbutton">
 		      <property name="visible">True</property>
 		      <property name="can_focus">True</property>
 		      <property name="label" translatable="yes">Auto away after</property>