Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] 7 commits: Dont style delayed messages differently
by Philipp Hörist 10 Jun '19

10 Jun '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: cf7b9f26 by Philipp Hörist at 2019-06-10T17:08:55Z Dont style delayed messages differently The timestamp should be enough indication of how recent the message is - - - - - 40dd5cf7 by Philipp Hörist at 2019-06-10T19:31:19Z Remove duplicate code Same code exists in the ChatControlBase.add_message() method already - - - - - 021e3fc1 by Philipp Hörist at 2019-06-10T19:31:27Z Fix documentation - - - - - 99906bfc by Philipp Hörist at 2019-06-10T19:31:27Z Fix MUC Messages sent by the server - - - - - b23759c9 by Philipp Hörist at 2019-06-10T19:31:33Z Rename msg_stanza_id to message_id This helps to prevent confusion because there exist XEP-0359 stanza-ids which are not used here - - - - - 6d50b72e by Philipp Hörist at 2019-06-10T19:31:33Z Remove unused argument graphics was always True, we only use it in add_info_message() - - - - - 0334f676 by Philipp Hörist at 2019-06-10T19:31:33Z ChatControl: Simplify receipt code Determine if we add a receipt mark inisde ConversationsTextview instead of in the ChatControl - - - - - 7 changed files: - gajim/chat_control.py - gajim/chat_control_base.py - gajim/common/config.py - gajim/conversation_textview.py - gajim/data/style/default.css - gajim/groupchat_control.py - gajim/gtk/themes.py Changes: ===================================== gajim/chat_control.py ===================================== @@ -858,7 +858,7 @@ class ChatControl(ChatControlBase): self.add_message( obj.msgtxt, kind, tim=obj.timestamp, encrypted=obj.encrypted, correct_id=obj.correct_id, - msg_stanza_id=obj.message_id, additional_data=obj.additional_data) + message_id=obj.message_id, additional_data=obj.additional_data) def _nec_decrypted_message_received(self, obj): if not obj.msgtxt: @@ -871,18 +871,16 @@ class ChatControl(ChatControlBase): return typ = '' - xep0184_id = None if obj.mtype == 'error': typ = 'error' if obj.forwarded and obj.sent: typ = 'out' - if obj.jid != app.get_jid_from_account(obj.conn.name): - xep0184_id = obj.id_ + self.add_message(obj.msgtxt, typ, tim=obj.timestamp, encrypted=obj.encrypted, subject=obj.subject, xhtml=obj.xhtml, displaymarking=obj.displaymarking, - msg_log_id=obj.msg_log_id, msg_stanza_id=obj.id_, correct_id=obj.correct_id, - xep0184_id=xep0184_id, additional_data=obj.additional_data) + msg_log_id=obj.msg_log_id, message_id=obj.message_id, correct_id=obj.correct_id, + additional_data=obj.additional_data) if obj.msg_log_id: pw = self.parent_win end = self.conv_textview.autoscroll @@ -899,11 +897,8 @@ class ChatControl(ChatControlBase): return self.last_sent_msg = obj.stanza_id - id_ = obj.msg_iq.getID() - xep0184_id = None - if self.contact.jid != app.get_jid_from_account(self.account): - if app.config.get_per('accounts', self.account, 'request_receipt'): - xep0184_id = id_ + message_id = obj.msg_iq.getID() + if obj.label: displaymarking = obj.label.getTag('displaymarking') else: @@ -914,8 +909,8 @@ class ChatControl(ChatControlBase): self.msg_textview, 'gajim-msg-correcting') self.add_message(obj.message, self.contact.jid, tim=obj.timestamp, - encrypted=obj.encrypted, xep0184_id=xep0184_id, xhtml=obj.xhtml, - displaymarking=displaymarking, msg_stanza_id=id_, + encrypted=obj.encrypted, xhtml=obj.xhtml, + displaymarking=displaymarking, message_id=message_id, correct_id=obj.correct_id, additional_data=obj.additional_data) @@ -947,9 +942,9 @@ class ChatControl(ChatControlBase): return app.nicks[self.account] def add_message(self, text, frm='', tim=None, encrypted=None, - subject=None, xhtml=None, xep0184_id=None, - displaymarking=None, msg_log_id=None, correct_id=None, - msg_stanza_id=None, additional_data=None): + subject=None, xhtml=None, + displaymarking=None, msg_log_id=None, correct_id=None, + message_id=None, additional_data=None): """ Print a line in the conversation @@ -988,8 +983,8 @@ class ChatControl(ChatControlBase): xhtml = '<body xmlns="%s">%s</body>' % (NS_XHTML, xhtml) ChatControlBase.add_message(self, text, kind, name, tim, subject=subject, old_kind=self.old_msg_kind, xhtml=xhtml, - xep0184_id=xep0184_id, displaymarking=displaymarking, - msg_log_id=msg_log_id, msg_stanza_id=msg_stanza_id, + displaymarking=displaymarking, + msg_log_id=msg_log_id, message_id=message_id, correct_id=correct_id, additional_data=additional_data, encrypted=encrypted) if text.startswith('/me ') or text.startswith('/me\n'): @@ -1308,20 +1303,21 @@ class ChatControl(ChatControlBase): tim = float(row.time) - if app.config.get('restored_messages_small'): - small_attr = ['small'] - else: - small_attr = [] xhtml = None if msg.startswith('<body '): xhtml = msg if row.subject: msg = _('Subject: %(subject)s\n%(message)s') % \ {'subject': row.subject, 'message': msg} - ChatControlBase.add_message(self, msg, kind, name, - tim, small_attr, small_attr + ['restored_message'], - small_attr + ['restored_message'], False, - old_kind=local_old_kind, xhtml=xhtml, additional_data=additional_data) + ChatControlBase.add_message(self, + msg, + kind, + name, + tim, + restored=True, + old_kind=local_old_kind, + xhtml=xhtml, + additional_data=additional_data) if row.message.startswith('/me ') or row.message.startswith('/me\n'): local_old_kind = None else: ===================================== gajim/chat_control_base.py ===================================== @@ -931,11 +931,12 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): text, 'status', '', None) def add_message(self, text, kind, name, tim, - other_tags_for_name=None, other_tags_for_time=None, other_tags_for_text=None, - count_as_new=True, subject=None, old_kind=None, xhtml=None, - xep0184_id=None, graphics=True, displaymarking=None, msg_log_id=None, - msg_stanza_id=None, correct_id=None, additional_data=None, - encrypted=None): + other_tags_for_name=None, other_tags_for_time=None, + other_tags_for_text=None, restored=False, subject=None, + old_kind=None, xhtml=None, + displaymarking=None, msg_log_id=None, + message_id=None, correct_id=None, additional_data=None, + encrypted=None): """ Print 'chat' type messages correct_id = (message_id, correct_id) @@ -958,16 +959,14 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): textview.print_conversation_line(text, kind, name, tim, other_tags_for_name, other_tags_for_time, other_tags_for_text, - subject, old_kind, xhtml, graphics=graphics, - displaymarking=displaymarking, msg_stanza_id=msg_stanza_id, + subject, old_kind, xhtml, + displaymarking=displaymarking, message_id=message_id, correct_id=correct_id, additional_data=additional_data, encrypted=encrypted) - if xep0184_id is not None: - textview.add_xep0184_mark(xep0184_id) - - if not count_as_new: + if restored: return + if kind == 'incoming': if not self.type_id == message_control.TYPE_GC or \ app.config.notify_for_muc(jid) or \ ===================================== gajim/common/config.py ===================================== @@ -236,7 +236,6 @@ class Config: 'print_status_muc_default': [opt_bool, False, _('Default Setting: Show a status message for all status (away, dnd, etc.) changes of users in a group chat')], 'log_contact_status_changes': [opt_bool, False], 'log_xhtml_messages': [opt_bool, False, _('Log XHTML messages instead of plain text messages.')], - 'restored_messages_small': [opt_bool, True, _('If true, restored messages will use a smaller font than the default one.')], 'hide_avatar_of_transport': [opt_bool, False, _('Don\'t show avatar for the transport itself.')], 'roster_window_skip_taskbar': [opt_bool, False, _('Don\'t show roster in the system taskbar.')], 'use_urgency_hint': [opt_bool, True, _('If true, make the window flash (the default behaviour in most Window Managers) when holding pending events.')], ===================================== gajim/conversation_textview.py ===================================== @@ -206,9 +206,9 @@ class ConversationTextview(GObject.GObject): self.handlers = {} self.image_cache = {} self.xep0184_marks = {} - # self.last_sent_message_id = msg_stanza_id + # self.last_sent_message_id = message_id self.last_sent_message_id = None - # last_received_message_id[name] = (msg_stanza_id, line_start_mark) + # last_received_message_id[name] = (message_id, line_start_mark) self.last_received_message_id = {} self.autoscroll = True # connect signals @@ -285,10 +285,6 @@ class ConversationTextview(GObject.GObject): #Pango.SCALE_SMALL tag.set_property('scale', 0.8333333333333) - tag = buffer_.create_tag('restored_message') - color = app.css_config.get_value('.gajim-restored-message', StyleAttr.COLOR) - tag.set_property('foreground', color) - self.tv.create_tags() tag = buffer_.create_tag('bold') @@ -898,9 +894,9 @@ class ConversationTextview(GObject.GObject): buffer_.insert_with_tags_by_name(iter_, '\n', 'eol') self.just_cleared = False - def get_end_mark(self, msg_stanza_id, start_mark): + def get_end_mark(self, message_id, start_mark): for index, msg in enumerate(self.message_list): - if msg[2] == msg_stanza_id and msg[1] == start_mark: + if msg[2] == message_id and msg[1] == start_mark: try: end_mark = self.message_list[index + 1][1] end_mark_name = end_mark.get_name() @@ -918,7 +914,7 @@ class ConversationTextview(GObject.GObject): return None, None def get_insert_mark(self, timestamp): - # message_list = [(timestamp, line_start_mark, msg_stanza_id)] + # message_list = [(timestamp, line_start_mark, message_id)] # We check if this is a new Message try: if self.message_list[-1][0] <= timestamp: @@ -939,7 +935,7 @@ class ConversationTextview(GObject.GObject): def print_conversation_line(self, text, kind, name, tim, other_tags_for_name=None, other_tags_for_time=None, other_tags_for_text=None, subject=None, old_kind=None, xhtml=None, graphics=True, - displaymarking=None, msg_stanza_id=None, correct_id=None, additional_data=None, + displaymarking=None, message_id=None, correct_id=None, additional_data=None, encrypted=None): """ Print 'chat' type messages @@ -966,12 +962,12 @@ class ConversationTextview(GObject.GObject): index, insert_mark, old_txt = \ self.correct_message(correct_id, kind, name) if correct_id in self.corrected_text_list: - self.corrected_text_list[msg_stanza_id] = \ + self.corrected_text_list[message_id] = \ self.corrected_text_list[correct_id] + '\n{}' \ .format(GLib.markup_escape_text(old_txt)) del self.corrected_text_list[correct_id] else: - self.corrected_text_list[msg_stanza_id] = \ + self.corrected_text_list[message_id] = \ _('<b>Message corrected. Original message:</b>\n{}') \ .format(GLib.markup_escape_text(old_txt)) corrected = True @@ -989,7 +985,7 @@ class ConversationTextview(GObject.GObject): 'Printed Line: %s, %s, %s, inserted after: %s' ', stanza-id: %s, correct-id: %s', self.line, text, tim, insert_mark_name, - msg_stanza_id, correct_id) + message_id, correct_id) if not insert_mark: # Texview is empty or Message is new iter_ = buffer_.get_end_iter() @@ -1058,14 +1054,14 @@ class ConversationTextview(GObject.GObject): if corrected: # Show Correction Icon - buffer_.create_tag(tag_name=msg_stanza_id) + buffer_.create_tag(tag_name=message_id) buffer_.insert(iter_, ' ') icon = load_icon('document-edit-symbolic', self.tv, pixbuf=True) buffer_.insert_pixbuf( iter_, icon) tag_start_iter = iter_.copy() tag_start_iter.backward_chars(2) - buffer_.apply_tag_by_name(msg_stanza_id, tag_start_iter, iter_) + buffer_.apply_tag_by_name(message_id, tag_start_iter, iter_) # If we inserted a Line we add a new line at the end if insert_mark: @@ -1079,18 +1075,18 @@ class ConversationTextview(GObject.GObject): if index is None: # New Message - self.message_list.append((tim, new_mark, msg_stanza_id)) + self.message_list.append((tim, new_mark, message_id)) elif corrected: # Replace the corrected message - self.message_list[index] = (tim, new_mark, msg_stanza_id) + self.message_list[index] = (tim, new_mark, message_id) else: # We insert the message at index - self.message_list.insert(index, (tim, new_mark, msg_stanza_id)) + self.message_list.insert(index, (tim, new_mark, message_id)) if kind == 'incoming': - self.last_received_message_id[name] = (msg_stanza_id, new_mark) + self.last_received_message_id[name] = (message_id, new_mark) elif kind == 'outgoing': - self.last_sent_message_id = (msg_stanza_id, new_mark) + self.last_sent_message_id = (message_id, new_mark) if not insert_mark: if self.autoscroll or kind == 'outgoing': @@ -1101,7 +1097,9 @@ class ConversationTextview(GObject.GObject): buffer_.end_user_action() self.line += 1 - return iter_ + + if kind == 'outgoing' and message_id is not None: + self.add_xep0184_mark(message_id) def get_time_to_show(self, tim, direction_mark=''): """ ===================================== gajim/data/style/default.css ===================================== @@ -1 +1 @@ - .gajim-incoming-nickname { color: rgb(164, 0, 0) } .gajim-outgoing-nickname { color: rgb(52, 101, 164) } .gajim-outgoing-message-text { color: rgb(85, 87, 83) } .gajim-status-message { color: rgb(78, 154, 6) } .gajim-url { color: rgb(32, 74, 135) } .gajim-highlight-message { color: rgb(255, 128, 128) } .gajim-restored-message { color: rgb(85, 87, 83) } .gajim-roster-disconnected { background: rgb(171 ,97 ,97) } .gajim-roster-connected { background: rgb(173, 195, 198) } .gajim-state-composing { color: rgb(0, 139, 0) } .gajim-state-inactive { color: rgb(158, 158, 158) } .gajim-state-gone { color: rgb(128, 128, 128) } .gajim-state-paused { color: rgb(0, 0, 205) } .gajim-message-placeholder { color: rgb(195, 195, 192) } \ No newline at end of file + .gajim-incoming-nickname { color: rgb(164, 0, 0) } .gajim-outgoing-nickname { color: rgb(52, 101, 164) } .gajim-outgoing-message-text { color: rgb(85, 87, 83) } .gajim-status-message { color: rgb(78, 154, 6) } .gajim-url { color: rgb(32, 74, 135) } .gajim-highlight-message { color: rgb(255, 128, 128) } .gajim-roster-disconnected { background: rgb(171 ,97 ,97) } .gajim-roster-connected { background: rgb(173, 195, 198) } .gajim-state-composing { color: rgb(0, 139, 0) } .gajim-state-inactive { color: rgb(158, 158, 158) } .gajim-state-gone { color: rgb(128, 128, 128) } .gajim-state-paused { color: rgb(0, 0, 205) } .gajim-message-placeholder { color: rgb(195, 195, 192) } \ No newline at end of file ===================================== gajim/groupchat_control.py ===================================== @@ -56,7 +56,6 @@ from gajim.common import events from gajim.common import app from gajim.common import helpers from gajim.common.helpers import open_uri -from gajim.common.helpers import AdditionalDataDict from gajim.common import ged from gajim.common.i18n import _ from gajim.common import contacts @@ -1203,7 +1202,7 @@ class GroupchatControl(ChatControlBase): obj.msgtxt, contact=obj.nick, tim=obj.timestamp, correct_id=obj.correct_id, encrypted=obj.encrypted, - msg_stanza_id=obj.message_id, + message_id=obj.message_id, additional_data=obj.additional_data) def _nec_gc_message_received(self, obj): @@ -1217,24 +1216,14 @@ class GroupchatControl(ChatControlBase): xhtml=obj.xhtml_msgtxt, displaymarking=obj.displaymarking, additional_data=obj.additional_data) else: - # message from someone - if obj.delayed: - # don't print xhtml if it's an old message. - # Like that xhtml messages are grayed too. - self.add_delayed_message( - obj.msgtxt, contact=obj.nick, - tim=obj.timestamp, xhtml=None, encrypted=obj.encrypted, - displaymarking=obj.displaymarking, msg_stanza_id=obj.id_, - additional_data=obj.additional_data) - else: - if obj.nick == self.nick: - self.last_sent_txt = obj.msgtxt - self.add_message( - obj.msgtxt, contact=obj.nick, - tim=obj.timestamp, xhtml=obj.xhtml_msgtxt, - displaymarking=obj.displaymarking, encrypted=obj.encrypted, - correct_id=obj.correct_id, msg_stanza_id=obj.id_, - additional_data=obj.additional_data) + if obj.nick == self.nick: + self.last_sent_txt = obj.msgtxt + self.add_message( + obj.msgtxt, contact=obj.nick, + tim=obj.timestamp, xhtml=obj.xhtml_msgtxt, + displaymarking=obj.displaymarking, encrypted=obj.encrypted, + correct_id=obj.correct_id, message_id=obj.message_id, + additional_data=obj.additional_data) obj.needs_highlight = self.needs_visual_notification(obj.msgtxt) def on_private_message(self, nick, sent, msg, tim, xhtml, session, msg_log_id=None, @@ -1287,46 +1276,23 @@ class GroupchatControl(ChatControlBase): return None return self.model.get_iter(path) - - def add_delayed_message(self, text, contact='', tim=None, xhtml=None, - displaymarking=None, msg_stanza_id=None, encrypted=None, additional_data=None): - if additional_data is None: - additional_data = AdditionalDataDict() - - if contact: - if contact == self.nick: # it's us - kind = 'outgoing' - else: - kind = 'incoming' - else: - kind = 'status' - if app.config.get('restored_messages_small'): - small_attr = ['small'] - else: - small_attr = [] - - ChatControlBase.add_message(self, text, kind, contact, tim, - small_attr, small_attr + ['restored_message'], - small_attr + ['restored_message'], count_as_new=False, xhtml=xhtml, - displaymarking=displaymarking, msg_stanza_id=msg_stanza_id, - encrypted=encrypted, additional_data=additional_data) - def add_message(self, text, contact='', tim=None, xhtml=None, - graphics=True, displaymarking=None, correct_id=None, msg_stanza_id=None, - encrypted=None, additional_data=None): + displaymarking=None, correct_id=None, message_id=None, + encrypted=None, additional_data=None): """ - Print a line in the conversation + Add message to the ConversationsTextview - If contact is set: it's a message from someone or an info message - (contact = 'info' in such a case). + If contact is set: it's a message from someone If contact is not set: it's a message from the server or help. """ - if additional_data is None: - additional_data = AdditionalDataDict() + other_tags_for_name = [] other_tags_for_text = [] - if contact == self.nick: # it's us + if not contact: + # Message from the server + kind = 'status' + elif contact == self.nick: # it's us kind = 'outgoing' else: kind = 'incoming' @@ -1353,8 +1319,8 @@ class GroupchatControl(ChatControlBase): ChatControlBase.add_message(self, text, kind, contact, tim, other_tags_for_name, [], other_tags_for_text, xhtml=xhtml, - graphics=graphics, displaymarking=displaymarking, - correct_id=correct_id, msg_stanza_id=msg_stanza_id, encrypted=encrypted, + displaymarking=displaymarking, + correct_id=correct_id, message_id=message_id, encrypted=encrypted, additional_data=additional_data) def get_nb_unread(self): @@ -1533,7 +1499,7 @@ class GroupchatControl(ChatControlBase): frm = 'out' obj.session.control.add_message(obj.msgtxt, frm, tim=obj.timestamp, xhtml=obj.xhtml, encrypted=obj.encrypted, - displaymarking=obj.displaymarking, msg_stanza_id=obj.id_, + displaymarking=obj.displaymarking, message_id=obj.message_id, correct_id=obj.correct_id) else: # otherwise pass it off to the control to be queued ===================================== gajim/gtk/themes.py ===================================== @@ -153,10 +153,6 @@ CSS_STYLE_OPTIONS = [ '.gajim-msg-correcting text', StyleAttr.BACKGROUND), - StyleOption(_('Restored Message Color'), - '.gajim-restored-message', - StyleAttr.COLOR), - StyleOption(_('Contact Disconnected Background'), '.gajim-roster-disconnected', StyleAttr.BACKGROUND), View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/b1decf2b142a949a4e85d9ea07521fc36… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/b1decf2b142a949a4e85d9ea07521fc36… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Remove unused argument
by Philipp Hörist 10 Jun '19

