Commits

commits@gajim.org

17632 discussions

gajim: fix creating Notification via pynotify. See #8308
by Gajim 30 Mar '16

30 Mar '16

changeset 406b4409fcb9 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=406b4409fcb9 description: fix creating Notification via pynotify. See #8308 diffstat: src/notify.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r f7c3262c9535 -r 406b4409fcb9 src/notify.py --- a/src/notify.py Tue Mar 29 22:54:40 2016 +0200 +++ b/src/notify.py Wed Mar 30 20:45:50 2016 +0200 @@ -116,7 +116,7 @@ else: _title = title - notification = Notify.Notification(_title, _text) + notification = Notify.Notification.new(_title, _text) notification.set_timeout(timeout*1000) notification.set_category(event_type)

1 0

gajim: fix importing gst. Fixes #8306
by Gajim 29 Mar '16

29 Mar '16

changeset f7c3262c9535 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=f7c3262c9535 description: fix importing gst. Fixes #8306 diffstat: src/common/gajim.py | 2 ++ src/common/jingle_rtp.py | 2 ++ src/common/multimedia_helpers.py | 4 ++++ src/config.py | 2 +- 4 files changed, 9 insertions(+), 1 deletions(-) diffs (54 lines): diff -r 32a3f3c1ddbe -r f7c3262c9535 src/common/gajim.py --- a/src/common/gajim.py Fri Mar 25 00:29:49 2016 +0100 +++ b/src/common/gajim.py Tue Mar 29 22:54:40 2016 +0200 @@ -201,7 +201,9 @@ from gi.repository import Farstream gi.require_version('Gst', '1.0') from gi.repository import Gst + gi.require_version('GdkX11', '3.0') from gi.repository import GdkX11 + gi.require_version('GstVideo', '1.0') from gi.repository import GstVideo from gi.repository import GLib try: diff -r 32a3f3c1ddbe -r f7c3262c9535 src/common/jingle_rtp.py --- a/src/common/jingle_rtp.py Fri Mar 25 00:29:49 2016 +0100 +++ b/src/common/jingle_rtp.py Tue Mar 29 22:54:40 2016 +0200 @@ -27,7 +27,9 @@ import gi gi.require_version('Gst', '1.0') from gi.repository import Gst +gi.require_version('GdkX11', '3.0') from gi.repository import GdkX11 +gi.require_version('GstVideo', '1.0') from gi.repository import GstVideo from gi.repository import GLib diff -r 32a3f3c1ddbe -r f7c3262c9535 src/common/multimedia_helpers.py --- a/src/common/multimedia_helpers.py Fri Mar 25 00:29:49 2016 +0100 +++ b/src/common/multimedia_helpers.py Tue Mar 29 22:54:40 2016 +0200 @@ -13,8 +13,12 @@ ## You should have received a copy of the GNU General Public License ## along with Gajim. If not, see <http://www.gnu.org/licenses/>. +import gi +gi.require_version('Gst', '1.0') from gi.repository import Gst +gi.require_version('GdkX11', '3.0') from gi.repository import GdkX11 +gi.require_version('GstVideo', '1.0') from gi.repository import GstVideo diff -r 32a3f3c1ddbe -r f7c3262c9535 src/config.py --- a/src/config.py Fri Mar 25 00:29:49 2016 +0100 +++ b/src/config.py Tue Mar 29 22:54:40 2016 +0200 @@ -68,7 +68,7 @@ from common.multimedia_helpers import AudioInputManager, AudioOutputManager from common.multimedia_helpers import VideoInputManager, VideoOutputManager HAS_GST = True -except ImportError: +except (ImportError, ValueError): HAS_GST = False from common.exceptions import GajimGeneralException

1 0

gajim: Sort emoticons packs list in the preferences window.
by Gajim 28 Mar '16

28 Mar '16

