Commits

commits@gajim.org

17632 discussions

gajim: enable block menu if server supports only XEP-0191
by Yann Leboulanger 28 Jul '13

28 Jul '13

changeset a3aa5ab01e46 in /home/hg/repos/gajim branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=a3aa5ab01e46 description: enable block menu if server supports only XEP-0191 diffstat: src/gui_menu_builder.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (14 lines): diff -r 08e24222f69b -r a3aa5ab01e46 src/gui_menu_builder.py --- a/src/gui_menu_builder.py Fri Apr 05 20:59:17 2013 +0200 +++ b/src/gui_menu_builder.py Fri Apr 05 20:59:47 2013 +0200 @@ -469,8 +469,8 @@ execute_command_menuitem, send_custom_status_menuitem): widget.set_sensitive(False) - if gajim.connections[account] and gajim.connections[account].\ - privacy_rules_supported: + if gajim.connections[account] and (gajim.connections[account].\ + privacy_rules_supported or gajim.connections[account].blocking_supported): if helpers.jid_is_blocked(account, jid): block_menuitem.set_no_show_all(True) block_menuitem.hide()

1 0

gajim: update Changelog for next release
by Yann Leboulanger 28 Jul '13

28 Jul '13

changeset 40c881eb1782 in /home/hg/repos/gajim branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=40c881eb1782 description: update Changelog for next release diffstat: ChangeLog | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diffs (18 lines): diff -r 428111015d68 -r 40c881eb1782 ChangeLog --- a/ChangeLog Sun Mar 31 15:17:10 2013 +0200 +++ b/ChangeLog Sun Mar 31 15:59:36 2013 +0200 @@ -1,4 +1,14 @@ +Gajim 0.16 () + + * Improve File transfer support by adding Jingle file transfer + * use external python-nbxmpp library + * Improve audio / Video calls and add screensharing feature + * Support systemd-logind + * Support XEP-0224 (Attention) + * Support XEP-0191 blocking command + Gajim 0.15.3 (17 March 2013) + * Better handling of SSL errors * Better handling of canceling file transfer * Improve farstream calls

1 0

gajim: don't run several GPG threads when we receive a non-GPG m...
by Yann Leboulanger 28 Jul '13

28 Jul '13

changeset 08e24222f69b in /home/hg/repos/gajim branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=08e24222f69b description: don't run several GPG threads when we receive a non-GPG message. Fixes #7311 diffstat: src/common/connection_handlers.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diffs (13 lines): diff -r 40c881eb1782 -r 08e24222f69b src/common/connection_handlers.py --- a/src/common/connection_handlers.py Sun Mar 31 15:59:36 2013 +0200 +++ b/src/common/connection_handlers.py Fri Apr 05 20:59:17 2013 +0200 @@ -1015,7 +1015,8 @@ gajim.thread_interface(self.decrypt_thread, [encmsg, keyID, obj], self._on_message_decrypted, [obj]) return - self._on_message_decrypted(None, obj) + gajim.nec.push_incoming_event(DecryptedMessageReceivedEvent(None, + conn=self, msg_obj=obj)) def _on_message_decrypted(self, output, obj): if len(self.gpg_messages_to_decrypt):

1 0

gajim: implement XEP-0191 for servers that don't support privacy...
by Yann Leboulanger 28 Jul '13

28 Jul '13

