Commits September 2018

commits@gajim.org

1 participants
100 discussions

[Git][gajim/gajim][master] Fix subscribing to contact
by Philipp Hörist 09 Sep '18

09 Sep '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: f82cd95f by Philipp Hörist at 2018-09-09T15:43:17Z Fix subscribing to contact Fixes #9321 - - - - - 1 changed file: - gajim/common/modules/presence.py Changes: ===================================== gajim/common/modules/presence.py ===================================== --- a/gajim/common/modules/presence.py +++ b/gajim/common/modules/presence.py @@ -52,6 +52,9 @@ class Presence: return log.info('Received from %s', stanza.getFrom()) + if nbxmpp.isErrorNode(stanza): + log.info('Error:\n%s', stanza) + app.nec.push_incoming_event( NetworkEvent('raw-pres-received', conn=self._con, @@ -166,7 +169,7 @@ class Presence: item.addChild('group').setData(group) self._con.connection.send(iq) - self.send_presence(jid, 'subscribe', msg) + self.send_presence(jid, 'subscribe', status=msg) def get_presence(self, to=None, typ=None, priority=None, show=None, status=None, nick=None, caps=True, View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/f82cd95f2c0bcd1dd6ee1f0c0aedcc1abf… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/f82cd95f2c0bcd1dd6ee1f0c0aedcc1abf… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Request blocking list on connect
by Philipp Hörist 09 Sep '18

09 Sep '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 43270400 by Philipp Hörist at 2018-09-09T14:50:55Z Request blocking list on connect - - - - - 1 changed file: - gajim/common/connection_handlers.py Changes: ===================================== gajim/common/connection_handlers.py ===================================== --- a/gajim/common/connection_handlers.py +++ b/gajim/common/connection_handlers.py @@ -580,11 +580,9 @@ class ConnectionHandlers(ConnectionSocks5Bytestream, # ask our VCard self.get_module('VCardTemp').request_vcard() - # Get bookmarks self.get_module('Bookmarks').get_bookmarks() - - # Get annotations from private namespace self.get_module('Annotations').get_annotations() + self.get_module('Blocking').get_blocking_list() # Inform GUI we just signed in app.nec.push_incoming_event(SignedInEvent(None, conn=self)) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/432704005d2bd161d7400b16594ce9b53c… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/432704005d2bd161d7400b16594ce9b53c… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Add Builder class
by Philipp Hörist 09 Sep '18

09 Sep '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: a4970519 by Philipp Hörist at 2018-09-09T13:29:55Z Add Builder class - - - - - 1 changed file: - gajim/gtk/util.py Changes: ===================================== gajim/gtk/util.py ===================================== --- a/gajim/gtk/util.py +++ b/gajim/gtk/util.py @@ -31,6 +31,47 @@ _icon_theme.append_search_path(configpaths.get('ICONS')) log = logging.getLogger('gajim.gtk.util') +class Builder: + def __init__(self, filename=None, widget=None): + self._builder = Gtk.Builder() + self._builder.set_translation_domain(i18n.DOMAIN) + + file_path = os.path.join(configpaths.get('GUI'), filename) + + if sys.platform == "win32": + # This is a workaround for non working translation on Windows + tree = ET.parse(file_path) + for node in tree.iter(): + if 'translatable' in node.attrib: + node.text = _(node.text) + xml_text = ET.tostring(tree.getroot(), + encoding='unicode', + method='xml') + + if widget is not None: + self._builder.add_objects_from_string(xml_text, [widget]) + else: + # Workaround + # https://gitlab.gnome.org/GNOME/pygobject/issues/255 + Gtk.Builder.__mro__[1].add_from_string( + self._builder, xml_text, len(xml_text.encode("utf-8"))) + else: + if widget is not None: + self._builder.add_objects_from_file(file_path, [widget]) + else: + self._builder.add_from_file(file_path) + + def __getattr__(self, name): + try: + return getattr(self._builder, name) + except AttributeError: + return self._builder.get_object(name) + + +def get_builder(file_name, widget=None): + return Builder(file_name, widget) + + def load_icon(icon_name, widget, size=16, pixbuf=False, flags=Gtk.IconLookupFlags.FORCE_SIZE): @@ -49,37 +90,6 @@ def load_icon(icon_name, widget, size=16, pixbuf=False, log.error('Unable to load icon %s: %s', icon_name, str(e)) -def get_builder(file_name, widget=None): - file_path = os.path.join(configpaths.get('GUI'), file_name) - - builder = Gtk.Builder() - builder.set_translation_domain(i18n.DOMAIN) - - if sys.platform == "win32": - # This is a workaround for non working translation on Windows - tree = ET.parse(file_path) - for node in tree.iter(): - if 'translatable' in node.attrib: - node.text = _(node.text) - xml_text = ET.tostring(tree.getroot(), - encoding='unicode', - method='xml') - - if widget is not None: - builder.add_objects_from_string(xml_text, [widget]) - else: - # Workaround - # https://gitlab.gnome.org/GNOME/pygobject/issues/255 - Gtk.Builder.__mro__[1].add_from_string( - builder, xml_text, len(xml_text.encode("utf-8"))) - else: - if widget is not None: - builder.add_objects_from_file(file_path, [widget]) - else: - builder.add_from_file(file_path) - return builder - - def get_iconset_name_for(name): if name == 'not in roster': name = 'notinroster' View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/a4970519654ef08a3c13fb84bc4ccf9a21… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/a4970519654ef08a3c13fb84bc4ccf9a21… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Fix fallback for bookmark name
by Philipp Hörist 08 Sep '18

