Commits March 2023

commits@gajim.org

1 participants
44 discussions

[Git][gajim/gajim] Pushed new branch mute-chat-notifications
by Daniel Brötzmann (＠wurstsalat) 30 Mar '23

30 Mar '23

Daniel Brötzmann pushed new branch mute-chat-notifications at gajim / gajim -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/tree/mute-chat-notifications You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: GroupChatDetails: Adapt to changed icons
by Daniel Brötzmann (＠wurstsalat) 30 Mar '23

30 Mar '23

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: bf7ed98b by wurstsalat at 2023-03-30T20:44:32+02:00 fix: GroupChatDetails: Adapt to changed icons - - - - - 1 changed file: - gajim/data/gui/groupchat_details.ui Changes: ===================================== gajim/data/gui/groupchat_details.ui ===================================== @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> <requires lib="gtk+" version="3.24"/>  @@ -150,7 +150,7 @@ <packing> <property name="name">manage</property> <property name="title" translatable="yes">Manage</property> - <property name="icon-name">preferences-other-symbolic</property> + <property name="icon-name">document-edit-symbolic</property> <property name="position">2</property> </packing> </child> View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/bf7ed98b863ac594e5e721843cc66d6d… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/bf7ed98b863ac594e5e721843cc66d6d… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: Message input: Fix height for single line messages
by Daniel Brötzmann (＠wurstsalat) 30 Mar '23

30 Mar '23

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: f4f1aa7d by wurstsalat at 2023-03-30T15:02:28+02:00 fix: Message input: Fix height for single line messages - - - - - 1 changed file: - gajim/data/gui/message_actions_box.ui Changes: ===================================== gajim/data/gui/message_actions_box.ui ===================================== @@ -229,6 +229,7 @@ <property name="overlay-scrolling">False</property> <property name="max-content-height">100</property> <property name="propagate-natural-height">True</property> + <property name="hscrollbar-policy">GTK_POLICY_EXTERNAL</property> <child> <placeholder/> </child> View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/f4f1aa7db3d01c3e86711823753c1bae… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/f4f1aa7db3d01c3e86711823753c1bae… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: Update message merged state after deleting a message
by Daniel Brötzmann (＠wurstsalat) 29 Mar '23

29 Mar '23

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 2a1bad9b by wurstsalat at 2023-03-29T23:03:58+02:00 fix: Update message merged state after deleting a message Fixes #11438 - - - - - 1 changed file: - gajim/gtk/conversation/view.py Changes: ===================================== gajim/gtk/conversation/view.py ===================================== @@ -666,8 +666,17 @@ def _reduce_messages_after(self) -> None: def remove_message(self, log_line_id: int) -> None: row = self.get_row_by_log_line_id(log_line_id) - if row is not None: - row.destroy() + if row is None: + return + + index = row.get_index() + row.destroy() + decendant_row = self._list_box.get_row_at_index(index) + if isinstance(decendant_row, MessageRow): + # Unset possible merged state if we delete a 'top level' message. + # Checks for same sender etc. are not necessary, since we simply + # unset merged state. + decendant_row.set_merged(False) def scroll_to_message_and_highlight(self, log_line_id: int) -> None: highlight_row = None View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/2a1bad9b5162ae40fa18913151206b28… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/2a1bad9b5162ae40fa18913151206b28… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] refactor: Use datetime directly for get_uf_relative_time
by Daniel Brötzmann (＠wurstsalat) 29 Mar '23