changeset 4b726d480778 in /home/hg/repos/gajim branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=4b726d480778 description: implement XEP-0191 for servers that don't support privacy lists diffstat: src/common/connection.py | 22 +++++++++++++++++++++- src/common/connection_handlers.py | 23 +++++++++++++++++++++-- 2 files changed, 42 insertions(+), 3 deletions(-) diffs (104 lines): diff -r 61cbe7b5c950 -r 4b726d480778 src/common/connection.py --- a/src/common/connection.py Sat Mar 30 20:36:43 2013 +0100 +++ b/src/common/connection.py Sat Mar 30 23:13:48 2013 +0100 @@ -159,6 +159,7 @@ self.archiving_supported = False self.archive_pref_supported = False self.roster_supported = True + self.blocking_supported = False self.muc_jid = {} # jid of muc server for each transport type self._stun_servers = [] # STUN servers of our jabber server @@ -1576,11 +1577,20 @@ def block_contacts(self, contact_list, message): if not self.privacy_rules_supported: + if self.blocking_supported: #XEP-0191 + iq = nbxmpp.Iq('set', xmlns='') + 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 for contact in contact_list: self.send_custom_status('offline', message, contact.jid) new_rule = {'order': '1', 'type': 'jid', 'action': 'deny', - 'value' : contact.jid, 'child': ['message', 'iq', 'presence-out']} + 'value' : contact.jid, 'child': ['message', 'iq', + 'presence-out']} self.blocked_list.append(new_rule) self.blocked_contacts.append(contact.jid) self.set_privacy_list('block', self.blocked_list) @@ -1591,6 +1601,14 @@ def unblock_contacts(self, contact_list): if not self.privacy_rules_supported: + if self.blocking_supported: #XEP-0191 + iq = nbxmpp.Iq('set', xmlns='') + 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 self.new_blocked_list = [] self.to_unblock = [] @@ -1831,6 +1849,8 @@ self.archive_manual_supported = True if nbxmpp.NS_ARCHIVE_PREF in obj.features: self.archive_pref_supported = True + if nbxmpp.NS_BLOCKING in obj.features: + self.blocking_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 diff -r 61cbe7b5c950 -r 4b726d480778 src/common/connection_handlers.py --- a/src/common/connection_handlers.py Sat Mar 30 20:36:43 2013 +0100 +++ b/src/common/connection_handlers.py Sat Mar 30 23:13:48 2013 +0100 @@ -80,6 +80,7 @@ ROSTER_ARRIVED = 'roster_arrived' DELIMITER_ARRIVED = 'delimiter_arrived' PRIVACY_ARRIVED = 'privacy_arrived' +BLOCKING_ARRIVED = 'blocking_arrived' PEP_CONFIG = 'pep_config' HAS_IDLE = True try: @@ -562,8 +563,18 @@ if iq_obj.getType() != 'error': self.privacy_rules_supported = True self.get_privacy_list('block') - elif self.continue_connect_info: - if self.continue_connect_info[0] == 'invisible': + else: + if self.blocking_supported: + 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, ) + self.connection.send(iq) + + if self.continue_connect_info and self.continue_connect_info[0]\ + == 'invisible': # Trying to login as invisible but privacy list not # supported self.disconnect(on_purpose=True) @@ -576,6 +587,14 @@ return # Ask metacontacts before roster self.get_metacontacts() + elif self.awaiting_answers[id_][0] == BLOCKING_ARRIVED: + if iq_obj.getType() == 'result': + list_node = iq_obj.getTag('blocklist') + if not list_node: + return + self.blocked_contacts = [] + for i in list_node.iterTags('item'): + self.blocked_contacts.append(i.getAttr('jid')) elif self.awaiting_answers[id_][0] == PEP_CONFIG: if iq_obj.getType() == 'error': return

1 0

gajim: get files from 0.15 branch
by Yann Leboulanger 28 Jul '13

28 Jul '13

