sugarlabs/sugar-toolkit-gtk3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix up chat sending/receiving

Browse Source
This commit is contained in:
Dan Williams 2006-04-25 11:47:19 -04:00
parent 78eac624de
commit c6c65f3efa
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
chat/chat.py
View File

@ -120,7 +120,7 @@ class ChatRequestHandler(object):
if buddy: if buddy:
chat = buddy.chat() chat = buddy.chat()
if not chat: if not chat:
chat = BuddyChat(self, buddy, self._chat_view, self._chat_label) chat = BuddyChat(self._parent, buddy, self._chat_view, self._chat_label)
buddy.set_chat(chat) buddy.set_chat(chat)
chat.recv_message(message) chat.recv_message(message)
return True return True
@ -254,7 +254,7 @@ class ChatActivity(activity.Activity):
aniter = self._buddy_list_model.append(None) aniter = self._buddy_list_model.append(None)
self._buddy_list_model.set(aniter, self._MODEL_COL_NICK, "Group", self._buddy_list_model.set(aniter, self._MODEL_COL_NICK, "Group",
self._MODEL_COL_ICON, self._pixbuf_active_chat, self._MODEL_COL_BUDDY, None) self._MODEL_COL_ICON, self._pixbuf_active_chat, self._MODEL_COL_BUDDY, None)
self._activate_chat(None) self._activate_chat_for_buddy(None)
plug.add(vbox) plug.add(vbox)
vbox.show() vbox.show()
@ -327,14 +327,10 @@ class ChatActivity(activity.Activity):
(model, aniter) = widget.get_selection().get_selected() (model, aniter) = widget.get_selection().get_selected()
chat = None chat = None
buddy = self._buddy_list_model.get_value(aniter, self._MODEL_COL_BUDDY) buddy = self._buddy_list_model.get_value(aniter, self._MODEL_COL_BUDDY)
if not buddy: if buddy and not buddy.chat():
chat = self._group_chat
else:
chat = buddy.chat()
if not chat:
chat = BuddyChat(self, buddy, self._chat_view, self._chat_label) chat = BuddyChat(self, buddy, self._chat_view, self._chat_label)
buddy.set_chat(chat) buddy.set_chat(chat)
self._activate_chat(chat) self._activate_chat_for_buddy(buddy)
def _on_buddy_presence_event(self, action, buddy): def _on_buddy_presence_event(self, action, buddy):
if action == BuddyList.ACTION_BUDDY_ADDED: if action == BuddyList.ACTION_BUDDY_ADDED:
@ -365,7 +361,7 @@ class ChatActivity(activity.Activity):
def local_name(self): def local_name(self):
return (self._nick, self._realname) return (self._nick, self._realname)
def _activate_chat(self, buddy): def _activate_chat_for_buddy(self, buddy):
self._active_chat_buddy = buddy self._active_chat_buddy = buddy
# Clear the "new message" icon when the user activates the chat # Clear the "new message" icon when the user activates the chat
@ -376,7 +372,7 @@ class ChatActivity(activity.Activity):
# Actually activate the chat # Actually activate the chat
chat = self._group_chat chat = self._group_chat
if buddy: if self._active_chat_buddy:
chat = buddy.chat() chat = buddy.chat()
chat.activate() chat.activate()
@ -387,6 +383,7 @@ class ChatActivity(activity.Activity):
chat = self._group_chat chat = self._group_chat
if self._active_chat_buddy: if self._active_chat_buddy:
chat = self._active_chat_buddy.chat() chat = self._active_chat_buddy.chat()
return chat
def run(self): def run(self):
try: try: