Commits

commits@gajim.org

17632 discussions

gajim: fix a few things for jingle video
by Gajim 23 Dec '15

23 Dec '15

changeset ecfc76d21658 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=ecfc76d21658 description: fix a few things for jingle video diffstat: data/gui/preferences_window.ui | 1 + src/common/gajim.py | 2 ++ src/common/jingle_rtp.py | 19 ++++++++++--------- src/common/multimedia_helpers.py | 4 +++- src/dialogs.py | 14 ++++++++------ 5 files changed, 24 insertions(+), 16 deletions(-) diffs (158 lines): diff -r 155cb60aed62 -r ecfc76d21658 data/gui/preferences_window.ui --- a/data/gui/preferences_window.ui Tue Dec 22 21:28:27 2015 +0100 +++ b/data/gui/preferences_window.ui Wed Dec 23 22:40:53 2015 +0100 @@ -2270,6 +2270,7 @@ <property name="receives_default">False</property> <property name="xalign">0</property> <property name="draw_indicator">True</property> + <signal name="toggled" handler="on_video_see_self_checkbutton_toggled" swapped="no"/> </object> <packing> <property name="left_attach">0</property> diff -r 155cb60aed62 -r ecfc76d21658 src/common/gajim.py --- a/src/common/gajim.py Tue Dec 22 21:28:27 2015 +0100 +++ b/src/common/gajim.py Wed Dec 23 22:40:53 2015 +0100 @@ -194,6 +194,8 @@ from gi.repository import Farstream gi.require_version('Gst', '1.0') from gi.repository import Gst + from gi.repository import GdkX11 + from gi.repository import GstVideo from gi.repository import GLib try: Gst.init(None) diff -r 155cb60aed62 -r ecfc76d21658 src/common/jingle_rtp.py --- a/src/common/jingle_rtp.py Tue Dec 22 21:28:27 2015 +0100 +++ b/src/common/jingle_rtp.py Wed Dec 23 22:40:53 2015 +0100 @@ -27,6 +27,8 @@ import gi gi.require_version('Gst', '1.0') from gi.repository import Gst +from gi.repository import GdkX11 +from gi.repository import GstVideo from gi.repository import GLib from common import gajim @@ -234,7 +236,7 @@ # Add fallback source self.src_bin = self.get_fallback_src() self.pipeline.add(self.src_bin) - self.src_bin.get_static_pad('src').link(sink_pad) + self.src_bin.link(sink_pad) self.stream_failed_once = True else: reason = nbxmpp.Node('reason') @@ -386,6 +388,7 @@ # sometimes it'll freeze... JingleRTPContent.setup_stream(self, self._on_src_pad_added) bus = self.pipeline.get_bus() + bus.enable_sync_message_emission() bus.connect('sync-message::element', self._on_sync_message) # the local parts @@ -413,16 +416,14 @@ self.src_bin = self.make_bin_from_config('video_input_device', '%%s %s! %svideoscale ! %svideoconvert' % (tee, framerate, video_size), _("video input")) - #caps = gst.element_factory_make('capsfilter') - #caps.set_property('caps', gst.caps_from_string('video/x-raw-yuv, width=320, height=240')) - self.pipeline.add(self.src_bin)#, caps) + self.pipeline.add(self.src_bin) self.pipeline.set_state(Gst.State.PLAYING) - #src_bin.link(caps) self.sink = self.make_bin_from_config('video_output_device', 'videoscale ! videoconvert ! %s', _("video output")) + self.pipeline.add(self.sink) self.src_bin.get_static_pad('src').link(self.p2psession.get_property( @@ -432,16 +433,16 @@ self.pipeline.set_state(Gst.State.PLAYING) def _on_sync_message(self, bus, message): - if message.structure is None: + if message.get_structure() is None: return False - if message.structure.get_name() == 'prepare-xwindow-id': + if message.get_structure().get_name() == 'prepare-window-handle': message.src.set_property('force-aspect-ratio', True) imagesink = message.src if gajim.config.get('video_see_self') and not self.out_xid_set: - imagesink.set_xwindow_id(self.out_xid) + imagesink.set_window_handle(self.out_xid) self.out_xid_set = True else: - imagesink.set_xwindow_id(self.in_xid) + imagesink.set_window_handle(self.in_xid) def get_fallback_src(self): # TODO: Use avatar? diff -r 155cb60aed62 -r ecfc76d21658 src/common/multimedia_helpers.py --- a/src/common/multimedia_helpers.py Tue Dec 22 21:28:27 2015 +0100 +++ b/src/common/multimedia_helpers.py Wed Dec 23 22:40:53 2015 +0100 @@ -14,6 +14,8 @@ ## along with Gajim. If not, see <http://www.gnu.org/licenses/>. from gi.repository import Gst +from gi.repository import GdkX11 +from gi.repository import GstVideo class DeviceManager(object): @@ -85,7 +87,7 @@ self.devices = {} # Test src self.detect_element('videotestsrc', _('Video test'), - '%s is-live=true ! video/x-raw-yuv,framerate=10/1') + '%s is-live=true ! video/x-raw,framerate=10/1') # Auto src self.detect_element('autovideosrc', _('Autodetect')) # V4L2 src diff -r 155cb60aed62 -r ecfc76d21658 src/dialogs.py --- a/src/dialogs.py Tue Dec 22 21:28:27 2015 +0100 +++ b/src/dialogs.py Wed Dec 23 22:40:53 2015 +0100 @@ -5393,33 +5393,35 @@ fixed = ctrl.xml.get_object('outgoing_fixed') fixed.set_no_show_all(False) video_hbox.show_all() + ctrl.xml.get_object('incoming_drawingarea').realize() if os.name == 'nt': in_xid = ctrl.xml.get_object('incoming_drawingarea').\ get_window().handle else: in_xid = ctrl.xml.get_object('incoming_drawingarea').\ - get_window().xid + get_property('window').get_xid() content = session.get_content('video') # move outgoing stream to chat window if gajim.config.get('video_see_self'): + ctrl.xml.get_object('outgoing_drawingarea').realize() if os.name == 'nt': out_xid = ctrl.xml.get_object('outgoing_drawingarea').\ get_window().handle else: out_xid = ctrl.xml.get_object('outgoing_drawingarea').\ - get_window().xid + get_property('window').get_xid() b = content.src_bin found = False - for e in b.elements(): + for e in b.children: if e.get_name().startswith('autovideosink'): found = True break if found: - found = False - for f in e.elements(): + for f in e.children: if f.get_name().startswith('autovideosink'): - f.set_xwindow_id(out_xid) + f.set_window_handle(out_xid) content.out_xid = out_xid + break content.in_xid = in_xid ctrl.set_video_state('connecting', self.sid) # Now, accept the content/sessions.

