Commits October 2008

commits@gajim.org

5 participants
128 discussions

[commit-gajim] r10532 - trunk/src
by jim++＠gajim.org 13 Oct '08

13 Oct '08

Author: jim++ Date: 2008-10-13 10:01:22 +0200 (Mon, 13 Oct 2008) New Revision: 10532 Modified: trunk/src/groupchat_control.py Log: GC are now opened without automatic switch to tab, stop them stealing current tab focus when connected. Still no fix for #3908 :/ Modified: trunk/src/groupchat_control.py =================================================================== --- trunk/src/groupchat_control.py 2008-10-12 20:32:24 UTC (rev 10531) +++ trunk/src/groupchat_control.py 2008-10-13 08:01:22 UTC (rev 10532) @@ -947,8 +947,6 @@ if self.parent_win: self.parent_win.redraw_tab(self) - self.msg_textview.grab_focus() - def got_disconnected(self): self.list_treeview.get_model().clear() nick_list = gajim.contacts.get_nick_list(self.account, self.room_jid)

1 0

[commit-gajim] r10531 - trunk/src
by asterix＠gajim.org 12 Oct '08

12 Oct '08

Author: asterix Date: 2008-10-12 22:32:24 +0200 (Sun, 12 Oct 2008) New Revision: 10531 Modified: trunk/src/dialogs.py Log: better var name Modified: trunk/src/dialogs.py =================================================================== --- trunk/src/dialogs.py 2008-10-12 19:17:09 UTC (rev 10530) +++ trunk/src/dialogs.py 2008-10-12 20:32:24 UTC (rev 10531) @@ -68,7 +68,7 @@ self.dialog.set_transient_for(gajim.interface.roster.window) self.list_ = list_ self.changes_made = False - self.list = self.xml.get_widget('groups_treeview') + self.treeview = self.xml.get_widget('groups_treeview') if len(list_) == 1: contact = list_[0][0] self.xml.get_widget('nickname_label').set_markup( @@ -118,7 +118,7 @@ if group in helpers.special_groups: return # check if it already exists - model = self.list.get_model() + model = self.treeview.get_model() iter = model.get_iter_root() while iter: if model.get_value(iter, 0).decode('utf-8') == group: @@ -131,7 +131,7 @@ def group_toggled_cb(self, cell, path): self.changes_made = True - model = self.list.get_model() + model = self.treeview.get_model() if model[path][2]: model[path][2] = False model[path][1] = True @@ -145,9 +145,10 @@ def init_list(self): store = gtk.ListStore(str, bool, bool) - self.list.set_model(store) - for column in self.list.get_columns(): # Clear treeview when re-drawing - self.list.remove_column(column) + self.treeview.set_model(store) + for column in self.treeview.get_columns(): + # Clear treeview when re-drawing + self.treeview.remove_column(column) accounts = [] # Store groups in a list so we can sort them and the number of contacts in # it @@ -185,14 +186,14 @@ store.set(iter, 2, True) column = gtk.TreeViewColumn(_('Group')) column.set_expand(True) - self.list.append_column(column) + self.treeview.append_column(column) renderer = gtk.CellRendererText() column.pack_start(renderer) column.set_attributes(renderer, text=0) column = gtk.TreeViewColumn(_('In the group')) column.set_expand(False) - self.list.append_column(column) + self.treeview.append_column(column) renderer = gtk.CellRendererToggle() column.pack_start(renderer) renderer.set_property('activatable', True)

1 0

[commit-gajim] r10530 - trunk/src
by asterix＠gajim.org 12 Oct '08

12 Oct '08

Author: asterix Date: 2008-10-12 21:17:09 +0200 (Sun, 12 Oct 2008) New Revision: 10530 Modified: trunk/src/groupchat_control.py trunk/src/roster_window.py Log: show minimized room in roster in red if we have been highlighted. Modified: trunk/src/groupchat_control.py =================================================================== --- trunk/src/groupchat_control.py 2008-10-12 12:52:26 UTC (rev 10529) +++ trunk/src/groupchat_control.py 2008-10-12 19:17:09 UTC (rev 10530) @@ -818,6 +818,8 @@ # muc-specific chatstate if self.parent_win: self.parent_win.redraw_tab(self, 'attention') + else: + self.attention_flag = True other_tags_for_name.append('bold') other_tags_for_text.append('marked') Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2008-10-12 12:52:26 UTC (rev 10529) +++ trunk/src/roster_window.py 2008-10-12 19:17:09 UTC (rev 10530) @@ -4238,7 +4238,15 @@ return jid = model[titer][C_JID].decode('utf-8') account = model[titer][C_ACCOUNT].decode('utf-8') - color = gajim.config.get_per('themes', theme, 'contacttextcolor') + color = None + if type_ == 'groupchat': + ctrl = gajim.interface.minimized_controls[account].get(jid, None) + if ctrl and ctrl.attention_flag: + color = gajim.config.get_per('themes', theme, + 'state_muc_directed_msg_color') + renderer.set_property('foreground', 'red') + if not color: + color = gajim.config.get_per('themes', theme, 'contacttextcolor') if color: renderer.set_property('foreground', color) else:

1 0

[commit-gajim] r10529 - trunk/src
by asterix＠gajim.org 12 Oct '08

12 Oct '08

Author: asterix Date: 2008-10-12 14:52:26 +0200 (Sun, 12 Oct 2008) New Revision: 10529 Modified: trunk/src/message_window.py Log: don't close a MUC when we said we don't want. Modified: trunk/src/message_window.py =================================================================== --- trunk/src/message_window.py 2008-10-12 11:20:35 UTC (rev 10528) +++ trunk/src/message_window.py 2008-10-12 12:52:26 UTC (rev 10529) @@ -514,7 +514,7 @@ close(ctrl) def on_no(ctrl): - close(ctrl) + return def on_minimize(ctrl): if method != self.CLOSE_COMMAND:

1 0

[commit-gajim] r10528 - in trunk/src: . common
by asterix＠gajim.org 12 Oct '08

12 Oct '08

Author: asterix Date: 2008-10-12 13:20:35 +0200 (Sun, 12 Oct 2008) New Revision: 10528 Modified: trunk/src/common/caps.py trunk/src/groupchat_control.py Log: update Contact instance in privateChatControl. see #4292 Modified: trunk/src/common/caps.py =================================================================== --- trunk/src/common/caps.py 2008-10-12 00:51:24 UTC (rev 10527) +++ trunk/src/common/caps.py 2008-10-12 11:20:35 UTC (rev 10528) @@ -228,12 +228,14 @@ # we will put these into proper Contact object and ask # for disco... so that disco will learn how to interpret # these caps + pm_ctrl = None jid = helpers.get_full_jid_from_iq(presence) contact = gajim.contacts.get_contact_from_full_jid(self.name, jid) if contact is None: room_jid, nick = gajim.get_room_and_nick_from_fjid(jid) contact = gajim.contacts.get_gc_contact( self.name, room_jid, nick) + pm_ctrl = gajim.interface.msg_win_mgr.get_control(jid, self.name) if contact is None: # TODO: a way to put contact not-in-roster # into Contacts @@ -267,6 +269,8 @@ contact.caps_node = node contact.caps_hash_method = hash_method contact.caps_hash = hash + if pm_ctrl: + pm_ctrl.update_contact() def _capsDiscoCB(self, jid, node, identities, features, dataforms): contact = gajim.contacts.get_contact_from_full_jid(self.name, jid) Modified: trunk/src/groupchat_control.py =================================================================== --- trunk/src/groupchat_control.py 2008-10-12 00:51:24 UTC (rev 10527) +++ trunk/src/groupchat_control.py 2008-10-12 11:20:35 UTC (rev 10528) @@ -162,7 +162,10 @@ self.got_connected() ChatControl.update_ui(self) + def update_contact(self): + self.contact = gajim.contacts.contact_from_gc_contact(self.gc_contact) + class GroupchatControl(ChatControlBase): TYPE_ID = message_control.TYPE_GC # alphanum sorted

1 0

[commit-gajim] r10527 - trunk/src
by bct＠gajim.org 12 Oct '08

12 Oct '08

Author: bct Date: 2008-10-12 02:51:24 +0200 (Sun, 12 Oct 2008) New Revision: 10527 Modified: trunk/src/chat_control.py Log: disable autonegotiation if e2e is manually started or started by a failed decrypt Modified: trunk/src/chat_control.py =================================================================== --- trunk/src/chat_control.py 2008-10-11 22:37:11 UTC (rev 10526) +++ trunk/src/chat_control.py 2008-10-12 00:51:24 UTC (rev 10527) @@ -2342,7 +2342,6 @@ NS_ESESSION) and not gajim.capscache.is_supported( self.contact, 'notexistant'): self.begin_e2e_negotiation() - self.no_autonegotiation = True else: self.send_chatstate('active', self.contact) @@ -2577,6 +2576,8 @@ self.begin_e2e_negotiation() def begin_e2e_negotiation(self): + self.no_autonegotiation = True + if not self.session: fjid = self.contact.get_full_jid() new_sess = gajim.connections[self.account].make_new_session(fjid)