10 Jun '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: b1decf2b by Philipp Hörist at 2019-06-10T14:17:05Z Remove unused argument - - - - - 3 changed files: - gajim/chat_control.py - gajim/chat_control_base.py - gajim/conversation_textview.py Changes: ===================================== gajim/chat_control.py ===================================== @@ -947,7 +947,7 @@ class ChatControl(ChatControlBase): return app.nicks[self.account] def add_message(self, text, frm='', tim=None, encrypted=None, - subject=None, xhtml=None, simple=False, xep0184_id=None, + subject=None, xhtml=None, xep0184_id=None, displaymarking=None, msg_log_id=None, correct_id=None, msg_stanza_id=None, additional_data=None): """ @@ -988,7 +988,7 @@ class ChatControl(ChatControlBase): xhtml = '<body xmlns="%s">%s</body>' % (NS_XHTML, xhtml) ChatControlBase.add_message(self, text, kind, name, tim, subject=subject, old_kind=self.old_msg_kind, xhtml=xhtml, - simple=simple, xep0184_id=xep0184_id, displaymarking=displaymarking, + xep0184_id=xep0184_id, displaymarking=displaymarking, msg_log_id=msg_log_id, msg_stanza_id=msg_stanza_id, correct_id=correct_id, additional_data=additional_data, encrypted=encrypted) ===================================== gajim/chat_control_base.py ===================================== @@ -932,7 +932,7 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): def add_message(self, text, kind, name, tim, other_tags_for_name=None, other_tags_for_time=None, other_tags_for_text=None, - count_as_new=True, subject=None, old_kind=None, xhtml=None, simple=False, + count_as_new=True, subject=None, old_kind=None, xhtml=None, xep0184_id=None, graphics=True, displaymarking=None, msg_log_id=None, msg_stanza_id=None, correct_id=None, additional_data=None, encrypted=None): @@ -958,7 +958,7 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): textview.print_conversation_line(text, kind, name, tim, other_tags_for_name, other_tags_for_time, other_tags_for_text, - subject, old_kind, xhtml, simple=simple, graphics=graphics, + subject, old_kind, xhtml, graphics=graphics, displaymarking=displaymarking, msg_stanza_id=msg_stanza_id, correct_id=correct_id, additional_data=additional_data, encrypted=encrypted) ===================================== gajim/conversation_textview.py ===================================== @@ -938,7 +938,7 @@ class ConversationTextview(GObject.GObject): def print_conversation_line(self, text, kind, name, tim, other_tags_for_name=None, other_tags_for_time=None, other_tags_for_text=None, - subject=None, old_kind=None, xhtml=None, simple=False, graphics=True, + subject=None, old_kind=None, xhtml=None, graphics=True, displaymarking=None, msg_stanza_id=None, correct_id=None, additional_data=None, encrypted=None): """ @@ -1017,8 +1017,8 @@ class ConversationTextview(GObject.GObject): self.print_encryption_status(iter_, additional_data) # print the time stamp - self.print_time(text, kind, tim, simple, direction_mark, - other_tags_for_time, iter_) + self.print_time(text, kind, tim, direction_mark, + other_tags_for_time, iter_) # If there's a displaymarking, print it here. if displaymarking: @@ -1189,12 +1189,12 @@ class ConversationTextview(GObject.GObject): trust = additional_data.get_value('encrypted', 'trust') return name, fingerprint, trust - def print_time(self, text, kind, tim, simple, direction_mark, other_tags_for_time, iter_): + def print_time(self, text, kind, tim, direction_mark, other_tags_for_time, iter_): local_tim = time.localtime(tim) buffer_ = self.tv.get_buffer() current_print_time = app.config.get('print_time') - if current_print_time == 'always' and not simple: + if current_print_time == 'always': timestamp_str = self.get_time_to_show(local_tim, direction_mark) timestamp = time.strftime(timestamp_str, local_tim) timestamp = direction_mark + timestamp + direction_mark @@ -1203,7 +1203,7 @@ class ConversationTextview(GObject.GObject): *other_tags_for_time) else: buffer_.insert(iter_, timestamp) - elif current_print_time == 'sometimes' and not simple: + elif current_print_time == 'sometimes': every_foo_seconds = 60 * app.config.get( 'print_ichat_every_foo_minutes') seconds_passed = tim - self.last_time_printout View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/b1decf2b142a949a4e85d9ea07521fc36c… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/b1decf2b142a949a4e85d9ea07521fc36c… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Remove unused argument
by Philipp Hörist 10 Jun '19

10 Jun '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: c3461a43 by Philipp Hörist at 2019-06-10T12:38:03Z Remove unused argument - - - - - 2 changed files: - gajim/chat_control_base.py - gajim/conversation_textview.py Changes: ===================================== gajim/chat_control_base.py ===================================== @@ -923,14 +923,12 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): self.received_history_pos = pos def add_info_message(self, text): - jid = self.contact.jid self.conv_textview.print_conversation_line( - text, jid, 'info', '', None, graphics=False) + text, 'info', '', None, graphics=False) def add_status_message(self, text): - jid = self.contact.jid self.conv_textview.print_conversation_line( - text, jid, 'status', '', None) + text, 'status', '', None) def add_message(self, text, kind, name, tim, other_tags_for_name=None, other_tags_for_time=None, other_tags_for_text=None, @@ -958,7 +956,7 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): if additional_data is None: additional_data = AdditionalDataDict() - textview.print_conversation_line(text, jid, kind, name, tim, + textview.print_conversation_line(text, kind, name, tim, other_tags_for_name, other_tags_for_time, other_tags_for_text, subject, old_kind, xhtml, simple=simple, graphics=graphics, displaymarking=displaymarking, msg_stanza_id=msg_stanza_id, ===================================== gajim/conversation_textview.py ===================================== @@ -936,7 +936,7 @@ class ConversationTextview(GObject.GObject): # Should not happen, but who knows return None, None - def print_conversation_line(self, text, jid, kind, name, tim, + def print_conversation_line(self, text, kind, name, tim, other_tags_for_name=None, other_tags_for_time=None, other_tags_for_text=None, subject=None, old_kind=None, xhtml=None, simple=False, graphics=True, displaymarking=None, msg_stanza_id=None, correct_id=None, additional_data=None, View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/c3461a43e36f980d3155b986e2adb94542… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/c3461a43e36f980d3155b986e2adb94542… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 3 commits: Add logging to user_nickname module
by Philipp Hörist 10 Jun '19