1 0

gajim: [Darlan] remove non-IBR from servers.xml. Fixes #8203
by Gajim 22 Dec '15

22 Dec '15

changeset c3141c7b6a19 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=c3141c7b6a19 description: [Darlan] remove non-IBR from servers.xml. Fixes #8203 diffstat: data/other/servers.xml | 46 ---------------------------------------------- 1 files changed, 0 insertions(+), 46 deletions(-) diffs (118 lines): diff -r 725f1b5da2bf -r c3141c7b6a19 data/other/servers.xml --- a/data/other/servers.xml Sun Dec 20 20:42:38 2015 +0100 +++ b/data/other/servers.xml Tue Dec 22 21:28:27 2015 +0100 @@ -8,15 +8,9 @@ --> <query xmlns:reg="urn:xmpp:vcard:registration:1"> <item jid="0nl1ne.at" /> - <item jid="blah.im" /> - <item jid="boese-ban.de" /> <item jid="brauchen.info" /> - <item jid="ch3kr.net" /> <item jid="chatme.im" /> - <item jid="chrome.pl" /> <item jid="climm.org" /> - <item jid="coderollers.com" /> - <item jid="codingteam.net" /> <item jid="comm.unicate.me" /> <item jid="creep.im" /> <item jid="deshalbfrei.org" /> @@ -25,44 +19,28 @@ <item jid="forumanalogue.fr" /> <item jid="im.apinc.org" /> <item jid="im.flosoft.biz" /> - <item jid="internet-exception.de" /> - <item jid="is-a-furry.org" /> - <item jid="jabb3r.net" /> - <item jid="jabber-br.org" /> <item jid="jabber-hosting.de" /> <item jid="jabber.at" /> <item jid="jabber.ccc.de" /> <item jid="jabber.chaotic.de" /> <item jid="jabber.co.nz" /> <item jid="jabber.cz" /> - <item jid="jabber.de" /> <item jid="jabber.earth.li" /> - <item jid="jabber.etighichat.com" /> <item jid="jabber.fourecks.de" /> - <item jid="jabber.gate31.net" /> <item jid="jabber.hot-chilli.net" /> <item jid="jabber.i-pobox.net" /> - <item jid="jabber.iitsp.com" /> - <item jid="jabber.loudas.com" /> <item jid="jabber.me" /> <item jid="jabber.meta.net.nz" /> - <item jid="jabber.minus273.org" /> <item jid="jabber.no" /> <item jid="jabber.sk" /> - <item jid="jabber.no-sense.net" /> <item jid="jabber.org" /> - <item jid="jabber.rootbash.com" /> <item jid="jabber.rueckgr.at" /> <item jid="jabber.scha.de" /> - <item jid="jabber.schnied.net" /> <item jid="jabber.second-home.de" /> <item jid="jabber.smash-net.org" /> <item jid="jabber.sow.as" /> <item jid="jabber.theforest.us" /> - <item jid="jabber.tmkis.com" /> - <item jid="jabber.yeahnah.co.nz" /> <item jid="jabberafrica.org" /> - <item jid="jabberd.eu" /> <item jid="jabberes.org" /> <item jid="jabberpl.org" /> <item jid="jabbim.com" /> @@ -70,32 +48,14 @@ <item jid="jabbim.hu" /> <item jid="jabbim.pl" /> <item jid="jabbim.sk" /> - <item jid="jabin.org" /> - <item jid="jabme.de" /> <item jid="jabster.pl" /> <item jid="jaim.at" /> - <item jid="jappix.com" /> - <item jid="jisshi.com" /> - <item jid="labnote.org" /> - <item jid="lightwitch.org" /> - <item jid="limun.org" /> <item jid="linuxlovers.at" /> <item jid="lsd-25.ru" /> - <item jid="macjabber.de" /> - <item jid="mayplaces.com" /> - <item jid="miqote.com" /> - <item jid="na-di.de" /> - <item jid="neko.im" /> - <item jid="netmindz.net" /> <item jid="njs.netlab.cz" /> - <item jid="palemoon.net" /> <item jid="palita.net" /> <item jid="pandion.im" /> - <item jid="pidgin.su" /> - <item jid="programmer-art.org" /> - <item jid="prosody.de" /> <item jid="richim.org" /> - <item jid="rkquery.de" /> <item jid="sss.chaoslab.ru" /> <item jid="sternenschweif.de" /> <item jid="suchat.org" /> @@ -106,11 +66,7 @@ <item jid="swissjabber.org" /> <item jid="tcweb.org" /> <item jid="tekst.me" /> - <item jid="thiessen.im" /> - <item jid="thiessen.it" /> - <item jid="thiessen.org" /> <item jid="tigase.im" /> - <item jid="twattle.net" /> <item jid="ubuntu-jabber.de" /> <item jid="ubuntu-jabber.net" /> <item jid="univers-libre.net" /> @@ -120,8 +76,6 @@ <item jid="xabber.de" /> <item jid="xmpp-hosting.de" /> <item jid="xmpp.jp" /> - <item jid="xmpp.ru.net" /> <item jid="xmppnet.de" /> - <item jid="zauris.ru" /> <item jid="zsim.de" /> </query>

