Commits

commits@gajim.org

17632 discussions

python-nbxmpp: fix some new GLib things
by Yann Leboulanger 28 Jul '13

28 Jul '13

changeset ed510b99ba0e in /home/hg/repos/python-nbxmpp details:http://hg.gajim.org/python-nbxmpp?cmd=changeset;node=ed510b99ba0e description: fix some new GLib things diffstat: nbxmpp/idlequeue.py | 25 +++++++++++++------------ 1 files changed, 13 insertions(+), 12 deletions(-) diffs (70 lines): diff -r 6fdbe172ce7a -r ed510b99ba0e nbxmpp/idlequeue.py --- a/nbxmpp/idlequeue.py Fri Jul 26 11:26:52 2013 +0200 +++ b/nbxmpp/idlequeue.py Sun Jul 28 20:45:01 2013 +0200 @@ -25,10 +25,10 @@ # needed for get_idleqeue try: - from gi.repository import GObject - HAVE_GOBJECT = True + from gi.repository import GLib + HAVE_GLIB = True except ImportError: - HAVE_GOBJECT = False + HAVE_GLIB = False # needed for idlecommand if os.name == 'nt': @@ -36,10 +36,11 @@ elif os.name == 'posix': import fcntl -FLAG_WRITE = 20 # write only -FLAG_READ = 19 # read only -FLAG_READ_WRITE = 23 # read and write -FLAG_CLOSE = 16 # wait for close +FLAG_WRITE = GLib.IOCondition.OUT | GLib.IOCondition.HUP +FLAG_READ = GLib.IOCondition.IN | GLib.IOCondition.PRI | GLib.IOCondition.HUP +FLAG_READ_WRITE = GLib.IOCondition.OUT | GLib.IOCondition.IN | \ + GLib.IOCondition.PRI | GLib.IOCondition.HUP +FLAG_CLOSE = GLib.IOCondition.HUP PENDING_READ = 3 # waiting read event PENDING_WRITE = 4 # waiting write event @@ -54,7 +55,7 @@ # gobject.io_add_watch does not work on windows return SelectIdleQueue() else: - if HAVE_GOBJECT: + if HAVE_GLIB: # Gajim's default Idlequeue return GlibIdleQueue() else: @@ -516,15 +517,15 @@ self.events = {} # time() is already called in glib, we just get the last value # overrides IdleQueue.current_time() - self.current_time = GObject.get_current_time + self.current_time = GLib.get_current_time def _add_idle(self, fd, flags): """ This method is called when we plug a new idle object. Start listening for events from fd """ - res = GObject.io_add_watch(fd, flags, self._process_events, - priority=GObject.PRIORITY_LOW) + res = GLib.io_add_watch(fd, GLib.PRIORITY_LOW, flags, + self._process_events) # store the id of the watch, so that we can remove it on unplug self.events[fd] = res @@ -543,7 +544,7 @@ """ if not fd in self.events: return - GObject.source_remove(self.events[fd]) + GLib.source_remove(self.events[fd]) del(self.events[fd]) def process(self):

1 0

gajim: fix indentation
by Yann Leboulanger 28 Jul '13

28 Jul '13

changeset 4344e00225ac in /home/hg/repos/gajim branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=4344e00225ac description: fix indentation diffstat: src/remote_control.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (14 lines): diff -r 2988854e1f96 -r 4344e00225ac src/remote_control.py --- a/src/remote_control.py Sat Jul 27 19:10:08 2013 +0400 +++ b/src/remote_control.py Sun Jul 28 08:53:06 2013 +0200 @@ -37,8 +37,8 @@ from time import time from dialogs import AddNewContactWindow, NewChatDialog, JoinGroupchatWindow from common import ged -from common.connection_handlers_events import MessageOutgoingEvent, - GcMessageOutgoingEvent +from common.connection_handlers_events import MessageOutgoingEvent +from common.connection_handlers_events import GcMessageOutgoingEvent from common import dbus_support

1 0

gajim: go to end iter after each print_special_text if we don't ...
by Yann Leboulanger 28 Jul '13

28 Jul '13

