Commits March 2019

commits@gajim.org

1 participants
63 discussions

[Git][gajim/gajim][master] Add method to determine window manager
by Philipp Hörist 25 Mar '19

25 Mar '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 4acf36c9 by Philipp Hörist at 2019-03-25T19:11:53Z Add method to determine window manager - - - - - 2 changed files: - gajim/common/app.py - gajim/common/const.py Changes: ===================================== gajim/common/app.py ===================================== @@ -39,12 +39,14 @@ from distutils.version import LooseVersion as V from collections import namedtuple import nbxmpp +from gi.repository import Gdk import gajim from gajim.common import config as c_config from gajim.common import configpaths from gajim.common import ged as ged_module from gajim.common.i18n import LANG +from gajim.common.const import Display from gajim.common.contacts import LegacyContactsAPI from gajim.common.events import Events from gajim.common.types import NetworkEventsControllerT # pylint: disable=unused-import @@ -212,6 +214,18 @@ def is_installed(dependency): def is_flatpak(): return gajim.IS_FLATPAK +def is_display(display): + # XWayland reports as Display X11, so try with env var + is_wayland = os.environ.get('XDG_SESSION_TYPE') == 'wayland' + if is_wayland and display == Display.WAYLAND: + return True + + default = Gdk.Display.get_default() + if default is None: + log('gajim').warning('Could not determine window manager') + return False + return default.__class__.__name__ == display.value + def disable_dependency(dependency): _dependencies[dependency] = False ===================================== gajim/common/const.py ===================================== @@ -199,6 +199,7 @@ class MUCUser(IntEnum): AFFILIATION = 3 AFFILIATION_TEXT = 4 + @unique class Trust(IntEnum): UNTRUSTED = 0 @@ -206,6 +207,14 @@ class Trust(IntEnum): BLIND = 2 VERIFIED = 3 + +class Display(Enum): + X11 = 'X11Display' + WAYLAND = 'GdkWaylandDisplay' + WIN32 = 'GdkWin32Display' + QUARTZ = 'GdkQuartzDisplay' + + EME_MESSAGES = { 'urn:xmpp:otr:0': _('This message was encrypted with OTR ' View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/4acf36c97b79730b40ded2bbb050fd18eb… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/4acf36c97b79730b40ded2bbb050fd18eb… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Update look of Remove account dialog
by Philipp Hörist 25 Mar '19

25 Mar '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: f6e113c0 by Daniel Brötzmann at 2019-03-25T19:11:33Z Update look of Remove account dialog - - - - - 3 changed files: - gajim/config.py - gajim/data/gui/remove_account_window.ui - gajim/gtk/accounts.py Changes: ===================================== gajim/config.py ===================================== @@ -30,19 +30,6 @@ from gi.repository import Gtk from gi.repository import GObject -from gajim.common import app -from gajim.common import passwords -from gajim.common.i18n import _ - -from gajim import dialogs - -from gajim import gui_menu_builder - -from gajim.gtk.dialogs import ConfirmationDialog -from gajim.gtk.dialogs import ConfirmationDialogDoubleRadio -from gajim.gtk.dialogs import ErrorDialog -from gajim.gtk.util import get_builder - class FakeDataForm(Gtk.Table): """ @@ -94,131 +81,3 @@ class FakeDataForm(Gtk.Table): for name in self.entries: self.infos[name] = self.entries[name].get_text() return self.infos - -#---------- RemoveAccountWindow class -------------# -class RemoveAccountWindow: - """ - Ask for removing from gajim only or from gajim and server too and do - removing of the account given - """ - - def on_remove_account_window_destroy(self, widget): - if self.account in app.interface.instances: - del app.interface.instances[self.account]['remove_account'] - - def on_cancel_button_clicked(self, widget): - self.window.destroy() - - def __init__(self, account): - self.account = account - xml = get_builder('remove_account_window.ui') - self.window = xml.get_object('remove_account_window') - active_window = app.app.get_active_window() - self.window.set_transient_for(active_window) - self.remove_and_unregister_radiobutton = xml.get_object( - 'remove_and_unregister_radiobutton') - self.window.set_title(_('Removing %s account') % self.account) - xml.connect_signals(self) - self.window.show_all() - - def on_remove_button_clicked(self, widget): - def remove(): - if self.account in app.connections and \ - app.connections[self.account].connected and \ - not self.remove_and_unregister_radiobutton.get_active(): - # change status to offline only if we will not remove this JID from - # server - app.connections[self.account].change_status('offline', 'offline') - if self.remove_and_unregister_radiobutton.get_active(): - if not self.account in app.connections: - ErrorDialog( - _('Account is disabled'), - _('To unregister from a server, account must be ' - 'enabled.'), - transient_for=self.window) - return - if not app.connections[self.account].password: - def on_ok(passphrase, checked): - if passphrase == -1: - # We don't remove account cause we canceled pw window - return - app.connections[self.account].password = passphrase - app.connections[self.account].unregister_account( - self._on_remove_success) - - dialogs.PassphraseDialog( - _('Password Required'), - _('Enter your password for account %s') % self.account, - _('Save password'), ok_handler=on_ok, - transient_for=self.window) - return - app.connections[self.account].unregister_account( - self._on_remove_success) - else: - self._on_remove_success(True) - - if self.account in app.connections and \ - app.connections[self.account].connected: - ConfirmationDialog( - _('Account "%s" is connected to the server') % self.account, - _('If you remove it, the connection will be lost.'), - on_response_ok=remove, - transient_for=self.window) - else: - remove() - - def on_remove_responce_ok(self, is_checked): - if is_checked[0]: - self._on_remove_success(True) - - def _on_remove_success(self, res): - # action of unregistration has failed, we don't remove the account - # Error message is send by connect_and_auth() - if not res: - ConfirmationDialogDoubleRadio( - _('Connection to server %s failed') % self.account, - _('What would you like to do?'), - _('Remove only from Gajim'), - _('Don\'t remove anything. I\'ll try again later'), - on_response_ok=self.on_remove_responce_ok, is_modal=False, - transient_for=self.window) - return - # Close all opened windows - app.interface.roster.close_all(self.account, force=True) - if self.account in app.connections: - app.connections[self.account].disconnect(reconnect=False) - app.connections[self.account].cleanup() - del app.connections[self.account] - app.logger.remove_roster(app.get_jid_from_account(self.account)) - # Delete password must be before del_per() because it calls set_per() - # which would recreate the account with defaults values if not found - passwords.delete_password(self.account) - app.config.del_per('accounts', self.account) - del app.interface.instances[self.account] - if self.account in app.nicks: - del app.interface.minimized_controls[self.account] - del app.nicks[self.account] - del app.block_signed_in_notifications[self.account] - del app.groups[self.account] - app.contacts.remove_account(self.account) - del app.gc_connected[self.account] - del app.automatic_rooms[self.account] - del app.to_be_removed[self.account] - del app.newly_added[self.account] - del app.sleeper_state[self.account] - del app.last_message_time[self.account] - del app.status_before_autoaway[self.account] - del app.gajim_optional_features[self.account] - del app.caps_hash[self.account] - if len(app.connections) >= 2: # Do not merge accounts if only one exists - app.interface.roster.regroup = app.config.get('mergeaccounts') - else: - app.interface.roster.regroup = False - app.interface.roster.setup_and_draw_roster() - app.app.remove_account_actions(self.account) - gui_menu_builder.build_accounts_menu() - - window = app.get_app_window('AccountsWindow') - if window is not None: - window.remove_account(self.account) - self.window.destroy() ===================================== gajim/data/gui/remove_account_window.ui ===================================== @@ -1,119 +1,115 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> - <requires lib="gtk+" version="3.12"/> - <object class="GtkImage" id="image1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="stock">gtk-delete</property> - </object> + <requires lib="gtk+" version="3.20"/> <object class="GtkWindow" id="remove_account_window"> <property name="can_focus">False</property> - <property name="border_width">6</property> + <property name="border_width">18</property> <property name="type_hint">dialog</property> <signal name="destroy" handler="on_remove_account_window_destroy" swapped="no"/> <child> - <object class="GtkBox" id="vbox69"> + <placeholder/> + </child> + <child> + <object class="GtkBox"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="border_width">3</property> <property name="orientation">vertical</property> - <property name="spacing">6</property> + <property name="spacing">18</property> <child> - <object class="GtkBox" id="hbox2951"> + <object class="GtkLabel"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="spacing">6</property> + <property name="halign">start</property> + <property name="label" translatable="yes">What do you want to do?</property> + <property name="use_markup">True</property> + <style> + <class name="large-header"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="spacing">12</property> <child> - <object class="GtkImage" id="image498"> + <object class="GtkImage"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="stock">gtk-dialog-question</property> + <property name="icon_name">user-trash</property> <property name="icon_size">6</property> </object> <packing> <property name="expand">False</property> - <property name="fill">False</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> - <object class="GtkFrame" id="frame30"> + <object class="GtkBox"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label_xalign">0</property> - <property name="shadow_type">none</property> + <property name="orientation">vertical</property> + <property name="spacing">6</property> <child> - <object class="GtkBox" id="vbox1"> + <object class="GtkRadioButton" id="remove_only_radiobutton"> + <property name="label" translatable="yes">Remove account _only from Gajim</property> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_left">12</property> - <property name="border_width">6</property> - <property name="orientation">vertical</property> - <property name="spacing">6</property> - <child> - <object class="GtkRadioButton" id="remove_only_radiobutton"> - <property name="label" translatable="yes">Remove account _only from Gajim</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - <property name="active">True</property> - <property name="draw_indicator">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkRadioButton" id="remove_and_unregister_radiobutton"> - <property name="label" translatable="yes">Remove account from Gajim and from _server</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - <property name="draw_indicator">True</property> - <property name="group">remove_only_radiobutton</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="halign">start</property> + <property name="use_underline">True</property> + <property name="active">True</property> + <property name="draw_indicator">True</property> </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> </child> - <child type="label"> - <object class="GtkLabel" id="label242"> + <child> + <object class="GtkRadioButton" id="remove_and_unregister_radiobutton"> + <property name="label" translatable="yes">Remove account from Gajim and from _server</property> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes"><b>What do you want to do?</b></property> - <property name="use_markup">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="halign">start</property> + <property name="use_underline">True</property> + <property name="active">True</property> + <property name="draw_indicator">True</property> + <property name="group">remove_only_radiobutton</property> </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> </child> </object> <packing> <property name="expand">False</property> - <property name="fill">False</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> </object> <packing> <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> + <property name="fill">True</property> + <property name="position">1</property> </packing> </child> <child> - <object class="GtkButtonBox" id="hbuttonbox16"> + <object class="GtkButtonBox"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="border_width">6</property> <property name="spacing">12</property> <property name="layout_style">end</property> <child> @@ -139,9 +135,11 @@ <property name="can_focus">True</property> <property name="can_default">True</property> <property name="receives_default">False</property> - <property name="image">image1</property> <property name="use_underline">True</property> <signal name="clicked" handler="on_remove_button_clicked" swapped="no"/> + <style> + <class name="destructive-action"/> + </style> </object> <packing> <property name="expand">False</property> @@ -153,7 +151,7 @@ <packing> <property name="expand">False</property> <property name="fill">False</property> - <property name="position">1</property> + <property name="position">2</property> </packing> </child> </object> ===================================== gajim/gtk/accounts.py ===================================== @@ -30,12 +30,14 @@ from gajim.common.const import OptionKind from gajim.common.const import OptionType from gajim import gui_menu_builder -from gajim import config +from gajim.dialogs import PassphraseDialog from gajim.options_dialog import OptionsDialog from gajim.options_dialog import OptionsBox from gajim.gtk.dialogs import ConfirmationDialog +from gajim.gtk.dialogs import ConfirmationDialogDoubleRadio +from gajim.gtk.dialogs import ErrorDialog from gajim.gtk.dialogs import YesNoDialog from gajim.gtk.util import get_icon_name from gajim.gtk.util import get_builder @@ -220,7 +222,7 @@ class AccountsWindow(Gtk.ApplicationWindow): if account not in app.interface.instances: app.interface.instances[account] = {} app.interface.instances[account]['remove_account'] = \ - config.RemoveAccountWindow(account) + RemoveAccountWindow(account) if win_opened: ConfirmationDialog( _('You have opened chat in account %s') % account, @@ -811,3 +813,131 @@ class LoginDialog(OptionsDialog): savepass = app.config.get_per('accounts', self.account, 'savepass') if not savepass: passwords.delete_password(self.account) + + +class RemoveAccountWindow: + """ + Ask whether to remove from gajim only or both from gajim and the server, + then remove the account given + """ + + def on_remove_account_window_destroy(self, widget): + if self.account in app.interface.instances: + del app.interface.instances[self.account]['remove_account'] + + def on_cancel_button_clicked(self, widget): + self._ui.remove_account_window.destroy() + + def __init__(self, account): + self.account = account + self._ui = get_builder('remove_account_window.ui') + active_window = app.app.get_active_window() + self._ui.remove_account_window.set_transient_for(active_window) + self._ui.remove_account_window.set_title(_('Removing account %s') % self.account) + self._ui.connect_signals(self) + self._ui.remove_account_window.show_all() + + def on_remove_button_clicked(self, widget): + def remove(): + if self.account in app.connections and \ + app.connections[self.account].connected and \ + not self._ui.remove_and_unregister_radiobutton.get_active(): + # change status to offline only if we will not remove this JID from + # server + app.connections[self.account].change_status('offline', 'offline') + if self._ui.remove_and_unregister_radiobutton.get_active(): + if not self.account in app.connections: + ErrorDialog( + _('Account is disabled'), + _('To unregister from a server, the account must be ' + 'enabled.'), + transient_for=self._ui.remove_account_window) + return + if not app.connections[self.account].password: + def on_ok(passphrase, checked): + if passphrase == -1: + # We don't remove account cause we canceled pw window + return + app.connections[self.account].password = passphrase + app.connections[self.account].unregister_account( + self._on_remove_success) + + PassphraseDialog( + _('Password required'), + _('Enter your password for account %s') % self.account, + _('Save password'), ok_handler=on_ok, + transient_for=self._ui.remove_account_window) + return + app.connections[self.account].unregister_account( + self._on_remove_success) + else: + self._on_remove_success(True) + + if self.account in app.connections and \ + app.connections[self.account].connected: + ConfirmationDialog( + _('Account "%s" is connected to the server') % self.account, + _('If you remove it, the connection will be lost.'), + on_response_ok=remove, + transient_for=self._ui.remove_account_window) + else: + remove() + + def on_remove_response_ok(self, is_checked): + if is_checked[0]: + self._on_remove_success(True) + + def _on_remove_success(self, res): + # action of unregistration has failed, we don't remove the account + # Error message is send by connect_and_auth() + if not res: + ConfirmationDialogDoubleRadio( + _('Connection to server %s failed') % self.account, + _('What would you like to do?'), + _('Remove only from Gajim'), + _('Don\'t remove anything. I\'ll try again later'), + on_response_ok=self.on_remove_response_ok, is_modal=False, + transient_for=self._ui.remove_account_window) + return + # Close all opened windows + app.interface.roster.close_all(self.account, force=True) + if self.account in app.connections: + app.connections[self.account].disconnect(reconnect=False) + app.connections[self.account].cleanup() + del app.connections[self.account] + app.logger.remove_roster(app.get_jid_from_account(self.account)) + # Delete password must be before del_per() because it calls set_per() + # which would recreate the account with defaults values if not found + passwords.delete_password(self.account) + app.config.del_per('accounts', self.account) + del app.interface.instances[self.account] + if self.account in app.nicks: + del app.interface.minimized_controls[self.account] + del app.nicks[self.account] + del app.block_signed_in_notifications[self.account] + del app.groups[self.account] + app.contacts.remove_account(self.account) + del app.gc_connected[self.account] + del app.automatic_rooms[self.account] + del app.to_be_removed[self.account] + del app.newly_added[self.account] + del app.sleeper_state[self.account] + del app.last_message_time[self.account] + del app.status_before_autoaway[self.account] + del app.gajim_optional_features[self.account] + del app.caps_hash[self.account] + if len(app.connections) >= 2: # Do not merge accounts if only one exists + app.interface.roster.regroup = app.config.get('mergeaccounts') + else: + app.interface.roster.regroup = False + app.interface.roster.setup_and_draw_roster() + app.app.remove_account_actions(self.account) + gui_menu_builder.build_accounts_menu() + + window = app.get_app_window('AccountsWindow') + if window is not None: + window.remove_account(self.account) + self._ui.remove_account_window.destroy() + + def destroy(self): + self._ui.remove_account_window.destroy() View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/f6e113c0b685fe866f79949fac184a632e… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/f6e113c0b685fe866f79949fac184a632e… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Improve dark theme colors
by Philipp Hörist 24 Mar '19