changeset 428111015d68 in /home/hg/repos/gajim branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=428111015d68 description: get files from 0.15 branch diffstat: ChangeLog | 13 ++++++++++++ autogen.sh | 2 +- debian/changelog | 35 ++++++++++++++++++++++++++++++++ gajim.nsi | 60 ++++++++++++++++++++++++++++--------------------------- 4 files changed, 80 insertions(+), 30 deletions(-) diffs (224 lines): diff -r 4b726d480778 -r 428111015d68 ChangeLog --- a/ChangeLog Sat Mar 30 23:13:48 2013 +0100 +++ b/ChangeLog Sun Mar 31 15:17:10 2013 +0200 @@ -1,3 +1,16 @@ +Gajim 0.15.3 (17 March 2013) + * Better handling of SSL errors + * Better handling of canceling file transfer + * Improve farstream calls + * Minor fixes and improvements + +Gajim 0.15.2 (30 October 2012) + + * Show punycode encoded urls if they contain non-ascii chars + * Fix crash when pressing Esc in chat window + * Support Network Manager 0.9 + * decrypt GPG messages in the correct order + Gajim 0.15.1 (29 August 2012) * Switch from python-farsight to python-farstream diff -r 4b726d480778 -r 428111015d68 autogen.sh --- a/autogen.sh Sat Mar 30 23:13:48 2013 +0100 +++ b/autogen.sh Sun Mar 31 15:17:10 2013 +0200 @@ -1,5 +1,5 @@ #!/usr/bin/env bash - gajimversion="0.15.2.0" + gajimversion="0.15.3" if [ -d ".hg" ]; then node=$(hg tip --template "{node}") hgversion="-${node:0:12}" diff -r 4b726d480778 -r 428111015d68 debian/changelog --- a/debian/changelog Sat Mar 30 23:13:48 2013 +0100 +++ b/debian/changelog Sun Mar 31 15:17:10 2013 +0200 @@ -1,3 +1,30 @@ +gajim (0.15.3-1) experimental; urgency=low + + * New upstream release + * Switch to 3.0 (quilt) source format. + + -- Yann Leboulanger <yann(a)leboulanger.org> Sun, 17 Mar 2013 18:32:12 +0200 + +gajim (0.15.1-4) unstable; urgency=low + + * apply patches using dpatch in debian/rules + + -- Yann Leboulanger <asterix(a)lagaule.org> Fri, 15 Feb 2013 23:34:36 +0200 + +gajim (0.15.1-3) unstable; urgency=low + + * Go back to old patch format so that Gajim can go in testing. + + -- Yann Leboulanger <asterix(a)lagaule.org> Sun, 02 Dec 2012 19:42:34 +0200 + +gajim (0.15.1-2) unstable; urgency=low + + * re-add missing 0.15-1.1 changelog entry + * add a patch to prevent a traceback. + * add a patch to fix a crash. Closes: #690937 + + -- Yann Leboulanger <asterix(a)lagaule.org> Sun, 14 Oct 2012 18:02:36 +0200 + gajim (0.15.1-1) unstable; urgency=low * New upstream release. @@ -8,6 +35,14 @@ -- Yann Leboulanger <asterix(a)lagaule.org> Tue, 29 Aug 2012 09:51:52 +0200 +gajim (0.15-1.1) unstable; urgency=high + + * Non-maintainer upload by the Security Team. + * Fix CVE-2012-2093: insecure use of temporary files when convering LaTeX + IM messages to png images. Closes: #668710 + + -- Luk Claes <luk(a)debian.org> Sat, 16 Jun 2012 18:22:00 +0200 + gajim (0.15-1) unstable; urgency=low * New upstream release. diff -r 4b726d480778 -r 428111015d68 gajim.nsi --- a/gajim.nsi Sat Mar 30 23:13:48 2013 +0100 +++ b/gajim.nsi Sun Mar 31 15:17:10 2013 +0200 @@ -39,11 +39,15 @@ !insertmacro MUI_UNPAGE_INSTFILES !insertmacro MUI_UNPAGE_FINISH +;Show all languages, despite user's codepage +!define MUI_LANGDLL_ALLLANGUAGES + !insertmacro MUI_LANGUAGE "English" !insertmacro MUI_LANGUAGE "French" !insertmacro MUI_LANGUAGE "German" !insertmacro MUI_LANGUAGE "Italian" !insertmacro MUI_LANGUAGE "Russian" +!insertmacro MUI_LANGUAGE "Hebrew" !insertmacro MUI_RESERVEFILE_LANGDLL ; English @@ -58,9 +62,7 @@ LangString DESC_SecGtk ${LANG_ENGLISH} "Installs Gtk+ 2 (necessary to run Gajim)." LangString DESC_SecDesktopIcon ${LANG_ENGLISH} "If set, a shortcut for Gajim will be created on the desktop." LangString DESC_SecAutostart ${LANG_ENGLISH} "If set, Gajim will be automatically started when Windows starts." -LangString STR_Installed ${LANG_ENGLISH} "Apparently, Gajim is already installed." -LangString STR_Uninstall ${LANG_ENGLISH} "Launch Uninstaller" -LangString STR_Cancel ${LANG_ENGLISH} "Cancel" +LangString STR_Installed ${LANG_ENGLISH} "Apparently, Gajim is already installed. Uninstall it?" LangString STR_Running ${LANG_ENGLISH} "It appears that Gajim is currently running.$\n\ Please quit Gajim and restart the uninstaller." @@ -76,9 +78,7 @@ LangString DESC_SecGtk ${LANG_FRENCH} "Installer Gtk+ 2 (nécessaire à Gajim)." LangString DESC_SecDesktopIcon ${LANG_FRENCH} "Si selectionné, un raccourci pour Gajim sera créé sur le bureau." LangString DESC_SecAutostart ${LANG_FRENCH} "Si activé, Gajim sera automatiquement lancé au démarrage de Windows." -LangString STR_Installed ${LANG_FRENCH} "Gajim est apparement déja installé." -LangString STR_Uninstall ${LANG_FRENCH} "Lancer la Désinstallation" -LangString STR_Cancel ${LANG_FRENCH} "Annuler" +LangString STR_Installed ${LANG_FRENCH} "Gajim est apparement déjà installé. Lancer la désinstallation ?" LangString STR_Running ${LANG_FRENCH} "Gajim est apparament lancé.$\n\ Fermez-le et redémarrez le désinstallateur." @@ -94,9 +94,7 @@ LangString DESC_SecGtk ${LANG_GERMAN} "Installert Gtk+ 2 (notwendig um Gajim zu benutzen)." LangString DESC_SecDesktopIcon ${LANG_GERMAN} "Wenn dies aktiviert wird, wird ein Icon für Gajim auf dem Desktop erstellt." LangString DESC_SecAutostart ${LANG_GERMAN} "Gajim wird automatisch gestartet, sowie Windows startet, wenn dies aktivier wird." -LangString STR_Installed ${LANG_GERMAN} "Gajim scheint bereits installiert zu sein." -LangString STR_Uninstall ${LANG_GERMAN} "Deinstallations-Programm starten" -LangString STR_Cancel ${LANG_GERMAN} "Abbrechen" +LangString STR_Installed ${LANG_GERMAN} "Gajim is apparently already installed. Uninstall it?" LangString STR_Running ${LANG_GERMAN} "Es scheint, dass Gajim bereits läuft.$\n\ Bitte beenden Sie es und starten Sie den Installer erneut.." @@ -112,9 +110,7 @@ LangString DESC_SecGtk ${LANG_ITALIAN} "Installa Gtk+ 2 (necessario per eseguire Gajim)." LangString DESC_SecDesktopIcon ${LANG_ITALIAN} "Se selezionato, un'icona verrà creata sul desktop." LangString DESC_SecAutostart ${LANG_ITALIAN} "Se selezionato, Gajim sarà eseguito all'avvio di Windows." -LangString STR_Installed ${LANG_ITALIAN} "Gajim is apparently already installed." -LangString STR_Uninstall ${LANG_ITALIAN} "Launch Uninstall" -LangString STR_Cancel ${LANG_ITALIAN} "Cancel" +LangString STR_Installed ${LANG_ITALIAN} "Gajim is apparently already installed. Uninstall it?" LangString STR_Running ${LANG_ITALIAN} "It appears that Gajim is currently running.$\n\ Close it and restart uninstaller." @@ -130,11 +126,24 @@ LangString DESC_SecGtk ${LANG_RUSSIAN} "Óñòàíîâêà Gtk+ 2 (íåîáõîäèìî äëÿ ðàáîòû Gajim)." LangString DESC_SecDesktopIcon ${LANG_RUSSIAN} "Åñëè îòìå÷åíî, íà ðàáî÷åì ñòîëå áóäåò ñîçäàí ÿðëûê Gajim." LangString DESC_SecAutostart ${LANG_RUSSIAN} "Åñëè îòìå÷åíî, Gajim áóäåò àâòîìàòè÷åñêè çàïóñêàòüñÿ ïðè çàãðóçêå Windows." -LangString STR_Installed ${LANG_RUSSIAN} "Gajim is apparently already installed." -LangString STR_Uninstall ${LANG_RUSSIAN} "Launch Uninstall" -LangString STR_Cancel ${LANG_RUSSIAN} "Cancel" -LangString STR_Running ${LANG_RUSSIAN} "It appears that Gajim is currently running.$\n\ - Close it and restart uninstaller." +LangString STR_Installed ${LANG_RUSSIAN} "Ïîõîæå, Gajim óæå óñòàíîâëåí. Äåèíñòàëëèðîâàòü óñòàíîâëåííóþ âåðñèþ?" +LangString STR_Running ${LANG_RUSSIAN} "Ïîõîæå, Gajim óæå çàïóùåí.$\nÇàêðîéòå åãî è çàïóñòèòå äåèíñòàëëÿòîð ñíîâà." + +; Hebrew +LangString NAME_Emoticons ${LANG_HEBREW} "øâùåðéí" +LangString NAME_Iconsets ${LANG_HEBREW} "îòøëé öìîéú" +LangString NAME_Languages ${LANG_HEBREW} "ùôåú" +LangString NAME_SecLanguagesOther ${LANG_HEBREW} "àçøåú" +LangString NAME_Themes ${LANG_HEBREW} "òøëàåú ðåùà" +LangString NAME_SecDesktopIcon ${LANG_HEBREW} "öåø ñîì áùåìçï òáåãä" +LangString NAME_SecAutostart ${LANG_HEBREW} "äôòì àú Gajim ëàùø Windows îúçéì" +LangString DESC_SecGajim ${LANG_HEBREW} "îú÷éï ÷áöé Gajim òé÷øééí." +LangString DESC_SecGtk ${LANG_HEBREW} "îú÷éï Gtk+ 2 (ðçåöä ìäøöú Gajim)." +LangString DESC_SecDesktopIcon ${LANG_HEBREW} "áîéãä åð÷áòú, ÷éöåø ãøê òáåø Gajim éåùí òì ùåìçï äòáåãä." +LangString DESC_SecAutostart ${LANG_HEBREW} "áîéãä åð÷áòú, Gajim éåôòì àåèåîèéú ëàùø Windows îúçéì." +LangString STR_Installed ${LANG_HEBREW} "ëôé äðøàä, Gajim ëáø îåú÷ï. ìäñéø àåúå?" +LangString STR_Running ${LANG_HEBREW} "ðøàä ùäúåëðéú Gajim îåøöú ëòú.$\n\ + àðà öà îï Gajim åàúçì àú îñéø ääú÷ðä." Section "Gajim" SecGajim SectionIn RO @@ -191,7 +200,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.1" + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "DisplayVersion" "0.15.3" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "URLInfoAbout" "http://www.gajim.org/" WriteUninstaller "$INSTDIR\Uninstall.exe" @@ -354,6 +363,7 @@ File /r "po\eo" File /r "po\eu" File /r "po\gl" + File /r "po\he" File /r "po\hr" File /r "po\lt" File /r "po\nb" @@ -598,6 +608,7 @@ RMDir /r "$INSTDIR\po\eu" RMDir /r "$INSTDIR\po\fr" RMDir /r "$INSTDIR\po\gl" + RMDir /r "$INSTDIR\po\he" RMDir /r "$INSTDIR\po\hr" RMDir /r "$INSTDIR\po\it" RMDir /r "$INSTDIR\po\lt" @@ -678,11 +689,7 @@ IntOp $0 $0 - 2 strcpy $1 $R0 $0 1 IfFileExists $1 +1 NotInstalled - messagebox::show MB_DEFBUTTON4|MB_TOPMOST "Gajim" \ - "0,103" \ - $(STR_Installed) \ - $(STR_Uninstall) $(STR_Cancel) - Pop $R1 + MessageBox MB_YESNO|MB_DEFBUTTON2|MB_TOPMOST $(STR_Installed) IDNO Quit StrCmp $R1 2 Quit +1 ExecWait '$R0 _?=$INSTDIR' $R2 StrCmp $R2 0 +1 Quit @@ -691,12 +698,7 @@ ; Check to see if new installer (NSIS)already installed ReadRegStr $R3 HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "UninstallString" IfFileExists $R3 +1 ReallyNotInstalled - - messagebox::show MB_DEFBUTTON4|MB_TOPMOST "Gajim" \ - "0,103" \ - $(STR_Installed) \ - $(STR_Uninstall) $(STR_Cancel) - Pop $R4 + MessageBox MB_YESNO|MB_DEFBUTTON2|MB_TOPMOST $(STR_Installed) IDNO Quit StrCmp $R4 2 Quit +1 ExecWait '$R3 _?=$INSTDIR' $R5 StrCmp $R5 0 ReallyNotInstalled Quit

