Commits

commits@gajim.org

17632 discussions

gajim: [fschmaus] Improve XEP-0082 support. Fixes #7814
by Gajim 07 Sep '14

07 Sep '14

changeset 43cb67972361 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=43cb67972361 description: [fschmaus] Improve XEP-0082 support. Fixes #7814 diffstat: src/common/connection_handlers_events.py | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) diffs (27 lines): diff -r ac09400aded7 -r 43cb67972361 src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Fri Aug 22 15:44:07 2014 +0200 +++ b/src/common/connection_handlers_events.py Sun Sep 07 21:51:06 2014 +0200 @@ -222,12 +222,21 @@ def dst(self, dt): return ZERO + if utc_time[-1:] == 'Z': + # Remove the trailing 'Z' + utc_time = utc_time[:-1] + elif utc_time[-6:] == "+00:00": + # Remove the trailing "+00:00" + utc_time = utc_time[:-6] + else: + log.info("Wrong timezone defintion: %s" % str(e)) + return try: - t = datetime.datetime.strptime(utc_time, '%Y-%m-%dT%H:%M:%SZ') + t = datetime.datetime.strptime(utc_time, '%Y-%m-%dT%H:%M:%S') except ValueError, e: try: t = datetime.datetime.strptime(utc_time, - '%Y-%m-%dT%H:%M:%S.%fZ') + '%Y-%m-%dT%H:%M:%S.%f') except ValueError, e: log.info('Wrong time format: %s' % str(e)) return

1 0

gajim-website: improve footer css
by Gajim Website 04 Sep '14

04 Sep '14

changeset 69ba09dbf798 in /home/hg/repos/gajim-website author: Yann Leboulanger <asterix(a)lagaule.org> details:http://hg.gajim.org/gajim-website?cmd=changeset;node=69ba09dbf798 description: improve footer css diffstat: css/main.css | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diffs (13 lines): diff -r dafa8cc9d737 -r 69ba09dbf798 css/main.css --- a/css/main.css Sun Aug 31 21:36:34 2014 +0200 +++ b/css/main.css Thu Sep 04 22:32:37 2014 +0200 @@ -158,3 +158,9 @@ margin:10px; padding:5px; } + +#footer { + font-size: 12px; + text-align: center; + color: #888888; +}

1 0

gajim-website: Merge new_download_page branch
by Gajim Website 31 Aug '14

31 Aug '14

