Commits March 2014

commits@gajim.org

3 participants
103 discussions

python-nbxmpp: always store certificate of server, even if there...
by Yann Leboulanger 29 Mar '14

29 Mar '14

changeset cb67945d0438 in /home/hg/repos/python-nbxmpp details:http://hg.gajim.org/python-nbxmpp?cmd=changeset;node=cb67945d0438 description: always store certificate of server, even if there is no error diffstat: nbxmpp/tls_nb.py | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diffs (16 lines): diff -r 46e9c8c80bac -r cb67945d0438 nbxmpp/tls_nb.py --- a/nbxmpp/tls_nb.py Sat Mar 15 20:39:59 2014 +0100 +++ b/nbxmpp/tls_nb.py Sat Mar 29 18:28:28 2014 +0100 @@ -476,9 +476,10 @@ def _ssl_verify_callback(self, sslconn, cert, errnum, depth, ok): # Exceptions can't propagate up through this callback, so print them here. try: - if not ok and depth == 0: + if depth == 0: self._owner.ssl_certificate = cert - self._owner.ssl_errnum = errnum + if not ok: + self._owner.ssl_errnum = errnum return True except: log.error("Exception caught in _ssl_info_callback:", exc_info=True)

1 0

gajim: change icon of certificate Dialog. see #7445
by Gajim 29 Mar '14

29 Mar '14

changeset 62df6d94b68d 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=62df6d94b68d description: change icon of certificate Dialog. see #7445 diffstat: icons/hicolor/32x32/mimetypes/application-certificate.png | Bin src/dialogs.py | 6 ++++++ 2 files changed, 6 insertions(+), 0 deletions(-) diffs (18 lines): diff -r 604f0c6a3edc -r 62df6d94b68d icons/hicolor/32x32/mimetypes/application-certificate.png Binary file icons/hicolor/32x32/mimetypes/application-certificate.png has changed diff -r 604f0c6a3edc -r 62df6d94b68d src/dialogs.py --- a/src/dialogs.py Sat Mar 29 18:18:04 2014 +0100 +++ b/src/dialogs.py Sat Mar 29 18:27:48 2014 +0100 @@ -5418,6 +5418,12 @@ 'iou': issuer.organizationalUnitName, 'io': cert.get_notBefore(), 'eo': cert.get_notAfter(), 'sha1': cert.digest('sha1')}) + pix = gtkgui_helpers.get_icon_pixmap('application-certificate', size=32, + quiet=True) + if pix: + img = gtk.image_new_from_pixbuf(pix) + img.show_all() + self.set_image(img) self.set_transient_for(parent) self.set_title(_('Certificate for account %s') % account)

1 0

gajim: rename gajim-security_high / low to security-high / low. ...
by Gajim 29 Mar '14

29 Mar '14