24 Mar '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 52111cd1 by Daniel Brötzmann at 2019-03-24T14:33:37Z Improve dark theme colors - - - - - 2 changed files: - gajim/data/style/default-dark.css - gajim/gtk/history.py Changes: ===================================== gajim/data/style/default-dark.css ===================================== @@ -1,11 +1,11 @@ .gajim-incoming-nickname { - color: rgb(164, 0, 0) + color: rgb(207, 49, 47) } .gajim-outgoing-nickname { - color: rgb(52, 101, 164) + color: rgb(38, 139, 210) } .gajim-url { - color: rgb(117, 80, 123) + color: rgb(53, 132, 228) } .gajim-highlight-message { color: rgb(245, 121, 0) @@ -27,4 +27,4 @@ } .gajim-state-paused { color: rgb(0, 0, 205) - } \ No newline at end of file + } ===================================== gajim/gtk/history.py ===================================== @@ -36,6 +36,7 @@ from gajim.common import exceptions from gajim.common.i18n import _ from gajim.common.const import ShowConstant from gajim.common.const import KindConstant +from gajim.common.const import StyleAttr from gajim import conversation_textview @@ -85,7 +86,9 @@ class HistoryWindow(Gtk.ApplicationWindow): account, used_in_history_window=True) self._ui.scrolledwindow.add(self.history_textview.tv) self.history_buffer = self.history_textview.tv.get_buffer() - self.history_buffer.create_tag('highlight', background='yellow') + highlight_color = app.css_config.get_value( + '.gajim-highlight-message', StyleAttr.COLOR) + self.history_buffer.create_tag('highlight', background=highlight_color) self.history_buffer.create_tag('invisible', invisible=True) self.clearing_search = False View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/52111cd1b353f02c33682e73ac6bf99448… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/52111cd1b353f02c33682e73ac6bf99448… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Flatpak: Disable install from ZIP
by Philipp Hörist 24 Mar '19

