From 2ca95475cb97919ec4c93320de581ba8215a4483 Mon Sep 17 00:00:00 2001
From: Yann Leboulanger <asterix@lagaule.org>
Date: Sun, 16 Nov 2003 23:38:20 +0000
Subject: [PATCH] icon in chat window

---
 plugins/gtkgui.glade |  4 ++--
 plugins/gtkgui.py    | 19 ++++++++++++-------
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/plugins/gtkgui.glade b/plugins/gtkgui.glade
index d2da10887..28ae89038 100644
--- a/plugins/gtkgui.glade
+++ b/plugins/gtkgui.glade
@@ -264,7 +264,7 @@
 	      </child>
 
 	      <child>
-		<widget class="GtkMenuItem" id="na">
+		<widget class="GtkMenuItem" id="xa">
 		  <property name="visible">True</property>
 		  <property name="label" translatable="yes">NA</property>
 		  <property name="use_underline">True</property>
@@ -503,7 +503,7 @@
 	  </child>
 
 	  <child>
-	    <widget class="GtkImage" id="image16">
+	    <widget class="GtkImage" id="image">
 	      <property name="visible">True</property>
 	      <property name="stock">gtk-no</property>
 	      <property name="icon_size">4</property>
diff --git a/plugins/gtkgui.py b/plugins/gtkgui.py
index 980fcc17c..b725774d8 100644
--- a/plugins/gtkgui.py
+++ b/plugins/gtkgui.py
@@ -226,7 +226,7 @@ class browser:
 
 class message:
 	def delete_event(self, widget):
-		del self.roster.tab_messages[self.user.jid]
+		del self.r.tab_messages[self.user.jid]
 		self.window.destroy()
 	
 	def print_conversation(self, txt, contact = None):
@@ -247,7 +247,7 @@ class message:
 			start_iter = txt_buffer.get_start_iter()
 			end_iter = txt_buffer.get_end_iter()
 			txt = txt_buffer.get_text(start_iter, end_iter, 0)
-			self.roster.queueOUT.put(('MSG',(self.user.jid, txt)))
+			self.r.queueOUT.put(('MSG',(self.user.jid, txt)))
 			txt_buffer.set_text('', -1)
 			self.print_conversation(txt, self.user.jid)
 			widget.grab_focus()
@@ -258,10 +258,12 @@ class message:
 		self.cfgParser = common.optparser.OptionsParser(CONFPATH)
 		self.cfgParser.parseCfgFile()
 		self.user = user
-		self.roster = roster
+		self.r = roster
 		self.xml = gtk.glade.XML('plugins/gtkgui.glade', 'Chat')
 		self.window = self.xml.get_widget('Chat')
 		self.window.set_title('Chat with ' + user.name)
+		self.img = self.xml.get_widget('image')
+		self.img.set_from_pixbuf(self.r.pixbufs[user.show])
 		self.xml.get_widget('label_contact').set_text(user.name + ' <'\
 			+ user.jid + '>')
 		self.message = self.xml.get_widget('message')
@@ -355,6 +357,9 @@ class roster:
 				for i in self.l_contact[jid]['iter']:
 					if self.pixbufs.has_key(show):
 						self.treestore.set_value(i, 0, self.pixbufs[show])
+			#update icon in chat window
+			if self.tab_messages.has_key(jid):
+				self.tab_messages[jid].img.set_from_pixbuf(self.pixbufs[show])
 		u.show = show
 		u.status = status
 	
@@ -498,14 +503,14 @@ class roster:
 		iconstyle = self.cfgParser.GtkGui_iconstyle
 		if not iconstyle:
 			iconstyle = 'sun'
-		path = 'plugins/icons/' + iconstyle + '/'
+		self.path = 'plugins/icons/' + iconstyle + '/'
 		self.pixbufs = {}
 		for state in ('online', 'away', 'xa', 'dnd', 'offline', 'requested'):
-			if not os.path.exists(path + state + '.xpm'):
-				print 'No such file : ' + path + state + '.xpm'
+			if not os.path.exists(self.path + state + '.xpm'):
+				print 'No such file : ' + self.path + state + '.xpm'
 				self.pixbufs[state] = None
 			else:
-				pix = gtk.gdk.pixbuf_new_from_file (path + state + '.xpm')
+				pix = gtk.gdk.pixbuf_new_from_file (self.path + state + '.xpm')
 				self.pixbufs[state] = pix
 		self.tree.set_model(self.treestore)
 		self.queueOUT = queueOUT