changeset 604f0c6a3edc 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=604f0c6a3edc description: rename gajim-security_high / low to security-high / low. see #7445 diffstat: icons/hicolor/16x16/status/gajim-security_high.png | Bin icons/hicolor/16x16/status/gajim-security_low.png | Bin icons/hicolor/16x16/status/security-high.png | Bin icons/hicolor/16x16/status/security-low.png | Bin icons/hicolor/32x32/actions/gajim-security_high.png | Bin icons/hicolor/32x32/actions/gajim-security_low.png | Bin icons/hicolor/32x32/status/security-high.png | Bin icons/hicolor/32x32/status/security-low.png | Bin src/chat_control.py | 4 ++-- src/dialogs.py | 12 ++++++------ 10 files changed, 8 insertions(+), 8 deletions(-) diffs (85 lines): diff -r d3c3c850f292 -r 604f0c6a3edc icons/hicolor/16x16/status/gajim-security_high.png Binary file icons/hicolor/16x16/status/gajim-security_high.png has changed diff -r d3c3c850f292 -r 604f0c6a3edc icons/hicolor/16x16/status/gajim-security_low.png Binary file icons/hicolor/16x16/status/gajim-security_low.png has changed diff -r d3c3c850f292 -r 604f0c6a3edc icons/hicolor/16x16/status/security-high.png Binary file icons/hicolor/16x16/status/security-high.png has changed diff -r d3c3c850f292 -r 604f0c6a3edc icons/hicolor/16x16/status/security-low.png Binary file icons/hicolor/16x16/status/security-low.png has changed diff -r d3c3c850f292 -r 604f0c6a3edc icons/hicolor/32x32/actions/gajim-security_high.png Binary file icons/hicolor/32x32/actions/gajim-security_high.png has changed diff -r d3c3c850f292 -r 604f0c6a3edc icons/hicolor/32x32/actions/gajim-security_low.png Binary file icons/hicolor/32x32/actions/gajim-security_low.png has changed diff -r d3c3c850f292 -r 604f0c6a3edc icons/hicolor/32x32/status/security-high.png Binary file icons/hicolor/32x32/status/security-high.png has changed diff -r d3c3c850f292 -r 604f0c6a3edc icons/hicolor/32x32/status/security-low.png Binary file icons/hicolor/32x32/status/security-low.png has changed diff -r d3c3c850f292 -r 604f0c6a3edc src/chat_control.py --- a/src/chat_control.py Sat Mar 29 17:52:22 2014 +0100 +++ b/src/chat_control.py Sat Mar 29 18:18:04 2014 +0100 @@ -2314,11 +2314,11 @@ if authenticated: #About encrypted chat session authenticated_string = _('and authenticated') - img_path = gtkgui_helpers.get_icon_path('gajim-security_high') + img_path = gtkgui_helpers.get_icon_path('security-high') else: #About encrypted chat session authenticated_string = _('and NOT authenticated') - img_path = gtkgui_helpers.get_icon_path('gajim-security_low') + img_path = gtkgui_helpers.get_icon_path('security-low') self.lock_image.set_from_file(img_path) #status will become 'is' or 'is not', authentificaed will become diff -r d3c3c850f292 -r 604f0c6a3edc src/dialogs.py --- a/src/dialogs.py Sat Mar 29 17:52:22 2014 +0100 +++ b/src/dialogs.py Sat Mar 29 18:18:04 2014 +0100 @@ -5126,7 +5126,7 @@ if self.session.verified_identity: labeltext += '\n\n' + _('''You have already verified this contact's identity.''') - security_image = 'gajim-security_high' + security_image = 'security-high' if self.session.control: self.session.control._show_lock_image(True, 'E2E', True, self.session.is_loggable(), True) @@ -5143,7 +5143,7 @@ self.session.control._show_lock_image(True, 'E2E', True, self.session.is_loggable(), False) labeltext += '\n\n' + _('''To be certain that only the expected person can read your messages or send you messages, you need to verify their identity by clicking the button below.''') - security_image = 'gajim-security_low' + security_image = 'security-low' verification_status = _('''Contact's identity NOT verified''') self.window.set_title(verification_status) @@ -5200,13 +5200,13 @@ verification_status = _('''Contact's identity NOT verified''') info = _('The contact\'s key (%s) does not match the key ' 'assigned in Gajim.') % keyID[:8] - image = 'gajim-security_low' + image = 'security-low' elif not keyID: # No key assigned nor a key is used by remote contact verification_status = _('No OpenPGP key assigned') info = _('No OpenPGP key is assigned to this contact. So you cannot' ' encrypt messages.') - image = 'gajim-security_low' + image = 'security-low' else: error = gajim.connections[account].gpg.encrypt('test', [keyID])[1] if error: @@ -5214,12 +5214,12 @@ info = _('OpenPGP key is assigned to this contact, but you ' 'do not trust his key, so message cannot be ' 'encrypted. Use your OpenPGP client to trust this key.') - image = 'gajim-security_low' + image = 'security-low' else: verification_status = _('''Contact's identity verified''') info = _('OpenPGP Key is assigned to this contact, and you ' 'trust his key, so messages will be encrypted.') - image = 'gajim-security_high' + image = 'security-high' status_label.set_markup('%s' % \ verification_status)

1 0

gajim: minimize groupchats before closing message window
by Gajim 29 Mar '14

29 Mar '14

changeset d3c3c850f292 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=d3c3c850f292 description: minimize groupchats before closing message window diffstat: src/message_window.py | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diffs (13 lines): diff -r ce8b4918ebd3 -r d3c3c850f292 src/message_window.py --- a/src/message_window.py Fri Mar 28 21:48:15 2014 +0100 +++ b/src/message_window.py Sat Mar 29 17:52:22 2014 +0100 @@ -216,6 +216,9 @@ win.destroy() if not gajim.config.get('confirm_close_multiple_tabs'): + for ctrl in self.controls(): + if ctrl.minimizable(): + ctrl.minimize() # destroy window return False dialogs.YesNoDialog(

1 0

gajim: rename some icons so we don't need to check in code if in...
by Gajim 28 Mar '14

28 Mar '14

