Commits May 2008

commits@gajim.org

9 participants
181 discussions

[commit-gajim] r9569 - branches/session_centric/src
by bct＠gajim.org 04 May '08

04 May '08

Author: bct Date: 2008-05-04 02:24:27 +0200 (Sun, 04 May 2008) New Revision: 9569 Modified: branches/session_centric/src/chat_control.py branches/session_centric/src/gajim.py branches/session_centric/src/groupchat_control.py branches/session_centric/src/message_control.py branches/session_centric/src/message_window.py Log: pm bugfix Modified: branches/session_centric/src/chat_control.py =================================================================== --- branches/session_centric/src/chat_control.py 2008-05-03 23:19:02 UTC (rev 9568) +++ branches/session_centric/src/chat_control.py 2008-05-04 00:24:27 UTC (rev 9569) @@ -1586,7 +1586,7 @@ elif num_unread > 1: unread = '[' + unicode(num_unread) + ']' - # Draw tab label using chatstate + # Draw tab label using chatstate theme = gajim.config.get('roster_theme') color = None if not chatstate: @@ -1846,6 +1846,7 @@ self.contact.chatstate = None self.contact.our_chatstate = None + # terminate session self.session.control = None # Disconnect timer callbacks @@ -2077,12 +2078,11 @@ # reset to status image in gc if it is a pm # Is it a pm ? room_jid, nick = gajim.get_room_and_nick_from_fjid(jid) -# XXX fixme somehow -# control = gajim.interface.msg_win_mgr.get_control(room_jid, self.account) -# if control and control.type_id == message_control.TYPE_GC: -# control.update_ui() -# control.parent_win.show_title() -# typ = 'pm' + control = gajim.interface.msg_win_mgr.get_gc_control(room_jid, self.account) + if control and control.type_id == message_control.TYPE_GC: + control.update_ui() + control.parent_win.show_title() + typ = 'pm' self.redraw_after_event_removed(jid) if (self.contact.show in ('offline', 'error')): @@ -2093,8 +2093,8 @@ len(gajim.contacts.get_contacts(self.account, jid)) < 2): gajim.interface.roster.really_remove_contact(self.contact, self.account) -# elif typ == 'pm': -# control.remove_contact(nick) + elif typ == 'pm': + control.remove_contact(nick) def show_bigger_avatar(self, small_avatar): '''resizes the avatar, if needed, so it has at max half the screen size @@ -2140,18 +2140,18 @@ window.set_app_paintable(True) if gtk.gtk_version >= (2, 10, 0) and gtk.pygtk_version >= (2, 10, 0): window.set_type_hint(gtk.gdk.WINDOW_TYPE_HINT_TOOLTIP) - + window.realize() window.window.set_back_pixmap(pixmap, False) # make it transparent window.window.shape_combine_mask(mask, 0, 0) - # make the bigger avatar window show up centered + # make the bigger avatar window show up centered x0, y0 = small_avatar.window.get_origin() x0 += small_avatar.allocation.x y0 += small_avatar.allocation.y center_x= x0 + (small_avatar.allocation.width / 2) center_y = y0 + (small_avatar.allocation.height / 2) - pos_x, pos_y = center_x - (avatar_w / 2), center_y - (avatar_h / 2) + pos_x, pos_y = center_x - (avatar_w / 2), center_y - (avatar_h / 2) window.move(pos_x, pos_y) # make the cursor invisible so we can see the image invisible_cursor = gtkgui_helpers.get_invisible_cursor() Modified: branches/session_centric/src/gajim.py =================================================================== --- branches/session_centric/src/gajim.py 2008-05-03 23:19:02 UTC (rev 9568) +++ branches/session_centric/src/gajim.py 2008-05-04 00:24:27 UTC (rev 9569) @@ -1924,6 +1924,7 @@ if ctrl: new_sess = gajim.connections[account].make_new_session(str(jid)) ctrl.set_session(new_sess) + gajim.connections[account].delete_session(str(jid), session.thread_id) if was_encrypted: ctrl.print_esession_details() Modified: branches/session_centric/src/groupchat_control.py =================================================================== --- branches/session_centric/src/groupchat_control.py 2008-05-03 23:19:02 UTC (rev 9568) +++ branches/session_centric/src/groupchat_control.py 2008-05-04 00:24:27 UTC (rev 9569) @@ -604,7 +604,7 @@ no_queue = len(gajim.events.get_events(self.account, fjid)) == 0 # We print if window is opened - pm_control = gajim.interface.msg_win_mgr.get_control(fjid, self.account, session) + pm_control = session.control if pm_control: pm_control.print_conversation(msg, tim = tim, xhtml = xhtml) @@ -632,7 +632,7 @@ self.parent_win.show_title() self.parent_win.redraw_tab(self) else: - self._start_private_message(nick, session) + self._start_private_message(nick) # Scroll to line self.list_treeview.expand_row(path[0:1], False) self.list_treeview.scroll_to_cell(path) @@ -891,10 +891,9 @@ nick = model[iter][C_NICK].decode('utf-8') fjid = gajim.construct_fjid(self.room_jid, nick) # 'fake' jid - self._start_private_message(nick) + ctrl = self._start_private_message(nick) if msg: - gajim.interface.msg_win_mgr.get_control(fjid, self.account).\ - send_message(msg) + ctrl.send_message(msg) def on_send_file(self, widget, gc_contact): '''sends a file to a contact in the room''' @@ -2041,6 +2040,8 @@ win.set_active_tab(ctrl) win.window.present() + return ctrl + def on_row_activated(self, widget, path): '''When an iter is activated (dubblick or single click if gnome is set this way''' @@ -2099,7 +2100,7 @@ return if gajim.single_click and not event.state & gtk.gdk.SHIFT_MASK: - self.on_row_activated(widget, path) + self.on_row_activated(widget, path) return True else: model = widget.get_model() Modified: branches/session_centric/src/message_control.py =================================================================== --- branches/session_centric/src/message_control.py 2008-05-03 23:19:02 UTC (rev 9568) +++ branches/session_centric/src/message_control.py 2008-05-04 00:24:27 UTC (rev 9569) @@ -117,26 +117,25 @@ return len(gajim.events.get_events(self.account, self.contact.jid)) def set_session(self, session): - if hasattr(self, 'session') and session == self.session: + oldsession = None + if hasattr(self, 'session'): + oldsession = self.session + + if oldsession and session == oldsession: return - was_encrypted = False - - if hasattr(self, 'session') and self.session: - if self.session.enable_encryption: - was_encrypted = True - - gajim.connections[self.account].delete_session(self.session.jid, - self.session.thread_id) - self.session = session if session: session.control = self - if was_encrypted: - self.print_esession_details() + if oldsession: + self.parent_win.change_thread_key(self.contact.jid, + self.account, oldsession.thread_id, session.thread_id) + if oldsession.enable_encryption: + self.print_esession_details() + def send_message(self, message, keyID = '', type = 'chat', chatstate = None, msg_id = None, composing_xep = None, resource = None, user_nick = None): @@ -144,13 +143,6 @@ ''' jid = self.contact.jid - if not self.session: - print('uhoh new session') - fjid = self.contact.get_full_jid() - new_session = gajim.connections[self.account].make_new_session(fjid) - - self.set_session(new_session) - # Send and update history return gajim.connections[self.account].send_message(jid, message, keyID, type = type, chatstate = chatstate, msg_id = msg_id, Modified: branches/session_centric/src/message_window.py =================================================================== --- branches/session_centric/src/message_window.py 2008-05-03 23:19:02 UTC (rev 9568) +++ branches/session_centric/src/message_window.py 2008-05-04 00:24:27 UTC (rev 9569) @@ -429,6 +429,7 @@ fjid = ctrl.get_full_jid() thread_id = ctrl.session.thread_id + del self._controls[ctrl.account][fjid][thread_id] if len(self._controls[ctrl.account][fjid]) == 0: @@ -567,19 +568,30 @@ return [] def change_key(self, old_jid, new_jid, acct): - '''Change the key of a control''' + '''Change the JID key of a control''' try: - # Check if control exists - ctrl = self._controls[acct][old_jid] - except: + # Check if controls exists + ctrls = self._controls[acct][old_jid] + except KeyError: return - self._controls[acct][new_jid] = self._controls[acct][old_jid] + self._controls[acct][new_jid] = ctrls del self._controls[acct][old_jid] if old_jid in gajim.last_message_time[acct]: gajim.last_message_time[acct][new_jid] = \ gajim.last_message_time[acct][old_jid] del gajim.last_message_time[acct][old_jid] + def change_thread_key(self, jid, acct, old_thread_id, new_thread_id): + '''Change the thread_id key of a control''' + try: + # Check if control exists + ctrl = self._controls[acct][jid][old_thread_id] + except KeyError: + return + + self._controls[acct][jid][new_thread_id] = ctrl + del self._controls[acct][jid][old_thread_id] + def controls(self): for jid_dict in self._controls.values(): for ctrl_dict in jid_dict.values():