1 0

gajim: [Darlan] remove non-IBR from servers.xml. Fixes #8203
by Gajim 22 Dec '15

22 Dec '15

changeset 155cb60aed62 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=155cb60aed62 description: [Darlan] remove non-IBR from servers.xml. Fixes #8203 diffstat: data/other/servers.xml | 46 ---------------------------------------------- 1 files changed, 0 insertions(+), 46 deletions(-) diffs (118 lines): diff -r af78b7c06890 -r 155cb60aed62 data/other/servers.xml --- a/data/other/servers.xml Sun Dec 20 20:42:38 2015 +0100 +++ b/data/other/servers.xml Tue Dec 22 21:28:27 2015 +0100 @@ -8,15 +8,9 @@ --> <query xmlns:reg="urn:xmpp:vcard:registration:1"> <item jid="0nl1ne.at" /> - <item jid="blah.im" /> - <item jid="boese-ban.de" /> <item jid="brauchen.info" /> - <item jid="ch3kr.net" /> <item jid="chatme.im" /> - <item jid="chrome.pl" /> <item jid="climm.org" /> - <item jid="coderollers.com" /> - <item jid="codingteam.net" /> <item jid="comm.unicate.me" /> <item jid="creep.im" /> <item jid="deshalbfrei.org" /> @@ -25,44 +19,28 @@ <item jid="forumanalogue.fr" /> <item jid="im.apinc.org" /> <item jid="im.flosoft.biz" /> - <item jid="internet-exception.de" /> - <item jid="is-a-furry.org" /> - <item jid="jabb3r.net" /> - <item jid="jabber-br.org" /> <item jid="jabber-hosting.de" /> <item jid="jabber.at" /> <item jid="jabber.ccc.de" /> <item jid="jabber.chaotic.de" /> <item jid="jabber.co.nz" /> <item jid="jabber.cz" /> - <item jid="jabber.de" /> <item jid="jabber.earth.li" /> - <item jid="jabber.etighichat.com" /> <item jid="jabber.fourecks.de" /> - <item jid="jabber.gate31.net" /> <item jid="jabber.hot-chilli.net" /> <item jid="jabber.i-pobox.net" /> - <item jid="jabber.iitsp.com" /> - <item jid="jabber.loudas.com" /> <item jid="jabber.me" /> <item jid="jabber.meta.net.nz" /> - <item jid="jabber.minus273.org" /> <item jid="jabber.no" /> <item jid="jabber.sk" /> - <item jid="jabber.no-sense.net" /> <item jid="jabber.org" /> - <item jid="jabber.rootbash.com" /> <item jid="jabber.rueckgr.at" /> <item jid="jabber.scha.de" /> - <item jid="jabber.schnied.net" /> <item jid="jabber.second-home.de" /> <item jid="jabber.smash-net.org" /> <item jid="jabber.sow.as" /> <item jid="jabber.theforest.us" /> - <item jid="jabber.tmkis.com" /> - <item jid="jabber.yeahnah.co.nz" /> <item jid="jabberafrica.org" /> - <item jid="jabberd.eu" /> <item jid="jabberes.org" /> <item jid="jabberpl.org" /> <item jid="jabbim.com" /> @@ -70,32 +48,14 @@ <item jid="jabbim.hu" /> <item jid="jabbim.pl" /> <item jid="jabbim.sk" /> - <item jid="jabin.org" /> - <item jid="jabme.de" /> <item jid="jabster.pl" /> <item jid="jaim.at" /> - <item jid="jappix.com" /> - <item jid="jisshi.com" /> - <item jid="labnote.org" /> - <item jid="lightwitch.org" /> - <item jid="limun.org" /> <item jid="linuxlovers.at" /> <item jid="lsd-25.ru" /> - <item jid="macjabber.de" /> - <item jid="mayplaces.com" /> - <item jid="miqote.com" /> - <item jid="na-di.de" /> - <item jid="neko.im" /> - <item jid="netmindz.net" /> <item jid="njs.netlab.cz" /> - <item jid="palemoon.net" /> <item jid="palita.net" /> <item jid="pandion.im" /> - <item jid="pidgin.su" /> - <item jid="programmer-art.org" /> - <item jid="prosody.de" /> <item jid="richim.org" /> - <item jid="rkquery.de" /> <item jid="sss.chaoslab.ru" /> <item jid="sternenschweif.de" /> <item jid="suchat.org" /> @@ -106,11 +66,7 @@ <item jid="swissjabber.org" /> <item jid="tcweb.org" /> <item jid="tekst.me" /> - <item jid="thiessen.im" /> - <item jid="thiessen.it" /> - <item jid="thiessen.org" /> <item jid="tigase.im" /> - <item jid="twattle.net" /> <item jid="ubuntu-jabber.de" /> <item jid="ubuntu-jabber.net" /> <item jid="univers-libre.net" /> @@ -120,8 +76,6 @@ <item jid="xabber.de" /> <item jid="xmpp-hosting.de" /> <item jid="xmpp.jp" /> - <item jid="xmpp.ru.net" /> <item jid="xmppnet.de" /> - <item jid="zauris.ru" /> <item jid="zsim.de" /> </query>