10 Jun '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 603ad003 by Philipp Hörist at 2019-06-10T12:23:31Z Add logging to user_nickname module - - - - - a0f655f2 by Philipp Hörist at 2019-06-10T12:23:31Z Refactor printing info and status messages Add some methods to ChatControlBase to add status and info message to the ConversationTextview instead of going through print_conversation() and print_conversation_line() which adds nothing to info and status messages - - - - - 54437a0f by Philipp Hörist at 2019-06-10T12:23:31Z Rename print_conversation_* methods - - - - - 8 changed files: - gajim/chat_control.py - gajim/chat_control_base.py - gajim/common/modules/message.py - gajim/common/modules/user_nickname.py - gajim/groupchat_control.py - gajim/gui_interface.py - gajim/privatechat_control.py - gajim/roster_window.py Changes: ===================================== gajim/chat_control.py ===================================== @@ -560,7 +560,7 @@ class ChatControl(ChatControlBase): if state in ('connecting', 'connected', 'stop', 'error') and reason: info = _('%(type)s state : %(state)s, reason: %(reason)s') % { 'type': jingle_type.capitalize(), 'state': state, 'reason': reason} - self.print_conversation(info, 'info') + self.add_info_message(info) states = {'connecting': self.JINGLE_STATE_CONNECTING, 'connection_received': self.JINGLE_STATE_CONNECTION_RECEIVED, @@ -855,7 +855,7 @@ class ChatControl(ChatControlBase): if obj.kind == KindConstant.CHAT_MSG_SENT: kind = 'outgoing' - self.print_conversation( + self.add_message( obj.msgtxt, kind, tim=obj.timestamp, encrypted=obj.encrypted, correct_id=obj.correct_id, msg_stanza_id=obj.message_id, additional_data=obj.additional_data) @@ -878,7 +878,7 @@ class ChatControl(ChatControlBase): typ = 'out' if obj.jid != app.get_jid_from_account(obj.conn.name): xep0184_id = obj.id_ - self.print_conversation(obj.msgtxt, typ, + self.add_message(obj.msgtxt, typ, tim=obj.timestamp, encrypted=obj.encrypted, subject=obj.subject, xhtml=obj.xhtml, displaymarking=obj.displaymarking, msg_log_id=obj.msg_log_id, msg_stanza_id=obj.id_, correct_id=obj.correct_id, @@ -913,7 +913,7 @@ class ChatControl(ChatControlBase): gtkgui_helpers.remove_css_class( self.msg_textview, 'gajim-msg-correcting') - self.print_conversation(obj.message, self.contact.jid, tim=obj.timestamp, + self.add_message(obj.message, self.contact.jid, tim=obj.timestamp, encrypted=obj.encrypted, xep0184_id=xep0184_id, xhtml=obj.xhtml, displaymarking=displaymarking, msg_stanza_id=id_, correct_id=obj.correct_id, @@ -946,7 +946,7 @@ class ChatControl(ChatControlBase): def get_our_nick(self): return app.nicks[self.account] - def print_conversation(self, text, frm='', tim=None, encrypted=None, + def add_message(self, text, frm='', tim=None, encrypted=None, subject=None, xhtml=None, simple=False, xep0184_id=None, displaymarking=None, msg_log_id=None, correct_id=None, msg_stanza_id=None, additional_data=None): @@ -967,17 +967,9 @@ class ChatControl(ChatControlBase): if additional_data is None: additional_data = AdditionalDataDict() - if frm == 'status': - if not app.config.get('print_status_in_chats'): - return - kind = 'status' - name = '' - elif frm == 'error': + if frm == 'error': kind = 'error' name = '' - elif frm == 'info': - kind = 'info' - name = '' else: if not frm: kind = 'incoming' @@ -994,7 +986,7 @@ class ChatControl(ChatControlBase): xhtml = create_xhtml(text) if xhtml: xhtml = '<body xmlns="%s">%s</body>' % (NS_XHTML, xhtml) - ChatControlBase.print_conversation_line(self, text, kind, name, tim, + ChatControlBase.add_message(self, text, kind, name, tim, subject=subject, old_kind=self.old_msg_kind, xhtml=xhtml, simple=simple, xep0184_id=xep0184_id, displaymarking=displaymarking, msg_log_id=msg_log_id, msg_stanza_id=msg_stanza_id, @@ -1217,12 +1209,12 @@ class ChatControl(ChatControlBase): if self.contact != obj.contact: return if obj.name == 'ping-sent': - self.print_conversation(_('Ping?'), 'status') + self.add_info_message(_('Ping?')) elif obj.name == 'ping-reply': - self.print_conversation( - _('Pong! (%s seconds)') % obj.seconds, 'status') + self.add_info_message( + _('Pong! (%s seconds)') % obj.seconds) elif obj.name == 'ping-error': - self.print_conversation(_('Error.'), 'status') + self.add_info_message(_('Error.')) def show_avatar(self): if not app.config.get('show_avatar_in_chat'): @@ -1326,7 +1318,7 @@ class ChatControl(ChatControlBase): if row.subject: msg = _('Subject: %(subject)s\n%(message)s') % \ {'subject': row.subject, 'message': msg} - ChatControlBase.print_conversation_line(self, msg, kind, name, + ChatControlBase.add_message(self, msg, kind, name, tim, small_attr, small_attr + ['restored_message'], small_attr + ['restored_message'], False, old_kind=local_old_kind, xhtml=xhtml, additional_data=additional_data) @@ -1358,7 +1350,7 @@ class ChatControl(ChatControlBase): kind = 'print_queue' if event.sent_forwarded: kind = 'out' - self.print_conversation(event.message, kind, tim=event.time, + self.add_message(event.message, kind, tim=event.time, encrypted=event.encrypted, subject=event.subject, xhtml=event.xhtml, displaymarking=event.displaymarking, correct_id=event.correct_id, additional_data=event.additional_data) @@ -1422,11 +1414,14 @@ class ChatControl(ChatControlBase): self.update_ui() self.parent_win.redraw_tab(self) + if not app.config.get('print_status_in_chats'): + return + if status: status = '- %s' % status status_line = _('%(name)s is now %(show)s %(status)s') % { 'name': name, 'show': uf_show, 'status': status or ''} - self.print_conversation(status_line, 'status') + self.add_status_message(status_line) def _info_bar_show_message(self): if self.info_bar.get_visible(): ===================================== gajim/chat_control_base.py ===================================== @@ -922,7 +922,17 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): else: self.received_history_pos = pos - def print_conversation_line(self, text, kind, name, tim, + def add_info_message(self, text): + jid = self.contact.jid + self.conv_textview.print_conversation_line( + text, jid, 'info', '', None, graphics=False) + + def add_status_message(self, text): + jid = self.contact.jid + self.conv_textview.print_conversation_line( + text, jid, 'status', '', None) + + def add_message(self, text, kind, name, tim, other_tags_for_name=None, other_tags_for_time=None, other_tags_for_text=None, count_as_new=True, subject=None, old_kind=None, xhtml=None, simple=False, xep0184_id=None, graphics=True, displaymarking=None, msg_log_id=None, ===================================== gajim/common/modules/message.py ===================================== @@ -226,7 +226,7 @@ class Message(BaseModule): if not event.msgtxt: event.msgtxt = _('message') if event.gc_control: - event.gc_control.print_conversation(event.msgtxt) + event.gc_control.add_info_message(event.msgtxt) else: self._log_error_message(event) error_msg = event.stanza.getErrorMsg() or event.msgtxt ===================================== gajim/common/modules/user_nickname.py ===================================== @@ -48,6 +48,8 @@ class UserNickname(BaseModule): str(properties.jid)): contact.contact_name = nick + self._log.info('Nickname for %s: %s', properties.jid, nick) + app.nec.push_incoming_event( NetworkEvent('nickname-received', account=self._account, ===================================== gajim/groupchat_control.py ===================================== @@ -1199,7 +1199,7 @@ class GroupchatControl(ChatControlBase): return if obj.archive_jid != self.room_jid: return - self.print_conversation( + self.add_message( obj.msgtxt, contact=obj.nick, tim=obj.timestamp, correct_id=obj.correct_id, encrypted=obj.encrypted, @@ -1212,7 +1212,7 @@ class GroupchatControl(ChatControlBase): if not obj.nick: # message from server - self.print_conversation( + self.add_message( obj.msgtxt, tim=obj.timestamp, xhtml=obj.xhtml_msgtxt, displaymarking=obj.displaymarking, additional_data=obj.additional_data) @@ -1221,7 +1221,7 @@ class GroupchatControl(ChatControlBase): if obj.delayed: # don't print xhtml if it's an old message. # Like that xhtml messages are grayed too. - self.print_old_conversation( + self.add_delayed_message( obj.msgtxt, contact=obj.nick, tim=obj.timestamp, xhtml=None, encrypted=obj.encrypted, displaymarking=obj.displaymarking, msg_stanza_id=obj.id_, @@ -1229,7 +1229,7 @@ class GroupchatControl(ChatControlBase): else: if obj.nick == self.nick: self.last_sent_txt = obj.msgtxt - self.print_conversation( + self.add_message( obj.msgtxt, contact=obj.nick, tim=obj.timestamp, xhtml=obj.xhtml_msgtxt, displaymarking=obj.displaymarking, encrypted=obj.encrypted, @@ -1288,7 +1288,7 @@ class GroupchatControl(ChatControlBase): return self.model.get_iter(path) - def print_old_conversation(self, text, contact='', tim=None, xhtml=None, + def add_delayed_message(self, text, contact='', tim=None, xhtml=None, displaymarking=None, msg_stanza_id=None, encrypted=None, additional_data=None): if additional_data is None: additional_data = AdditionalDataDict() @@ -1305,13 +1305,13 @@ class GroupchatControl(ChatControlBase): else: small_attr = [] - ChatControlBase.print_conversation_line(self, text, kind, contact, tim, + ChatControlBase.add_message(self, text, kind, contact, tim, small_attr, small_attr + ['restored_message'], small_attr + ['restored_message'], count_as_new=False, xhtml=xhtml, displaymarking=displaymarking, msg_stanza_id=msg_stanza_id, encrypted=encrypted, additional_data=additional_data) - def print_conversation(self, text, contact='', tim=None, xhtml=None, + def add_message(self, text, contact='', tim=None, xhtml=None, graphics=True, displaymarking=None, correct_id=None, msg_stanza_id=None, encrypted=None, additional_data=None): """ @@ -1325,19 +1325,14 @@ class GroupchatControl(ChatControlBase): additional_data = AdditionalDataDict() other_tags_for_name = [] other_tags_for_text = [] - if contact: - if contact == self.nick: # it's us - kind = 'outgoing' - elif contact == 'info': - kind = 'info' - contact = None - else: - kind = 'incoming' - # muc-specific chatstate - if self.parent_win: - self.parent_win.redraw_tab(self, 'newmsg') + + if contact == self.nick: # it's us + kind = 'outgoing' else: - kind = 'status' + kind = 'incoming' + # muc-specific chatstate + if self.parent_win: + self.parent_win.redraw_tab(self, 'newmsg') if kind == 'incoming': # it's a message NOT from us # highlighting and sounds @@ -1356,7 +1351,7 @@ class GroupchatControl(ChatControlBase): self.check_and_possibly_add_focus_out_line() - ChatControlBase.print_conversation_line(self, text, kind, contact, tim, + ChatControlBase.add_message(self, text, kind, contact, tim, other_tags_for_name, [], other_tags_for_text, xhtml=xhtml, graphics=graphics, displaymarking=displaymarking, correct_id=correct_id, msg_stanza_id=msg_stanza_id, encrypted=encrypted, @@ -1476,7 +1471,7 @@ class GroupchatControl(ChatControlBase): just_joined = self.join_time > time.time() - 10 if app.config.get('show_subject_on_join') or not just_joined: - self.print_conversation(text) + self.add_info_message(text) if event.subject == '': self.subject_button.hide() @@ -1517,7 +1512,7 @@ class GroupchatControl(ChatControlBase): self.is_anonymous = True for change in changes: - self.print_conversation(change) + self.add_info_message(change) def _nec_signed_in(self, obj): if obj.conn.name != self.account: @@ -1536,7 +1531,7 @@ class GroupchatControl(ChatControlBase): frm = '' if obj.sent: frm = 'out' - obj.session.control.print_conversation(obj.msgtxt, frm, + obj.session.control.add_message(obj.msgtxt, frm, tim=obj.timestamp, xhtml=obj.xhtml, encrypted=obj.encrypted, displaymarking=obj.displaymarking, msg_stanza_id=obj.id_, correct_id=obj.correct_id) @@ -1552,13 +1547,13 @@ class GroupchatControl(ChatControlBase): nick = obj.contact.get_shown_name() if obj.name == 'ping-sent': - self.print_conversation(_('Ping? (%s)') % nick) + self.add_info_message(_('Ping? (%s)') % nick) elif obj.name == 'ping-reply': - self.print_conversation( + self.add_info_message( _('Pong! (%(nick)s %(delay)s s.)') % {'nick': nick, 'delay': obj.seconds}) elif obj.name == 'ping-error': - self.print_conversation(_('Error.')) + self.add_info_message(_('Error.')) @property def is_connected(self) -> bool: @@ -1769,8 +1764,7 @@ class GroupchatControl(ChatControlBase): if not self.is_connected: # We just joined the room - self.print_conversation(_('You (%s) joined the room') % nick, - 'info', graphics=False) + self.add_info_message(_('You (%s) joined the room') % nick) self.add_contact_to_roster(nick) self.got_connected() @@ -1788,27 +1782,26 @@ class GroupchatControl(ChatControlBase): # We just need to invite contacts for jid in app.automatic_rooms[self.account][self.room_jid]['invities']: con.get_module('MUC').invite(self.room_jid, jid) - self.print_conversation( + self.add_info_message( _('%(jid)s has been ' - 'invited in this room') % {'jid': jid}, - graphics=False) + 'invited in this room') % {'jid': jid}) if StatusCode.NON_ANONYMOUS in status_codes: - self.print_conversation( + self.add_info_message( _('Any occupant is allowed to see your full JID')) self.is_anonymous = False if StatusCode.CONFIG_ROOM_LOGGING in status_codes: - self.print_conversation(_('Room logging is enabled')) + self.add_info_message(_('Room logging is enabled')) if StatusCode.NICKNAME_MODIFIED in status_codes: - self.print_conversation(\ + self.add_info_message(\ _('The server has assigned or modified your roomnick')) if event.properties.is_new_room: app.connections[self.account].get_module('Discovery').disco_muc( self.room_jid, self._on_room_created, update=True) - self.print_conversation(_('A new room has been created')) + self.add_info_message(_('A new room has been created')) con = app.connections[self.account] con.get_module('MUC').request_config(self.room_jid) @@ -1831,7 +1824,7 @@ class GroupchatControl(ChatControlBase): 'as {new_nick}').format(nick=nick, new_nick=new_nick) self._nick_completion.contact_renamed(nick, new_nick) - self.print_conversation(message, 'info', graphics=False) + self.add_info_message(message) tv = self.conv_textview if nick in tv.last_received_message_id: @@ -1858,14 +1851,14 @@ class GroupchatControl(ChatControlBase): if event.properties.is_muc_self_presence: message = _('You are now {show}{status}').format(show=show, status=status) - self.print_conversation(message, 'info', graphics=False) + self.add_status_message(message) elif app.config.get_per('rooms', self.room_jid, 'print_status', status_default): message = _('{nick} is now {show}{status}').format(nick=nick, show=show, status=status) - self.print_conversation(message, 'info', graphics=False) + self.add_status_message(message) self.draw_contact(nick) @@ -1899,7 +1892,7 @@ class GroupchatControl(ChatControlBase): actor=actor, reason=reason) - self.print_conversation(message, graphics=False) + self.add_info_message(message) self.draw_contact(nick) self.update_actions() @@ -1930,7 +1923,7 @@ class GroupchatControl(ChatControlBase): actor=actor, reason=reason) - self.print_conversation(message, graphics=False) + self.add_info_message(message) self.remove_contact(nick) self.add_contact_to_roster(nick) self.update_actions() @@ -1960,39 +1953,39 @@ class GroupchatControl(ChatControlBase): #Group Chat: Server kicked us because of an server error message = _('You have left due ' 'to an error{reason}').format(reason=reason) - self.print_conversation(message, 'info', graphics=False) + self.add_info_message(message) elif StatusCode.REMOVED_KICKED in status_codes: #Group Chat: We have been kicked by Alice: reason message = _('You have been ' 'kicked{actor}{reason}').format(actor=actor, reason=reason) - self.print_conversation(message, 'info', graphics=False) + self.add_info_message(message) elif StatusCode.REMOVED_BANNED in status_codes: #Group Chat: We have been banned by Alice: reason message = _('You have been ' 'banned{actor}{reason}').format(actor=actor, reason=reason) - self.print_conversation(message, 'info', graphics=False) + self.add_info_message(message) elif StatusCode.REMOVED_AFFILIATION_CHANGE in status_codes: #Group Chat: We were removed because of an affiliation change reason = _(': Affiliation changed') message = message.format(actor=actor, reason=reason) - self.print_conversation(message, 'info', graphics=False) + self.add_info_message(message) elif StatusCode.REMOVED_NONMEMBER_IN_MEMBERS_ONLY in status_codes: #Group Chat: Room configuration changed reason = _(': Room configuration changed to members-only') message = message.format(actor=actor, reason=reason) - self.print_conversation(message, 'info', graphics=False) + self.add_info_message(message) elif StatusCode.REMOVED_SERVICE_SHUTDOWN in status_codes: #Group Chat: Kicked because of server shutdown reason = ': System shutdown' message = message.format(actor=actor, reason=reason) - self.print_conversation(message, 'info', graphics=False) + self.add_info_message(message) self.autorejoin = True self.got_disconnected() @@ -2029,7 +2022,7 @@ class GroupchatControl(ChatControlBase): #Group Chat: User was kicked because of an server error: reason message = _('{nick} has left due to ' 'an error{reason}').format(nick=nick, reason=reason) - self.print_conversation(message, 'info', graphics=False) + self.add_info_message(message) elif StatusCode.REMOVED_KICKED in status_codes: #Group Chat: User was kicked by Alice: reason @@ -2037,7 +2030,7 @@ class GroupchatControl(ChatControlBase): 'kicked{actor}{reason}').format(nick=nick, actor=actor, reason=reason) - self.print_conversation(message, 'info', graphics=False) + self.add_info_message(message) elif StatusCode.REMOVED_BANNED in status_codes: #Group Chat: User was banned by Alice: reason @@ -2045,22 +2038,22 @@ class GroupchatControl(ChatControlBase): 'banned{actor}{reason}').format(nick=nick, actor=actor, reason=reason) - self.print_conversation(message, 'info', graphics=False) + self.add_info_message(message) elif StatusCode.REMOVED_AFFILIATION_CHANGE in status_codes: reason = _(': Affiliation changed') message = message.format(nick=nick, actor=actor, reason=reason) - self.print_conversation(message, 'info', graphics=False) + self.add_info_message(message) elif StatusCode.REMOVED_NONMEMBER_IN_MEMBERS_ONLY in status_codes: reason = _(': Room configuration changed to members-only') message = message.format(nick=nick, actor=actor, reason=reason) - self.print_conversation(message, 'info', graphics=False) + self.add_info_message(message) elif print_join_left: message = _('{nick} has left{reason}').format(nick=nick, reason=reason) - self.print_conversation(message, 'info', graphics=False) + self.add_info_message(message) self.remove_contact(nick) self.draw_all_roles() @@ -2079,8 +2072,7 @@ class GroupchatControl(ChatControlBase): self.add_contact_to_roster(nick) if self.is_connected and print_join_left: - self.print_conversation(_('%s has joined the group chat') % nick, - graphics=False) + self.add_info_message(_('%s has joined the group chat') % nick) def _on_presence_error(self, event): if event.account != self.account: @@ -2135,7 +2127,7 @@ class GroupchatControl(ChatControlBase): self.account, self.room_jid, win) else: - self.print_conversation( + self.add_info_message( 'Error %s: %s' % (error_type.value, error_message)) self.autorejoin = False @@ -2192,13 +2184,13 @@ class GroupchatControl(ChatControlBase): reason = '' if reason is None else ': %s' % reason message = _('Room has been destroyed') - self.print_conversation(message, 'info', graphics=False) + self.add_info_message(message) alternate = destroyed.alternate if alternate is not None: join_message = _('You can join this room ' 'instead: xmpp:%s?join') % alternate - self.print_conversation(join_message, 'info', graphics=False) + self.add_info_message(join_message) self.autorejoin = False self.got_disconnected() @@ -2492,8 +2484,8 @@ class GroupchatControl(ChatControlBase): con = app.connections[self.account] con.get_module('MUC').invite(self.room_jid, contact_jid) - self.print_conversation(_('%(jid)s has been invited in this room') % - {'jid': contact_jid}, graphics=False) + self.add_info_message(_('%(jid)s has been invited in this room') % + {'jid': contact_jid}) def _jid_not_blocked(self, bare_jid: str) -> bool: fjid = self.room_jid + '/' + bare_jid ===================================== gajim/gui_interface.py ===================================== @@ -206,7 +206,7 @@ class Interface: ctrl = self.msg_win_mgr.get_control(event.properties.jid.getBare(), event.account) if ctrl and ctrl.type_id == message_control.TYPE_GC: - ctrl.print_conversation('Error: %s' % event.properties.error) + ctrl.add_info_message('Error: %s' % event.properties.error) @staticmethod def handle_event_connection_lost(obj): @@ -360,12 +360,12 @@ class Interface: account=account, name=nick, show=show) ctrl = self.new_private_chat(gc_c, account, session) - ctrl.print_conversation(_('Error %(code)s: %(msg)s') % { - 'code': obj.error_code, 'msg': obj.error_msg}, 'status') + ctrl.add_info_message(_('Error %(code)s: %(msg)s') % { + 'code': obj.error_code, 'msg': obj.error_msg}) return - gc_control.print_conversation(_('Error %(code)s: %(msg)s') % { - 'code': obj.error_code, 'msg': obj.error_msg}, 'status') + gc_control.add_info_message(_('Error %(code)s: %(msg)s') % { + 'code': obj.error_code, 'msg': obj.error_msg}) if gc_control.parent_win and \ gc_control.parent_win.get_active_jid() == jid: gc_control.set_subject(gc_control.subject) @@ -509,9 +509,9 @@ class Interface: gc_control = self.msg_win_mgr.get_gc_control(obj.jid, account) if gc_control: - gc_control.print_conversation( + gc_control.add_info_message( _('%(jid)s has been invited in this room') % { - 'jid': jid}, graphics=False) + 'jid': jid}) del app.automatic_rooms[account][obj.jid] else: win = app.get_app_window('GroupchatConfig', account, obj.jid) @@ -525,14 +525,13 @@ class Interface: event.account) if gc_control: if event.reason: - gc_control.print_conversation( + gc_control.add_info_message( _('%(jid)s declined the invitation: %(reason)s') % { - 'jid': event.from_, 'reason': event.reason}, - graphics=False) + 'jid': event.from_, 'reason': event.reason}) else: - gc_control.print_conversation( + gc_control.add_info_message( _('%(jid)s declined the invitation') % { - 'jid': event.from_}, graphics=False) + 'jid': event.from_}) def handle_event_gc_invitation(self, event): if helpers.allow_popup_window(event.account) or not self.systray_enabled: ===================================== gajim/privatechat_control.py ===================================== @@ -114,7 +114,7 @@ class PrivateChatControl(ChatControl): message = _('{nick} is now known ' 'as {new_nick}').format(nick=nick, new_nick=new_nick) - self.print_conversation(message, 'info') + self.add_info_message(message) self.draw_banner() app.interface.msg_win_mgr.change_key(str(event.properties.jid), @@ -140,14 +140,14 @@ class PrivateChatControl(ChatControl): if event.properties.is_muc_self_presence: message = _('You are now {show}{status}').format(show=show, status=status) - self.print_conversation(message, 'info') + self.add_status_message(message) elif app.config.get_per('rooms', self.room_name, 'print_status', status_default): message = _('{nick} is now {show}{status}').format(nick=nick, show=show, status=status) - self.print_conversation(message, 'info') + self.add_status_message(message) self.parent_win.redraw_tab(self) self.update_ui() ===================================== gajim/roster_window.py ===================================== @@ -3013,9 +3013,9 @@ class RosterWindow: gc_control = app.interface.msg_win_mgr.get_gc_control(room_jid, room_account) if gc_control: - gc_control.print_conversation( + gc_control.add_info_message( _('%(jid)s has been invited in this room') % { - 'jid': contact_jid}, graphics=False) + 'jid': contact_jid}) def on_all_groupchat_maximized(self, widget, group_list): for (contact, account) in group_list: View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/0da3aa2d310d8f12dfe7206ba7259d7ad… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/0da3aa2d310d8f12dfe7206ba7259d7ad… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] PluginsGUI: Disable expand for installed plugins box
by Philipp Hörist 10 Jun '19