changeset dbe977dd4985 in /home/hg/repos/gajim branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=dbe977dd4985 description: go to end iter after each print_special_text if we don't have an argument with the iter where we have to insert text. See #7372 diffstat: src/conversation_textview.py | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diffs (12 lines): diff -r 3db418a58271 -r dbe977dd4985 src/conversation_textview.py --- a/src/conversation_textview.py Fri Jul 26 14:45:16 2013 +0200 +++ b/src/conversation_textview.py Fri Jul 26 20:29:50 2013 +0200 @@ -1095,6 +1095,8 @@ special_text = otext[start:end] if start > index: text_before_special_text = otext[index:start] + if not iter_: + end_iter = buffer_.get_end_iter() # we insert normal text if other_tags: insert_tags_func(end_iter, text_before_special_text, *other_tags)

1 0

gajim: use XEP-0033 to send one message to several JIDs
by Yann Leboulanger 28 Jul '13

28 Jul '13

changeset 1acd7579c2da in /home/hg/repos/gajim branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=1acd7579c2da description: use XEP-0033 to send one message to several JIDs diffstat: src/common/connection.py | 153 +++++++++++++++++++++++++++++----------------- src/dialogs.py | 18 ++--- 2 files changed, 104 insertions(+), 67 deletions(-) diffs (267 lines): diff -r dbe977dd4985 -r 1acd7579c2da src/common/connection.py --- a/src/common/connection.py Fri Jul 26 20:29:50 2013 +0200 +++ b/src/common/connection.py Sat Jul 27 14:14:50 2013 +0200 @@ -160,6 +160,7 @@ self.archive_pref_supported = False self.roster_supported = True self.blocking_supported = False + self.addressing_supported = False self.muc_jid = {} # jid of muc server for each transport type self._stun_servers = [] # STUN servers of our jabber server @@ -259,14 +260,33 @@ if not self.connection or self.connected < 2: return 1 - try: - jid = self.check_jid(jid) - except helpers.InvalidFormat: - gajim.nec.push_incoming_event(InformationEvent(None, conn=self, - level='error', pri_txt=_('Invalid Jabber ID'), sec_txt=_( - 'It is not possible to send a message to %s, this JID is not ' - 'valid.') % jid)) - return + if isinstance(jid, list): + new_list = [] + for j in jid: + try: + new_list.append(self.check_jid(j)) + except helpers.InvalidFormat: + gajim.nec.push_incoming_event(InformationEvent(None, + conn=self, level='error', pri_txt=_('Invalid Jabber ' + 'ID'), sec_txt=_('It is not possible to send a message ' + 'to %s, this JID is not valid.') % j)) + return + fjid = new_list + else: + try: + jid = self.check_jid(jid) + except helpers.InvalidFormat: + gajim.nec.push_incoming_event(InformationEvent(None, conn=self, + level='error', pri_txt=_('Invalid Jabber ID'), sec_txt=_( + 'It is not possible to send a message to %s, this JID is not ' + 'valid.') % jid)) + return + fjid = jid + if resource: + fjid += '/' + resource + + if session: + fjid = session.get_to() if msg and not xhtml and gajim.config.get( 'rst_formatting_outgoing_messages'): @@ -274,15 +294,10 @@ xhtml = create_xhtml(msg) if not msg and chatstate is None and form_node is None: return - fjid = jid - if resource: - fjid += '/' + resource + msgtxt = msg msgenc = '' - if session: - fjid = session.get_to() - if keyID and self.USE_GPG: xhtml = None if keyID == 'UNKNOWN': @@ -386,15 +401,16 @@ subject, type_, correction_msg, xhtml) return + if type_ == 'chat': - msg_iq = nbxmpp.Message(to=fjid, body=msgtxt, typ=type_, + msg_iq = nbxmpp.Message(body=msgtxt, typ=type_, xhtml=xhtml) else: if subject: - msg_iq = nbxmpp.Message(to=fjid, body=msgtxt, typ='normal', + msg_iq = nbxmpp.Message(body=msgtxt, typ='normal', subject=subject, xhtml=xhtml) else: - msg_iq = nbxmpp.Message(to=fjid, body=msgtxt, typ='normal', + msg_iq = nbxmpp.Message(body=msgtxt, typ='normal', xhtml=xhtml) if msg_id: @@ -413,26 +429,6 @@ msg_iq.setTag('nick', namespace = nbxmpp.NS_NICK).setData( user_nick) - # TODO: We might want to write a function so we don't need to - # reproduce that ugly if somewhere else. - if resource: - contact = gajim.contacts.get_contact(self.name, jid, resource) - else: - contact = gajim.contacts.get_contact_with_highest_priority(self.name, - jid) - - # chatstates - if peer supports xep85, send chatstates - # please note that the only valid tag inside a message containing a - # <body> tag is the active event - if chatstate and contact and contact.supports(NS_CHATSTATES): - msg_iq.setTag(chatstate, namespace=NS_CHATSTATES) - - if forward_from: - addresses = msg_iq.addChild('addresses', - namespace=nbxmpp.NS_ADDRESS) - addresses.addChild('address', attrs = {'type': 'ofrom', - 'jid': forward_from}) - # XEP-0203 if delayed: our_jid = gajim.get_jid_from_account(self.name) + '/' + \ @@ -441,25 +437,60 @@ msg_iq.addChild('delay', namespace=nbxmpp.NS_DELAY2, attrs={'from': our_jid, 'stamp': timestamp}) - # XEP-0184 - if msgtxt and gajim.config.get_per('accounts', self.name, - 'request_receipt') and contact and contact.supports( - nbxmpp.NS_RECEIPTS): - msg_iq.setTag('request', namespace=nbxmpp.NS_RECEIPTS) - - if session: - # XEP-0201 - session.last_send = time.time() - msg_iq.setThread(session.thread_id) - - # XEP-0200 - if session.enable_encryption: - msg_iq = session.encrypt_stanza(msg_iq) - # XEP-0224 if attention: msg_iq.setTag('attention', namespace=nbxmpp.NS_ATTENTION) + if isinstance(jid, list): + if self.addressing_supported: + msg_iq.setTo(gajim.config.get_per('accounts', self.name, 'hostname')) + addresses = msg_iq.addChild('addresses', + namespace=nbxmpp.NS_ADDRESS) + for j in jid: + addresses.addChild('address', attrs = {'type': 'to', + 'jid': j}) + else: + iqs = [] + for j in jid: + iq = nbxmpp.Message(node=msg_iq) + iq.setTo(j) + iqs.append(iq) + msg_iq = iqs + else: + msg_id.setTo(fjid) + if resource: + contact = gajim.contacts.get_contact(self.name, jid, resource) + else: + contact = gajim.contacts.get_contact_with_highest_priority( + self.name, jid) + + # chatstates - if peer supports xep85, send chatstates + # please note that the only valid tag inside a message containing a + # <body> tag is the active event + if chatstate and contact and contact.supports(NS_CHATSTATES): + msg_iq.setTag(chatstate, namespace=NS_CHATSTATES) + + # XEP-0184 + if msgtxt and gajim.config.get_per('accounts', self.name, + 'request_receipt') and contact and contact.supports( + nbxmpp.NS_RECEIPTS): + msg_iq.setTag('request', namespace=nbxmpp.NS_RECEIPTS) + + if forward_from: + addresses = msg_iq.addChild('addresses', + namespace=nbxmpp.NS_ADDRESS) + addresses.addChild('address', attrs = {'type': 'ofrom', + 'jid': forward_from}) + + if session: + # XEP-0201 + session.last_send = time.time() + msg_iq.setThread(session.thread_id) + + # XEP-0200 + if session.enable_encryption: + msg_iq = session.encrypt_stanza(msg_iq) + if callback: callback(jid, msg, keyID, forward_from, session, original_message, subject, type_, msg_iq, xhtml) @@ -1902,6 +1933,8 @@ self.archive_pref_supported = True if nbxmpp.NS_BLOCKING in obj.features: self.blocking_supported = True + if nbxmpp.NS_ADDRESS in obj.features: + self.addressing_supported = True if nbxmpp.NS_CARBONS in obj.features and gajim.config.get_per( 'accounts', self.name, 'enable_message_carbons'): # Server supports carbons, activate it @@ -1995,8 +2028,11 @@ def cb(jid, msg, keyID, forward_from, session, original_message, subject, type_, msg_iq, xhtml): - msg_id = self.connection.send(msg_iq, now=obj.now) - jid = helpers.parse_jid(obj.jid) + if isinstance(msg_iq, list): + for iq in msg_iq: + msg_id = self.connection.send(iq, now=obj.now) + else: + msg_id = self.connection.send(msg_iq, now=obj.now) gajim.nec.push_incoming_event(MessageSentEvent(None, conn=self, jid=jid, message=msg, keyID=keyID, chatstate=obj.chatstate)) if obj.callback: @@ -2004,8 +2040,13 @@ if not obj.is_loggable: return - self.log_message(jid, msg, forward_from, session, original_message, - subject, type_, xhtml) + if isinstance(jid, list): + for j in jid: + self.log_message(j, msg, forward_from, session, + original_message, subject, type_, xhtml) + else: + self.log_message(jid, msg, forward_from, session, + original_message, subject, type_, xhtml) self._prepare_message(obj.jid, obj.message, obj.keyID, type_=obj.type_, subject=obj.subject, chatstate=obj.chatstate, msg_id=obj.msg_id, diff -r dbe977dd4985 -r 1acd7579c2da src/dialogs.py --- a/src/dialogs.py Fri Jul 26 20:29:50 2013 +0200 +++ b/src/dialogs.py Sat Jul 27 14:14:50 2013 +0200 @@ -3203,6 +3203,8 @@ else: form_node = None + recipient_list = [] + for to_whom_jid in sender_list: if to_whom_jid in self.completion_dict: to_whom_jid = self.completion_dict[to_whom_jid].jid @@ -3219,17 +3221,11 @@ message) continue - if self.session: - session = self.session - else: - session = gajim.connections[self.account].make_new_session( - to_whom_jid) - - # FIXME: allow GPG message some day - gajim.nec.push_outgoing_event(MessageOutgoingEvent(None, - account=self.account, jid=to_whom_jid, message=message, - type_='normal', subject=subject, session=session, - form_node=form_node)) + recipient_list.append(to_whom_jid) + + gajim.nec.push_outgoing_event(MessageOutgoingEvent(None, + account=self.account, jid=recipient_list, message=message, + type_='normal', subject=subject, form_node=form_node)) self.subject_entry.set_text('') # we sent ok, clear the subject self.message_tv_buffer.set_text('') # we sent ok, clear the textview

