Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][mainwindow] 2 commits: Fix destroying MUCs
by Philipp Hörist (＠lovetox) 22 Jul '21

22 Jul '21

Philipp Hörist pushed to branch mainwindow at gajim / gajim Commits: a32bd7c8 by lovetox at 2021-07-22T17:45:45+02:00 Fix destroying MUCs - - - - - dc32941b by lovetox at 2021-07-22T19:57:38+02:00 Fix closing the control - - - - - 2 changed files: - gajim/common/modules/muc.py - gajim/gtk/controls/groupchat.py Changes: ===================================== gajim/common/modules/muc.py ===================================== @@ -485,6 +485,7 @@ def _on_muc_user_presence(self, _con, stanza, properties): self._log.info('MUC destroyed: %s', room_jid) self._remove_join_timeout(room_jid) self._set_muc_state(room_jid, MUCJoinedState.NOT_JOINED) + self._con.get_module('Bookmarks').remove(room_jid) room.set_not_joined() room.notify('room-destroyed', properties) return ===================================== gajim/gtk/controls/groupchat.py ===================================== @@ -128,9 +128,6 @@ def __init__(self, account, jid): # if True, the room has mentioned us self.attention_flag = False - # True if we initiated room destruction - self._wait_for_destruction = False - # sorted list of nicks who mentioned us (last at the end) self.attention_list = [] self.nick_hits = [] @@ -490,7 +487,6 @@ def _on_destroy_alternate_changed(self, entry, _param): 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 self._client.get_module('MUC').destroy(self.room_jid, reason, jid) self._show_page('groupchat') @@ -1173,11 +1169,6 @@ def _on_room_destroyed(self, _contact, _signal_name, properties): 'instead: xmpp:%s?join') % str(alternate) self.add_info_message(join_message) - self._client.get_module('Bookmarks').remove(self.room_jid) - - if self._wait_for_destruction: - self._close_control() - def _on_message_sent(self, event): if not event.message: return @@ -1296,8 +1287,10 @@ def on_cancel(is_checked): on_yes(self) - def _close_control(self, reason=None): - self.shutdown(reason) + def _close_control(self): + app.window.activate_action( + 'remove-chat', + GLib.Variant('as', [self.account, str(self.room_jid)])) def set_control_active(self, state): self.attention_flag = False @@ -1673,9 +1666,7 @@ def _on_page_close_clicked(self, _button=None): self._close_control() def _on_groupchat_state_abort_clicked(self, _button): - app.window.activate_action( - 'remove-chat', - GLib.Variant('as', [self.account, str(self.room_jid)])) + self._close_control() def _on_groupchat_state_join_clicked(self, _groupchat_state): self._client.get_module('MUC').join(self.room_jid) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/01779713ea762ae71374c1e6fbd6cbc… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/01779713ea762ae71374c1e6fbd6cbc… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Fix groupchat creation
by Philipp Hörist (＠lovetox) 22 Jul '21

22 Jul '21

