Commits August 2013

commits@gajim.org

3 participants
325 discussions

gajim: Decode shell output befor send message. Fixes #7407
by Denis Fomin 04 Aug '13

04 Aug '13

changeset ee9eefe5ed53 in /home/hg/repos/gajim branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=ee9eefe5ed53 description: Decode shell output befor send message. Fixes #7407 diffstat: src/command_system/implementation/execute.py | 2 +- 1 файлов изменено, 1 вставок(+), 1 удалений(-) различия (11 строк): diff -r 08bd2e70fc10 -r ee9eefe5ed53 src/command_system/implementation/execute.py --- a/src/command_system/implementation/execute.py Fri Aug 02 11:44:15 2013 +0200 +++ b/src/command_system/implementation/execute.py Sun Aug 04 19:17:55 2013 +0400 @@ -115,6 +115,6 @@ stdout, stderr = cls.fetch(popen) success = popen.returncode == 0 if success and stdout: - processor.send(stdout) + processor.send(stdout.decode('utf8')) elif not success and stderr: processor.echo_error(stderr)

1 0

gajim: fix direction mark
by Yann Leboulanger 02 Aug '13

02 Aug '13

changeset 7203f12ad637 in /home/hg/repos/gajim branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=7203f12ad637 description: fix direction mark diffstat: src/gajim.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (14 lines): diff -r c738a135a60a -r 7203f12ad637 src/gajim.py --- a/src/gajim.py Thu Aug 01 22:53:48 2013 +0200 +++ b/src/gajim.py Fri Aug 02 11:44:15 2013 +0200 @@ -205,8 +205,8 @@ if os.name == 'nt': warnings.filterwarnings(action='ignore') -if gtk.widget_get_default_direction() == gtk.TEXT_DIR_LTR: - i18n.direction_mark = u'\u200E' +if gtk.widget_get_default_direction() == gtk.TEXT_DIR_RTL: + i18n.direction_mark = u'\u200F' pritext = '' from common import exceptions

1 0

gajim: fix direction mark
by Yann Leboulanger 02 Aug '13

02 Aug '13

changeset 08bd2e70fc10 in /home/hg/repos/gajim branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=08bd2e70fc10 description: fix direction mark diffstat: src/gajim.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (14 lines): diff -r 00342dab35c6 -r 08bd2e70fc10 src/gajim.py --- a/src/gajim.py Thu Aug 01 22:53:48 2013 +0200 +++ b/src/gajim.py Fri Aug 02 11:44:15 2013 +0200 @@ -205,8 +205,8 @@ if os.name == 'nt': warnings.filterwarnings(action='ignore') -if gtk.widget_get_default_direction() == gtk.TEXT_DIR_LTR: - i18n.direction_mark = u'\u200E' +if gtk.widget_get_default_direction() == gtk.TEXT_DIR_RTL: + i18n.direction_mark = u'\u200F' pritext = '' from common import exceptions

1 0

gajim: always present room JID LTR. Fixes #7402
by Yann Leboulanger 01 Aug '13

01 Aug '13