changeset dafa8cc9d737 in /home/hg/repos/gajim-website author: Yann Leboulanger <asterix(a)lagaule.org> details:http://hg.gajim.org/gajim-website?cmd=changeset;node=dafa8cc9d737 description: Merge new_download_page branch diffstat: Design.php | 35 +-- css/main.css | 39 +- dev.php | 22 +- docs.php | 15 +- downloads.php | 384 ++++++++++++++++++----------- imgs/agilialinux.png | Bin imgs/archlinux.png | Bin imgs/debian.png | Bin imgs/fedora.png | Bin imgs/freebsd.png | Bin imgs/gentoo.png | Bin imgs/mandriva.png | Bin imgs/opensuse.png | Bin imgs/pld.png | Bin imgs/slackware.png | Bin imgs/source.png | Bin imgs/sourcemage.png | Bin imgs/ubuntu.png | Bin imgs/windows.png | Bin imgs/zenwalk.png | Bin locale/ar_AE/LC_MESSAGES/msg.po | 490 ++++++++++++++++++------------------- locale/bg_BG/LC_MESSAGES/msg.po | 489 ++++++++++++++++++-------------------- locale/de_DE/LC_MESSAGES/msg.po | 490 ++++++++++++++++++------------------- locale/eo/LC_MESSAGES/msg.po | 486 ++++++++++++++++++-------------------- locale/es_ES/LC_MESSAGES/msg.po | 427 +++++++++++++-------------------- locale/fr_FR/LC_MESSAGES/msg.po | 489 ++++++++++++++++++-------------------- locale/he_IL/LC_MESSAGES/msg.po | 508 +++++++++++++++++++-------------------- locale/hu_HU/LC_MESSAGES/msg.po | 491 ++++++++++++++++++------------------- locale/it_IT/LC_MESSAGES/msg.po | 493 ++++++++++++++++++------------------- locale/pl_PL/LC_MESSAGES/msg.po | 492 ++++++++++++++++++-------------------- locale/pt_BR/LC_MESSAGES/msg.po | 495 ++++++++++++++++++-------------------- locale/ru_RU/LC_MESSAGES/msg.po | 498 +++++++++++++++++++-------------------- msg.pot | 401 +++++++++++-------------------- 33 files changed, 3232 insertions(+), 3512 deletions(-) diffs (truncated from 11744 to 300 lines): diff -r e51cf683a910 -r dafa8cc9d737 Design.php --- a/Design.php Wed Jul 02 23:26:53 2014 +0200 +++ b/Design.php Sun Aug 31 21:36:34 2014 +0200 @@ -69,6 +69,7 @@ function Entete ($titre, $texte, $p="") { + header('Content-Type: application/xhtml+xml'); session_start(); // print_r($_SERVER); $language = get_language(); @@ -89,28 +90,6 @@ _("Wiki") => "http://trac.gajim.org/wiki", _("Development") => "dev.php"); - if (strpos($_SERVER['SCRIPT_NAME'], 'downloads.php')) - $menu2 = array( - _("Debian") => "downloads.php?lang=$language#debian", - _("Slackware") => "downloads.php?lang=$language#slackware", - _("Ubuntu") => "downloads.php?lang=$language#ubuntu", - _("Fedora") => "downloads.php?lang=$language#fedora", - _("Gentoo") => "downloads.php?lang=$language#gentoo", - _("Archlinux") => "downloads.php?lang=$language#archlinux", - _("SuSE") => "downloads.php?lang=$language#suse", - _("PLD") => "downloads.php?lang=$language#pld", - _("Sourcemage") => "downloads.php?lang=$language#sourcemage", - _("Mandriva") => "downloads.php?lang=$language#mandriva", - _("Zenwalk") => "downloads.php?lang=$language#zenwalk", - _("AgiliaLinux") => "downloads.php?lang=$language#agilialinux", - _("FreeBSD") => "downloads.php?lang=$language#freebsd", - _("Autopackage") => "downloads.php?lang=$language#autopackage", - _("Windows installer") => "downloads.php?lang=$language#windows", - _("Source") => "downloads.php?lang=$language#tarball", - _("Mercurial") => "downloads.php?lang=$language#mercurial", - _("Daily snapshots") => "downloads.php?lang=$language#snaps", - _("Old releases") => "downloads.php?lang=$language#old"); - if (strpos($_SERVER['SCRIPT_NAME'], 'docs.php')) $menu2 = array( _("Installation") => "docs.php?lang=$language#install", @@ -119,13 +98,13 @@ $page = $_SERVER["SCRIPT_NAME"]; $p = explode("/", $page); $page = $p[count($p)-1]; + echo "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n"; echo "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\"\n"; echo "\"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd\">\n"; echo "<html xmlns='http://www.w3.org/1999/xhtml'>\n <head>\n"; echo " <meta name=\"Author\" content=\"Le Boulanger Yann (asterix)\"/>"; echo " <meta name=\"description\" content=\"Gajim is a Jabber client written in PyGTK. The goal of Gajim's developers is to provide a full featured and easy to use xmpp client for the GTK+ users. Gajim does not require GNOME to run, eventhough it exists with it nicely. Gajim is released under the GNU General Public License\"/>\n"; echo " <meta name=\"keywords\" content=\"gajim client jabber python gtk xmpp chat linux gnu instant messaging messenger pygtk contact transport file transfer hig chatstate bookmark avatars srv wikipedia\"/>\n"; - echo " <meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\" />\n"; echo " <title>\n $titre\n </title>\n"; echo " <link rel=\"stylesheet\" href=\"css/main.css\" type=\"text/css\" />\n"; if ($language == "he" or $language == "ar") @@ -163,7 +142,7 @@ echo " <a href = \"$page?lang=hu\"><img src=\"imgs/hu_flag.png\" alt=\"hu_flag\" title=\"Weboldal magyarul\" /></a>\n"; echo " <a href = \"$page?lang=he\"><img src=\"imgs/he_flag.png\" alt=\"he_flag\" title=\"אתר הרשת בעברית\" /></a>\n"; echo " <a href = \"$page?lang=ar\"><img src=\"imgs/ar_flag.png\" alt=\"ar_flag\" title=\"الموقع باللغة العربية\" /></a>\n"; - echo " </div> \n</div>\n"; + echo " </div> \n</div> \n"; echo "<div class=\"menu\">\n"; while ( list ($libelle, $ancre) = each ($menu)){ echo " <span>\n "; @@ -186,7 +165,7 @@ echo Ancre ($ancre2, $libelle2, "submenu_a"); echo "\n </li>\n"; } - echo " </ul></div><div id=\"main_content\">\n"; + echo " </ul></div> \n"; } } @@ -194,11 +173,11 @@ function PiedDePage () { - echo " </div><div id=\"footer\">\n "; + echo " <div id=\"footer\">\n "; echo _(" Site optimized for W3C Standards and realized with vim editor under GNU/Linux by Asterix (Jabber ID: asterix(a)jabber.lagaule.org)\n"); echo " </div> \n"; - echo " </div> \n"; - echo " \n"; + echo " </div> \n"; + echo " </div> \n"; echo " </body>\n</html>\n"; diff -r e51cf683a910 -r dafa8cc9d737 css/main.css --- a/css/main.css Wed Jul 02 23:26:53 2014 +0200 +++ b/css/main.css Sun Aug 31 21:36:34 2014 +0200 @@ -31,14 +31,6 @@ } -/* -#end_menu -{ - background-image: url(../bar.png); - background-repeat:no-repeat; - float:left; - width:144px; -}*/ #translator { position: absolute; top : 20px; @@ -71,9 +63,6 @@ } .menu a:hover { -/* background-color: #84C1D7; - border: none; -*/ color: gray; } .main { @@ -86,10 +75,6 @@ border: 2px dashed #26667E; margin-right:20px; } -/*#main_content -{ - -}*/ .submenu ul { clear: both; @@ -149,3 +134,27 @@ .translation-status td.trans-img img { vertical-align:middle; } + +#os-logos { + margin:25px auto; +} + +#os-logos > tr > td { + min-width:100px; + max-width:100px; + text-align:center; + vertical-align:bottom; +} + +.os-logo { + max-width:75px; + max-height:75px; + margin:0px auto; +} + +#os-details div { + border:1px solid #bbbbbb; + border-radius:5px; + margin:10px; + padding:5px; +} diff -r e51cf683a910 -r dafa8cc9d737 dev.php --- a/dev.php Wed Jul 02 23:26:53 2014 +0200 +++ b/dev.php Sun Aug 31 21:36:34 2014 +0200 @@ -5,14 +5,12 @@ Entete (_("Gajim, a Jabber client"), "GAJIM"); -print (" <p>"); print (" <h1>"); print _(" Our Room"); print (" </h1>"); print _(" Our room is")." <a href=\"xmpp:gajim@conference.gajim.org?join\">gajim(a)conference.gajim.org</a> "._("You are welcome to join and communicate with us."); print (" <br/>"); -print (" <p>"); print (" <h1>"); print _(" Mailing List"); print (" </h1>"); @@ -26,7 +24,7 @@ print (" </h1>"); print _("To checkout hg do")." <em>hg clone http://hg.gajim.org/gajim gajim</em>"; print (" <br/>"); -print _(" You can also")." <a href=\"http://trac.gajim.org/browser/\">"._("browse SVN repository")."</a>."; +print _(" You can also")." <a href=\"http://trac.gajim.org/browser/\">"._("browse Mercurial repository")."</a>."; print (" <br/>"); @@ -49,10 +47,12 @@ print (" <li>\n"); print _(" Donating: ")."\n"; print ('<form action="https://www.paypal.com/cgi-bin/webscr" method="post"> - <input type="hidden" name="cmd" value="_s-xclick"> - <input type="hidden" name="hosted_button_id" value="ASTY4K884QP26"> - <input type="image" src="https://www.paypal.com/en_US/i/btn/btn_donateCC_LG.gif" border="0" name="submit" alt="PayPal - The safer, easier way to pay online!"> - <img alt="" border="0" src="https://www.paypal.com/fr_FR/i/scr/pixel.gif" width="1" height="1"> + <fieldset style="border:0;"> + <input type="hidden" name="cmd" value="_s-xclick"/> + <input type="hidden" name="hosted_button_id" value="ASTY4K884QP26"/> + <input type="image" src="https://www.paypal.com/en_US/i/btn/btn_donateCC_LG.gif" style="border:0;" name="submit" alt="PayPal - The safer, easier way to pay online!"/> + <img alt="" style="border:0;" src="https://www.paypal.com/fr_FR/i/scr/pixel.gif" width="1" height="1"/> + </fieldset> </form>'); print ('<a class="FlattrButton" style="display:none;" href="http://gajim.org"></a>'); print (" </li>\n"); @@ -68,10 +68,9 @@ $f3 = fopen("stats_po_svn", 'r'); print ("<table class=\"translation-status\">"); print ("<tr><th>Language</th><th colspan=\"2\">0.14.4 Version</th><th colspan=\"2\">0.15.1 Version</th><th colspan=\"2\">HG version</th></tr>"); -while (!feof($f_lang)) -{ +$data = fgets($f_lang); +do { print ("<tr>"); - $data = fgets($f_lang); print ($data); $data = fgets($f1); print ($data); @@ -80,7 +79,8 @@ $data = fgets($f3); print ($data); print ("</tr>"); -} + $data = fgets($f_lang); +} while (!feof($f_lang)); print ("</table>"); fclose($f_lang); fclose($f1); diff -r e51cf683a910 -r dafa8cc9d737 docs.php --- a/docs.php Wed Jul 02 23:26:53 2014 +0200 +++ b/docs.php Sun Aug 31 21:36:34 2014 +0200 @@ -5,14 +5,13 @@ Entete ("Gajim, a Jabber client", "GAJIM"); -print (" <p>\n"); -print ("<a name=\"install\"></a>"); +print ("<a name=\"install\"/>"); print (" <h1>\n"); print _(" Installation\n"); -print (" </h1></a>\n"); +print (" </h1>\n"); -print ("<a name=\"tarball\"></a>\n"); -print ("<a name=\"mercurial\"></a>\n"); +print ("<a name=\"tarball\"/>\n"); +print ("<a name=\"mercurial\"/>\n"); print (" <h2>\n"); print _(" Tarball and Mercurial\n"); print (" </h2>\n"); @@ -30,15 +29,14 @@ print (" </h3>\n"); $link = "<a href=\"http://trac.gajim.org/wiki/Win32Env\">"._("this page")."</a>"; printf(_("See %s to install development version under windows."), $link); -print (" <p>\n"); -print ("<a name=\"jabber\"></a>"); +print ("<a name=\"jabber\"/>"); print (" <h1>\n"); print (" Jabber/XMPP\n"); print (" </h1>\n"); print _(" Please read")." <a href=\"http://trac.gajim.org/wiki/GajimHelp#help_quickstart_guides\">"._("here")."</a>.\n"; -print ("<a name=\"structure\"></a>"); +print ("<a name=\"structure\"/>"); print (" <h1>\n"); print _(" Structure\n"); print (" </h1>\n"); @@ -46,7 +44,6 @@ print (" <br/>"); $link = "<a href=\"http://xmpppy.sourceforge.net/\">xmpppy</a>"; printf(_(" Gajim uses a fork of the %s library to do the interface with Jabber network.\n"), $link); -print (" </p>\n"); PiedDePage(); ?> diff -r e51cf683a910 -r dafa8cc9d737 downloads.php --- a/downloads.php Wed Jul 02 23:26:53 2014 +0200 +++ b/downloads.php Sun Aug 31 21:36:34 2014 +0200 @@ -11,166 +11,223 @@ printf(_(" A %s version is in test"), "<strong>0.16-rc2</strong>"); print ("<br/>\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"; +print _("you are advised to use the ")."<a href='#source' id='top-sourcelink'>"._("source tarball")."</a>\n"; -print ("<a name=\"debian\">\n"); -print (" <h2>\n"); -print (" Debian GNU/Linux\n"); -print (" </h2>\n"); -print ("</a>\n"); + +#OS-Table START +print "<table id='os-logos'>\n<tr>\n"; + +$os_table = array( + 0 => array ( + "agilialinux", # href / image + "AgiliaLinux", # Tooltip + "AgiliaLinux (MOPSLinux)", #text + ), + 1 => array ( + "archlinux", + "Archlinux", + "Archlinux", + ),