24 Mar '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: a988d2e2 by Daniel Brötzmann at 2019-03-24T14:33:03Z Flatpak: Disable install from ZIP - - - - - 2 changed files: - gajim/data/gui/plugins_window.ui - gajim/plugins/gui.py Changes: ===================================== gajim/data/gui/plugins_window.ui ===================================== @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> <requires lib="gtk+" version="3.20"/> <object class="GtkWindow" id="plugins_window"> @@ -13,6 +13,9 @@ <property name="type_hint">dialog</property> <signal name="destroy" handler="on_plugins_window_destroy" swapped="no"/> <signal name="key-press-event" handler="on_key_press_event" swapped="no"/> + <child type="titlebar"> + <placeholder/> + </child> <child> <object class="GtkNotebook" id="plugins_notebook"> <property name="visible">True</property> @@ -232,6 +235,7 @@ <property name="wrap">True</property> <property name="wrap_mode">word-char</property> <property name="selectable">True</property> + <property name="xalign">0</property> </object> <packing> <property name="expand">False</property> @@ -375,9 +379,6 @@ </child> </object> </child> - <child type="titlebar"> - <placeholder/> - </child> </object> <object class="GtkTextBuffer" id="textbuffer1"> <property name="text" translatable="yes">Plug-in decription should be displayed here. This text will be erased during PluginsWindow initialization.</property> ===================================== gajim/plugins/gui.py ===================================== @@ -32,6 +32,7 @@ from gi.repository import Gdk from gajim.common import app from gajim.common import configpaths from gajim.common.exceptions import PluginsystemError +from gajim.common.helpers import launch_browser_mailer from gajim.plugins.helpers import log_calls from gajim.plugins.helpers import GajimPluginActivateException @@ -65,14 +66,21 @@ class PluginsWindow: widgets_to_extract = ('plugins_notebook', 'plugin_name_label', 'plugin_version_label', 'plugin_authors_label', - 'plugin_homepage_linkbutton', 'uninstall_plugin_button', - 'configure_plugin_button', 'installed_plugins_treeview', - 'available_text', 'available_text_label') + 'plugin_homepage_linkbutton', 'install_plugin_button', + 'uninstall_plugin_button', 'configure_plugin_button', + 'installed_plugins_treeview', 'available_text', + 'available_text_label') for widget_name in widgets_to_extract: setattr(self, widget_name, builder.get_object(widget_name)) self.plugin_description_textview = builder.get_object('description') + + # Disable 'Install from ZIP' for Flatpak installs + if app.is_flatpak(): + self.install_plugin_button.set_tooltip_text( + _('Click to view Gajim\'s wiki page on how to install plugins in Flatpak.')) + self.installed_plugins_model = Gtk.ListStore(object, str, bool, bool, GdkPixbuf.Pixbuf) self.installed_plugins_treeview.set_model(self.installed_plugins_model) @@ -241,6 +249,10 @@ class PluginsWindow: @log_calls('PluginsWindow') def on_install_plugin_button_clicked(self, widget): + if app.is_flatpak(): + launch_browser_mailer('url', 'https://dev.gajim.org/gajim/gajim/wikis/help/flathub') + return + def show_warn_dialog(): text = _('Archive is malformed') dialog = WarningDialog(text, '', transient_for=self.window) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/a988d2e25088fd77f48b292dd12f0f7b14… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/a988d2e25088fd77f48b292dd12f0f7b14… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Add server blabber.im to servers.json
by Philipp Hörist 24 Mar '19