1 0

gajim: [tmolitor] add a way to sort emoticons in emoticon menu. ...
by Gajim 20 Dec '15

20 Dec '15

changeset fc540d01a959 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=fc540d01a959 description: [tmolitor] add a way to sort emoticons in emoticon menu. Fixes #8204 diffstat: src/gui_interface.py | 16 ++++++++++++++-- 1 files changed, 14 insertions(+), 2 deletions(-) diffs (54 lines): diff -r 0940684e9fb8 -r fc540d01a959 src/gui_interface.py --- a/src/gui_interface.py Thu Dec 17 20:10:06 2015 +0100 +++ b/src/gui_interface.py Sat Dec 19 11:15:40 2015 +0100 @@ -2005,6 +2005,11 @@ import imp imp.reload(emoticons) emots = emoticons.emoticons + self.emoticons_sorting = None + try: + self.emoticons_sorting = emoticons.sorting + except: + pass except Exception as e: return True for emot_filename in emots: @@ -2023,6 +2028,12 @@ 16, 16) self.emoticons_images.append((emot, pix)) self.emoticons[emot.upper()] = emot_file + def emoticons_sorter(item): + try: + return self.emoticons_sorting.index(item[0]) + except: + return 0 + self.emoticons_images = sorted(self.emoticons_images, key=emoticons_sorter) del emoticons sys.path.remove(path) @@ -2087,7 +2098,7 @@ ################################################################################ def join_gc_room(self, account, room_jid, nick, password, minimize=False, - is_continued=False): + is_continued=False): """ Join the room immediately """ @@ -2572,7 +2583,7 @@ # we are not already connected minimize = bm['minimize'] in ('1', 'true') self.join_gc_room(account, jid, bm['nick'], - bm['password'], minimize = minimize) + bm['password'], minimize = minimize) elif jid in self.minimized_controls[account]: # more or less a hack: # On disconnect the minimized gc contact instances @@ -2772,6 +2783,7 @@ self.emoticons = [] self.emoticons_animations = {} self.emoticons_images = {} + self.emoticons_sorting = None cfg_was_read = parser.read()