Philipp Hörist pushed to branch mainwindow at gajim / gajim Commits: 01779713 by lovetox at 2021-07-22T08:42:43+02:00 Fix groupchat creation - - - - - 3 changed files: - gajim/common/modules/muc.py - gajim/gtk/groupchat_creation.py - gajim/gui_interface.py Changes: ===================================== gajim/common/modules/muc.py ===================================== @@ -231,13 +231,15 @@ def join(self, jid, nick=None, password=None, config=None): else: self._join(muc_data) - def create(self, muc_data): + def create(self, jid, config): if not app.account_is_available(self._account): return - self._mucs[muc_data.jid] = muc_data + self._con.get_module('Contacts').add_contact(jid, groupchat=True) + muc_data = self._create_muc_data(jid, None, None, config) + self._mucs[jid] = muc_data self._create(muc_data) - self._push_muc_added_event(muc_data.jid) + self._push_muc_added_event(jid) def _push_muc_added_event(self, jid): app.nec.push_incoming_event( ===================================== gajim/gtk/groupchat_creation.py ===================================== @@ -234,7 +234,7 @@ def _create_muc(self, room_jid): app.interface.create_groupchat( self._account, str(room_jid), - config=config) + config) self.destroy() ===================================== gajim/gui_interface.py ===================================== @@ -1257,50 +1257,14 @@ def show_groupchat(self, account, room_jid): return True return False - def create_groupchat_control(self, account, room_jid, muc_data, - minimize=False): - avatar_sha = app.storage.cache.get_avatar_sha(room_jid) - contact = app.contacts.create_contact(jid=room_jid, - account=account, - groups=[_('Group chats')], - sub='none', - avatar_sha=avatar_sha, - groupchat=True) - app.contacts.add_contact(account, contact) - - if minimize: - control = GroupchatControl(None, contact, muc_data, account) - app.interface.minimized_controls[account][room_jid] = control - self.roster.add_groupchat(room_jid, account) - - else: - mw = self.msg_win_mgr.get_window(room_jid, account) - if not mw: - mw = self.msg_win_mgr.create_window(contact, - account, - ControlType.GROUPCHAT) - control = GroupchatControl(mw, contact, muc_data, account) - mw.new_tab(control) - mw.set_active_tab(control) - - @staticmethod - def _create_muc_data(account, room_jid, nick, password, config): - if not nick: - nick = get_group_chat_nick(account, room_jid) + def create_groupchat(self, account, room_jid, config): + if app.window.chat_exists(account, room_jid): + log.error('Trying to create groupchat ' + 'which is already added as chat') + return - # Fetch data from bookmarks client = app.get_client(account) - bookmark = client.get_module('Bookmarks').get_bookmark(room_jid) - if bookmark is not None: - if bookmark.password is not None: - password = bookmark.password - - return MUCData(room_jid, nick, password, config) - - def create_groupchat(self, account, room_jid, config=None): - muc_data = self._create_muc_data(account, room_jid, None, None, config) - self.create_groupchat_control(account, room_jid, muc_data) - app.connections[account].get_module('MUC').create(muc_data) + client.get_module('MUC').create(room_jid, config) def show_add_join_groupchat(self, account, jid, nickname=None): if not app.window.chat_exists(account, jid): View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/01779713ea762ae71374c1e6fbd6cbc6… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/01779713ea762ae71374c1e6fbd6cbc6… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Fix declined MUC invitations
by Daniel Brötzmann (＠wurstsalat) 21 Jul '21

21 Jul '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 2654afdf by wurstsalat at 2021-07-21T23:05:26+02:00 Fix declined MUC invitations - - - - - 2 changed files: - gajim/gtk/notification_manager.py - gajim/gui_interface.py Changes: ===================================== gajim/gtk/notification_manager.py ===================================== @@ -335,7 +335,7 @@ def __init__(self, account, event): NotificationRow.__init__(self, account, event.muc) self.type = 'invitation-declined' - image = self._generate_avatar_image(event.from_) + image = self._generate_avatar_image(event.from_.bare) self.grid.attach(image, 1, 1, 1, 2) title_label = self._generate_label() ===================================== gajim/gui_interface.py ===================================== @@ -372,20 +372,6 @@ def handle_event_msgnotsent(obj): obj.session.roster_message(obj.jid, msg, obj.time_, obj.conn.name, msg_type='error') - def handle_event_gc_decline(self, event): - # TODO: Adapt to new mainwindow - gc_control = self.msg_win_mgr.get_gc_control(str(event.muc), - event.account) - if gc_control: - if event.reason: - gc_control.add_info_message( - _('%(jid)s declined the invitation: %(reason)s') % { - 'jid': event.from_, 'reason': event.reason}) - else: - gc_control.add_info_message( - _('%(jid)s declined the invitation') % { - 'jid': event.from_}) - def handle_event_gc_invitation(self, event): event = events.GcInvitationtEvent(event) @@ -1072,7 +1058,6 @@ def create_core_handlers_list(self): 'file-request-error': [self.handle_event_file_request_error], 'file-request-received': [self.handle_event_file_request], 'muc-invitation': [self.handle_event_gc_invitation], - 'muc-decline': [self.handle_event_gc_decline], 'http-auth-received': [self.handle_event_http_auth], 'information': [self.handle_event_information], 'iq-error-received': [self.handle_event_iq_error], View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/2654afdfd8162eac3508bed90a6e6384… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/2654afdfd8162eac3508bed90a6e6384… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] InvivationReceivedRow: Fix getting avatar
by Daniel Brötzmann (＠wurstsalat) 21 Jul '21