10 Jun '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 0da3aa2d by Daniel Brötzmann at 2019-06-01T22:48:41Z PluginsGUI: Disable expand for installed plugins box - - - - - 1 changed file: - gajim/data/gui/plugins_window.ui Changes: ===================================== gajim/data/gui/plugins_window.ui ===================================== @@ -24,20 +24,16 @@ <object class="GtkBox"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="margin_left">18</property> - <property name="margin_right">18</property> - <property name="margin_top">18</property> - <property name="margin_bottom">18</property> + <property name="border_width">18</property> <property name="spacing">18</property> <child> - <object class="GtkBox" id="vbox6"> + <object class="GtkBox"> <property name="width_request">200</property> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="hexpand">True</property> <property name="orientation">vertical</property> <child> - <object class="GtkScrolledWindow" id="scrolledwindow1"> + <object class="GtkScrolledWindow"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="hscrollbar_policy">never</property> @@ -71,10 +67,10 @@ <object class="GtkToolButton" id="install_plugin_button"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="tooltip_text" translatable="yes">Install Plugin from File</property> + <property name="tooltip_text" translatable="yes">Install Plugin from ZIP-File</property> <property name="label" translatable="yes">Install from File…</property> <property name="use_underline">True</property> - <property name="icon_name">document-open-symbolic</property> + <property name="icon_name">system-software-install-symbolic</property> <signal name="clicked" handler="on_install_plugin_button_clicked" swapped="no"/> </object> <packing> @@ -88,7 +84,7 @@ <property name="can_focus">False</property> <property name="tooltip_text" translatable="yes">Uninstall Plugin</property> <property name="use_underline">True</property> - <property name="icon_name">list-remove-symbolic</property> + <property name="icon_name">edit-delete-symbolic</property> <signal name="clicked" handler="on_uninstall_plugin_button_clicked" swapped="no"/> </object> <packing> @@ -250,7 +246,7 @@ <property name="row_spacing">6</property> <property name="column_spacing">12</property> <child> - <object class="GtkLabel" id="label5"> + <object class="GtkLabel"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">end</property> @@ -282,7 +278,7 @@ </packing> </child> <child> - <object class="GtkLabel" id="label4"> + <object class="GtkLabel"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">end</property> @@ -315,7 +311,7 @@ </packing> </child> <child> - <object class="GtkLabel" id="label6"> + <object class="GtkLabel"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">end</property> @@ -362,7 +358,7 @@ </object> </child> <child type="tab"> - <object class="GtkLabel" id="label1"> + <object class="GtkLabel"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="label" translatable="yes">Installed</property> View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/0da3aa2d310d8f12dfe7206ba7259d7ada… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/0da3aa2d310d8f12dfe7206ba7259d7ada… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] StartChatDialog: Fix filter error and add dim-label for jid
by Philipp Hörist 22 May '19

22 May '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: c1dd6a04 by Daniel Brötzmann at 2019-05-22T19:48:40Z StartChatDialog: Fix filter error and add dim-label for jid - - - - - 1 changed file: - gajim/gtk/start_chat.py Changes: ===================================== gajim/gtk/start_chat.py ===================================== @@ -242,6 +242,9 @@ class StartChatDialog(Gtk.ApplicationWindow): def _select_new_match(self, entry, direction): selected_row = self.listbox.get_selected_row() + if selected_row is None: + return + index = selected_row.get_index() if direction == 'next': @@ -440,6 +443,7 @@ class ContactRow(Gtk.Grid): self.jid_label.set_xalign(0) self.jid_label.set_width_chars(25) self.jid_label.set_halign(Gtk.Align.START) + self.jid_label.get_style_context().add_class('dim-label') middle_box.add(self.jid_label) self.add(middle_box) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/c1dd6a045d1417fd3d9fe581eedf7a2246… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/c1dd6a045d1417fd3d9fe581eedf7a2246… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Rework DoubleInputDialog to DestroyMucDialog
by Philipp Hörist 21 May '19

21 May '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: c18cc281 by Daniel Brötzmann at 2019-05-21T20:22:20Z Rework DoubleInputDialog to DestroyMucDialog - - - - - 3 changed files: - gajim/data/gui/dubbleinput_dialog.ui → gajim/data/gui/destroy_muc_dialog.ui - gajim/groupchat_control.py - gajim/gtk/dialogs.py Changes: ===================================== gajim/data/gui/dubbleinput_dialog.ui → gajim/data/gui/destroy_muc_dialog.ui ===================================== @@ -1,32 +1,36 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> - <requires lib="gtk+" version="3.12"/> - <object class="GtkDialog" id="dubbleinput_dialog"> + <requires lib="gtk+" version="3.20"/> + <object class="GtkDialog" id="destroy_muc_dialog"> + <property name="width_request">250</property> <property name="can_focus">False</property> - <property name="border_width">6</property> + <property name="border_width">18</property> + <property name="resizable">False</property> + <property name="modal">True</property> <property name="type_hint">dialog</property> - <signal name="destroy" handler="on_dubbleinput_dialog_destroy" swapped="no"/> + <child> + <placeholder/> + </child> <child internal-child="vbox"> - <object class="GtkBox" id="dialog-vbox10"> + <object class="GtkBox"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> - <property name="spacing">6</property> + <property name="spacing">12</property> <child internal-child="action_area"> - <object class="GtkButtonBox" id="dialog-action_area9"> + <object class="GtkButtonBox"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="layout_style">end</property> <child> - <object class="GtkButton" id="cancelbutton"> - <property name="label">gtk-cancel</property> - <property name="use_action_appearance">False</property> + <object class="GtkButton" id="cancel_button"> + <property name="label">_Cancel</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="can_default">True</property> <property name="receives_default">False</property> - <property name="use_stock">True</property> + <property name="use_underline">True</property> </object> <packing> <property name="expand">False</property> @@ -35,15 +39,17 @@ </packing> </child> <child> - <object class="GtkButton" id="okbutton"> - <property name="label">gtk-ok</property> - <property name="use_action_appearance">False</property> + <object class="GtkButton" id="destroy_button"> + <property name="label">_Destroy</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="can_default">True</property> <property name="has_default">True</property> <property name="receives_default">False</property> - <property name="use_stock">True</property> + <property name="use_underline">True</property> + <style> + <class name="destructive-action"/> + </style> </object> <packing> <property name="expand">False</property> @@ -60,95 +66,129 @@ </packing> </child> <child> - <object class="GtkBox" id="vbox76"> + <object class="GtkGrid"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="border_width">6</property> - <property name="orientation">vertical</property> - <property name="spacing">6</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> <child> - <object class="GtkBox" id="hbox2960"> + <object class="GtkLabel" id="label_header"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="spacing">12</property> + <property name="halign">start</property> + <property name="label" translatable="yes">Destroy this group chat permanently?</property> + <property name="use_markup">True</property> + <property name="wrap">True</property> + <property name="xalign">0</property> + <style> + <class name="large-header"/> + </style> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkExpander" id="reason_expander"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="margin_top">6</property> <child> - <object class="GtkImage" id="image507"> + <object class="GtkBox"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="stock">gtk-dialog-question</property> - <property name="icon_size">6</property> + <property name="orientation">vertical</property> + <property name="spacing">6</property> + <child> + <object class="GtkEntry" id="reason_entry"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="margin_top">6</property> + <property name="activates_default">True</property> + <property name="placeholder_text" translatable="yes">Reason...</property> + <property name="show_emoji_icon">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="alt_venue_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="margin_top">6</property> + <property name="label" translatable="yes">Where participants should go (optional)</property> + <property name="wrap">True</property> + <property name="xalign">0</property> + <style> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="alt_venue_entry"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="placeholder_text" translatable="yes">Alternate venue...</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">3</property> + </packing> + </child> </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> </child> - <child> - <object class="GtkLabel" id="label1"> + <child type="label"> + <object class="GtkLabel"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="use_markup">True</property> + <property name="label" translatable="yes">_Reason and alternate venue (optional)</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">reason_entry</property> + <signal name="mnemonic-activate" handler="_on_reason_mnemonic_activate" swapped="no"/> + <style> + <class name="dim-label"/> + </style> </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> </child> </object> <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> + <property name="left_attach">1</property> + <property name="top_attach">1</property> </packing> </child> <child> - <object class="GtkEntry" id="input_entry1"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="activates_default">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label2"> + <object class="GtkImage"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="valign">start</property> + <property name="icon_name">user-trash-symbolic</property> + <property name="icon_size">6</property> </object> <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">2</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="input_entry2"> - <property name="visible">True</property> - <property name="can_focus">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">3</property> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + <property name="height">2</property> </packing> </child> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">0</property> </packing> </child> </object> </child> - <action-widgets> - <action-widget response="-6">cancelbutton</action-widget> - <action-widget response="-5">okbutton</action-widget> - </action-widgets> </object> </interface> ===================================== gajim/groupchat_control.py ===================================== @@ -71,7 +71,7 @@ from gajim.common.connection_handlers_events import GcMessageOutgoingEvent from gajim.gtk.dialogs import ErrorDialog from gajim.gtk.dialogs import InputTextDialog from gajim.gtk.dialogs import ConfirmationDialogCheck -from gajim.gtk.dialogs import DoubleInputDialog +from gajim.gtk.dialogs import DestroyMucDialog from gajim.gtk.dialogs import InputDialog from gajim.gtk.dialogs import ChangeNickDialog from gajim.gtk.single_message import SingleMessageWindow @@ -643,7 +643,7 @@ class GroupchatControl(ChatControlBase): self.force_non_minimizable = False def _on_destroy_room(self, action, param): - def on_ok(reason, jid): + def _on_confirm(reason, jid): if jid: # Test jid try: @@ -658,12 +658,8 @@ class GroupchatControl(ChatControlBase): con = app.connections[self.account] con.get_module('MUC').destroy(self.room_jid, reason, jid) - # Ask for a reason - DoubleInputDialog(_('Destroying %s') % '\u200E' + \ - self.room_jid, _('You are going to remove this room permanently.' - '\nYou may specify a reason below:'), - _('You may also enter an alternate venue:'), ok_handler=on_ok, - transient_for=self.parent_win.window) + # Ask for a reason (and an alternate venue) + DestroyMucDialog(self.room_jid, destroy_handler=_on_confirm) def _on_configure_room(self, _action, _param): contact = app.contacts.get_gc_contact( ===================================== gajim/gtk/dialogs.py ===================================== @@ -814,72 +814,48 @@ class InputTextDialog(CommonInputDialog): return self.input_buffer.get_text(start_iter, end_iter, True) -class DoubleInputDialog: +class DestroyMucDialog: """ - Class for Double Input dialog + Class for Destroy MUC Dialog """ + def __init__(self, room_jid, destroy_handler=None): + self._ui = get_builder('destroy_muc_dialog.ui') + self._ui.destroy_muc_dialog.set_transient_for( + app.app.get_active_window()) + + self.destroy_handler = destroy_handler + + title = _('Destroy %s') % room_jid + self._ui.destroy_muc_dialog.set_title(title) + label_header = _('Destroy this group chat permanently?') + self._ui.label_header.set_markup(label_header) + label_alt_venue = _('Where participants should go (optional)') + self._ui.alt_venue_label.set_markup(label_alt_venue) + + self._ui.reason_entry.connect('activate', self._on_entry_activate) + self._ui.alt_venue_entry.connect('activate', self._on_entry_activate) + + self._ui.destroy_button.connect( + 'clicked', self._on_destroy_button_clicked) + self._ui.cancel_button.connect( + 'clicked', self._on_cancel_button_clicked) + self._ui.connect_signals(self) + self._ui.destroy_muc_dialog.show_all() - def __init__(self, title, label_str1, label_str2, input_str1=None, - input_str2=None, is_modal=True, ok_handler=None, cancel_handler=None, - transient_for=None): - self.xml = get_builder('dubbleinput_dialog.ui') - self.dialog = self.xml.get_object('dubbleinput_dialog') - label1 = self.xml.get_object('label1') - self.input_entry1 = self.xml.get_object('input_entry1') - label2 = self.xml.get_object('label2') - self.input_entry2 = self.xml.get_object('input_entry2') - self.dialog.set_title(title) - label1.set_markup(label_str1) - label2.set_markup(label_str2) - self.cancel_handler = cancel_handler - if input_str1: - self.input_entry1.set_text(input_str1) - self.input_entry1.select_region(0, -1) # select all - if input_str2: - self.input_entry2.set_text(input_str2) - self.input_entry2.select_region(0, -1) # select all - if transient_for is None: - transient_for = app.app.get_active_window() - self.dialog.set_transient_for(transient_for) + def _on_entry_activate(self, widget, *args): + self._ui.destroy_button.set_active(True) - self.dialog.set_modal(is_modal) + def _on_reason_mnemonic_activate(self, widget, group_cycling=False): + self._ui.reason_expander.set_expanded(True) - self.ok_handler = ok_handler - okbutton = self.xml.get_object('okbutton') - okbutton.connect('clicked', self.on_okbutton_clicked) - cancelbutton = self.xml.get_object('cancelbutton') - cancelbutton.connect('clicked', self.on_cancelbutton_clicked) - self.xml.connect_signals(self) - self.dialog.show_all() + def _on_destroy_button_clicked(self, widget): + user_input_reason = self._ui.reason_entry.get_text() + user_input_alt_venue = self._ui.alt_venue_entry.get_text() + self._ui.destroy_muc_dialog.destroy() + self.destroy_handler(user_input_reason, user_input_alt_venue) - def on_dubbleinput_dialog_destroy(self, widget): - if not self.cancel_handler: - return False - if isinstance(self.cancel_handler, tuple): - self.cancel_handler[0](*self.cancel_handler[1:]) - else: - self.cancel_handler() - - def on_okbutton_clicked(self, widget): - user_input1 = self.input_entry1.get_text() - user_input2 = self.input_entry2.get_text() - self.cancel_handler = None - self.dialog.destroy() - if not self.ok_handler: - return - if isinstance(self.ok_handler, tuple): - self.ok_handler[0](user_input1, user_input2, *self.ok_handler[1:]) - else: - self.ok_handler(user_input1, user_input2) - - def on_cancelbutton_clicked(self, widget): - self.dialog.destroy() - if not self.cancel_handler: - return - if isinstance(self.cancel_handler, tuple): - self.cancel_handler[0](*self.cancel_handler[1:]) - else: - self.cancel_handler() + def _on_cancel_button_clicked(self, widget): + self._ui.destroy_muc_dialog.destroy() class CertificateDialog(Gtk.ApplicationWindow): View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/c18cc281c5f5b7588771e7f3195496ee5d… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/c18cc281c5f5b7588771e7f3195496ee5d… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Refactor conditions to determine connected state
by Philipp Hörist 20 May '19