changeset 29ffa6a30d77 in /home/hg/repos/gajim author: Anaël Verrier <elghinn(a)free.fr> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=29ffa6a30d77 description: Sort emoticons packs list in the preferences window. diffstat: src/config.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (25 lines): diff -r f8aeab45f1c8 -r 29ffa6a30d77 src/config.py --- a/src/config.py Sun Mar 27 18:09:21 2016 +0200 +++ b/src/config.py Sun Mar 27 18:09:58 2016 +0200 @@ -149,19 +149,19 @@ # user themes if os.path.isdir(gajim.MY_EMOTS_PATH): emoticons_list += os.listdir(gajim.MY_EMOTS_PATH) + emoticons_list.sort() renderer_text = gtk.CellRendererText() emoticons_combobox.pack_start(renderer_text, True) emoticons_combobox.add_attribute(renderer_text, 'text', 0) model = gtk.ListStore(str) emoticons_combobox.set_model(model) - l = [] + l = [_('Disabled')] for dir_ in emoticons_list: if not os.path.isdir(os.path.join(gajim.DATA_DIR, 'emoticons', dir_)) \ and not os.path.isdir(os.path.join(gajim.MY_EMOTS_PATH, dir_)) : continue if dir_ != '.svn': l.append(dir_) - l.append(_('Disabled')) for i in xrange(len(l)): model.append([l[i]]) if gajim.config.get('emoticons_theme') == l[i]:

1 0

gajim: Use OrderedDict to maintain emoticons order in packs.
by Gajim 28 Mar '16

28 Mar '16

