Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] Minimize Roster correctly on ESC
by Philipp Hörist 14 Oct '17

14 Oct '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 16ad6080 by Philipp Hörist at 2017-10-14T21:08:58+02:00 Minimize Roster correctly on ESC Fixes #8765 - - - - - 1 changed file: - gajim/roster_window.py Changes: ===================================== gajim/roster_window.py ===================================== --- a/gajim/roster_window.py +++ b/gajim/roster_window.py @@ -3755,7 +3755,7 @@ class RosterWindow: 'quit_on_roster_x_button') and ((app.interface.systray_enabled and\ app.config.get('trayicon') == 'always') or app.config.get( 'allow_hide_roster')): - self.window.hide() + self.window.iconify() elif event.get_state() & Gdk.ModifierType.CONTROL_MASK and event.keyval == \ Gdk.KEY_i: treeselection = self.tree.get_selection() View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/16ad6080663e575be1367bcc35d446d519… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/16ad6080663e575be1367bcc35d446d519… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Remove AcronymExpanderPlugin
by Philipp Hörist 14 Oct '17

14 Oct '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 5aeed6c7 by Philipp Hörist at 2017-10-14T16:10:14+02:00 Remove AcronymExpanderPlugin Moved to the gajim-plugins repository - - - - - 4 changed files: - − plugins/acronyms_expander/__init__.py - − plugins/acronyms_expander/acronyms - − plugins/acronyms_expander/acronyms_expander.py - − plugins/acronyms_expander/manifest.ini Changes: ===================================== plugins/acronyms_expander/__init__.py deleted ===================================== --- a/plugins/acronyms_expander/__init__.py +++ /dev/null @@ -1 +0,0 @@ -from .acronyms_expander import AcronymsExpanderPlugin ===================================== plugins/acronyms_expander/acronyms deleted ===================================== --- a/plugins/acronyms_expander/acronyms +++ /dev/null @@ -1,69 +0,0 @@ -{"afaik": "as far as I know", -"afaict": "as far as I can tell", -"afk": "away from keyboard", -"atm": "at the moment", -"bbiab": "be back in a bit", -"bbiaf": "be back in a few (minutes)", -"bbl": "be back later", -"bbs": "be back soon", -"b/c": "because", -"bf": "boyfriend", -"bfo": "blinding flash of the obvious", -"brb": "be right back", -"bsod": "blue screen of death", -"btw": "by the way", -"ciao": "Italian for goodbye", -"ctrn": "can't talk right now", -"cul8r": "see you later", -"cya": "see ya", -"dhtb": "don't have the bandwidth", -"f2f": "face to face", -"fubar": "fucked up beyond all recognition", -"fwiw": "for what it's worth", -"fyi": "for your information", -"gmta": "great minds think alike", -"iam": "in a meeting", -"ianal": "I am not a lawyer", -"ihmb": "I hate my boss", -"iirc": "if I recall correctly", -"imho": "in my humble opinion", -"imo": "in my opinion", -"iow": "in other words", -"irl": "in real life", -"<g>": "grin", -"*g*": "grin", -"gf": "girlfriend", -"gmta": "great minds think alike", -"g2g": "got to go", -"jid": "jabber identifier", -"j/k": "just kidding", -"ok": "okay", -"lol": "laugh out loud", -"l8r": "later", -"msg": "message", -"n/m": "never mind", -"n/p": "no problem", -"oAo": "over and out!", -"omg": "oh my god", -"oob": "out of band", -"otoh": "on the other hand", -"oww": "oops, wrong window!", -"otp": "on the phone", -"pita": "pain in the ass", -"pov": "point of view", -"pw": "password", -"rotfl": "rolling on the floor laughing", -"rsn": "real soon now", -"rtfm": "read the friendly manual", -"slap": "sounds like a plan", -"thx": "thanks", -"tia": "thanks in advance", -"tla": "three-letter arconym", -"ttfn": "ta ta for now", -"ttyl": "talk to you later", -"wb": "welcome back", -"wfm": "works for me", -"wtf": "what the fuck?!", -"wtg": "way to go!", -"xfer": "transfer", -"ymmv": "your mileage may vary",} ===================================== plugins/acronyms_expander/acronyms_expander.py deleted ===================================== --- a/plugins/acronyms_expander/acronyms_expander.py +++ /dev/null @@ -1,110 +0,0 @@ -# -*- coding: utf-8 -*- - -## This file is part of Gajim. -## -## Gajim 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; version 3 only. -## -## Gajim is distributed in the hope that it will be useful, -## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY 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 Gajim. If not, see <http://www.gnu.org/licenses/>. -## - -''' -Acronyms expander plugin. - -:author: Mateusz Biliński <mateusz(a)bilinski.it> -:since: 9th June 2008 -:copyright: Copyright (2008) Mateusz Biliński <mateusz(a)bilinski.it> -:license: GPL -''' - -import sys -import os - -from gi.repository import Gtk -from gi.repository import GObject - -from gajim.plugins import GajimPlugin -from gajim.plugins.helpers import log, log_calls - -class AcronymsExpanderPlugin(GajimPlugin): - - @log_calls('AcronymsExpanderPlugin') - def init(self): - self.description = _('Replaces acronyms (or other strings) ' - 'with given expansions/substitutes.') - self.config_dialog = None - - self.gui_extension_points = { - 'chat_control_base': (self.connect_with_chat_control_base, - self.disconnect_from_chat_control_base) - } - - self.config_default_values = { - 'INVOKER': (' ', ''), - 'ACRONYMS': ({'/slap': '/me slaps', - 'PS-': 'plug-in system', - 'G-': 'Gajim', - 'GNT-': 'https://dev.gajim.org/gajim/gajim/issues', - 'GW-': 'https://dev.gajim.org/gajim/gajim/wikis/home', - }, - ''), - } - if 'ACRONYMS' not in self.config: - myAcronyms = self.get_own_acronyms_list() - self.config['ACRONYMS'].update(myAcronyms) - - @log_calls('AcronymsExpanderPlugin') - def get_own_acronyms_list(self): - data_file = self.local_file_path('acronyms') - if not os.path.isfile(data_file): - return {} - data = open(data_file, 'r') - acronyms = eval(data.read()) - data.close() - return acronyms - - @log_calls('AcronymsExpanderPlugin') - def textbuffer_live_acronym_expander(self, tb): - """ - @param tb gtk.TextBuffer - """ - #assert isinstance(tb,gtk.TextBuffer) - ACRONYMS = self.config['ACRONYMS'] - INVOKER = self.config['INVOKER'] - t = tb.get_text(tb.get_start_iter(), tb.get_end_iter(), True) - #log.debug('%s %d'%(t, len(t))) - if t and t[-1] == INVOKER: - #log.debug('changing msg text') - base, sep, head=t[:-1].rpartition(INVOKER) - log.debug('%s | %s | %s'%(base, sep, head)) - if head in ACRONYMS: - head = ACRONYMS[head] - #log.debug('head: %s'%(head)) - t = ''.join((base, sep, head, INVOKER)) - #log.debug("setting text: '%s'"%(t)) - GObject.idle_add(tb.set_text, t) - - @log_calls('AcronymsExpanderPlugin') - def connect_with_chat_control_base(self, chat_control): - d = {} - tv = chat_control.msg_textview - tb = tv.get_buffer() - h_id = tb.connect('changed', self.textbuffer_live_acronym_expander) - d['h_id'] = h_id - - chat_control.acronyms_expander_plugin_data = d - - return True - - @log_calls('AcronymsExpanderPlugin') - def disconnect_from_chat_control_base(self, chat_control): - d = chat_control.acronyms_expander_plugin_data - tv = chat_control.msg_textview - tv.get_buffer().disconnect(d['h_id']) ===================================== plugins/acronyms_expander/manifest.ini deleted ===================================== --- a/plugins/acronyms_expander/manifest.ini +++ /dev/null @@ -1,9 +0,0 @@ -[info] -name: Acronyms Expander -short_name: acronyms_expander -version: 0.1 -description: Replaces acronyms (or other strings) with given expansions/substitutes. -authors: Mateusz Biliński <mateusz(a)bilinski.it> -homepage: http://blog.bilinski.it - - View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/5aeed6c7376d9ccf0d24c08cca113b49c7… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/5aeed6c7376d9ccf0d24c08cca113b49c7… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Fix syntax error
by Philipp Hörist 14 Oct '17

14 Oct '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 2b0ab5e9 by Philipp Hörist at 2017-10-14T09:48:57+02:00 Fix syntax error - - - - - 1 changed file: - gajim/roster_window.py Changes: ===================================== gajim/roster_window.py ===================================== --- a/gajim/roster_window.py +++ b/gajim/roster_window.py @@ -2381,7 +2381,7 @@ class RosterWindow: else: try: w.window.destroy() - except AttributeError, RuntimeError: + except (AttributeError, RuntimeError): w.destroy() def close_all(self, account, force=False): View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/2b0ab5e9aaffc24aacbfb071069cee8147… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/2b0ab5e9aaffc24aacbfb071069cee8147… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Catch exception when closing window
by Philipp Hörist 14 Oct '17

14 Oct '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: c6fc9081 by Philipp Hörist at 2017-10-14T09:43:44+02:00 Catch exception when closing window Fixes #8761 - - - - - 1 changed file: - gajim/roster_window.py Changes: ===================================== gajim/roster_window.py ===================================== --- a/gajim/roster_window.py +++ b/gajim/roster_window.py @@ -2381,7 +2381,7 @@ class RosterWindow: else: try: w.window.destroy() - except AttributeError: + except AttributeError, RuntimeError: w.destroy() def close_all(self, account, force=False): View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/c6fc9081c5c0dddc68ecb2e4bf9d70b071… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/c6fc9081c5c0dddc68ecb2e4bf9d70b071… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 5 commits: Refactor store_bookmarks()
by Philipp Hörist 13 Oct '17

13 Oct '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: e79af35e by Philipp Hörist at 2017-10-14T00:13:13+02:00 Refactor store_bookmarks() - Add logging - Move Node building code into own methods - - - - - 149522dc by Philipp Hörist at 2017-10-14T00:13:18+02:00 ServerInfo: Add PubSub discovery - - - - - ac281533 by Philipp Hörist at 2017-10-14T00:13:19+02:00 Get Pubsub bookmarks also if PEP is supported - - - - - dd4a8005 by Philipp Hörist at 2017-10-14T00:13:19+02:00 Discover PublishOptions also if PubSub is not discovered PEP supports a subset of PubSub and can also support publish options - - - - - fcf15fca by Philipp Hörist at 2017-10-14T00:13:19+02:00 Bookmarks: Remove invalid publish option - - - - - 4 changed files: - gajim/common/connection.py - gajim/common/connection_handlers.py - gajim/common/pubsub.py - gajim/server_info.py Changes: ===================================== gajim/common/connection.py ===================================== --- a/gajim/common/connection.py +++ b/gajim/common/connection.py @@ -1930,12 +1930,12 @@ class Connection(CommonConnection, ConnectionHandlers): self.register_supported = True if nbxmpp.NS_PUBSUB in obj.features: self.pubsub_supported = True - if nbxmpp.NS_PUBSUB_PUBLISH_OPTIONS in obj.features: - self.pubsub_publish_options_supported = True - else: - # Remove stored bookmarks accessible to everyone. - self.send_pb_purge(our_jid, 'storage:bookmarks') - self.send_pb_delete(our_jid, 'storage:bookmarks') + if nbxmpp.NS_PUBSUB_PUBLISH_OPTIONS in obj.features: + self.pubsub_publish_options_supported = True + else: + # Remove stored bookmarks accessible to everyone. + self.send_pb_purge(our_jid, 'storage:bookmarks') + self.send_pb_delete(our_jid, 'storage:bookmarks') if nbxmpp.NS_BLOCKING in obj.features: self.blocking_supported = True if nbxmpp.NS_ADDRESS in obj.features: @@ -2347,6 +2347,7 @@ class Connection(CommonConnection, ConnectionHandlers): iq2 = iq.addChild(name='query', namespace=nbxmpp.NS_PRIVATE) iq2.addChild(name='storage', namespace='storage:bookmarks') self.connection.send(iq) + app.log('bookmarks').info('Request Bookmarks (PrivateStorage)') def _check_bookmarks_received(self): if not self.bookmarks: @@ -2361,63 +2362,78 @@ class Connection(CommonConnection, ConnectionHandlers): """ if not app.account_is_connected(self.name): return - if self.pubsub_supported and self.pubsub_publish_options_supported \ - and storage_type != 'xml': - self.send_pb_retrieve('', 'storage:bookmarks') - # some server (ejabberd) are so slow to answer that we request via XML - # if we don't get answer in the next 30 seconds - app.idlequeue.set_alarm(self._check_bookmarks_received, 30) - else: - self._request_bookmarks_xml() - def store_bookmarks(self, storage_type=None): - """ - Send bookmarks to the storage namespace or PubSub if supported + if storage_type != 'xml': + pubsub = self.pubsub_supported or self.pep_supported + if pubsub and self.pubsub_publish_options_supported: + self.send_pb_retrieve('', 'storage:bookmarks') + app.log('bookmarks').info('Request Bookmarks (PubSub)') + # some server (ejabberd) are so slow to answer that we + # request via XML if we don't get answer in the next 30 seconds + app.idlequeue.set_alarm(self._check_bookmarks_received, 30) + return - storage_type can be set to 'pubsub' or 'xml' so store in only one method - else it will be stored on both - """ + self._request_bookmarks_xml() + + def get_bookmarks_storage_node(self): NS_GAJIM_BM = 'xmpp:gajim.org/bookmarks' - if not app.account_is_connected(self.name): - return - iq = nbxmpp.Node(tag='storage', attrs={'xmlns': 'storage:bookmarks'}) + storage_node = nbxmpp.Node( + tag='storage', attrs={'xmlns': 'storage:bookmarks'}) for bm in self.bookmarks: - iq2 = iq.addChild(name="conference") - iq2.setAttr('jid', bm['jid']) - iq2.setAttr('autojoin', bm['autojoin']) - iq2.setAttr('name', bm['name']) - iq2.setTag('minimize', namespace=NS_GAJIM_BM). \ - setData(bm['minimize']) + conf_node = storage_node.addChild(name="conference") + conf_node.setAttr('jid', bm['jid']) + conf_node.setAttr('autojoin', bm['autojoin']) + conf_node.setAttr('name', bm['name']) + conf_node.setTag( + 'minimize', namespace=NS_GAJIM_BM).setData(bm['minimize']) # Only add optional elements if not empty # Note: need to handle both None and '' as empty # thus shouldn't use "is not None" if bm.get('nick', None): - iq2.setTagData('nick', bm['nick']) + conf_node.setTagData('nick', bm['nick']) if bm.get('password', None): - iq2.setTagData('password', bm['password']) + conf_node.setTagData('password', bm['password']) if bm.get('print_status', None): - iq2.setTag('print_status', namespace=NS_GAJIM_BM). \ - setData(bm['print_status']) - - if self.pubsub_supported and self.pubsub_publish_options_supported and\ - storage_type != 'xml': - options = nbxmpp.Node(nbxmpp.NS_DATA + ' x', - attrs={'type': 'submit'}) - f = options.addChild('field', - attrs={'var': 'FORM_TYPE', 'type': 'hidden'}) - f.setTagData('value', nbxmpp.NS_PUBSUB_PUBLISH_OPTIONS) - f = options.addChild('field', - attrs={'var': 'pubsub#persist_items'}) - f.setTagData('value', 'true') - f = options.addChild('field', attrs={'var': 'pubsub#access_model'}) - f.setTagData('value', 'whitelist') - self.send_pb_publish('', 'storage:bookmarks', iq, 'current', - options=options) + conf_node.setTag( + 'print_status', + namespace=NS_GAJIM_BM).setData(bm['print_status']) + return storage_node + + @staticmethod + def get_bookmark_publish_options(): + options = nbxmpp.Node(nbxmpp.NS_DATA + ' x', + attrs={'type': 'submit'}) + f = options.addChild('field', + attrs={'var': 'FORM_TYPE', 'type': 'hidden'}) + f.setTagData('value', nbxmpp.NS_PUBSUB_PUBLISH_OPTIONS) + f = options.addChild('field', attrs={'var': 'pubsub#access_model'}) + f.setTagData('value', 'whitelist') + return options + + def store_bookmarks(self, storage_type=None): + """ + Send bookmarks to the storage namespace or PubSub if supported + + storage_type can be set to 'pubsub' or 'xml' so store in only one method + else it will be stored on both + """ + if not app.account_is_connected(self.name): + return + + storage_node = self.get_bookmarks_storage_node() + + if storage_type != 'xml': + pubsub = self.pubsub_supported or self.pep_supported + if pubsub and self.pubsub_publish_options_supported: + self.send_pb_publish( + '', 'storage:bookmarks', storage_node, 'current', + options=self.get_bookmark_publish_options()) + app.log('bookmarks').info('Bookmarks published (PubSub)') + if storage_type != 'pubsub': - iqA = nbxmpp.Iq(typ='set') - iqB = iqA.addChild(name='query', namespace=nbxmpp.NS_PRIVATE) - iqB.addChild(node=iq) - self.connection.send(iqA) + iq = nbxmpp.Iq('set', nbxmpp.NS_PRIVATE, payload=storage_node) + self.connection.send(iq) + app.log('bookmarks').info('Bookmarks published (PrivateStorage)') def get_annotations(self): """ ===================================== gajim/common/connection_handlers.py ===================================== --- a/gajim/common/connection_handlers.py +++ b/gajim/common/connection_handlers.py @@ -1511,6 +1511,7 @@ ConnectionHandlersBase, ConnectionJingle, ConnectionIBBytestream): def _nec_private_storate_bookmarks_received(self, obj): if obj.conn.name != self.name: return + app.log('bookmarks').info('Received Bookmarks (PrivateStorage)') resend_to_pubsub = False bm_jids = [b['jid'] for b in self.bookmarks] for bm in obj.bookmarks: @@ -1518,7 +1519,7 @@ ConnectionHandlersBase, ConnectionJingle, ConnectionIBBytestream): self.bookmarks.append(bm) # We got a bookmark that was not in pubsub resend_to_pubsub = True - if self.pubsub_supported and resend_to_pubsub: + if resend_to_pubsub: self.store_bookmarks('pubsub') def _nec_private_storate_rosternotes_received(self, obj): ===================================== gajim/common/pubsub.py ===================================== --- a/gajim/common/pubsub.py +++ b/gajim/common/pubsub.py @@ -203,6 +203,7 @@ class ConnectionPubSub: def _nec_pubsub_bookmarks_received(self, obj): if obj.conn.name != self.name: return + app.log('bookmarks').info('Received Bookmarks (PubSub)') bm_jids = [b['jid'] for b in self.bookmarks] for bm in obj.bookmarks: if bm['jid'] not in bm_jids: ===================================== gajim/server_info.py ===================================== --- a/gajim/server_info.py +++ b/gajim/server_info.py @@ -118,6 +118,8 @@ class ServerInfoDialog(Gtk.Dialog): Feature('XEP-0016: Privacy Lists', con.privacy_rules_supported, None), Feature('XEP-0045: Multi-User Chat', con.muc_jid, None), Feature('XEP-0054: vcard-temp', con.vcard_supported, None), + Feature('XEP-0060: PubSub', con.pubsub_supported, None), + Feature('XEP-0060: Publish Options', con.pubsub_publish_options_supported, None), Feature('XEP-0163: Personal Eventing Protocol', con.pep_supported, None), Feature('XEP-0191: Blocking Command', con.blocking_supported, nbxmpp.NS_BLOCKING), Feature('XEP-0198: Stream Management', con.sm.enabled, nbxmpp.NS_STREAM_MGMT), View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/f4a734b70ce4bfdc5346e40306744d3cf… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/f4a734b70ce4bfdc5346e40306744d3cf… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Add GooCanvas to the Windows build
by Philipp Hörist 12 Oct '17

