Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][mainwindow] 3 commits: Fix sending files from ChatControl menu
by Daniel Brötzmann 16 Mar '21

16 Mar '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 37e64f0b by wurstsalat at 2021-03-16T20:22:50+01:00 Fix sending files from ChatControl menu - - - - - 2be26a32 by wurstsalat at 2021-03-16T20:30:44+01:00 ContactInfo: Handle timeout correctly - - - - - 1d5258fe by wurstsalat at 2021-03-16T21:55:56+01:00 Chat Controls: Simplify usage of client - - - - - 6 changed files: - gajim/chat_control.py - gajim/chat_control_base.py - gajim/groupchat_control.py - gajim/gtk/contact_info.py - gajim/gui_interface.py - gajim/privatechat_control.py Changes: ===================================== gajim/chat_control.py ===================================== @@ -193,7 +193,7 @@ def __init__(self, parent_win, jid, acct, session, resource=None): # # and it's not the same # if not resource: # resource = contact.resource - # session = app.connections[self.account].find_controlless_session( + # session = self._client.find_controlless_session( # self.contact.jid, resource) # if session: @@ -267,13 +267,12 @@ def add_actions(self): def update_actions(self): win = self.parent_win.window online = app.account_is_connected(self.account) - con = app.connections[self.account] # Add to roster # TODO # if not isinstance(self.contact, GC_Contact) \ # and _('Not in contact list') in self.contact.groups and \ - # app.connections[self.account].roster_supported and online: + # self._client.roster_supported and online: # win.lookup_action( # 'add-to-roster-' + self.control_id).set_enabled(True) # else: @@ -283,7 +282,7 @@ def update_actions(self): # Block contact win.lookup_action( 'block-contact-' + self.control_id).set_enabled( - online and con.get_module('Blocking').supported) + online and self._client.get_module('Blocking').supported) # Jingle AV detection if (self.contact.supports(Namespace.JINGLE_ICE_UDP) and @@ -312,7 +311,7 @@ def update_actions(self): httpupload = win.lookup_action( 'send-file-httpupload-' + self.control_id) httpupload.set_enabled( - online and con.get_module('HTTPUpload').available) + online and self._client.get_module('HTTPUpload').available) # Send file (Jingle) jingle_support = self.contact.supports(Namespace.JINGLE_FILE_TRANSFER_5) @@ -768,8 +767,7 @@ def update_video(self): self.xml.incoming_viewport.add(self._video_widget_other) self.xml.outgoing_viewport.add(self._video_widget_self) - con = app.connections[self.account] - session = con.get_module('Jingle').get_jingle_session( + session = self._client.get_module('Jingle').get_jingle_session( self.contact.get_full_jid(), self.jingle['video'].sid) content = session.get_content('video') content.do_setup(sink_self, sink_other) @@ -832,8 +830,7 @@ def close_jingle_content(self, jingle_type: str, if not jingle.sid: return - con = app.connections[self.account] - session = con.get_module('Jingle').get_jingle_session( + session = self._client.get_module('Jingle').get_jingle_session( self.contact.get_full_jid(), jingle.sid) if session: content = session.get_content(jingle_type) @@ -854,11 +851,9 @@ def _on_end_call_clicked(self, _widget): self.xml.av_box.hide() def _on_jingle_button_toggled(self, jingle_types): - con = app.connections[self.account] - if all(item in jingle_types for item in ['audio', 'video']): # Both 'audio' and 'video' in jingle_types - sid = con.get_module('Jingle').start_audio_video( + sid = self._client.get_module('Jingle').start_audio_video( self.contact.get_full_jid()) self.set_jingle_state('audio', JingleState.CONNECTING, sid) self.set_jingle_state('video', JingleState.CONNECTING, sid) @@ -868,7 +863,7 @@ def _on_jingle_button_toggled(self, jingle_types): if self.jingle['audio'].state != JingleState.NULL: self.close_jingle_content('audio') else: - sid = con.get_module('Jingle').start_audio( + sid = self._client.get_module('Jingle').start_audio( self.contact.get_full_jid()) self.set_jingle_state('audio', JingleState.CONNECTING, sid) @@ -876,13 +871,12 @@ def _on_jingle_button_toggled(self, jingle_types): if self.jingle['video'].state != JingleState.NULL: self.close_jingle_content('video') else: - sid = con.get_module('Jingle').start_video( + sid = self._client.get_module('Jingle').start_video( self.contact.get_full_jid()) self.set_jingle_state('video', JingleState.CONNECTING, sid) def _get_audio_content(self): - con = app.connections[self.account] - session = con.get_module('Jingle').get_jingle_session( + session = self._client.get_module('Jingle').get_jingle_session( self.contact.get_full_jid(), self.jingle['audio'].sid) return session.get_content('audio') @@ -1087,8 +1081,8 @@ def shutdown(self): self.remove_actions() # Send 'gone' chatstate - con = app.connections[self.account] - con.get_module('Chatstate').set_chatstate(self.contact, Chatstate.GONE) + self._client.get_module('Chatstate').set_chatstate( + self.contact, Chatstate.GONE) for jingle_type in ('audio', 'video'): self.close_jingle_content(jingle_type, shutdown=True) @@ -1311,8 +1305,7 @@ def _on_accept_file_request(self, _widget, file_props): app.events.remove_events(self.account, self.contact.jid, event=ev) def _on_cancel_file_request(self, _widget, file_props): - con = app.connections[self.account] - con.get_module('Bytestream').send_file_rejection(file_props) + self._client.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) @@ -1408,8 +1401,7 @@ def _on_reject_call(self, _button, event): app.events.remove_events( self.account, self.contact.jid, types='jingle-incoming') - con = app.connections[self.account] - session = con.get_module('Jingle').get_jingle_session( + session = self._client.get_module('Jingle').get_jingle_session( event.peerjid, event.sid) if not session: return @@ -1424,8 +1416,7 @@ def _on_accept_call(self, _button, event): app.events.remove_events( self.account, self.contact.jid, types='jingle-incoming') - con = app.connections[self.account] - session = con.get_module('Jingle').get_jingle_session( + session = self._client.get_module('Jingle').get_jingle_session( event.peerjid, event.sid) if not session: return ===================================== gajim/chat_control_base.py ===================================== @@ -108,15 +108,16 @@ def __init__(self, parent_win, widget_name, jid, acct, self.handlers = {} self.parent_win = parent_win + self.account = acct + self.resource = resource + + self._client = app.get_client(acct) + groupchat = self._type != ControlType.CHAT - contact = app.get_client(acct).get_module('Contacts').get_contact( + self.contact = self._client.get_module('Contacts').get_contact( jid, groupchat=groupchat) - self.contact = contact self._connect_contact_signals() - self.account = acct - self.resource = resource - # control_id is a unique id for the control, # its used as action name for actions that belong to a control self.control_id = str(uuid.uuid4()) @@ -242,8 +243,7 @@ def __init__(self, parent_win, widget_name, jid, acct, self.sendmessage = True - con = app.connections[self.account] - con.get_module('Chatstate').set_active(self.contact) + self._client.get_module('Chatstate').set_active(self.contact) if parent_win is not None: id_ = parent_win.window.connect('motion-notify-event', @@ -477,10 +477,9 @@ def setup_seclabel(self): self.xml.label_selector.pack_start(cell, True) # text to show is in in first column of liststore self.xml.label_selector.add_attribute(cell, 'text', 0) - con = app.connections[self.account] jid = self.contact.jid.bare - if con.get_module('SecLabels').supported: - con.get_module('SecLabels').request_catalog(jid) + if self._client.get_module('SecLabels').supported: + self._client.get_module('SecLabels').request_catalog(jid) def _sec_labels_received(self, event): if event.account != self.account: @@ -974,9 +973,8 @@ def get_seclabel(self): if idx == -1: return None - con = app.connections[self.account] jid = self.contact.jid.bare - catalog = con.get_module('SecLabels').get_catalog(jid) + catalog = self._client.get_module('SecLabels').get_catalog(jid) labels, label_list = catalog.labels, catalog.get_label_names() lname = label_list[idx] label = labels[lname] @@ -1011,8 +1009,7 @@ def send_message(self, else: correct_id = None - con = app.connections[self.account] - chatstate = con.get_module('Chatstate').get_active_chatstate( + chatstate = self._client.get_module('Chatstate').get_active_chatstate( self.contact) message_ = OutgoingMessage(account=self.account, @@ -1028,7 +1025,7 @@ def send_message(self, correct_id=correct_id, xhtml=xhtml) - con.send_message(message_) + self._client.send_message(message_) # Record the history of sent messages self.save_message(message, 'sent') @@ -1051,8 +1048,7 @@ def _on_window_motion_notify(self, *args): return if self.parent_win.get_active_jid() == self.contact.jid: # if window is the active one, set last interaction - con = app.connections[self.account] - con.get_module('Chatstate').set_mouse_activity( + self._client.get_module('Chatstate').set_mouse_activity( self.contact, self.msg_textview.has_text()) def _on_message_tv_buffer_changed(self, textview, textbuffer): @@ -1065,14 +1061,14 @@ def _on_message_tv_buffer_changed(self, textview, textbuffer): app.plugin_manager.extension_point( 'typing' + self.encryption, self) - con = app.connections[self.account] - con.get_module('Chatstate').set_keyboard_activity(self.contact) + self._client.get_module('Chatstate').set_keyboard_activity( + self.contact) if not textview.has_text(): - con.get_module('Chatstate').set_chatstate_delayed(self.contact, - Chatstate.ACTIVE) + self._client.get_module('Chatstate').set_chatstate_delayed( + self.contact, Chatstate.ACTIVE) return - con.get_module('Chatstate').set_chatstate(self.contact, - Chatstate.COMPOSING) + self._client.get_module('Chatstate').set_chatstate( + self.contact, Chatstate.COMPOSING) def save_message(self, message, msg_type): # save the message, so user can scroll though the list with key up/down @@ -1190,8 +1186,7 @@ def add_message(self, # if (self.parent_win.get_active_control() == self and # self.parent_win.is_active() and # self.has_focus() and end): - # con = app.connections[self.account] - # con.get_module('ChatMarkers').send_displayed_marker( + # self._client.get_module('ChatMarkers').send_displayed_marker( # self.contact, # self.last_msg_id, # self._type) @@ -1374,7 +1369,6 @@ def _on_ok(_contact): _on_ok(gc_contact) def set_control_active(self, state): - con = app.connections[self.account] if state: self.set_emoticon_popover() jid = self.contact.jid @@ -1389,7 +1383,7 @@ def set_control_active(self, state): # There were events to remove self.redraw_after_event_removed(jid) # XEP-0333 Send <displayed> marker - con.get_module('ChatMarkers').send_displayed_marker( + self._client.get_module('ChatMarkers').send_displayed_marker( self.contact, self.last_msg_id, self._type) @@ -1397,14 +1391,14 @@ def set_control_active(self, state): # send chatstate inactive to the one we're leaving # and active to the one we visit if self.msg_textview.has_text(): - con.get_module('Chatstate').set_chatstate(self.contact, - Chatstate.PAUSED) + self._client.get_module('Chatstate').set_chatstate( + self.contact, Chatstate.PAUSED) else: - con.get_module('Chatstate').set_chatstate(self.contact, - Chatstate.ACTIVE) + self._client.get_module('Chatstate').set_chatstate( + self.contact, Chatstate.ACTIVE) else: - con.get_module('Chatstate').set_chatstate(self.contact, - Chatstate.INACTIVE) + self._client.get_module('Chatstate').set_chatstate( + self.contact, Chatstate.INACTIVE) def scroll_to_end(self, force=False): self.conv_textview.scroll_to_end(force) @@ -1437,8 +1431,7 @@ def _on_edge_reached(self, _scrolledwindow, pos): # There were events to remove self.redraw_after_event_removed(jid) # XEP-0333 Send <displayed> tag - con = app.connections[self.account] - con.get_module('ChatMarkers').send_displayed_marker( + self._client.get_module('ChatMarkers').send_displayed_marker( self.contact, self.last_msg_id, self._type) ===================================== gajim/groupchat_control.py ===================================== @@ -261,15 +261,14 @@ def _on_muc_state_changed(self, _contact, _signal_name): self.is_connected = False ChatControlBase.got_disconnected(self) - con = app.connections[self.account] - con.get_module('Chatstate').remove_delay_timeout(self.contact) + self._client.get_module('Chatstate').remove_delay_timeout( + self.contact) self.update_actions() @property def _muc_data(self): - client = app.get_client(self.account) - return client.get_module('MUC').get_muc_data(self.room_jid) + return self._client.get_module('MUC').get_muc_data(self.room_jid) @property def _nick_completion(self): @@ -329,7 +328,6 @@ def update_actions(self, *args): return contact = self.contact.get_resource(self.nick) - con = app.connections[self.account] # Destroy Room self._get_action('destroy-').set_enabled(self.is_connected and @@ -363,12 +361,12 @@ def update_actions(self, *args): httpupload = self._get_action( 'send-file-httpupload-') httpupload.set_enabled(self.is_connected and - con.get_module('HTTPUpload').available) + self._client.get_module('HTTPUpload').available) self._get_action('send-file-').set_enabled(httpupload.get_enabled()) if self.is_connected and httpupload.get_enabled(): tooltip_text = _('Send File…') - max_file_size = con.get_module('HTTPUpload').max_file_size + max_file_size = self._client.get_module('HTTPUpload').max_file_size if max_file_size is not None: max_file_size = max_file_size / (1024 * 1024) tooltip_text = _('Send File (max. %s MiB)…') % max_file_size @@ -503,8 +501,8 @@ def _on_invite_clicked(self, _button): self._show_page('groupchat') def invite(self, contact_jid): - con = app.connections[self.account] - message_id = con.get_module('MUC').invite(self.room_jid, contact_jid) + message_id = self._client.get_module('MUC').invite( + self.room_jid, contact_jid) self.add_info_message( _('%s has been invited to this group chat') % contact_jid, message_id=message_id) @@ -536,8 +534,7 @@ def _on_destroy_confirm(self, _button): reason = self.xml.destroy_reason_entry.get_text() jid = self.xml.destroy_alternate_entry.get_text() self._wait_for_destruction = True - con = app.connections[self.account] - con.get_module('MUC').destroy(self.room_jid, reason, jid) + self._client.get_module('MUC').destroy(self.room_jid, reason, jid) self._show_page('groupchat') def _on_configure_room(self, _action, _param): @@ -548,8 +545,7 @@ def _on_configure_room(self, _action, _param): contact = self.contact.get_resource(self.nick) if contact.affiliation.is_owner: - con = app.connections[self.account] - con.get_module('MUC').request_config( + self._client.get_module('MUC').request_config( self.room_jid, callback=self._on_configure_form_received) elif contact.affiliation.is_admin: @@ -569,8 +565,7 @@ def _on_request_voice(self, _action, _param): """ Request voice in the current room """ - con = app.connections[self.account] - con.get_module('MUC').request_voice(self.room_jid) + self._client.get_module('MUC').request_voice(self.room_jid) def _on_execute_command(self, _action, param): jid = self.room_jid @@ -590,8 +585,7 @@ def _on_accept(filename): vcard = VCard() vcard.set_avatar(data, 'image/png') - con = app.connections[self.account] - con.get_module('VCardTemp').set_vcard( + self._client.get_module('VCardTemp').set_vcard( vcard, jid=self.room_jid, callback=self._on_upload_avatar_result) @@ -634,13 +628,11 @@ def _on_ban(self, _action, param): def _on_change_role(self, _action, param): nick, role = param.get_strv() - con = app.connections[self.account] - con.get_module('MUC').set_role(self.room_jid, nick, role) + self._client.get_module('MUC').set_role(self.room_jid, nick, role) def _on_change_affiliation(self, _action, param): jid, affiliation = param.get_strv() - con = app.connections[self.account] - con.get_module('MUC').set_affiliation( + self._client.get_module('MUC').set_affiliation( self.room_jid, {jid: {'affiliation': affiliation}}) @@ -667,8 +659,7 @@ def on_groupchat_maximize(self): self.get_full_jid(), types=type_): # XEP-0333 Send <displayed> marker - con = app.connections[self.account] - con.get_module('ChatMarkers').send_displayed_marker( + self._client.get_module('ChatMarkers').send_displayed_marker( self.contact, self.last_msg_id, self._type) @@ -709,9 +700,8 @@ def _on_room_voice_request(self, _contact, _signal_name, properties): voice_request = properties.voice_request def on_approve(): - con = app.connections[self.account] - con.get_module('MUC').approve_voice_request(self.room_jid, - voice_request) + self._client.get_module('MUC').approve_voice_request( + self.room_jid, voice_request) ConfirmationDialog( _('Voice Request'), @@ -864,8 +854,7 @@ def needs_visual_notification(self, text): """ special_words = app.settings.get('muc_highlight_words').split(';') special_words.append(self.nick) - con = app.connections[self.account] - special_words.append(con.get_own_jid().bare) + special_words.append(self._client.get_own_jid().bare) # Strip empties: ''.split(';') == [''] and would highlight everything. # Also lowercase everything for case insensitive compare. special_words = [word.lower() for word in special_words if word] @@ -920,8 +909,7 @@ def _on_room_config_changed(self, _contact, _signal_name, properties): if StatusCode.CONFIG_NON_PRIVACY_RELATED in status_codes: changes.append(_('A setting not related to privacy has been ' 'changed')) - app.connections[self.account].get_module('Discovery').disco_muc( - self.room_jid) + self._client.get_module('Discovery').disco_muc(self.room_jid) if StatusCode.CONFIG_ROOM_LOGGING in status_codes: # Can be a presence (see chg_contact_status in groupchat_control.py) @@ -986,13 +974,12 @@ def got_disconnected(self): self.is_connected = False ChatControlBase.got_disconnected(self) - con = app.connections[self.account] - con.get_module('Chatstate').remove_delay_timeout(self.contact) + self._client.get_module('Chatstate').remove_delay_timeout(self.contact) self.update_actions() def rejoin(self): - app.connections[self.account].get_module('MUC').join(self._muc_data) + self._client.get_module('MUC').join(self._muc_data) # def send_pm(self, nick, message=None): # ctrl = self._start_private_message(nick) @@ -1263,8 +1250,7 @@ def _on_room_password_required(self, _contact, _signal_name, _properties): self._show_page('password') def _on_room_join_failed(self, _contact, _signal_name, error): - con = app.connections[self.account] - if con.get_module('Bookmarks').is_bookmark(self.room_jid): + if self._client.get_module('Bookmarks').is_bookmark(self.room_jid): self.xml.remove_bookmark_button.show() self.xml.error_heading.set_text(_('Failed to Join Group Chat')) @@ -1297,8 +1283,7 @@ def _on_room_destroyed(self, _contact, _signal_name, properties): self.got_disconnected() - con = app.connections[self.account] - con.get_module('Bookmarks').remove(self.room_jid) + self._client.get_module('Bookmarks').remove(self.room_jid) if self._wait_for_destruction: self._close_control() @@ -1344,8 +1329,7 @@ def send_message(self, message, xhtml=None, process_commands=True): correct_id = self.last_sent_msg else: correct_id = None - con = app.connections[self.account] - chatstate = con.get_module('Chatstate').get_active_chatstate( + chatstate = self._client.get_module('Chatstate').get_active_chatstate( self.contact) # Send the message @@ -1357,7 +1341,7 @@ def send_message(self, message, xhtml=None, process_commands=True): chatstate=chatstate, correct_id=correct_id) message_.additional_data.set_value('gajim', 'xhtml', xhtml) - con.send_message(message_) + self._client.send_message(message_) self.msg_textview.get_buffer().set_text('') self.msg_textview.grab_focus() @@ -1544,8 +1528,8 @@ def _on_message_textview_key_press_event(self, widget, event): else: start_iter.backward_chars(len(begin)) - con = app.connections[self.account] - con.get_module('Chatstate').block_chatstates(self.contact, True) + self._client.get_module('Chatstate').block_chatstates( + self.contact, True) message_buffer.delete(start_iter, end_iter) # get a shell-like completion @@ -1577,8 +1561,8 @@ def _on_message_textview_key_press_event(self, widget, event): completion = self.nick_hits[0] message_buffer.insert_at_cursor(completion + add) - con.get_module('Chatstate').block_chatstates(self.contact, - False) + self._client.get_module('Chatstate').block_chatstates( + self.contact, False) self.last_key_tabs = True return True @@ -1661,15 +1645,13 @@ def append_nick_in_msg_textview(self, _widget, nick): def _on_kick_participant_clicked(self, _button): reason = self.xml.kick_reason_entry.get_text() - con = app.connections[self.account] - con.get_module('MUC').set_role( + self._client.get_module('MUC').set_role( self.room_jid, self._kick_nick, 'none', reason) self._show_page('groupchat') def _on_ban_participant_clicked(self, _button): reason = self.xml.ban_reason_entry.get_text() - con = app.connections[self.account] - con.get_module('MUC').set_affiliation( + self._client.get_module('MUC').set_affiliation( self.room_jid, {self._ban_jid: {'affiliation': 'outcast', 'reason': reason}}) self._show_page('groupchat') @@ -1715,8 +1697,7 @@ def _on_nickname_text_changed(self, entry, _param): def _on_nickname_change_clicked(self, _button): new_nick = self.xml.nickname_entry.get_text() - app.connections[self.account].get_module('MUC').change_nick( - self.room_jid, new_nick) + self._client.get_module('MUC').change_nick(self.room_jid, new_nick) self._show_page('groupchat') def _on_rename_groupchat(self, _action, _param): @@ -1729,7 +1710,7 @@ def _on_rename_groupchat(self, _action, _param): def _on_rename_clicked(self, _button): new_name = self.xml.name_entry.get_text() - app.connections[self.account].get_module('Bookmarks').modify( + self._client.get_module('Bookmarks').modify( self.room_jid, name=new_name) self._show_page('groupchat') @@ -1745,14 +1726,13 @@ def _on_subject_change_clicked(self, _button): subject = buffer_.get_text(buffer_.get_start_iter(), buffer_.get_end_iter(), False) - con = app.connections[self.account] - con.get_module('MUC').set_subject(self.room_jid, subject) + self._client.get_module('MUC').set_subject(self.room_jid, subject) self._show_page('groupchat') def _on_password_set_clicked(self, _button): password = self.xml.password_entry.get_text() self._muc_data.password = password - app.connections[self.account].get_module('MUC').join(self._muc_data) + self._client.get_module('MUC').join(self._muc_data) self._show_page('progress') def _on_password_changed(self, entry, _param): @@ -1799,28 +1779,25 @@ def _on_captcha_changed(self, _widget, is_valid): def _on_captcha_set_clicked(self, _button): form_node = self._captcha_request.get_submit_form() - con = app.connections[self.account] - con.get_module('MUC').send_captcha(self.room_jid, form_node) + self._client.get_module('MUC').send_captcha(self.room_jid, form_node) self._remove_captcha_request() self._show_page('progress') def _on_captcha_cancel_clicked(self, _button=None): - con = app.connections[self.account] - con.get_module('MUC').cancel_captcha(self.room_jid) + self._client.get_module('MUC').cancel_captcha(self.room_jid) self._remove_captcha_request() self._close_control() def _on_captcha_try_again_clicked(self, _button=None): - app.connections[self.account].get_module('MUC').join(self._muc_data) + self._client.get_module('MUC').join(self._muc_data) self._show_page('progress') def _on_remove_bookmark_button_clicked(self, _button=None): - con = app.connections[self.account] - con.get_module('Bookmarks').remove(self.room_jid) + self._client.get_module('Bookmarks').remove(self.room_jid) self._close_control() def _on_retry_join_clicked(self, _button=None): - app.connections[self.account].get_module('MUC').join(self._muc_data) + self._client.get_module('MUC').join(self._muc_data) self._show_page('progress') def _on_page_cancel_clicked(self, _button=None): ===================================== gajim/gtk/contact_info.py ===================================== @@ -171,6 +171,7 @@ def _update_timer(self): times_complete = self._received_times == set(self._devices.keys()) if devices_complete and times_complete or self._time == 10000: self._ui.devices_spinner.stop() + self._update_timeout_id = None return False return True ===================================== gajim/gui_interface.py ===================================== @@ -880,8 +880,7 @@ def _send_httpupload(self, chat_control, path): FileTransferProgress(transfer) con.get_module('HTTPUpload').start_transfer(transfer) - @staticmethod - def _on_http_upload_state_changed(transfer, _signal_name, state): + def _on_http_upload_state_changed(self, transfer, _signal_name, state): if state.is_finished: uri = transfer.get_transformed_uri() @@ -898,8 +897,7 @@ def _on_http_upload_state_changed(transfer, _signal_name, state): client = app.get_client(transfer.account) client.send_message(message) - @staticmethod - def _on_cancel_upload(transfer, _signal_name): + def _on_cancel_upload(self, transfer, _signal_name): client = app.get_client(transfer.account) client.get_module('HTTPUpload').cancel_transfer(transfer) ===================================== gajim/privatechat_control.py ===================================== @@ -24,7 +24,6 @@ # You should have received a copy of the GNU General Public License # along with Gajim. If not, see <http://www.gnu.org/licenses/>. -from gajim.common import app from gajim.common import helpers from gajim.common.i18n import _ @@ -44,8 +43,8 @@ class PrivateChatControl(ChatControl): COMMAND_HOST = PrivateChatCommands def __init__(self, parent_win, jid, account): - client = app.get_client(account) - self._room_contact = client.get_module('Contacts').get_contact(jid.bare) + self._room_contact = self._client.get_module('Contacts').get_contact( + jid.bare) ChatControl.__init__(self, parent_win, jid, account, None) @@ -72,8 +71,8 @@ def room_name(self): return self._room_contact.name def get_our_nick(self): - client = app.get_client(self.account) - muc_data = client.get_module('MUC').get_muc_data(self._room_contact.jid) + muc_data = self._client.get_module('MUC').get_muc_data( + self._room_contact.jid) return muc_data.nick def _on_user_nickname_changed(self, View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/76e458b512422a4d8d53488810ac465… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/76e458b512422a4d8d53488810ac465… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Rework ContactInfo dialog
by Daniel Brötzmann 16 Mar '21