changeset f8aeab45f1c8 in /home/hg/repos/gajim author: Anaël Verrier <elghinn(a)free.fr> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=f8aeab45f1c8 description: Use OrderedDict to maintain emoticons order in packs. diffstat: data/emoticons/animated/emoticons.py | 100 ++++++++++++++++--------------- data/emoticons/static-big/emoticons.py | 86 +++++++++++++------------- data/emoticons/static/emoticons.py | 86 +++++++++++++------------- data/emoticons/tango/emoticons.py | 104 ++++++++++++++++---------------- 4 files changed, 192 insertions(+), 184 deletions(-) diffs (truncated from 396 to 300 lines): diff -r ac352597e14a -r f8aeab45f1c8 data/emoticons/animated/emoticons.py --- a/data/emoticons/animated/emoticons.py Mon Mar 28 20:52:24 2016 +0200 +++ b/data/emoticons/animated/emoticons.py Sun Mar 27 18:09:21 2016 +0200 @@ -1,50 +1,52 @@ # coding=utf-8 -emoticons = { - 'smile.png': [':-)', ':)'], - 'coolglasses.png': ['B-)', '(H)'], - 'wink.gif': [';-)', ';)'], - 'biggrin.png': [':-D', ':D'], - 'unhappy.png': [':-(', ':('], - 'cry.gif': [":'-(", ":'(", ';-(', ';(', ";'-("], - 'frowning.png': [':-/', ':/', ':-\\', ':\\', ':-S', ':S'], - 'blush.png': [':-$', ':$'], - 'angry.png': [':-@', ':@'], - 'bat.gif': [':-[', ':['], - 'kiss.png': [':-{}', ':-*', ':*', '(K)'], - 'stare.png': [':-|', ':|'], - 'devil.png': [']:->', '>:-)', '>:)', '(6)'], - 'tongue.png': [':-P', ':P', ':-þ', ':þ'], - 'oh.png': ['=-O', ':-O', ':O'], - 'heart.png': ['<3', '(L)', '*IN LOVE*'], - 'pussy.png': ['(@)'], - 'cuffs.png': ['(%)'], - 'moon.png': ['(S)'], - 'lamp.png': ['(I)'], - 'music.png': ['(8)'], - 'beer.png': ['(B)', '*DRINK*'], - 'brflower.png': ['(W)'], - 'boy.png': ['(Z)'], - 'girl.png': ['(X)'], - 'mail.png': ['(E)'], - 'thumbdown.png': ['(N)'], - 'photo.png': ['(P)'], - 'thumbup.png': ['(Y)', '*THUMBS UP*'], - 'hugleft.png': ['(})'], - 'brheart.png': ['</3', '(U)'], - 'flower.png': ['@}->--', '(F)'], - 'drink.png': ['(D)'], - 'phone.png': ['(T)'], - 'coffee.png': ['(C)'], - 'hugright.png': ['({)'], - 'star.png': ['(*)'], - 'rainbow.png': ['(R)'], - 'cigarette.gif': ['(ci)'], - 'cake.gif': ['(^)'], - 'dontknow.gif': [':^)'], - 'eyeroll.gif': ['8-)'], - 'lightning.gif': ['(li)'], - 'party.gif': ['<:o)'], - 'sleepy.gif': ['|-)'], - 'think.gif': ['*-)'], - 'puke.gif': [':-!'], -} +from collections import OrderedDict + +emoticons = OrderedDict(( + ('smile.png', [':-)', ':)']), + ('coolglasses.png', ['B-)', '(H)']), + ('wink.gif', [';-)', ';)']), + ('biggrin.png', [':-D', ':D']), + ('unhappy.png', [':-(', ':(']), + ('cry.gif', [":'-(", ":'(", ';-(', ';(', ";'-("]), + ('frowning.png', [':-/', ':/', ':-\\', ':\\', ':-S', ':S']), + ('blush.png', [':-$', ':$']), + ('angry.png', [':-@', ':@']), + ('bat.gif', [':-[', ':[']), + ('kiss.png', [':-{}', ':-*', ':*', '(K)']), + ('stare.png', [':-|', ':|']), + ('devil.png', [']:->', '>:-)', '>:)', '(6)']), + ('tongue.png', [':-P', ':P', ':-þ', ':þ']), + ('oh.png', ['=-O', ':-O', ':O']), + ('heart.png', ['<3', '(L)', '*IN LOVE*']), + ('pussy.png', ['(@)']), + ('cuffs.png', ['(%)']), + ('moon.png', ['(S)']), + ('lamp.png', ['(I)']), + ('music.png', ['(8)']), + ('beer.png', ['(B)', '*DRINK*']), + ('brflower.png', ['(W)']), + ('boy.png', ['(Z)']), + ('girl.png', ['(X)']), + ('mail.png', ['(E)']), + ('thumbdown.png', ['(N)']), + ('photo.png', ['(P)']), + ('thumbup.png', ['(Y)', '*THUMBS UP*']), + ('hugleft.png', ['(})']), + ('brheart.png', ['</3', '(U)']), + ('flower.png', ['@}->--', '(F)']), + ('drink.png', ['(D)']), + ('phone.png', ['(T)']), + ('coffee.png', ['(C)']), + ('hugright.png', ['({)']), + ('star.png', ['(*)']), + ('rainbow.png', ['(R)']), + ('cigarette.gif', ['(ci)']), + ('cake.gif', ['(^)']), + ('dontknow.gif', [':^)']), + ('eyeroll.gif', ['8-)']), + ('lightning.gif', ['(li)']), + ('party.gif', ['<:o)']), + ('sleepy.gif', ['|-)']), + ('think.gif', ['*-)']), + ('puke.gif', [':-!']), +)) diff -r ac352597e14a -r f8aeab45f1c8 data/emoticons/static-big/emoticons.py --- a/data/emoticons/static-big/emoticons.py Mon Mar 28 20:52:24 2016 +0200 +++ b/data/emoticons/static-big/emoticons.py Sun Mar 27 18:09:21 2016 +0200 @@ -1,43 +1,45 @@ # coding=utf-8 -emoticons = { - 'smile.png': [':-)', ':)'], - 'coolglasses.png': ['8-)', 'B-)', '(H)'], - 'wink.png': [';-)', ';)'], - 'biggrin.png': [':-D', ':D'], - 'unhappy.png': [':-(', ':('], - 'cry.png': [":'-(", ":'(", ';-(', ';(', ";'-("], - 'frowning.png': [':-/', ':/', ':-\\', ':\\', ':-S', ':S'], - 'blush.png': [':-$', ':$'], - 'angry.png': [':-@', ':@'], - 'bat.png': [':-[', ':['], - 'kiss.png': [':-{}', ':-*', ':*', '(K)'], - 'stare.png': [':-|', ':|'], - 'devil.png': [']:->', '>:-)', '>:)', '(6)'], - 'tongue.png': [':-P', ':P', ':-þ', ':þ'], - 'oh.png': ['=-O', ':-O', ':O'], - 'heart.png': ['<3', '(L)', '*IN LOVE*'], - 'lion.png': [':3', '>:3'], - 'pussy.png': ['(@)', '=^.^='], - 'cuffs.png': ['(%)'], - 'moon.png': ['(S)'], - 'lamp.png': ['(I)'], - 'music.png': ['(8)'], - 'beer.png': ['(B)', '*DRINK*'], - 'brflower.png': ['(W)'], - 'boy.png': ['(Z)'], - 'girl.png': ['(X)'], - 'mail.png': ['(E)'], - 'thumbdown.png': ['(N)'], - 'photo.png': ['(P)'], - 'thumbup.png': ['(Y)', '*THUMBS UP*'], - 'hugleft.png': ['(})'], - 'brheart.png': ['</3', '(U)'], - 'flower.png': ['@}->--', '(F)'], - 'drink.png': ['(D)'], - 'phone.png': ['(T)'], - 'coffee.png': ['(C)'], - 'hugright.png': ['({)'], - 'star.png': ['(*)'], - 'rainbow.png': ['(R)'], - 'puke.png': [':-!'], -} +from collections import OrderedDict + +emoticons = OrderedDict(( + ('smile.png', [':-)', ':)']), + ('coolglasses.png', ['8-)', 'B-)', '(H)']), + ('wink.png', [';-)', ';)']), + ('biggrin.png', [':-D', ':D']), + ('unhappy.png', [':-(', ':(']), + ('cry.png', [":'-(", ":'(", ';-(', ';(', ";'-("]), + ('frowning.png', [':-/', ':/', ':-\\', ':\\', ':-S', ':S']), + ('blush.png', [':-$', ':$']), + ('angry.png', [':-@', ':@']), + ('bat.png', [':-[', ':[']), + ('kiss.png', [':-{}', ':-*', ':*', '(K)']), + ('stare.png', [':-|', ':|']), + ('devil.png', [']:->', '>:-)', '>:)', '(6)']), + ('tongue.png', [':-P', ':P', ':-þ', ':þ']), + ('oh.png', ['=-O', ':-O', ':O']), + ('heart.png', ['<3', '(L)', '*IN LOVE*']), + ('lion.png', [':3', '>:3']), + ('pussy.png', ['(@)', '=^.^=']), + ('cuffs.png', ['(%)']), + ('moon.png', ['(S)']), + ('lamp.png', ['(I)']), + ('music.png', ['(8)']), + ('beer.png', ['(B)', '*DRINK*']), + ('brflower.png', ['(W)']), + ('boy.png', ['(Z)']), + ('girl.png', ['(X)']), + ('mail.png', ['(E)']), + ('thumbdown.png', ['(N)']), + ('photo.png', ['(P)']), + ('thumbup.png', ['(Y)', '*THUMBS UP*']), + ('hugleft.png', ['(})']), + ('brheart.png', ['</3', '(U)']), + ('flower.png', ['@}->--', '(F)']), + ('drink.png', ['(D)']), + ('phone.png', ['(T)']), + ('coffee.png', ['(C)']), + ('hugright.png', ['({)']), + ('star.png', ['(*)']), + ('rainbow.png', ['(R)']), + ('puke.png', [':-!']), +)) diff -r ac352597e14a -r f8aeab45f1c8 data/emoticons/static/emoticons.py --- a/data/emoticons/static/emoticons.py Mon Mar 28 20:52:24 2016 +0200 +++ b/data/emoticons/static/emoticons.py Sun Mar 27 18:09:21 2016 +0200 @@ -1,43 +1,45 @@ # coding=utf-8 -emoticons = { - 'smile.png': [':-)', ':)'], - 'coolglasses.png': ['8-)', 'B-)', '(H)'], - 'wink.png': [';-)', ';)'], - 'biggrin.png': [':-D', ':D'], - 'unhappy.png': [':-(', ':('], - 'cry.png': [":'-(", ":'(", ';-(', ';(', ";'-("], - 'frowning.png': [':-/', ':/', ':-\\', ':\\', ':-S', ':S'], - 'blush.png': [':-$', ':$'], - 'angry.png': [':-@', ':@'], - 'bat.png': [':-[', ':['], - 'kiss.png': [':-{}', ':-*', ':*', '(K)'], - 'stare.png': [':-|', ':|'], - 'devil.png': [']:->', '>:-)', '>:)', '(6)'], - 'tongue.png': [':-P', ':P', ':-þ', ':þ'], - 'oh.png': ['=-O', ':-O', ':O'], - 'heart.png': ['<3', '(L)', '*IN LOVE*'], - 'lion.png': [':3', '>:3'], - 'pussy.png': ['(@)', '=^.^='], - 'cuffs.png': ['(%)'], - 'moon.png': ['(S)'], - 'lamp.png': ['(I)'], - 'music.png': ['(8)'], - 'beer.png': ['(B)', '*DRINK*'], - 'brflower.png': ['(W)'], - 'boy.png': ['(Z)'], - 'girl.png': ['(X)'], - 'mail.png': ['(E)'], - 'thumbdown.png': ['(N)'], - 'photo.png': ['(P)'], - 'thumbup.png': ['(Y)', '*THUMBS UP*'], - 'hugleft.png': ['(})'], - 'brheart.png': ['</3', '(U)'], - 'flower.png': ['@}->--', '(F)'], - 'drink.png': ['(D)'], - 'phone.png': ['(T)'], - 'coffee.png': ['(C)'], - 'hugright.png': ['({)'], - 'star.png': ['(*)'], - 'rainbow.png': ['(R)'], - 'puke.png': [':-!'], -} +from collections import OrderedDict + +emoticons = OrderedDict(( + ('smile.png', [':-)', ':)']), + ('coolglasses.png', ['8-)', 'B-)', '(H)']), + ('wink.png', [';-)', ';)']), + ('biggrin.png', [':-D', ':D']), + ('unhappy.png', [':-(', ':(']), + ('cry.png', [":'-(", ":'(", ';-(', ';(', ";'-("]), + ('frowning.png', [':-/', ':/', ':-\\', ':\\', ':-S', ':S']), + ('blush.png', [':-$', ':$']), + ('angry.png', [':-@', ':@']), + ('bat.png', [':-[', ':[']), + ('kiss.png', [':-{}', ':-*', ':*', '(K)']), + ('stare.png', [':-|', ':|']), + ('devil.png', [']:->', '>:-)', '>:)', '(6)']), + ('tongue.png', [':-P', ':P', ':-þ', ':þ']), + ('oh.png', ['=-O', ':-O', ':O']), + ('heart.png', ['<3', '(L)', '*IN LOVE*']), + ('lion.png', [':3', '>:3']), + ('pussy.png', ['(@)', '=^.^=']), + ('cuffs.png', ['(%)']), + ('moon.png', ['(S)']), + ('lamp.png', ['(I)']), + ('music.png', ['(8)']), + ('beer.png', ['(B)', '*DRINK*']), + ('brflower.png', ['(W)']), + ('boy.png', ['(Z)']), + ('girl.png', ['(X)']), + ('mail.png', ['(E)']), + ('thumbdown.png', ['(N)']), + ('photo.png', ['(P)']), + ('thumbup.png', ['(Y)', '*THUMBS UP*']), + ('hugleft.png', ['(})']), + ('brheart.png', ['</3', '(U)']), + ('flower.png', ['@}->--', '(F)']), + ('drink.png', ['(D)']), + ('phone.png', ['(T)']), + ('coffee.png', ['(C)']), + ('hugright.png', ['({)']), + ('star.png', ['(*)']), + ('rainbow.png', ['(R)']), + ('puke.png', [':-!']), +)) diff -r ac352597e14a -r f8aeab45f1c8 data/emoticons/tango/emoticons.py --- a/data/emoticons/tango/emoticons.py Mon Mar 28 20:52:24 2016 +0200 +++ b/data/emoticons/tango/emoticons.py Sun Mar 27 18:09:21 2016 +0200 @@ -1,52 +1,54 @@ # coding=utf-8 -emoticons = { - 'angel.png': ['O:-)', 'o:-)', '0:-)'], - 'curl-lip.png': [':-)', ':)', '=)'], - 'sarcastic.png': [';D', ';-D'], - 'sad.png': [':-(', ':(', '=('], - 'wink.png': [';-)', ';)'], - 'tongue.png': [':-P', ':P', ':-p', ':p'], - 'glasses-cool': ['8-)', 'B-)', '(H)'],

1 0

gajim: fix error reply when S5B cannot be established. Fixes #8315
by Gajim 28 Mar '16

28 Mar '16

changeset ac352597e14a in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=ac352597e14a description: fix error reply when S5B cannot be established. Fixes #8315 diffstat: src/common/protocol/bytestream.py | 27 ++++++++++++--------------- 1 files changed, 12 insertions(+), 15 deletions(-) diffs (66 lines): diff -r d84143872a64 -r ac352597e14a src/common/protocol/bytestream.py --- a/src/common/protocol/bytestream.py Tue Mar 08 22:36:22 2016 +0100 +++ b/src/common/protocol/bytestream.py Mon Mar 28 20:52:24 2016 +0200 @@ -364,8 +364,8 @@ from common.connection_handlers_events import FileRequestErrorEvent gajim.nec.push_incoming_event(FileRequestErrorEvent(None, conn=self, jid=unicode(receiver), file_props=file_props, error_msg='')) - self._connect_error(unicode(receiver), file_props.sid, - file_props.sid, code=406) + self._connect_error(file_props.sid, error='not-acceptable', + error_type='modify') else: iq = nbxmpp.Iq(to=unicode(receiver), typ='set') file_props.request_id = 'id_' + file_props.sid @@ -551,7 +551,7 @@ file_props.hash_ = hash_id return - def _connect_error(self,sid, code=404): + def _connect_error(self, sid, error, error_type, msg=None): """ Called when there is an error establishing BS connection, or when connection is rejected @@ -562,23 +562,17 @@ if file_props is None: log.error('can not send iq error on failed transfer') return - msg_dict = { - 404: 'Could not connect to given hosts', - 405: 'Cancel', - 406: 'Not acceptable', - } - msg = msg_dict[code] if file_props.type_ == 's': to = file_props.receiver else: to = file_props.sender - iq = nbxmpp.Iq(to=to, typ='error') - iq.setAttr('id', file_props.sid) + iq = nbxmpp.Iq(to=to, typ='error') + iq.setAttr('id', file_props.request_id) err = iq.setTag('error') - err.setAttr('code', unicode(code)) - err.setData(msg) + err.setAttr('type', error_type) + err.setTag(error, namespace=nbxmpp.NS_STANZAS) self.connection.send(iq) - if code == 404: + if msg: self.disconnect_transfer(file_props) file_props.error = -3 from common.connection_handlers_events import \ @@ -661,9 +655,12 @@ raise nbxmpp.NodeProcessed file_props.streamhosts = streamhosts + def _connection_error(sid): + self._connect_error(sid, 'item-not-found', 'cancel', + msg='Could not connect to given hosts') if file_props.type_ == 'r': gajim.socks5queue.connect_to_hosts(self.name, sid, - self.send_success_connect_reply, self._connect_error) + self.send_success_connect_reply, _connection_error) raise nbxmpp.NodeProcessed def _ResultCB(self, con, iq_obj):