12 Oct '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: f4a734b7 by Philipp Hörist at 2017-10-12T18:29:51+02:00 Add GooCanvas to the Windows build Its for the Whiteboard Plugin - - - - - 1 changed file: - win/_base.sh Changes: ===================================== win/_base.sh ===================================== --- a/win/_base.sh +++ b/win/_base.sh @@ -73,7 +73,8 @@ function install_deps { mingw-w64-"${ARCH}"-"${PYTHON_ID}"-pip \ mingw-w64-"${ARCH}"-gstreamer \ mingw-w64-"${ARCH}"-adwaita-icon-theme \ - mingw-w64-"${ARCH}"-sqlite3 + mingw-w64-"${ARCH}"-sqlite3 \ + mingw-w64-"${ARCH}"-goocanvas build_pip install setuptools_scm View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/f4a734b70ce4bfdc5346e40306744d3cff… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/f4a734b70ce4bfdc5346e40306744d3cff… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Update README.md
by Philipp Hörist 10 Oct '17

10 Oct '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: a63131c5 by Philipp Hörist at 2017-10-10T20:37:20+02:00 Update README.md - - - - - 1 changed file: - README.md Changes: ===================================== README.md ===================================== --- a/README.md +++ b/README.md @@ -14,10 +14,10 @@ ### Optional Runtime Requirements +- python-pillow for support of webp avatars - python3-crypto to enable End to end encryption - python3-gnupg to enable GPG encryption -- For zeroconf (bonjour), the "enable link-local messaging" checkbox, you need dbus-glib, python-avahi -- dnsutils (or whatever package provides the nslookup binary) for SRV support +- For zeroconf (bonjour) you need dbus-glib, python-avahi - gir1.2-gtkspell3-3.0 and aspell-LANG where lang is your locale eg. en, fr etc - gir1.2-secret-1 for GNOME Keyring or KDE support as password storage - D-Bus running to have gajim-remote working. Some distributions split dbus-x11, which is needed for dbus to work with Gajim. Version >= 0.80 is required. View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/a63131c556bc542b5eeb486e9c7e95c43e… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/a63131c556bc542b5eeb486e9c7e95c43e… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Execute handler only for the correct account
by Philipp Hörist 08 Oct '17

