From ed4fc948ca7f76bc30196b4686115f751edd660d Mon Sep 17 00:00:00 2001
From: Dan Williams <dcbw@redhat.com>
Date: Tue, 25 Apr 2006 13:13:23 -0400
Subject: [PATCH] Make the on_button_close call asynchronous

---
 chat/chat.py       | 6 +-----
 shell/src/shell.py | 9 ++++++++-
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/chat/chat.py b/chat/chat.py
index f4fab639..2abb2f1b 100755
--- a/chat/chat.py
+++ b/chat/chat.py
@@ -79,7 +79,7 @@ class BuddyChat(Chat):
 		success = True
 		try:
 			peer.message(text)
-		except (socket.error, xmlrpclib.Fault), e:
+		except socket.error, e:
 			msg = str(e)
 			success = False
 		self._local_message(success, msg)
@@ -366,10 +366,6 @@ class ChatActivity(activity.Activity):
 
 		# Clear the "new message" icon when the user activates the chat
 		aniter = self._get_iter_for_buddy(buddy)
-		# Select the row in the list
-		if aniter:
-			selection = self._buddy_list_view.get_selection()
-			selection.select_iter(aniter)
 		icon = self._buddy_list_model.get_value(aniter, self._MODEL_COL_ICON)
 		if icon == self._pixbuf_new_message:
 			self._buddy_list_model.set_value(aniter, self._MODEL_COL_ICON, self._pixbuf_active_chat)
diff --git a/shell/src/shell.py b/shell/src/shell.py
index 24c7eefe..869f9875 100755
--- a/shell/src/shell.py
+++ b/shell/src/shell.py
@@ -74,9 +74,16 @@ class ActivityHost(dbus.service.Object):
 		notebook = self.activity_container.notebook
 		index = notebook.append_page(self.socket, hbox)
 		notebook.set_current_page(index)
+
+	def __close_button_clicked_reply_cb(self):
+		pass
+
+	def __close_button_clicked_error_cb(self, error):
+		pass
 		
 	def tab_close_button_clicked(self, button):
-		self.peer_service.close_from_user()
+		self.peer_service.close_from_user(reply_handler = self.__close_button_clicked_reply_cb, \
+										  error_handler = self.__close_button_clicked_error_cb)
 
 	@dbus.service.method("com.redhat.Sugar.Shell.ActivityHost", \
 							 in_signature="", \