1 0

gajim: Set sensitivity for toolbar. Fixes #7389
by Denis Fomin 28 Jul '13

28 Jul '13

changeset 2988854e1f96 in /home/hg/repos/gajim branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=2988854e1f96 description: Set sensitivity for toolbar. Fixes #7389 diffstat: src/chat_control.py | 44 ++++++++++++++++++++++++++++++++++++-------- src/groupchat_control.py | 31 +++++++++++++++++++++++++++++++ 2 files changed, 67 insertions(+), 8 deletions(-) diffs (175 lines): diff -r 1acd7579c2da -r 2988854e1f96 src/chat_control.py --- a/src/chat_control.py Sat Jul 27 14:14:50 2013 +0200 +++ b/src/chat_control.py Sat Jul 27 19:10:08 2013 +0400 @@ -364,6 +364,7 @@ # when/if we do XHTML we will put formatting buttons back widget = self.xml.get_object('emoticons_button') + widget.set_sensitive(False) id_ = widget.connect('clicked', self.on_emoticons_button_clicked) self.handlers[id_] = widget @@ -459,6 +460,7 @@ # Hook up send button widget = self.xml.get_object('send_button') id_ = widget.connect('clicked', self._on_send_button_clicked) + widget.set_sensitive(False) self.handlers[id_] = widget widget = self.xml.get_object('formattings_button') @@ -622,10 +624,6 @@ """ When send button is pressed: send the current message """ - if gajim.connections[self.account].connected < 2: # we are not connected - dialogs.ErrorDialog(_('A connection is not available'), - _('Your message can not be sent until you are connected.')) - return message_buffer = self.msg_textview.get_buffer() start_iter = message_buffer.get_start_iter() end_iter = message_buffer.get_end_iter() @@ -1502,7 +1500,6 @@ def got_connected(self): self.msg_textview.set_sensitive(True) self.msg_textview.set_editable(True) - # FIXME: Set sensitivity for toolbar self.update_toolbar() def got_disconnected(self): @@ -1511,7 +1508,6 @@ self.conv_textview.tv.grab_focus() self.no_autonegotiation = False - # FIXME: Set sensitivity for toolbar self.update_toolbar() @@ -1785,6 +1781,13 @@ gajim.events.event_removed_unsubscribe(self.on_event_removed) def _update_toolbar(self): + if (gajim.connections[self.account].connected > 1 and not \ + self.TYPE_ID == 'pm') or (self.contact.show != 'offline' and \ + self.TYPE_ID == 'pm'): + emoticons_button = self.xml.get_object('emoticons_button') + emoticons_button.set_sensitive(True) + send_button = self.xml.get_object('send_button') + send_button.set_sensitive(True) # Formatting if self.contact.supports(NS_XHTML_IM) and not self.gpg_is_active: self._formattings_button.set_sensitive(True) @@ -1833,9 +1836,10 @@ self._video_button.set_tooltip_text(video_tooltip_text[:-1]) # Send file - if (self.contact.supports(NS_FILE) or \ + if ((self.contact.supports(NS_FILE) or \ self.contact.supports(NS_JINGLE_FILE_TRANSFER)) or \ - self.type_id == 'chat' or self.gc_contact.resource: + self.type_id == 'chat' or self.gc_contact.resource) and \ + self.contact.show != 'offline': self._send_file_button.set_sensitive(True) self._send_file_button.set_tooltip_text(_('Send files')) else: @@ -3258,6 +3262,30 @@ if contact: self.contact = contact self.draw_banner() + emoticons_button = self.xml.get_object('emoticons_button') + emoticons_button.set_sensitive(True) + send_button = self.xml.get_object('send_button') + send_button.set_sensitive(True) + + def got_disconnected(self): + # Emoticons button + emoticons_button = self.xml.get_object('emoticons_button') + emoticons_button.set_sensitive(False) + send_button = self.xml.get_object('send_button') + send_button.set_sensitive(False) + # Add to roster + self._add_to_roster_button.hide() + # Audio button + self._audio_button.set_sensitive(False) + # Video button + self._video_button.set_sensitive(False) + # Send file button + self._send_file_button.set_tooltip_text('') + self._send_file_button.set_sensitive(False) + # Convert to GC button + self._convert_to_gc_button.set_sensitive(False) + + ChatControlBase.got_disconnected(self) def update_status_display(self, name, uf_show, status): """ diff -r 1acd7579c2da -r 2988854e1f96 src/groupchat_control.py --- a/src/groupchat_control.py Sat Jul 27 14:14:50 2013 +0200 +++ b/src/groupchat_control.py Sat Jul 27 19:10:08 2013 +0400 @@ -284,6 +284,9 @@ is_anonymous=self.room_ctrl.is_anonymous) return menu + def got_disconnected(self): + ChatControl.got_disconnected(self) + class GroupchatControl(ChatControlBase): TYPE_ID = message_control.TYPE_GC @@ -308,6 +311,8 @@ # Keep error dialog instance to be sure to have only once at a time self.error_dialog = None + send_button = self.xml.get_object('send_button') + send_button.set_sensitive(False) self.actions_button = self.xml.get_object('muc_window_actions_button') id_ = self.actions_button.connect('clicked', @@ -315,14 +320,19 @@ self.handlers[id_] = self.actions_button widget = self.xml.get_object('change_nick_button') + widget.set_sensitive(False) id_ = widget.connect('clicked', self._on_change_nick_menuitem_activate) self.handlers[id_] = widget widget = self.xml.get_object('change_subject_button') + widget.set_sensitive(False) id_ = widget.connect('clicked', self._on_change_subject_menuitem_activate) self.handlers[id_] = widget + formattings_button = self.xml.get_object('formattings_button') + formattings_button.set_sensitive(False) + widget = self.xml.get_object('bookmark_button') for bm in gajim.connections[self.account].bookmarks: if bm['jid'] == self.contact.jid: @@ -1350,7 +1360,28 @@ if self.parent_win: self.parent_win.redraw_tab(self) + send_button = self.xml.get_object('send_button') + send_button.set_sensitive(True) + emoticons_button = self.xml.get_object('emoticons_button') + emoticons_button.set_sensitive(True) + formattings_button = self.xml.get_object('formattings_button') + formattings_button.set_sensitive(True) + change_nick_button = self.xml.get_object('change_nick_button') + change_nick_button.set_sensitive(True) + change_subject_button = self.xml.get_object('change_subject_button') + change_subject_button.set_sensitive(True) + def got_disconnected(self): + send_button = self.xml.get_object('send_button') + send_button.set_sensitive(False) + emoticons_button = self.xml.get_object('emoticons_button') + emoticons_button.set_sensitive(False) + formattings_button = self.xml.get_object('formattings_button') + formattings_button.set_sensitive(False) + change_nick_button = self.xml.get_object('change_nick_button') + change_nick_button.set_sensitive(False) + change_subject_button = self.xml.get_object('change_subject_button') + change_subject_button.set_sensitive(False) self.list_treeview.set_model(None) self.model.clear() nick_list = gajim.contacts.get_nick_list(self.account, self.room_jid)