08 Oct '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 4379c2d0 by Philipp Hörist at 2017-10-08T22:29:15+02:00 Execute handler only for the correct account - - - - - 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 @@ -268,6 +268,9 @@ class ConnectionVcard: self._vcard_gc_presence_received) def _vcard_presence_received(self, obj): + if obj.conn.name != self.name: + return + if obj.avatar_sha is None: # No Avatar is advertised return View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/4379c2d014660188706837e4aa6a132043… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/4379c2d014660188706837e4aa6a132043… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] HistoryWindow: Fix some UI issues
by Philipp Hörist 08 Oct '17

08 Oct '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 95a984f6 by Philipp Hörist at 2017-10-08T19:02:55+02:00 HistoryWindow: Fix some UI issues - Set application and menubar - Remove deprecated settings Fixes #8756 - - - - - 2 changed files: - gajim/data/gui/history_window.ui - gajim/history_window.py Changes: ===================================== gajim/data/gui/history_window.ui ===================================== --- a/gajim/data/gui/history_window.ui +++ b/gajim/data/gui/history_window.ui @@ -1,13 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> - <requires lib="gtk+" version="3.12"/> - <object class="GtkWindow" id="history_window"> + <requires lib="gtk+" version="3.20"/> + <object class="GtkApplicationWindow" id="history_window"> <property name="can_focus">False</property> <property name="title" translatable="yes">Conversation History</property> - <property name="role">history</property> + <property name="window_position">center</property> <property name="default_width">650</property> <property name="default_height">450</property> + <property name="show_menubar">False</property> <signal name="destroy" handler="on_history_window_destroy" swapped="no"/> <signal name="key-press-event" handler="on_history_window_key_press_event" swapped="no"/> <child> @@ -72,13 +73,11 @@ <child> <object class="GtkCheckButton" id="search_in_date"> <property name="label" translatable="yes">_In date search</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="receives_default">False</property> <property name="tooltip_text" translatable="yes">Only searching within selected day</property> <property name="use_underline">True</property> - <property name="xalign">0.5</property> <property name="draw_indicator">True</property> </object> <packing> @@ -196,12 +195,10 @@ <child> <object class="GtkCheckButton" id="log_history_checkbutton"> <property name="label" translatable="yes">_Log conversation history</property> - <property name="use_action_appearance">False</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.5</property> <property name="active">True</property> <property name="draw_indicator">True</property> </object> @@ -218,7 +215,6 @@ <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="use_underline">True</property> - <property name="xalign">0.5</property> <property name="active">True</property> <property name="draw_indicator">True</property> <signal name="toggled" handler="on_show_status_checkbutton_toggled" swapped="no"/> @@ -245,7 +241,6 @@ <child> <object class="GtkButton" id="close_button"> <property name="label">gtk-close</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="can_default">True</property> ===================================== gajim/history_window.py ===================================== --- a/gajim/history_window.py +++ b/gajim/history_window.py @@ -69,6 +69,7 @@ class HistoryWindow: def __init__(self, jid=None, account=None): xml = gtkgui_helpers.get_gtk_builder('history_window.ui') self.window = xml.get_object('history_window') + self.window.set_application(app.app) self.calendar = xml.get_object('calendar') scrolledwindow = xml.get_object('scrolledwindow') self.history_textview = conversation_textview.ConversationTextview( View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/95a984f64590946379c3e3533bbe222e17… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/95a984f64590946379c3e3533bbe222e17… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Set application and menubar on MessageWindow
by Philipp Hörist 08 Oct '17