1 0

[commit-gajim] r9568 - branches/session_centric/src
by bct＠gajim.org 03 May '08

03 May '08

Author: bct Date: 2008-05-04 01:19:02 +0200 (Sun, 04 May 2008) New Revision: 9568 Modified: branches/session_centric/src/session.py branches/session_centric/src/tictactoe.py Log: couple of quick bugfixes Modified: branches/session_centric/src/session.py =================================================================== --- branches/session_centric/src/session.py 2008-05-03 16:52:27 UTC (rev 9567) +++ branches/session_centric/src/session.py 2008-05-03 23:19:02 UTC (rev 9568) @@ -23,7 +23,8 @@ # the other party terminated the session. we'll keep the control around, though. stanza_session.EncryptedStanzaSession.acknowledge_termination(self) - self.control.session = None + if self.control: + self.control.session = None # remove events associated with this session from the queue def remove_events(self, types): Modified: branches/session_centric/src/tictactoe.py =================================================================== --- branches/session_centric/src/tictactoe.py 2008-05-03 16:52:27 UTC (rev 9567) +++ branches/session_centric/src/tictactoe.py 2008-05-03 23:19:02 UTC (rev 9568) @@ -253,6 +253,7 @@ self.setup_window() + # check if the last move (at row r and column c) won the game def check_for_strike(self, p, r, c, strike): # number in a row: up and down, left and right tallyI = 0 @@ -268,36 +269,31 @@ c -= 1 for d in xrange(-strike, strike): + r_in_range = 0 <= r+d < self.rows + c_in_range = 0 <= c+d < self.cols + # vertical check - try: + if r_in_range: tallyI = tallyI + 1 if self.board[r+d][c] != p: tallyI = 0 - except IndexError: - pass # horizontal check - try: + if c_in_range: tally_ = tally_ + 1 if self.board[r][c+d] != p: tally_ = 0 - except IndexError: - pass # diagonal checks - try: + if r_in_range and c_in_range: tallyL = tallyL + 1 if self.board[r+d][c+d] != p: tallyL = 0 - except IndexError: - pass - try: + if r_in_range and 0 <= c-d < self.cols: tallyF = tallyF + 1 if self.board[r+d][c-d] != p: tallyF = 0 - except IndexError: - pass if any([t == strike for t in (tallyL, tallyF, tallyI, tally_)]): return True