1 0

gajim: Ignore roster pushes that are not from our JID or our ser...
by Gajim 20 Dec '15

20 Dec '15

changeset af78b7c06890 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=af78b7c06890 description: Ignore roster pushes that are not from our JID or our server. Ignore badly farmated roster pushes. diffstat: src/common/connection_handlers_events.py | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diffs (26 lines): diff -r fc540d01a959 -r af78b7c06890 src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Sat Dec 19 11:15:40 2015 +0100 +++ b/src/common/connection_handlers_events.py Sun Dec 20 20:42:38 2015 +0100 @@ -407,6 +407,10 @@ base_network_events = [] def generate(self): + frm = helpers.get_jid_from_iq(self.stanza) + our_jid = gajim.get_jid_from_account(self.conn.name) + if frm and frm != our_jid and frm != gajim.get_server_from_jid(our_jid): + return self.version = self.stanza.getTagAttr('query', 'ver') self.items = {} for item in self.stanza.getTag('query').getChildren(): @@ -423,6 +427,11 @@ groups.append(group.getData()) self.items[jid] = {'name': name, 'sub': sub, 'ask': ask, 'groups': groups} + if len(self.items) > 1: + reply = nbxmpp.Iq(typ='error', attrs={'id': self.stanza.getID()}, + to=self.stanza.getFrom(), frm=self.stanza.getTo(), xmlns=None) + self.conn.connection.send(reply) + return if self.conn.connection and self.conn.connected > 1: reply = nbxmpp.Iq(typ='result', attrs={'id': self.stanza.getID()}, to=self.stanza.getFrom(), frm=self.stanza.getTo(), xmlns=None)