1 0

gajim: Ignore presence errors
by Gajim 24 Mar '16

24 Mar '16

changeset d9a0c09c1b2d in /home/hg/repos/gajim author: tmolitor <thilo(a)eightysoft.de> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=d9a0c09c1b2d description: Ignore presence errors diffstat: src/common/connection_handlers_events.py | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diffs (15 lines): diff -r d312d6ddc50e -r d9a0c09c1b2d src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Sat Mar 19 13:13:25 2016 +0100 +++ b/src/common/connection_handlers_events.py Fri Mar 25 00:29:20 2016 +0100 @@ -848,10 +848,7 @@ gajim.nec.push_incoming_event(UnsubscribedPresenceReceivedEvent( None, conn=self.conn, stanza=self.stanza, presence_obj=self)) elif self.ptype == 'error': - if self.errcode != '409': # conflict # See #5120 - self.show = 'error' - self.status = self.errmsg - return True + return if not self.ptype or self.ptype == 'unavailable': our_jid = gajim.get_jid_from_account(self.conn.name)

1 0

gajim: merge
by Gajim 24 Mar '16

24 Mar '16

changeset 32a3f3c1ddbe in /home/hg/repos/gajim author: tmolitor <thilo(a)eightysoft.de> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=32a3f3c1ddbe description: merge diffstat: src/config.py | 21 +++++++++++++++++++++ src/session.py | 3 +-- 2 files changed, 22 insertions(+), 2 deletions(-) diffs (104 lines): diff -r d9a0c09c1b2d -r 32a3f3c1ddbe src/config.py --- a/src/config.py Fri Mar 25 00:29:20 2016 +0100 +++ b/src/config.py Fri Mar 25 00:29:49 2016 +0100 @@ -3191,6 +3191,8 @@ self.window = self.xml.get_object('manage_bookmarks_window') self.window.set_transient_for(gajim.interface.roster.window) + self.ignore_events = False + # Account-JID, RoomName, Room-JID, Autojoin, Minimize, Passowrd, Nick, # Show_Status self.treestore = Gtk.TreeStore(str, str, str, bool, bool, str, str, str) @@ -3317,8 +3319,11 @@ # Don't remove account iters return + self.ignore_events = True model.remove(iter_) + self.selection.unselect_all() self.clear_fields() + self.ignore_events = False def check_valid_bookmark(self): """ @@ -3438,6 +3443,8 @@ self.print_status_combobox.set_active(opts.index(print_status)) def on_title_entry_changed(self, widget): + if self.ignore_events: + return (model, iter_) = self.selection.get_selected() if iter_: # After removing a bookmark, we got nothing selected if model.iter_parent(iter_): @@ -3445,6 +3452,8 @@ model[iter_][1] = self.title_entry.get_text() def on_nick_entry_changed(self, widget): + if self.ignore_events: + return (model, iter_) = self.selection.get_selected() if iter_: nick = self.nick_entry.get_text() @@ -3458,6 +3467,8 @@ model[iter_][6] = nick def on_server_entry_changed(self, widget): + if self.ignore_events: + return (model, iter_) = self.selection.get_selected() if not iter_: return @@ -3483,6 +3494,8 @@ model[iter_][2] = room_jid def on_room_entry_changed(self, widget): + if self.ignore_events: + return (model, iter_) = self.selection.get_selected() if not iter_: return @@ -3508,22 +3521,30 @@ model[iter_][2] = room_jid def on_pass_entry_changed(self, widget): + if self.ignore_events: + return (model, iter_) = self.selection.get_selected() if iter_: model[iter_][5] = self.pass_entry.get_text() def on_autojoin_checkbutton_toggled(self, widget): + if self.ignore_events: + return (model, iter_) = self.selection.get_selected() if iter_: model[iter_][3] = self.autojoin_checkbutton.get_active() self.minimize_checkbutton.set_sensitive(model[iter_][3]) def on_minimize_checkbutton_toggled(self, widget): + if self.ignore_events: + return (model, iter_) = self.selection.get_selected() if iter_: model[iter_][4] = self.minimize_checkbutton.get_active() def on_print_status_combobox_changed(self, widget): + if self.ignore_events: + return active = widget.get_active() model = widget.get_model() print_status = model[active][1] diff -r d9a0c09c1b2d -r 32a3f3c1ddbe src/session.py --- a/src/session.py Fri Mar 25 00:29:20 2016 +0100 +++ b/src/session.py Fri Mar 25 00:29:49 2016 +0100 @@ -356,8 +356,7 @@ event = event_t(msg, subject, msg_type, tim, encrypted, resource, msg_log_id, xhtml=xhtml, session=self, form_node=form_node, displaymarking=displaymarking, sent_forwarded=False, - show_in_roster=obj.show_in_roster, - show_in_systray=obj.show_in_systray) + show_in_roster=show_in_roster, show_in_systray=show_in_systray) gajim.events.add_event(self.conn.name, fjid, event)

