From d80325510b9ae043d1b63e36f20b1c85dfca0d68 Mon Sep 17 00:00:00 2001
From: Nikos Kouremenos <kourem@gmail.com>
Date: Mon, 28 Mar 2005 01:20:47 +0000
Subject: [PATCH] fixes for ticket 128

---
 Core/core.py                    | 6 +++++-
 plugins/gtkgui/chat.py          | 3 ++-
 plugins/gtkgui/gtkgui.py        | 6 +++---
 plugins/gtkgui/roster_window.py | 2 +-
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/Core/core.py b/Core/core.py
index b73ae94e5c..9129c98725 100644
--- a/Core/core.py
+++ b/Core/core.py
@@ -678,7 +678,11 @@ class GajimCore:
 		return list_ev
 
 	def request_infos(self, account, con, jid):
-		con.discoverInfo(jid)
+		try: # FIXME: nk 2 yann. is this the best way ?
+			con.discoverInfo(jid)
+		except AttributeError:
+			pass
+			
 
 	def read_queue(self):
 		while self.hub.queueIn.empty() == 0:
diff --git a/plugins/gtkgui/chat.py b/plugins/gtkgui/chat.py
index 76cf0e0c81..530eba8c64 100644
--- a/plugins/gtkgui/chat.py
+++ b/plugins/gtkgui/chat.py
@@ -589,6 +589,7 @@ class Chat:
 		if ((jid != self.get_active_jid()) or (not self.window.is_active()) or \
 			(not end)) and kind == 'incoming':
 			self.nb_unread[jid] += 1
-			self.plugin.systray.add_jid(jid, self.account)
+			if self.plugin.systray_enabled:
+				self.plugin.systray.add_jid(jid, self.account)
 			self.redraw_tab(jid)
 			self.show_title()
diff --git a/plugins/gtkgui/gtkgui.py b/plugins/gtkgui/gtkgui.py
index 8c7d341a91..c10ce4e8d7 100644
--- a/plugins/gtkgui/gtkgui.py
+++ b/plugins/gtkgui/gtkgui.py
@@ -697,11 +697,11 @@ class plugin:
 
 	def show_systray(self):
 		self.systray.show_icon()
-		self.systray_visible = 1
+		self.systray_enabled = True
 
 	def hide_systray(self):
 		self.systray.hide_icon()
-		self.systray_visible = 0
+		self.systray_enabled = False
 	
 	def image_is_ok(self, image):
 		if not os.path.exists(image):
@@ -899,7 +899,7 @@ class plugin:
 		self.sleeper = common.sleepy.Sleepy( \
 			self.config['autoawaytime']*60, \
 			self.config['autoxatime']*60)
-		self.systray_visible = 0
+		self.systray_enabled = False
 		try:
 			import egg.trayicon as trayicon # use gnomepythonextras trayicon
 		except:
diff --git a/plugins/gtkgui/roster_window.py b/plugins/gtkgui/roster_window.py
index 2591e6f7f9..17e2cc06d4 100644
--- a/plugins/gtkgui/roster_window.py
+++ b/plugins/gtkgui/roster_window.py
@@ -934,7 +934,7 @@ class Roster_window:
 	
 	def on_roster_window_delete_event(self, widget, event):
 		"""When we want to close the window"""
-		if self.plugin.systray_visible:
+		if self.plugin.systray_enabled:
 			self.window.hide()
 		else:
 			accounts = self.plugin.accounts.keys()
-- 
GitLab