changeset 4a2daceca341 in /home/hg/repos/gajim branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=4a2daceca341 description: always present room JID LTR. Fixes #7402 diffstat: src/common/i18n.py | 2 +- src/groupchat_control.py | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diffs (47 lines): diff -r 9e6cfe05c032 -r 4a2daceca341 src/common/i18n.py --- a/src/common/i18n.py Wed Jul 31 19:15:42 2013 +0200 +++ b/src/common/i18n.py Thu Aug 01 19:05:00 2013 +0200 @@ -28,7 +28,7 @@ import unicodedata # May be changed after GTK is imported -direction_mark = u'\u200F' +direction_mark = u'\u200E' def paragraph_direction_mark(text): """ diff -r 9e6cfe05c032 -r 4a2daceca341 src/groupchat_control.py --- a/src/groupchat_control.py Wed Jul 31 19:15:42 2013 +0200 +++ b/src/groupchat_control.py Thu Aug 01 19:05:00 2013 +0200 @@ -236,7 +236,8 @@ _('Sending private message failed'), #in second %s code replaces with nickname _('You are no longer in group chat "%(room)s" or ' - '"%(nick)s" has left.') % {'room': room, 'nick': nick}) + '"%(nick)s" has left.') % {'room': u'\u200E' + room, + 'nick': nick}) return ChatControl.send_message(self, message, xhtml=xhtml, @@ -780,7 +781,7 @@ name = self.get_continued_conversation_name() else: name = self.room_jid - text = '<span %s>%s</span>' % (font_attrs, name) + text = '<span %s>%s</span>' % (font_attrs, u'\u200E' + name) self.name_label.set_markup(text) if self.subject: @@ -2189,9 +2190,9 @@ reason, jid) # Ask for a reason - dialogs.DoubleInputDialog(_('Destroying %s') % self.room_jid, - _('You are going to definitively destroy this room.\n' - 'You may specify a reason below:'), + dialogs.DoubleInputDialog(_('Destroying %s') % u'\u200E' + \ + self.room_jid, _('You are going to definitively destroy this \ + room.\nYou may specify a reason below:'), _('You may also enter an alternate venue:'), ok_handler=on_ok) def _on_bookmark_room_menuitem_activate(self, widget):

1 0

gajim: fix more bidi things
by Yann Leboulanger 01 Aug '13

01 Aug '13

changeset c738a135a60a in /home/hg/repos/gajim branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=c738a135a60a description: fix more bidi things diffstat: src/conversation_textview.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diffs (13 lines): diff -r 4a2daceca341 -r c738a135a60a src/conversation_textview.py --- a/src/conversation_textview.py Thu Aug 01 19:05:00 2013 +0200 +++ b/src/conversation_textview.py Thu Aug 01 22:53:48 2013 +0200 @@ -1432,7 +1432,8 @@ before_str = helpers.from_one_line(before_str) after_str = gajim.config.get('after_nickname') after_str = helpers.from_one_line(after_str) - format_ = direction_mark + before_str + name + after_str + ' ' + format_ = direction_mark + before_str + name + direction_mark + \ + after_str + ' ' buffer_.insert_with_tags_by_name(end_iter, format_, *name_tags) def print_subject(self, subject, iter_=None):

1 0

gajim: move formattings button tooltip to the code to make it mo...
by Yann Leboulanger 01 Aug '13

01 Aug '13

changeset d3cde2dede39 in /home/hg/repos/gajim branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=d3cde2dede39 description: move formattings button tooltip to the code to make it more precise. Fixes #7389 diffstat: data/gui/chat_control.ui | 1 - src/chat_control.py | 8 ++++++++ 2 files changed, 8 insertions(+), 1 deletions(-) diffs (31 lines): diff -r 07c06b35d103 -r d3cde2dede39 data/gui/chat_control.ui --- a/data/gui/chat_control.ui Tue Jul 30 14:56:32 2013 +0200 +++ b/data/gui/chat_control.ui Mon Jul 29 10:54:48 2013 +0200 @@ -301,7 +301,6 @@ <property name="can_focus">True</property> <property name="receives_default">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="tooltip_text" translatable="yes">Show a list of formattings</property> <property name="relief">none</property> <property name="focus_on_click">False</property> <child> diff -r 07c06b35d103 -r d3cde2dede39 src/chat_control.py --- a/src/chat_control.py Tue Jul 30 14:56:32 2013 +0200 +++ b/src/chat_control.py Mon Jul 29 10:54:48 2013 +0200 @@ -1755,8 +1755,16 @@ # Formatting if self.contact.supports(NS_XHTML_IM) and not self.gpg_is_active: self._formattings_button.set_sensitive(True) + self._formattings_button.set_tooltip(_( + 'Show a list of formattings')) else: self._formattings_button.set_sensitive(False) + if self.contact.supports(NS_XHTML_IM): + self._formattings_button.set_tooltip(_('Formattings are not ' + 'available when GPG is active')) + else: + self._formattings_button.set_tooltip(_('This contact does not ' + 'support HTML')) # Add to roster if not isinstance(self.contact, GC_Contact) \