21 Jul '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 456adf4f by wurstsalat at 2021-07-21T22:58:15+02:00 InvivationReceivedRow: Fix getting avatar - - - - - 1 changed file: - gajim/gtk/notification_manager.py Changes: ===================================== gajim/gtk/notification_manager.py ===================================== @@ -285,7 +285,7 @@ def __init__(self, account, event): self._event = event - image = self._generate_avatar_image(event.from_) + image = self._generate_avatar_image(event.from_.bare) self.grid.attach(image, 1, 1, 1, 2) title_label = self._generate_label() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/456adf4f42b3050c7071a565bd06ea63… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/456adf4f42b3050c7071a565bd06ea63… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] NotificationListbox: Improve style
by Daniel Brötzmann (＠wurstsalat) 20 Jul '21

20 Jul '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: e57c46b6 by wurstsalat at 2021-07-20T20:44:11+02:00 NotificationListbox: Improve style - - - - - 1 changed file: - gajim/data/style/gajim.css Changes: ===================================== gajim/data/style/gajim.css ===================================== @@ -289,7 +289,8 @@ .notification-listbox { background: transparent; } .notification-listbox row { - padding: 6px; + padding: 12px; + border: 1px solid @borders; } /*Middle Grid*/ View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e57c46b6f0f3162f7b6f5ab235ac5cbd… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e57c46b6f0f3162f7b6f5ab235ac5cbd… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Groupchat Invitation: Add info message correctly
by Daniel Brötzmann (＠wurstsalat) 20 Jul '21

20 Jul '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: bbd99aaf by wurstsalat at 2021-07-20T20:10:32+02:00 Groupchat Invitation: Add info message correctly - - - - - 1 changed file: - gajim/gtk/controls/groupchat.py Changes: ===================================== gajim/gtk/controls/groupchat.py ===================================== @@ -460,11 +460,9 @@ def _on_invite_clicked(self, _button): self._show_page('groupchat') def invite(self, contact_jid): - message_id = self._client.get_module('MUC').invite( - self.room_jid, contact_jid) + 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) + _('%s has been invited to this group chat') % contact_jid) def _on_destroy_room(self, _action, _param): self.xml.destroy_reason_entry.grab_focus() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/bbd99aaf38f65f322833c86e3f1c9f67… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/bbd99aaf38f65f322833c86e3f1c9f67… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Group Chat: Fixes for direct messages
by Daniel Brötzmann (＠wurstsalat) 19 Jul '21