08 Sep '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 0a20cb59 by Philipp Hörist at 2018-09-08T21:55:31Z Fix fallback for bookmark name - - - - - 1 changed file: - gajim/common/modules/bookmarks.py Changes: ===================================== gajim/common/modules/bookmarks.py ===================================== --- a/gajim/common/modules/bookmarks.py +++ b/gajim/common/modules/bookmarks.py @@ -305,10 +305,11 @@ class Bookmarks: None, account=self._account)) def get_name_from_bookmark(self, jid): + fallback = jid.split('@')[0] try: - return self.bookmarks[jid]['name'] + return self.bookmarks[jid]['name'] or fallback except KeyError: - return jid.split('@')[0] + return fallback def purge_pubsub_bookmarks(self): log.info('Purge/Delete Bookmarks on PubSub, ' View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/0a20cb5997e635d12ccc5d72080ac0c38a… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/0a20cb5997e635d12ccc5d72080ac0c38a… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Improve speed of groupchat roster
by Philipp Hörist 08 Sep '18

08 Sep '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 27dd36cc by Philipp Hörist at 2018-09-08T18:49:26Z Improve speed of groupchat roster - Save reference to contact in a dict instead of iterating the whole model - Sort roster only once after all contacts have been added to the roster - Speed up get_gc_contact() Fixes #9334 - - - - - 2 changed files: - gajim/common/contacts.py - gajim/groupchat_control.py Changes: ===================================== gajim/common/contacts.py ===================================== --- a/gajim/common/contacts.py +++ b/gajim/common/contacts.py @@ -643,10 +643,10 @@ class GC_Contacts(): return list(self._rooms[room_jid].keys()) def get_gc_contact(self, room_jid, nick): - nick_list = self.get_nick_list(room_jid) - if not nick in nick_list: + try: + return self._rooms[room_jid][nick] + except KeyError: return None - return self._rooms[room_jid][nick] def is_gc_contact(self, jid): """ ===================================== gajim/groupchat_control.py ===================================== --- a/gajim/groupchat_control.py +++ b/gajim/groupchat_control.py @@ -399,11 +399,15 @@ class GroupchatControl(ChatControlBase): hpaned_position = app.config.get('gc-hpaned-position') self.hpaned.set_position(hpaned_position) + # Holds the Gtk.TreeRowReference for each contact + self._contact_refs = {} + # Holds the Gtk.TreeRowReference for each role + self._role_refs = {} + #status_image, shown_nick, type, nickname, avatar self.columns = [Gtk.Image, str, str, str, Gtk.Image] self.model = Gtk.TreeStore(*self.columns) self.model.set_sort_func(Column.NICK, self.tree_compare_iters) - self.model.set_sort_column_id(Column.NICK, Gtk.SortType.ASCENDING) # columns column = Gtk.TreeViewColumn() @@ -1297,16 +1301,11 @@ class GroupchatControl(ChatControlBase): app.interface.roster.draw_contact(self.room_jid, self.account) def get_contact_iter(self, nick): - role_iter = self.model.get_iter_first() - while role_iter: - user_iter = self.model.iter_children(role_iter) - while user_iter: - if nick == self.model[user_iter][Column.NICK]: - return user_iter - else: - user_iter = self.model.iter_next(user_iter) - role_iter = self.model.iter_next(role_iter) - return None + try: + ref = self._contact_refs[nick] + return self.model.get_iter(ref.get_path()) + except KeyError: + return None def print_old_conversation(self, text, contact='', tim=None, xhtml = None, displaymarking=None, msg_stanza_id=None, encrypted=None, additional_data=None): @@ -1606,6 +1605,9 @@ class GroupchatControl(ChatControlBase): app.gc_connected[self.account][self.room_jid] = True ChatControlBase.got_connected(self) + + # Sort model and assign it to treeview + self.model.set_sort_column_id(Column.NICK, Gtk.SortType.ASCENDING) self.list_treeview.set_model(self.model) self.list_treeview.expand_all() # We don't redraw the whole banner here, because only icon change @@ -1621,7 +1623,12 @@ class GroupchatControl(ChatControlBase): def got_disconnected(self): formattings_button = self.xml.get_object('formattings_button') formattings_button.set_sensitive(False) + + self.model.set_sort_column_id(Gtk.TREE_SORTABLE_UNSORTED_SORT_COLUMN_ID, + Gtk.SortType.ASCENDING) self.list_treeview.set_model(None) + self._contact_refs = {} + self._role_refs = {} self.model.clear() nick_list = app.contacts.get_nick_list(self.account, self.room_jid) for nick in nick_list: @@ -2028,7 +2035,7 @@ class GroupchatControl(ChatControlBase): self.update_actions() def add_contact_to_roster(self, nick, show, role, affiliation, status, - jid='', avatar_sha=None): + jid='', avatar_sha=None): role_name = helpers.get_uf_role(role, plural=True) resource = '' @@ -2042,43 +2049,57 @@ class GroupchatControl(ChatControlBase): name = nick + # Add Contact + gc_contact = app.contacts.create_gc_contact( + room_jid=self.room_jid, account=self.account, + name=nick, show=show, status=status, role=role, + affiliation=affiliation, jid=j, resource=resource, + avatar_sha=avatar_sha) + app.contacts.add_gc_contact(self.account, gc_contact) + + # Create Role role_iter = self.get_role_iter(role) if not role_iter: - image = gtkgui_helpers.get_image_from_icon_name('closed', self.scale_factor) - role_iter = self.model.append(None, - [image, role, 'role', role_name, None] + [None] * self.nb_ext_renderers) + image = gtkgui_helpers.get_image_from_icon_name('closed', + self.scale_factor) + ext_columns = [None] * self.nb_ext_renderers + row = [image, role, 'role', role_name, None] + ext_columns + role_iter = self.model.append(None, row) + self._role_refs[role] = Gtk.TreeRowReference( + self.model, self.model.get_path(role_iter)) self.draw_all_roles() - iter_ = self.model.append(role_iter, [None, nick, 'contact', name, None] + \ - [None] * self.nb_ext_renderers) - if not nick in app.contacts.get_nick_list(self.account, - self.room_jid): - gc_contact = app.contacts.create_gc_contact( - room_jid=self.room_jid, account=self.account, - name=nick, show=show, status=status, role=role, - affiliation=affiliation, jid=j, resource=resource, - avatar_sha=avatar_sha) - app.contacts.add_gc_contact(self.account, gc_contact) - else: - gc_contact = app.contacts.get_gc_contact(self.account, self.room_jid, nick) + + # Avatar + image = None + if app.config.get('show_avatars_in_roster'): + surface = app.interface.get_avatar( + avatar_sha, AvatarSize.ROSTER, self.scale_factor) + image = Gtk.Image.new_from_surface(surface) + + # Add to model + ext_columns = [None] * self.nb_ext_renderers + row = [image, nick, 'contact', name, None] + ext_columns + iter_ = self.model.append(role_iter, row) + self._contact_refs[nick] = Gtk.TreeRowReference( + self.model, self.model.get_path(iter_)) + self.draw_contact(nick) - self.draw_avatar(gc_contact) - if nick == self.nick: # we became online + if nick == self.nick: # we became online self.got_connected() if self.list_treeview.get_model(): - self.list_treeview.expand_row((self.model.get_path(role_iter)), False) + self.list_treeview.expand_row( + (self.model.get_path(role_iter)), False) if self.is_continued: self.draw_banner_text() return iter_ def get_role_iter(self, role): - role_iter = self.model.get_iter_first() - while role_iter: - role_name = self.model[role_iter][Column.NICK] - if role == role_name: - return role_iter - role_iter = self.model.iter_next(role_iter) - return None + try: + ref = self._role_refs[role] + return self.model.get_iter(ref.get_path()) + except KeyError: + return None def remove_contact(self, nick): """ @@ -2087,13 +2108,20 @@ class GroupchatControl(ChatControlBase): iter_ = self.get_contact_iter(nick) if not iter_: return - gc_contact = app.contacts.get_gc_contact(self.account, self.room_jid, - nick) + gc_contact = app.contacts.get_gc_contact( + self.account, self.room_jid, nick) if gc_contact: app.contacts.remove_gc_contact(self.account, gc_contact) + parent_iter = self.model.iter_parent(iter_) + if parent_iter is None: + # This is not a child, should never happen + return self.model.remove(iter_) + del self._contact_refs[nick] if self.model.iter_n_children(parent_iter) == 0: + role = self.model[parent_iter][Column.NICK] + del self._role_refs[role] self.model.remove(parent_iter) def _message_sent(self, obj): View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/27dd36cca3464e35f6343cf7f65fd78ea6… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/27dd36cca3464e35f6343cf7f65fd78ea6… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Windows: Fix translation
by Philipp Hörist 08 Sep '18