1 0

gajim: use correct function to set tooltip
by Yann Leboulanger 01 Aug '13

01 Aug '13

changeset 8c8784f1585f in /home/hg/repos/gajim branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=8c8784f1585f description: use correct function to set tooltip diffstat: src/chat_control.py | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diffs (25 lines): diff -r d3cde2dede39 -r 8c8784f1585f src/chat_control.py --- a/src/chat_control.py Mon Jul 29 10:54:48 2013 +0200 +++ b/src/chat_control.py Mon Jul 29 21:11:40 2013 +0200 @@ -1755,16 +1755,16 @@ # Formatting if self.contact.supports(NS_XHTML_IM) and not self.gpg_is_active: self._formattings_button.set_sensitive(True) - self._formattings_button.set_tooltip(_( + self._formattings_button.set_tooltip_text(_( 'Show a list of formattings')) else: self._formattings_button.set_sensitive(False) if self.contact.supports(NS_XHTML_IM): - self._formattings_button.set_tooltip(_('Formattings are not ' - 'available when GPG is active')) + self._formattings_button.set_tooltip_text(_('Formattings are ' + 'not available when GPG is active')) else: - self._formattings_button.set_tooltip(_('This contact does not ' - 'support HTML')) + self._formattings_button.set_tooltip_text(_('This contact does ' + 'not support HTML')) # Add to roster if not isinstance(self.contact, GC_Contact) \

1 0

gajim: don't cycle through blobk nicknames when autocompletting ...
by Yann Leboulanger 01 Aug '13

01 Aug '13

changeset af16b3f443a8 in /home/hg/repos/gajim branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=af16b3f443a8 description: don't cycle through blobk nicknames when autocompletting nicks. Fixes #7398 diffstat: src/groupchat_control.py | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diffs (14 lines): diff -r 8c8784f1585f -r af16b3f443a8 src/groupchat_control.py --- a/src/groupchat_control.py Mon Jul 29 21:11:40 2013 +0200 +++ b/src/groupchat_control.py Mon Jul 29 22:05:39 2013 +0200 @@ -2297,7 +2297,9 @@ list_nick.remove(self.nick) # Skip self for nick in list_nick: - if nick.lower().startswith(begin.lower()): + fjid = self.room_jid + '/' + nick + if nick.lower().startswith(begin.lower()) and not \ + helpers.jid_is_blocked(self.account, fjid): # the word is the begining of a nick self.nick_hits.append(nick) if len(self.nick_hits):

1 0

gajim: don't allow to browse non-MUC server in join groupchat di...
by Yann Leboulanger 01 Aug '13

01 Aug '13