16 Mar '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 76e458b5 by Daniel Brötzmann at 2021-03-16T19:16:11+01:00 Rework ContactInfo dialog - - - - - 9 changed files: - gajim/common/const.py - + gajim/data/gui/contact_info.ui - − gajim/data/gui/edit_groups_dialog.ui - − gajim/data/gui/vcard_information_window.ui - gajim/data/style/gajim.css - gajim/dialogs.py - gajim/groupchat_control.py - gajim/gtk/add_contact.py - gajim/gtk/const.py The diff was not included because it is too large. View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/76e458b512422a4d8d53488810ac465d… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/76e458b512422a4d8d53488810ac465d… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Profile: Add translation hints for menu entries
by Daniel Brötzmann 16 Mar '21

16 Mar '21

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 9df1cbcd by Daniel Brötzmann at 2021-03-16T11:15:35+01:00 Profile: Add translation hints for menu entries - - - - - 6f25997b by Daniel Brötzmann at 2021-03-16T11:17:07+01:00 DOAP: Add XEP-0106 - - - - - 2 changed files: - data/gajim.doap - gajim/gtk/profile.py Changes: ===================================== data/gajim.doap ===================================== @@ -233,6 +233,13 @@ <xmpp:version>1.1</xmpp:version> </xmpp:SupportedXep> </implements> + <implements> + <xmpp:SupportedXep> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0106.html"/> + <xmpp:status>complete</xmpp:status> + <xmpp:version>1.1.1</xmpp:version> + </xmpp:SupportedXep> + </implements> <implements> <xmpp:SupportedXep> <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0107.html"/> ===================================== gajim/gtk/profile.py ===================================== @@ -26,12 +26,12 @@ log = logging.getLogger('gajim.gui.profile') MENU_DICT = { - 'fn': _('Full Name'), + 'fn': Q_('?profile:Full Name'), 'bday': _('Birthday'), - 'gender': _('Gender'), - 'adr': _('Address'), + 'gender': Q_('?profile:Gender'), + 'adr': Q_('?profile:Address'), 'email': _('Email'), - 'impp': 'IM Address', + 'impp': Q_('?profile:IM Address'), 'tel': _('Phone No.'), 'org': Q_('?profile:Organisation'), 'title': Q_('?profile:Title'), View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/a72b39b1ec120945f187c6cd660a84d… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/a72b39b1ec120945f187c6cd660a84d… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] fix rename group
by Philipp Hörist 15 Mar '21

