Commits

commits@gajim.org

17632 discussions

gajim-website: link 0.16-alpha1 tarball
by Yann Leboulanger 27 Jul '13

27 Jul '13

changeset 0f08feded1c2 in /home/hg/repos/gajim-website details:http://hg.gajim.org/gajim-website?cmd=changeset;node=0f08feded1c2 description: link 0.16-alpha1 tarball diffstat: downloads.php | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (14 lines): diff -r 87e6b10ee596 -r 0f08feded1c2 downloads.php --- a/downloads.php Sat Jul 27 21:54:14 2013 +0200 +++ b/downloads.php Sat Jul 27 21:59:10 2013 +0200 @@ -160,8 +160,8 @@ print (" </h2>\n"); print ("</a>\n"); print _(" The tarball version of Gajim is ")."<a href=\"downloads/".$download_folder."/gajim-".$last_version.".tar.bz2\">"._("here")."</a>. "._("For information on how to build Gajim,")." <a href=\"http://hg.gajim.org/gajim/raw-file/tip/README.html\">"._("see the <tt>README</tt>")."</a> ("._("in English")."). \n"; -#printf(_(" The tarball version of %s is "), "0.15-beta4"); -#print "<a href=\"downloads/0.15/gajim-0.15-beta4.tar.gz\">"._("here")."</a>. \n"; +printf(_(" The tarball version of %s is "), "0.16-alpha1") +print "<a href=\"downloads/0.16/gajim-0.16-alpha1.tar.gz\">"._("here")."</a>. \n"; print _("If you want to use the last unstable development version, then you should checkout the mercurial repository.\n");

1 0

gajim-website: announce 0.16-alpha1 release
by Yann Leboulanger 27 Jul '13

27 Jul '13

changeset 87e6b10ee596 in /home/hg/repos/gajim-website details:http://hg.gajim.org/gajim-website?cmd=changeset;node=87e6b10ee596 description: announce 0.16-alpha1 release diffstat: downloads.php | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diffs (38 lines): diff -r 1a44320d934e -r 87e6b10ee596 downloads.php --- a/downloads.php Thu Jul 18 10:43:35 2013 +0200 +++ b/downloads.php Sat Jul 27 21:54:14 2013 +0200 @@ -8,7 +8,7 @@ $last_version = "0.15.4"; print (" \n"); print _(" Latest version of Gajim is")." ".$last_version." \n"; -#printf(_(" A %s version is in test"), "0.15-beta4"); +printf(_(" A %s version is in test"), "0.16-alpha1"); print (" \n"); print _("If your distribution doesn't have the latest version "); print _("you are advised to use the ")."<a href=\"#autopackage\">autopackage</a> "._("or the ")."<a href=\"#tarball\">"._("source tarball")."</a>\n"; @@ -20,8 +20,8 @@ print ("</a>\n"); print _(" If you use Debian unstable do")." apt-get install gajim\n"; print (" \n"); -#printf(_(" The Debian package of %s is "), "0.15-beta4"); -#print "<a href=\"downloads/0.15/gajim_0.15~beta4-1_all.deb\">"._("here")."</a>. \n"; +printf(_(" The Debian package of %s is "), "0.16-alpha1"); +print "<a href=\"ftp://ftp.gajim.org/debian/dists/unstable/main/binary-all/gajim_0.16~alpha1…">"._("here")."</a>. \n"; print _(" A daily package from mercurial is also built. To use it, remove gajim")." (apt-get remove gajim), "._("add this line to your")." /etc/apt/source.list:\n"; print (" \n"); print (" deb ftp://ftp.gajim.org/debian unstable main\n"); @@ -148,10 +148,10 @@ print _(" There is a ")." <a href=\"downloads/".$download_folder."/gajim-".$last_version."-3.exe\">"._("Gajim installer")."</a>.\n"; #print _("The installer doesn't contain translations because of a") . " <a href=\"https://bugzilla.gnome.org/show_bug.cgi?id=574520\">" . _("GTK bug") . "</a>.\n"; print (" \n"); -#print _(" Here is a")." <a href=\"downloads/0.15/gajim-0.15-beta4-2.exe\">"._("Gajim installer")."</a> "; -#printf(_("for %s version "), "0.15-beta4"); -#print (".\n"); -#print (" \n"); +print _(" Here is a")." <a href=\"downloads/0.16/gajim-0.16-alpha1-1.exe\">"._("Gajim installer")."</a> "; +printf(_("for %s version "), "0.16-alpha1"); +print (".\n"); +print (" \n"); print (" \n"); print ("<a name=\"tarball\">\n");

1 0