1 0

gajim: add /ping command in groupchat to ping occupants
by Gajim 22 Aug '14

22 Aug '14

changeset ac09400aded7 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=ac09400aded7 description: add /ping command in groupchat to ping occupants diffstat: src/chat_control.py | 14 +++++++++----- src/command_system/implementation/standard.py | 9 +++++++++ src/common/connection.py | 5 +++-- src/groupchat_control.py | 9 +++++++++ 4 files changed, 30 insertions(+), 7 deletions(-) diffs (91 lines): diff -r cd2b18340d4d -r ac09400aded7 src/chat_control.py --- a/src/chat_control.py Fri Aug 22 14:23:05 2014 +0200 +++ b/src/chat_control.py Fri Aug 22 15:44:07 2014 +0200 @@ -208,11 +208,6 @@ return self.print_conversation(_('Ping?'), 'status') - def _nec_ping_reply(self, obj): - if self.contact != obj.contact: - return - self.print_conversation(_('Pong! (%s s.)') % obj.seconds, 'status') - def _nec_ping_error(self, obj): if self.contact != obj.contact: return @@ -2850,6 +2845,15 @@ return self.update_ui() + def _nec_ping_reply(self, obj): + if obj.control: + if obj.control != self: + return + else: + if self.contact != obj.contact: + return + self.print_conversation(_('Pong! (%s s.)') % obj.seconds, 'status') + def set_control_active(self, state): ChatControlBase.set_control_active(self, state) # send chatstate inactive to the one we're leaving diff -r cd2b18340d4d -r ac09400aded7 src/command_system/implementation/standard.py --- a/src/command_system/implementation/standard.py Fri Aug 22 14:23:05 2014 +0200 +++ b/src/command_system/implementation/standard.py Fri Aug 22 15:44:07 2014 +0200 @@ -410,3 +410,12 @@ @doc(_("Allow an occupant to send you public or private messages")) def unblock(self, who): self.on_unblock(None, who) + + @command + @doc(_("Send a ping to the contact")) + def ping(self, nick): + if self.account == gajim.ZEROCONF_ACC_NAME: + raise CommandError(_('Command is not supported for zeroconf accounts')) + gc_c = gajim.contacts.get_gc_contact(self.account, self.room_jid, nick) + gajim.connections[self.account].sendPing(gc_c, self) + diff -r cd2b18340d4d -r ac09400aded7 src/common/connection.py --- a/src/common/connection.py Fri Aug 22 14:23:05 2014 +0200 +++ b/src/common/connection.py Fri Aug 22 15:44:07 2014 +0200 @@ -1551,10 +1551,11 @@ assert id_ == self.awaiting_xmpp_ping_id self.awaiting_xmpp_ping_id = None - def sendPing(self, pingTo=None): + def sendPing(self, pingTo=None, control=None): """ Send XMPP Ping (XEP-0199) request. If pingTo is not set, ping is sent to server to detect connection failure at application level + If control is set, display result there """ if not gajim.account_is_connected(self.name): return @@ -1577,7 +1578,7 @@ return timeDiff = round(timePong - timePing, 2) gajim.nec.push_incoming_event(PingReplyEvent(None, conn=self, - contact=pingTo, seconds=timeDiff)) + contact=pingTo, seconds=timeDiff, control=control)) if pingTo: timePing = time_time() self.connection.SendAndCallForResponse(iq, _on_response) diff -r cd2b18340d4d -r ac09400aded7 src/groupchat_control.py --- a/src/groupchat_control.py Fri Aug 22 14:23:05 2014 +0200 +++ b/src/groupchat_control.py Fri Aug 22 15:44:07 2014 +0200 @@ -1375,6 +1375,15 @@ obj.xhtml, self.session, msg_id=obj.msg_id, encrypted=obj.encrypted, displaymarking=obj.displaymarking) + def _nec_ping_reply(self, obj): + if obj.control: + if obj.control != self: + return + else: + if self.contact != obj.contact: + return + self.print_conversation(_('Pong! (%s s.)') % obj.seconds) + def got_connected(self): # Make autorejoin stop. if self.autorejoin:

1 0

gajim-plugins: don't crash when we upgrade to Gajim 0.16
by Gajim Plugins 22 Aug '14

22 Aug '14

changeset b33cc20caf07 in /home/hg/repos/gajim-plugins author: Yann Leboulanger <asterix(a)lagaule.org> branches: gajim_0.15 details:gajim-plugins?cmd=changeset;node=b33cc20caf07 description: don't crash when we upgrade to Gajim 0.16 diffstat: plugin_installer/plugin_installer.py | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diffs (24 lines): diff -r c8950f970c07 -r b33cc20caf07 plugin_installer/plugin_installer.py --- a/plugin_installer/plugin_installer.py Fri Oct 04 23:49:11 2013 +0400 +++ b/plugin_installer/plugin_installer.py Fri Aug 22 14:51:08 2014 +0200 @@ -386,8 +386,18 @@ desc = '<body xmlns=\'http://www.w3.org/1999/xhtml\'>' + \ desc + ' </body>' desc = desc.replace('\n', '<br/>') - self.plugin_description_textview.tv.display_html(desc, - self.plugin_description_textview) + import inspect + args = inspect.getargspec( + self.plugin_description_textview.tv.display_html) + gajim_version = list(gajim.version.split('-', 1)[0].split('.')) + if (gajim_version >= [0, 16]): + # Gajim_0.16 + self.plugin_description_textview.tv.display_html(desc, + self.plugin_description_textview.tv, + self.plugin_description_textview) + else: + self.plugin_description_textview.tv.display_html(desc, + self.plugin_description_textview) self.plugin_description_textview.tv.set_property('sensitive', True) else: self._clear_available_plugin_info()

