Commits June 2020

commits@gajim.org

1 participants
55 discussions

[Git][gajim/python-nbxmpp][master] 1.0.0
by Philipp Hörist 18 Jun '20

18 Jun '20

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 78b96254 by lovetox at 2020-06-18T21:09:03+02:00 1.0.0 - - - - - 2 changed files: - nbxmpp/__init__.py - setup.cfg Changes: ===================================== nbxmpp/__init__.py ===================================== @@ -4,4 +4,4 @@ from .protocol import * gi.require_version('Soup', '2.4') -__version__ = "0.9.95" +__version__ = "1.0.0" ===================================== setup.cfg ===================================== @@ -1,6 +1,6 @@ [metadata] name = nbxmpp -version = 0.9.95 +version = 1.0.0 description = XMPP Library author = Yann Leboulanger, Philipp Hoerist author_email = gajim-devel(a)gajim.org View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/78b962547435212089b8cf01… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/78b962547435212089b8cf01… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Disable client cert support until nbxmpp support is back
by Philipp Hörist 18 Jun '20

18 Jun '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 791acd56 by lovetox at 2020-06-18T20:36:18+02:00 Disable client cert support until nbxmpp support is back - - - - - 3f38952e by lovetox at 2020-06-18T20:36:18+02:00 Disable zeroconf support until its working again - - - - - 2 changed files: - gajim/gtk/accounts.py - gajim/gui_interface.py Changes: ===================================== gajim/gtk/accounts.py ===================================== @@ -61,6 +61,9 @@ class AccountsWindow(Gtk.ApplicationWindow): self.add(box) for account in app.get_accounts_sorted(): + if account == 'Local': + # Disable zeroconf support until its working again + continue self.add_account(account, initial=True) self._menu.connect('menu-activated', self._on_menu_activated) @@ -615,8 +618,10 @@ class GeneralPage(GenericSettingPage): SettingType.ACTION, '-import-contacts', props={'account': account}), - Setting(SettingKind.DIALOG, _('Client Certificate'), - SettingType.DIALOG, props={'dialog': CertificateDialog}), + # Currently not supported by nbxmpp + # + # Setting(SettingKind.DIALOG, _('Client Certificate'), + # SettingType.DIALOG, props={'dialog': CertificateDialog}), Setting(SettingKind.SWITCH, _('Connect on startup'), SettingType.ACCOUNT_CONFIG, 'autoconnect'), ===================================== gajim/gui_interface.py ===================================== @@ -1969,10 +1969,10 @@ class Interface: self.register_core_handlers() self.create_zeroconf_default_config() - if app.config.get_per('accounts', app.ZEROCONF_ACC_NAME, 'active') \ - and app.is_installed('ZEROCONF'): - app.connections[app.ZEROCONF_ACC_NAME] = \ - connection_zeroconf.ConnectionZeroconf(app.ZEROCONF_ACC_NAME) + # if app.config.get_per('accounts', app.ZEROCONF_ACC_NAME, 'active') \ + # and app.is_installed('ZEROCONF'): + # app.connections[app.ZEROCONF_ACC_NAME] = \ + # connection_zeroconf.ConnectionZeroconf(app.ZEROCONF_ACC_NAME) for account in app.config.get_per('accounts'): if not app.config.get_per('accounts', account, 'is_zeroconf') and\ View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/6881d68e7cc6a4e677eb7637b734b39… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/6881d68e7cc6a4e677eb7637b734b39… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 3 commits: StartChat: Add infobar
by Philipp Hörist 18 Jun '20