08 Sep '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 52e09cf5 by Philipp Hörist at 2018-09-08T06:40:42Z Windows: Fix translation Fixes #9324 - - - - - 3 changed files: - gajim/application.py - gajim/gtk/util.py - gajim/gtkgui_helpers.py Changes: ===================================== gajim/application.py ===================================== --- a/gajim/application.py +++ b/gajim/application.py @@ -182,8 +182,8 @@ class GajimApplication(Gtk.Application): # Set Application Menu app.app = self - from gajim import gtkgui_helpers - builder = gtkgui_helpers.get_gtk_builder('application_menu.ui') + from gajim.gtk.util import get_builder + builder = get_builder('application_menu.ui') menubar = builder.get_object("menubar") appmenu = builder.get_object("appmenu") if app.prefers_app_menu(): ===================================== gajim/gtk/util.py ===================================== --- a/gajim/gtk/util.py +++ b/gajim/gtk/util.py @@ -68,7 +68,10 @@ def get_builder(file_name, widget=None): if widget is not None: builder.add_objects_from_string(xml_text, [widget]) else: - builder.add_from_string(xml_text) + # Workaround + # https://gitlab.gnome.org/GNOME/pygobject/issues/255 + Gtk.Builder.__mro__[1].add_from_string( + builder, xml_text, len(xml_text.encode("utf-8"))) else: if widget is not None: builder.add_objects_from_file(file_path, [widget]) ===================================== gajim/gtkgui_helpers.py ===================================== --- a/gajim/gtkgui_helpers.py +++ b/gajim/gtkgui_helpers.py @@ -140,7 +140,10 @@ def get_gtk_builder(file_name, widget=None): if widget is not None: builder.add_objects_from_string(xml_text, [widget]) else: - builder.add_from_string(xml_text) + # Workaround + # https://gitlab.gnome.org/GNOME/pygobject/issues/255 + Gtk.Builder.__mro__[1].add_from_string( + builder, xml_text, len(xml_text.encode("utf-8"))) else: if widget is not None: builder.add_objects_from_file(file_path, [widget]) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/52e09cf5265b6fd1bfeaeda8a8e7b4db26… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/52e09cf5265b6fd1bfeaeda8a8e7b4db26… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Remove verbose logging of idle time
by Philipp Hörist 06 Sep '18