29 Mar '23

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: b8fc0a13 by wurstsalat at 2023-03-29T21:28:11+02:00 refactor: Use datetime directly for get_uf_relative_time - - - - - 3 changed files: - gajim/common/helpers.py - gajim/gtk/chat_list_row.py - test/common/test_get_uf_relative_time.py Changes: ===================================== gajim/common/helpers.py ===================================== @@ -250,12 +250,11 @@ def get_uf_affiliation(affiliation: Union[Affiliation, str], return '' -def get_uf_relative_time(timestamp: float, - timenow: Optional[float] = None) -> str: - date_time = datetime.fromtimestamp(timestamp) - if timenow: # used by unittest - now = datetime.fromtimestamp(timenow) - else: +def get_uf_relative_time(date_time: datetime, + now: Optional[datetime] = None + ) -> str: + + if now is None: # used by unittest now = datetime.now() timespan = now - date_time ===================================== gajim/gtk/chat_list_row.py ===================================== @@ -18,6 +18,7 @@ from typing import Optional import pickle +from datetime import datetime from urllib.parse import urlparse import cairo @@ -324,7 +325,7 @@ def update_time(self) -> None: if self.timestamp == 0: return self._ui.timestamp_label.set_text( - get_uf_relative_time(self.timestamp)) + get_uf_relative_time(datetime.fromtimestamp(self.timestamp))) def add_unread(self, text: str) -> None: self._unread_count += 1 ===================================== test/common/test_get_uf_relative_time.py ===================================== @@ -19,16 +19,16 @@ def test_sub_1_minute(self): '''Test timedelta less than 1 minute''' timenow = datetime(2023, 1, 2, 3, 4, 0, tzinfo=local_timezone) timestamp1 = timenow - timedelta(seconds=30) - self.assertEqual(get_uf_relative_time(timestamp1.timestamp(), - timenow.timestamp()), + self.assertEqual(get_uf_relative_time(timestamp1, + timenow), _('Just now')) def test_sub_15_minutes(self): '''Test timedelta less than 15 minutes and more than 1 minute ago''' timenow = datetime(2023, 1, 2, 3, 4, 0, tzinfo=local_timezone) timestamp1 = timenow - timedelta(minutes=3) - self.assertEqual(get_uf_relative_time(timestamp1.timestamp(), - timenow.timestamp()), + self.assertEqual(get_uf_relative_time(timestamp1, + timenow), ngettext( '%s min ago', '%s mins ago', @@ -40,8 +40,8 @@ def test_sub_15_minutes_next_day(self): '''Test timedelta less than 15 minutes and it is the next day''' timenow = datetime(2023, 1, 1, 0, 5, 0, tzinfo=local_timezone) timestamp1 = timenow - timedelta(minutes=10) - self.assertEqual(get_uf_relative_time(timestamp1.timestamp(), - timenow.timestamp()), + self.assertEqual(get_uf_relative_time(timestamp1, + timenow), ngettext( '%s min ago', '%s mins ago', @@ -53,24 +53,24 @@ def test_today(self): '''Test today: same day and more than 15 minutes ago''' timenow = datetime(2023, 1, 2, 12, 0, 0, tzinfo=local_timezone) timestamp1 = timenow - timedelta(hours=4) - self.assertEqual(get_uf_relative_time(timestamp1.timestamp(), - timenow.timestamp()), + self.assertEqual(get_uf_relative_time(timestamp1, + timenow), timestamp1.strftime(app.settings.get('time_format'))) def test_yesterday_less_than_24h(self): '''Test yesterday and less than 24h ago''' timenow = datetime(2023, 1, 2, 12, 0, 0, tzinfo=local_timezone) timestamp1 = datetime(2023, 1, 1, 14, 0, 0, tzinfo=local_timezone) - self.assertEqual(get_uf_relative_time(timestamp1.timestamp(), - timenow.timestamp()), + self.assertEqual(get_uf_relative_time(timestamp1, + timenow), _('Yesterday')) def test_yesterday_more_than_24h(self): '''Test yesterday and more than 24h ago''' timenow = datetime(2023, 1, 2, 12, 0, 0, tzinfo=local_timezone) timestamp1 = datetime(2023, 1, 1, 10, 0, 0, tzinfo=local_timezone) - self.assertEqual(get_uf_relative_time(timestamp1.timestamp(), - timenow.timestamp()), + self.assertEqual(get_uf_relative_time(timestamp1, + timenow), _('Yesterday')) def test_weekday(self): @@ -78,24 +78,24 @@ def test_weekday(self): than 7 days ago, should return the weekday, i.e. 'Sun' for Sunday''' timenow = datetime(2023, 1, 5, 1, 2, 3, tzinfo=local_timezone) timestamp1 = datetime(2023, 1, 1, 4, 5, 6, tzinfo=local_timezone) - self.assertEqual(get_uf_relative_time(timestamp1.timestamp(), - timenow.timestamp()), + self.assertEqual(get_uf_relative_time(timestamp1, + timenow), timestamp1.strftime('%a')) def test_month_day(self): '''Test month_day: timestamp more than 7 days ago but less than 365''' timenow = datetime(2023, 1, 5, 1, 2, 3, tzinfo=local_timezone) timestamp1 = datetime(2022, 11, 15, 4, 5, 6, tzinfo=local_timezone) - self.assertEqual(get_uf_relative_time(timestamp1.timestamp(), - timenow.timestamp()), + self.assertEqual(get_uf_relative_time(timestamp1, + timenow), timestamp1.strftime('%b %d')) def test_year(self): '''Test year: timestamp more than 365 days ago''' timenow = datetime(2023, 1, 5, 1, 2, 3, tzinfo=local_timezone) timestamp1 = datetime(2022, 1, 1, 4, 5, 6, tzinfo=local_timezone) - self.assertEqual(get_uf_relative_time(timestamp1.timestamp(), - timenow.timestamp()), '2022') + self.assertEqual(get_uf_relative_time(timestamp1, + timenow), '2022') if __name__ == '__main__': View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/b8fc0a13d1be36853d1f462434fb5019… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/b8fc0a13d1be36853d1f462434fb5019… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] refactor: Use Gdk button constants for click events
by Daniel Brötzmann (＠wurstsalat) 29 Mar '23

29 Mar '23

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 325f10fa by wurstsalat at 2023-03-29T20:53:23+02:00 refactor: Use Gdk button constants for click events - - - - - 8 changed files: - gajim/gtk/component_search.py - gajim/gtk/conversation/rows/widgets.py - gajim/gtk/filetransfer.py - gajim/gtk/groupchat_roster.py - gajim/gtk/notification.py - gajim/gtk/roster.py - gajim/gtk/start_chat.py - gajim/gtk/workspace_side_bar.py Changes: ===================================== gajim/gtk/component_search.py ===================================== @@ -308,7 +308,8 @@ def _on_button_press(self, treeview: Gtk.TreeView, event: Gdk.EventButton ) -> bool: - if event.button != 3: # Right click + + if event.button != Gdk.BUTTON_SECONDARY: return False path = treeview.get_path_at_pos(int(event.x), int(event.y)) ===================================== gajim/gtk/conversation/rows/widgets.py ===================================== @@ -192,9 +192,9 @@ def _on_avatar_clicked(self, if not isinstance(self._contact, GroupchatContact): return Gdk.EVENT_STOP - if event.button == 1: + if event.button == Gdk.BUTTON_PRIMARY: app.window.activate_action('mention', GLib.Variant('s', name)) - elif event.button == 3: + elif event.button == Gdk.BUTTON_SECONDARY: self._show_participant_menu(name, event) return Gdk.EVENT_STOP ===================================== gajim/gtk/filetransfer.py ===================================== @@ -1007,7 +1007,7 @@ def _on_transfers_list_button_press_event(self, widget, event): int(event.y))[0] except TypeError: self._ui.transfers_list.get_selection().unselect_all() - if event.button == 3: # Right click + if event.button == Gdk.BUTTON_SECONDARY: if path: self._ui.transfers_list.get_selection().select_path(path) iter_ = self.model.get_iter(path) ===================================== gajim/gtk/groupchat_roster.py ===================================== @@ -400,7 +400,7 @@ def _on_roster_button_press_event(self, event: Gdk.EventButton ) -> None: - if event.button not in (2, 3): + if event.button == Gdk.BUTTON_PRIMARY: return pos = treeview.get_path_at_pos(int(event.x), int(event.y)) @@ -422,10 +422,10 @@ def _on_roster_button_press_event(self, if self._contact.nickname == nick: return - if event.button == 3: # right click + if event.button == Gdk.BUTTON_SECONDARY: self._show_contact_menu(nick, event) - # if event.button == 2: # middle click + # if event.button == Gdk.BUTTON_MIDDLE: # self.roster.emit('row-activated', nick) def _show_contact_menu(self, nick: str, event: Gdk.EventButton) -> None: ===================================== gajim/gtk/notification.py ===================================== @@ -241,7 +241,7 @@ def _on_button_press(self, _widget: Gtk.Widget, event: Gdk.EventButton ) -> None: - if event.button == 1: + if event.button == Gdk.BUTTON_PRIMARY: jid = '' if self._event.jid is not None: ===================================== gajim/gtk/roster.py ===================================== @@ -344,7 +344,7 @@ def _on_roster_button_press_event(self, treeview: Gtk.TreeView, event: Gdk.EventButton) -> None: - if event.button not in (2, 3): + if event.button == Gdk.BUTTON_PRIMARY: return pos = treeview.get_path_at_pos(int(event.x), int(event.y)) @@ -364,11 +364,11 @@ def _on_roster_button_press_event(self, jid = self._store[iter_][Column.JID_OR_GROUP] - if event.button == 3: # right click + if event.button == Gdk.BUTTON_SECONDARY: self._show_contact_menu(jid, treeview, event) jid = JID.from_string(jid) - if event.button == 2: # middle click + if event.button == Gdk.BUTTON_MIDDLE: app.window.add_chat(self._account, jid, 'contact', select=True) @staticmethod ===================================== gajim/gtk/start_chat.py ===================================== @@ -832,7 +832,7 @@ def _popup_menu(self, if not self.groupchat: return - if event.button != 3: # right click + if event.button != Gdk.BUTTON_SECONDARY: return menu = get_start_chat_row_menu(self.account, self.jid) ===================================== gajim/gtk/workspace_side_bar.py ===================================== @@ -329,7 +329,7 @@ def __init__(self, workspace_id: str) -> None: self.show_all() def _popup_menu(self, _widget: Gtk.Widget, event: Gdk.EventButton) -> None: - if event.button != 3: # right click + if event.button != Gdk.BUTTON_SECONDARY: return menu = get_workspace_menu(self.workspace_id) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/325f10fabde5011ff033261e7f4df60b… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/325f10fabde5011ff033261e7f4df60b… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] imprv: Workspace menu: Always show Mark as read action
by Daniel Brötzmann (＠wurstsalat) 29 Mar '23

29 Mar '23

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 93455cfb by wurstsalat at 2023-03-29T20:41:18+02:00 imprv: Workspace menu: Always show Mark as read action - - - - - 2 changed files: - gajim/gtk/menus.py - gajim/gtk/workspace_side_bar.py Changes: ===================================== gajim/gtk/menus.py ===================================== @@ -778,23 +778,17 @@ def get_format_menu() -> GajimMenu: return GajimMenu.from_list(menuitems) -def get_workspace_menu(workspace_id: str, has_unread: bool) -> GajimMenu: +def get_workspace_menu(workspace_id: str) -> GajimMenu: remove_action = 'win.dummy' if app.settings.get_workspace_count() > 1: remove_action = 'win.remove-workspace' menuitems: MenuItemListT = [ + (_('Mark as read'), 'win.mark-workspace-as-read', workspace_id), (_('Edit…'), 'win.edit-workspace', workspace_id), (_('Remove'), remove_action, workspace_id), ] - if has_unread: - menuitems.insert( - 0, - (_('Mark as read'), - 'win.mark-workspace-as-read', - workspace_id)) - return GajimMenu.from_list(menuitems) ===================================== gajim/gtk/workspace_side_bar.py ===================================== @@ -332,8 +332,7 @@ def _popup_menu(self, _widget: Gtk.Widget, event: Gdk.EventButton) -> None: if event.button != 3: # right click return - menu = get_workspace_menu( - self.workspace_id, self._unread_label.get_visible()) + menu = get_workspace_menu(self.workspace_id) popover = GajimPopover(menu, relative_to=self, event=event) popover.popup() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/93455cfbe8732c3a45b9ee3df20160a4… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/93455cfbe8732c3a45b9ee3df20160a4… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][omemo_integration] fix: Fix flatpak manifest
by Philipp Hörist (＠lovetox) 29 Mar '23

29 Mar '23

Philipp Hörist pushed to branch omemo_integration at gajim / gajim Commits: 71b52195 by Philipp Hörist at 2023-03-29T17:42:41+02:00 fix: Fix flatpak manifest - - - - - 2 changed files: - flatpak/org.gajim.Gajim.Devel.yaml - flatpak/org.gajim.Gajim.yaml Changes: ===================================== flatpak/org.gajim.Gajim.Devel.yaml ===================================== @@ -329,16 +329,7 @@ modules: url: https://dev.gajim.org/gajim/python-nbxmpp.git # OMEMO dependencies - - name: omemo-dr - buildsystem: simple - build-commands: - - pip3 install . - sources: - - type: archive - url: https://files.pythonhosted.org/packages/source/o/omemo-dr/omemo-dr-0.99.0.t… - sha256: 79f9b166b350b3baced2bb0a998a3f8a3cf8756b5b5714d08c5cee5c90e62a8e - - - name: protobuf + - name: python3-protobuf buildsystem: simple build-commands: - pip3 install --no-deps protobuf-4.21.1-py3-none-any.whl @@ -347,6 +338,15 @@ modules: url: https://files.pythonhosted.org/packages/py3/p/protobuf/protobuf-4.21.1-py3-… sha256: 79cd8d0a269b714f6b32641f86928c718e8d234466919b3f552bfb069dbb159b + - name: python3-omemo-dr + buildsystem: simple + build-commands: + - pip3 install . + sources: + - type: archive + url: https://files.pythonhosted.org/packages/source/o/omemo-dr/omemo-dr-0.99.0.t… + sha256: 79f9b166b350b3baced2bb0a998a3f8a3cf8756b5b5714d08c5cee5c90e62a8e + - name: python3-qrcode buildsystem: simple build-commands: ===================================== flatpak/org.gajim.Gajim.yaml ===================================== @@ -323,16 +323,7 @@ modules: sha256: afaf513a90adf99444df32008c1c35cc861ff6bd3e586200f9210a991d13b5b1 # OMEMO dependencies - - name: omemo-dr - buildsystem: simple - build-commands: - - pip3 install . - sources: - - type: archive - url: https://files.pythonhosted.org/packages/source/o/omemo-dr/omemo-dr-0.99.0.t… - sha256: 79f9b166b350b3baced2bb0a998a3f8a3cf8756b5b5714d08c5cee5c90e62a8e - - - name: protobuf + - name: python3-protobuf buildsystem: simple build-commands: - pip3 install --no-deps protobuf-4.21.1-py3-none-any.whl @@ -341,6 +332,15 @@ modules: url: https://files.pythonhosted.org/packages/py3/p/protobuf/protobuf-4.21.1-py3-… sha256: 79cd8d0a269b714f6b32641f86928c718e8d234466919b3f552bfb069dbb159b + - name: python3-omemo-dr + buildsystem: simple + build-commands: + - pip3 install . + sources: + - type: archive + url: https://files.pythonhosted.org/packages/source/o/omemo-dr/omemo-dr-0.99.0.t… + sha256: 79f9b166b350b3baced2bb0a998a3f8a3cf8756b5b5714d08c5cee5c90e62a8e + - name: python3-qrcode buildsystem: simple build-commands: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/71b52195eb64bc9a8523a4624192cd02… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/71b52195eb64bc9a8523a4624192cd02… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][omemo_integration] 2 commits: cfix: Use new wiki page
by Daniel Brötzmann (＠wurstsalat) 29 Mar '23

29 Mar '23

Daniel Brötzmann pushed to branch omemo_integration at gajim / gajim Commits: ff89b64b by wurstsalat at 2023-03-29T10:16:13+02:00 cfix: Use new wiki page - - - - - 078e3553 by wurstsalat at 2023-03-29T10:21:22+02:00 cfix: Fire encryption_state extension point only for plugins - - - - - 2 changed files: - gajim/gtk/accounts.py - gajim/gtk/message_actions_box.py Changes: ===================================== gajim/gtk/accounts.py ===================================== @@ -943,8 +943,7 @@ def __init__(self, account: str) -> None: btbv_label = Gtk.Label() btbv_label.set_xalign(0) markup = '<a href="%s">%s</a>' % ( - 'https://dev.gajim.org/gajim/gajim-plugins/-/' - 'wikis/omemogajimplugin', + 'https://dev.gajim.org/gajim/gajim/-/wikis/help/OMEMO', _('Read more about blind trust')) btbv_label.set_markup(markup) self.add(btbv_label) ===================================== gajim/gtk/message_actions_box.py ===================================== @@ -336,20 +336,21 @@ def _update_encryption_button(self) -> None: def _update_encryption_details_button(self) -> None: contact = self.get_current_contact() - state = contact.settings.get('encryption') + encryption = contact.settings.get('encryption') - encryption_state = {'visible': bool(state), - 'enc_type': state, + encryption_state = {'visible': bool(encryption), + 'enc_type': encryption, 'authenticated': False} - if state: - app.plugin_manager.extension_point( - f'encryption_state{state}', - app.window.get_control(), - encryption_state) - - if state == 'OMEMO': - encryption_state['authenticated'] = True + if encryption: + if encryption == 'OMEMO': + encryption_state['authenticated'] = True + else: + # Only fire extension_point for plugins (i.e. not OMEMO) + app.plugin_manager.extension_point( + f'encryption_state{encryption}', + app.window.get_control(), + encryption_state) visible, enc_type, authenticated = encryption_state.values() assert isinstance(visible, bool) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/8564473de0e3bd451f1fd4cdd8c42f8… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/8564473de0e3bd451f1fd4cdd8c42f8… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][omemo_integration] new: Replace python-axolotl with omemo-dr
by Philipp Hörist (＠lovetox) 28 Mar '23

28 Mar '23

Philipp Hörist pushed to branch omemo_integration at gajim / gajim Commits: 8564473d by Philipp Hörist at 2023-03-28T20:42:56+02:00 new: Replace python-axolotl with omemo-dr - - - - - 6 changed files: - README.md - flatpak/org.gajim.Gajim.Devel.yaml - flatpak/org.gajim.Gajim.yaml - pyproject.toml - win/_base.sh - win/dev_env.sh Changes: ===================================== README.md ===================================== @@ -21,7 +21,7 @@ ### Runtime Requirements - [GtkSourceView](https://gitlab.gnome.org/GNOME/gtksourceview) - [Pango](https://gitlab.gnome.org/GNOME/pango) (>=1.50.0) - [sqlite](https://www.sqlite.org/) (>=3.33.0) -- [axolotl](https://pypi.org/project/python-axolotl/) (>=0.2.3) +- [omemo-dr](https://dev.gajim.org/gajim/omemo-dr) (>=1.0.0) - [qrcode](https://pypi.org/project/qrcode/) (>=7.3.1) ### Optional Runtime Requirements ===================================== flatpak/org.gajim.Gajim.Devel.yaml ===================================== @@ -329,32 +329,23 @@ modules: url: https://dev.gajim.org/gajim/python-nbxmpp.git # OMEMO dependencies - - name: protobuf - buildsystem: simple - build-commands: - - pip3 install --no-deps protobuf-4.21.1-py3-none-any.whl - sources: - - type: file - url: https://files.pythonhosted.org/packages/py3/p/protobuf/protobuf-4.21.1-py3-… - sha256: 79cd8d0a269b714f6b32641f86928c718e8d234466919b3f552bfb069dbb159b - - - name: python3-axolotl-curve25519 + - name: omemo-dr buildsystem: simple build-commands: - pip3 install . sources: - type: archive - url: https://files.pythonhosted.org/packages/source/p/python-axolotl-curve25519/… - sha256: 0705a66297ebd2f508a60dc94e22881c754301eb81db93963322f6b3bdcb63a3 + url: https://files.pythonhosted.org/packages/source/o/omemo-dr/omemo-dr-0.99.0.t… + sha256: 79f9b166b350b3baced2bb0a998a3f8a3cf8756b5b5714d08c5cee5c90e62a8e - - name: python3-axolotl + - name: protobuf buildsystem: simple build-commands: - - pip3 install --no-deps python_axolotl-0.2.3-py3-none-any.whl + - pip3 install --no-deps protobuf-4.21.1-py3-none-any.whl sources: - type: file - url: https://files.pythonhosted.org/packages/0f/b3/4a0b0e664435691bba36fac6e366c… - sha256: 6a22acbf646c3b736ea1a4663ab5c52687fce6612e92ae6a7fe63803c212fb9e + url: https://files.pythonhosted.org/packages/py3/p/protobuf/protobuf-4.21.1-py3-… + sha256: 79cd8d0a269b714f6b32641f86928c718e8d234466919b3f552bfb069dbb159b - name: python3-qrcode buildsystem: simple ===================================== flatpak/org.gajim.Gajim.yaml ===================================== @@ -323,32 +323,23 @@ modules: sha256: afaf513a90adf99444df32008c1c35cc861ff6bd3e586200f9210a991d13b5b1 # OMEMO dependencies - - name: protobuf - buildsystem: simple - build-commands: - - pip3 install --no-deps protobuf-4.21.1-py3-none-any.whl - sources: - - type: file - url: https://files.pythonhosted.org/packages/py3/p/protobuf/protobuf-4.21.1-py3-… - sha256: 79cd8d0a269b714f6b32641f86928c718e8d234466919b3f552bfb069dbb159b - - - name: python3-axolotl-curve25519 + - name: omemo-dr buildsystem: simple build-commands: - pip3 install . sources: - type: archive - url: https://files.pythonhosted.org/packages/source/p/python-axolotl-curve25519/… - sha256: 0705a66297ebd2f508a60dc94e22881c754301eb81db93963322f6b3bdcb63a3 + url: https://files.pythonhosted.org/packages/source/o/omemo-dr/omemo-dr-0.99.0.t… + sha256: 79f9b166b350b3baced2bb0a998a3f8a3cf8756b5b5714d08c5cee5c90e62a8e - - name: python3-axolotl + - name: protobuf buildsystem: simple build-commands: - - pip3 install --no-deps python_axolotl-0.2.3-py3-none-any.whl + - pip3 install --no-deps protobuf-4.21.1-py3-none-any.whl sources: - type: file - url: https://files.pythonhosted.org/packages/0f/b3/4a0b0e664435691bba36fac6e366c… - sha256: 6a22acbf646c3b736ea1a4663ab5c52687fce6612e92ae6a7fe63803c212fb9e + url: https://files.pythonhosted.org/packages/py3/p/protobuf/protobuf-4.21.1-py3-… + sha256: 79cd8d0a269b714f6b32641f86928c718e8d234466919b3f552bfb069dbb159b - name: python3-qrcode buildsystem: simple ===================================== pyproject.toml ===================================== @@ -35,7 +35,7 @@ dependencies = [ "pycairo>=1.16.0", "PyGObject>=3.42.0", "qrcode>=7.3.1", - "python-axolotl>=0.2.3" + "omemo-dr>=0.99.0,<2.0.0", ] dynamic = ["version"] ===================================== win/_base.sh ===================================== @@ -108,9 +108,9 @@ function install_deps { PIP_REQUIREMENTS="\ git+https://dev.gajim.org/gajim/python-nbxmpp.git +git+https://dev.gajim.org/gajim/omemo-dr.git keyring python-gnupg -python-axolotl qrcode css_parser sentry-sdk ===================================== win/dev_env.sh ===================================== @@ -26,11 +26,12 @@ function main { PIP_REQUIREMENTS="\ git+https://dev.gajim.org/gajim/python-nbxmpp.git -python-axolotl -python-gnupg +git+https://dev.gajim.org/gajim/omemo-dr.git keyring -css_parser +python-gnupg qrcode +css_parser +sentry-sdk " pip3 install precis-i18n pip3 install $(echo "$PIP_REQUIREMENTS" | tr ["\\n"] [" "]) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/8564473de0e3bd451f1fd4cdd8c42f8c… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/8564473de0e3bd451f1fd4cdd8c42f8c… You're receiving this email because of your account on dev.gajim.org.

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits March 2023