1 0

gajim: fix deleting a bookmark. Fixes #8290
by Gajim 23 Mar '16

23 Mar '16

changeset 41cad711028f in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=41cad711028f description: fix deleting a bookmark. Fixes #8290 diffstat: src/config.py | 21 +++++++++++++++++++++ 1 files changed, 21 insertions(+), 0 deletions(-) diffs (91 lines): diff -r 8374b44462bf -r 41cad711028f src/config.py --- a/src/config.py Wed Mar 23 21:16:29 2016 +0100 +++ b/src/config.py Wed Mar 23 22:32:03 2016 +0100 @@ -3191,6 +3191,8 @@ self.window = self.xml.get_object('manage_bookmarks_window') self.window.set_transient_for(gajim.interface.roster.window) + self.ignore_events = False + # Account-JID, RoomName, Room-JID, Autojoin, Minimize, Passowrd, Nick, # Show_Status self.treestore = Gtk.TreeStore(str, str, str, bool, bool, str, str, str) @@ -3317,8 +3319,11 @@ # Don't remove account iters return + self.ignore_events = True model.remove(iter_) + self.selection.unselect_all() self.clear_fields() + self.ignore_events = False def check_valid_bookmark(self): """ @@ -3438,6 +3443,8 @@ self.print_status_combobox.set_active(opts.index(print_status)) def on_title_entry_changed(self, widget): + if self.ignore_events: + return (model, iter_) = self.selection.get_selected() if iter_: # After removing a bookmark, we got nothing selected if model.iter_parent(iter_): @@ -3445,6 +3452,8 @@ model[iter_][1] = self.title_entry.get_text() def on_nick_entry_changed(self, widget): + if self.ignore_events: + return (model, iter_) = self.selection.get_selected() if iter_: nick = self.nick_entry.get_text() @@ -3458,6 +3467,8 @@ model[iter_][6] = nick def on_server_entry_changed(self, widget): + if self.ignore_events: + return (model, iter_) = self.selection.get_selected() if not iter_: return @@ -3483,6 +3494,8 @@ model[iter_][2] = room_jid def on_room_entry_changed(self, widget): + if self.ignore_events: + return (model, iter_) = self.selection.get_selected() if not iter_: return @@ -3508,22 +3521,30 @@ model[iter_][2] = room_jid def on_pass_entry_changed(self, widget): + if self.ignore_events: + return (model, iter_) = self.selection.get_selected() if iter_: model[iter_][5] = self.pass_entry.get_text() def on_autojoin_checkbutton_toggled(self, widget): + if self.ignore_events: + return (model, iter_) = self.selection.get_selected() if iter_: model[iter_][3] = self.autojoin_checkbutton.get_active() self.minimize_checkbutton.set_sensitive(model[iter_][3]) def on_minimize_checkbutton_toggled(self, widget): + if self.ignore_events: + return (model, iter_) = self.selection.get_selected() if iter_: model[iter_][4] = self.minimize_checkbutton.get_active() def on_print_status_combobox_changed(self, widget): + if self.ignore_events: + return active = widget.get_active() model = widget.get_model() print_status = model[active][1]

