Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][mainwindow] PreviewManager: Rename get_previewable
by Daniel Brötzmann (＠wurstsalat) 17 Nov '21

17 Nov '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 683b131c by wurstsalat at 2021-11-17T21:42:43+01:00 PreviewManager: Rename get_previewable - - - - - 4 changed files: - gajim/common/preview.py - gajim/gtk/chat_list.py - gajim/gtk/controls/base.py - gajim/gtk/conversation/rows/message.py Changes: ===================================== gajim/common/preview.py ===================================== @@ -217,9 +217,9 @@ def _accept_uri(urlparts: ParseResult, log.info('Unsupported URI scheme: %s', uri) return False - def get_previewable(self, - text: str, - additional_data: AdditionalDataDict) -> bool: + def is_previewable(self, + text: str, + additional_data: AdditionalDataDict) -> bool: if len(text.split(' ')) > 1: # urlparse doesn't recognise spaces as URL delimiter log.debug('Text is not an uri: %s...', text[:15]) @@ -328,7 +328,7 @@ def _on_thumb_load_finished(data: Optional[bytes], return preview.update_widget(data=pixbuf) - def download_content(self, + def download_content(self, preview: Preview, force: bool = False) -> None: if preview.account is None: @@ -344,7 +344,7 @@ def download_content(self, session = self._get_session(preview.account) session.queue_message(message, self._on_finished, preview) - def _check_certificate(self, + def _check_certificate(self, message: Soup.Message, preview: Preview) -> None: _https_used, _tls_certificate, tls_errors = message.get_https_status() @@ -359,7 +359,7 @@ def _check_certificate(self, session.cancel_message(message, Soup.Status.CANCELLED) return - def _on_content_sniffed(self, + def _on_content_sniffed(self, message: Soup.Message, type_: str, _params: GLib.HashTable, ===================================== gajim/gtk/chat_list.py ===================================== @@ -715,7 +715,7 @@ def set_message_text(self, text: str, icon_name: Optional[str] = None, if icon_name is not None: icon = Gio.Icon.new_for_string(icon_name) if additional_data is not None: - if app.interface.preview_manager.get_previewable( + if app.interface.preview_manager.is_previewable( text, additional_data): file_name = filename_from_uri(text) icon, file_type = guess_simple_file_type(text) ===================================== gajim/gtk/controls/base.py ===================================== @@ -1176,7 +1176,7 @@ def _notify(self, name: str, text: str, tim: Optional[int], title = _('New message from %s') % name - is_previewable = app.interface.preview_manager.get_previewable( + is_previewable = app.interface.preview_manager.is_previewable( text, additional_data) if is_previewable: if text.startswith('geo:'): ===================================== gajim/gtk/conversation/rows/message.py ===================================== @@ -86,7 +86,7 @@ def __init__(self, if additional_data.get_value('retracted', 'by') is not None: self.get_style_context().add_class('retracted-message') - is_previewable = app.interface.preview_manager.get_previewable( + is_previewable = app.interface.preview_manager.is_previewable( text, additional_data) if is_previewable: context = None View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/683b131c4145f992d0c366019b46807c… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/683b131c4145f992d0c366019b46807c… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Notifications: Display file type and file name
by Daniel Brötzmann (＠wurstsalat) 16 Nov '21

16 Nov '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: a0f78d3b by wurstsalat at 2021-11-16T16:22:35+01:00 Notifications: Display file type and file name - - - - - 1 changed file: - gajim/gtk/controls/base.py Changes: ===================================== gajim/gtk/controls/base.py ===================================== @@ -23,6 +23,8 @@ # You should have received a copy of the GNU General Public License # along with Gajim. If not, see <http://www.gnu.org/licenses/>. +from typing import Optional + import os import sys import time @@ -46,6 +48,8 @@ from gajim.common.helpers import AdditionalDataDict from gajim.common.helpers import get_retraction_text from gajim.common.const import KindConstant +from gajim.common.preview_helpers import filename_from_uri +from gajim.common.preview_helpers import guess_simple_file_type from gajim.common.structs import OutgoingMessage from gajim.gui.conversation.view import ConversationView @@ -1156,7 +1160,7 @@ def add_message(self, # Issue notification if notify: - self._notify(name, text, tim) + self._notify(name, text, tim, additional_data) # Send chat marker if we’re actively following the chat chat_active = app.window.is_chat_active( @@ -1164,13 +1168,24 @@ def add_message(self, if chat_active and self._scrolled_view.get_autoscroll(): app.window.mark_as_read(self.account, self.contact.jid) - def _notify(self, name, text, tim): + def _notify(self, name: str, text: str, tim: Optional[int], + additional_data: AdditionalDataDict) -> None: if app.window.is_chat_active(self.account, self.contact.jid): if self._scrolled_view.get_autoscroll(): return title = _('New message from %s') % name + is_previewable = app.interface.preview_manager.get_previewable( + text, additional_data) + if is_previewable: + if text.startswith('geo:'): + text = _('Location') + else: + file_name = filename_from_uri(text) + _icon, file_type = guess_simple_file_type(text) + text = f'{file_type} ({file_name})' + if self.is_chat: msg_type = 'chat-message' sound = 'first_message_received' View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a0f78d3b3f36b81884b3f5ddef06ebdf… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a0f78d3b3f36b81884b3f5ddef06ebdf… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] 2 commits: ChatList: Don’t fail on missing stanza_id
by Daniel Brötzmann (＠wurstsalat) 16 Nov '21

16 Nov '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 71d723fa by wurstsalat at 2021-11-16T14:45:02+01:00 ChatList: Don’t fail on missing stanza_id - - - - - 5db81cd7 by wurstsalat at 2021-11-16T15:03:44+01:00 WorkspaceSidebar: Set Scrolled background to transparent - - - - - 3 changed files: - gajim/data/gui/main.ui - gajim/data/style/gajim.css - gajim/gtk/chat_list.py Changes: ===================================== gajim/data/gui/main.ui ===================================== @@ -59,6 +59,7 @@ </child> <style> <class name="no-border"/> + <class name="workspace-scrolled"/> </style> </object> <packing> ===================================== gajim/data/style/gajim.css ===================================== @@ -198,6 +198,9 @@ .app-message-listbox row { } /* Workspace sidebar */ +.workspace-scrolled { + background: transparent; +} .workspace-sidebar { background: transparent; margin-right: 6px; ===================================== gajim/gtk/chat_list.py ===================================== @@ -343,7 +343,10 @@ def _on_message_received(self, event): row.set_stanza_id(event.stanza_id) else: row.set_timestamp(event.properties.timestamp) - row.set_stanza_id(event.properties.stanza_id.id) + stanza_id = None + if event.properties.stanza_id: + stanza_id = event.properties.stanza_id.id + row.set_stanza_id(stanza_id) row.set_message_text( event.msgtxt, additional_data=event.additional_data) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/a6ce8b05e2ab5b58a568b53d8aee5c4… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/a6ce8b05e2ab5b58a568b53d8aee5c4… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Account: Make Login setting accessible
by Daniel Brötzmann (＠wurstsalat) 14 Nov '21

14 Nov '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: a6ce8b05 by wurstsalat at 2021-11-14T20:59:48+01:00 Account: Make Login setting accessible Sensitive text is not clickable, which leads to confusion - - - - - 2 changed files: - gajim/gtk/accounts.py - gajim/gtk/settings.py Changes: ===================================== gajim/gtk/accounts.py ===================================== @@ -641,7 +641,10 @@ def __init__(self, account): SettingType.ACCOUNT_CONFIG, 'account_color', desc=_('Recognize your account by color')), - Setting(SettingKind.LOGIN, _('Login'), SettingType.DIALOG, + Setting(SettingKind.LOGIN, + _('Login'), + SettingType.DIALOG, + desc=_('Change your account’s password, etc.'), bind='account::anonymous_auth', inverted=True, props={'dialog': LoginDialog}), ===================================== gajim/gtk/settings.py ===================================== @@ -587,7 +587,6 @@ def on_row_activated(self): class LoginSetting(DialogSetting): def __init__(self, *args, **kwargs): DialogSetting.__init__(self, *args, **kwargs) - self.setting_value.set_selectable(True) def get_setting_value(self): jid = app.get_jid_from_account(self.account) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a6ce8b05e2ab5b58a568b53d8aee5c4c… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a6ce8b05e2ab5b58a568b53d8aee5c4c… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] App menu: Remove show-offline/show-active
by Daniel Brötzmann (＠wurstsalat) 14 Nov '21

14 Nov '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 2e4b34de by wurstsalat at 2021-11-14T20:14:07+01:00 App menu: Remove show-offline/show-active - - - - - 2 changed files: - gajim/application.py - gajim/data/gui/application_menu.ui Changes: ===================================== gajim/application.py ===================================== @@ -498,8 +498,6 @@ def _set_shortcuts(self): 'app.ipython': ['<Primary><Alt>I'], 'app.start-chat::': ['<Primary>N'], 'app.create-groupchat::': ['<Primary>G'], - 'win.show-offline': ['<Primary>O'], - 'win.show-active': ['<Primary>Y'], 'win.change-nickname': ['<Primary><Shift>N'], 'win.change-subject': ['<Primary><Shift>S'], 'win.escape': ['Escape'], ===================================== gajim/data/gui/application_menu.ui ===================================== @@ -37,16 +37,6 @@ </submenu> <submenu> <attribute name="label" translatable="yes">_View</attribute> - <section> - <item> - <attribute name="label" translatable="yes">Show _Offline Contacts</attribute> - <attribute name="action">win.show-offline</attribute> - </item> - <item> - <attribute name="label" translatable="yes">Show _Active Contacts</attribute> - <attribute name="action">win.show-active</attribute> - </item> - </section> <section> <item> <attribute name="label" translatable="yes">_XML Console</attribute> View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/2e4b34dea611104b0bfd390a7480e7e1… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/2e4b34dea611104b0bfd390a7480e7e1… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] StartChat: Remove history when forgetting group chat
by Daniel Brötzmann (＠wurstsalat) 14 Nov '21

14 Nov '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 1e47ee1b by wurstsalat at 2021-11-14T18:37:39+01:00 StartChat: Remove history when forgetting group chat - - - - - 2 changed files: - gajim/app_actions.py - gajim/common/storage/archive.py Changes: ===================================== gajim/app_actions.py ===================================== @@ -28,6 +28,7 @@ from gajim.gui.about import AboutDialog from gajim.gui.discovery import ServiceDiscoveryWindow from gajim.gui.util import open_window +from gajim.gui.util import get_app_window # General Actions @@ -266,10 +267,16 @@ def start_chat(_action, param): def forget_groupchat(_action, param): account, jid = param.unpack() + room_jid = JID.from_string(jid) + window = get_app_window('StartChatDialog') + window.remove_row(account, str(room_jid)) + client = app.get_client(account) - client.get_module('Bookmarks').remove(JID.from_string(jid)) - window = open_window('StartChatDialog') - window.remove_row(account, jid) + client.get_module('MUC').leave(room_jid) + client.get_module('Bookmarks').remove(room_jid) + + app.storage.archive.remove_chat_history( + account, str(room_jid), groupchat=True) def on_groupchat_join(_action, param): account, jid = param.get_strv() ===================================== gajim/common/storage/archive.py ===================================== @@ -1192,6 +1192,27 @@ def reset_archive_infos(self, jid): log.info('Reset message archive info: %s', jid) self._delayed_commit() + def remove_chat_history(self, account: str, jid: str, + groupchat: bool = False) -> None: + """ + Remove chat history for a specific chat. + If it's a group chat, remove last MAM ID as well. + """ + account_id = self.get_account_id(account) + jid_id = self.get_jid_id(jid) + sql = 'DELETE FROM logs WHERE account_id = ? AND jid_id = ?' + self._con.execute(sql, (account_id, jid_id)) + + sql = 'DELETE FROM jids WHERE jid_id = ?' + self._con.execute(sql, (jid_id,)) + + if groupchat: + sql = 'DELETE FROM last_archive_message WHERE jid_id = ?' + self._con.execute(sql, (jid_id,)) + + self._delayed_commit() + log.info('Removed chat history for: %s', jid) + def _cleanup_chat_history(self): """ Remove messages from account where messages are older than max_age View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/1e47ee1b7485bce2e3970111c5d69f67… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/1e47ee1b7485bce2e3970111c5d69f67… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] StartChat: Add 'Forget this Group Chat' menu action
by Daniel Brötzmann (＠wurstsalat) 14 Nov '21

14 Nov '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 4e168244 by wurstsalat at 2021-11-14T13:40:49+01:00 StartChat: Add 'Forget this Group Chat' menu action - - - - - 4 changed files: - gajim/app_actions.py - gajim/application.py - gajim/gtk/start_chat.py - gajim/gui_menu_builder.py Changes: ===================================== gajim/app_actions.py ===================================== @@ -17,6 +17,8 @@ from gi.repository import Gtk from gi.repository import Gdk +from nbxmpp import JID + from gajim.common import app from gajim.common import helpers from gajim.common.app import interface @@ -262,6 +264,12 @@ def start_chat(_action, param): account, jid = param.get_strv() app.interface.start_chat_from_jid(account, jid) +def forget_groupchat(_action, param): + account, jid = param.unpack() + client = app.get_client(account) + client.get_module('Bookmarks').remove(JID.from_string(jid)) + window = open_window('StartChatDialog') + window.remove_row(account, jid) def on_groupchat_join(_action, param): account, jid = param.get_strv() ===================================== gajim/application.py ===================================== @@ -398,6 +398,7 @@ def add_actions(self): ('open-link', 'as', app_actions.open_link), ('open-mail', 's', app_actions.open_mail), ('create-groupchat', 's', app_actions.on_create_gc), + ('forget-groupchat', 'as', app_actions.forget_groupchat), ('groupchat-join', 'as', app_actions.on_groupchat_join), ] ===================================== gajim/gtk/start_chat.py ===================================== @@ -35,6 +35,8 @@ from gajim.common.const import MUC_DISCO_ERRORS from gajim.common.modules.util import as_task +from gajim.gui_menu_builder import get_start_chat_row_menu + from .chat_filter import ChatFilter from .groupchat_info import GroupChatInfoScrolled from .groupchat_nick import NickChooser @@ -126,6 +128,12 @@ def __init__(self): def set_search_text(self, text): self._ui.search_entry.set_text(text) + def remove_row(self, account: str, jid: str) -> None: + for row in self._ui.listbox.get_children(): + if row.account == account and row.jid == jid: + row.destroy() + return + def _global_search_active(self): return self._ui.global_search_toggle.get_active() @@ -747,9 +755,32 @@ def __init__(self, account, contact, jid, name, show_account, grid.add(box) - self.add(grid) + eventbox = Gtk.EventBox() + eventbox.connect('button-press-event', self._popup_menu) + eventbox.add(grid) + self.add(eventbox) self.show_all() + def _popup_menu(self, _widget, event): + if not self.groupchat: + return + + if event.button != 3: # right click + return + + menu = get_start_chat_row_menu(self.account, self.jid) + + rectangle = Gdk.Rectangle() + rectangle.x = event.x + rectangle.y = event.y + rectangle.width = rectangle.height = 1 + + popover = Gtk.Popover.new_from_model(self, menu) + popover.set_relative_to(self) + popover.set_position(Gtk.PositionType.RIGHT) + popover.set_pointing_to(rectangle) + popover.popup() + def _get_avatar_image(self, contact): if self.new: icon_name = 'avatar-default' ===================================== gajim/gui_menu_builder.py ===================================== @@ -485,6 +485,22 @@ def get_subscription_menu(account: str, jid: str) -> Gio.Menu: return menu +def get_start_chat_row_menu(account: str, jid: Union[JID, str]) -> Gio.Menu: + jid = str(jid) + menu_items: List[Tuple[str, str]] = [ + ('forget-groupchat', _('Forget this Group Chat')), + ] + menu = Gio.Menu() + for item in menu_items: + action, label = item + action = f'app.{action}' + menuitem = Gio.MenuItem.new(label, action) + variant_list = GLib.Variant('as', [account, jid]) + menuitem.set_action_and_target_value(action, variant_list) + menu.append_item(menuitem) + return menu + + def get_chat_list_row_menu(workspace_id: str, account: str, jid: Union[JID, str], pinned: bool) -> Gio.Menu: jid = str(jid) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/4e168244b4e02b1f96727f8950e2c958… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/4e168244b4e02b1f96727f8950e2c958… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] StatusSelector: Determine show correctly for account
by Daniel Brötzmann (＠wurstsalat) 14 Nov '21

14 Nov '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 48b229b9 by wurstsalat at 2021-11-14T01:49:53+01:00 StatusSelector: Determine show correctly for account - - - - - 1 changed file: - gajim/gtk/status_selector.py Changes: ===================================== gajim/gtk/status_selector.py ===================================== @@ -18,6 +18,7 @@ from gajim.common import app from gajim.common import ged from gajim.common.const import AvatarSize +from gajim.common.helpers import get_connection_status from gajim.common.helpers import get_uf_show from gajim.common.helpers import get_global_show from gajim.common.helpers import statuses_unified @@ -101,16 +102,12 @@ def _on_change_status(self, button): self._status_popover.popdown() new_status = button.get_name() app.interface.change_status(status=new_status, account=self._account) - self.update() def update(self, *args, **kwargs): if self._account is None: show = get_global_show() else: - if self._account not in app.connections: - return - client = app.get_client(self._account) - show = client.status + show = get_connection_status(self._account) surface = get_show_circle( show, AvatarSize.SHOW_CIRCLE, self.get_scale_factor()) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/48b229b991b0a81db265b7c136bcdbf8… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/48b229b991b0a81db265b7c136bcdbf8… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] 3 commits: ChatList: Set stanza_id correctly when receiving MAM messages
by Daniel Brötzmann (＠wurstsalat) 13 Nov '21

13 Nov '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 12bc0c21 by wurstsalat at 2021-11-13T20:59:05+01:00 ChatList: Set stanza_id correctly when receiving MAM messages - - - - - 256dd758 by wurstsalat at 2021-11-14T00:03:15+01:00 Don't fail if active workspace is None - - - - - 1d8eb84b by wurstsalat at 2021-11-14T00:06:14+01:00 Notifications: Suppress for MAM messages - - - - - 5 changed files: - gajim/gtk/chat_list.py - gajim/gtk/controls/base.py - gajim/gtk/controls/chat.py - gajim/gtk/controls/groupchat.py - gajim/gtk/main.py Changes: ===================================== gajim/gtk/chat_list.py ===================================== @@ -340,11 +340,13 @@ def _on_message_received(self, event): row.set_nick(nick) if event.name == 'mam-message-received': row.set_timestamp(event.properties.mam.timestamp) + row.set_stanza_id(event.stanza_id) else: row.set_timestamp(event.properties.timestamp) + row.set_stanza_id(event.properties.stanza_id.id) row.set_message_text( event.msgtxt, additional_data=event.additional_data) - row.set_stanza_id(event.properties.stanza_id.id) + self._add_unread(row, event.properties) self.invalidate_sort() ===================================== gajim/gtk/controls/base.py ===================================== @@ -1111,6 +1111,7 @@ def add_message(self, kind, name, tim, + notify, displaymarking=None, msg_log_id=None, message_id=None, @@ -1154,7 +1155,8 @@ def add_message(self, self.save_message(text, 'received') # Issue notification - self._notify(name, text, tim) + if notify: + self._notify(name, text, tim) # Send chat marker if we’re actively following the chat chat_active = app.window.is_chat_active( ===================================== gajim/gtk/controls/chat.py ===================================== @@ -415,7 +415,8 @@ def _on_mam_message_received(self, event): correct_id=event.correct_id, message_id=event.properties.id, stanza_id=event.stanza_id, - additional_data=event.additional_data) + additional_data=event.additional_data, + notify=False) def _on_message_received(self, event): if not event.msgtxt: @@ -605,7 +606,8 @@ def add_message(self, stanza_id=None, correct_id=None, message_id=None, - additional_data=None): + additional_data=None, + notify=True): if additional_data is None: additional_data = AdditionalDataDict() @@ -620,6 +622,7 @@ def add_message(self, kind, name, tim, + notify, displaymarking=displaymarking, msg_log_id=msg_log_id, message_id=message_id, ===================================== gajim/gtk/controls/groupchat.py ===================================== @@ -674,7 +674,8 @@ def _on_mam_message_received(self, event): correct_id=event.correct_id, message_id=event.properties.id, stanza_id=event.stanza_id, - additional_data=event.additional_data) + additional_data=event.additional_data, + notify=False) def _on_gc_message_received(self, event): if event.properties.muc_nickname is None: @@ -710,7 +711,8 @@ def add_message(self, correct_id=None, message_id=None, stanza_id=None, - additional_data=None): + additional_data=None, + notify=True): if contact == self.contact.nickname: kind = 'outgoing' @@ -729,6 +731,7 @@ def add_message(self, kind, contact, tim, + notify, displaymarking=displaymarking, correct_id=correct_id, message_id=message_id, ===================================== gajim/gtk/main.py ===================================== @@ -1,3 +1,5 @@ +from typing import Optional + import logging import os @@ -16,6 +18,7 @@ from .adhoc import AdHocCommand from .account_side_bar import AccountSideBar from .app_side_bar import AppSideBar +from .workspace_side_bar import Workspace from .workspace_side_bar import WorkspaceSideBar from .main_stack import MainStack from .dialogs import DialogButton @@ -323,7 +326,7 @@ def show_account_page(self, account): self._account_side_bar.activate_account_page(account) self._main_stack.show_account(account) - def get_active_workspace(self): + def get_active_workspace(self) -> Optional[Workspace]: return self._workspace_side_bar.get_active_workspace() def is_chat_active(self, account, jid): @@ -390,6 +393,8 @@ def _add_group_chat(self, _action, param): def add_group_chat(self, account, jid, select=False): workspace_id = self.get_active_workspace() + if workspace_id is None: + workspace_id = self._workspace_side_bar.get_first_workspace() self._chat_page.add_chat_for_workspace(workspace_id, account, jid, @@ -411,6 +416,8 @@ def add_chat(self, account, jid, type_, select=False): def add_private_chat(self, account, jid, select=False): workspace_id = self.get_active_workspace() + if workspace_id is None: + workspace_id = self._workspace_side_bar.get_first_workspace() self._chat_page.add_chat_for_workspace(workspace_id, account, jid, View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/8660c9b6da254b26dc0bf88ad7b1c16… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/8660c9b6da254b26dc0bf88ad7b1c16… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Search: Fix missing stanza_id while adding messages
by Daniel Brötzmann (＠wurstsalat) 11 Nov '21

11 Nov '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 8660c9b6 by wurstsalat at 2021-11-11T22:42:32+01:00 Search: Fix missing stanza_id while adding messages - - - - - 1 changed file: - gajim/common/storage/archive.py Changes: ===================================== gajim/common/storage/archive.py ===================================== @@ -462,7 +462,7 @@ def get_conversation_around(self, account, jid, timestamp): sql_before = ''' SELECT contact_name, time, kind, show, message, subject, - additional_data, log_line_id, message_id, + additional_data, log_line_id, message_id, stanza_id, error as "error [common_error]", marker as "marker [marker]" FROM logs NATURAL JOIN jids WHERE jid IN ({jids}) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/8660c9b6da254b26dc0bf88ad7b1c160… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/8660c9b6da254b26dc0bf88ad7b1c160… 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