1 0

[commit-gajim] r9567 - in branches/session_centric/src: . common common/zeroconf
by bct＠gajim.org 03 May '08

03 May '08

Author: bct Date: 2008-05-03 18:52:27 +0200 (Sat, 03 May 2008) New Revision: 9567 Modified: branches/session_centric/src/common/connection_handlers.py branches/session_centric/src/common/zeroconf/connection_handlers_zeroconf.py branches/session_centric/src/roster_window.py branches/session_centric/src/session.py Log: reuse existing chat sessions and controls Modified: branches/session_centric/src/common/connection_handlers.py =================================================================== --- branches/session_centric/src/common/connection_handlers.py 2008-05-03 16:50:16 UTC (rev 9566) +++ branches/session_centric/src/common/connection_handlers.py 2008-05-03 16:52:27 UTC (rev 9567) @@ -1558,7 +1558,7 @@ return elif mtype != 'groupchat': - session = self.get_session(frm, thread_id, mtype) + session = self.get_or_create_session(frm, thread_id, mtype) if thread_id and not session.received_thread_id: session.received_thread_id = True @@ -1731,7 +1731,7 @@ self.dispatch('GC_INVITATION',(frm, jid_from, reason, password, is_continued)) - def get_session(self, jid, thread_id, type): + def get_or_create_session(self, jid, thread_id, type): '''returns an existing session between this connection and 'jid', returns a new one if none exist.''' session = self.find_session(jid, thread_id, type) Modified: branches/session_centric/src/common/zeroconf/connection_handlers_zeroconf.py =================================================================== --- branches/session_centric/src/common/zeroconf/connection_handlers_zeroconf.py 2008-05-03 16:50:16 UTC (rev 9566) +++ branches/session_centric/src/common/zeroconf/connection_handlers_zeroconf.py 2008-05-03 16:52:27 UTC (rev 9567) @@ -658,7 +658,7 @@ frm = unicode(frm) jid = frm - session = self.get_session(frm, thread_id, mtype) + session = self.get_or_create_session(frm, thread_id, mtype) if thread_id and not session.received_thread_id: session.received_thread_id = True @@ -794,7 +794,7 @@ raise common.xmpp.NodeProcessed - def get_session(self, jid, thread_id, type): + def get_or_create_session(self, jid, thread_id, type): '''returns an existing session between this connection and 'jid', returns a new one if none exist.''' session = self.find_session(jid, thread_id, type) Modified: branches/session_centric/src/roster_window.py =================================================================== --- branches/session_centric/src/roster_window.py 2008-05-03 16:50:16 UTC (rev 9566) +++ branches/session_centric/src/roster_window.py 2008-05-03 16:52:27 UTC (rev 9567) @@ -56,6 +56,8 @@ from groupchat_control import GroupchatControl from groupchat_control import PrivateChatControl +from session import ChatControlSession + from common import dbus_support if dbus_support.supported: from music_track_listener import MusicTrackListener @@ -3390,7 +3392,7 @@ x_min = 0 if gajim.single_click and not event.state & gtk.gdk.SHIFT_MASK and \ not event.state & gtk.gdk.CONTROL_MASK: - # Don't handle dubble click if we press icon of a metacontact + # Don't handle double click if we press icon of a metacontact iter = model.get_iter(path) if x > x_min and x < x_min + 27 and type_ == 'contact' and \ model.iter_has_child(iter): @@ -3928,7 +3930,7 @@ mw = gajim.interface.msg_win_mgr.create_window(contact, account, type_) if not session: - session = gajim.connections[account].get_session(fjid, None, 'pm') + session = gajim.connections[account].get_or_create_session(fjid, None, 'pm') chat_control = PrivateChatControl(mw, gc_contact, contact, account, session) mw.new_tab(chat_control) @@ -3967,7 +3969,7 @@ contact = self.add_to_not_in_the_roster(account, jid, resource = resource) - session = gajim.connections[account].get_session(fjid, None, 'chat') + session = gajim.connections[account].get_or_create_session(fjid, None, 'chat') if not gajim.interface.msg_win_mgr.has_window(fjid, account): session.control = self.new_chat(session, contact, account, resource = resource) @@ -4314,10 +4316,26 @@ conn = gajim.connections[account] + if not session and fjid in conn.sessions: + sessions = filter(lambda s: isinstance(s, ChatControlSession), + conn.sessions[fjid].values()) + + # look for an existing session with a chat control + for s in sessions: + if s.control: + session = s + break + + if not session and not len(sessions) == 0: + # there are no sessions with chat controls, just take the first one + session = sessions[0] + if not session: - session = conn.get_session(fjid, None, 'chat') + # couldn't find an existing ChatControlSession, just make a new one + session = conn.make_new_session(fjid, None, 'chat') if not session.control: + # open a new chat control session.control = self.new_chat(session, contact, account, resource=resource) if len(gajim.events.get_events(account, fjid)): @@ -4336,8 +4354,8 @@ win.window.present() def on_row_activated(self, widget, path): - '''When an iter is activated (dubblick or single click if gnome is set - this way''' + '''When an iter is activated (double-click or single click if gnome is + set this way''' model = self.tree.get_model() account = model[path][C_ACCOUNT].decode('utf-8') type_ = model[path][C_TYPE] @@ -4384,6 +4402,7 @@ c = gajim.contacts.get_contact_with_highest_priority(account, jid) if jid == gajim.get_jid_from_account(account): resource = c.resource + self.on_open_chat_window(widget, c, account, resource = resource, session = session) def on_roster_treeview_row_activated(self, widget, path, col = 0): Modified: branches/session_centric/src/session.py =================================================================== --- branches/session_centric/src/session.py 2008-05-03 16:50:16 UTC (rev 9566) +++ branches/session_centric/src/session.py 2008-05-03 16:52:27 UTC (rev 9567) @@ -19,6 +19,12 @@ self.control = None + def acknowledge_termination(self): + # the other party terminated the session. we'll keep the control around, though. + stanza_session.EncryptedStanzaSession.acknowledge_termination(self) + + self.control.session = None + # remove events associated with this session from the queue def remove_events(self, types): any_removed = False