18 Jun '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: a21c05f9 by Daniel Brötzmann at 2020-06-17T21:38:28+02:00 StartChat: Add infobar - - - - - 9355aed9 by Daniel Brötzmann at 2020-06-17T21:48:53+02:00 Preferences: Add reset button for hints - - - - - 6881d68e by Daniel Brötzmann at 2020-06-17T21:49:00+02:00 InfoBar: Add CSS styling for different types - - - - - 7 changed files: - gajim/common/config.py - gajim/data/gui/preferences_window.ui - gajim/data/gui/start_chat_dialog.ui - gajim/data/style/gajim-dark.css - gajim/data/style/gajim.css - gajim/gtk/preferences.py - gajim/gtk/start_chat.py Changes: ===================================== gajim/common/config.py ===================================== @@ -249,6 +249,7 @@ class Config: 'command_system_execute': [opt_bool, False, _('If enabled, Gajim will execute commands (/show, /sh, /execute, /exec).')], 'groupchat_roster_width': [opt_int, 210, _('Width of group chat roster in pixel')], 'dev_force_bookmark_2': [opt_bool, False, _('Force Bookmark 2 usage')], + 'show_help_start_chat': [opt_bool, True, _('Shows an info bar with helpful hints in the Start / Join Chat dialog')], }, {}) # type: Tuple[Dict[str, List[Any]], Dict[Any, Any]] __options_per_key = { ===================================== gajim/data/gui/preferences_window.ui ===================================== @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> <requires lib="gtk+" version="3.22"/> <object class="GtkAdjustment" id="adjustment_status_auto_away"> @@ -2529,7 +2529,6 @@ to discover one from the server. (Example: stun.iptel.org)</property> <property name="use_underline">True</property> <property name="justify">right</property> <property name="mnemonic_widget">proxies_combobox</property> - <property name="angle">0.01</property> <style> <class name="dim-label"/> </style> @@ -2652,6 +2651,23 @@ to discover one from the server. (Example: stun.iptel.org)</property> <property name="position">2</property> </packing> </child> + <child> + <object class="GtkButton" id="reset_help"> + <property name="label" translatable="yes">_Reset Hints</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="tooltip_text" translatable="yes">In order to introduce you to features, Gajim displays some hints. This button will reset all these hints.</property> + <property name="halign">start</property> + <property name="use_underline">True</property> + <signal name="clicked" handler="_on_reset_help_clicked" swapped="no"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">3</property> + </packing> + </child> </object> </child> <child type="label"> ===================================== gajim/data/gui/start_chat_dialog.ui ===================================== @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> - <requires lib="gtk+" version="3.20"/> + <requires lib="gtk+" version="3.22"/> <object class="GtkListStore" id="account_store"> <columns>  @@ -17,55 +17,68 @@ <property name="can_focus">False</property> <signal name="notify::visible-child-name" handler="_on_page_changed" swapped="no"/> <child> - <object class="GtkBox" id="box"> + <object class="GtkBox"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="border_width">18</property> <property name="orientation">vertical</property> - <property name="spacing">6</property> <child> - <object class="GtkBox"> + <object class="GtkInfoBar" id="infobar"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="spacing">6</property> - <child> - <object class="GtkSearchEntry" id="search_entry"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="has_focus">True</property> - <property name="is_focus">True</property> - <property name="hexpand">True</property> - <property name="primary_icon_name">edit-find-symbolic</property> - <property name="primary_icon_activatable">False</property> - <property name="primary_icon_sensitive">False</property> + <property name="homogeneous">True</property> + <property name="show_close_button">True</property> + <signal name="response" handler="_on_infobar_response" swapped="no"/> + <child internal-child="action_area"> + <object class="GtkButtonBox"> + <property name="can_focus">False</property> + <property name="layout_style">end</property> + <child> + <placeholder/> + </child> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> + <property name="fill">False</property> <property name="position">0</property> </packing> </child> - <child> - <object class="GtkToggleButton" id="global_search_toggle"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="tooltip_text" translatable="yes">Global Group Chat Search</property> - <property name="halign">end</property> - <property name="relief">half</property> - <signal name="toggled" handler="_on_global_search_toggle" swapped="no"/> + <child internal-child="content_area"> + <object class="GtkBox"> + <property name="can_focus">False</property> + <property name="spacing">6</property> <child> <object class="GtkImage"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="icon_name">feather-globe-symbolic</property> + <property name="icon_name">dialog-information-symbolic</property> + <property name="icon_size">3</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Start a new chat, join a group chat or search for new group chats globally. You can also enter an XMPP address.</property> + <property name="wrap">True</property> + <property name="max_width_chars">46</property> + <property name="xalign">0</property> </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> </child> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> + <property name="fill">False</property> + <property name="position">0</property> </packing> </child> </object> @@ -76,25 +89,91 @@ </packing> </child> <child> - <object class="GtkScrolledWindow" id="scrolledwindow"> + <object class="GtkBox" id="box"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hscrollbar_policy">never</property> - <property name="shadow_type">in</property> + <property name="can_focus">False</property> + <property name="border_width">18</property> + <property name="orientation">vertical</property> + <property name="spacing">6</property> <child> - <object class="GtkViewport"> + <object class="GtkBox"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="spacing">6</property> + <child> + <object class="GtkSearchEntry" id="search_entry"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="has_focus">True</property> + <property name="is_focus">True</property> + <property name="hexpand">True</property> + <property name="primary_icon_name">edit-find-symbolic</property> + <property name="primary_icon_activatable">False</property> + <property name="primary_icon_sensitive">False</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkToggleButton" id="global_search_toggle"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="tooltip_text" translatable="yes">Global Group Chat Search</property> + <property name="halign">end</property> + <property name="relief">half</property> + <signal name="toggled" handler="_on_global_search_toggle" swapped="no"/> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="icon_name">feather-globe-symbolic</property> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkScrolledWindow" id="scrolledwindow"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hscrollbar_policy">never</property> + <property name="shadow_type">in</property> <child> - <object class="GtkListBox" id="listbox"> - <property name="name">StartChatListBox</property> + <object class="GtkViewport"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="selection_mode">browse</property> - <property name="activate_on_single_click">False</property> + <child> + <object class="GtkListBox" id="listbox"> + <property name="name">StartChatListBox</property> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="selection_mode">browse</property> + <property name="activate_on_single_click">False</property> + </object> + </child> </object> </child> </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> </child> </object> <packing> ===================================== gajim/data/style/gajim-dark.css ===================================== @@ -1 +1,19 @@ /* Gajim Dark Application CSS File */ + +/* InfoBar */ +infobar.info > revealer > box { + color: #D9EDF7; + background-color: #3A87AD; +} +infobar.question > revealer > box { + color: #D9EDF7; + background-color: #295A72; +} +infobar.warning > revealer > box { + color: #FCF8E3; + background-color: #D2822B; +} +infobar.error > revealer > box { + color: #FCE5D5; + background-color: #D64937; +} ===================================== gajim/data/style/gajim.css ===================================== @@ -101,6 +101,24 @@ list.settings > row > box { margin: 6px 18px; } +/* InfoBar */ +infobar.info > revealer > box { + color: #3A87AD; + background-color: #D9EDF7; +} +infobar.question > revealer > box { + color: #295A72; + background-color: #AFDAF0; +} +infobar.warning > revealer > box { + color: #D06821; + background-color: #FFEBC0; +} +infobar.error > revealer > box { + color: #B94A48; + background-color: #F2DEDE; +} + /*SendFileDialog*/ #SendFileDialog grid list > row { padding: 10px 20px 10px 10px; } ===================================== gajim/gtk/preferences.py ===================================== @@ -1059,5 +1059,13 @@ class Preferences(Gtk.ApplicationWindow): def _on_debug_folder_clicked(self, _widget): open_file(configpaths.get('DEBUG')) + def _on_reset_help_clicked(self, widget): + widget.set_sensitive(False) + helping_hints = [ + 'start_chat', + ] + for hint in helping_hints: + app.config.set('show_help_%s' % hint, True) + def on_open_advanced_editor_button_clicked(self, _widget): open_window('AdvancedConfig') ===================================== gajim/gtk/start_chat.py ===================================== @@ -52,7 +52,7 @@ class StartChatDialog(Gtk.ApplicationWindow): self.set_application(app.app) self.set_position(Gtk.WindowPosition.CENTER) self.set_show_menubar(False) - self.set_title(_('Start New Conversation')) + self.set_title(_('Start / Join Chat')) self.set_default_size(-1, 400) self.ready_to_destroy = False self._parameter_form = None @@ -96,6 +96,8 @@ class StartChatDialog(Gtk.ApplicationWindow): self._muc_info_box = GroupChatInfoScrolled() self._ui.info_box.add(self._muc_info_box) + self._ui.infobar.set_revealed(app.config.get('show_help_start_chat')) + self.connect('key-press-event', self._on_key_press) self.connect('destroy', self._destroy) @@ -259,6 +261,11 @@ class StartChatDialog(Gtk.ApplicationWindow): self._ui.search_entry.grab_focus_without_selecting() return Gdk.EVENT_PROPAGATE + def _on_infobar_response(self, _widget, response): + if response == Gtk.ResponseType.CLOSE: + self._ui.infobar.set_revealed(False) + app.config.set('show_help_start_chat', False) + def _start_new_chat(self, row): if row.new: try: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/4cd448de8f7a4e3d70fe5d7fcb37971… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/4cd448de8f7a4e3d70fe5d7fcb37971… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] StartChat: Improve global muc search
by Philipp Hörist 16 Jun '20

