From 0425cd29d8a3d7bf6076db7e206e456387182251 Mon Sep 17 00:00:00 2001
From: Yann Leboulanger <asterix@lagaule.org>
Date: Mon, 28 Feb 2005 17:45:06 +0000
Subject: [PATCH] change callback, widget and variable names for Accounts
 window in glade and in the code

---
 plugins/gtkgui/config.py    | 20 ++++++++++----------
 plugins/gtkgui/gtkgui.glade |  4 ++--
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/plugins/gtkgui/config.py b/plugins/gtkgui/config.py
index 84698a4f5..cbee75360 100644
--- a/plugins/gtkgui/config.py
+++ b/plugins/gtkgui/config.py
@@ -1140,7 +1140,7 @@ class accounts_Window:
 		"""initialize listStore with existing accounts"""
 		self.xml.get_widget("modify_button").set_sensitive(False)
 		self.xml.get_widget("delete_button").set_sensitive(False)
-		model = self.treeview.get_model()
+		model = self.accounts_treeview.get_model()
 		model.clear()
 		for account in self.plugin.accounts:
 			activ = 1
@@ -1164,7 +1164,7 @@ class accounts_Window:
 	def on_delete_clicked(self, widget):
 		"""When delete button is clicked :
 		Remove an account from the listStore and from the config file"""
-		sel = self.treeview.get_selection()
+		sel = self.accounts_treeview.get_selection()
 		(model, iter) = sel.get_selected()
 		account = model.get_value(iter, 0)
 		window = confirm_Window(_("Are you sure you want to remove this account (%s) ?") % account)
@@ -1187,7 +1187,7 @@ class accounts_Window:
 		open the account information window for this account"""
 		if not self.plugin.windows.has_key('accountPreference'):
 #			infos = {}
-			sel = self.treeview.get_selection()
+			sel = self.accounts_treeview.get_selection()
 			(model, iter) = sel.get_selected()
 			account = model.get_value(iter, 0)
 			infos = self.plugin.accounts[account]
@@ -1208,23 +1208,23 @@ class accounts_Window:
 		
 	def __init__(self, plugin):
 		self.plugin = plugin
-		self.xml = gtk.glade.XML(GTKGUI_GLADE, 'Accounts', APP)
-		self.window = self.xml.get_widget("Accounts")
-		self.treeview = self.xml.get_widget("treeview")
+		self.xml = gtk.glade.XML(GTKGUI_GLADE, 'accounts_window', APP)
+		self.window = self.xml.get_widget("accounts_window")
+		self.accounts_treeview = self.xml.get_widget("accounts_treeview")
 		model = gtk.ListStore(gobject.TYPE_STRING, gobject.TYPE_STRING, \
 			gobject.TYPE_BOOLEAN)
-		self.treeview.set_model(model)
+		self.accounts_treeview.set_model(model)
 		#columns
 		renderer = gtk.CellRendererText()
-		self.treeview.insert_column_with_attributes(-1, _('Name'), renderer, \
+		self.accounts_treeview.insert_column_with_attributes(-1, _('Name'), renderer, \
 			text=0)
 		renderer = gtk.CellRendererText()
-		self.treeview.insert_column_with_attributes(-1, _('Server'), \
+		self.accounts_treeview.insert_column_with_attributes(-1, _('Server'), \
 			renderer, text=1)
 		renderer = gtk.CellRendererToggle()
 		renderer.set_property('activatable', True)
 		renderer.connect('toggled', self.on_toggled, model)
-		self.treeview.insert_column_with_attributes(-1, _('Active'), \
+		self.accounts_treeview.insert_column_with_attributes(-1, _('Active'), \
 			renderer, active=2)
 		self.xml.signal_connect('gtk_widget_destroy', self.delete_event)
 		self.xml.signal_connect('on_row_activated', self.on_row_activated)
diff --git a/plugins/gtkgui/gtkgui.glade b/plugins/gtkgui/gtkgui.glade
index ba566eeb0..1e7b260e1 100644
--- a/plugins/gtkgui/gtkgui.glade
+++ b/plugins/gtkgui/gtkgui.glade
@@ -657,7 +657,7 @@
   </child>
 </widget>
 
-<widget class="GtkWindow" id="Accounts">
+<widget class="GtkWindow" id="accounts_window">
   <property name="visible">True</property>
   <property name="title" translatable="yes">Accounts</property>
   <property name="type">GTK_WINDOW_TOPLEVEL</property>
@@ -690,7 +690,7 @@
 	  <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
 
 	  <child>
-	    <widget class="GtkTreeView" id="treeview">
+	    <widget class="GtkTreeView" id="accounts_treeview">
 	      <property name="visible">True</property>
 	      <property name="can_focus">True</property>
 	      <property name="headers_visible">True</property>