1 0

[commit-gajim] r10526 - trunk/src
by bct＠gajim.org 11 Oct '08

11 Oct '08

Author: bct Date: 2008-10-12 00:37:11 +0200 (Sun, 12 Oct 2008) New Revision: 10526 Modified: trunk/src/gajim.py Log: fix renegotiation when a message was unable to decrypt. fixes #4360. Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2008-10-11 22:02:20 UTC (rev 10525) +++ trunk/src/gajim.py 2008-10-11 22:37:11 UTC (rev 10526) @@ -1818,9 +1818,9 @@ details = _('Unable to decrypt message from ' '%s\nIt may have been tampered with.') % jid - if session.control: - session.control.print_conversation_line(details, - 'status', '', tim) + ctrl = session.control + if ctrl: + ctrl.print_conversation_line(details, 'status', '', tim) else: dialogs.WarningDialog(_('Unable to decrypt message'), details) @@ -1830,7 +1830,8 @@ session.conn.delete_session(jid, session.thread_id) # restart the session - session.negotiate_e2e(False) + if ctrl: + ctrl.begin_e2e_negotiation() def handle_event_privacy_lists_received(self, account, data): # ('PRIVACY_LISTS_RECEIVED', account, list)

1 0

[commit-gajim] r10525 - trunk/src
by bct＠gajim.org 11 Oct '08