24 Mar '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 0de04b1a by Dominion at 2019-03-22T09:09:46Z Add server blabber.im to servers.json - - - - - 1 changed file: - gajim/data/other/servers.json Changes: ===================================== gajim/data/other/servers.json ===================================== @@ -2,6 +2,7 @@ "servers":[ "0nl1ne.at", "404.city", + "blabber.im", "brauchen.info", "chatme.im", "comm.unicate.me", View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/0de04b1ae9ec036312d1bf8b2d8ad7cbb1… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/0de04b1ae9ec036312d1bf8b2d8ad7cbb1… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Flatpak: Fix cryptography build
by André 20 Mar '19

20 Mar '19

André pushed to branch master at gajim / gajim Commits: c2be5372 by André Apitzsch at 2019-03-20T23:29:00Z Flatpak: Fix cryptography build - - - - - fd46fcab by André Apitzsch at 2019-03-20T23:29:45Z Flatpak: Update runtime version to 3.32 - - - - - 1 changed file: - flatpak/org.gajim.Gajim.yaml Changes: ===================================== flatpak/org.gajim.Gajim.yaml ===================================== @@ -1,6 +1,6 @@ app-id: org.gajim.Gajim runtime: org.gnome.Platform -runtime-version: 3.30 +runtime-version: 3.32 sdk: org.gnome.Sdk command: gajim tags: nightly @@ -13,6 +13,7 @@ finish-args: - --socket=pulseaudio - --system-talk-name=org.freedesktop.GeoClue2 - --system-talk-name=org.freedesktop.login1 + - --talk-name=org.freedesktop.Notifications - --talk-name=org.gnome.ScreenSaver - --talk-name=org.mpris.MediaPlayer2.* # Keyring @@ -88,7 +89,7 @@ modules: - name: python3-cryptography buildsystem: simple build-commands: - - pip3 install --prefix=/app . + - python3 setup.py install --prefix=/app sources: - type: archive url: https://files.pythonhosted.org/packages/07/ca/bc827c5e55918ad223d59d299fff9… View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/ae4c98cbb2d187bb846fadce9584c1499… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/ae4c98cbb2d187bb846fadce9584c1499… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Show trust level for incoming encrypted messages
by Philipp Hörist 20 Mar '19