changeset ce8b4918ebd3 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=ce8b4918ebd3 description: rename some icons so we don't need to check in code if installed iconset has it. Fixes #7445 diffstat: icons/hicolor/16x16/actions/document-send.png | Bin icons/hicolor/16x16/actions/gajim-upload.png | Bin icons/hicolor/16x16/status/applications-internet.png | Bin icons/hicolor/16x16/status/gajim-earth.png | Bin src/chat_control.py | 2 -- src/groupchat_control.py | 2 -- src/gui_interface.py | 2 -- src/gui_menu_builder.py | 2 -- 8 files changed, 0 insertions(+), 8 deletions(-) diffs (56 lines): diff -r 71ff18f209f0 -r ce8b4918ebd3 icons/hicolor/16x16/actions/document-send.png Binary file icons/hicolor/16x16/actions/document-send.png has changed diff -r 71ff18f209f0 -r ce8b4918ebd3 icons/hicolor/16x16/actions/gajim-upload.png Binary file icons/hicolor/16x16/actions/gajim-upload.png has changed diff -r 71ff18f209f0 -r ce8b4918ebd3 icons/hicolor/16x16/status/applications-internet.png Binary file icons/hicolor/16x16/status/applications-internet.png has changed diff -r 71ff18f209f0 -r ce8b4918ebd3 icons/hicolor/16x16/status/gajim-earth.png Binary file icons/hicolor/16x16/status/gajim-earth.png has changed diff -r 71ff18f209f0 -r ce8b4918ebd3 src/chat_control.py --- a/src/chat_control.py Fri Mar 28 21:30:57 2014 +0100 +++ b/src/chat_control.py Fri Mar 28 21:48:15 2014 +0100 @@ -1498,8 +1498,6 @@ self._send_file_button = self.xml.get_object('send_file_button') # add a special img for send file button pixbuf = gtkgui_helpers.get_icon_pixmap('document-send', quiet=True) - if not pixbuf: - pixbuf = gtkgui_helpers.get_icon_pixmap('gajim-upload') img = gtk.image_new_from_pixbuf(pixbuf) self._send_file_button.set_image(img) id_ = self._send_file_button.connect('clicked', diff -r 71ff18f209f0 -r ce8b4918ebd3 src/groupchat_control.py --- a/src/groupchat_control.py Fri Mar 28 21:30:57 2014 +0100 +++ b/src/groupchat_control.py Fri Mar 28 21:48:15 2014 +0100 @@ -2584,8 +2584,6 @@ item = xml.get_object('send_file_menuitem') # add a special img for send file menuitem pixbuf = gtkgui_helpers.get_icon_pixmap('document-send', quiet=True) - if not pixbuf: - pixbuf = gtkgui_helpers.get_icon_pixmap('gajim-upload') img = gtk.image_new_from_pixbuf(pixbuf) item.set_image(img) diff -r 71ff18f209f0 -r ce8b4918ebd3 src/gui_interface.py --- a/src/gui_interface.py Fri Mar 28 21:30:57 2014 +0100 +++ b/src/gui_interface.py Fri Mar 28 21:48:15 2014 +0100 @@ -2656,8 +2656,6 @@ elif isinstance(pep_obj, pep.UserLocationPEP): icon = gtkgui_helpers.get_icon_pixmap('applications-internet', quiet=True) - if not icon: - icon = gtkgui_helpers.get_icon_pixmap('gajim-earth') return icon def create_ipython_window(self): diff -r 71ff18f209f0 -r ce8b4918ebd3 src/gui_menu_builder.py --- a/src/gui_menu_builder.py Fri Mar 28 21:30:57 2014 +0100 +++ b/src/gui_menu_builder.py Fri Mar 28 21:48:15 2014 +0100 @@ -259,8 +259,6 @@ # add a special img for send file menuitem pixbuf = gtkgui_helpers.get_icon_pixmap('document-send', quiet=True) - if not pixbuf: - pixbuf = gtkgui_helpers.get_icon_pixmap('gajim-upload') img = gtk.image_new_from_pixbuf(pixbuf) send_file_menuitem.set_image(img)

1 0

gajim: keep treeview consistent when connecting. Fixes #7434
by Gajim 28 Mar '14

28 Mar '14

changeset 71ff18f209f0 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=71ff18f209f0 description: keep treeview consistent when connecting. Fixes #7434 diffstat: src/roster_window.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 0fc2a9403a8a -r 71ff18f209f0 src/roster_window.py --- a/src/roster_window.py Fri Mar 28 21:29:42 2014 +0100 +++ b/src/roster_window.py Fri Mar 28 21:30:57 2014 +0100 @@ -2627,7 +2627,7 @@ def _nec_roster_received(self, obj): if obj.received_from_server: self.fill_contacts_and_groups_dicts(obj.roster, obj.conn.name) - self.add_account_contacts(obj.conn.name) + self.add_account_contacts(obj.conn.name, improve_speed=False) self.fire_up_unread_messages_events(obj.conn.name) else: if gajim.config.get('remember_opened_chat_controls'):

1 0

gajim: update contact instance in chat window when we talk to an...
by Gajim 28 Mar '14