15 Mar '21

Philipp Hörist pushed to branch mainwindow at gajim / gajim Commits: 82c1db1f by lovetox at 2021-03-15T22:49:23+01:00 fix rename group - - - - - 1 changed file: - gajim/common/modules/roster.py Changes: ===================================== gajim/common/modules/roster.py ===================================== @@ -169,9 +169,6 @@ def remove_group(self, group): self.set_groups(item.jid, new_groups) def rename_group(self, group, new_group): - if new_group in self._groups: - return - items = self._get_items_with_group(group) for item in items: new_groups = item.groups - set([group]) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/82c1db1f0a49006f45403c6cb4d23445… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/82c1db1f0a49006f45403c6cb4d23445… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] more group functions
by Philipp Hörist 15 Mar '21

15 Mar '21

Philipp Hörist pushed to branch mainwindow at gajim / gajim Commits: ba15754f by lovetox at 2021-03-15T22:00:41+01:00 more group functions - - - - - 1 changed file: - gajim/common/modules/roster.py Changes: ===================================== gajim/common/modules/roster.py ===================================== @@ -159,6 +159,25 @@ def get_groups(self): self._groups = groups return set(groups) + def _get_items_with_group(self, group): + return filter(lambda item: group in item.groups, self._roster.values()) + + def remove_group(self, group): + items = self._get_items_with_group(group) + for item in items: + new_groups = item.groups - set([group]) + self.set_groups(item.jid, new_groups) + + def rename_group(self, group, new_group): + if new_group in self._groups: + return + + items = self._get_items_with_group(group) + for item in items: + new_groups = item.groups - set([group]) + new_groups.add(new_group) + self.set_groups(item.jid, new_groups) + def change_group(self, jid, old_group, new_group): item = self.get_item(jid) groups = set(item.groups) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/ba15754f2656e50ad3c5bbf5d0b5f0ea… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/ba15754f2656e50ad3c5bbf5d0b5f0ea… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] add get_groups()
by Philipp Hörist 15 Mar '21