20 Mar '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: ae4c98cb by Malte Leip at 2019-03-20T19:50:49Z Show trust level for incoming encrypted messages - - - - - 2 changed files: - gajim/common/const.py - gajim/conversation_textview.py Changes: ===================================== gajim/common/const.py ===================================== @@ -199,6 +199,12 @@ class MUCUser(IntEnum): AFFILIATION = 3 AFFILIATION_TEXT = 4 +@unique +class Trust(IntEnum): + UNTRUSTED = 0 + UNDECIDED = 1 + BLIND = 2 + VERIFIED = 3 EME_MESSAGES = { 'urn:xmpp:otr:0': ===================================== gajim/conversation_textview.py ===================================== @@ -44,7 +44,7 @@ from gajim.common import i18n from gajim.common.i18n import _ from gajim.common.helpers import AdditionalDataDict from gajim.common.fuzzyclock import FuzzyClock -from gajim.common.const import StyleAttr +from gajim.common.const import StyleAttr, Trust from gajim.gtk import util from gajim.gtk.util import load_icon @@ -60,6 +60,22 @@ SHOWN = 2 log = logging.getLogger('gajim.conversation_textview') +TRUST_SYMBOL_DATA = { + Trust.UNTRUSTED: ('dialog-error-symbolic', + _('Untrusted'), + 'error-color'), + Trust.UNDECIDED: ('security-low-symbolic', + _('Trust Not Decided'), + 'warning-color'), + Trust.BLIND: ('security-medium-symbolic', + _('Unverified'), + 'success-color'), + Trust.VERIFIED: ('security-high-symbolic', + _('Verified'), + 'encrypted-color') +} + + def is_selection_modified(mark): name = mark.get_name() return name in ('selection_bound', 'insert') @@ -1133,13 +1149,17 @@ class ConversationTextview(GObject.GObject): color = 'unencrypted-color' tooltip = _('Not encrypted') else: - icon = 'channel-secure-symbolic' - color = 'encrypted-color' - name, fingerprint = details - if fingerprint is None: - tooltip = name + name, fingerprint, trust = details + tooltip = _('Encrypted (%s)') % (name) + if trust is None: + # The encryption plugin did not pass trust information + icon = 'channel-secure-symbolic' + color = 'encrypted-color' else: - tooltip = '%s %s' % (name, fingerprint) + icon, trust_tooltip, color = TRUST_SYMBOL_DATA[trust] + tooltip = tooltip + '\n' + trust_tooltip + if fingerprint is not None: + tooltip = tooltip + ' (' + fingerprint + ')' temp_mark = self._buffer.create_mark(None, iter_, True) self._buffer.insert(iter_, ' ') @@ -1164,7 +1184,8 @@ class ConversationTextview(GObject.GObject): return fingerprint = additional_data.get_value('encrypted', 'fingerprint') - return name, fingerprint + trust = additional_data.get_value('encrypted', 'trust') + return name, fingerprint, trust def print_time(self, text, kind, tim, simple, direction_mark, other_tags_for_time, iter_): local_tim = time.localtime(tim) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/ae4c98cbb2d187bb846fadce9584c1499a… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/ae4c98cbb2d187bb846fadce9584c1499a… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_1.1] 2 commits: Flatpak: Fix access to GnuPG keys
by André 16 Mar '19