1 0

[commit-gajim] r9566 - branches/session_centric/src
by bct＠gajim.org 03 May '08

03 May '08

Author: bct Date: 2008-05-03 18:50:16 +0200 (Sat, 03 May 2008) New Revision: 9566 Modified: branches/session_centric/src/tictactoe.py Log: made compatible with python 2.4 Modified: branches/session_centric/src/tictactoe.py =================================================================== --- branches/session_centric/src/tictactoe.py 2008-05-03 14:13:28 UTC (rev 9565) +++ branches/session_centric/src/tictactoe.py 2008-05-03 16:50:16 UTC (rev 9566) @@ -270,24 +270,32 @@ for d in xrange(-strike, strike): # vertical check try: - tallyI = tallyI + 1 if self.board[r+d][c] == p else 0 + tallyI = tallyI + 1 + if self.board[r+d][c] != p: + tallyI = 0 except IndexError: pass # horizontal check try: - tally_ = tally_ + 1 if self.board[r][c+d] == p else 0 + tally_ = tally_ + 1 + if self.board[r][c+d] != p: + tally_ = 0 except IndexError: pass # diagonal checks try: - tallyL = tallyL + 1 if self.board[r+d][c+d] == p else 0 + tallyL = tallyL + 1 + if self.board[r+d][c+d] != p: + tallyL = 0 except IndexError: pass try: - tallyF = tallyF + 1 if self.board[r+d][c-d] == p else 0 + tallyF = tallyF + 1 + if self.board[r+d][c-d] != p: + tallyF = 0 except IndexError: pass

1 0

[commit-gajim] r9565 - trunk/po
by jim++＠gajim.org 03 May '08

03 May '08

Author: jim++ Date: 2008-05-03 16:13:28 +0200 (Sat, 03 May 2008) New Revision: 9565 Modified: trunk/po/fr.po Log: Two small fixs in fr translation, thanks Merwok for report. Modified: trunk/po/fr.po =================================================================== --- trunk/po/fr.po 2008-05-03 10:59:18 UTC (rev 9564) +++ trunk/po/fr.po 2008-05-03 14:13:28 UTC (rev 9565) @@ -1532,7 +1532,7 @@ #. a header for custom browser/client/file manager. so translate sth like: Custom Settings #: ../data/glade/preferences_window.glade.h:8 msgid "Custom" -msgstr "<b<Paramètres personnalisés" +msgstr "Paramètres personnalisés" #: ../data/glade/preferences_window.glade.h:9 msgid "Font" @@ -6893,7 +6893,7 @@ #: ../src/common/config.py:225 msgid "Don't show roster in the system taskbar." -msgstr "Ne pas afficher d'icône dans la zone de notifications du système." +msgstr "Ne pas afficher d'icône dans la barre des tâches." #: ../src/common/config.py:226 msgid "If True and installed GTK+ and PyGTK versions are at least 2.8, make the window flash (the default behaviour in most Window Managers) when holding pending events."

1 0

[commit-gajim] r9564 - trunk/src
by jim++＠gajim.org 03 May '08

03 May '08