1 0

gajim: remove send_message from connection object. Use Event eve...
by Yann Leboulanger 28 Jul '13

28 Jul '13

changeset 3db418a58271 in /home/hg/repos/gajim branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=3db418a58271 description: remove send_message from connection object. Use Event everywhere diffstat: src/common/commands.py | 16 ++++++++--- src/common/connection.py | 25 ------------------ src/common/zeroconf/connection_zeroconf.py | 40 ------------------------------ src/dialogs.py | 25 ++++++++++-------- 4 files changed, 25 insertions(+), 81 deletions(-) diffs (184 lines): diff -r 97c8cf7cedf2 -r 3db418a58271 src/common/commands.py --- a/src/common/commands.py Fri Jul 26 11:45:03 2013 +0200 +++ b/src/common/commands.py Fri Jul 26 14:45:16 2013 +0200 @@ -26,6 +26,7 @@ from common import helpers from common import dataforms from common import gajim +from common.connection_handlers_events import MessageOutgoingEvent import logging log = logging.getLogger('gajim.c.commands') @@ -285,9 +286,10 @@ ev_typ = event.type_ if ev_typ == 'printed_chat': ev_typ = 'chat' - self.connection.send_message(j, event.parameters[0], '', + gajim.nec.push_outgoing_event(MessageOutgoingEvent(None, + account=account, jid=j, message=event.parameters[0], type_=ev_typ, subject=event.parameters[1], - resource=resource, forward_from=jid, delayed=event.time_) + resource=resource, forward_from=jid, delayed=event.time_)) # Inform other client of completion response, cmd = self.buildResponse(request, status = 'completed') @@ -315,10 +317,14 @@ j, resource = gajim.get_room_and_nick_from_fjid(self.jid) for jid in events: for event in events[jid]: - self.connection.send_message(j, event.parameters[0], '', - type_=event.type_, subject=event.parameters[1], + ev_typ = event.type_ + if ev_typ == 'printed_chat': + ev_typ = 'chat' + gajim.nec.push_outgoing_event(MessageOutgoingEvent(None, + account=account, jid=j, message=event.parameters[0], + type_=ev_typ, subject=event.parameters[1], resource=resource, forward_from=jid, delayed=event.time_, - now=True) + now=True)) response, cmd = self.buildResponse(request, status = 'completed') cmd.addChild('note', {}, _('The status has been changed.')) diff -r 97c8cf7cedf2 -r 3db418a58271 src/common/connection.py --- a/src/common/connection.py Fri Jul 26 11:45:03 2013 +0200 +++ b/src/common/connection.py Fri Jul 26 14:45:16 2013 +0200 @@ -1989,31 +1989,6 @@ self.connection.send(msg_iq) - def send_message(self, jid, msg, keyID=None, type_='chat', subject='', - chatstate=None, msg_id=None, resource=None, user_nick=None, xhtml=None, - label=None, session=None, forward_from=None, form_node=None, - original_message=None, delayed=None, attention=False, correction_msg=None, - callback=None, callback_args=[], now=False): - - def cb(jid, msg, keyID, forward_from, session, original_message, - subject, type_, msg_iq, xhtml): - msg_id = self.connection.send(msg_iq, now=now) - jid = helpers.parse_jid(jid) - gajim.nec.push_incoming_event(MessageSentEvent(None, conn=self, - jid=jid, message=msg, keyID=keyID, chatstate=chatstate)) - if callback: - callback(msg_id, *callback_args) - - self.log_message(jid, msg, forward_from, session, original_message, - subject, type_, xhtml) - - self._prepare_message(jid, msg, keyID, type_=type_, subject=subject, - chatstate=chatstate, msg_id=msg_id, resource=resource, - user_nick=user_nick, xhtml=xhtml, label=label, session=session, - forward_from=forward_from, form_node=form_node, - original_message=original_message, delayed=delayed, - attention=attention, correction_msg=correction_msg, callback=cb) - def _nec_message_outgoing(self, obj): if obj.account != self.name: return diff -r 97c8cf7cedf2 -r 3db418a58271 src/common/zeroconf/connection_zeroconf.py --- a/src/common/zeroconf/connection_zeroconf.py Fri Jul 26 11:45:03 2013 +0200 +++ b/src/common/zeroconf/connection_zeroconf.py Fri Jul 26 14:45:16 2013 +0200 @@ -332,46 +332,6 @@ title=_('Could not change status of account "%s"') % self.name, msg=_('Please check if avahi-daemon is running.'))) - def send_message(self, jid, msg, keyID, type_='chat', subject='', - chatstate=None, msg_id=None, resource=None, user_nick=None, xhtml=None, - label=None, session=None, forward_from=None, form_node=None, - original_message=None, delayed=None, attention=False, callback=None, - callback_args=[], now=True): - - def on_send_ok(msg_id): - gajim.nec.push_incoming_event(MessageSentEvent(None, conn=self, - jid=jid, message=msg, keyID=keyID, chatstate=None)) - if callback: - callback(msg_id, *callback_args) - - self.log_message(jid, msg, forward_from, session, original_message, - subject, type_) - - def on_send_not_ok(reason): - reason += ' ' + _('Your message could not be sent.') - gajim.nec.push_incoming_event(MessageErrorEvent(None, conn=self, - fjid=jid, error_code=-1, error_msg=reason, msg=None, time_=None, - session=session)) - - def cb(jid, msg, keyID, forward_from, session, original_message, subject, - type_, msg_iq): - ret = self.connection.send(msg_iq, msg is not None, on_ok=on_send_ok, - on_not_ok=on_send_not_ok) - - if ret == -1: - # Contact Offline - gajim.nec.push_incoming_event(MessageErrorEvent(None, conn=self, - fjid=jid, error_code=-1, error_msg=_( - 'Contact is offline. Your message could not be sent.'), - msg=None, time_=None, session=session)) - - self._prepare_message(jid, msg, keyID, type_=type_, subject=subject, - chatstate=chatstate, msg_id=msg_id, resource=resource, - user_nick=user_nick, xhtml=xhtml, session=session, - forward_from=forward_from, form_node=form_node, - original_message=original_message, delayed=delayed, - attention=attention, callback=cb) - def _nec_message_outgoing(self, obj): if obj.account != self.name: return diff -r 97c8cf7cedf2 -r 3db418a58271 src/dialogs.py --- a/src/dialogs.py Fri Jul 26 11:45:03 2013 +0200 +++ b/src/dialogs.py Fri Jul 26 14:45:16 2013 +0200 @@ -63,6 +63,7 @@ from common import i18n from common import dataforms from common.exceptions import GajimGeneralException +from common.connection_handlers_events import MessageOutgoingEvent class EditGroupsDialog: """ @@ -3193,6 +3194,15 @@ sender_list = [j.strip() for j in self.to_entry.get_text().split( ',')] + subject = self.subject_entry.get_text() + begin, end = self.message_tv_buffer.get_bounds() + message = self.message_tv_buffer.get_text(begin, end, True) + + if self.form_widget: + form_node = self.form_widget.data_form + else: + form_node = None + for to_whom_jid in sender_list: if to_whom_jid in self.completion_dict: to_whom_jid = self.completion_dict[to_whom_jid].jid @@ -3204,10 +3214,6 @@ 'valid.') % to_whom_jid) return True - subject = self.subject_entry.get_text() - begin, end = self.message_tv_buffer.get_bounds() - message = self.message_tv_buffer.get_text(begin, end, True) - if '/announce/' in to_whom_jid: gajim.connections[self.account].send_motd(to_whom_jid, subject, message) @@ -3219,14 +3225,11 @@ session = gajim.connections[self.account].make_new_session( to_whom_jid) - if self.form_widget: - form_node = self.form_widget.data_form - else: - form_node = None # FIXME: allow GPG message some day - gajim.connections[self.account].send_message(to_whom_jid, message, - keyID=None, type_='normal', subject=subject, session=session, - form_node=form_node) + gajim.nec.push_outgoing_event(MessageOutgoingEvent(None, + account=self.account, jid=to_whom_jid, message=message, + type_='normal', subject=subject, session=session, + form_node=form_node)) self.subject_entry.set_text('') # we sent ok, clear the subject self.message_tv_buffer.set_text('') # we sent ok, clear the textview