11 Oct '08

Author: bct Date: 2008-10-12 00:02:20 +0200 (Sun, 12 Oct 2008) New Revision: 10525 Modified: trunk/src/session.py Log: renegotiate e2e after somebody reconnects (still doesn't work for PM) Modified: trunk/src/session.py =================================================================== --- trunk/src/session.py 2008-10-11 19:58:22 UTC (rev 10524) +++ trunk/src/session.py 2008-10-11 22:02:20 UTC (rev 10525) @@ -44,18 +44,19 @@ self.control = None - def acknowledge_termination(self): + def detach_from_control(self): if self.control: + self.control.no_autonegotiation = False self.control.set_session(None) + def acknowledge_termination(self): + self.detach_from_control() stanza_session.EncryptedStanzaSession.acknowledge_termination(self) def terminate(self): stanza_session.EncryptedStanzaSession.terminate(self) + self.detach_from_control() - if self.control: - self.control.set_session(None) - # extracts chatstate from a <message/> stanza def get_chatstate(self, msg, msgtxt): composing_xep = None

1 0

[commit-gajim] r10524 - trunk/src
by bct＠gajim.org 11 Oct '08

11 Oct '08

Author: bct Date: 2008-10-11 21:58:22 +0200 (Sat, 11 Oct 2008) New Revision: 10524 Modified: trunk/src/message_window.py Log: fix tb when closing a message window Modified: trunk/src/message_window.py =================================================================== --- trunk/src/message_window.py 2008-10-11 13:21:25 UTC (rev 10523) +++ trunk/src/message_window.py 2008-10-11 19:58:22 UTC (rev 10524) @@ -1084,13 +1084,13 @@ elif self.mode == self.ONE_MSG_WINDOW_PERACCT: acct = msg_win.account elif self.mode == self.ONE_MSG_WINDOW_PERTYPE: - type_ = msg_win.type + type_ = msg_win.type_ pos_x_key = type_ + '-msgwin-x-position' pos_y_key = type_ + '-msgwin-y-position' size_width_key = type_ + '-msgwin-width' size_height_key = type_ + '-msgwin-height' elif self.mode == self.ONE_MSG_WINDOW_NEVER: - type_ = msg_win.type + type_ = msg_win.type_ size_width_key = type_ + '-msgwin-width' size_height_key = type_ + '-msgwin-height' elif self.mode == self.ONE_MSG_WINDOW_ALWAYS_WITH_ROSTER:

1 0

[commit-gajim] r10523 - trunk/src
by asterix＠gajim.org 11 Oct '08

11 Oct '08

Author: asterix Date: 2008-10-11 15:21:25 +0200 (Sat, 11 Oct 2008) New Revision: 10523 Modified: trunk/src/message_window.py Log: fix var names. type -> type_. see #4403 Modified: trunk/src/message_window.py =================================================================== --- trunk/src/message_window.py 2008-10-11 13:10:53 UTC (rev 10522) +++ trunk/src/message_window.py 2008-10-11 13:21:25 UTC (rev 10523) @@ -1039,7 +1039,7 @@ return ctrl return None - def get_controls(self, type_ = None, acct = None): + def get_controls(self, type_=None, acct=None): ctrls = [] for c in self.controls(): if acct and c.account != acct: @@ -1084,15 +1084,15 @@ elif self.mode == self.ONE_MSG_WINDOW_PERACCT: acct = msg_win.account elif self.mode == self.ONE_MSG_WINDOW_PERTYPE: - type = msg_win.type - pos_x_key = type + '-msgwin-x-position' - pos_y_key = type + '-msgwin-y-position' - size_width_key = type + '-msgwin-width' - size_height_key = type + '-msgwin-height' + type_ = msg_win.type + pos_x_key = type_ + '-msgwin-x-position' + pos_y_key = type_ + '-msgwin-y-position' + size_width_key = type_ + '-msgwin-width' + size_height_key = type_ + '-msgwin-height' elif self.mode == self.ONE_MSG_WINDOW_NEVER: - type = msg_win.type - size_width_key = type + '-msgwin-width' - size_height_key = type + '-msgwin-height' + type_ = msg_win.type + size_width_key = type_ + '-msgwin-width' + size_height_key = type_ + '-msgwin-height' elif self.mode == self.ONE_MSG_WINDOW_ALWAYS_WITH_ROSTER: # Ignore any hpaned width width = msg_win.notebook.allocation.width

1 0

← Newer
1
2
3
4
5
6
7
8
9
...
13
Older →

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits October 2008