Author: jim++ Date: 2008-05-03 12:59:18 +0200 (Sat, 03 May 2008) New Revision: 9564 Modified: trunk/src/history_window.py Log: Even load the pixbuf only once. Modified: trunk/src/history_window.py =================================================================== --- trunk/src/history_window.py 2008-05-03 10:20:56 UTC (rev 9563) +++ trunk/src/history_window.py 2008-05-03 10:59:18 UTC (rev 9564) @@ -148,10 +148,12 @@ helpers.get_contact_dict_for_account(account)) muc_active_img = gtkgui_helpers.load_icon('muc_active') - status_img = gajim.interface.jabber_state_images['16']['online'] - + contact_img = gajim.interface.jabber_state_images['16']['online'] + muc_active_pix = muc_active_img.get_pixbuf() + contact_pix = contact_img.get_pixbuf() keys = self.completion_dict.keys() # Map jid to info tuple + # Warning : This for is time critical with big DB for key in keys: completed = key contact = self.completion_dict[completed] @@ -169,7 +171,7 @@ if gajim.logger.jid_is_room_jid(completed) or\ gajim.logger.jid_is_from_pm(completed): - img = muc_active_img + pix = muc_active_pix if gajim.logger.jid_is_from_pm(completed): # It's PM. Make it easier to find room, nick = gajim.get_room_and_nick_from_fjid(completed) @@ -177,9 +179,9 @@ completed = info_completion info_name = nick else: - img = status_img + pix = contact_pix - liststore.append((img.get_pixbuf(), completed)) + liststore.append((pix, completed)) self.completion_dict[key] = (info_jid, info_acc, info_name, info_completion) self.completion_dict[completed] = (info_jid, info_acc,

1 0

[commit-gajim] r9563 - trunk/src
by steve-e＠gajim.org 03 May '08

03 May '08