changeset ca0cbe69a25f in /home/hg/repos/gajim branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=ca0cbe69a25f description: don't allow to browse non-MUC server in join groupchat dialog. diffstat: src/common/connection_handlers.py | 24 ++++++++++++-- src/common/connection_handlers_events.py | 9 +++++ src/dialogs.py | 50 ++++++++++++++++++++++++++++++- 3 files changed, 76 insertions(+), 7 deletions(-) diffs (203 lines): diff -r af16b3f443a8 -r ca0cbe69a25f src/common/connection_handlers.py --- a/src/common/connection_handlers.py Mon Jul 29 22:05:39 2013 +0200 +++ b/src/common/connection_handlers.py Tue Jul 30 20:09:52 2013 +0200 @@ -104,7 +104,8 @@ jid is mandatory; name, node, action is optional. """ - self._discover(nbxmpp.NS_DISCO_ITEMS, jid, node, id_prefix) + id_ = self._discover(nbxmpp.NS_DISCO_ITEMS, jid, node, id_prefix) + self.disco_items_ids.append(id_) def discoverInfo(self, jid, node=None, id_prefix=None): """ @@ -112,7 +113,8 @@ For identity: category, type is mandatory, name is optional. For feature: var is mandatory. """ - self._discover(nbxmpp.NS_DISCO_INFO, jid, node, id_prefix) + id_ = self._discover(nbxmpp.NS_DISCO_INFO, jid, node, id_prefix) + self.disco_info_ids.append(id_) def request_register_agent_info(self, agent): if not self.connection or self.connected < 2: @@ -166,12 +168,14 @@ if not self.connection or self.connected < 2: return iq = nbxmpp.Iq(typ='get', to=jid, queryNS=ns) + id_ = self.connection.getAnID() if id_prefix: - id_ = self.connection.getAnID() - iq.setID('%s%s' % (id_prefix, id_)) + id_ = id_prefix + id_ + iq.setID(id_) if node: iq.setQuerynode(node) self.connection.send(iq) + return id_ def _ReceivedRegInfo(self, con, resp, agent): nbxmpp.features_nb._ReceivedRegInfo(con, resp, agent) @@ -1439,6 +1443,10 @@ self.version_ids = [] # IDs of urn:xmpp:time requests self.entity_time_ids = [] + # IDs of disco#items requests + self.disco_items_ids = [] + # IDs of disco#info requests + self.disco_info_ids = [] # ID of urn:xmpp:ping requests self.awaiting_xmpp_ping_id = None self.continue_connect_info = None @@ -1590,6 +1598,14 @@ gajim.nec.push_incoming_event(TimeResultReceivedEvent(None, conn=self, stanza=obj.stanza)) return True + if obj.id_ in self.disco_items_ids: + gajim.nec.push_incoming_event(AgentItemsErrorReceivedEvent(None, + conn=self, stanza=obj.stanza)) + return True + if obj.id_ in self.disco_info_ids: + gajim.nec.push_incoming_event(AgentInfoErrorReceivedEvent(None, + conn=self, stanza=obj.stanza)) + return True def _nec_private_storate_bookmarks_received(self, obj): if obj.conn.name != self.name: diff -r af16b3f443a8 -r ca0cbe69a25f src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Mon Jul 29 22:05:39 2013 +0200 +++ b/src/common/connection_handlers_events.py Tue Jul 30 20:09:52 2013 +0200 @@ -1929,6 +1929,8 @@ self.get_jid_resource() hostname = gajim.config.get_per('accounts', self.conn.name, 'hostname') self.get_id() + if self.id_ in self.conn.disco_items_ids: + self.conn.disco_items_ids.remove(self.id_) if self.fjid == hostname and self.id_[:6] == 'Gajim_': for item in self.items: self.conn.discoverInfo(item['jid'], id_prefix='Gajim_') @@ -1941,6 +1943,9 @@ def generate(self): self.get_jid_resource() + self.get_id() + if self.id_ in self.conn.disco_items_ids: + self.conn.disco_items_ids.remove(self.id_) return True class AgentInfoReceivedEvent(nec.NetworkIncomingEvent, HelperEvent): @@ -1949,6 +1954,8 @@ def generate(self): self.get_id() + if self.id_ in self.conn.disco_info_ids: + self.conn.disco_info_ids.remove(self.id_) if self.id_ is None: log.warn('Invalid IQ received without an ID. Ignoring it: %s' % \ self.stanza) @@ -1993,6 +2000,8 @@ def generate(self): self.get_jid_resource() self.get_id() + if self.id_ in self.conn.disco_info_ids: + self.conn.disco_info_ids.remove(self.id_) return True class FileRequestReceivedEvent(nec.NetworkIncomingEvent, HelperEvent): diff -r af16b3f443a8 -r ca0cbe69a25f src/dialogs.py --- a/src/dialogs.py Mon Jul 29 22:05:39 2013 +0200 +++ b/src/dialogs.py Tue Jul 30 20:09:52 2013 +0200 @@ -32,6 +32,7 @@ import gtk import gobject import os +import nbxmpp import gtkgui_helpers import vcard @@ -2407,6 +2408,11 @@ if 'jabber' in gajim.connections[account].muc_jid: server_list.append(gajim.connections[account].muc_jid['jabber']) + entry = self.server_comboboxentry.child + entry.connect('changed', self.on_server_entry_changed) + self.browse_button = self.xml.get_object('browse_rooms_button') + self.browse_button.set_sensitive(False) + self.recently_combobox = self.xml.get_object('recently_combobox') liststore = gtk.ListStore(str, str) self.recently_combobox.set_model(liststore) @@ -2451,12 +2457,22 @@ if account and not gajim.connections[account].private_storage_supported: self.xml.get_object('bookmark_checkbutton').set_sensitive(False) + self.requested_jid = None + gajim.ged.register_event_handler('agent-info-received', ged.GUI1, + self._nec_agent_info_received) + gajim.ged.register_event_handler('agent-info-error-received', ged.GUI1, + self._nec_agent_info_error_received) + self.window.show_all() def on_join_groupchat_window_destroy(self, widget): """ Close window """ + gajim.ged.remove_event_handler('agent-info-received', ged.GUI1, + self._nec_agent_info_received) + gajim.ged.register_event_handler('agent-info-error-received', ged.GUI1, + self._nec_agent_info_error_received) if self.account and 'join_gc' in gajim.interface.instances[self.account]: # remove us from open windows del gajim.interface.instances[self.account]['join_gc'] @@ -2505,19 +2521,47 @@ def on_browse_rooms_button_clicked(self, widget): server = self.server_comboboxentry.child.get_text().decode('utf-8') - if server in gajim.interface.instances[self.account]['disco']: - gajim.interface.instances[self.account]['disco'][server].window.\ + self.requested_jid = server + gajim.connections[self.account].discoverInfo(server) + + def _nec_agent_info_error_received(self, obj): + if obj.conn.name != self.account: + return + if obj.jid != self.requested_jid: + return + self.requested_jid = None + ErrorDialog(_('Wrong server'), _('%s is not a groupchat server') % \ + obj.jid) + + def _nec_agent_info_received(self, obj): + if obj.conn.name != self.account: + return + if obj.jid != self.requested_jid: + return + self.requested_jid = None + if nbxmpp.NS_MUC not in obj.features: + ErrorDialog(_('Wrong server'), _('%s is not a groupchat server') % \ + obj.jid) + return + if obj.jid in gajim.interface.instances[self.account]['disco']: + gajim.interface.instances[self.account]['disco'][obj.jid].window.\ present() else: try: # Object will add itself to the window dict import disco - disco.ServiceDiscoveryWindow(self.account, server, + disco.ServiceDiscoveryWindow(self.account, obj.jid, initial_identities=[{'category': 'conference', 'type': 'text'}]) except GajimGeneralException: pass + def on_server_entry_changed(self, widget): + if not widget.get_text(): + self.browse_button.set_sensitive(False) + else: + self.browse_button.set_sensitive(True) + def on_cancel_button_clicked(self, widget): """ When Cancel button is clicked

1 0

gajim: don't try to get xid of a non-existing window
by Yann Leboulanger 01 Aug '13

01 Aug '13

changeset d10080b40a4d in /home/hg/repos/gajim branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=d10080b40a4d description: don't try to get xid of a non-existing window diffstat: src/dialogs.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diffs (16 lines): diff -r ca0cbe69a25f -r d10080b40a4d src/dialogs.py --- a/src/dialogs.py Tue Jul 30 20:09:52 2013 +0200 +++ b/src/dialogs.py Wed Jul 31 18:22:55 2013 +0200 @@ -5314,10 +5314,11 @@ fixed.set_no_show_all(False) video_hbox.show_all() in_xid = ctrl.xml.get_object('incoming_drawingarea').window.xid - out_xid = ctrl.xml.get_object('outgoing_drawingarea').window.xid content = session.get_content('video') # move outgoing stream to chat window if gajim.config.get('video_see_self'): + out_xid = ctrl.xml.get_object('outgoing_drawingarea').\ + window.xid b = content.pipeline.get_by_name('bin2') c = b.get_by_name('autovideosink0') d = c.get_by_name('autovideosink0-actual-sink-xvimage')

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 August 2013