08 Oct '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 57efe7c4 by Philipp Hörist at 2017-10-08T18:08:13+02:00 Set application and menubar on MessageWindow - - - - - 0b1d5a31 by Philipp Hörist at 2017-10-08T18:09:15+02:00 Remove unused import - Sort imports correctly (PEP8) - - - - - 1 changed file: - gajim/message_window.py Changes: ===================================== gajim/message_window.py ===================================== --- a/gajim/message_window.py +++ b/gajim/message_window.py @@ -27,12 +27,13 @@ ## along with Gajim. If not, see <http://www.gnu.org/licenses/>. ## +import time + from gi.repository import Gtk from gi.repository import Gdk from gi.repository import GdkPixbuf from gi.repository import GObject from gi.repository import GLib -import time from gajim import common from gajim import gtkgui_helpers @@ -40,9 +41,7 @@ from gajim import message_control from gajim import dialogs from gajim.chat_control_base import ChatControlBase from gajim.chat_control import ChatControl - from gajim.common import app -from gajim.gtkgui_helpers import get_action from gajim.common.i18n import Q_ #################### @@ -81,6 +80,8 @@ class MessageWindow(object): self.widget_name = 'message_window' self.xml = gtkgui_helpers.get_gtk_builder('%s.ui' % self.widget_name) self.window = self.xml.get_object(self.widget_name) + self.window.set_application(app.app) + self.window.set_show_menubar(False) self.notebook = self.xml.get_object('notebook') self.parent_paned = None View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/1d5665632a9dc3f0f02fd48815445676e… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/1d5665632a9dc3f0f02fd48815445676e… You're receiving this email because of your account on dev.gajim.org.

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits