From 178468e2c059f5c5cca43b1359f5cfd347ed3c30 Mon Sep 17 00:00:00 2001
From: Marco Pesenti Gritti <mpg@redhat.com>
Date: Tue, 23 May 2006 12:48:08 -0400
Subject: [PATCH] Don't show hidden tabs border in the editor

---
 sugar/chat/chat.py   | 33 ++++++++++++++-------------------
 sugar/p2p/network.py | 26 ++++++++++----------------
 2 files changed, 24 insertions(+), 35 deletions(-)

diff --git a/sugar/chat/chat.py b/sugar/chat/chat.py
index 8c156982..c5c87080 100755
--- a/sugar/chat/chat.py
+++ b/sugar/chat/chat.py
@@ -19,7 +19,6 @@ from sugar.p2p import Buddy
 from sugar.p2p.Group import LocalGroup
 from sugar.p2p.Service import Service
 from sugar.p2p.Stream import Stream
-from sugar.p2p import network
 from sugar.session.LogWriter import LogWriter
 from sugar.chat.sketchpad.Toolbox import Toolbox
 from sugar.chat.sketchpad.SketchPad import SketchPad
@@ -92,6 +91,7 @@ class Chat(activity.Activity):
 	def _create_chat_editor(self):
 		nb = gtk.Notebook()
 		nb.set_show_tabs(False)
+		nb.set_show_border(False)
 		nb.set_size_request(-1, 70)
 	
 		chat_view_sw = gtk.ScrolledWindow()
@@ -281,15 +281,15 @@ class Chat(activity.Activity):
 		print "act %d: in activity_on_close_from_user" % self.activity_get_id()
 		self.activity_shutdown()
 
-	def _scroll_chat_view_to_bottom(self):
-		# Only scroll to bottom if the view is already close to the bottom
-		vadj = self._chat_sw.get_vadjustment()
-		if vadj.value + vadj.page_size > vadj.upper * 0.8:
-			vadj.value = vadj.upper - vadj.page_size
-			self._chat_sw.set_vadjustment(vadj)
+    def _scroll_chat_view_to_bottom(self):
+        # Only scroll to bottom if the view is already close to the bottom
+        vadj = self._chat_sw.get_vadjustment()
+        if vadj.value + vadj.page_size > vadj.upper * 0.8:
+            vadj.value = vadj.upper - vadj.page_size
+            self._chat_sw.set_vadjustment(vadj)
 
 	def _message_inserted(self):
-		gobject.idle_add(self._scroll_chat_view_to_bottom)
+        gobject.idle_add(self._scroll_chat_view_to_bottom)
 		self.activity_set_has_changes(True)
 
 	def _insert_buddy(self, buf, nick):
@@ -400,9 +400,6 @@ class Chat(activity.Activity):
 
 	def recv_message(self, buddy, msg):
 		"""Insert a remote chat message into the chat buffer."""
-		if not buddy:
-			return
-
 		chunk = self._get_first_richtext_chunk(msg)
 		if chunk:
 			self._insert_rich_message(buddy.get_nick_name(), chunk)
@@ -601,16 +598,14 @@ class GroupChat(Chat):
 			self._chats[buddy] = chat
 			chat.activity_connect_to_shell()
 
-	def _request_buddy_icon_cb(self, result_status, response, user_data):
+	def _request_buddy_icon_cb(self, response, user_data):
 		icon = response
 		buddy = user_data
-		if result_status == network.RESULT_SUCCESS:
-			if icon and len(icon):
-				icon = base64.b64decode(icon)
-				print "Buddy icon for '%s' is size %d" % (buddy.get_nick_name(), len(icon))
-				buddy.set_icon(icon)
-
-		if result_status == network.RESULT_FAILED or not icon:
+		if icon and len(icon):
+			icon = base64.b64decode(icon)
+			print "Buddy icon for '%s' is size %d" % (buddy.get_nick_name(), len(icon))
+			buddy.set_icon(icon)
+		else:
 			# What the heck, try again!
 			gobject.timeout_add(1000, self._request_buddy_icon, buddy)
 
diff --git a/sugar/p2p/network.py b/sugar/p2p/network.py
index b6241a9f..684d114e 100644
--- a/sugar/p2p/network.py
+++ b/sugar/p2p/network.py
@@ -10,9 +10,6 @@ import SimpleXMLRPCServer
 import SocketServer
 
 
-RESULT_FAILED = 0
-RESULT_SUCCESS = 1
-
 __authinfos = {}
 
 def _add_authinfo(authinfo):
@@ -179,7 +176,7 @@ class GlibXMLRPCTransport(xmlrpclib.Transport):
 		if request_cb:
 			if len(response) == 1:
 				response = response[0]
-			gobject.idle_add(request_cb, RESULT_SUCCESS, response, user_data)
+			gobject.idle_add(request_cb, response, user_data)
 
 class _Method:
 	"""Right, so python people thought it would be funny to make this
@@ -212,7 +209,7 @@ class GlibServerProxy(xmlrpclib.ServerProxy):
 	Here, 'xmlrpc_test_cb' is the callback function, which has the following
 	signature:
 	
-	def xmlrpc_test_cb(result_status, response, user_data=None):
+	def xmlrpc_test_cb(response, user_data=None):
 		...
 	"""
 	def __init__(self, uri, encoding=None, verbose=0, allow_none=0):
@@ -239,17 +236,14 @@ class GlibServerProxy(xmlrpclib.ServerProxy):
 		request = xmlrpclib.dumps(params, methodname, encoding=self._encoding,
 						allow_none=self._allow_none)
 
-		try:
-			response = self._transport.start_request(
-				self._host,
-				self._handler,
-				request,
-				verbose=self._verbose,
-				request_cb=request_cb,
-				user_data=user_data
-				)
-		except socket.error, exc:
-			gobject.idle_add(request_cb, RESULT_FAILED, None, user_data)
+		response = self._transport.start_request(
+			self._host,
+			self._handler,
+			request,
+			verbose=self._verbose,
+			request_cb=request_cb,
+			user_data=user_data
+			)
 
 	def __getattr__(self, name):
 		# magic method dispatcher