06 Sep '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: c8b31dff by Philipp Hörist at 2018-09-06T19:44:31Z Remove verbose logging of idle time - - - - - 1 changed file: - gajim/common/idle.py Changes: ===================================== gajim/common/idle.py ===================================== --- a/gajim/common/idle.py +++ b/gajim/common/idle.py @@ -257,7 +257,6 @@ class IdleMonitor: return True idle_time = self.get_idle_sec() - log.info('Idle time: %s', idle_time) # xa is stronger than away so check for xa first if idle_time > self._xa_interval: View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/c8b31dffbbc4ebe716ded2a47d01102089… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/c8b31dffbbc4ebe716ded2a47d01102089… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Windows: Improve locked screen detection
by Philipp Hörist 06 Sep '18

06 Sep '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: bba88cf6 by Philipp Hörist at 2018-09-06T19:41:38Z Windows: Improve locked screen detection UAC prompts count as locked screens, so only trigger extended away when the screen is more than 10 seconds locked Fixes #9117 - - - - - 1 changed file: - gajim/common/idle.py Changes: ===================================== gajim/common/idle.py ===================================== --- a/gajim/common/idle.py +++ b/gajim/common/idle.py @@ -20,6 +20,7 @@ # along with Gajim. If not, see <http://www.gnu.org/licenses/>. import sys +import time import ctypes import ctypes.util import logging @@ -151,6 +152,8 @@ class WindowsIdleMonitor: self.GetTickCount = ctypes.windll.kernel32.GetTickCount self.GetLastInputInfo = ctypes.windll.user32.GetLastInputInfo + self._locked_time = None + class LASTINPUTINFO(ctypes.Structure): _fields_ = [('cbSize', ctypes.c_uint), ('dwTime', ctypes.c_uint)] @@ -165,17 +168,29 @@ class WindowsIdleMonitor: # Check if Screen Saver is running # 0x72 is SPI_GETSCREENSAVERRUNNING saver_runing = ctypes.c_int(0) - info = self.SystemParametersInfo(0x72, 0, ctypes.byref(saver_runing), 0) + info = self.SystemParametersInfo( + 0x72, 0, ctypes.byref(saver_runing), 0) if info and saver_runing.value: return True # Check if Screen is locked + # Also a UAC prompt counts as locked + # So just return True if we are more than 10 seconds locked desk = self.OpenInputDesktop(0, False, 0) - if not desk: - return True + unlocked = bool(desk) self.CloseDesktop(desk) - return False + if unlocked: + self._locked_time = None + return False + + if self._locked_time is None: + self._locked_time = time.time() + return False + + threshold = time.time() - 10 + if threshold > self._locked_time: + return True class IdleMonitor: View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/bba88cf60918e17f5b3a93d904ec2fd612… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/bba88cf60918e17f5b3a93d904ec2fd612… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Revert "Windows: Remove locked screen detection"
by Philipp Hörist 06 Sep '18