Author: steve-e Date: 2008-05-03 12:20:56 +0200 (Sat, 03 May 2008) New Revision: 9563 Modified: trunk/src/history_window.py Log: Remove debug remains. Modified: trunk/src/history_window.py =================================================================== --- trunk/src/history_window.py 2008-05-03 10:15:47 UTC (rev 9562) +++ trunk/src/history_window.py 2008-05-03 10:20:56 UTC (rev 9563) @@ -128,11 +128,12 @@ def _fill_completion_dict(self): '''Fill completion_dict for key auto completion. + Key will be either jid or full_completion_name (contact name or long description like "pm-contact from groupchat....") - {key : (jid, account, nick_name, full_completion_name}''' - c1 = time.clock() + {key : (jid, account, nick_name, full_completion_name} + ''' liststore = gtkgui_helpers.get_completion_liststore(self.jid_entry) # Add all jids in logs.db:

1 0

[commit-gajim] r9562 - trunk/src
by steve-e＠gajim.org 03 May '08

03 May '08

Author: steve-e Date: 2008-05-03 12:15:47 +0200 (Sat, 03 May 2008) New Revision: 9562 Modified: trunk/src/history_window.py Log: Load icons for history window only once. Modified: trunk/src/history_window.py =================================================================== --- trunk/src/history_window.py 2008-05-03 01:30:05 UTC (rev 9561) +++ trunk/src/history_window.py 2008-05-03 10:15:47 UTC (rev 9562) @@ -132,7 +132,7 @@ (contact name or long description like "pm-contact from groupchat....") {key : (jid, account, nick_name, full_completion_name}''' - + c1 = time.clock() liststore = gtkgui_helpers.get_completion_liststore(self.jid_entry) # Add all jids in logs.db: @@ -146,6 +146,9 @@ self.completion_dict.update( helpers.get_contact_dict_for_account(account)) + muc_active_img = gtkgui_helpers.load_icon('muc_active') + status_img = gajim.interface.jabber_state_images['16']['online'] + keys = self.completion_dict.keys() # Map jid to info tuple for key in keys: @@ -165,7 +168,7 @@ if gajim.logger.jid_is_room_jid(completed) or\ gajim.logger.jid_is_from_pm(completed): - img = gtkgui_helpers.load_icon('muc_active') + img = muc_active_img if gajim.logger.jid_is_from_pm(completed): # It's PM. Make it easier to find room, nick = gajim.get_room_and_nick_from_fjid(completed) @@ -173,7 +176,7 @@ completed = info_completion info_name = nick else: - img = gajim.interface.jabber_state_images['16']['online'] + img = status_img liststore.append((img.get_pixbuf(), completed)) self.completion_dict[key] = (info_jid, info_acc, info_name,

1 0

[commit-gajim] r9561 - trunk/src/common
by jim++＠gajim.org 03 May '08

03 May '08

Author: jim++ Date: 2008-05-03 03:30:05 +0200 (Sat, 03 May 2008) New Revision: 9561 Modified: trunk/src/common/helpers.py Log: [elghinn] Specify exception we want to catch so we see if there are others problems. Modified: trunk/src/common/helpers.py =================================================================== --- trunk/src/common/helpers.py 2008-05-03 00:10:17 UTC (rev 9560) +++ trunk/src/common/helpers.py 2008-05-03 01:30:05 UTC (rev 9561) @@ -46,7 +46,7 @@ import hashlib hash_md5 = hashlib.md5 hash_sha1 = hashlib.sha1 -except: +except ImportError: # Python 2.4 import md5 import sha

1 0

[commit-gajim] r9560 - in branches/session_centric/src: . common
by bct＠gajim.org 03 May '08

03 May '08

Author: bct Date: 2008-05-03 02:10:17 +0200 (Sat, 03 May 2008) New Revision: 9560 Modified: branches/session_centric/src/chat_control.py branches/session_centric/src/common/connection_handlers.py branches/session_centric/src/gajim.py branches/session_centric/src/groupchat_control.py branches/session_centric/src/roster_window.py branches/session_centric/src/session.py Log: pm fixes Modified: branches/session_centric/src/chat_control.py =================================================================== --- branches/session_centric/src/chat_control.py 2008-05-02 23:25:31 UTC (rev 9559) +++ branches/session_centric/src/chat_control.py 2008-05-03 00:10:17 UTC (rev 9560) @@ -927,9 +927,8 @@ if contact: gajim.interface.roster.draw_contact(room_jid, self.account) groupchat_control.draw_contact(nick) - mw = gajim.interface.msg_win_mgr.get_gc_window(room_jid, self.account) - if mw: - mw.redraw_tab(groupchat_control) + if groupchat_control.parent_win: + groupchat_control.parent_win.redraw_tab(groupchat_control) else: gajim.interface.roster.draw_contact(jid, self.account) gajim.interface.roster.show_title() Modified: branches/session_centric/src/common/connection_handlers.py =================================================================== --- branches/session_centric/src/common/connection_handlers.py 2008-05-02 23:25:31 UTC (rev 9559) +++ branches/session_centric/src/common/connection_handlers.py 2008-05-03 00:10:17 UTC (rev 9560) @@ -1029,7 +1029,7 @@ gajim.interface.remove_avatar_files(our_jid) self.awaiting_answers[id] = (VCARD_PUBLISHED, iq2) - + def _IqCB(self, con, iq_obj): id = iq_obj.getID() @@ -1081,6 +1081,7 @@ our_jid = gajim.get_jid_from_account(self.name) if iq_obj.getType() == 'error' and jid == our_jid: # our server doesn't support vcard + gajim.log.debug('xxx error xxx') self.vcard_supported = False if not iq_obj.getTag('vCard') or iq_obj.getType() == 'error': if frm and frm != our_jid: Modified: branches/session_centric/src/gajim.py =================================================================== --- branches/session_centric/src/gajim.py 2008-05-02 23:25:31 UTC (rev 9559) +++ branches/session_centric/src/gajim.py 2008-05-03 00:10:17 UTC (rev 9560) @@ -727,7 +727,7 @@ full_jid_with_resource = array[0] jids = full_jid_with_resource.split('/', 1) jid = jids[0] - gc_control = self.msg_win_mgr.get_control(jid, account) + gc_control = self.msg_win_mgr.get_gc_control(jid, account) if not gc_control and \ jid in self.minimized_controls[account]: gc_control = self.minimized_controls[account][jid] Modified: branches/session_centric/src/groupchat_control.py =================================================================== --- branches/session_centric/src/groupchat_control.py 2008-05-02 23:25:31 UTC (rev 9559) +++ branches/session_centric/src/groupchat_control.py 2008-05-03 00:10:17 UTC (rev 9560) @@ -121,7 +121,7 @@ def __init__(self, parent_win, gc_contact, contact, account, session): room_jid = contact.jid.split('/')[0] - room_ctrl = gajim.interface.msg_win_mgr.get_control(room_jid, account) + room_ctrl = gajim.interface.msg_win_mgr.get_gc_control(room_jid, account) if gajim.interface.minimized_controls[account].has_key(room_jid): room_ctrl = gajim.interface.minimized_controls[account][room_jid] self.room_name = room_ctrl.name @@ -448,9 +448,9 @@ 'state_muc_msg_color') if color_name: color = gtk.gdk.colormap_get_system().alloc_color(color_name) - + label_str = self.name - + # count waiting highlighted messages unread = '' num_unread = self.get_nb_unread() @@ -604,9 +604,11 @@ no_queue = len(gajim.events.get_events(self.account, fjid)) == 0 # We print if window is opened - pm_control = gajim.interface.msg_win_mgr.get_control(fjid, self.account) + pm_control = gajim.interface.msg_win_mgr.get_control(fjid, self.account, session) + if pm_control: pm_control.print_conversation(msg, tim = tim, xhtml = xhtml) + return event = gajim.events.create_event('pm', (msg, '', 'incoming', tim, @@ -883,7 +885,7 @@ def on_send_pm(self, widget = None, model = None, iter = None, nick = None, msg = None): - '''opens a chat window and msg is not None sends private message to a + '''opens a chat window and if msg is not None sends private message to a contact in a room''' if nick is None: nick = model[iter][C_NICK].decode('utf-8') @@ -1603,7 +1605,7 @@ for nick in nick_list: # Update pm chat window fjid = self.room_jid + '/' + nick - ctrl = gajim.interface.msg_win_mgr.get_control(fjid, self.account) + ctrl = gajim.interface.msg_win_mgr.get_gc_control(fjid, self.account) if ctrl: contact = gajim.contacts.get_gc_contact(self.account, self.room_jid, nick) contact.show = 'offline' @@ -2033,7 +2035,10 @@ if not win: gajim.interface.roster.new_private_chat(gc_c, self.account) win = gajim.interface.msg_win_mgr.get_window(nick_jid, self.account) - win.set_active_tab(nick_jid, self.account) + + ctrl = win.get_controls(nick_jid, self.account)[0] + + win.set_active_tab(ctrl) win.window.present() def on_row_activated(self, widget, path): Modified: branches/session_centric/src/roster_window.py =================================================================== --- branches/session_centric/src/roster_window.py 2008-05-02 23:25:31 UTC (rev 9559) +++ branches/session_centric/src/roster_window.py 2008-05-03 00:10:17 UTC (rev 9560) @@ -3927,6 +3927,9 @@ if not mw: mw = gajim.interface.msg_win_mgr.create_window(contact, account, type_) + if not session: + session = gajim.connections[account].get_session(fjid, None, 'pm') + chat_control = PrivateChatControl(mw, gc_contact, contact, account, session) mw.new_tab(chat_control) if len(gajim.events.get_events(account, fjid)): Modified: branches/session_centric/src/session.py =================================================================== --- branches/session_centric/src/session.py 2008-05-02 23:25:31 UTC (rev 9559) +++ branches/session_centric/src/session.py 2008-05-03 00:10:17 UTC (rev 9560) @@ -107,19 +107,18 @@ if gajim.jid_is_transport(jid): jid = jid.replace('@', '') - #groupchat_control = gajim.interface.msg_win_mgr.get_control(jid, self.conn.name) + groupchat_control = gajim.interface.msg_win_mgr.get_gc_control(jid, self.conn.name) -# XXX fixme -# if not groupchat_control and \ -# jid in gajim.interface.minimized_controls[self.conn.name]: -# groupchat_control = self.minimized_controls[self.conn.name][jid] + if not groupchat_control and \ + jid in gajim.interface.minimized_controls[self.conn.name]: + groupchat_control = self.minimized_controls[self.conn.name][jid] pm = False -# if groupchat_control and groupchat_control.type_id == \ -# message_control.TYPE_GC: + if groupchat_control and groupchat_control.type_id == \ + message_control.TYPE_GC: # It's a Private message -# pm = True -# msg_type = 'pm' + pm = True + msg_type = 'pm' jid_of_control = full_jid_with_resource @@ -134,7 +133,7 @@ contact.chatstate = chatstate if contact.our_chatstate == 'ask': # we were jep85 disco? contact.our_chatstate = 'active' # no more - #self.control.handle_incoming_chatstate() XXX + self.control.handle_incoming_chatstate() elif contact.chatstate != 'active': # got no valid jep85 answer, peer does not support it contact.chatstate = False @@ -168,8 +167,8 @@ if pm: nickname = resource - groupchat_control.on_private_message(nickname, msgtxt, array[2], - xhtml, session, msg_id) + groupchat_control.on_private_message(nickname, msgtxt, tim, + xhtml, self, msg_id) else: self.roster_message(jid, msgtxt, tim, encrypted, msg_type, subject, resource, msg_id, user_nick, advanced_notif_num,

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits May 2008