1 0

gajim: hnadle MISSING_PASSPHRASE message from gnupg when signing
by Yann Leboulanger 28 Jul '13

28 Jul '13

changeset 322e3a542b4b in /home/hg/repos/gajim branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=322e3a542b4b description: hnadle MISSING_PASSPHRASE message from gnupg when signing diffstat: src/common/gnupg.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 448ddc766419 -r 322e3a542b4b src/common/gnupg.py --- a/src/common/gnupg.py Mon Mar 11 20:21:59 2013 +0100 +++ b/src/common/gnupg.py Thu Mar 14 12:45:53 2013 +0100 @@ -447,7 +447,7 @@ def handle_status(self, key, value): if key in ("USERID_HINT", "NEED_PASSPHRASE", "BAD_PASSPHRASE", - "GOOD_PASSPHRASE", "BEGIN_SIGNING", "CARDCTRL"): + "GOOD_PASSPHRASE", "BEGIN_SIGNING", "CARDCTRL", "MISSING_PASSPHRASE"): pass elif key in ("KEYEXPIRED", "SIGEXPIRED"): self.status = 'key expired'

1 0

gajim: don't enable register button in disco when we select the ...
by Yann Leboulanger 28 Jul '13

28 Jul '13

changeset 2f30fb341de4 in /home/hg/repos/gajim branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=2f30fb341de4 description: don't enable register button in disco when we select the server line diffstat: src/disco.py | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diffs (26 lines): diff -r 322e3a542b4b -r 2f30fb341de4 src/disco.py --- a/src/disco.py Thu Mar 14 12:45:53 2013 +0100 +++ b/src/disco.py Thu Mar 14 12:47:49 2013 +0100 @@ -1531,15 +1531,18 @@ self.execute_button.set_sensitive(True) if self.search_button and nbxmpp.NS_SEARCH in features: self.search_button.set_sensitive(True) - if self.register_button and nbxmpp.NS_REGISTER in features: + # Don't autorize to register with a server via disco + if self.register_button and nbxmpp.NS_REGISTER in features and \ + jid != self.jid: # We can register this agent registered_transports = [] jid_list = gajim.contacts.get_jid_list(self.account) - for jid in jid_list: + for jid_ in jid_list: contact = gajim.contacts.get_first_contact_from_jid( - self.account, jid) + self.account, jid_) if _('Transports') in contact.groups: - registered_transports.append(jid) + registered_transports.append(jid_) + registered_transports.append(self.jid) if jid in registered_transports: self.register_button.set_label(_('_Edit')) else:

1 0

gajim: use GED to send messages via gajim-remote. Fixes #7321
by Yann Leboulanger 28 Jul '13

28 Jul '13

changeset 66658bd3f739 in /home/hg/repos/gajim branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=66658bd3f739 description: use GED to send messages via gajim-remote. Fixes #7321 diffstat: src/remote_control.py | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diffs (33 lines): diff -r 2f30fb341de4 -r 66658bd3f739 src/remote_control.py --- a/src/remote_control.py Thu Mar 14 12:47:49 2013 +0100 +++ b/src/remote_control.py Tue Mar 19 10:25:10 2013 +0100 @@ -37,6 +37,7 @@ from time import time from dialogs import AddNewContactWindow, NewChatDialog, JoinGroupchatWindow from common import ged +from common.connection_handlers_events import MessageOutgoingEvent from common import dbus_support if dbus_support.supported: @@ -441,8 +442,10 @@ if ctrl: ctrl.print_conversation(message, frm='outgoing') - connection.send_message(jid, message, keyID, type_, subject, - session=session) + gajim.nec.push_outgoing_event(MessageOutgoingEvent(None, + account=connected_account, jid=jid, message=message, + keyID=keyID, type_=type_, control=ctrl)) + return DBUS_BOOLEAN(True) return DBUS_BOOLEAN(False) @@ -462,7 +465,7 @@ keyID is specified, encrypt the message with the pgp key """ jid = self._get_real_jid(jid, account) - return self._send_message(jid, message, keyID, account, type, subject) + return self._send_message(jid, message, keyID, account, 'normal', subject) @dbus.service.method(INTERFACE, in_signature='sss', out_signature='b') def send_groupchat_message(self, room_jid, message, account):