06 Sep '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 3a16ccb4 by Philipp Hörist at 2018-09-06T19:38:41Z Revert "Windows: Remove locked screen detection" This reverts commit 05307bd6098343993b6b57544ee5fccd2a3ce7ac - - - - - 1 changed file: - gajim/common/idle.py Changes: ===================================== gajim/common/idle.py ===================================== --- a/gajim/common/idle.py +++ b/gajim/common/idle.py @@ -168,6 +168,13 @@ class WindowsIdleMonitor: info = self.SystemParametersInfo(0x72, 0, ctypes.byref(saver_runing), 0) if info and saver_runing.value: return True + + # Check if Screen is locked + desk = self.OpenInputDesktop(0, False, 0) + if not desk: + return True + self.CloseDesktop(desk) + return False View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/3a16ccb4d453f399482f81fc35326edce8… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/3a16ccb4d453f399482f81fc35326edce8… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Windows: Remove locked screen detection
by Philipp Hörist 06 Sep '18

06 Sep '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 05307bd6 by Philipp Hörist at 2018-09-06T19:17:05Z Windows: Remove locked screen detection This does not reliably tell us when the screen is locked. For example this triggers when a UAC prompt is active. >From the Windows documentation there is no way to determine if a workstation is locked Fixes #9117 - - - - - 1 changed file: - gajim/common/idle.py Changes: ===================================== gajim/common/idle.py ===================================== --- a/gajim/common/idle.py +++ b/gajim/common/idle.py @@ -168,13 +168,6 @@ class WindowsIdleMonitor: info = self.SystemParametersInfo(0x72, 0, ctypes.byref(saver_runing), 0) if info and saver_runing.value: return True - - # Check if Screen is locked - desk = self.OpenInputDesktop(0, False, 0) - if not desk: - return True - self.CloseDesktop(desk) - return False View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/05307bd6098343993b6b57544ee5fccd2a… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/05307bd6098343993b6b57544ee5fccd2a… You're receiving this email because of your account on dev.gajim.org.

1 0

← Newer
1
2
3
4
5
6
7
8
9
10
Older →

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits September 2018