16 Mar '19

André pushed to branch gajim_1.1 at gajim / gajim Commits: 4099b01f by André Apitzsch at 2019-03-16T22:59:15Z Flatpak: Fix access to GnuPG keys Fixes gajim/gajim-plugins#386 - - - - - 65dc8ed8 by André Apitzsch at 2019-03-16T23:09:46Z Flatpak: Update dependencies - - - - - 1 changed file: - flatpak/org.gajim.Gajim.yaml Changes: ===================================== flatpak/org.gajim.Gajim.yaml ===================================== @@ -20,6 +20,8 @@ finish-args: - --filesystem=~/.config/dconf:ro - --talk-name=ca.desrt.dconf - --env=DCONF_USER_CONFIG_DIR=.config/dconf + # GnuPG + - --filesystem=~/.gnupg # extensions - --env=PYTHONPATH=/app/plugins/lib/python3.7/site-packages @@ -60,8 +62,8 @@ modules: - pip3 install --prefix=/app . sources: - type: archive - url: https://files.pythonhosted.org/packages/bc/81/47bd0404f2cb5363edb371e3b15da… - sha256: 9b6f7ba4e78c52c1a291d0c0c0bd745d19adde1a9e1c03cb899f0c6efd6f8033 + url: https://files.pythonhosted.org/packages/64/7c/27367b38e6cc3e1f49f193deb761f… + sha256: e113878a446c6228669144ae8a56e268c91b7f1fafae927adc4879d9849e0ea7 - name: python3-asn1crypto buildsystem: simple @@ -87,8 +89,8 @@ modules: - pip3 install --prefix=/app . sources: - type: archive - url: https://files.pythonhosted.org/packages/22/21/233e38f74188db94e8451ef638575… - sha256: 8d10113ca826a4c29d5b85b2c4e045ffa8bad74fb525ee0eceb1d38d4c70dfd6 + url: https://files.pythonhosted.org/packages/07/ca/bc827c5e55918ad223d59d299fff9… + sha256: 26c821cbeb683facb966045e2064303029d572a87ee69ca5a1bf54bf55f93ca6 - name: python3-pyopenssl buildsystem: simple @@ -180,8 +182,8 @@ modules: - pip3 install --prefix=/app . sources: - type: archive - url: https://files.pythonhosted.org/packages/e4/74/877d904d144163862edae107dc919… - sha256: 660d796f6d97b30a5e249417abf012ee30a22b9e40817dde05ca9f35c96cc80d + url: https://files.pythonhosted.org/packages/d6/01/34b2a441926780f26edd21490158a… + sha256: cd73417777e4847fdd8d0d96c7cafc606952edbd2b9d52a2a72bb2aaa04d08ef - name: gajim buildsystem: simple View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/c972196a4f25540a2cba30c1d22d9bf33… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/c972196a4f25540a2cba30c1d22d9bf33… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Flatpak: Fix access to GnuPG keys
by André 16 Mar '19