1 0

gajim: update tooltip in groupchat window
by Yann Leboulanger 28 Jul '13

28 Jul '13

changeset 473129bda349 in /home/hg/repos/gajim branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=473129bda349 description: update tooltip in groupchat window diffstat: data/gui/groupchat_control.ui | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diffs (20 lines): diff -r a1e08b3453de -r 473129bda349 data/gui/groupchat_control.ui --- a/data/gui/groupchat_control.ui Thu Jul 25 19:03:43 2013 +0200 +++ b/data/gui/groupchat_control.ui Sun Jul 28 18:32:53 2013 +0200 @@ -382,7 +382,7 @@ <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="has_tooltip">True</property> - <property name="tooltip_text" translatable="yes">Show a menu of advanced functions (Alt+D)</property> + <property name="tooltip_text" translatable="yes">Show advanced functions (Alt+D)</property> <property name="use_action_appearance">False</property> <property name="relief">none</property> <property name="focus_on_click">False</property> @@ -441,6 +441,7 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> + <property name="tooltip_text" translatable="yes">Send message</property> <property name="use_action_appearance">False</property> <child> <object class="GtkAlignment" id="alignment105">

1 0

gajim: update changelog
by Yann Leboulanger 28 Jul '13

28 Jul '13

changeset 97c8cf7cedf2 in /home/hg/repos/gajim branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=97c8cf7cedf2 description: update changelog diffstat: ChangeLog | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (11 lines): diff -r 473129bda349 -r 97c8cf7cedf2 ChangeLog --- a/ChangeLog Sun Jul 28 18:32:53 2013 +0200 +++ b/ChangeLog Fri Jul 26 11:45:03 2013 +0200 @@ -7,6 +7,7 @@ * Support XEP-0308 Last message correction * Support XEP-0224 Attention * Support XEP-0191 Blocking command + * Better LTR languages support Gajim 0.15.4 (25 May 2013)