16 Jun '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 4cd448de by lovetox at 2020-06-16T22:56:32+02:00 StartChat: Improve global muc search - Don't clear the search entry when pressing the global search button - Start a search automatically after pressing the button - - - - - 1 changed file: - gajim/gtk/start_chat.py Changes: ===================================== gajim/gtk/start_chat.py ===================================== @@ -370,15 +370,17 @@ class StartChatDialog(Gtk.ApplicationWindow): return box == Search.GLOBAL def _on_global_search_toggle(self, button): - self._ui.search_entry.set_text('') self._ui.search_entry.grab_focus() image_style_context = button.get_children()[0].get_style_context() if button.get_active(): image_style_context.add_class('selected-color') self._set_listbox(self._global_search_listbox) + if self._ui.search_entry.get_text(): + self._start_search() self._remove_new_jid_row() self._ui.listbox.invalidate_filter() else: + self._ui.search_entry.set_text('') image_style_context.remove_class('selected-color') self._set_listbox(self._ui.listbox) self._global_search_listbox.remove_all() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/4cd448de8f7a4e3d70fe5d7fcb379712… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/4cd448de8f7a4e3d70fe5d7fcb379712… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_1.2] 24 commits: Gspell: Use default language if requested one is missing
by Philipp Hörist 07 Jun '20