1 0

gajim: fix sending file without jingle when localcert is not yet...
by Gajim 22 Aug '14

22 Aug '14

changeset cd2b18340d4d 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=cd2b18340d4d description: fix sending file without jingle when localcert is not yet generated. diffstat: src/common/socks5.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (21 lines): diff -r fd78ff1be867 -r cd2b18340d4d src/common/socks5.py --- a/src/common/socks5.py Wed Aug 13 22:46:18 2014 +0200 +++ b/src/common/socks5.py Fri Aug 22 14:23:05 2014 +0200 @@ -326,7 +326,7 @@ if listener.file_props.type_ == 's' and \ not self.isHashInSockObjs(self.senders, sock_hash): sockobj = Socks5SenderServer(self.idlequeue, sock_hash, self, - sock[0], sock[1][0], sock[1][1], fingerprint='server', + sock[0], sock[1][0], sock[1][1], fingerprint=None, file_props=listener.file_props) self._add(sockobj, self.senders, listener.file_props, sock_hash) # Start waiting for data @@ -341,7 +341,7 @@ sh['target'] = None sockobj = Socks5ReceiverServer(idlequeue=self.idlequeue, streamhost=sh,sid=None, file_props=listener.file_props, - fingerprint='server') + fingerprint=None) self._add(sockobj, self.readers, listener.file_props, sock_hash) sockobj.set_sock(sock[0])