1 0

gajim: re-work blocking code
by Yann Leboulanger 28 Jul '13

28 Jul '13

changeset 61cbe7b5c950 in /home/hg/repos/gajim branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=61cbe7b5c950 description: re-work blocking code diffstat: src/common/connection.py | 89 +++++++++++++++++++++++++++++++ src/roster_window.py | 134 ++++++++++------------------------------------ 2 files changed, 118 insertions(+), 105 deletions(-) diffs (254 lines): diff -r 66658bd3f739 -r 61cbe7b5c950 src/common/connection.py --- a/src/common/connection.py Tue Mar 19 10:25:10 2013 +0100 +++ b/src/common/connection.py Sat Mar 30 20:36:43 2013 +0100 @@ -1574,6 +1574,95 @@ iq.setQuery().setTag('active', {'name': name}) self.connection.send(iq) + def block_contacts(self, contact_list, message): + if not self.privacy_rules_supported: + return + for contact in contact_list: + self.send_custom_status('offline', message, contact.jid) + new_rule = {'order': '1', 'type': 'jid', 'action': 'deny', + 'value' : contact.jid, 'child': ['message', 'iq', 'presence-out']} + self.blocked_list.append(new_rule) + self.blocked_contacts.append(contact.jid) + self.set_privacy_list('block', self.blocked_list) + if len(self.blocked_list) == 1: + self.set_active_list('block') + self.set_default_list('block') + self.get_privacy_list('block') + + def unblock_contacts(self, contact_list): + if not self.privacy_rules_supported: + return + self.new_blocked_list = [] + self.to_unblock = [] + for contact in contact_list: + self.to_unblock.append(contact.jid) + if contact.jid in self.blocked_contacts: + self.blocked_contacts.remove(contact.jid) + for rule in self.blocked_list: + if rule['action'] != 'deny' or rule['type'] != 'jid' \ + or rule['value'] not in self.to_unblock: + self.new_blocked_list.append(rule) + self.set_privacy_list('block', self.new_blocked_list) + self.get_privacy_list('block') + if len(self.new_blocked_list) == 0: + self.blocked_list = [] + self.blocked_contacts = [] + self.blocked_groups = [] + self.set_default_list('') + self.set_active_list('') + self.del_privacy_list('block') + if not gajim.interface.roster.regroup: + show = gajim.SHOW_LIST[self.connected] + else: # accounts merged + show = helpers.get_global_show() + if show == 'invisible': + return + for contact in contact_list: + self.send_custom_status(show, self.status, contact.jid) + + def block_group(self, group, contact_list, message): + if not self.privacy_rules_supported: + return + self.blocked_groups.append(group) + for contact in contact_list: + self.send_custom_status('offline', message, contact.jid) + new_rule = {'order': '1', 'type': 'group', 'action': 'deny', + 'value' : group, 'child': ['message', 'iq', 'presence-out']} + self.blocked_list.append(new_rule) + self.set_privacy_list('block', self.blocked_list) + if len(self.blocked_list) == 1: + self.set_active_list('block') + self.set_default_list('block') + self.get_privacy_list('block') + + def unblock_group(self, group, contact_list): + if not self.privacy_rules_supported: + return + if group in self.blocked_groups: + self.blocked_groups.remove(group) + self.new_blocked_list = [] + for rule in self.blocked_list: + if rule['action'] != 'deny' or rule['type'] != 'group' or \ + rule['value'] != group: + self.new_blocked_list.append(rule) + self.set_privacy_list('block', self.new_blocked_list) + self.get_privacy_list('block') + if len(self.new_blocked_list) == 0: + self.blocked_list = [] + self.blocked_contacts = [] + self.blocked_groups = [] + self.set_default_list('') + self.set_active_list('') + self.del_privacy_list('block') + if not gajim.interface.roster.regroup: + show = gajim.SHOW_LIST[self.connected] + else: # accounts merged + show = helpers.get_global_show() + if show == 'invisible': + return + for contact in contact_list: + self.send_custom_status(show, self.status, contact.jid) + def send_invisible_presence(self, msg, signed, initial = False): if not gajim.account_is_connected(self.name): return diff -r 66658bd3f739 -r 61cbe7b5c950 src/roster_window.py --- a/src/roster_window.py Tue Mar 19 10:25:10 2013 +0100 +++ b/src/roster_window.py Sat Mar 30 20:36:43 2013 +0100 @@ -3022,46 +3022,21 @@ # user pressed Cancel to change status message dialog return accounts = [] + accounts = set(i[1] for i in list_ if gajim.connections[i[1]].\ + privacy_rules_supported) if group is None: - for (contact, account) in list_: - if account not in accounts: - if not gajim.connections[account].\ - privacy_rules_supported: - continue - accounts.append(account) - self.send_status(account, 'offline', msg, to=contact.jid) - new_rule = {'order': '1', 'type': 'jid', - 'action': 'deny', 'value' : contact.jid, - 'child': ['message', 'iq', 'presence-out']} - gajim.connections[account].blocked_list.append(new_rule) - # needed for draw_contact: - gajim.connections[account].blocked_contacts.append( - contact.jid) - self.draw_contact(contact.jid, account) + for acct in accounts: + l_ = [i[0] for i in list_ if i[1] == acct] + gajim.connections[acct].block_contacts(l_, msg) + for contact in l_: + self.draw_contact(contact.jid, acct) else: - for (contact, account) in list_: - if account not in accounts: - if not gajim.connections[account].\ - privacy_rules_supported: - continue - accounts.append(account) - # needed for draw_group: - gajim.connections[account].blocked_groups.append(group) - self.draw_group(group, account) - self.send_status(account, 'offline', msg, to=contact.jid) - self.draw_contact(contact.jid, account) - new_rule = {'order': '1', 'type': 'group', 'action': 'deny', - 'value' : group, 'child': ['message', 'iq', - 'presence-out']} - # account is the same for all when we block a group - gajim.connections[list_[0][1]].blocked_list.append(new_rule) - for account in accounts: - connection = gajim.connections[account] - connection.set_privacy_list('block', connection.blocked_list) - if len(connection.blocked_list) == 1: - connection.set_active_list('block') - connection.set_default_list('block') - connection.get_privacy_list('block') + for acct in accounts: + l_ = [i[0] for i in list_ if i[1] == acct] + gajim.connections[acct].block_group(group, l_, msg) + self.draw_group(group, acct) + for contact in l_: + self.draw_contact(contact.jid, acct) def _block_it(is_checked=None): if is_checked is not None: # dialog has been shown @@ -3086,75 +3061,24 @@ """ When clicked on the 'unblock' button in context menu. """ - accounts = [] + accounts = set(i[1] for i in list_ if gajim.connections[i[1]].\ + privacy_rules_supported) if group is None: - for (contact, account) in list_: - if account not in accounts: - if gajim.connections[account].privacy_rules_supported: - accounts.append(account) - gajim.connections[account].new_blocked_list = [] - gajim.connections[account].to_unblock = [] - gajim.connections[account].to_unblock.append( - contact.jid) - else: - gajim.connections[account].to_unblock.append(contact.jid) - # needed for draw_contact: - if contact.jid in gajim.connections[account].blocked_contacts: - gajim.connections[account].blocked_contacts.remove( - contact.jid) - self.draw_contact(contact.jid, account) - for account in accounts: - for rule in gajim.connections[account].blocked_list: - if rule['action'] != 'deny' or rule['type'] != 'jid' \ - or rule['value'] not in \ - gajim.connections[account].to_unblock: - gajim.connections[account].new_blocked_list.append(rule) + for acct in accounts: + l_ = [i[0] for i in list_ if i[1] == acct] + gajim.connections[acct].unblock_contacts(l_) + for contact in l_: + self.draw_contact(contact.jid, acct) else: - for (contact, account) in list_: - if account not in accounts: - if gajim.connections[account].privacy_rules_supported: - accounts.append(account) - # needed for draw_group: - if group in gajim.connections[account].blocked_groups: - gajim.connections[account].blocked_groups.remove( - group) - self.draw_group(group, account) - gajim.connections[account].new_blocked_list = [] - for rule in gajim.connections[account].blocked_list: - if rule['action'] != 'deny' or \ - rule['type'] != 'group' or rule['value'] != group: - gajim.connections[account].new_blocked_list.\ - append(rule) - self.draw_contact(contact.jid, account) - for account in accounts: - gajim.connections[account].set_privacy_list('block', - gajim.connections[account].new_blocked_list) - gajim.connections[account].get_privacy_list('block') - if len(gajim.connections[account].new_blocked_list) == 0: - gajim.connections[account].blocked_list = [] - gajim.connections[account].blocked_contacts = [] - gajim.connections[account].blocked_groups = [] - gajim.connections[account].set_default_list('') - gajim.connections[account].set_active_list('') - gajim.connections[account].del_privacy_list('block') - if 'privacy_list_block' in gajim.interface.instances[account]: - del gajim.interface.instances[account]['privacy_list_block'] - for (contact, account) in list_: - if not self.regroup: - show = gajim.SHOW_LIST[gajim.connections[account].connected] - else: # accounts merged - show = helpers.get_global_show() - if show == 'invisible': - # Don't send our presence if we're invisible - continue - if account not in accounts: - accounts.append(account) - if gajim.connections[account].privacy_rules_supported: - self.send_status(account, show, - gajim.connections[account].status, to=contact.jid) - else: - self.send_status(account, show, - gajim.connections[account].status, to=contact.jid) + for acct in accounts: + l_ = [i[0] for i in list_ if i[1] == acct] + gajim.connections[acct].unblock_group(group, l_) + self.draw_group(group, acct) + for contact in l_: + self.draw_contact(contact.jid, acct) + for acct in accounts: + if 'privacy_list_block' in gajim.interface.instances[acct]: + del gajim.interface.instances[acct]['privacy_list_block'] def on_rename(self, widget, row_type, jid, account): # this function is called either by F2 or by Rename menuitem