19 Jul '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: f6d8a6d7 by wurstsalat at 2021-07-19T23:01:48+02:00 Group Chat: Fixes for direct messages - - - - - 5 changed files: - gajim/gtk/controls/groupchat.py - gajim/gtk/controls/private.py - gajim/gtk/groupchat_roster.py - gajim/gtk/tooltips.py - gajim/gui_menu_builder.py Changes: ===================================== gajim/gtk/controls/groupchat.py ===================================== @@ -609,13 +609,14 @@ def show_roster(self): def _on_roster_row_activated(self, _roster, nick): muc_prefer_direct_msg = app.settings.get('muc_prefer_direct_msg') if not self.is_anonymous and muc_prefer_direct_msg: + participant = self.contact.get_resource(nick) app.window.add_chat(self.account, - self.contact.jid, + participant.real_jid.bare, 'contact', select=True) else: contact = self.contact.get_resource(nick) - app.window.add_private_chat(self.account, contact.jid) + app.window.add_private_chat(self.account, contact.jid, select=True) def _on_avatar_update(self, _contact, _signal_name): self._update_avatar() ===================================== gajim/gtk/controls/private.py ===================================== @@ -24,6 +24,7 @@ # 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 _ @@ -43,6 +44,7 @@ class PrivateChatControl(ChatControl): COMMAND_HOST = PrivateChatCommands def __init__(self, account, jid): + self._client = app.get_client(account) self._room_contact = self._client.get_module('Contacts').get_contact( jid.bare) ===================================== gajim/gtk/groupchat_roster.py ===================================== @@ -279,7 +279,7 @@ def _on_roster_row_activated(self, _treeview, path, _column): # This is a group row return nick = self._store[iter_][Column.NICK_OR_GROUP] - if self._control.nick == nick: + if self._control.contact.nickname == nick: return self.emit('row-activated', nick) @@ -301,10 +301,10 @@ def _on_roster_button_press_event(self, treeview, event): if self._group_chat_contact.nickname == nick: return - if event.button == 3: # right click + if event.button == 3: # right click self._show_contact_menu(nick) - if event.button == 2: # middle click + if event.button == 2: # middle click self.emit('row-activated', nick) def _show_contact_menu(self, nick): ===================================== gajim/gtk/tooltips.py ===================================== @@ -100,7 +100,7 @@ def _populate_grid(self, contact): # JID if contact.real_jid is not None: - self._ui.jid.set_text(str(contact.jid)) + self._ui.jid.set_text(str(contact.real_jid.bare)) self._ui.jid.show() # Affiliation ===================================== gajim/gui_menu_builder.py ===================================== @@ -918,8 +918,8 @@ def get_groupchat_roster_menu(account, control_id, self_contact, contact): item = Gtk.MenuItem(label=_('Add to Contact List…')) action = 'app.{account}-add-contact(["{account}", "{jid}"])'.format( - account=account, jid=contact.jid or '') - if contact.jid is None: + account=account, jid=contact.real_jid or '') + if contact.real_jid is None: item.set_sensitive(False) else: item.set_detailed_action_name(action) @@ -941,7 +941,7 @@ def get_groupchat_roster_menu(account, control_id, self_contact, contact): menu.append(item) item = Gtk.MenuItem(label=_('Ban')) - action = 'win.ban-%s::%s' % (control_id, contact.jid or '') + action = 'win.ban-%s::%s' % (control_id, contact.real_jid or '') if is_affiliation_change_allowed(self_contact, contact, 'outcast'): item.set_detailed_action_name(action) else: @@ -952,7 +952,7 @@ def get_groupchat_roster_menu(account, control_id, self_contact, contact): item = Gtk.MenuItem(label=_('Make Owner')) action = 'win.change-affiliation-%s(["%s", "owner"])' % (control_id, - contact.jid) + contact.real_jid) if is_affiliation_change_allowed(self_contact, contact, 'owner'): item.set_detailed_action_name(action) else: @@ -961,7 +961,7 @@ def get_groupchat_roster_menu(account, control_id, self_contact, contact): item = Gtk.MenuItem(label=_('Make Admin')) action = 'win.change-affiliation-%s(["%s", "admin"])' % (control_id, - contact.jid) + contact.real_jid) if is_affiliation_change_allowed(self_contact, contact, 'admin'): item.set_detailed_action_name(action) else: @@ -970,7 +970,7 @@ def get_groupchat_roster_menu(account, control_id, self_contact, contact): item = Gtk.MenuItem(label=_('Make Member')) action = 'win.change-affiliation-%s(["%s", "member"])' % (control_id, - contact.jid) + contact.real_jid) if is_affiliation_change_allowed(self_contact, contact, 'member'): item.set_detailed_action_name(action) else: @@ -979,7 +979,7 @@ def get_groupchat_roster_menu(account, control_id, self_contact, contact): item = Gtk.MenuItem(label=_('Revoke Member')) action = 'win.change-affiliation-%s(["%s", "none"])' % (control_id, - contact.jid) + contact.real_jid) if is_affiliation_change_allowed(self_contact, contact, 'none'): item.set_detailed_action_name(action) else: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/f6d8a6d76558793d3ab62fdd0a3674ba… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/f6d8a6d76558793d3ab62fdd0a3674ba… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Discover real jid correctly
by Philipp Hörist (＠lovetox) 19 Jul '21

19 Jul '21