gajim: Added tag gajim-0.16-alpha1 for changeset 7538b7eff0cd
by Yann Leboulanger 27 Jul '13

27 Jul '13

changeset 9acecc952839 in /home/hg/repos/gajim branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=9acecc952839 description: Added tag gajim-0.16-alpha1 for changeset 7538b7eff0cd diffstat: .hgtags | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (8 lines): diff -r 7538b7eff0cd -r 9acecc952839 .hgtags --- a/.hgtags Sat Jul 27 20:13:53 2013 +0200 +++ b/.hgtags Sat Jul 27 21:09:49 2013 +0200 @@ -6,3 +6,4 @@ 91ceabbf74309d7bbd79b43552b89768842b4e8a gajim-0.14.1 db4ecb0d1f187578732ceb2fa9beab0591125341 gajim-0.15-alpha1 50d609e2b30b4eaded2af345580fdd7125d4e179 gajim-0.15-beta1 +7538b7eff0cd2adf455beb78c206c5ffb81ba2f0 gajim-0.16-alpha1

1 0

gajim: fix indentation
by Yann Leboulanger 27 Jul '13

27 Jul '13

changeset 0d24c24b7afe in /home/hg/repos/gajim branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=0d24c24b7afe description: fix indentation diffstat: src/remote_control.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (14 lines): diff -r 47d4a7f5bb49 -r 0d24c24b7afe src/remote_control.py --- a/src/remote_control.py Sat Jul 27 19:10:08 2013 +0400 +++ b/src/remote_control.py Sat Jul 27 19:56:42 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: prepare 0.16-alpha1 release
by Yann Leboulanger 27 Jul '13

27 Jul '13

changeset 7538b7eff0cd in /home/hg/repos/gajim branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=7538b7eff0cd description: prepare 0.16-alpha1 release diffstat: autogen.sh | 2 +- debian/changelog | 6 ++++++ debian/control | 2 +- gajim.nsi | 2 +- src/common/defs.py | 2 +- 5 files changed, 10 insertions(+), 4 deletions(-) diffs (59 lines): diff -r 0d24c24b7afe -r 7538b7eff0cd autogen.sh --- a/autogen.sh Sat Jul 27 19:56:42 2013 +0200 +++ b/autogen.sh Sat Jul 27 20:13:53 2013 +0200 @@ -1,5 +1,5 @@ #!/usr/bin/env bash - gajimversion="0.15.4" + gajimversion="0.16-alpha1" if [ -d ".hg" ]; then node=$(hg tip --template "{node}") hgversion="-${node:0:12}" diff -r 0d24c24b7afe -r 7538b7eff0cd debian/changelog --- a/debian/changelog Sat Jul 27 19:56:42 2013 +0200 +++ b/debian/changelog Sat Jul 27 20:13:53 2013 +0200 @@ -1,3 +1,9 @@ +gajim (0.16~alpha1-1) unstable; urgency=low + + * New upstream release + + -- Yann Leboulanger <yann(a)leboulanger.org> Sat, 27 Jul 2013 19:21:47 +0200 + gajim (0.15.3-1) experimental; urgency=low * New upstream release diff -r 0d24c24b7afe -r 7538b7eff0cd debian/control --- a/debian/control Sat Jul 27 19:56:42 2013 +0200 +++ b/debian/control Sat Jul 27 20:13:53 2013 +0200 @@ -10,7 +10,7 @@ Package: gajim Architecture: all -Depends: ${misc:Depends}, ${python:Depends}, python-gtk2 (>= 2.22.0), dnsutils +Depends: ${misc:Depends}, ${python:Depends}, python-gtk2 (>= 2.22.0), dnsutils, python-nbxmpp 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-farstream, gstreamer0.10-plugins-ugly, python-pycurl, python-gupnp-igd Description: Jabber client written in PyGTK diff -r 0d24c24b7afe -r 7538b7eff0cd gajim.nsi --- a/gajim.nsi Sat Jul 27 19:56:42 2013 +0200 +++ b/gajim.nsi Sat Jul 27 20:13:53 2013 +0200 @@ -201,7 +201,7 @@ WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "DisplayName" "Gajim" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "UninstallString" "$INSTDIR\Uninstall.exe" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "DisplayIcon" "$INSTDIR\bin\Gajim.exe" - WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "DisplayVersion" "0.15.4" + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "DisplayVersion" "0.16" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "URLInfoAbout" "http://www.gajim.org/" WriteUninstaller "$INSTDIR\Uninstall.exe" diff -r 0d24c24b7afe -r 7538b7eff0cd src/common/defs.py --- a/src/common/defs.py Sat Jul 27 19:56:42 2013 +0200 +++ b/src/common/defs.py Sat Jul 27 20:13:53 2013 +0200 @@ -27,7 +27,7 @@ basedir = '../' localedir = '../po' -version = '0.15.4.0' +version = '0.16-alpha1' import subprocess try: node = subprocess.Popen('hg tip --template "{node|short}"', shell=True,