1 0

gajim: don't traceback when deleting an account. Fixes #8199
by Gajim 20 Dec '15

20 Dec '15

changeset ba73423fb6e1 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=ba73423fb6e1 description: don't traceback when deleting an account. Fixes #8199 diffstat: src/roster_window.py | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diffs (21 lines): diff -r 44024cd39584 -r ba73423fb6e1 src/roster_window.py --- a/src/roster_window.py Tue Dec 15 22:25:39 2015 +0100 +++ b/src/roster_window.py Sat Dec 12 13:52:18 2015 +0100 @@ -115,6 +115,8 @@ if self.regroup: name = 'MERGED' + if name not in self._iters: + return None it = self._iters[name]['account'] if model == self.model or it is None: @@ -145,6 +147,8 @@ if self.regroup: account = 'MERGED' + if account not in self._iters: + return None if name not in self._iters[account]['groups']: return None

1 0

gajim: [tmolitor] use uuid instead of plain counting integers fo...
by Gajim 20 Dec '15

20 Dec '15

changeset 0940684e9fb8 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=0940684e9fb8 description: [tmolitor] use uuid instead of plain counting integers for stanza ids. Fixes #8202 diffstat: src/common/gajim.py | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diffs (24 lines): diff -r ba73423fb6e1 -r 0940684e9fb8 src/common/gajim.py --- a/src/common/gajim.py Sat Dec 12 13:52:18 2015 +0100 +++ b/src/common/gajim.py Thu Dec 17 20:10:06 2015 +0100 @@ -32,6 +32,7 @@ import logging import locale import gi +import uuid from common import config import nbxmpp @@ -239,11 +240,8 @@ # Capabilities hash per account caps_hash = {} -global_id = 0 def get_an_id(): - global global_id - global_id += 1 - return global_id + return str(uuid.uuid4()) def get_nick_from_jid(jid): pos = jid.find('@')

1 0

gajim-plugins: [gotr] do not crash when Gajim version has 4 numb...
by Gajim Plugins 20 Dec '15

20 Dec '15

changeset f7925acd4aba in /home/hg/repos/gajim-plugins author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:gajim-plugins?cmd=changeset;node=f7925acd4aba description: [gotr] do not crash when Gajim version has 4 numbers (0.16.4.1) diffstat: gotr/manifest.ini | 2 +- gotr/otrmodule.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diffs (33 lines): diff -r 2dc8e77a80e5 -r f7925acd4aba gotr/manifest.ini --- a/gotr/manifest.ini Sat Dec 19 02:26:57 2015 +0100 +++ b/gotr/manifest.ini Sun Nov 22 16:59:48 2015 +0100 @@ -1,7 +1,7 @@ [info] name: Off-The-Record Encryption short_name: gotr -version: 1.9.1 +version: 1.9.2 description: Provide OTR encryption. Read <a href="https://github.com/python-otr/gajim-otr/wiki">https://github.com/python-otr/gajim-otr/wiki</a> before use. authors: Kjell Braden <afflux.gajim(a)pentabarf.de> homepage: http://gajim-otr.pentabarf.de diff -r 2dc8e77a80e5 -r f7925acd4aba gotr/otrmodule.py --- a/gotr/otrmodule.py Sat Dec 19 02:26:57 2015 +0100 +++ b/gotr/otrmodule.py Sun Nov 22 16:59:48 2015 +0100 @@ -66,7 +66,7 @@ import time import sys from pprint import pformat -from distutils.version import StrictVersion +from distutils.version import LooseVersion from common import gajim from common import ged @@ -279,7 +279,7 @@ self.handle_incoming_msg) self.events_handlers['before-change-show'] = (ged.PRECORE, self.handle_change_show) - if StrictVersion(gajim.config.get('version')) < StrictVersion(MINVERSION_OUTGOING_MSG_STAZA): + if LooseVersion(gajim.config.get('version')) < LooseVersion(MINVERSION_OUTGOING_MSG_STAZA): self.events_handlers['message-outgoing'] = (ged.OUT_PRECORE, self.handle_outgoing_msg) else:

1 0

gajim: Ignore roster pushes that are not from our JID or our ser...
by Gajim 20 Dec '15

20 Dec '15

changeset 725f1b5da2bf 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=725f1b5da2bf description: Ignore roster pushes that are not from our JID or our server. Ignore badly farmated roster pushes. diffstat: src/common/connection_handlers_events.py | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diffs (26 lines): diff -r 47d1d194e2d1 -r 725f1b5da2bf src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Sat Dec 19 11:15:40 2015 +0100 +++ b/src/common/connection_handlers_events.py Sun Dec 20 20:42:38 2015 +0100 @@ -408,6 +408,10 @@ base_network_events = [] def generate(self): + frm = helpers.get_jid_from_iq(self.stanza) + our_jid = gajim.get_jid_from_account(self.conn.name) + if frm and frm != our_jid and frm != gajim.get_server_from_jid(our_jid): + return self.version = self.stanza.getTagAttr('query', 'ver') self.items = {} for item in self.stanza.getTag('query').getChildren(): @@ -424,6 +428,11 @@ groups.append(group.getData()) self.items[jid] = {'name': name, 'sub': sub, 'ask': ask, 'groups': groups} + if len(self.items) > 1: + reply = nbxmpp.Iq(typ='error', attrs={'id': self.stanza.getID()}, + to=self.stanza.getFrom(), frm=self.stanza.getTo(), xmlns=None) + self.conn.connection.send(reply) + return if self.conn.connection and self.conn.connected > 1: reply = nbxmpp.Iq(typ='result', attrs={'id': self.stanza.getID()}, to=self.stanza.getFrom(), frm=self.stanza.getTo(), xmlns=None)

1 0

gajim: [tmolitor] add a way to sort emoticons in emoticon menu. ...
by Gajim 19 Dec '15

19 Dec '15

changeset 47d1d194e2d1 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=47d1d194e2d1 description: [tmolitor] add a way to sort emoticons in emoticon menu. Fixes #8204 diffstat: src/gui_interface.py | 16 ++++++++++++++-- 1 files changed, 14 insertions(+), 2 deletions(-) diffs (54 lines): diff -r 5f460d7b8143 -r 47d1d194e2d1 src/gui_interface.py --- a/src/gui_interface.py Thu Dec 17 20:10:06 2015 +0100 +++ b/src/gui_interface.py Sat Dec 19 11:15:40 2015 +0100 @@ -1991,6 +1991,11 @@ # set reload(emoticons) emots = emoticons.emoticons + self.emoticons_sorting = None + try: + self.emoticons_sorting = emoticons.sorting + except: + pass except Exception, e: return True for emot_filename in emots: @@ -2009,6 +2014,12 @@ 16, 16) self.emoticons_images.append((emot, pix)) self.emoticons[emot.upper()] = emot_file + def emoticons_sorter(item): + try: + return self.emoticons_sorting.index(item[0]) + except: + return 0 + self.emoticons_images = sorted(self.emoticons_images, key=emoticons_sorter) del emoticons sys.path.remove(path) @@ -2073,7 +2084,7 @@ ################################################################################ def join_gc_room(self, account, room_jid, nick, password, minimize=False, - is_continued=False): + is_continued=False): """ Join the room immediately """ @@ -2589,7 +2600,7 @@ # we are not already connected minimize = bm['minimize'] in ('1', 'true') self.join_gc_room(account, jid, bm['nick'], - bm['password'], minimize = minimize) + bm['password'], minimize = minimize) elif jid in self.minimized_controls[account]: # more or less a hack: # On disconnect the minimized gc contact instances @@ -2792,6 +2803,7 @@ self.emoticons = [] self.emoticons_animations = {} self.emoticons_images = {} + self.emoticons_sorting = None cfg_was_read = parser.read()

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