Commits

commits@gajim.org

17632 discussions

gajim: don't commit SQL request too fast to improve performences...
by Yann Leboulanger 07 Apr '12

07 Apr '12

changeset 692089c2d7d4 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=692089c2d7d4 description: don't commit SQL request too fast to improve performences. Fixes #6905 diffstat: src/common/logger.py | 49 ++++++++++++++++++++++++++++++------------------- 1 files changed, 30 insertions(+), 19 deletions(-) diffs (121 lines): diff -r 8655f45bc38f -r 692089c2d7d4 src/common/logger.py --- a/src/common/logger.py Sun Apr 01 20:17:05 2012 +0200 +++ b/src/common/logger.py Tue Apr 03 19:38:15 2012 +0200 @@ -34,6 +34,7 @@ import datetime from gzip import GzipFile from cStringIO import StringIO +import gobject import exceptions import gajim @@ -106,6 +107,7 @@ def __init__(self): self.jids_already_in = [] # holds jids that we already have in DB self.con = None + self.commit_timout_id = None if not os.path.exists(LOG_DB_PATH): # this can happen only the first time (the time we create the db) @@ -163,15 +165,25 @@ self.open_db() self.get_jids_already_in_db() + def _really_commit(self): + try: + self.con.commit() + except sqlite.OperationalError, e: + print >> sys.stderr, str(e) + self.commit_timout_id = None + return False + + def _timeout_commit(self): + if self.commit_timout_id: + return + self.commit_timout_id = gobject.timeout_add(500, self._really_commit) + def simple_commit(self, sql_to_commit): """ Helper to commit """ self.cur.execute(sql_to_commit) - try: - self.con.commit() - except sqlite.OperationalError, e: - print >> sys.stderr, str(e) + self._timeout_commit() def get_jids_already_in_db(self): try: @@ -398,12 +410,14 @@ except sqlite.OperationalError, e: raise exceptions.PysqliteOperationalError(str(e)) message_id = None - try: - self.con.commit() - if write_unread: + if write_unread: + try: + self.con.commit() message_id = self.cur.lastrowid - except sqlite.OperationalError, e: - print >> sys.stderr, str(e) + except sqlite.OperationalError, e: + print >> sys.stderr, str(e) + else: + self._timeout_commit() if message_id: self.insert_unread_events(message_id, values[0]) return message_id @@ -909,10 +923,7 @@ VALUES (?, ?, ?, ?); ''', (hash_method, hash_, buffer(data), int(time.time()))) # (1) -- note above - try: - self.con.commit() - except sqlite.OperationalError, e: - print >> sys.stderr, str(e) + self._timeout_commit() def update_caps_time(self, method, hash_): sql = '''UPDATE caps_cache SET last_seen = %d @@ -950,9 +961,9 @@ # Fill roster tables with the new roster for jid in roster: self.add_or_update_contact(account_jid, jid, roster[jid]['name'], - roster[jid]['subscription'], roster[jid]['ask'], - roster[jid]['groups'], commit=False) - self.con.commit() + roster[jid]['subscription'], roster[jid]['ask'], + roster[jid]['groups'], commit=False) + self._timeout_commit() # At this point, we are sure the replacement works properly so we can # set the new roster_version value. @@ -974,7 +985,7 @@ self.cur.execute( 'DELETE FROM roster_entry WHERE account_jid_id=? AND jid_id=?', (account_jid_id, jid_id)) - self.con.commit() + self._timeout_commit() def add_or_update_contact(self, account_jid, jid, name, sub, ask, groups, commit=True): @@ -1009,7 +1020,7 @@ self.convert_human_subscription_values_to_db_api_values(sub), bool(ask))) if commit: - self.con.commit() + self._timeout_commit() def get_roster(self, account_jid): """ @@ -1062,7 +1073,7 @@ (account_jid_id,)) self.cur.execute('DELETE FROM roster_group WHERE account_jid_id=?', (account_jid_id,)) - self.con.commit() + self._timeout_commit() def save_if_not_exists(self, with_, direction, tim, msg='', nick=None): if tim:

1 0

gajim: we require PyGTK2.22 for InfoBar
by Yann Leboulanger 07 Apr '12

07 Apr '12

changeset 8655f45bc38f in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=8655f45bc38f description: we require PyGTK2.22 for InfoBar diffstat: README.html | 2 +- debian/control | 2 +- src/gajim.py | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) diffs (46 lines): diff -r 627d4c33003b -r 8655f45bc38f README.html --- a/README.html Sun Apr 01 19:47:11 2012 +0200 +++ b/README.html Sun Apr 01 20:17:05 2012 +0200 @@ -15,7 +15,7 @@ <h2>Runtime Requirements</h2> <ul> <li>python2.5 or higher</li> -<li>pygtk2.16 or higher</li> +<li>pygtk2.22 or higher</li> </ul> <h2>Optional Runtime Requirements</h2> diff -r 627d4c33003b -r 8655f45bc38f debian/control --- a/debian/control Sun Apr 01 19:47:11 2012 +0200 +++ b/debian/control Sun Apr 01 20:17:05 2012 +0200 @@ -10,7 +10,7 @@ Package: gajim Architecture: all -Depends: ${misc:Depends}, ${python:Depends}, python-gtk2 (>= 2.16.0), dnsutils +Depends: ${misc:Depends}, ${python:Depends}, python-gtk2 (>= 2.22.0), dnsutils Recommends: dbus, python-dbus, notification-daemon, python-openssl (>= 0.12), python-crypto, python-pyasn1 Suggests: python-gconf, python-gnome2, nautilus-sendto, avahi-daemon, python-avahi, network-manager, libgtkspell0, aspell-en, python-gnomekeyring, gnome-keyring, python-kerberos (>= 1.1), texlive-latex-base, dvipng, python-farsight, gstreamer0.10-plugins-ugly, python-pycurl Description: Jabber client written in PyGTK diff -r 627d4c33003b -r 8655f45bc38f src/gajim.py --- a/src/gajim.py Sun Apr 01 19:47:11 2012 +0200 +++ b/src/gajim.py Sun Apr 01 20:17:05 2012 +0200 @@ -233,12 +233,12 @@ elif sysname in ('FreeBSD', 'OpenBSD', 'NetBSD'): libc.setproctitle('gajim') - if gtk.pygtk_version < (2, 16, 0): - pritext = _('Gajim needs PyGTK 2.16 or above') - sectext = _('Gajim needs PyGTK 2.16 or above to run. Quiting...') - elif gtk.gtk_version < (2, 16, 0): - pritext = _('Gajim needs GTK 2.16 or above') - sectext = _('Gajim needs GTK 2.16 or above to run. Quiting...') + if gtk.pygtk_version < (2, 22, 0): + pritext = _('Gajim needs PyGTK 2.22 or above') + sectext = _('Gajim needs PyGTK 2.22 or above to run. Quiting...') + elif gtk.gtk_version < (2, 22, 0): + pritext = _('Gajim needs GTK 2.22 or above') + sectext = _('Gajim needs GTK 2.22 or above to run. Quiting...') from common import check_paths

1 0

gajim: revert unwanted change
by Yann Leboulanger 07 Apr '12

07 Apr '12

changeset 627d4c33003b in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=627d4c33003b description: revert unwanted change diffstat: src/chat_control.py | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diffs (32 lines): diff -r 70dbe48350ff -r 627d4c33003b src/chat_control.py --- a/src/chat_control.py Sun Apr 01 19:39:26 2012 +0200 +++ b/src/chat_control.py Sun Apr 01 19:47:11 2012 +0200 @@ -1648,15 +1648,15 @@ self.restore_conversation() self.msg_textview.grab_focus() - # change tooltip text for audio and video buttons if python-farstream is + # change tooltip text for audio and video buttons if python-farsight is # not installed - if not gajim.HAVE_FARSTREAM: + if not gajim.HAVE_FARSIGHT: tooltip_text = self._audio_button.get_tooltip_text() self._audio_button.set_tooltip_text( - '%s\n%s' % (tooltip_text, _('Requires python-farstream.'))) + '%s\n%s' % (tooltip_text, _('Requires python-farsight.'))) tooltip_text = self._video_button.get_tooltip_text() self._video_button.set_tooltip_text( - '%s\n%s' % (tooltip_text, _('Requires python-farstream.'))) + '%s\n%s' % (tooltip_text, _('Requires python-farsight.'))) gajim.ged.register_event_handler('pep-received', ged.GUI1, self._nec_pep_received) @@ -1704,7 +1704,7 @@ # Jingle detection if self.contact.supports(NS_JINGLE_ICE_UDP) and \ - gajim.HAVE_FARSTREAM and self.contact.resource: + gajim.HAVE_FARSIGHT and self.contact.resource: self.audio_available = self.contact.supports(NS_JINGLE_RTP_AUDIO) self.video_available = self.contact.supports(NS_JINGLE_RTP_VIDEO) else:

1 0

gajim: correctly forward unread printed messages to other resour...
by Yann Leboulanger 07 Apr '12

07 Apr '12

changeset 70dbe48350ff in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=70dbe48350ff description: correctly forward unread printed messages to other resources. Fixes #7094 diffstat: src/chat_control.py | 14 +++++++------- src/common/commands.py | 18 +++++++++++------- src/common/events.py | 2 +- src/common/stanza_session.py | 2 +- src/gui_interface.py | 4 ++-- src/roster_window.py | 4 ++-- 6 files changed, 24 insertions(+), 20 deletions(-) diffs (142 lines): diff -r 74adce11c070 -r 70dbe48350ff src/chat_control.py --- a/src/chat_control.py Tue Mar 27 14:57:49 2012 +0200 +++ b/src/chat_control.py Sun Apr 01 19:39:26 2012 +0200 @@ -980,8 +980,8 @@ show_in_systray = notify.get_show_in_systray(event, self.account, self.contact, type_) - event = gajim.events.create_event(type_, (self, msg_id), - show_in_roster=show_in_roster, + event = gajim.events.create_event(type_, (text, subject, self, + msg_id), show_in_roster=show_in_roster, show_in_systray=show_in_systray) gajim.events.add_event(self.account, full_jid, event) # We need to redraw contact if we show in roster @@ -1648,15 +1648,15 @@ self.restore_conversation() self.msg_textview.grab_focus() - # change tooltip text for audio and video buttons if python-farsight is + # change tooltip text for audio and video buttons if python-farstream is # not installed - if not gajim.HAVE_FARSIGHT: + if not gajim.HAVE_FARSTREAM: tooltip_text = self._audio_button.get_tooltip_text() self._audio_button.set_tooltip_text( - '%s\n%s' % (tooltip_text, _('Requires python-farsight.'))) + '%s\n%s' % (tooltip_text, _('Requires python-farstream.'))) tooltip_text = self._video_button.get_tooltip_text() self._video_button.set_tooltip_text( - '%s\n%s' % (tooltip_text, _('Requires python-farsight.'))) + '%s\n%s' % (tooltip_text, _('Requires python-farstream.'))) gajim.ged.register_event_handler('pep-received', ged.GUI1, self._nec_pep_received) @@ -1704,7 +1704,7 @@ # Jingle detection if self.contact.supports(NS_JINGLE_ICE_UDP) and \ - gajim.HAVE_FARSIGHT and self.contact.resource: + gajim.HAVE_FARSTREAM and self.contact.resource: self.audio_available = self.contact.supports(NS_JINGLE_RTP_AUDIO) self.video_available = self.contact.supports(NS_JINGLE_RTP_VIDEO) else: diff -r 74adce11c070 -r 70dbe48350ff src/common/commands.py --- a/src/common/commands.py Tue Mar 27 14:57:49 2012 +0200 +++ b/src/common/commands.py Sun Apr 01 19:39:26 2012 +0200 @@ -56,10 +56,10 @@ assert status in ('executing', 'completed', 'canceled') response = request.buildReply('result') - cmd = response.addChild('command', namespace=xmpp.NS_COMMANDS, attrs={ - 'sessionid': self.sessionid, - 'node': self.commandnode, - 'status': status}) + cmd = response.getTag('command', namespace=xmpp.NS_COMMANDS) + cmd.setAttr('sessionid', self.sessionid) + cmd.setAttr('node', self.commandnode) + cmd.setAttr('status', status) if defaultaction is not None or actions is not None: if defaultaction is not None: assert defaultaction in ('cancel', 'execute', 'prev', 'next', @@ -277,13 +277,17 @@ def execute(self, request): account = self.connection.name # Forward messages - events = gajim.events.get_events(account, types=['chat', 'normal']) + events = gajim.events.get_events(account, types=['chat', 'normal', + 'printed_chat']) j, resource = gajim.get_room_and_nick_from_fjid(self.jid) for jid in events: for event in events[jid]: + ev_typ = event.type_ + if ev_typ == 'printed_chat': + ev_typ = 'chat' self.connection.send_message(j, event.parameters[0], '', - type_=event.type_, subject=event.parameters[1], - resource=resource, forward_from=jid, delayed=event.time_) + type_=ev_typ, subject=event.parameters[1], + resource=resource, forward_from=jid, delayed=event.time_) # Inform other client of completion response, cmd = self.buildResponse(request, status = 'completed') diff -r 74adce11c070 -r 70dbe48350ff src/common/events.py --- a/src/common/events.py Tue Mar 27 14:57:49 2012 +0200 +++ b/src/common/events.py Sun Apr 01 19:39:26 2012 +0200 @@ -45,7 +45,7 @@ where kind in error, incoming file-*: file_props gc_msg: None - printed_chat: control + printed_chat: [message, subject, control, msg_id] printed_*: None messages that are already printed in chat, but not read gc-invitation: [room_jid, reason, password, is_continued] diff -r 74adce11c070 -r 70dbe48350ff src/common/stanza_session.py --- a/src/common/stanza_session.py Tue Mar 27 14:57:49 2012 +0200 +++ b/src/common/stanza_session.py Sun Apr 01 19:39:26 2012 +0200 @@ -99,7 +99,7 @@ for event in gajim.events.get_events(self.conn.name, j, types=types): # the event wasn't in this session if (event.type_ == 'chat' and event.parameters[8] != self) or \ - (event.type_ == 'printed_chat' and event.parameters[0].session != \ + (event.type_ == 'printed_chat' and event.parameters[2].session != \ self): continue diff -r 74adce11c070 -r 70dbe48350ff src/gui_interface.py --- a/src/gui_interface.py Tue Mar 27 14:57:49 2012 +0200 +++ b/src/gui_interface.py Sun Apr 01 19:39:26 2012 +0200 @@ -1540,7 +1540,7 @@ return if type_ == 'printed_chat': - ctrl = event.parameters[0] + ctrl = event.parameters[2] elif type_ == 'chat': session = event.parameters[8] ctrl = session.control @@ -1578,7 +1578,7 @@ event = gajim.events.get_first_event(account, jid, type_) if type_ == 'printed_pm': - ctrl = event.parameters[0] + ctrl = event.parameters[2] elif type_ == 'pm': session = event.parameters[8] diff -r 74adce11c070 -r 70dbe48350ff src/roster_window.py --- a/src/roster_window.py Tue Mar 27 14:57:49 2012 +0200 +++ b/src/roster_window.py Sun Apr 01 19:39:26 2012 +0200 @@ -1871,9 +1871,9 @@ for ev in event_list: if ev.type_ != 'printed_chat': continue - if len(ev.parameters) > 1 and ev.parameters[1]: + if len(ev.parameters) > 3 and ev.parameters[3]: # There is a msg_id - msg_ids.append(ev.parameters[1]) + msg_ids.append(ev.parameters[3]) if msg_ids: gajim.logger.set_read_messages(msg_ids)

1 0

gajim: fix getting vcard in rooms where JIDs are public. fixes #...
by Fomin Denis 07 Apr '12

07 Apr '12

changeset 3e5a693616f1 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=3e5a693616f1 description: fix getting vcard in rooms where JIDs are public. fixes #7131 diffstat: src/vcard.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (21 lines): diff -r 5f1b9198345b -r 3e5a693616f1 src/vcard.py --- a/src/vcard.py Sun Mar 25 14:32:30 2012 +0400 +++ b/src/vcard.py Sun Mar 25 16:15:25 2012 +0400 @@ -268,7 +268,7 @@ return if self.xml.get_object('information_notebook').get_n_pages() < 5: return - if obj.fjid != self.contact.jid: + if obj.fjid != self.contact.jid and obj.fjid != self.real_jid: return i = 0 client = '' @@ -299,7 +299,7 @@ return if self.xml.get_object('information_notebook').get_n_pages() < 5: return - if obj.fjid != self.contact.jid: + if obj.fjid != self.contact.jid and obj.fjid != self.real_jid: return i = 0 time_s = ''

1 0

gajim: fix pyopenssl version checking. Fixes #7124
by Yann Leboulanger 07 Apr '12

07 Apr '12

changeset 74adce11c070 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=74adce11c070 description: fix pyopenssl version checking. Fixes #7124 diffstat: src/common/check_X509.py | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diffs (13 lines): diff -r 3e5a693616f1 -r 74adce11c070 src/common/check_X509.py --- a/src/common/check_X509.py Sun Mar 25 16:15:25 2012 +0400 +++ b/src/common/check_X509.py Tue Mar 27 14:57:49 2012 +0200 @@ -5,8 +5,7 @@ import OpenSSL.SSL import OpenSSL.crypto ver = OpenSSL.__version__ - ver_l = [int(i) for i in ver.split('.')] - if ver_l < [0, 12]: + if ver < '0.12': raise ImportError from pyasn1.type import univ, constraint, char, namedtype, tag from pyasn1.codec.der.decoder import decode

1 0

gajim: fix getting vcard in rooms where JIDs are public. fixes #...
by Fomin Denis 07 Apr '12

07 Apr '12

changeset 5f1b9198345b in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=5f1b9198345b description: fix getting vcard in rooms where JIDs are public. fixes #7131 diffstat: src/vcard.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r f8142335bf82 -r 5f1b9198345b src/vcard.py --- a/src/vcard.py Wed Mar 21 14:29:25 2012 +0400 +++ b/src/vcard.py Sun Mar 25 14:32:30 2012 +0400 @@ -268,7 +268,7 @@ return if self.xml.get_object('information_notebook').get_n_pages() < 5: return - if obj.fjid != self.real_jid: + if obj.fjid != self.contact.jid: return i = 0 client = ''

1 0

gajim: typo in french. Fixes #7128
by Fomin Denis 07 Apr '12

07 Apr '12

changeset f8142335bf82 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=f8142335bf82 description: typo in french. Fixes #7128 diffstat: po/fr.po | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r ca9016526a5e -r f8142335bf82 po/fr.po --- a/po/fr.po Mon Mar 19 17:37:05 2012 -0400 +++ b/po/fr.po Wed Mar 21 14:29:25 2012 +0400 @@ -1755,7 +1755,7 @@ #: ../data/gui/preferences_window.ui.h:22 msgid "<i>(example: stunserver.org)</i>" -msgstr "<i>(exemple: stunserver.org)>/i>" +msgstr "<i>(exemple: stunserver.org)</i>" #: ../data/gui/preferences_window.ui.h:23 msgid "Advanced"

1 0

gajim: fix version string
by Fomin Denis 07 Apr '12

07 Apr '12

changeset ad2887b91a07 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=ad2887b91a07 description: fix version string diffstat: src/common/defs.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diffs (13 lines): diff -r e1920c602015 -r ad2887b91a07 src/common/defs.py --- a/src/common/defs.py Thu Mar 29 19:17:52 2012 +0200 +++ b/src/common/defs.py Sun Mar 18 23:53:11 2012 +0400 @@ -32,7 +32,8 @@ try: node = subprocess.Popen('hg tip --template "{node|short}"', shell=True, stdout=subprocess.PIPE).communicate()[0] - version += '-' + node + if node: + version += '-' + node except Exception: pass

1 0

gajim: re-enable SM when resuming
by Jefry Lagrange 07 Apr '12

07 Apr '12

changeset ca9016526a5e in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=ca9016526a5e description: re-enable SM when resuming diffstat: src/common/xmpp/smacks.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (11 lines): diff -r ad2887b91a07 -r ca9016526a5e src/common/xmpp/smacks.py --- a/src/common/xmpp/smacks.py Sun Mar 18 23:53:11 2012 +0400 +++ b/src/common/xmpp/smacks.py Mon Mar 19 17:37:05 2012 -0400 @@ -103,6 +103,7 @@ self.uqueue.pop(0) if stanza.getName() == 'resumed': + self.enabled = True self.resuming = True self.con.set_oldst() if self.uqueue != []:

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