Commits July 2017

commits@gajim.org

1 participants
66 discussions

[Git][gajim/gajim][xep-0319] 3 commits: Revert "fix missing return"
by Yann Leboulanger 30 Jul '17

30 Jul '17

Yann Leboulanger pushed to branch xep-0319 at gajim / gajim Commits: 4aa03778 by Yann Leboulanger at 2017-07-30T22:39:59+02:00 Revert "fix missing return" This reverts commit 10a50064cdae247f65fe7779b9d85522640e0e48. - - - - - 8aa331e6 by Yann Leboulanger at 2017-07-30T22:40:10+02:00 Revert "fix parsing since attribute" This reverts commit ff8c17c38473b7369c6872673a8539164d395b55. - - - - - 8bf16d30 by Yann Leboulanger at 2017-07-30T22:54:43+02:00 show idle time in local time - - - - - 2 changed files: - gajim/common/connection_handlers_events.py - gajim/tooltips.py Changes: ===================================== gajim/common/connection_handlers_events.py ===================================== --- a/gajim/common/connection_handlers_events.py +++ b/gajim/common/connection_handlers_events.py @@ -125,31 +125,6 @@ class HelperEvent: self.chatstate = child.getName() break - def get_datetime(self, time_str): - """ - Parse datetime according to XEP-0082 - Returns a datetime object or None - """ - if time_str[-1:] == 'Z': - # Remove the trailing 'Z' - time_str = time_str[:-1] - elif time_str[-6:] == "+00:00": - # Remove the trailing "+00:00" - time_str = time_str[:-6] - else: - log.info("Wrong timezone defintion: %s" % time_str) - return None - try: - t = datetime.datetime.strptime(time_str, '%Y-%m-%dT%H:%M:%S') - except ValueError: - try: - t = datetime.datetime.strptime(time_str, - '%Y-%m-%dT%H:%M:%S.%f') - except ValueError as e: - log.info('Wrong time format: %s' % str(e)) - return None - return t - class HttpAuthReceivedEvent(nec.NetworkIncomingEvent): name = 'http-auth-received' base_network_events = [] @@ -234,9 +209,24 @@ class TimeResultReceivedEvent(nec.NetworkIncomingEvent, HelperEvent): def dst(self, dt): return ZERO - t = self.get_datetime(utc_time) - if not t: + if utc_time[-1:] == 'Z': + # Remove the trailing 'Z' + utc_time = utc_time[:-1] + elif utc_time[-6:] == "+00:00": + # Remove the trailing "+00:00" + utc_time = utc_time[:-6] + else: + log.info("Wrong timezone defintion: %s" % utc_time) return + try: + t = datetime.datetime.strptime(utc_time, '%Y-%m-%dT%H:%M:%S') + except ValueError: + try: + t = datetime.datetime.strptime(utc_time, + '%Y-%m-%dT%H:%M:%S.%f') + except ValueError as e: + log.info('Wrong time format: %s' % str(e)) + return t = t.replace(tzinfo=UTC()) self.time_info = t.astimezone(contact_tz()).strftime('%c') @@ -811,8 +801,9 @@ PresenceHelperEvent): self.idle_time = None idle_tag = self.stanza.getTag('idle', namespace=nbxmpp.NS_IDLE) if idle_tag: - idle_time = idle_tag.getAttr('since') - self.idle_time = self.get_datetime(idle_time) + time_str = idle_tag.getAttr('since') + tim = helpers.datetime_tuple(time_str) + self.idle_time = timegm(tim) xtags = self.stanza.getTags('x') for x in xtags: namespace = x.getNamespace() ===================================== gajim/tooltips.py ===================================== --- a/gajim/tooltips.py +++ b/gajim/tooltips.py @@ -715,6 +715,8 @@ class RosterTooltip(Gtk.Window, StatusTable): if contact.idle_time: idle_color = gajim.config.get('tooltip_idle_color') idle_time = contact.idle_time + idle_time = time.localtime(contact.idle_time) + idle_time = datetime(*(idle_time[:6])) current = datetime.now() if idle_time.date() == current.date(): formatted = idle_time.strftime("%X") View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/10a50064cdae247f65fe7779b9d855226…

1 0

[Git][gajim/gajim][master] Adapt to latest nbxmpp changes
by Philipp Hörist 29 Jul '17

29 Jul '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: c1decf68 by Philipp Hörist at 2017-07-29T21:35:45+02:00 Adapt to latest nbxmpp changes - - - - - 1 changed file: - gajim/common/connection_handlers_events.py Changes: ===================================== gajim/common/connection_handlers_events.py ===================================== --- a/gajim/common/connection_handlers_events.py +++ b/gajim/common/connection_handlers_events.py @@ -1062,7 +1062,7 @@ class MamMessageReceivedEvent(nec.NetworkIncomingEvent, HelperEvent): log.info('MAM message not from our user archive') return False - self.msg_ = self.forwarded.getTag('message') + self.msg_ = self.forwarded.getTag('message', protocol=True) if self.msg_.getType() == 'groupchat': log.info('Received groupchat message from user archive') @@ -1075,11 +1075,8 @@ class MamMessageReceivedEvent(nec.NetworkIncomingEvent, HelperEvent): to = self.msg_.getTo() if frm.bareMatch(own_jid): - self.stanza_id = self.msg_.getTag('origin-id', - namespace=nbxmpp.NS_SID) - if self.stanza_id: - self.stanza_id = self.stanza_id.getID() - else: + self.stanza_id = self.msg_.getOriginID() + if not self.stanza_id: self.stanza_id = self.msg_.getID() self.with_ = to @@ -1228,11 +1225,13 @@ class MessageReceivedEvent(nec.NetworkIncomingEvent, HelperEvent): return self.forwarded = True - result = self.stanza.getTag('result') + result = self.stanza.getTag('result', protocol=True) if result and result.getNamespace() in (nbxmpp.NS_MAM, nbxmpp.NS_MAM_1, nbxmpp.NS_MAM_2): - forwarded = result.getTag('forwarded', namespace=nbxmpp.NS_FORWARD) + forwarded = result.getTag('forwarded', + namespace=nbxmpp.NS_FORWARD, + protocol=True) if not forwarded: log.warning('Invalid MAM Message: no forwarded child') return View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/c1decf682ba836927ba1df80c33aa4dcf8…

1 0

[Git][gajim/python-nbxmpp][master] Update ChangeLog
by Philipp Hörist 29 Jul '17

29 Jul '17

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: e9d06e6a by Philipp Hörist at 2017-07-29T21:33:35+02:00 Update ChangeLog - - - - - 1 changed file: - ChangeLog Changes: ===================================== ChangeLog ===================================== --- a/ChangeLog +++ b/ChangeLog @@ -2,13 +2,10 @@ python-nbxmpp 0.6.0 (tba) * Add new getOriginID/SetOriginID method for Messages * Add new getJid() method for Protocol - * getTagAttr() accepts now a Namespace to filter - * Return Protocol/Message instance when using getTag() + * getTagAttr() accepts now a namespace argument + * Add new `protocol` argument for getTag() * Add new XEP Namespaces - Attention: - The API for getTag() changed in the way that it always returns a Protocol or Message instance now instead of a Node instance before. This means 'to' and 'from' attributes return now a JID instance instead of a string - python-nbxmpp 0.5.6 (03 June 2017) * Support XEP-0198 Version 1.5.2 View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/e9d06e6a196105348979ed8587…

1 0

[Git][gajim/python-nbxmpp][master] Revert API changes
by Philipp Hörist 29 Jul '17

29 Jul '17

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: c3adfe67 by Philipp Hörist at 2017-07-29T21:31:09+02:00 Revert API changes Introduce a new named argument `protocol` to return a Protocol/Message instance when calling getTag() instead of changing the default return value of getTag() which would be an API change. - - - - - 1 changed file: - nbxmpp/protocol.py Changes: ===================================== nbxmpp/protocol.py ===================================== --- a/nbxmpp/protocol.py +++ b/nbxmpp/protocol.py @@ -957,15 +957,18 @@ class Protocol(Node): props.append(prop) return props - def getTag(self, name, attrs=None, namespace=None): + def getTag(self, name, attrs=None, namespace=None, protocol=False): """ - Return at least a Protocol instance, so we dont fall back to simplexml level + Return the Node instance for the tag. + If protocol is True convert to a new Protocol/Message instance. """ - tag = super(Protocol, self).getTag(name, attrs, namespace) - if not tag: - return None - - return Protocol(node=tag) + tag = Node.getTag(self, name, attrs, namespace) + if protocol and tag: + if name == 'message': + return Message(node=tag) + else: + return Protocol(node=tag) + return tag def __setitem__(self, item, val): """ @@ -1106,18 +1109,6 @@ class Message(Protocol): attrs.append(child.getAttr('code')) return attrs - def getTag(self, name, attrs=None, namespace=None): - """ - Return Message instance, fallback to Protocol - """ - tag = super(Message, self).getTag(name, attrs, namespace) - if not tag: - return tag - - if name == 'message': - return Message(node=tag) - return tag - class Presence(Protocol): def __init__(self, to=None, typ=None, priority=None, show=None, status=None, View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/c3adfe67f8cf9e276ed43efa26…

1 0

[Git][gajim/gajim][xep-0319] fix missing return
by Yann Leboulanger 28 Jul '17

28 Jul '17

Yann Leboulanger pushed to branch xep-0319 at gajim / gajim Commits: 10a50064 by Yann Leboulanger at 2017-07-28T22:42:35+02:00 fix missing return - - - - - 1 changed file: - gajim/common/connection_handlers_events.py Changes: ===================================== gajim/common/connection_handlers_events.py ===================================== --- a/gajim/common/connection_handlers_events.py +++ b/gajim/common/connection_handlers_events.py @@ -148,6 +148,7 @@ class HelperEvent: except ValueError as e: log.info('Wrong time format: %s' % str(e)) return None + return t class HttpAuthReceivedEvent(nec.NetworkIncomingEvent): name = 'http-auth-received' View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/10a50064cdae247f65fe7779b9d8552264…

1 0

[Git][gajim/gajim][xep-0319] fix parsing since attribute
by Yann Leboulanger 28 Jul '17

28 Jul '17

Yann Leboulanger pushed to branch xep-0319 at gajim / gajim Commits: ff8c17c3 by Yann Leboulanger at 2017-07-28T21:51:56+02:00 fix parsing since attribute - - - - - 1 changed file: - gajim/common/connection_handlers_events.py Changes: ===================================== gajim/common/connection_handlers_events.py ===================================== --- a/gajim/common/connection_handlers_events.py +++ b/gajim/common/connection_handlers_events.py @@ -125,6 +125,30 @@ class HelperEvent: self.chatstate = child.getName() break + def get_datetime(self, time_str): + """ + Parse datetime according to XEP-0082 + Returns a datetime object or None + """ + if time_str[-1:] == 'Z': + # Remove the trailing 'Z' + time_str = time_str[:-1] + elif time_str[-6:] == "+00:00": + # Remove the trailing "+00:00" + time_str = time_str[:-6] + else: + log.info("Wrong timezone defintion: %s" % time_str) + return None + try: + t = datetime.datetime.strptime(time_str, '%Y-%m-%dT%H:%M:%S') + except ValueError: + try: + t = datetime.datetime.strptime(time_str, + '%Y-%m-%dT%H:%M:%S.%f') + except ValueError as e: + log.info('Wrong time format: %s' % str(e)) + return None + class HttpAuthReceivedEvent(nec.NetworkIncomingEvent): name = 'http-auth-received' base_network_events = [] @@ -209,24 +233,9 @@ class TimeResultReceivedEvent(nec.NetworkIncomingEvent, HelperEvent): def dst(self, dt): return ZERO - if utc_time[-1:] == 'Z': - # Remove the trailing 'Z' - utc_time = utc_time[:-1] - elif utc_time[-6:] == "+00:00": - # Remove the trailing "+00:00" - utc_time = utc_time[:-6] - else: - log.info("Wrong timezone defintion: %s" % utc_time) + t = self.get_datetime(utc_time) + if not t: return - try: - t = datetime.datetime.strptime(utc_time, '%Y-%m-%dT%H:%M:%S') - except ValueError: - try: - t = datetime.datetime.strptime(utc_time, - '%Y-%m-%dT%H:%M:%S.%f') - except ValueError as e: - log.info('Wrong time format: %s' % str(e)) - return t = t.replace(tzinfo=UTC()) self.time_info = t.astimezone(contact_tz()).strftime('%c') @@ -801,8 +810,8 @@ PresenceHelperEvent): self.idle_time = None idle_tag = self.stanza.getTag('idle', namespace=nbxmpp.NS_IDLE) if idle_tag: - self.idle_time = datetime.datetime.strptime(idle_tag.getAttr( - 'since'), '%Y-%m-%dT%H:%M:%SZ') + idle_time = idle_tag.getAttr('since') + self.idle_time = self.get_datetime(idle_time) xtags = self.stanza.getTags('x') for x in xtags: namespace = x.getNamespace() View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/ff8c17c38473b7369c6872673a8539164d…

1 0

[Git][gajim/gajim][master] Remove old ScrolledWindow from GroupchatControl
by Philipp Hörist 28 Jul '17

28 Jul '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 05b509e0 by Philipp Hörist at 2017-07-28T21:39:11+02:00 Remove old ScrolledWindow from GroupchatControl - - - - - 1 changed file: - data/gui/groupchat_control.ui Changes: ===================================== data/gui/groupchat_control.ui ===================================== --- a/data/gui/groupchat_control.ui +++ b/data/gui/groupchat_control.ui @@ -157,21 +157,7 @@ </packing> </child> <child> - <object class="GtkScrolledWindow" id="message_scrolledwindow"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hscrollbar_policy">never</property> - <property name="vscrollbar_policy">never</property> - <property name="shadow_type">in</property> - <child> - <placeholder/> - </child> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> + <placeholder/> </child> </object> <packing> View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/05b509e008066c008878c04df82715f181…

1 0

[Git][gajim/gajim][master] 2 commits: Fix use of deprecated method
by Philipp Hörist 28 Jul '17

28 Jul '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: c963fc5d by Philipp Hörist at 2017-07-28T20:40:09+02:00 Fix use of deprecated method - - - - - b8aaf09c by Philipp Hörist at 2017-07-28T20:40:30+02:00 Fix infinite expand of MessageTextView - The 'configure-event' does not trigger anymore when connected to the MessageTextView. The reason is unknown. - Use our own ScrolledWindow Widget instead so we can better control the dimension of the MessageTextView - - - - - 5 changed files: - data/gui/chat_control.ui - gajim/chat_control_base.py - gajim/htmltextview.py - gajim/message_textview.py - + gajim/scrolled_window.py Changes: ===================================== data/gui/chat_control.ui ===================================== --- a/data/gui/chat_control.ui +++ b/data/gui/chat_control.ui @@ -629,21 +629,7 @@ </packing> </child> <child> - <object class="GtkScrolledWindow" id="message_scrolledwindow"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hscrollbar_policy">never</property> - <property name="vscrollbar_policy">never</property> - <property name="shadow_type">in</property> - <child> - <placeholder/> - </child> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> + <placeholder/> </child> </object> <packing> ===================================== gajim/chat_control_base.py ===================================== --- a/gajim/chat_control_base.py +++ b/gajim/chat_control_base.py @@ -44,6 +44,7 @@ import notify import re import emoticons +from scrolled_window import ScrolledWindow from common import events from common import gajim from common import helpers @@ -327,15 +328,21 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): self.last_received_id = {} # one per name # add MessageTextView to UI and connect signals - self.msg_scrolledwindow = self.xml.get_object('message_scrolledwindow') self.msg_textview = MessageTextView() + + self.msg_scrolledwindow = ScrolledWindow() + self.msg_scrolledwindow.set_max_content_height(100) + self.msg_scrolledwindow.set_min_content_height(23) + + self.msg_scrolledwindow.set_property('shadow_type', Gtk.ShadowType.IN) self.msg_scrolledwindow.add(self.msg_textview) + + hbox = self.xml.get_object('hbox') + hbox.pack_end(self.msg_scrolledwindow, True, True, 0) + id_ = self.msg_textview.connect('key_press_event', self._on_message_textview_key_press_event) self.handlers[id_] = self.msg_textview - id_ = self.msg_textview.connect('configure-event', - self.on_configure_event) - self.handlers[id_] = self.msg_textview id_ = self.msg_textview.connect('populate_popup', self.on_msg_textview_populate_popup) self.handlers[id_] = self.msg_textview @@ -369,8 +376,6 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): # For XEP-0172 self.user_nick = None - self.smooth = True - self.command_hits = [] self.last_key_tabs = False @@ -693,6 +698,10 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): self.send_message(message, xhtml=xhtml) else: message_buffer.insert_at_cursor('\n') + mark = message_buffer.get_insert() + iter_ = message_buffer.get_iter_at_mark(mark) + if message_buffer.get_end_iter().equal(iter_): + GLib.idle_add(gtkgui_helpers.scroll_to_end, self.msg_scrolledwindow) return True elif event.keyval == Gdk.KEY_z: # CTRL+z @@ -1157,60 +1166,6 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): self.conv_textview.scroll_to_end_iter() return False - def on_configure_event(self, msg_textview, event): - """ - When message_textview changes its size: if the new height will enlarge - the window, enable the scrollbar automatic policy. Also enable scrollbar - automatic policy for horizontal scrollbar if message we have in - message_textview is too big - """ - if msg_textview.get_window() is None: - return - - min_height = self.conv_scrolledwindow.get_property('height-request') - conversation_height = self.conv_textview.tv.get_window().get_size()[1] - message_height = msg_textview.get_window().get_size()[1] - message_width = msg_textview.get_window().get_size()[0] - # new tab is not exposed yet - if conversation_height < 2: - return - - if conversation_height < min_height: - min_height = conversation_height - - # we don't want to always resize in height the message_textview - # so we have minimum on conversation_textview's scrolled window - # but we also want to avoid window resizing so if we reach that - # minimum for conversation_textview and maximum for message_textview - # we set to automatic the scrollbar policy - diff_y = message_height - event.height - if diff_y != 0: - if conversation_height + diff_y < min_height: - if message_height + conversation_height - min_height > min_height: - policy = self.msg_scrolledwindow.get_property( - 'vscrollbar-policy') - if policy != Gtk.PolicyType.AUTOMATIC: - self.msg_scrolledwindow.set_property('vscrollbar-policy', - Gtk.PolicyType.AUTOMATIC) - self.msg_scrolledwindow.set_property('height-request', - message_height + conversation_height - min_height) - else: - self.msg_scrolledwindow.set_property('vscrollbar-policy', - Gtk.PolicyType.NEVER) - self.msg_scrolledwindow.set_property('height-request', -1) - - self.smooth = True # reinit the flag - # enable scrollbar automatic policy for horizontal scrollbar - # if message we have in message_textview is too big - if event.width > message_width: - self.msg_scrolledwindow.set_property('hscrollbar-policy', - Gtk.PolicyType.AUTOMATIC) - else: - self.msg_scrolledwindow.set_property('hscrollbar-policy', - Gtk.PolicyType.NEVER) - - return True - def on_conversation_vadjustment_changed(self, adjustment): # used to stay at the end of the textview when we shrink conversation # textview. ===================================== gajim/htmltextview.py ===================================== --- a/gajim/htmltextview.py +++ b/gajim/htmltextview.py @@ -838,7 +838,7 @@ class HtmlHandler(xml.sax.handler.ContentHandler): class HtmlTextView(Gtk.TextView): def __init__(self): - GObject.GObject.__init__(self) + Gtk.TextView.__init__(self) self.set_wrap_mode(Gtk.WrapMode.CHAR) self.set_editable(False) self._changed_cursor = False @@ -1045,7 +1045,7 @@ class HtmlTextView(Gtk.TextView): clipboard = self.get_clipboard(Gdk.SELECTION_CLIPBOARD) selected = self.get_selected_text() clipboard.set_text(selected, -1) - self.emit_stop_by_name('copy-clipboard') + GObject.signal_stop_emission_by_name(self, 'copy-clipboard') def on_html_text_view_realized(self, unused_data): self.get_buffer().remove_selection_clipboard(self.get_clipboard( ===================================== gajim/message_textview.py ===================================== --- a/gajim/message_textview.py +++ b/gajim/message_textview.py @@ -29,6 +29,7 @@ from gi.repository import GLib from gi.repository import Pango from common import gajim +import gtkgui_helpers class MessageTextView(Gtk.TextView): """ @@ -38,7 +39,7 @@ class MessageTextView(Gtk.TextView): UNDO_LIMIT = 20 def __init__(self): - GObject.GObject.__init__(self) + Gtk.TextView.__init__(self) # set properties self.set_border_width(1) @@ -79,6 +80,15 @@ class MessageTextView(Gtk.TextView): self.begin_tags['strike'] = '' self.end_tags['strike'] = '' + self.connect_after('paste-clipboard', self.after_paste_clipboard) + + def after_paste_clipboard(self, textview): + buffer_ = textview.get_buffer() + mark = buffer_.get_insert() + iter_ = buffer_.get_iter_at_mark(mark) + if iter_.get_offset() == buffer_.get_end_iter().get_offset(): + GLib.idle_add(gtkgui_helpers.scroll_to_end, textview.get_parent()) + def make_clickable_urls(self, text): _buffer = self.get_buffer() ===================================== gajim/scrolled_window.py ===================================== --- /dev/null +++ b/gajim/scrolled_window.py @@ -0,0 +1,89 @@ +# -*- coding:utf-8 -*- +# Copyright (C) 2015 Patrick Griffis <tingping(a)tingping.se> +# Copyright (C) 2014 Christian Hergert <christian(a)hergert.me> +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranties of +# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR +# PURPOSE. See the GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see <http://www.gnu.org/licenses/>. + +from gi.repository import GObject, Gtk + +class ScrolledWindow(Gtk.ScrolledWindow): + """ + ScrolledWindow that sets a max size for the child to grow into. + Taken from the Gnome Builder project: + https://git.gnome.org/browse/gnome-builder/tree/contrib/egg/egg-scrolled-wi… + """ + __gtype_name__ = "EggScrolledWindow" + + max_content_height = GObject.Property(type=int, default=-1, nick="Max Content Height", + blurb="The maximum height request that can be made") + max_content_width = GObject.Property(type=int, default=-1, nick="Max Content Width", + blurb="The maximum width request that can be made") + min_content_height = GObject.Property(type=int, default=-1, nick="Min Content Height", + blurb="The minimum height request that can be made") + + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + self.connect_after("notify::max-content-height", lambda obj, param: self.queue_resize()) + self.connect_after("notify::max-content-width", lambda obj, param: self.queue_resize()) + + def set_min_content_height(self, value): + self.min_content_height = value + + def set_max_content_height(self, value): + self.max_content_height = value + + def set_max_content_width(self, value): + self.max_content_width = value + + def get_max_content_height(self): + return self.max_content_height + + def get_max_content_width(self): + return self.max_content_width + + def do_get_preferred_height(self): + min_height, natural_height = Gtk.ScrolledWindow.do_get_preferred_height(self) + child = self.get_child() + + if natural_height and self.max_content_height > -1 and child: + + style = self.get_style_context() + border = style.get_border(style.get_state()) + additional = border.top + border.bottom + + child_min_height, child_nat_height = child.get_preferred_height() + if child_nat_height > natural_height and self.max_content_height > natural_height: + natural_height = min(self.max_content_height, child_nat_height) + additional + elif natural_height > child_nat_height: + if child_nat_height < self.min_content_height: + return self.min_content_height, self.min_content_height + min_height, natural_height = child_min_height + additional, child_nat_height + additional + + return min_height, natural_height + + def do_get_preferred_width(self): + min_width, natural_width = Gtk.ScrolledWindow.do_get_preferred_width(self) + child = self.get_child() + + if natural_width and self.max_content_width > -1 and child: + + style = self.get_style_context() + border = style.get_border(style.get_state()) + additional = border.left + border.right + 1 + + child_min_width, child_nat_width = child.get_preferred_width() + if child_nat_width > natural_width and self.max_content_width > natural_width: + natural_width = min(self.max_content_width, child_nat_width) + additional + + return min_width, natural_width View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/766458f394d5360e423daf7c7467d54e0…

1 0

[Git][gajim/gajim][xep-0319] improve idle time formatting in tooltip
by Yann Leboulanger 28 Jul '17

28 Jul '17

Yann Leboulanger pushed to branch xep-0319 at gajim / gajim Commits: 96a1c9a6 by Yann Leboulanger at 2017-07-28T15:40:42+02:00 improve idle time formatting in tooltip - - - - - 2 changed files: - gajim/common/connection_handlers_events.py - gajim/tooltips.py Changes: ===================================== gajim/common/connection_handlers_events.py ===================================== --- a/gajim/common/connection_handlers_events.py +++ b/gajim/common/connection_handlers_events.py @@ -801,7 +801,8 @@ PresenceHelperEvent): self.idle_time = None idle_tag = self.stanza.getTag('idle', namespace=nbxmpp.NS_IDLE) if idle_tag: - self.idle_time = idle_tag.getAttr('since') + self.idle_time = datetime.datetime.strptime(idle_tag.getAttr( + 'since'), '%Y-%m-%dT%H:%M:%SZ') xtags = self.stanza.getTags('x') for x in xtags: namespace = x.getNamespace() ===================================== gajim/tooltips.py ===================================== --- a/gajim/tooltips.py +++ b/gajim/tooltips.py @@ -714,7 +714,14 @@ class RosterTooltip(Gtk.Window, StatusTable): def _set_idle_time(self, contact): if contact.idle_time: idle_color = gajim.config.get('tooltip_idle_color') - idle_markup = "{}".format(idle_color, contact.idle_time) + idle_time = contact.idle_time + current = datetime.now() + if idle_time.date() == current.date(): + formatted = idle_time.strftime("%X") + else: + formatted = idle_time.strftime("%c") + idle_markup = "{}".format(idle_color, + formatted) self.idle_since.set_markup(idle_markup) self.idle_since.show() self.idle_since_label.show() View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/96a1c9a61922da6bef32b6b0ebd97b0aa5…