1 0

gajim: handle XEP-191 (blocking command) in a better way: habili...
by Gajim 13 Aug '14

13 Aug '14

changeset fd78ff1be867 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=fd78ff1be867 description: handle XEP-191 (blocking command) in a better way: hability to block a contact when server doesn't support privacy lists, add / remove jid to blocked list only when we get the result from server, handle blocked / unblocked contacts by other resources diffstat: src/common/connection.py | 2 -- src/common/connection_handlers.py | 30 +++++++++++++++++++++++++++--- src/common/connection_handlers_events.py | 23 +++++++++++++++++++++++ src/roster_window.py | 20 ++++++++++++++++---- 4 files changed, 66 insertions(+), 9 deletions(-) diffs (162 lines): diff -r deed3497b04c -r fd78ff1be867 src/common/connection.py --- a/src/common/connection.py Mon Aug 11 22:16:11 2014 +0200 +++ b/src/common/connection.py Wed Aug 13 22:46:18 2014 +0200 @@ -1688,7 +1688,6 @@ query = iq.setQuery(name='block') query.setNamespace(nbxmpp.NS_BLOCKING) for contact in contact_list: - self.blocked_contacts.append(contact.jid) query.addChild(name='item', attrs={'jid': contact.jid}) self.connection.send(iq) return @@ -1713,7 +1712,6 @@ query = iq.setQuery(name='unblock') query.setNamespace(nbxmpp.NS_BLOCKING) for contact in contact_list: - self.blocked_contacts.append(contact.jid) query.addChild(name='item', attrs={'jid': contact.jid}) self.connection.send(iq) return diff -r deed3497b04c -r fd78ff1be867 src/common/connection_handlers.py --- a/src/common/connection_handlers.py Mon Aug 11 22:16:11 2014 +0200 +++ b/src/common/connection_handlers.py Wed Aug 13 22:46:18 2014 +0200 @@ -575,9 +575,9 @@ iq = nbxmpp.Iq('get', xmlns='') query = iq.setQuery(name='blocklist') query.setNamespace(nbxmpp.NS_BLOCKING) - id_ = self.connection.getAnID() - iq.setID(id_) - self.awaiting_answers[id_] = (BLOCKING_ARRIVED, ) + id2_ = self.connection.getAnID() + iq.setID(id2_) + self.awaiting_answers[id2_] = (BLOCKING_ARRIVED, ) self.connection.send(iq) if self.continue_connect_info and self.continue_connect_info[0]\ @@ -1523,6 +1523,8 @@ self._nec_agent_removed) gajim.ged.register_event_handler('stream-other-host-received', ged.CORE, self._nec_stream_other_host_received) + gajim.ged.register_event_handler('blocking', ged.CORE, + self._nec_blocking) def cleanup(self): ConnectionHandlersBase.cleanup(self) @@ -1567,6 +1569,7 @@ self._nec_agent_removed) gajim.ged.remove_event_handler('stream-other-host-received', ged.CORE, self._nec_stream_other_host_received) + gajim.ged.remove_event_handler('blocking', ged.CORE, self._nec_blocking) def build_http_auth_answer(self, iq_obj, answer): if not self.connection or self.connected < 2: @@ -2257,6 +2260,25 @@ jid_from = helpers.get_full_jid_from_iq(iq_obj) jingle_xtls.handle_new_cert(con, iq_obj, jid_from) + def _BlockingSetCB(self, con, iq_obj): + log.debug('_BlockingSetCB') + gajim.nec.push_incoming_event(BlockingEvent(None, conn=self, + stanza=iq_obj)) + raise nbxmpp.NodeProcessed + + def _nec_blocking(self, obj): + if obj.conn.name != self.name: + return + if obj.unblock_all: + self.blocked_contacts = [] + else: + for jid in obj.blocked_jids: + if jid not in self.blocked_contacts: + self.blocked_contacts.append(jid) + for jid in obj.unblocked_jids: + if jid in self.blocked_contacts: + self.blocked_contacts.remove(jid) + def _nec_stream_other_host_received(self, obj): if obj.conn.name != self.name: return @@ -2351,3 +2373,5 @@ nbxmpp.NS_PUBKEY_PUBKEY) con.RegisterHandler('iq', self._PubkeyResultCB, 'result', nbxmpp.NS_PUBKEY_PUBKEY) + con.RegisterHandler('iq', self._BlockingSetCB, 'set', + nbxmpp.NS_BLOCKING) diff -r deed3497b04c -r fd78ff1be867 src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Mon Aug 11 22:16:11 2014 +0200 +++ b/src/common/connection_handlers_events.py Wed Aug 13 22:46:18 2014 +0200 @@ -2529,3 +2529,26 @@ def init(self): self.popup = True + +class BlockingEvent(nec.NetworkIncomingEvent): + name = 'blocking' + base_network_events = [] + + def init(self): + self.blocked_jids = [] + self.unblocked_jids = [] + self.unblock_all = False + + def generate(self): + block_tag = self.stanza.getTag('block', namespace=nbxmpp.NS_BLOCKING) + if block_tag: + for item in block_tag.getTags('item'): + self.blocked_jids.append(item.getAttr('jid')) + unblock_tag = self.stanza.getTag('unblock', + namespace=nbxmpp.NS_BLOCKING) + if unblock_tag: + if not unblock_tag.getTags('item'): # unblock all + self.unblock_all = True + for item in unblock_tag.getTags('item'): + self.unblocked_jids.append(item.getAttr('jid')) + return True diff -r deed3497b04c -r fd78ff1be867 src/roster_window.py --- a/src/roster_window.py Mon Aug 11 22:16:11 2014 +0200 +++ b/src/roster_window.py Wed Aug 13 22:46:18 2014 +0200 @@ -3017,6 +3017,14 @@ dialogs.ConfirmationDialog(pritext, sectext, on_response_ok = (remove, list_)) + def _nec_blocking(self, obj): + if obj.unblock_all: + jids = gajim.contacts.get_jid_list(obj.conn.name) + self._idle_draw_jids_of_account(jids, obj.conn.name) + else: + for jid in obj.blocked_jids + obj.unblocked_jids: + self.draw_contact(jid, obj.conn.name) + def on_block(self, widget, list_, group=None): """ When clicked on the 'block' button in context menu. list_ is a list of @@ -3026,8 +3034,9 @@ if msg is None: # user pressed Cancel to change status message dialog return - accounts = set(i[1] for i in list_ if gajim.connections[i[1]].\ - privacy_rules_supported) + accounts = set(i[1] for i in list_ if (gajim.connections[i[1]].\ + privacy_rules_supported or (group is None and gajim.\ + connections[i[1]].blocking_supported))) if group is None: for acct in accounts: l_ = [i[0] for i in list_ if i[1] == acct] @@ -3065,8 +3074,9 @@ """ When clicked on the 'unblock' button in context menu. """ - accounts = set(i[1] for i in list_ if gajim.connections[i[1]].\ - privacy_rules_supported) + accounts = set(i[1] for i in list_ if (gajim.connections[i[1]].\ + privacy_rules_supported or (group is None and gajim.\ + connections[i[1]].blocking_supported))) if group is None: for acct in accounts: l_ = [i[0] for i in list_ if i[1] == acct] @@ -6607,3 +6617,5 @@ self._nec_signed_in) gajim.ged.register_event_handler('decrypted-message-received', ged.GUI2, self._nec_decrypted_message_received) + gajim.ged.register_event_handler('blocking', ged.GUI1, + self._nec_blocking)