07 Jun '20

Philipp Hörist pushed to branch gajim_1.2 at gajim / gajim Commits: d1e6aa60 by André Apitzsch at 2020-06-07T08:24:21+02:00 Gspell: Use default language if requested one is missing The default language cannot be `None` if `app.is_installed('GSPELL')` is `True`, because to be `True` at least one language needs to be available. If `app.is_installed('GSPELL')` is `False`, the modified code is not called. - - - - - 738f140a by lovetox at 2020-06-07T08:24:21+02:00 Change look of DND status - - - - - 07f68379 by lovetox at 2020-06-07T08:24:21+02:00 Change color of XA status - - - - - e45a8392 by lovetox at 2020-06-07T08:24:21+02:00 Refactor idle status - - - - - 86779b63 by lovetox at 2020-06-07T08:24:21+02:00 Caps: Fix EntityCapsTask precondition check - - - - - e1ec6791 by André Apitzsch at 2020-06-07T08:24:21+02:00 Improve shortcut behaviour on MacOS Part of #8787. - - - - - c631815c by André at 2020-06-07T08:24:21+02:00 Feature: Fix keyring availability check - - - - - 2bb4cd51 by André Apitzsch at 2020-06-07T08:24:21+02:00 Feature: Remove list header Information is already provided by window title. - - - - - c751043e by André Apitzsch at 2020-06-07T08:24:21+02:00 Server Info: Remove list header Information is already provided by tab title. - - - - - ea2b94fd by lovetox at 2020-06-07T08:24:21+02:00 Fix discovering local address for file transfer Fixes #10016 - - - - - f402b26e by lovetox at 2020-06-07T08:24:21+02:00 Client: Update status while disconnected Idle status changes while disconnected were lost leading to reconnecting or resuming with the idle status we had before disconnect - - - - - 4b4e01aa by lovetox at 2020-06-07T08:24:21+02:00 Client: Remove unnecessary our-show events The event gets raised when we receive the presence reflection - - - - - adadf0ac by lovetox at 2020-06-07T08:24:21+02:00 Client: Use NetworkEvent instead of OurShowEvent - - - - - 05f4530b by lovetox at 2020-06-07T08:24:21+02:00 Refactor our-show event handlers - - - - - 0d0ab311 by lovetox at 2020-06-07T08:24:21+02:00 Remove unused code - - - - - 8b6c0cf8 by lovetox at 2020-06-07T08:24:21+02:00 Update pre-push-tests.sh - - - - - b08cf8b1 by lovetox at 2020-06-07T08:24:21+02:00 Remove unused code - - - - - 48c4dcfc by lovetox at 2020-06-07T08:24:21+02:00 Menu: Better name start chat entry - - - - - b5ad4690 by lovetox at 2020-06-07T08:24:21+02:00 Remove unused helper methods - - - - - 248a411b by lovetox at 2020-06-07T08:24:21+02:00 Fix pylint errors - - - - - f3d82005 by lovetox at 2020-06-07T08:24:21+02:00 Client: Update presence of MUCs only on resume - - - - - 0de4272b by André Apitzsch at 2020-06-07T08:24:21+02:00 Update XMPP logo Logo without text is used, because it wasn't readable in the GUI anyway. Part of #9049. - - - - - fe0428c2 by lovetox at 2020-06-07T08:24:21+02:00 Client: Raise our-show event on resume - - - - - 6b482a11 by lovetox at 2020-06-07T08:24:21+02:00 Fix mypy errors - - - - - 30 changed files: - gajim/application.py - gajim/chat_control_base.py - gajim/common/app.py - gajim/common/client.py - gajim/common/config.py - gajim/common/connection_handlers.py - gajim/common/connection_handlers_events.py - gajim/common/const.py - gajim/common/helpers.py - gajim/common/idle.py - gajim/common/jingle_transport.py - gajim/common/modules/bytestream.py - gajim/common/modules/caps.py - gajim/common/modules/muc.py - gajim/common/modules/presence.py - gajim/common/modules/vcard_avatars.py - gajim/data/gui/application_menu.ui - gajim/data/gui/shortcuts_window.ui - gajim/data/icons/hicolor/scalable/status/xmpp.svg - gajim/dialogs.py - gajim/groupchat_control.py - gajim/gtk/avatar.py - gajim/gtk/dialogs.py - gajim/gtk/features.py - gajim/gtk/filechoosers.py - gajim/gtk/notification.py - gajim/gtk/preferences.py - gajim/gtk/server_info.py - gajim/gtk/single_message.py - gajim/gtk/types.py The diff was not included because it is too large. View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/534a29479bf8501da1ef59ffd1b818c… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/534a29479bf8501da1ef59ffd1b818c… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Remove nonworking network state simulation
by Philipp Hörist 06 Jun '20

06 Jun '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: e52ab0ea by André Apitzsch at 2020-06-06T16:40:25+02:00 Remove nonworking network state simulation Fixes #10134. - - - - - 1 changed file: - gajim/application.py Changes: ===================================== gajim/application.py ===================================== @@ -152,21 +152,6 @@ class GajimApplication(Gtk.Application): GLib.OptionArg.NONE, _('Start a new chat')) - self.add_main_option( - 'simulate-network-lost', - 0, - GLib.OptionFlags.NONE, - GLib.OptionArg.NONE, - _('Simulate loss of connectivity')) - - self.add_main_option( - 'simulate-network-connected', - 0, - GLib.OptionFlags.NONE, - GLib.OptionArg.NONE, - _('Simulate regaining connectivity')) - - self.add_main_option_entries(self._get_remaining_entry()) self.connect('handle-local-options', self._handle_local_options) @@ -327,14 +312,6 @@ class GajimApplication(Gtk.Application): self.activate_action(cmd) return 0 - if options.contains('simulate-network-lost'): - app.interface.network_status_changed(None, False) - return 0 - - if options.contains('simulate-network-connected'): - app.interface.network_status_changed(None, True) - return 0 - if remaining is not None: self._open_uris(remaining.unpack()) return 0 View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e52ab0ea16048de530de7643a72a0edf… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e52ab0ea16048de530de7643a72a0edf… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Flatpak: Fix start using desktop file
by André 04 Jun '20

04 Jun '20

André pushed to branch master at gajim / gajim Commits: aa623168 by André Apitzsch at 2020-06-04T22:35:32+02:00 Flatpak: Fix start using desktop file - - - - - 1 changed file: - flatpak/org.gajim.Gajim.yaml Changes: ===================================== flatpak/org.gajim.Gajim.yaml ===================================== @@ -238,6 +238,7 @@ modules: commands: - sed -i "s+<id>org.gajim.Gajim</id>+<id>org.gajim.Gajim.Devel</id>+" data/org.gajim.Gajim.appdata.xml.in - sed -i "s+<name>Gajim</name>+<name>Gajim (Nightly)</name>+" data/org.gajim.Gajim.appdata.xml.in + - sed -i "s+Exec=gajim+Exec=gajim-devel+" data/org.gajim.Gajim.desktop.in - mv gajim/data/icons/hicolor/scalable/apps/org.gajim.Gajim{.Devel,}.svg post-install: - install -d /app/plugins View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/aa62316879eb185bd83b3f17f6fa113b… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/aa62316879eb185bd83b3f17f6fa113b… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Fix mypy errors
by Philipp Hörist 03 Jun '20

03 Jun '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: e192882b by lovetox at 2020-06-03T20:16:57+02:00 Fix mypy errors - - - - - 2 changed files: - gajim/gtk/filechoosers.py - gajim/gtk/types.py Changes: ===================================== gajim/gtk/filechoosers.py ===================================== @@ -15,6 +15,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 List + import os import sys from pathlib import Path @@ -27,7 +29,6 @@ from gajim.common import app from gajim.common.i18n import _ from gajim.gtk.const import Filter -from gajim.gtk.types import FilterList # pylint: disable=unused-import def _require_native() -> bool: @@ -85,7 +86,7 @@ class BaseFileChooser: class BaseFileOpenDialog: _title = _('Choose File to Send…') - _filters = [Filter(_('All files'), '*', True)] # type: FilterList + _filters = [Filter(_('All files'), '*', True)] class BaseAvatarChooserDialog: @@ -96,7 +97,7 @@ class BaseAvatarChooserDialog: if _require_native(): _filters = [Filter(_('PNG files'), '*.png', True), Filter(_('JPEG files'), '*.jp*g', False), - Filter(_('SVG files'), '*.svg', False)] # type: FilterList + Filter(_('SVG files'), '*.svg', False)] else: _filters = [Filter(_('Images'), ['image/png', 'image/jpeg', @@ -106,7 +107,7 @@ class BaseAvatarChooserDialog: class NativeFileChooserDialog(Gtk.FileChooserNative, BaseFileChooser): _title = '' - _filters = [] # type: FilterList + _filters: List[Filter] = [] _action = Gtk.FileChooserAction.OPEN def __init__(self, accept_cb, cancel_cb=None, transient_for=None, @@ -158,7 +159,7 @@ class NativeAvatarChooserDialog(BaseAvatarChooserDialog, NativeFileChooserDialog class GtkFileChooserDialog(Gtk.FileChooserDialog, BaseFileChooser): _title = '' - _filters = [] # type: FilterList + _filters: List[Filter] = [] _action = Gtk.FileChooserAction.OPEN _preivew_size = (200, 200) ===================================== gajim/gtk/types.py ===================================== @@ -13,10 +13,3 @@ # along with Gajim. If not, see <http://www.gnu.org/licenses/>. # Types for typechecking - -from typing import ClassVar -from typing import List - -from gajim.gtk.const import Filter - -FilterList = ClassVar[List[Filter]] View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e192882b075a8ef83d3364d9dc81037f… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e192882b075a8ef83d3364d9dc81037f… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Client: Raise our-show event on resume
by Philipp Hörist 03 Jun '20

03 Jun '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 21c6be64 by lovetox at 2020-06-03T20:03:49+02:00 Client: Raise our-show event on resume - - - - - 1 changed file: - gajim/common/client.py Changes: ===================================== gajim/common/client.py ===================================== @@ -226,6 +226,14 @@ class Client(ConnectionHandlers): if self._status_sync_on_resume: self._status_sync_on_resume = False self.update_presence() + else: + # Normally show is updated when we receive a presence reflection. + # On resume, if show has not changed while offline, we dont send + # a new presence so we have to trigger the event here. + app.nec.push_incoming_event( + NetworkEvent('our-show', + account=self._account, + show=self._status)) def _set_client_available(self): self._set_state(ClientState.AVAILABLE) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/21c6be642c29070a023fef56ab2aa017… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/21c6be642c29070a023fef56ab2aa017… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Update XMPP logo
by Philipp Hörist 02 Jun '20