1 0

gajim: send RIE stanza as an IQ if user is online and supports R...
by Yann Leboulanger 28 Jul '13

28 Jul '13

changeset 28d3d13390c3 in /home/hg/repos/gajim branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=28d3d13390c3 description: send RIE stanza as an IQ if user is online and supports RIE. Fixes #7289 diffstat: src/common/connection.py | 26 +++++++++++++++----------- src/roster_window.py | 9 +++++++-- 2 files changed, 22 insertions(+), 13 deletions(-) diffs (71 lines): diff -r bacc7bc883eb -r 28d3d13390c3 src/common/connection.py --- a/src/common/connection.py Mon Jan 14 20:18:55 2013 +0100 +++ b/src/common/connection.py Sun Feb 10 18:57:25 2013 +0100 @@ -1879,26 +1879,30 @@ form_node=obj.form_node, original_message=obj.original_message, delayed=obj.delayed, attention=obj.attention, callback=cb) - def send_contacts(self, contacts, jid): + def send_contacts(self, contacts, fjid, type_='message'): """ Send contacts with RosterX (Xep-0144) """ if not gajim.account_is_connected(self.name): return - if len(contacts) == 1: - msg = _('Sent contact: "%s" (%s)') % (contacts[0].get_full_jid(), + if type_ == 'message': + if len(contacts) == 1: + msg = _('Sent contact: "%s" (%s)') % (contacts[0].get_full_jid(), contacts[0].get_shown_name()) - else: - msg = _('Sent contacts:') - for contact in contacts: - msg += '\n "%s" (%s)' % (contact.get_full_jid(), + else: + msg = _('Sent contacts:') + for contact in contacts: + msg += '\n "%s" (%s)' % (contact.get_full_jid(), contact.get_shown_name()) - msg_iq = nbxmpp.Message(to=jid, body=msg) - x = msg_iq.addChild(name='x', namespace=nbxmpp.NS_ROSTERX) + stanza = nbxmpp.Message(to=gajim.get_jid_without_resource(fjid), + body=msg) + elif type_ == 'iq': + stanza = nbxmpp.Iq(to=fjid, typ='set') + x = stanza.addChild(name='x', namespace=nbxmpp.NS_ROSTERX) for contact in contacts: x.addChild(name='item', attrs={'action': 'add', 'jid': contact.jid, - 'name': contact.get_shown_name()}) - self.connection.send(msg_iq) + 'name': contact.get_shown_name()}) + self.connection.send(stanza) def send_stanza(self, stanza): """ diff -r bacc7bc883eb -r 28d3d13390c3 src/roster_window.py --- a/src/roster_window.py Mon Jan 14 20:18:55 2013 +0100 +++ b/src/roster_window.py Sun Feb 10 18:57:25 2013 +0100 @@ -72,7 +72,7 @@ if dbus_support.supported: import dbus -from nbxmpp.protocol import NS_FILE +from nbxmpp.protocol import NS_FILE, NS_ROSTERX from common.pep import MOODS, ACTIVITIES #(icon, name, type, jid, account, editable, second pixbuf) @@ -4529,7 +4529,12 @@ def on_drop_rosterx(self, widget, account_source, c_source, account_dest, c_dest, was_big_brother, context, etime): - gajim.connections[account_dest].send_contacts([c_source], c_dest.jid) + type_ = 'message' + if c_dest.show not in ('offline', 'error') and c_dest.supports( + NS_ROSTERX): + type_ = 'iq' + gajim.connections[account_dest].send_contacts([c_source], + c_dest.get_full_jid(), type_=type_) def on_drop_in_contact(self, widget, account_source, c_source, account_dest, c_dest, was_big_brother, context, etime):

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