Philipp Hörist pushed to branch mainwindow at gajim / gajim Commits: 22bcf73b by lovetox at 2021-07-19T22:09:57+02:00 Discover real jid correctly - - - - - 1 changed file: - gajim/common/structs.py Changes: ===================================== gajim/common/structs.py ===================================== @@ -214,7 +214,7 @@ def from_presence(cls, properties): available=properties.type.is_available, affiliation=properties.muc_user.affiliation, role=properties.muc_user.role, - real_jid=properties.jid) + real_jid=properties.muc_user.jid) UNKNOWN_MUC_PRESENCE = MUCPresenceData(show=PresenceShowExt.OFFLINE, View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/22bcf73be4d5816716a339102d48a5c0… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/22bcf73be4d5816716a339102d48a5c0… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Append group chat name in PM conversation
by Daniel Brötzmann (＠wurstsalat) 19 Jul '21

19 Jul '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 0767454c by wurstsalat at 2021-07-19T21:13:46+02:00 Append group chat name in PM conversation - - - - - 2 changed files: - gajim/gtk/chat_list.py - gajim/gtk/controls/chat.py Changes: ===================================== gajim/gtk/chat_list.py ===================================== @@ -416,9 +416,10 @@ def update_avatar(self): def update_name(self): if self.type == 'pm': client = app.get_client(self.account) - muc_name = get_groupchat_name(client, self.jid) + muc_name = get_groupchat_name(client, self.jid.bare) self._ui.name_label.set_text(f'{self.contact.name} ({muc_name})') return + own_jid = self._client.get_own_jid().bare if self.jid == own_jid: self._ui.name_label.set_text(_('Note to myself')) ===================================== gajim/gtk/controls/chat.py ===================================== @@ -860,40 +860,35 @@ def update_ui(self): def draw_banner_text(self): """ - Draw the text in the fat line at the top of the window that houses the - name, jid + Draws the chat banner's text (e.g. name, chat state) in the top of the + chat window """ contact = self.contact name = contact.name - # if self.resource: - # name += '/' + self.resource - # if self._type.is_privatechat: - # name = i18n.direction_mark + _( - # '%(nickname)s from group chat %(room_name)s') % \ - # {'nickname': name, 'room_name': self.room_name} - # name = i18n.direction_mark + GLib.markup_escape_text(name) + if self._type.is_privatechat: + name = f'{name} ({self.room_name})' - cs = self.contact.chatstate - if cs is not None: - cs = cs.value + chatstate = self.contact.chatstate + if chatstate is not None: + chatstate = chatstate.value if app.settings.get('show_chatstate_in_banner'): - chatstate = helpers.get_uf_chatstate(cs) + chatstate = helpers.get_uf_chatstate(chatstate) - label_text = '%s %s' % \ - (name, chatstate) - label_tooltip = '%s %s' % (name, chatstate) + label_text = f'{name}' \ + f'' \ + f'{chatstate}' + label_tooltip = f'{name} {chatstate}' else: - label_text = '%s' % name + label_text = f'{name}' label_tooltip = name status_text = '' self.xml.banner_label.hide() self.xml.banner_label.set_no_show_all(True) - self.xml.banner_label.set_markup(status_text) - # setup the label that holds name and jid + self.xml.banner_name_label.set_markup(label_text) self.xml.banner_name_label.set_tooltip_text(label_tooltip) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/0767454c015f1c44f3293deb89c25289… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/0767454c015f1c44f3293deb89c25289… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] SearchView: Improve behavior when unselecting chat
by Daniel Brötzmann (＠wurstsalat) 18 Jul '21

18 Jul '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: b5682727 by wurstsalat at 2021-07-18T16:30:28+02:00 SearchView: Improve behavior when unselecting chat - - - - - 2 changed files: - gajim/gtk/chat_page.py - gajim/gtk/search_view.py Changes: ===================================== gajim/gtk/chat_page.py ===================================== @@ -132,6 +132,7 @@ def _on_chat_selected(self, _chat_list_stack, workspace_id, account, jid): def _on_chat_unselected(self, _chat_list_stack): self._chat_stack.clear() + self._search_view.set_context(None, None) def _on_search_history(self, _action, _param): control = self.get_active_control() ===================================== gajim/gtk/search_view.py ===================================== @@ -179,7 +179,7 @@ def set_focus(self): def set_context(self, account, jid): self._account = account self._jid = jid - self._ui.search_checkbutton.set_active(False) + self._ui.search_checkbutton.set_active(jid is None) class RowHeader(Gtk.Box): View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/b56827279886abb5c0e540dab9716e62… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/b56827279886abb5c0e540dab9716e62… 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