20 May '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 519d8644 by Philipp Hörist at 2019-05-20T19:33:42Z Refactor conditions to determine connected state GUI code must not be aware of what integers map to connection states - - - - - 19 changed files: - gajim/chat_control_base.py - gajim/command_system/implementation/standard.py - gajim/common/app.py - gajim/common/connection.py - gajim/common/jingle_session.py - gajim/common/modules/bytestream.py - gajim/common/modules/entity_time.py - gajim/common/modules/presence.py - gajim/common/zeroconf/connection_zeroconf.py - gajim/dialogs.py - gajim/gtk/discovery.py - gajim/gtk/join_groupchat.py - gajim/gtk/profile.py - gajim/gtk/settings.py - gajim/gtk/single_message.py - gajim/gtk/xml_console.py - gajim/gui_interface.py - gajim/remote_control.py - gajim/roster_window.py Changes: ===================================== gajim/chat_control_base.py ===================================== @@ -739,7 +739,7 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): is_ctrl_enter = bool(event_state & Gdk.ModifierType.CONTROL_MASK) send_message = is_ctrl_enter == app.config.get('send_on_ctrl_enter') - if send_message and app.connections[self.account].connected < 2: + if send_message and not app.account_is_connected(self.account): # we are not connected app.interface.raise_dialog('not-connected-while-sending') elif send_message: ===================================== gajim/command_system/implementation/standard.py ===================================== @@ -128,7 +128,7 @@ class StandardCommonCommands(CommandContainer): if not app.config.get_per('accounts', connection.name, 'sync_with_global_status'): continue - if connection.connected < 2: + if not connection.is_connected: continue connection.change_status(status, message) @@ -142,7 +142,7 @@ class StandardCommonCommands(CommandContainer): if not app.config.get_per('accounts', connection.name, 'sync_with_global_status'): continue - if connection.connected < 2: + if not connection.is_connected: continue connection.change_status('away', message) @@ -156,7 +156,7 @@ class StandardCommonCommands(CommandContainer): if not app.config.get_per('accounts', connection.name, 'sync_with_global_status'): continue - if connection.connected < 2: + if not connection.is_connected: continue connection.change_status('online', message) ===================================== gajim/common/app.py ===================================== @@ -453,7 +453,7 @@ def account_is_connected(account): if account not in connections: return False # 0 is offline, 1 is connecting - return connections[account].connected > 1 + return connections[account].is_connected def is_invisible(account): return SHOW_LIST[connections[account].connected] == 'invisible' ===================================== gajim/common/connection.py ===================================== @@ -127,6 +127,10 @@ class CommonConnection: self.get_config_values_or_default() + @property + def is_connected(self): + return self.connected > 1 + def _register_new_handlers(self, con): for handler in modules.get_handlers(self): if len(handler) == 5: @@ -176,7 +180,7 @@ class CommonConnection: def _prepare_message(self, obj): - if not self.connection or self.connected < 2: + if not self.connection or not self.is_connected: return 1 if isinstance(obj.jid, list): @@ -511,7 +515,7 @@ class Connection(CommonConnection, ConnectionHandlers): def reconnect(self): # Do not try to reco while we are already trying self.time_to_reconnect = None - if self.connected < 2: # connection failed + if not self.is_connected: # connection failed log.info('Reconnect') self.connected = 1 app.nec.push_incoming_event(OurShowEvent(None, conn=self, @@ -1347,7 +1351,7 @@ class Connection(CommonConnection, ConnectionHandlers): return # If we are already connected, and privacy rules are supported, send # offline presence first as it's required by XEP-0126 - if self.connected > 1 and self.get_module('PrivacyLists').supported: + if self.is_connected and self.get_module('PrivacyLists').supported: self.get_module('Bytestream').remove_all_transfers() self.get_module('Presence').send_presence( typ='unavailable', @@ -1780,7 +1784,7 @@ class Connection(CommonConnection, ConnectionHandlers): # Account may have been disabled return if self.time_to_reconnect: - if self.connected < 2: + if not self.is_connected: self.reconnect() else: self.time_to_reconnect = None ===================================== gajim/common/jingle_session.py ===================================== @@ -766,7 +766,7 @@ class JingleSession: def _session_terminate(self, reason=None): stanza, jingle = self.__make_jingle('session-terminate', reason=reason) self.__broadcast_all(stanza, jingle, None, 'session-terminate-sent') - if self.connection.connection and self.connection.connected >= 2: + if self.connection.connection and self.connection.is_connected: self.connection.connection.send(stanza) # TODO: Move to GUI? reason, text = self.__reason_from_stanza(jingle) @@ -818,7 +818,7 @@ class JingleSession: def __content_remove(self, content, reason=None): assert self.state != JingleStates.ENDED - if self.connection.connection and self.connection.connected > 1: + if self.connection.connection and self.connection.is_connected: stanza, jingle = self.__make_jingle('content-remove', reason=reason) self.__append_content(jingle, content) self.connection.connection.send(stanza) ===================================== gajim/common/modules/bytestream.py ===================================== @@ -135,7 +135,7 @@ class Bytestream(BaseModule): Send iq, confirming that we want to download the file """ # user response to ConfirmationDialog may come after we've disconneted - if not self._con.connection or self._con.connected < 2: + if not app.account_is_connected(self._account): return # file transfer initiated by a jingle session @@ -176,7 +176,7 @@ class Bytestream(BaseModule): invalid stream or 'profile' for invalid profile """ # user response to ConfirmationDialog may come after we've disconnected - if not self._con.connection or self._con.connected < 2: + if not app.account_is_connected(self._account): return if file_props.sid in self._sessions: @@ -188,7 +188,7 @@ class Bytestream(BaseModule): """ Send reply to the initiator of FT that we made a connection """ - if not self._con.connection or self._con.connected < 2: + if not app.account_is_connected(self._account): return if streamhost is None: return None @@ -249,7 +249,7 @@ class Bytestream(BaseModule): """ Send iq for the present streamhosts and proxies """ - if not self._con.connection or self._con.connected < 2: + if not app.account_is_connected(self._account): return receiver = file_props.receiver sender = file_props.sender @@ -463,7 +463,7 @@ class Bytestream(BaseModule): Called when there is an error establishing BS connection, or when connection is rejected """ - if not self._con.connection or self._con.connected < 2: + if not app.account_is_connected(self._account): return file_props = FilesProp.getFileProp(self._account, sid) if file_props is None: @@ -491,7 +491,7 @@ class Bytestream(BaseModule): """ Called after authentication to proxy server """ - if not self._con.connection or self._con.connected < 2: + if not app.account_is_connected(self._account): return file_props = FilesProp.getFileProp(self._account, proxy['sid']) iq = nbxmpp.Iq(to=proxy['initiator'], typ='set') ===================================== gajim/common/modules/entity_time.py ===================================== @@ -41,7 +41,7 @@ class EntityTime(BaseModule): if not app.account_is_connected(self._account): return # If we are invisible, do not request - if self._con.connected == app.SHOW_LIST.index('invisible'): + if app.is_invisible(self._account): return if resource: ===================================== gajim/common/modules/presence.py ===================================== @@ -189,7 +189,7 @@ class Presence(BaseModule): if jid in app.to_be_removed[self._account]: app.to_be_removed[self._account].remove(jid) elif event.old_show > 1 and event.new_show == 0 and \ - self._con.connected > 1: + self._con.is_connected: if not jid in app.to_be_removed[self._account]: app.to_be_removed[self._account].append(jid) if jid in app.newly_added[self._account]: ===================================== gajim/common/zeroconf/connection_zeroconf.py ===================================== @@ -224,7 +224,7 @@ class ConnectionZeroconf(CommonConnection, ConnectionHandlersZeroconf): app.newly_added[self.name].append(jid) if jid in app.to_be_removed[self.name]: app.to_be_removed[self.name].remove(jid) - elif event.old_show > 1 and event.new_show == 0 and self.connected > 1: + elif event.old_show > 1 and event.new_show == 0 and self.is_connected: if not jid in app.to_be_removed[self.name]: app.to_be_removed[self.name].append(jid) if jid in app.newly_added[self.name]: ===================================== gajim/dialogs.py ===================================== @@ -783,7 +783,7 @@ class SynchroniseSelectAccountDialog: return remote_account = model.get_value(iter_, 0) - if app.connections[remote_account].connected < 2: + if not app.account_is_connected(remote_account): ErrorDialog(_('This account is not connected to the server'), _('You cannot synchronize with an account unless it is connected.')) return ===================================== gajim/gtk/discovery.py ===================================== @@ -488,7 +488,7 @@ class ServiceDiscoveryWindow: self.reloading = False # Check connection - if app.connections[account].connected < 2: + if not app.account_is_connected(account): ErrorDialog(_('You are not connected to the server'), _('Without a connection, you can not browse available services')) raise RuntimeError('You must be connected to browse services') ===================================== gajim/gtk/join_groupchat.py ===================================== @@ -187,8 +187,7 @@ class JoinGroupchatWindow(Gtk.ApplicationWindow): account = self.account_combo.get_active_id() nickname = self.nick_entry.get_text() - invisible_show = app.SHOW_LIST.index('invisible') - if app.connections[account].connected == invisible_show: + if app.is_invisible(account): app.interface.raise_dialog('join-while-invisible') return ===================================== gajim/gtk/profile.py ===================================== @@ -316,7 +316,7 @@ class ProfileWindow(Gtk.ApplicationWindow): if self.update_progressbar_timeout_id: # Operation in progress return - if app.connections[self.account].connected < 2: + if not app.account_is_connected(self.account): ErrorDialog( _('You are not connected to the server'), _('Without a connection, you can not publish your contact ' ===================================== gajim/gtk/settings.py ===================================== @@ -651,5 +651,5 @@ class ChangePasswordSetting(DialogSetting): activatable = False if self.account in app.connections: con = app.connections[self.account] - activatable = con.connected >= 2 and con.register_supported + activatable = con.is_connected and con.register_supported self.set_activatable(activatable) ===================================== gajim/gtk/single_message.py ===================================== @@ -269,7 +269,7 @@ class SingleMessageWindow(Gtk.ApplicationWindow): _('Characters typed: %s') % str(characters_no)) def send_single_message(self): - if app.connections[self.account].connected <= 1: + if not app.account_is_connected(self.account): # if offline or connecting ErrorDialog(_('Connection not available'), _('Please make sure you are connected with "%s".') % self.account) ===================================== gajim/gtk/xml_console.py ===================================== @@ -148,7 +148,7 @@ class XMLConsoleWindow(Gtk.Window): self._ui.input_entry.grab_focus() def on_send(self, *args): - if app.connections[self.account].connected <= 1: + if not app.account_is_connected(self.account): # if offline or connecting ErrorDialog( _('Connection not available'), ===================================== gajim/gui_interface.py ===================================== @@ -933,9 +933,8 @@ class Interface: if obj.conn.get_module('MAM').available: obj.conn.get_module('MAM').request_archive_on_signin() - invisible_show = app.SHOW_LIST.index('invisible') # We cannot join rooms if we are invisible - if connected == invisible_show: + if app.is_invisible(account): return # send currently played music if (pep_supported and sys.platform not in ('win32', 'darwin') and @@ -1626,8 +1625,7 @@ class Interface: self.roster.on_groupchat_maximized(None, room_jid, account) return - invisible_show = app.SHOW_LIST.index('invisible') - if app.connections[account].connected == invisible_show: + if app.is_invisible(account): ErrorDialog( _('You cannot join a group chat while you are invisible')) return @@ -2179,7 +2177,7 @@ class Interface: GLib.timeout_add_seconds(2, connection.reconnect) else: for connection in app.connections.values(): - if connection.connected > 1: + if connection.is_connected: log.info('Disconnect %s', connection.name) connection.disconnect(immediately=True) ===================================== gajim/remote_control.py ===================================== @@ -437,7 +437,7 @@ class GajimRemote(Server): if not account and len(accounts) == 1: account = accounts[0] if account: - if app.connections[account].connected > 1: # account is connected + if app.account_is_connected(account): # account is connected connected_account = account contact = app.contacts.get_contact_with_highest_priority( account, jid) @@ -445,7 +445,7 @@ class GajimRemote(Server): for account_ in accounts: contact = app.contacts.get_contact_with_highest_priority( account, jid) - if contact and app.connections[account_].connected > 1: + if contact and app.account_is_connected(account_): # account is connected connected_account = account_ break @@ -466,14 +466,14 @@ class GajimRemote(Server): if not account and len(accounts) == 1: account = accounts[0] if account: - if app.connections[account].connected > 1 and \ + if app.account_is_connected(account) and \ room_jid in app.gc_connected[account] and \ app.gc_connected[account][room_jid]: # account and groupchat are connected connected_account = account else: for account_ in accounts: - if app.connections[account_].connected > 1 and \ + if app.account_is_connected(account_) and \ room_jid in app.gc_connected[account_] and \ app.gc_connected[account_][room_jid]: # account and groupchat are connected @@ -590,7 +590,7 @@ class GajimRemote(Server): connected_account = None first_connected_acct = None for acct in accounts: - if app.connections[acct].connected > 1: # account is online + if app.account_is_connected(acct): # account is online contact = app.contacts.get_first_contact_from_jid(acct, jid) if app.interface.msg_win_mgr.has_window(jid, acct): connected_account = acct @@ -790,8 +790,7 @@ class GajimRemote(Server): def add_contact(self, jid, account): if account: - if account in app.connections and \ - app.connections[account].connected > 1: + if app.account_is_connected(account): # if given account is active, use it AddNewContactWindow(account=account, jid=jid) else: ===================================== gajim/roster_window.py ===================================== @@ -2063,7 +2063,7 @@ class RosterWindow: app.config.set_per('accounts', account, 'last_status', status) app.config.set_per('accounts', account, 'last_status_msg', helpers.to_one_line(txt)) - if app.connections[account].connected < 2: + if not app.account_is_connected(account): self.set_connecting_state(account) self.send_status_continue(account, status, txt, auto, to) @@ -2112,8 +2112,7 @@ class RosterWindow: else: if status in ('invisible', 'offline'): self.delete_pep(app.get_jid_from_account(account), account) - was_invisible = app.connections[account].connected == \ - app.SHOW_LIST.index('invisible') + was_invisible = app.is_invisible(account) app.connections[account].change_status(status, txt, auto) for gc_control in app.interface.msg_win_mgr.get_controls( @@ -2409,7 +2408,7 @@ class RosterWindow: accounts = list(app.connections.keys()) get_msg = False for acct in accounts: - if app.connections[acct].connected: + if app.account_is_connected(acct): get_msg = True break @@ -2417,7 +2416,7 @@ class RosterWindow: self.quit_on_next_offline = 0 accounts_to_disconnect = [] for acct in accounts: - if app.connections[acct].connected > 1: + if app.account_is_connected(acct): self.quit_on_next_offline += 1 accounts_to_disconnect.append(acct) @@ -2505,7 +2504,7 @@ class RosterWindow: GLib.timeout_add_seconds(5, self.remove_newly_added, jid, account) elif obj.old_show > 1 and obj.new_show == 0 and \ - obj.conn.connected > 1: + obj.conn.is_connected: GLib.timeout_add_seconds(5, self.remove_to_be_removed, jid, account) @@ -2868,7 +2867,7 @@ class RosterWindow: return # account is offline, don't allow to rename - if app.connections[account].connected < 2: + if not app.account_is_connected(account): return if row_type in ('contact', 'agent'): # it's jid @@ -3225,8 +3224,7 @@ class RosterWindow: elif type_ == 'account': account = model[path][Column.ACCOUNT] if account != 'all': - show = app.connections[account].connected - if show > 1: # We are connected + if app.account_is_connected(account): self.on_change_status_message_activate(widget, account) return True show = helpers.get_global_show() @@ -4202,7 +4200,7 @@ class RosterWindow: if account_dest == 'all': return # nothing can be done, if destination account is offline - if app.connections[account_dest].connected < 2: + if not app.account_is_connected(account_dest): return # A file got dropped on the roster @@ -4748,7 +4746,7 @@ class RosterWindow: item = Gtk.MenuItem.new_with_mnemonic(uf_show) sub_menu.append(item) con = app.connections[account] - if show == 'invisible' and con.connected > 1 and \ + if show == 'invisible' and con.is_connected and \ not con.get_module('PrivacyLists').supported: item.set_sensitive(False) else: @@ -4761,7 +4759,7 @@ class RosterWindow: sub_menu.append(item) item.connect('activate', self.on_change_status_message_activate, account) - if app.connections[account].connected < 2: + if not app.account_is_connected(account): item.set_sensitive(False) item = Gtk.SeparatorMenuItem.new() @@ -4831,7 +4829,7 @@ class RosterWindow: self.add_bookmarks_list(gc_sub_menu, account) # make some items insensitive if account is offline - if app.connections[account].connected < 2: + if not app.account_is_connected(account): for widget in (add_contact_menuitem, service_discovery_menuitem, join_group_chat_menuitem, execute_command_menuitem, pep_menuitem): @@ -4859,7 +4857,7 @@ class RosterWindow: sub_menu.append(item) item.connect('activate', self.on_change_status_message_activate, account) - if app.connections[account].connected < 2: + if not app.account_is_connected(account): item.set_sensitive(False) uf_show = helpers.get_uf_show('offline', use_mnemonic=True) @@ -4969,7 +4967,7 @@ class RosterWindow: if app.config.get_per('accounts', account, 'is_zeroconf'): send_group_message_item.set_sensitive(False) - if app.connections[account].connected < 2: + if not app.account_is_connected(account): send_group_message_item.set_sensitive(False) invite_menuitem.set_sensitive(False) @@ -5012,7 +5010,7 @@ class RosterWindow: group, account) # unsensitive if account is not connected - if app.connections[account].connected < 2: + if not app.account_is_connected(account): rename_item.set_sensitive(False) # General group cannot be changed @@ -5052,7 +5050,7 @@ class RosterWindow: for titer in iters: jid = model[titer][Column.JID] account = model[titer][Column.ACCOUNT] - if app.connections[account].connected < 2: + if not app.account_is_connected(account): one_account_offline = True if not app.connections[account].get_module('PrivacyLists').supported: privacy_rules_supported = False View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/519d86444a5e0d14a21b7ce38943522f83… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/519d86444a5e0d14a21b7ce38943522f83… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Move ConnectionJingle code to module
by Philipp Hörist 19 May '19

19 May '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 275e719d by Philipp Hörist at 2019-05-19T20:33:20Z Move ConnectionJingle code to module - - - - - 24852277 by Philipp Hörist at 2019-05-19T20:33:20Z Move ConnectionSocks5Bytestream code to module - - - - - 24 changed files: - gajim/chat_control.py - gajim/command_system/implementation/standard.py - gajim/common/connection.py - gajim/common/connection_handlers.py - gajim/common/connection_handlers_events.py - gajim/common/jingle_content.py - gajim/common/jingle_ft.py - gajim/common/jingle_session.py - gajim/common/jingle_transport.py - gajim/common/modules/__init__.py - gajim/common/protocol/bytestream.py → gajim/common/modules/bytestream.py - gajim/common/modules/discovery.py - gajim/common/modules/ibb.py - gajim/common/modules/iq.py - gajim/common/jingle.py → gajim/common/modules/jingle.py - gajim/common/modules/presence.py - − gajim/common/protocol/__init__.py - gajim/common/zeroconf/client_zeroconf.py - gajim/common/zeroconf/connection_handlers_zeroconf.py - gajim/common/zeroconf/connection_zeroconf.py - gajim/dialogs.py - gajim/gtk/filetransfer.py - gajim/gui_interface.py - gajim/roster_window.py Changes: ===================================== gajim/chat_control.py ===================================== @@ -594,7 +594,7 @@ class ChatControl(ChatControlBase): self._set_jingle_state('video', state, sid=sid, reason=reason) def _get_audio_content(self): - session = app.connections[self.account].get_jingle_session( + session = app.connections[self.account].get_module('Jingle').get_jingle_session( self.contact.get_full_jid(), self.audio_sid) return session.get_content('audio') @@ -757,8 +757,8 @@ class ChatControl(ChatControlBase): return setattr(self, jingle_type + '_sid', None) setattr(self, jingle_type + '_state', self.JINGLE_STATE_NULL) - session = app.connections[self.account].get_jingle_session( - self.contact.get_full_jid(), sid) + session = app.connections[self.account].get_module('Jingle').get_jingle_session( + self.contact.get_full_jid(), sid) if session: content = session.get_content(jingle_type) if content: @@ -790,7 +790,7 @@ class ChatControl(ChatControlBase): in_da = self.xml.get_object('incoming_drawingarea') in_da.realize() in_xid = in_da.get_window().get_xid() - sid = app.connections[self.account].start_video( + sid = app.connections[self.account].get_module('Jingle').start_video( self.contact.get_full_jid(), in_xid, out_xid) else: sid = getattr(app.connections[self.account], @@ -1470,7 +1470,7 @@ class ChatControl(ChatControlBase): app.events.remove_events(self.account, self.contact.jid, event=ev) def _on_cancel_file_request(self, widget, file_props): - app.connections[self.account].send_file_rejection(file_props) + app.connections[self.account].get_module('Bytestream').send_file_rejection(file_props) ev = self._get_file_props_event(file_props, 'file-request') if ev: app.events.remove_events(self.account, self.contact.jid, event=ev) ===================================== gajim/command_system/implementation/standard.py ===================================== @@ -189,7 +189,7 @@ class StandardCommonChatCommands(CommandContainer): for tone in sequence: if not (tone in ("*", "#") or tone.isdigit()): raise CommandError(_("%s is not a valid tone") % tone) - gjs = self.connection.get_jingle_session + gjs = self.connection.get_module('Jingle').get_jingle_session session = gjs(self.full_jid, self.audio_sid) content = session.get_content("audio") content.batch_dtmf(sequence) ===================================== gajim/common/connection.py ===================================== @@ -588,7 +588,7 @@ class Connection(CommonConnection, ConnectionHandlers): app.proxy65_manager.disconnect(self.connection) self.terminate_sessions() - self.remove_all_transfers() + self.get_module('Bytestream').remove_all_transfers() self._unregister_new_handlers(self.connection) self.connection = None @@ -1348,7 +1348,7 @@ class Connection(CommonConnection, ConnectionHandlers): # If we are already connected, and privacy rules are supported, send # offline presence first as it's required by XEP-0126 if self.connected > 1 and self.get_module('PrivacyLists').supported: - self.remove_all_transfers() + self.get_module('Bytestream').remove_all_transfers() self.get_module('Presence').send_presence( typ='unavailable', status=msg, ===================================== gajim/common/connection_handlers.py ===================================== @@ -30,10 +30,6 @@ import operator import nbxmpp from gajim.common import app -from gajim.common import helpers -from gajim.common import jingle_xtls -from gajim.common.jingle import ConnectionJingle -from gajim.common.protocol.bytestream import ConnectionSocks5Bytestream from gajim.common.connection_handlers_events import StreamReceivedEvent from gajim.common.connection_handlers_events import PresenceReceivedEvent from gajim.common.connection_handlers_events import StreamConflictReceivedEvent @@ -182,30 +178,14 @@ class ConnectionHandlersBase: return sess -class ConnectionHandlers(ConnectionSocks5Bytestream, - ConnectionHandlersBase, - ConnectionJingle): +class ConnectionHandlers(ConnectionHandlersBase): def __init__(self): - ConnectionSocks5Bytestream.__init__(self) - ConnectionJingle.__init__(self) ConnectionHandlersBase.__init__(self) app.nec.register_incoming_event(PresenceReceivedEvent) app.nec.register_incoming_event(StreamConflictReceivedEvent) app.nec.register_incoming_event(NotificationEvent) - def _PubkeyGetCB(self, con, iq_obj): - log.info('PubkeyGetCB') - jid_from = helpers.get_full_jid_from_iq(iq_obj) - sid = iq_obj.getAttr('id') - jingle_xtls.send_cert(con, jid_from, sid) - raise nbxmpp.NodeProcessed - - def _PubkeyResultCB(self, con, iq_obj): - log.info('PubkeyResultCB') - jid_from = helpers.get_full_jid_from_iq(iq_obj) - jingle_xtls.handle_new_cert(con, iq_obj, jid_from) - def _StreamCB(self, con, obj): log.debug('StreamCB') app.nec.push_incoming_event(StreamReceivedEvent(None, @@ -215,19 +195,5 @@ class ConnectionHandlers(ConnectionSocks5Bytestream, # try to find another way to register handlers in each class # that defines handlers - con.RegisterHandler('iq', self._bytestreamSetCB, 'set', - nbxmpp.NS_BYTESTREAM) - con.RegisterHandler('iq', self._bytestreamResultCB, 'result', - nbxmpp.NS_BYTESTREAM) - con.RegisterHandler('iq', self._bytestreamErrorCB, 'error', - nbxmpp.NS_BYTESTREAM) - con.RegisterHandler('iq', self._JingleCB, 'result') - con.RegisterHandler('iq', self._JingleCB, 'error') - con.RegisterHandler('iq', self._JingleCB, 'set', nbxmpp.NS_JINGLE) - con.RegisterHandler('iq', self._ResultCB, 'result') con.RegisterHandler('unknown', self._StreamCB, nbxmpp.NS_XMPP_STREAMS, xmlns=nbxmpp.NS_STREAMS) - con.RegisterHandler('iq', self._PubkeyGetCB, 'get', - nbxmpp.NS_PUBKEY_PUBKEY) - con.RegisterHandler('iq', self._PubkeyResultCB, 'result', - nbxmpp.NS_PUBKEY_PUBKEY) ===================================== gajim/common/connection_handlers_events.py ===================================== @@ -170,7 +170,7 @@ class FileRequestReceivedEvent(nec.NetworkIncomingEvent): def generate(self): self.id_ = self.stanza.getID() - self.fjid = self.conn._ft_get_from(self.stanza) + self.fjid = self.conn.get_module('Bytestream')._ft_get_from(self.stanza) self.jid = app.get_jid_without_resource(self.fjid) if self.jingle_content: secu = self.jingle_content.getTag('security') @@ -201,7 +201,7 @@ class FileRequestReceivedEvent(nec.NetworkIncomingEvent): if self.jingle_content.getAttr('creator') == 'initiator': file_tag = desc.getTag('file') self.file_props.sender = self.fjid - self.file_props.receiver = self.conn._ft_get_our_jid() + self.file_props.receiver = self.conn.get_module('Bytestream')._ft_get_our_jid() else: file_tag = desc.getTag('file') h = file_tag.getTag('hash') @@ -209,10 +209,10 @@ class FileRequestReceivedEvent(nec.NetworkIncomingEvent): n = file_tag.getTag('name') n = n.getData() if n else None pjid = app.get_jid_without_resource(self.fjid) - file_info = self.conn.get_file_info( + file_info = self.conn.get_module('Jingle').get_file_info( pjid, hash_=h, name=n, account=self.conn.name) self.file_props.file_name = file_info['file-name'] - self.file_props.sender = self.conn._ft_get_our_jid() + self.file_props.sender = self.conn.get_module('Bytestream')._ft_get_our_jid() self.file_props.receiver = self.fjid self.file_props.type_ = 's' for child in file_tag.getChildren(): @@ -236,7 +236,7 @@ class FileRequestReceivedEvent(nec.NetworkIncomingEvent): self.file_props.transport_sid = self.file_props.sid profile = si.getAttr('profile') if profile != nbxmpp.NS_FILE: - self.conn.send_file_rejection(self.file_props, code='400', + self.conn.get_module('Bytestream').send_file_rejection(self.file_props, code='400', typ='profile') raise nbxmpp.NodeProcessed feature_tag = si.getTag('feature', namespace=nbxmpp.NS_FEATURE) @@ -254,7 +254,7 @@ class FileRequestReceivedEvent(nec.NetworkIncomingEvent): nbxmpp.NS_IBB in values: break else: - self.conn.send_file_rejection(self.file_props, code='400', + self.conn.get_module('Bytestream').send_file_rejection(self.file_props, code='400', typ='stream') raise nbxmpp.NodeProcessed file_tag = si.getTag('file') @@ -269,7 +269,7 @@ class FileRequestReceivedEvent(nec.NetworkIncomingEvent): if mime_type is not None: self.file_props.mime_type = mime_type self.file_props.sender = self.fjid - self.file_props.receiver = self.conn._ft_get_our_jid() + self.file_props.receiver = self.conn.get_module('Bytestream')._ft_get_our_jid() self.file_props.request_id = self.id_ file_desc_tag = file_tag.getTag('desc') if file_desc_tag is not None: ===================================== gajim/common/jingle_content.py ===================================== @@ -219,7 +219,7 @@ class JingleContent: 'date' : self.file_props.date, 'peerjid' : pjid } - self.session.connection.set_file_info(file_info) + self.session.connection.get_module('Jingle').set_file_info(file_info) desc = file_tag.setTag('desc') if self.file_props.desc: desc.setData(self.file_props.desc) ===================================== gajim/common/jingle_ft.py ===================================== @@ -161,7 +161,7 @@ class JingleFileTransfer(JingleContent): 'date' : self.file_props.date, 'peerjid' : pjid } - self.session.connection.set_file_info(file_info) + self.session.connection.get_module('Jingle').set_file_info(file_info) def _compute_hash(self): # Caculates the hash and returns a xep-300 hash stanza ===================================== gajim/common/jingle_session.py ===================================== @@ -538,7 +538,7 @@ class JingleSession: # If we are not receiving a file # Check if there's already a session with this user: if contents[0].media != 'file': - for session in self.connection.iter_jingle_sessions(self.peerjid): + for session in self.connection.get_module('Jingle').iter_jingle_sessions(self.peerjid): if session is not self: reason = nbxmpp.Node('reason') alternative_session = reason.setTag('alternative-session') @@ -557,8 +557,8 @@ class JingleSession: n = request.getTag('file').getTag('name') n = n.getData() if n else None pjid = app.get_jid_without_resource(self.peerjid) - file_info = self.connection.get_file_info(pjid, hash_data, n, - self.connection.name) + file_info = self.connection.get_module('Jingle').get_file_info( + pjid, hash_data, n, self.connection.name) if not file_info: log.warning('The peer %s is requesting a ' \ 'file that we dont have or ' \ @@ -598,7 +598,7 @@ class JingleSession: cn.on_stanza(stanza, content, error, action) def __on_session_terminate(self, stanza, jingle, error, action): - self.connection.delete_jingle_session(self.sid) + self.connection.get_module('Jingle').delete_jingle_session(self.sid) reason, text = self.__reason_from_stanza(jingle) if reason not in ('success', 'cancel', 'decline'): self.__dispatch_error(reason, text) @@ -776,7 +776,7 @@ class JingleSession: text = '%s (%s)' % (reason, text) else: text = reason - self.connection.delete_jingle_session(self.sid) + self.connection.get_module('Jingle').delete_jingle_session(self.sid) app.nec.push_incoming_event(JingleDisconnectedReceivedEvent(None, conn=self.connection, jingle_session=self, ===================================== gajim/common/jingle_transport.py ===================================== @@ -305,7 +305,7 @@ class JingleTransportSocks5(JingleTransport): priority = (2**16) * type_preference proxy_cand = [] socks5conn = self.connection - proxyhosts = socks5conn._get_file_transfer_proxies_from_config(self.file_props) + proxyhosts = socks5conn.get_module('Bytestream')._get_file_transfer_proxies_from_config(self.file_props) if proxyhosts: self.file_props.proxyhosts = proxyhosts @@ -326,8 +326,8 @@ class JingleTransportSocks5(JingleTransport): self._add_candidates(proxy_cand) def get_content(self): - sesn = self.connection.get_jingle_session(self.ourjid, - self.file_props.sid) + sesn = self.connection.get_module('Jingle').get_jingle_session( + self.ourjid, self.file_props.sid) for content in sesn.contents.values(): if content.transport == self: return content @@ -337,8 +337,8 @@ class JingleTransportSocks5(JingleTransport): # send activate request to proxy, send activated confirmation to peer if not self.connection: return - sesn = self.connection.get_jingle_session(self.ourjid, - self.file_props.sid) + sesn = self.connection.get_module('Jingle').get_jingle_session( + self.ourjid, self.file_props.sid) if sesn is None: return ===================================== gajim/common/modules/__init__.py ===================================== @@ -75,6 +75,8 @@ MODULES = [ 'vcard_temp', 'announce', 'ibb', + 'jingle', + 'bytestream', ] _imported_modules = [] # type: List[tuple] ===================================== gajim/common/protocol/bytestream.py → gajim/common/modules/bytestream.py ===================================== @@ -28,6 +28,7 @@ import socket import logging import nbxmpp +from nbxmpp.structs import StanzaHandler from gi.repository import GLib from gajim.common import app @@ -35,9 +36,10 @@ from gajim.common import helpers from gajim.common import jingle_xtls from gajim.common.file_props import FilesProp from gajim.common.socks5 import Socks5SenderClient +from gajim.common.modules.base import BaseModule -log = logging.getLogger('gajim.c.p.bytestream') +log = logging.getLogger('gajim.c.m.bytestream') def is_transfer_paused(file_props): if file_props.stopped: @@ -71,33 +73,61 @@ def is_transfer_stopped(file_props): return True -class ConnectionBytestream: - - def pass_bytestream_disco(self, from_, identities, features, data, node): +class Bytestream(BaseModule): + def __init__(self, con): + BaseModule.__init__(self, con) + + self.handlers = [ + StanzaHandler(name='iq', + typ='result', + ns=nbxmpp.NS_BYTESTREAM, + callback=self._bytestreamResultCB), + StanzaHandler(name='iq', + typ='error', + ns=nbxmpp.NS_BYTESTREAM, + callback=self._bytestreamErrorCB), + StanzaHandler(name='iq', + typ='set', + ns=nbxmpp.NS_BYTESTREAM, + callback=self._bytestreamSetCB), + StanzaHandler(name='iq', + typ='result', + callback=self._ResultCB), + ] + + def pass_disco(self, from_, _identities, features, _data, _node): if nbxmpp.NS_BYTESTREAM not in features: return - if app.config.get_per('accounts', self.name, 'use_ft_proxies'): + if app.config.get_per('accounts', self._account, 'use_ft_proxies'): log.info('Discovered proxy: %s', from_) - our_fjid = self.get_own_jid() + our_fjid = self._con.get_own_jid() testit = app.config.get_per( - 'accounts', self.name, 'test_ft_proxies_on_startup') + 'accounts', self._account, 'test_ft_proxies_on_startup') app.proxy65_manager.resolve( - from_, self.connection, str(our_fjid), - default=self.name, testit=testit) + from_, self._con.connection, str(our_fjid), + default=self._account, testit=testit) raise nbxmpp.NodeProcessed def _ft_get_our_jid(self): - our_jid = app.get_jid_from_account(self.name) - resource = self.server_resource + if self._account == 'Local': + return app.get_jid_from_account(self._account) + our_jid = app.get_jid_from_account(self._account) + resource = self._con.server_resource return our_jid + '/' + resource def _ft_get_receiver_jid(self, file_props): + if self._account == 'Local': + return file_props.receiver.jid return file_props.receiver.jid + '/' + file_props.receiver.resource def _ft_get_from(self, iq_obj): + if self._account == 'Local': + return iq_obj.getFrom() return helpers.get_full_jid_from_iq(iq_obj) def _ft_get_streamhost_jid_attr(self, streamhost): + if self._account == 'Local': + return streamhost.getAttr('jid') return helpers.parse_jid(streamhost.getAttr('jid')) def send_file_approval(self, file_props): @@ -105,14 +135,14 @@ class ConnectionBytestream: Send iq, confirming that we want to download the file """ # user response to ConfirmationDialog may come after we've disconneted - if not self.connection or self.connected < 2: + if not self._con.connection or self._con.connected < 2: return # file transfer initiated by a jingle session log.info("send_file_approval: jingle session accept") - session = self.get_jingle_session(file_props.sender, - file_props.sid) + session = self._con.get_module('Jingle').get_jingle_session( + file_props.sender, file_props.sid) if not session: return content = None @@ -129,8 +159,8 @@ class ConnectionBytestream: if not jingle_xtls.check_cert( app.get_jid_without_resource(file_props.sender), fingerprint): - id_ = jingle_xtls.send_cert_request(self, - file_props.sender) + id_ = jingle_xtls.send_cert_request( + self._con, file_props.sender) jingle_xtls.key_exchange_pend(id_, content.on_cert_received, []) return @@ -146,7 +176,7 @@ class ConnectionBytestream: invalid stream or 'profile' for invalid profile """ # user response to ConfirmationDialog may come after we've disconnected - if not self.connection or self.connected < 2: + if not self._con.connection or self._con.connected < 2: return if file_props.sid in self._sessions: @@ -154,14 +184,11 @@ class ConnectionBytestream: jingle.cancel_session() return - -class ConnectionSocks5Bytestream(ConnectionBytestream): - def send_success_connect_reply(self, streamhost): """ Send reply to the initiator of FT that we made a connection """ - if not self.connection or self.connected < 2: + if not self._con.connection or self._con.connected < 2: return if streamhost is None: return None @@ -171,7 +198,7 @@ class ConnectionSocks5Bytestream(ConnectionBytestream): query = iq.setTag('query', namespace=nbxmpp.NS_BYTESTREAM) stream_tag = query.setTag('streamhost-used') stream_tag.setAttr('jid', streamhost['jid']) - self.connection.send(iq) + self._con.connection.send(iq) def stop_all_active_file_transfers(self, contact): """ @@ -187,7 +214,7 @@ class ConnectionSocks5Bytestream(ConnectionBytestream): from gajim.common.connection_handlers_events import \ FileRequestErrorEvent app.nec.push_incoming_event(FileRequestErrorEvent(None, - conn=self, jid=contact.jid, file_props=file_props, + conn=self._con, jid=contact.jid, file_props=file_props, error_msg='')) sender_jid = file_props.sender if contact.get_full_jid() == sender_jid: @@ -222,7 +249,7 @@ class ConnectionSocks5Bytestream(ConnectionBytestream): """ Send iq for the present streamhosts and proxies """ - if not self.connection or self.connected < 2: + if not self._con.connection or self._con.connected < 2: return receiver = file_props.receiver sender = file_props.sender @@ -236,7 +263,7 @@ class ConnectionSocks5Bytestream(ConnectionBytestream): if not listener: file_props.error = -5 from gajim.common.connection_handlers_events import FileRequestErrorEvent - app.nec.push_incoming_event(FileRequestErrorEvent(None, conn=self, + app.nec.push_incoming_event(FileRequestErrorEvent(None, conn=self._con, jid=receiver, file_props=file_props, error_msg='')) self._connect_error(file_props.sid, error='not-acceptable', error_type='modify') @@ -262,10 +289,10 @@ class ConnectionSocks5Bytestream(ConnectionBytestream): streamhost.setAttr('jid', sender) def _add_local_ips_as_streamhosts_to_query(self, query, file_props): - if not app.config.get_per('accounts', self.name, 'ft_send_local_ips'): + if not app.config.get_per('accounts', self._account, 'ft_send_local_ips'): return try: - my_ips = [self.peerhost[0]] # The ip we're connected to server with + my_ips = [self._con.peerhost[0]] # The ip we're connected to server with # all IPs from local DNS for addr in socket.getaddrinfo(socket.gethostname(), None): if not addr[4][0] in my_ips and not addr[4][0].startswith('127') and not addr[4][0] == '::1': @@ -292,16 +319,16 @@ class ConnectionSocks5Bytestream(ConnectionBytestream): def _add_upnp_igd_as_streamhost_to_query(self, query, file_props, iq): if not app.is_installed('UPNP'): - self.connection.send(iq) + self._con.connection.send(iq) return - my_ip = self.peerhost[0] + my_ip = self._con.peerhost[0] # check if we are connected with an IPv4 address try: socket.inet_aton(my_ip) except socket.error: - self.connection.send(iq) + self._con.connection.send(iq) return def ip_is_local(ip): @@ -351,12 +378,12 @@ class ConnectionSocks5Bytestream(ConnectionBytestream): else: self._add_streamhosts_to_query(query, file_props.sender, ext_port, [ext_ip]) - self.connection.send(iq) + self._con.connection.send(iq) cleanup_gupnp() def fail(s, error, proto, ext_ip, local_ip, local_port, desc): log.debug('Got GUPnP-IGD error') - self.connection.send(iq) + self._con.connection.send(iq) cleanup_gupnp() def no_upnp_reply(): @@ -364,7 +391,7 @@ class ConnectionSocks5Bytestream(ConnectionBytestream): # stop trying to use it app.disable_dependency('UPNP') self.no_gupnp_reply_id = 0 - self.connection.send(iq) + self._con.connection.send(iq) cleanup_gupnp() return False @@ -389,16 +416,16 @@ class ConnectionSocks5Bytestream(ConnectionBytestream): proxyhost['port'], [proxyhost['host']]) def _get_file_transfer_proxies_from_config(self, file_props): - configured_proxies = app.config.get_per('accounts', self.name, + configured_proxies = app.config.get_per('accounts', self._account, 'file_transfer_proxies') - shall_use_proxies = app.config.get_per('accounts', self.name, + shall_use_proxies = app.config.get_per('accounts', self._account, 'use_ft_proxies') if shall_use_proxies: proxyhost_dicts = [] proxies = [] if configured_proxies: proxies = [item.strip() for item in configured_proxies.split(',')] - default_proxy = app.proxy65_manager.get_default_for_name(self.name) + default_proxy = app.proxy65_manager.get_default_for_name(self._account) if default_proxy: # add/move default proxy at top of the others if default_proxy in proxies: @@ -406,7 +433,7 @@ class ConnectionSocks5Bytestream(ConnectionBytestream): proxies.insert(0, default_proxy) for proxy in proxies: - (host, _port, jid) = app.proxy65_manager.get_proxy(proxy, self.name) + (host, _port, jid) = app.proxy65_manager.get_proxy(proxy, self._account) if not host: continue host_dict = { @@ -436,9 +463,9 @@ class ConnectionSocks5Bytestream(ConnectionBytestream): Called when there is an error establishing BS connection, or when connection is rejected """ - if not self.connection or self.connected < 2: + if not self._con.connection or self._con.connected < 2: return - file_props = FilesProp.getFileProp(self.name, sid) + file_props = FilesProp.getFileProp(self._account, sid) if file_props is None: log.error('can not send iq error on failed transfer') return @@ -451,22 +478,22 @@ class ConnectionSocks5Bytestream(ConnectionBytestream): err = iq.setTag('error') err.setAttr('type', error_type) err.setTag(error, namespace=nbxmpp.NS_STANZAS) - self.connection.send(iq) + self._con.connection.send(iq) if msg: self.disconnect_transfer(file_props) file_props.error = -3 from gajim.common.connection_handlers_events import \ FileRequestErrorEvent app.nec.push_incoming_event(FileRequestErrorEvent(None, - conn=self, jid=to, file_props=file_props, error_msg=msg)) + conn=self._con, jid=to, file_props=file_props, error_msg=msg)) def _proxy_auth_ok(self, proxy): """ Called after authentication to proxy server """ - if not self.connection or self.connected < 2: + if not self._con.connection or self._con.connected < 2: return - file_props = FilesProp.getFileProp(self.name, proxy['sid']) + file_props = FilesProp.getFileProp(self._account, proxy['sid']) iq = nbxmpp.Iq(to=proxy['initiator'], typ='set') auth_id = "au_" + proxy['sid'] iq.setID(auth_id) @@ -475,7 +502,7 @@ class ConnectionSocks5Bytestream(ConnectionBytestream): activate = query.setTag('activate') activate.setData(file_props.proxy_receiver) iq.setID(auth_id) - self.connection.send(iq) + self._con.connection.send(iq) # register xmpppy handlers for bytestream and FT stanzas def _bytestreamErrorCB(self, con, iq_obj): @@ -490,7 +517,7 @@ class ConnectionSocks5Bytestream(ConnectionBytestream): return file_props.error = -4 from gajim.common.connection_handlers_events import FileRequestErrorEvent - app.nec.push_incoming_event(FileRequestErrorEvent(None, conn=self, + app.nec.push_incoming_event(FileRequestErrorEvent(None, conn=self._con, jid=jid, file_props=file_props, error_msg='')) raise nbxmpp.NodeProcessed @@ -499,7 +526,7 @@ class ConnectionSocks5Bytestream(ConnectionBytestream): id_ = iq_obj.getAttr('id') query = iq_obj.getTag('query') sid = query.getAttr('sid') - file_props = FilesProp.getFileProp(self.name, sid) + file_props = FilesProp.getFileProp(self._account, sid) streamhosts = [] for item in query.getChildren(): if item.getName() == 'streamhost': @@ -527,7 +554,7 @@ class ConnectionSocks5Bytestream(ConnectionBytestream): file_props.streamhosts.extend(streamhosts) else: file_props.streamhosts = streamhosts - app.socks5queue.connect_to_hosts(self.name, sid, + app.socks5queue.connect_to_hosts(self._account, sid, self.send_success_connect_reply, None) raise nbxmpp.NodeProcessed else: @@ -539,7 +566,7 @@ class ConnectionSocks5Bytestream(ConnectionBytestream): self._connect_error(sid, 'item-not-found', 'cancel', msg='Could not connect to given hosts') if file_props.type_ == 'r': - app.socks5queue.connect_to_hosts(self.name, sid, + app.socks5queue.connect_to_hosts(self._account, sid, self.send_success_connect_reply, _connection_error) raise nbxmpp.NodeProcessed @@ -554,7 +581,7 @@ class ConnectionSocks5Bytestream(ConnectionBytestream): return frm = self._ft_get_from(iq_obj) id_ = real_id[3:] - file_props = FilesProp.getFilePropByTransportSid(self.name, id_) + file_props = FilesProp.getFilePropByTransportSid(self._account, id_) if file_props.streamhost_used: for host in file_props.proxyhosts: if host['initiator'] == frm and 'idx' in host: @@ -572,7 +599,7 @@ class ConnectionSocks5Bytestream(ConnectionBytestream): except Exception: # this bytestream result is not what we need pass id_ = real_id[3:] - file_props = FilesProp.getFileProp(self.name, id_) + file_props = FilesProp.getFileProp(self._account, id_) if file_props is None: raise nbxmpp.NodeProcessed if streamhost is None: @@ -596,7 +623,7 @@ class ConnectionSocks5Bytestream(ConnectionBytestream): if file_props.stopped: self.remove_transfer(file_props) else: - app.socks5queue.send_file(file_props, self.name, 'server') + app.socks5queue.send_file(file_props, self._account, 'server') raise nbxmpp.NodeProcessed proxy = None @@ -618,7 +645,7 @@ class ConnectionSocks5Bytestream(ConnectionBytestream): port=int(proxy['port']), fingerprint=None, connected=False, file_props=file_props) sender.streamhost = proxy - app.socks5queue.add_sockobj(self.name, sender) + app.socks5queue.add_sockobj(self._account, sender) proxy['idx'] = sender.queue_idx app.socks5queue.on_success[file_props.sid] = self._proxy_auth_ok raise nbxmpp.NodeProcessed @@ -626,21 +653,10 @@ class ConnectionSocks5Bytestream(ConnectionBytestream): if file_props.stopped: self.remove_transfer(file_props) else: - app.socks5queue.send_file(file_props, self.name, 'server') + app.socks5queue.send_file(file_props, self._account, 'server') raise nbxmpp.NodeProcessed -class ConnectionSocks5BytestreamZeroconf(ConnectionSocks5Bytestream): - - def _ft_get_from(self, iq_obj): - return iq_obj.getFrom() - - def _ft_get_our_jid(self): - return app.get_jid_from_account(self.name) - - def _ft_get_receiver_jid(self, file_props): - return file_props.receiver.jid - - def _ft_get_streamhost_jid_attr(self, streamhost): - return streamhost.getAttr('jid') +def get_instance(*args, **kwargs): + return Bytestream(*args, **kwargs), 'Bytestream' ===================================== gajim/common/modules/discovery.py ===================================== @@ -162,7 +162,7 @@ class Discovery(BaseModule): try: self._con.get_module('MUC').pass_disco(from_, *args) self._con.get_module('HTTPUpload').pass_disco(from_, *args) - self._con.pass_bytestream_disco(from_, *args) + self._con.get_module('Bytestream').pass_disco(from_, *args) except nbxmpp.NodeProcessed: pass ===================================== gajim/common/modules/ibb.py ===================================== @@ -174,7 +174,7 @@ class IBB(BaseModule): peerjid = file_props.receiver else: peerjid = file_props.sender - session = self._con.get_jingle_session( + session = self._con.get_module('Jingle').get_jingle_session( peerjid, file_props.sid, 'file') # According to the xep, the initiator also cancels # the jingle session if there are no more files to send using IBB ===================================== gajim/common/modules/iq.py ===================================== @@ -53,7 +53,7 @@ class Iq(BaseModule): jid=properties.jid.getBare(), file_props=file_props, error_msg=properties.error.message)) - self._con.disconnect_transfer(file_props) + self._con.get_module('Bytestream').disconnect_transfer(file_props) raise nbxmpp.NodeProcessed if properties.error.type == Error.ITEM_NOT_FOUND: @@ -65,7 +65,7 @@ class Iq(BaseModule): account=self._account, jid=str(properties.jid), file_props=file_props)) - self._con.disconnect_transfer(file_props) + self._con.get_module('Bytestream').disconnect_transfer(file_props) raise nbxmpp.NodeProcessed app.nec.push_incoming_event( ===================================== gajim/common/jingle.py → gajim/common/modules/jingle.py ===================================== @@ -31,24 +31,49 @@ Handles the jingle signalling protocol import logging import nbxmpp +from nbxmpp.structs import StanzaHandler + from gajim.common import helpers from gajim.common import app +from gajim.common import jingle_xtls +from gajim.common.modules.base import BaseModule -from gajim.common.jingle_session import JingleSession, JingleStates +from gajim.common.jingle_session import JingleSession +from gajim.common.jingle_session import JingleStates from gajim.common.jingle_ft import JingleFileTransfer -from gajim.common.jingle_transport import JingleTransportSocks5, JingleTransportIBB +from gajim.common.jingle_transport import JingleTransportSocks5 +from gajim.common.jingle_transport import JingleTransportIBB if app.is_installed('FARSTREAM'): from gajim.common.jingle_rtp import JingleAudio, JingleVideo -logger = logging.getLogger('gajim.c.jingle') +logger = logging.getLogger('gajim.c.m.jingle') + +class Jingle(BaseModule): + def __init__(self, con): + BaseModule.__init__(self, con) -class ConnectionJingle: - """ - This object depends on that it is a part of Connection class. - """ + self.handlers = [ + StanzaHandler(name='iq', + typ='result', + callback=self._on_jingle_iq), + StanzaHandler(name='iq', + typ='error', + callback=self._on_jingle_iq), + StanzaHandler(name='iq', + typ='set', + ns=nbxmpp.NS_JINGLE, + callback=self._on_jingle_iq), + StanzaHandler(name='iq', + typ='get', + ns=nbxmpp.NS_PUBKEY_PUBKEY, + callback=self._on_pubkey_request), + StanzaHandler(name='iq', + typ='result', + ns=nbxmpp.NS_PUBKEY_PUBKEY, + callback=self._pubkey_result_received), + ] - def __init__(self): # dictionary: sessionid => JingleSession object self._sessions = {} @@ -68,7 +93,19 @@ class ConnectionJingle: self._sessions[sid].callbacks = [] del self._sessions[sid] - def _JingleCB(self, con, stanza): + def _on_pubkey_request(self, con, stanza, _properties): + jid_from = helpers.get_full_jid_from_iq(stanza) + self._log.info('Pubkey request from %s', jid_from) + sid = stanza.getAttr('id') + jingle_xtls.send_cert(con, jid_from, sid) + raise nbxmpp.NodeProcessed + + def _pubkey_result_received(self, con, stanza, _properties): + jid_from = helpers.get_full_jid_from_iq(stanza) + self._log.info('Pubkey result from %s', jid_from) + jingle_xtls.handle_new_cert(con, stanza, jid_from) + + def _on_jingle_iq(self, con, stanza, properties): """ The jingle stanza dispatcher @@ -103,7 +140,7 @@ class ConnectionJingle: # do we need to create a new jingle object if sid not in self._sessions: #TODO: tie-breaking and other things... - newjingle = JingleSession(con=self, weinitiate=False, jid=jid, + newjingle = JingleSession(self._con, weinitiate=False, jid=jid, iq_id=id_, sid=sid) self._sessions[sid] = newjingle # we already have such session in dispatcher... @@ -122,7 +159,7 @@ class ConnectionJingle: if jingle: jingle.add_content('voice', JingleAudio(jingle)) else: - jingle = JingleSession(self, weinitiate=True, jid=jid) + jingle = JingleSession(self._con, weinitiate=True, jid=jid) self._sessions[jingle.sid] = jingle jingle.add_content('voice', JingleAudio(jingle)) jingle.start_session() @@ -136,7 +173,7 @@ class ConnectionJingle: jingle.add_content('video', JingleVideo(jingle, in_xid=in_xid, out_xid=out_xid)) else: - jingle = JingleSession(self, weinitiate=True, jid=jid) + jingle = JingleSession(self._con, weinitiate=True, jid=jid) self._sessions[jingle.sid] = jingle jingle.add_content('video', JingleVideo(jingle, in_xid=in_xid, out_xid=out_xid)) @@ -145,16 +182,16 @@ class ConnectionJingle: def start_file_transfer(self, jid, file_props, request=False): logger.info("start file transfer with file: %s", file_props) - contact = app.contacts.get_contact_with_highest_priority(self.name, - app.get_jid_without_resource(jid)) - if app.contacts.is_gc_contact(self.name, jid): + contact = app.contacts.get_contact_with_highest_priority( + self._account, app.get_jid_without_resource(jid)) + if app.contacts.is_gc_contact(self._account, jid): gcc = jid.split('/') if len(gcc) == 2: - contact = app.contacts.get_gc_contact(self.name, gcc[0], gcc[1]) + contact = app.contacts.get_gc_contact(self._account, gcc[0], gcc[1]) if contact is None: return use_security = contact.supports(nbxmpp.NS_JINGLE_XTLS) - jingle = JingleSession(self, weinitiate=True, jid=jid, werequest=request) + jingle = JingleSession(self._con, weinitiate=True, jid=jid, werequest=request) # this is a file transfer jingle.session_type_ft = True self._sessions[jingle.sid] = jingle @@ -233,3 +270,7 @@ class ConnectionJingle: if session.peerjid == jid and session.get_content(media): return session return None + + +def get_instance(*args, **kwargs): + return Jingle(*args, **kwargs), 'Jingle' ===================================== gajim/common/modules/presence.py ===================================== @@ -201,7 +201,7 @@ class Presence(BaseModule): if properties.type.is_unavailable: # TODO: This causes problems when another # resource signs off! - self._con.stop_all_active_file_transfers(contact) + self._con.get_module('Bytestream').stop_all_active_file_transfers(contact) self._log_presence(properties) @staticmethod ===================================== gajim/common/protocol/__init__.py deleted ===================================== @@ -1,3 +0,0 @@ -""" -Implementations of specific XMPP protocols and XEPs -""" ===================================== gajim/common/zeroconf/client_zeroconf.py ===================================== @@ -327,16 +327,6 @@ class P2PClient(IdleObject): self.RegisterHandler(*StanzaHandler(name='message', callback=self._caller._messageCB)) - self.RegisterHandler('iq', self._caller._bytestreamSetCB, 'set', - nbxmpp.NS_BYTESTREAM) - self.RegisterHandler('iq', self._caller._bytestreamResultCB, 'result', - nbxmpp.NS_BYTESTREAM) - self.RegisterHandler('iq', self._caller._bytestreamErrorCB, 'error', - nbxmpp.NS_BYTESTREAM) - self.RegisterHandler('iq', self._caller._JingleCB, 'result') - self.RegisterHandler('iq', self._caller._JingleCB, 'error') - self.RegisterHandler('iq', self._caller._JingleCB, 'set', - nbxmpp.NS_JINGLE) self._caller._register_new_handlers(self) ===================================== gajim/common/zeroconf/connection_handlers_zeroconf.py ===================================== @@ -26,7 +26,6 @@ import nbxmpp from gajim.common import app -from gajim.common.protocol.bytestream import ConnectionSocks5BytestreamZeroconf from gajim.common import connection_handlers from gajim.common.i18n import _ from gajim.common.helpers import AdditionalDataDict @@ -56,12 +55,8 @@ class DecryptedMessageReceivedEvent(NetworkIncomingEvent): -class ConnectionHandlersZeroconf(ConnectionSocks5BytestreamZeroconf, - connection_handlers.ConnectionHandlersBase, - connection_handlers.ConnectionJingle): +class ConnectionHandlersZeroconf(connection_handlers.ConnectionHandlersBase): def __init__(self): - ConnectionSocks5BytestreamZeroconf.__init__(self) - connection_handlers.ConnectionJingle.__init__(self) connection_handlers.ConnectionHandlersBase.__init__(self) def _messageCB(self, con, stanza, properties): ===================================== gajim/common/zeroconf/connection_zeroconf.py ===================================== @@ -233,7 +233,7 @@ class ConnectionZeroconf(CommonConnection, ConnectionHandlersZeroconf): if event.ptype == 'unavailable': # TODO: This causes problems when another # resource signs off! - self.stop_all_active_file_transfers(contact) + self.get_module('Bytestream').stop_all_active_file_transfers(contact) def _on_name_conflictCB(self, alt_name): self.disconnect() ===================================== gajim/dialogs.py ===================================== @@ -1344,8 +1344,8 @@ class VoIPCallReceivedDialog: def on_voip_call_received_messagedialog_response(self, dialog, response): # we've got response from user, either stop connecting or accept the call - session = app.connections[self.account].get_jingle_session(self.fjid, - self.sid) + session = app.connections[self.account].get_module('Jingle').get_jingle_session( + self.fjid, self.sid) if not session: dialog.destroy() return ===================================== gajim/gtk/filetransfer.py ===================================== @@ -36,7 +36,7 @@ from gajim.common import app from gajim.common import helpers from gajim.common.i18n import _ from gajim.common.file_props import FilesProp -from gajim.common.protocol.bytestream import (is_transfer_active, is_transfer_paused, +from gajim.common.modules.bytestream import (is_transfer_active, is_transfer_paused, is_transfer_stopped) from gajim.gtk.dialogs import HigDialog @@ -310,9 +310,8 @@ class FileTransfersWindow: new_file_props.date = file_props.date new_file_props.hash_ = file_props.hash_ new_file_props.type_ = 'r' - tsid = app.connections[account].start_file_transfer(fjid, - new_file_props, - True) + tsid = app.connections[account].get_module('Jingle').start_file_transfer( + fjid, new_file_props, True) new_file_props.transport_sid = tsid self.add_transfer(account, contact, new_file_props) @@ -352,8 +351,8 @@ class FileTransfersWindow: if file_props is None: return False - app.connections[account].start_file_transfer(contact.get_full_jid(), - file_props) + app.connections[account].get_module('Jingle').start_file_transfer( + contact.get_full_jid(), file_props) self.add_transfer(account, contact, file_props) return True @@ -364,7 +363,7 @@ class FileTransfersWindow: file_props.file_name = file_path file_props.type_ = 'r' self.add_transfer(account, contact, file_props) - app.connections[account].send_file_approval(file_props) + app.connections[account].get_module('Bytestream').send_file_approval(file_props) def on_file_request_accepted(self, account, contact, file_props): def on_ok(account, contact, file_props, file_path): @@ -411,7 +410,7 @@ class FileTransfersWindow: con = app.connections[account] accept_cb = partial(on_ok, account, contact, file_props) - cancel_cb = partial(con.send_file_rejection, file_props) + cancel_cb = partial(con.get_module('Bytestream').send_file_rejection, file_props) FileSaveDialog(accept_cb, cancel_cb, path=app.config.get('last_save_dir'), @@ -440,7 +439,7 @@ class FileTransfersWindow: self.on_file_request_accepted(account, contact, file_props) def on_response_cancel(account, file_props): - app.connections[account].send_file_rejection(file_props) + app.connections[account].get_module('Bytestream').send_file_rejection(file_props) dialog = NonModalConfirmationDialog(prim_text, sec_text, on_response_ok=(on_response_ok, account, contact, file_props), @@ -553,7 +552,7 @@ class FileTransfersWindow: account = file_props.tt_account if account in app.connections: # there is a connection to the account - app.connections[account].remove_transfer(file_props) + app.connections[account].get_module('Bytestream').remove_transfer(file_props) if file_props.type_ == 'r': # we receive a file other = file_props.sender else: # we send a file @@ -883,7 +882,7 @@ class FileTransfersWindow: # Check if we are in a IBB transfer if file_props.direction: con.get_module('IBB').send_close(file_props) - con.disconnect_transfer(file_props) + con.get_module('Bytestream').disconnect_transfer(file_props) self.set_status(file_props, 'stop') def on_notify_ft_complete_checkbox_toggled(self, widget): ===================================== gajim/gui_interface.py ===================================== @@ -742,8 +742,8 @@ class Interface: file_props.sid, file_props.received_len) def __compare_hashes(self, account, file_props): - session = app.connections[account].get_jingle_session(jid=None, - sid=file_props.sid) + session = app.connections[account].get_module('Jingle').get_jingle_session( + jid=None, sid=file_props.sid) ft_win = self.instances['file_transfers'] h = Hashes2() try: @@ -794,8 +794,8 @@ class Interface: self.popup_ft_result(account, jid, file_props) if file_props.error == 0: ft.set_status(file_props, 'ok') - session = app.connections[account].get_jingle_session(jid=None, - sid=file_props.sid) + session = app.connections[account].get_module('Jingle').get_jingle_session( + jid=None, sid=file_props.sid) # End jingle session # TODO: only if there are no other parallel downloads in this session if session: ===================================== gajim/roster_window.py ===================================== @@ -2435,7 +2435,7 @@ class RosterWindow: on_continue3(message, pep_dict) return # check if there is an active file transfer - from gajim.common.protocol.bytestream import is_transfer_active + from gajim.common.modules.bytestream import is_transfer_active files_props = app.interface.instances['file_transfers'].\ files_props transfer_active = False View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/1675161095e4dadff2e7f6e6cd5386db9… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/1675161095e4dadff2e7f6e6cd5386db9… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Add paste-image-from-clipboard functionality
by Philipp Hörist 19 May '19

19 May '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 16751610 by Yuki at 2019-05-19T14:56:48Z Add paste-image-from-clipboard functionality - - - - - 2 changed files: - gajim/chat_control_base.py - gajim/common/config.py Changes: ===================================== gajim/chat_control_base.py ===================================== @@ -26,6 +26,7 @@ import os import re import time +from tempfile import TemporaryDirectory from gi.repository import Gtk from gi.repository import Gdk @@ -297,6 +298,9 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): hbox = self.xml.get_object('hbox') hbox.pack_start(self.msg_scrolledwindow, True, True, 0) + id_ = self.msg_textview.connect('paste-clipboard', + self._on_message_textview_paste_event) + self.handlers[id_] = self.msg_textview id_ = self.msg_textview.connect('key_press_event', self._on_message_textview_key_press_event) self.handlers[id_] = self.msg_textview @@ -579,6 +583,62 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): self.parent_win.notebook.event(event) return Gdk.EVENT_STOP + def _on_message_textview_paste_event(self, texview): + clipboard = Gtk.Clipboard.get(Gdk.SELECTION_CLIPBOARD) + image = clipboard.wait_for_image() + if image is not None: + if not app.config.get('confirm_paste_image'): + self._paste_event_confirmed(image) + return + NewConfirmationDialog( + _('Warning'), + _('You are trying to paste an image'), + _('Are you sure you want to paste your ' + 'clipboard image in the chat?'), + [DialogButton.make('Cancel'), + DialogButton.make('OK', + callback=lambda: self._paste_event_confirmed(image))], + ).show() + + def _paste_event_confirmed(self, image): + tmp_dir = TemporaryDirectory() + dir_ = tmp_dir.name + + # get file transfer preference + ft_pref = app.config.get_per('accounts', self.account, + 'filetransfer_preference') + path = os.path.join(dir_, '0.png') + image.savev(path, 'png', [], []) + con = app.connections[self.account] + win = self.parent_win.window + httpupload = win.lookup_action( + 'send-file-httpupload-%s' % self.control_id) + jingle = win.lookup_action('send-file-jingle-%s' % self.control_id) + + if self.type_id == message_control.TYPE_GC: + # groupchat only supports httpupload on drag and drop + if httpupload.get_enabled(): + # use httpupload + con.get_module('HTTPUpload').check_file_before_transfer( + path, self.encryption, self.contact, + self.session, groupchat=True) + else: + if httpupload.get_enabled() and jingle.get_enabled(): + if ft_pref == 'httpupload': + con.get_module('HTTPUpload').check_file_before_transfer( + path, self.encryption, self.contact, self.session) + else: + ft = app.interface.instances['file_transfers'] + ft.send_file(self.account, self.contact, path) + elif httpupload.get_enabled(): + con.get_module('HTTPUpload').check_file_before_transfer( + path, self.encryption, self.contact, self.session) + elif jingle.get_enabled(): + ft = app.interface.instances['file_transfers'] + ft.send_file(self.account, self.contact, path) + + tmp_dir.cleanup() + def _on_message_textview_key_press_event(self, widget, event): if event.keyval == Gdk.KEY_space: self.space_pressed = True ===================================== gajim/common/config.py ===================================== @@ -185,6 +185,7 @@ class Config: 'remote_control': [opt_bool, False, _('If checked, Gajim can be controlled remotely using gajim-remote.'), True], 'autodetect_browser_mailer': [opt_bool, True, '', True], 'print_ichat_every_foo_minutes': [opt_int, 5, _('When not printing time for every message (print_time==sometimes), print it every x minutes.')], + 'confirm_paste_image': [opt_bool, True, _('Ask before pasting an image.')], 'confirm_close_muc': [opt_bool, True, _('Ask before closing a group chat tab/window.')], 'confirm_close_muc_rooms': [opt_str, '', _('Always ask for confirmation before closing groupchats with any of the JIDs on this space separated list.')], 'noconfirm_close_muc_rooms': [opt_str, '', _('Never ask for confirmation before closing groupchats with any of the JIDs on this space separated list.')], View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/1675161095e4dadff2e7f6e6cd5386db97… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/1675161095e4dadff2e7f6e6cd5386db97… You're receiving this email because of your account on dev.gajim.org.

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