1 0

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

27 Jul '13

changeset 47d4a7f5bb49 in /home/hg/repos/gajim branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=47d4a7f5bb49 description: Set sensitivity for toolbar. Fixes #7389 diffstat: src/chat_control.py | 44 ++++++++++++++++++++++++++++++++++++-------- src/groupchat_control.py | 31 +++++++++++++++++++++++++++++++ 2 файлов изменено, 67 вставок(+), 8 удалений(-) различия (175 строк): diff -r cbca89be0388 -r 47d4a7f5bb49 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 @@ -366,6 +366,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 @@ -462,6 +463,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') @@ -625,10 +627,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() @@ -1466,7 +1464,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): @@ -1475,7 +1472,6 @@ self.conv_textview.tv.grab_focus() self.no_autonegotiation = False - # FIXME: Set sensitivity for toolbar self.update_toolbar() @@ -1749,6 +1745,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) @@ -1797,9 +1800,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: @@ -3245,6 +3249,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 cbca89be0388 -r 47d4a7f5bb49 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 @@ -278,6 +278,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 @@ -302,6 +305,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', @@ -309,14 +314,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: @@ -1342,7 +1352,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: use XEP-0033 to send one message to several JIDs
by Yann Leboulanger 27 Jul '13

27 Jul '13

changeset cbca89be0388 in /home/hg/repos/gajim branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=cbca89be0388 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 4a9723d04b83 -r cbca89be0388 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 4a9723d04b83 -r cbca89be0388 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 @@ -3174,6 +3174,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 @@ -3190,17 +3192,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: remove send_message from connection object. Use Event eve...
by Yann Leboulanger 26 Jul '13

26 Jul '13

changeset 2af3646ddb5f in /home/hg/repos/gajim branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=2af3646ddb5f 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 948f949577ca -r 2af3646ddb5f 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 @@ import helpers import dataforms 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 948f949577ca -r 2af3646ddb5f 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 948f949577ca -r 2af3646ddb5f 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 @@ -333,46 +333,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 948f949577ca -r 2af3646ddb5f 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 @@ -60,6 +60,7 @@ from common import i18n from common import dataforms from common.exceptions import GajimGeneralException +from common.connection_handlers_events import MessageOutgoingEvent class EditGroupsDialog: """ @@ -3164,6 +3165,15 @@ sender_list = [j.strip() for j in self.to_entry.get_text().decode( 'utf-8').split(',')] + subject = self.subject_entry.get_text().decode('utf-8') + begin, end = self.message_tv_buffer.get_bounds() + message = self.message_tv_buffer.get_text(begin, end).decode('utf-8') + + 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 @@ -3175,10 +3185,6 @@ 'valid.') % to_whom_jid) return True - subject = self.subject_entry.get_text().decode('utf-8') - begin, end = self.message_tv_buffer.get_bounds() - message = self.message_tv_buffer.get_text(begin, end).decode('utf-8') - if '/announce/' in to_whom_jid: gajim.connections[self.account].send_motd(to_whom_jid, subject, message) @@ -3190,14 +3196,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: go to end iter after each print_special_text if we don't ...
by Yann Leboulanger 26 Jul '13

26 Jul '13

changeset 4a9723d04b83 in /home/hg/repos/gajim branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=4a9723d04b83 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 2af3646ddb5f -r 4a9723d04b83 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 @@ -1085,6 +1085,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 insert_tags_func(end_iter, text_before_special_text, *other_tags) index = end # update index

1 0

gajim: gtk3 branch is name 0.16.10
by Yann Leboulanger 26 Jul '13

26 Jul '13

changeset 49087d647aa6 in /home/hg/repos/gajim branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=49087d647aa6 description: gtk3 branch is name 0.16.10 diffstat: src/common/defs.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 3198b3f40e32 -r 49087d647aa6 src/common/defs.py --- a/src/common/defs.py Wed May 15 14:24:16 2013 +0400 +++ b/src/common/defs.py Fri Jul 26 11:45:58 2013 +0200 @@ -27,7 +27,7 @@ basedir = '../' localedir = '../po' -version = '0.15.10.0' +version = '0.16.10.0' import subprocess try: node = subprocess.Popen('hg tip --template "{node|short}"', shell=True,

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