1 0

[Git][gajim/gajim][master] 2 commits: Implement XEP-0359 Stable Stanza IDs
by Philipp Hörist 28 Jul '17

28 Jul '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 9bca51eb by Philipp Hörist at 2017-07-28T14:03:14+02:00 Implement XEP-0359 Stable Stanza IDs - This allows us to better deduplicate Messages on MAM syncs - - - - - 766458f3 by Philipp Hörist at 2017-07-28T14:51:54+02:00 HistorySync: Connect to different event for counting This lets us better count how many messages we retrieved - - - - - 7 changed files: - gajim/chat_control.py - gajim/chat_control_base.py - gajim/common/connection.py - gajim/common/connection_handlers_events.py - gajim/common/zeroconf/connection_zeroconf.py - gajim/groupchat_control.py - gajim/history_sync.py Changes: ===================================== gajim/chat_control.py ===================================== --- a/gajim/chat_control.py +++ b/gajim/chat_control.py @@ -1187,7 +1187,7 @@ class ChatControl(ChatControlBase): gajim.nec.push_outgoing_event(MessageOutgoingEvent(None, account=self.account, jid=self.contact.jid, chatstate=state, - msg_id=contact.msg_log_id, control=self)) + control=self)) contact.our_chatstate = state if state == 'active': ===================================== gajim/chat_control_base.py ===================================== --- a/gajim/chat_control_base.py +++ b/gajim/chat_control_base.py @@ -732,7 +732,7 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): return label def send_message(self, message, keyID='', type_='chat', chatstate=None, - msg_id=None, resource=None, xhtml=None, callback=None, callback_args=None, + resource=None, xhtml=None, callback=None, callback_args=None, process_commands=True, attention=False): """ Send the given message to the active tab. Doesn't return None if error @@ -757,7 +757,7 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): label = self.get_seclabel() def _cb(obj, msg, cb, *cb_args): - self.last_sent_msg = obj.msg_id + self.last_sent_msg = obj.stanza_id if cb: cb(obj, msg, *cb_args) @@ -768,7 +768,7 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): gajim.nec.push_outgoing_event(MessageOutgoingEvent(None, account=self.account, jid=self.contact.jid, message=message, - keyID=keyID, type_=type_, chatstate=chatstate, msg_id=msg_id, + keyID=keyID, type_=type_, chatstate=chatstate, resource=resource, user_nick=self.user_nick, xhtml=xhtml, label=label, callback=_cb, callback_args=[callback] + callback_args, control=self, attention=attention, correct_id=correct_id, ===================================== gajim/common/connection.py ===================================== --- a/gajim/common/connection.py +++ b/gajim/common/connection.py @@ -317,8 +317,11 @@ class CommonConnection: msg_iq.setTag('replace', attrs={'id': obj.correct_id}, namespace=nbxmpp.NS_CORRECT) - if obj.msg_id: - msg_iq.setID(obj.msg_id) + # XEP-0359 + obj.stanza_id = self.connection.getAnID() + msg_iq.setID(obj.stanza_id) + if obj.message: + msg_iq.setOriginID(obj.stanza_id) if obj.form_node: msg_iq.addChild(node=obj.form_node) @@ -2056,12 +2059,12 @@ class Connection(CommonConnection, ConnectionHandlers): self.send_message(obj) def send_message(self, obj): - obj.msg_id = self.connection.send(obj.msg_iq, now=obj.now) + obj.stanza_id = self.connection.send(obj.msg_iq, now=obj.now) gajim.nec.push_incoming_event(MessageSentEvent( None, conn=self, jid=obj.jid, message=obj.message, keyID=obj.keyID, chatstate=obj.chatstate, automatic_message=obj.automatic_message, - msg_id=obj.msg_id, additional_data=obj.additional_data)) + stanza_id=obj.stanza_id, additional_data=obj.additional_data)) if obj.callback: obj.callback(obj, obj.msg_iq, *obj.callback_args) @@ -2628,6 +2631,11 @@ class Connection(CommonConnection, ConnectionHandlers): msg_iq = nbxmpp.Message(obj.jid, obj.message, typ='groupchat', xhtml=obj.xhtml) + obj.stanza_id = self.connection.getAnID() + msg_iq.setID(obj.stanza_id) + if obj.message: + msg_iq.setOriginID(obj.stanza_id) + if obj.correct_id: msg_iq.setTag('replace', attrs={'id': obj.correct_id}, namespace=nbxmpp.NS_CORRECT) @@ -2654,11 +2662,11 @@ class Connection(CommonConnection, ConnectionHandlers): self.send_gc_message(obj) def send_gc_message(self, obj): - obj.msg_id = self.connection.send(obj.msg_iq) + obj.stanza_id = self.connection.send(obj.msg_iq) gajim.nec.push_incoming_event(MessageSentEvent( None, conn=self, jid=obj.jid, message=obj.message, keyID=None, chatstate=None, automatic_message=obj.automatic_message, - msg_id=obj.msg_id, additional_data=obj.additional_data)) + stanza_id=obj.stanza_id, additional_data=obj.additional_data)) if obj.callback: obj.callback(obj) ===================================== gajim/common/connection_handlers_events.py ===================================== --- a/gajim/common/connection_handlers_events.py +++ b/gajim/common/connection_handlers_events.py @@ -1637,7 +1637,7 @@ class MessageSentEvent(nec.NetworkIncomingEvent): def generate(self): if not self.automatic_message: - self.conn.sent_message_ids.append(self.msg_id) + self.conn.sent_message_ids.append(self.stanza_id) # only record the last 20000 message ids (should be about 1MB [36 byte per uuid] # and about 24 hours if you send out a message every 5 seconds) self.conn.sent_message_ids = self.conn.sent_message_ids[-20000:] @@ -2709,7 +2709,7 @@ class MessageOutgoingEvent(nec.NetworkOutgoingEvent): self.type_ = 'chat' self.subject = '' self.chatstate = None - self.msg_id = None + self.stanza_id = None self.resource = None self.user_nick = None self.xhtml = None @@ -2762,6 +2762,7 @@ class GcMessageOutgoingEvent(nec.NetworkOutgoingEvent): self.message = '' self.chatstate = None self.xhtml = None + self.stanza_id = None self.label = None self.callback = None self.callback_args = [] ===================================== gajim/common/zeroconf/connection_zeroconf.py ===================================== --- a/gajim/common/zeroconf/connection_zeroconf.py +++ b/gajim/common/zeroconf/connection_zeroconf.py @@ -334,11 +334,11 @@ class ConnectionZeroconf(CommonConnection, ConnectionHandlersZeroconf): def _nec_stanza_message_outgoing(self, obj): - def on_send_ok(msg_id): + def on_send_ok(stanza_id): gajim.nec.push_incoming_event(MessageSentEvent(None, conn=self, jid=obj.jid, message=obj.message, keyID=obj.keyID, automatic_message=obj.automatic_message, chatstate=None, - msg_id=msg_id)) + stanza_id=stanza_id)) if obj.callback: obj.callback(obj.msg_iq, *obj.callback_args) ===================================== gajim/groupchat_control.py ===================================== --- a/gajim/groupchat_control.py +++ b/gajim/groupchat_control.py @@ -2042,7 +2042,7 @@ class GroupchatControl(ChatControlBase): def _cb(obj): # we'll save sent message text when we'll receive it in # _nec_gc_message_received - self.last_sent_msg = obj.msg_id + self.last_sent_msg = obj.stanza_id if self.correcting: self.correcting = False gtkgui_helpers.remove_css_class( ===================================== gajim/history_sync.py ===================================== --- a/gajim/history_sync.py +++ b/gajim/history_sync.py @@ -83,7 +83,7 @@ class HistorySyncAssistant(Gtk.Assistant): gajim.ged.register_event_handler('archiving-finished', ged.PRECORE, self._nec_archiving_finished) - gajim.ged.register_event_handler('mam-decrypted-message-received', + gajim.ged.register_event_handler('raw-mam-message-received', ged.PRECORE, self._nec_mam_message_received) @@ -167,7 +167,7 @@ class HistorySyncAssistant(Gtk.Assistant): gajim.ged.remove_event_handler('archiving-finished', ged.PRECORE, self._nec_archiving_finished) - gajim.ged.remove_event_handler('mam-decrypted-message-received', + gajim.ged.remove_event_handler('raw-mam-message-received', ged.PRECORE, self._nec_mam_message_received) del gajim.interface.instances[self.account]['history_sync'] @@ -179,7 +179,7 @@ class HistorySyncAssistant(Gtk.Assistant): if obj.conn.name != self.account: return - if obj.msg_obj.query_id != self.query_id: + if obj.result.getAttr('queryid') != self.query_id: return log.debug('received message') View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/8558a4365197ac582842c8a54c8500139…

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits July 2017