1 0

gajim: apply tags to puny encoded urls. Fixes #7391
by Yann Leboulanger 28 Jul '13

28 Jul '13

changeset b8403fe39fce in /home/hg/repos/gajim branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=b8403fe39fce description: apply tags to puny encoded urls. Fixes #7391 diffstat: src/conversation_textview.py | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diffs (16 lines): diff -r cc60f9107c06 -r b8403fe39fce src/conversation_textview.py --- a/src/conversation_textview.py Wed Jul 24 10:06:58 2013 +0200 +++ b/src/conversation_textview.py Wed Jul 24 12:39:07 2013 +0200 @@ -1249,7 +1249,11 @@ if 'url' in tags: puny_text = puny_encode(special_text).decode('utf-8') if not puny_text.endswith('-'): - buffer_.insert(end_iter, " (%s)" % puny_text) + puny_tags = [] + if use_other_tags: + puny_tags += other_tags + puny_tags = [(ttt.lookup(t) if isinstance(t, str) else t) for t in puny_tags] + buffer_.insert_with_tags(end_iter, " (%s)" % puny_text, *puny_tags) def print_empty_line(self): buffer_ = self.tv.get_buffer()

1 0

gajim: don't redraw several time the contacts when redrawing the...
by Yann Leboulanger 28 Jul '13