1 0

gajim: correctly detect when no name is provided for bookmarks
by Gajim 11 Aug '14

11 Aug '14

changeset deed3497b04c 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=deed3497b04c description: correctly detect when no name is provided for bookmarks diffstat: src/config.py | 2 +- src/roster_window.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diffs (24 lines): diff -r 8928ec22e6b2 -r deed3497b04c src/config.py --- a/src/config.py Mon Aug 11 22:10:23 2014 +0200 +++ b/src/config.py Mon Aug 11 22:16:11 2014 +0200 @@ -3163,7 +3163,7 @@ None, None, None, None]) for bookmark in gajim.connections[account].bookmarks: - if bookmark['name'] == '': + if not bookmark['name']: # No name was given for this bookmark. # Use the first part of JID instead... name = bookmark['jid'].split("@")[0] diff -r 8928ec22e6b2 -r deed3497b04c src/roster_window.py --- a/src/roster_window.py Mon Aug 11 22:10:23 2014 +0200 +++ b/src/roster_window.py Mon Aug 11 22:16:11 2014 +0200 @@ -6168,7 +6168,7 @@ for bookmark in gajim.connections[account].bookmarks: name = bookmark['name'] - if bookmark['name'] == '': + if not name: # No name was given for this bookmark. # Use the first part of JID instead... name = bookmark['jid'].split("@")[0]