15 Mar '21

Philipp Hörist pushed to branch mainwindow at gajim / gajim Commits: 8293075c by lovetox at 2021-03-15T20:37:40+01:00 add get_groups() - - - - - 1 changed file: - gajim/common/modules/roster.py Changes: ===================================== gajim/common/modules/roster.py ===================================== @@ -45,6 +45,9 @@ def __init__(self, con): self._roster = {} + # Groups cache for performance + self._groups = None + def load_roster(self): self._log.info('Load from database') roster = app.storage.cache.load_roster(self._account) @@ -105,6 +108,8 @@ def _on_request_roster(self, task): def _set_roster_from_data(self, items): self._roster.clear() + self._groups = None + for item in items: self._log.info(item) self._con.get_module('Contacts').add_contact(item.jid) @@ -121,6 +126,7 @@ def _process_roster_push(self, _con, _stanza, properties): else: self._roster[item.jid] = item + self._groups = None self._store_roster() self._log.info('New version: %s', properties.roster.version) @@ -143,6 +149,16 @@ def set_groups(self, jid, groups): item = self.get_item(jid) self._nbxmpp('Roster').set_item(jid, item.name, groups) + def get_groups(self): + if self._groups is not None: + return set(self._groups) + + groups = set() + for item in self._roster.values(): + groups.update(item.groups) + self._groups = groups + return set(groups) + def change_group(self, jid, old_group, new_group): item = self.get_item(jid) groups = set(item.groups) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/8293075c2ab4d6dc804797a216b3bbb2… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/8293075c2ab4d6dc804797a216b3bbb2… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] RosterItem: Copy attributes
by Philipp Hörist 13 Mar '21