1 0

gajim: fix var name
by Gajim 23 Mar '16

23 Mar '16

changeset 8374b44462bf in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=8374b44462bf description: fix var name diffstat: src/session.py | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diffs (13 lines): diff -r d312d6ddc50e -r 8374b44462bf src/session.py --- a/src/session.py Sat Mar 19 13:13:25 2016 +0100 +++ b/src/session.py Wed Mar 23 21:16:29 2016 +0100 @@ -356,8 +356,7 @@ event = event_t(msg, subject, msg_type, tim, encrypted, resource, msg_log_id, xhtml=xhtml, session=self, form_node=form_node, displaymarking=displaymarking, sent_forwarded=False, - show_in_roster=obj.show_in_roster, - show_in_systray=obj.show_in_systray) + show_in_roster=show_in_roster, show_in_systray=show_in_systray) gajim.events.add_event(self.conn.name, fjid, event)

1 0

gajim: prevent an error under GTK2.18+. Fixes #8287
by Gajim 19 Mar '16

19 Mar '16

changeset d312d6ddc50e in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=d312d6ddc50e description: prevent an error under GTK2.18+. Fixes #8287 diffstat: src/gtkgui_helpers.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 3c458f4d03c1 -r d312d6ddc50e src/gtkgui_helpers.py --- a/src/gtkgui_helpers.py Fri Mar 18 22:32:35 2016 +0100 +++ b/src/gtkgui_helpers.py Sat Mar 19 13:13:25 2016 +0100 @@ -125,7 +125,7 @@ """ window_x1, window_y1 = parent_win.get_origin()[1:] - def position_menu_under_button(menu, data): + def position_menu_under_button(menu, _x=None, _y=None, data=None): # inline function, which will not keep refs, when used as CB alloc = button.get_allocation() button_x, button_y = alloc.x, alloc.y

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