1 0

gajim: show first part of the JID in actions -> join group chat ...
by Gajim 11 Aug '14

11 Aug '14

changeset 8928ec22e6b2 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=8928ec22e6b2 description: show first part of the JID in actions -> join group chat menu when there is no name. diffstat: src/roster_window.py | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diffs (18 lines): diff -r 68a19c1bbb22 -r 8928ec22e6b2 src/roster_window.py --- a/src/roster_window.py Thu Jul 10 20:30:20 2014 +0200 +++ b/src/roster_window.py Mon Aug 11 22:10:23 2014 +0200 @@ -6167,8 +6167,13 @@ gc_sub_menu.append(item) for bookmark in gajim.connections[account].bookmarks: + name = bookmark['name'] + if bookmark['name'] == '': + # No name was given for this bookmark. + # Use the first part of JID instead... + name = bookmark['jid'].split("@")[0] # Do not use underline. - item = gtk.MenuItem(bookmark['name'], False) + item = gtk.MenuItem(name, False) item.connect('activate', self.on_bookmark_menuitem_activate, account, bookmark) gc_sub_menu.append(item)

1 0

gajim-plugins: [TicTacToe] [NickWilde] use nbxmpp instead of xmp...
by Gajim Plugins 11 Aug '14

11 Aug '14

changeset ce44898891c8 in /home/hg/repos/gajim-plugins author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:gajim-plugins?cmd=changeset;node=ce44898891c8 description: [TicTacToe] [NickWilde] use nbxmpp instead of xmpp. Fixes #96 diffstat: tictactoe/plugin.py | 17 ++++++++--------- 1 files changed, 8 insertions(+), 9 deletions(-) diffs (82 lines): diff -r 858f5aa3401f -r ce44898891c8 tictactoe/plugin.py --- a/tictactoe/plugin.py Sun Apr 27 16:43:50 2014 +0400 +++ b/tictactoe/plugin.py Mon Aug 11 21:55:10 2014 +0200 @@ -33,14 +33,13 @@ from plugins.plugin import GajimPluginException from plugins.helpers import log_calls, log from plugins.gui import GajimPluginConfigDialog -import common.xmpp +import nbxmpp import gtk from gtk import gdk import cairo import chat_control from common import ged import dialogs -from common import xmpp from common import caps_cache from common import stanza_session from common.connection_handlers_events import InformationEvent @@ -255,7 +254,7 @@ self.received = self.wait_for_invite_response def send_invitation(self): - msg = xmpp.Message() + msg = nbxmpp.Message() invite = msg.NT.invite invite.setNamespace(NS_GAMES) @@ -264,7 +263,7 @@ game = invite.NT.game game.setAttr('var', NS_GAMES_TICTACTOE) - x = xmpp.DataForm(typ='submit') + x = nbxmpp.DataForm(typ='submit') f = x.setField('role') f.setType('list-single') f.setValue('x') @@ -287,7 +286,7 @@ game = invite.getTag('game') x = game.getTag('x', namespace='jabber:x:data') - form = xmpp.DataForm(node=str(x)) + form = nbxmpp.DataForm(node=str(x)) if form.getField('role'): self.role_o = form.getField('role').getValues()[0] @@ -321,7 +320,7 @@ self.board = TicTacToeBoard(self, self.rows, self.cols) # accept the invitation, join the game - response = xmpp.Message() + response = nbxmpp.Message() join = response.NT.join join.setNamespace(NS_GAMES) @@ -358,7 +357,7 @@ self.base.button.set_active(False) def decline_invitation(self): - msg = xmpp.Message() + msg = nbxmpp.Message() terminate = msg.NT.decline terminate.setNamespace(NS_GAMES) @@ -452,7 +451,7 @@ # sends a move message def send_move(self, row, column): - msg = xmpp.Message() + msg = nbxmpp.Message() msg.setType('chat') turn = msg.NT.turn @@ -469,7 +468,7 @@ # sends a termination message and ends the game def end_game(self, reason): - msg = xmpp.Message() + msg = nbxmpp.Message() terminate = msg.NT.terminate terminate.setNamespace(NS_GAMES)

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