16 Mar '19

André pushed to branch master at gajim / gajim Commits: ab6623d7 by André Apitzsch at 2019-03-16T23:11:33Z Flatpak: Fix access to GnuPG keys Fixes gajim/gajim-plugins#386 - - - - - 5af7fbd4 by André Apitzsch at 2019-03-16T23:12:00Z Flatpak: Update dependencies - - - - - 1 changed file: - flatpak/org.gajim.Gajim.yaml Changes: ===================================== flatpak/org.gajim.Gajim.yaml ===================================== @@ -22,6 +22,8 @@ finish-args: - --filesystem=~/.config/dconf:ro - --talk-name=ca.desrt.dconf - --env=DCONF_USER_CONFIG_DIR=.config/dconf + # GnuPG + - --filesystem=~/.gnupg # extensions - --env=PYTHONPATH=/app/plugins/lib/python3.7/site-packages @@ -62,8 +64,8 @@ modules: - pip3 install --prefix=/app . sources: - type: archive - url: https://files.pythonhosted.org/packages/bc/81/47bd0404f2cb5363edb371e3b15da… - sha256: 9b6f7ba4e78c52c1a291d0c0c0bd745d19adde1a9e1c03cb899f0c6efd6f8033 + url: https://files.pythonhosted.org/packages/64/7c/27367b38e6cc3e1f49f193deb761f… + sha256: e113878a446c6228669144ae8a56e268c91b7f1fafae927adc4879d9849e0ea7 - name: python3-asn1crypto buildsystem: simple @@ -89,8 +91,8 @@ modules: - pip3 install --prefix=/app . sources: - type: archive - url: https://files.pythonhosted.org/packages/22/21/233e38f74188db94e8451ef638575… - sha256: 8d10113ca826a4c29d5b85b2c4e045ffa8bad74fb525ee0eceb1d38d4c70dfd6 + url: https://files.pythonhosted.org/packages/07/ca/bc827c5e55918ad223d59d299fff9… + sha256: 26c821cbeb683facb966045e2064303029d572a87ee69ca5a1bf54bf55f93ca6 - name: python3-pyopenssl buildsystem: simple View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/6ef3b8e01b2b01a582125689351e9c5e8… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/6ef3b8e01b2b01a582125689351e9c5e8… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_1.1] 2 commits: Raise nbxmpp version
by Philipp Hörist 16 Mar '19

16 Mar '19

Philipp Hörist pushed to branch gajim_1.1 at gajim / gajim Commits: 06ca9b39 by Philipp Hörist at 2019-03-16T15:21:53Z Raise nbxmpp version - - - - - c972196a by Philipp Hörist at 2019-03-16T15:32:42Z Update ChangeLog - - - - - 2 changed files: - ChangeLog - gajim/gajim.py Changes: ===================================== ChangeLog ===================================== @@ -1,3 +1,18 @@ +Gajim 1.1.3 (TBA) + + Bug fixes + + * #9514 Fix jingle filetransfers not working in some circumstances + * #9573 Dont leak DNS query when connecting over proxy + * #9578 Determine Windows version more reliably + * #9622 Fix an error while quitting Gajim + * Use UUID4 item ids for pubsub posts + * Various smaller improvements + + Features + + * Add a mobile phone indicator to the chat window + Gajim 1.1.2 (15 January 2019) Bug fixes ===================================== gajim/gajim.py ===================================== @@ -27,7 +27,7 @@ from distutils.version import LooseVersion as V # Install _() in namespace from gajim.common import i18n -_MIN_NBXMPP_VER = "0.6.9" +_MIN_NBXMPP_VER = "0.6.10" _MIN_GTK_VER = "3.22.0" View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/bb4daa294551cf9e2530db9586aa18bd3… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/bb4daa294551cf9e2530db9586aa18bd3… 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 2019