28 Jul '13

changeset 574655470339 in /home/hg/repos/gajim branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=574655470339 description: don't redraw several time the contacts when redrawing the full roster. See #7125 diffstat: src/roster_window.py | 35 +++++++++++++++++++++-------------- 1 files changed, 21 insertions(+), 14 deletions(-) diffs (63 lines): diff -r b8403fe39fce -r 574655470339 src/roster_window.py --- a/src/roster_window.py Wed Jul 24 12:39:07 2013 +0200 +++ b/src/roster_window.py Thu Jul 25 08:54:35 2013 +0200 @@ -275,28 +275,32 @@ self.draw_account(account) - def add_account_contacts(self, account): + def add_account_contacts(self, account, improve_speed=True, + draw_contacts=True): """ Add all contacts and groups of the given account to roster, draw them and account """ - self._before_fill() + if improve_speed: + self._before_fill() jids = gajim.contacts.get_jid_list(account) for jid in jids: self.add_contact(jid, account) - # Do not freeze the GUI when drawing the contacts - if jids: - # Overhead is big, only invoke when needed - self._idle_draw_jids_of_account(jids, account) - - # Draw all known groups - for group in gajim.groups[account]: - self.draw_group(group, account) - self.draw_account(account) - - self._after_fill() + if draw_contacts: + # Do not freeze the GUI when drawing the contacts + if jids: + # Overhead is big, only invoke when needed + self._idle_draw_jids_of_account(jids, account) + + # Draw all known groups + for group in gajim.groups[account]: + self.draw_group(group, account) + self.draw_account(account) + + if improve_speed: + self._after_fill() def _add_group_iter(self, account, group): """ @@ -1465,9 +1469,12 @@ for acct in gajim.contacts.get_accounts(): self._iters[acct] = {'account': None, 'groups': {}, 'contacts': {}} + self._before_fill() for acct in gajim.contacts.get_accounts(): self.add_account(acct) - self.add_account_contacts(acct) + self.add_account_contacts(acct, improve_speed=False, + draw_contacts=False) + self._after_fill() # Recalculate column width for ellipsizing self.tree.columns_autosize()

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