13 Mar '21

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 73944b1c by lovetox at 2021-03-13T22:06:52+01:00 RosterItem: Copy attributes - - - - - 1 changed file: - nbxmpp/structs.py Changes: ===================================== nbxmpp/structs.py ===================================== @@ -147,7 +147,7 @@ class RosterItem: @classmethod def from_node(cls, node): - attrs = node.getAttrs() + attrs = node.getAttrs(copy=True) jid = attrs.get('jid') if jid is None: raise Exception('jid attribute missing') View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/73944b1c4392fbd06fd946c3… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/73944b1c4392fbd06fd946c3… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Fix GC menu
by Philipp Hörist 13 Mar '21

13 Mar '21

Philipp Hörist pushed to branch mainwindow at gajim / gajim Commits: 8c9a34b8 by lovetox at 2021-03-13T13:34:33+01:00 Fix GC menu - - - - - 2 changed files: - gajim/gtk/groupchat_roster.py - gajim/gui_menu_builder.py Changes: ===================================== gajim/gtk/groupchat_roster.py ===================================== @@ -308,10 +308,8 @@ def _on_roster_button_press_event(self, treeview, event): self.emit('row-activated', nick) def _show_contact_menu(self, nick): - self_contact = app.contacts.get_gc_contact( - self._account, self.room_jid, self._control.nick) - contact = app.contacts.get_gc_contact( - self._account, self.room_jid, nick) + self_contact = self._group_chat_contact.get_resource(self._control.nick) + contact = self._group_chat_contact.get_resource(nick) menu = get_groupchat_roster_menu(self._account, self._control_id, self_contact, ===================================== gajim/gui_menu_builder.py ===================================== @@ -883,15 +883,6 @@ def get_groupchat_roster_menu(account, control_id, self_contact, contact): item.set_detailed_action_name(action) menu.append(item) - item = Gtk.MenuItem(label=_('Invite')) - if contact.jid is not None: - build_invite_submenu(item, - ((contact, account),), - show_bookmarked=True) - else: - item.set_sensitive(False) - menu.append(item) - item = Gtk.MenuItem(label=_('Execute Command…')) action = 'win.execute-command-%s::%s' % (control_id, contact.name) item.set_detailed_action_name(action) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/8c9a34b8200de417463d44292fd7f338… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/8c9a34b8200de417463d44292fd7f338… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Only convert domain name to ASCII
by Philipp Hörist 13 Mar '21

13 Mar '21

Philipp Hörist pushed to branch master at gajim / gajim Commits: a72b39b1 by André Apitzsch at 2021-03-13T08:06:46+01:00 Only convert domain name to ASCII IDNA is about domain name only, so ignore username, password and port. Fixes #10010. - - - - - 1 changed file: - gajim/common/helpers.py Changes: ===================================== gajim/common/helpers.py ===================================== @@ -140,11 +140,11 @@ def puny_encode_url(url): _url = '//' + _url try: o = urllib.parse.urlparse(_url) - p_loc = idn_to_ascii(o.netloc) + p_loc = idn_to_ascii(o.hostname) except Exception: log.debug('urlparse failed: %s', url) return False - return url.replace(o.netloc, p_loc) + return url.replace(o.hostname, p_loc) def parse_resource(resource): """ View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a72b39b1ec120945f187c6cd660a84df… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a72b39b1ec120945f187c6cd660a84df… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] WorkspaceSidebar: Attempt to fix icon position
by Daniel Brötzmann 10 Mar '21

10 Mar '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: d4378658 by wurstsalat at 2021-03-10T23:08:41+01:00 WorkspaceSidebar: Attempt to fix icon position - - - - - 2 changed files: - gajim/data/style/gajim.css - gajim/gtk/workspace_side_bar.py Changes: ===================================== gajim/data/style/gajim.css ===================================== @@ -96,11 +96,16 @@ border-bottom: 1px solid #4e9a06; } .workspace-add { - padding-left: 3px; + padding: 0 0 0 6px; + margin: 6px 12px; +} +.workspace-add image { + margin: 0px; + padding: 0px; color: alpha(@theme_text_color, 0.7); background-color: shade(@theme_base_color, 0.9); } -.workspace-sidebar-item:hover .workspace-add { +.workspace-add:hover image { background-color: shade(@theme_base_color, 0.85); } ===================================== gajim/gtk/workspace_side_bar.py ===================================== @@ -271,12 +271,10 @@ def __init__(self, workspace_id): CommonWorkspace.__init__(self, workspace_id) self.set_selectable(False) self.set_tooltip_text(_('Add Workspace')) + self.get_style_context().add_class('workspace-add') image = Gtk.Image.new_from_icon_name('list-add-symbolic', Gtk.IconSize.DND) - image.set_halign(Gtk.Align.CENTER) - image.set_margin_left(6) - image.get_style_context().add_class('workspace-add') self.add(image) self.show_all() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/d43786581ae82e4ebd65d33e88485ce6… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/d43786581ae82e4ebd65d33e88485ce6… 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