02 Jun '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 198cf3dd by André Apitzsch at 2020-06-02T22:33:37+02:00 Update XMPP logo Logo without text is used, because it wasn't readable in the GUI anyway. Part of #9049. - - - - - 1 changed file: - gajim/data/icons/hicolor/scalable/status/xmpp.svg Changes: ===================================== gajim/data/icons/hicolor/scalable/status/xmpp.svg ===================================== @@ -1,25 +1,27 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> - -<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'> -<svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" xml:space="preserve" height="181.44px" viewBox="0 0 176.486 181.437" width="176.49px" version="1.1" y="0px" x="0px" xmlns:xlink="http://www.w3.org/1999/xlink" enable-background="new 0 0 176.486 181.437"> -<linearGradient id="SVGID_1_" y2=".00048828" gradientUnits="userSpaceOnUse" x2="-1807.2" gradientTransform="translate(1916)" y1="125.86" x1="-1807.2"> - <stop stop-color="#1b3967" offset=".011"/> - <stop stop-color="#13b5ea" offset=".467"/> - <stop stop-color="#002b5c" offset=".9945"/> -</linearGradient> -<path d="m136.29 14.189c0.077 1.313-1.786 0.968-1.786 2.293 0 38.551-44.72 96.831-89.847 108.19v1.182c59.957-5.51 126.73-66.8 128.24-125.85l-36.6 14.189z" fill="url(#SVGID_1_)"/> -<path d="m120.23 17.96c0.077 1.313 0.121 2.633 0.121 3.958 0 38.551-30.7 90.497-75.827 101.86v1.637c59.065-3.823 105.81-63.023 105.81-109.2 0-2.375-0.125-4.729-0.371-7.056l-29.73 8.796z" fill="#E96D1F"/> -<linearGradient id="SVGID_2_" y2="1.279e-13" gradientUnits="userSpaceOnUse" x2="-1073.2" gradientTransform="matrix(-1 0 0 1 -1008.2 0)" y1="126.85" x1="-1073.2"> - <stop stop-color="#1b3967" offset=".011"/> - <stop stop-color="#13b5ea" offset=".467"/> - <stop stop-color="#002b5c" offset=".9945"/> -</linearGradient> -<path d="m150.34 8.76l-7.833 2.625c0.041 0.963 0.191 2.203 0.191 3.173 0 41.219-37.272 98.205-87.274 107.12-3.243 1.089-7.538 2.077-10.93 2.932v1.639c68.344-8.66 111.18-71.719 105.84-117.49z" fill="#D9541E"/> -<path d="m36.599 14.189c-0.077 1.313 1.787 0.968 1.787 2.293 0 38.551 46.558 97.366 91.688 108.73v1.639c-59.953-5.52-128.56-67.8-130.07-126.85l36.599 14.189z" fill="url(#SVGID_2_)"/> -<path d="m54.731 18.932c-0.076 1.313-0.12 2.63-0.12 3.957 0 38.551 30.699 90.497 75.827 101.86v1.639c-59.044-2.79-105.81-63.024-105.81-109.2 0-2.375 0.128-4.729 0.371-7.056l29.73 8.798z" fill="#A0CE67"/> -<path d="m24.713 9.583l7.617 2.722c-0.041 0.962-0.066 2.254-0.066 3.225 0 41.219 37.271 98.204 87.272 107.12 3.245 1.088 7.538 2.077 10.932 2.931v1.638c-65.254-5.56-111.1-71.866-105.76-117.64z" fill="#439639"/> - <path d="m14.576 166.71l-13.388-14.65h11.643l9.127 10.268 9.129-10.268h11.643l-13.387 14.646 14.401 14.728h-12.09l-9.697-10.67-9.693 10.67h-12.092l14.404-14.73z"/> - <path d="m47.096 152.06h13.836l10.183 18.905 10.183-18.905h13.832v29.374h-8.762v-21.096h-0.08l-11.807 21.096h-6.733l-11.807-21.096h-0.082v21.096h-8.764v-29.37z"/> - <path d="m101.25 152.06h24.546c8.559 0 10.628 4.302 10.628 10.063v2.516c0 4.381-1.908 9.41-8.275 9.41h-17.894v7.385h-9.005v-29.38zm9 14.69h13.997c2.109 0 2.924-1.377 2.924-3.123v-1.135c0-1.99-0.976-3.127-3.694-3.127h-13.227v7.38z"/> - <path d="m141.31 152.06h24.546c8.561 0 10.63 4.302 10.63 10.063v2.516c0 4.381-1.907 9.41-8.275 9.41h-17.893v7.385h-9.008v-29.38zm9.01 14.69h13.996c2.11 0 2.922-1.377 2.922-3.123v-1.135c0-1.99-0.974-3.127-3.693-3.127h-13.225v7.38z"/> -</svg> +<?xml version="1.0" encoding="utf-8"?> + +<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" + viewBox="-3277 648.6 176.5 134" enable-background="new -3277 648.6 176.5 134" xml:space="preserve"> +<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="-5084.2773" y1="706.7167" x2="-5084.2773" y2="832.5667" gradientTransform="matrix(1 0 0 -1 1916.1409 1481.1445)"> + <stop offset="1.100000e-02" style="stop-color:#1B3967"/> + <stop offset="0.467" style="stop-color:#13B5EA"/> + <stop offset="0.9945" style="stop-color:#002B5C"/> +</linearGradient> +<path fill="url(#SVGID_1_)" d="M-3140.7,662.7c0.1,1.3-1.8,1-1.8,2.3c0,38.6-44.7,96.8-89.8,108.2v1.2 + c60-5.5,126.7-66.8,128.2-125.9L-3140.7,662.7L-3140.7,662.7z"/> +<path fill="#E96D1F" d="M-3156.8,666.5c0.1,1.3,0.1,2.6,0.1,4c0,38.6-30.7,90.5-75.8,101.9v1.6c59.1-3.8,105.8-63,105.8-109.2 + c0-2.4-0.1-4.7-0.4-7.1L-3156.8,666.5L-3156.8,666.5z"/> +<path fill="#D9541E" d="M-3126.7,657.3l-7.8,2.6c0,1,0.2,2.2,0.2,3.2c0,41.2-37.3,98.2-87.3,107.1c-3.2,1.1-7.5,2.1-10.9,2.9v1.6 + C-3164.2,766.2-3121.3,703.1-3126.7,657.3L-3126.7,657.3z"/> +<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="-10904.1846" y1="705.7197" x2="-10904.1846" y2="832.5697" gradientTransform="matrix(-1 0 0 -1 -14116.3252 1481.1445)"> + <stop offset="1.100000e-02" style="stop-color:#1B3967"/> + <stop offset="0.467" style="stop-color:#13B5EA"/> + <stop offset="0.9945" style="stop-color:#002B5C"/> +</linearGradient> +<path fill="url(#SVGID_2_)" d="M-3240.4,662.7c-0.1,1.3,1.8,1,1.8,2.3c0,38.6,46.6,97.4,91.7,108.7v1.6 + c-60-5.5-128.6-67.8-130.1-126.9L-3240.4,662.7L-3240.4,662.7z"/> +<path fill="#A0CE67" d="M-3222.3,667.5c-0.1,1.3-0.1,2.6-0.1,4c0,38.6,30.7,90.5,75.8,101.9v1.6c-59-2.8-105.8-63-105.8-109.2 + c0-2.4,0.1-4.7,0.4-7.1L-3222.3,667.5L-3222.3,667.5z"/> +<path fill="#439639" d="M-3252.3,658.1l7.6,2.7c0,1-0.1,2.3-0.1,3.2c0,41.2,37.3,98.2,87.3,107.1c3.2,1.1,7.5,2.1,10.9,2.9v1.6 + C-3211.8,770.2-3257.6,703.9-3252.3,658.1L-3252.3,658.1z"/> +</svg> View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/198cf3dd5d16ceb25d04bf40e2c4e27e… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/198cf3dd5d16ceb25d04bf40e2c4e27e… 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 June 2020