28 Mar '14

changeset 0fc2a9403a8a 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=0fc2a9403a8a description: update contact instance in chat window when we talk to another resource. Fixes #7700 diffstat: src/common/connection.py | 5 +++-- src/session.py | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diffs (26 lines): diff -r ca9f2d4ffdc5 -r 0fc2a9403a8a src/common/connection.py --- a/src/common/connection.py Tue Mar 25 17:19:08 2014 +0100 +++ b/src/common/connection.py Fri Mar 28 21:29:42 2014 +0100 @@ -464,8 +464,9 @@ msg_iq = iqs else: msg_iq.setTo(fjid) - if resource: - contact = gajim.contacts.get_contact(self.name, jid, resource) + r_ = resource or gajim.get_resource_from_jid(fjid) + if r_: + contact = gajim.contacts.get_contact(self.name, jid, r_) else: contact = gajim.contacts.get_contact_with_highest_priority( self.name, jid) diff -r ca9f2d4ffdc5 -r 0fc2a9403a8a src/session.py --- a/src/session.py Tue Mar 25 17:19:08 2014 +0100 +++ b/src/session.py Fri Mar 28 21:29:42 2014 +0100 @@ -160,6 +160,7 @@ if ctrl: self.control = ctrl self.control.set_session(self) + self.control.contact = contact if not pm: self.roster_message2(obj)

1 0

gajim: ignore attention (XEP-224) when messages is delayed
by Gajim 27 Mar '14

27 Mar '14

changeset a9d3aa50bddd in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=a9d3aa50bddd description: ignore attention (XEP-224) when messages is delayed diffstat: src/common/connection_handlers_events.py | 5 ++++- src/common/protocol/bytestream.py | 3 +++ 2 files changed, 7 insertions(+), 1 deletions(-) diffs (28 lines): diff -r 8898f392acb2 -r a9d3aa50bddd src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Sun Mar 09 10:25:26 2014 +0100 +++ b/src/common/connection_handlers_events.py Mon Mar 10 21:47:21 2014 +0100 @@ -1311,7 +1311,10 @@ self.displaymarking = self.seclabel.getTag('displaymarking') if self.stanza.getTag('attention', namespace=nbxmpp.NS_ATTENTION): - self.attention = True + delayed = self.stanza.getTag('x', namespace=nbxmpp.NS_DELAY) is not\ + None + if not delayed: + self.attention = True self.form_node = self.stanza.getTag('x', namespace=nbxmpp.NS_DATA) diff -r 8898f392acb2 -r a9d3aa50bddd src/common/protocol/bytestream.py --- a/src/common/protocol/bytestream.py Sun Mar 09 10:25:26 2014 +0100 +++ b/src/common/protocol/bytestream.py Mon Mar 10 21:47:21 2014 +0100 @@ -468,6 +468,9 @@ if listener: self._add_streamhosts_to_query(query, sender, ext_port, [ext_ip]) + else: + self._add_streamhosts_to_query(query, file_props.sender, + ext_port, [ext_ip]) self.connection.send(iq) cleanup_gupnp()

1 0

gajim: update windows build script for win7
by Gajim 27 Mar '14

27 Mar '14

changeset b1724179fb73 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=b1724179fb73 description: update windows build script for win7 diffstat: build.bat | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r a9d3aa50bddd -r b1724179fb73 build.bat --- a/build.bat Mon Mar 10 21:47:21 2014 +0100 +++ b/build.bat Sat Mar 15 09:53:20 2014 +0100 @@ -35,6 +35,6 @@ for %%l in (po\*.po) do mkdir po\%%~nl & mkdir po\%%~nl\LC_MESSAGES & msgfmt -o po\%%~nl\LC_MESSAGES\gajim.mo %%l -"C:\Program Files\NSIS\makensis" gajim.nsi +"C:\Program Files (x86)\NSIS\makensis" gajim.nsi cd .. \ No newline at end of file

1 0

gajim: update changelog
by Gajim 27 Mar '14

27 Mar '14

changeset 792ee48ab707 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=792ee48ab707 description: update changelog diffstat: ChangeLog | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (11 lines): diff -r b1724179fb73 -r 792ee48ab707 ChangeLog --- a/ChangeLog Sat Mar 15 09:53:20 2014 +0100 +++ b/ChangeLog Sat Mar 15 09:53:48 2014 +0100 @@ -3,6 +3,7 @@ * Improve File transfer support by adding Jingle file transfer * use external python-nbxmpp library * Improve audio / Video calls and add screensharing feature + * Support audio under windows * Support systemd-logind * Support XEP-0308 Last message correction * Support XEP-0224 Attention

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits March 2014