Commits December 2011

commits@gajim.org

3 participants
147 discussions

gajim-website: new windows built with spell checking
by Yann Leboulanger 19 Dec '11

19 Dec '11

changeset abfcfbbaad3d in /home/hg/repos/gajim-website details:http://hg.gajim.org/gajim-website?cmd=changeset;node=abfcfbbaad3d description: new windows built with spell checking diffstat: downloads.php | 2 +- index.php | 21 +++++++++++---------- 2 files changed, 12 insertions(+), 11 deletions(-) diffs (43 lines): diff -r 1e65da2baabb -r abfcfbbaad3d downloads.php --- a/downloads.php Sun Dec 18 15:12:32 2011 +0100 +++ b/downloads.php Mon Dec 19 11:24:34 2011 +0100 @@ -148,7 +148,7 @@ print _(" There is a ")." <a href=\"downloads/".$download_folder."/gajim-".$last_version."-1.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 (" <br/>\n"); -print _(" Here is a")." <a href=\"downloads/0.15/gajim-0.15-beta3-1.exe\">"._("Gajim installer")."</a> "; +print _(" Here is a")." <a href=\"downloads/0.15/gajim-0.15-beta3-2.exe\">"._("Gajim installer")."</a> "; printf(_("for %s version "), "0.15-beta3"); print (".\n"); print (" <br/>\n"); diff -r 1e65da2baabb -r abfcfbbaad3d index.php --- a/index.php Sun Dec 18 15:12:32 2011 +0100 +++ b/index.php Mon Dec 19 11:24:34 2011 +0100 @@ -100,16 +100,17 @@ // 3 => sprintf(_("What's new in it:")), $array_news_items[0] = array( - 0 => _("handle default value in seclabel XEP"), - 1 => _("Fix convertion from chat to groupchat"), - 2 => _("Add infobar in chat window for file transfer"), - 3 => _("Implements XEP-0280: Message Carbons"), - 4 => _("use TLS connection for plugin installer"), - 5 => _("Some privacy improvements"), - 6 => _("Add a global proxy option"), - 7 => _("Make more use of proxy everytime we need to access the internet"), - 8 => _("Improve search in roster"), - 9 => _("Full changelog, see") . " <a href = \"http://hg.gajim.org/gajim/file/9903fad02c40/ChangeLog\">"._("Full ChangeLog")."</a> ", + 0 => _("Spell checking under windows"), + 1 => _("handle default value in seclabel XEP"), + 2 => _("Fix convertion from chat to groupchat"), + 3 => _("Add infobar in chat window for file transfer"), + 4 => _("Implements XEP-0280: Message Carbons"), + 5 => _("use TLS connection for plugin installer"), + 6 => _("Some privacy improvements"), + 7 => _("Add a global proxy option"), + 8 => _("Make more use of proxy everytime we need to access the internet"), + 9 => _("Improve search in roster"), + 10 => _("Full changelog, see") . " <a href = \"http://hg.gajim.org/gajim/file/9903fad02c40/ChangeLog\">"._("Full ChangeLog")."</a> ", ); $array_news_items[1] = array(

1 0

gajim: gtkspell really available for windows
by Yann Leboulanger 19 Dec '11

19 Dec '11

changeset 1c7a1df1e20a in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=1c7a1df1e20a description: gtkspell really available for windows diffstat: src/features_window.py | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diffs (12 lines): diff -r bf24584b4424 -r 1c7a1df1e20a src/features_window.py --- a/src/features_window.py Mon Dec 19 10:05:34 2011 +0100 +++ b/src/features_window.py Mon Dec 19 10:26:36 2011 +0100 @@ -217,8 +217,6 @@ return helpers.is_in_path('nslookup') def speller_available(self): - if os.name == 'nt': - return False try: __import__('gtkspell') except ImportError:

1 0

gajim: gtkspell really available for windows
by Yann Leboulanger 19 Dec '11

19 Dec '11

changeset a8cbcf420d64 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=a8cbcf420d64 description: gtkspell really available for windows diffstat: src/features_window.py | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diffs (12 lines): diff -r b45c7b9c16fb -r a8cbcf420d64 src/features_window.py --- a/src/features_window.py Mon Dec 19 10:05:34 2011 +0100 +++ b/src/features_window.py Mon Dec 19 10:26:36 2011 +0100 @@ -217,8 +217,6 @@ return helpers.is_in_path('nslookup') def speller_available(self): - if os.name == 'nt': - return False try: __import__('gtkspell') except ImportError:

1 0

gajim: revert unwanted commit
by Yann Leboulanger 19 Dec '11

19 Dec '11

changeset 0064fffbfd93 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=0064fffbfd93 description: revert unwanted commit diffstat: src/common/xmpp/auth_nb.py | 8 -------- 1 files changed, 0 insertions(+), 8 deletions(-) diffs (18 lines): diff -r 19ad7cbca461 -r 0064fffbfd93 src/common/xmpp/auth_nb.py --- a/src/common/xmpp/auth_nb.py Sun Dec 18 17:14:30 2011 +0100 +++ b/src/common/xmpp/auth_nb.py Sun Dec 18 18:19:03 2011 +0100 @@ -264,14 +264,6 @@ self._owner._caller.get_password(self.set_password, self.mechanism) self.startsasl = SASL_IN_PROCESS raise NodeProcessed - if 'X-MESSENGER-OAUTH2' in self.mecs: - node = Node('auth', attrs={'xmlns': NS_SASL, - 'mechanism': 'X-MESSENGER-OAUTH2'}) - node.addData('EwAgAq1DBAAUlbRWyAJjK5w968Ru3Cyt%2f6GvwXwAAcTdgGswey64ckzDPgGJVuMGOs3CcFncUI%2bkiga88Tn%2b1o4UowmCbz7vJTKpSrg5vA%2bQxMulY%2f3gjwkXUf10lDYzkn%2bykrPVVqp%2fd7KVLYey4sEm9HeVVXi1dxf1TfPDl%2f2QCkq5qNePldvpwja16J%2fRvP2IRvU4lNzJ0i510FUNc%2b%2fvvFLv7omxupg4Xzl%2bI4bbC2xs9m%2feeCsMP%2fdnrB8A3C2DQrHOa9LpjfCUZq04o%2bXB2GtTaCAaTDgPD02h34ykHQrUrtRU0ap3nh0Qnlt7JRpqVOUwTvb0Hn%2fv5h9cLwcCv3uwTbW91BPHOyaPaRmPCRvaZlKi%2bZ0hsCDuBzEDZgAACJG%2fIXBWykrg8AAXGWphNX%2fkakslIltlWqFQ1S9bGLVwNhdv4v455BE1Nl3akYcHKzggIWeBx%2fYjqCxyPPRpCXUr6RRFh6%2f2a9BdvFiJDQeFyrRbruxu5%2bwYJ5S2v2t1H9gBNjRfYmiSVldMzh9NmBvO7juwyodwEeEW%2fgzNIy6cQ9g9shCG8Q9oqn9Y1VOQRQ3RGRdvVS5Uzksc%2fAXAmS6eS7N5wWBvrlrP2EkJamRtTZwpnhwwW8sG%2bOjMi9eiB4GQajBZm%2bVNH4tRJvjbSTfQ2zm414D24xGSdSG6HvamKkaF5C8XaOPfF6XNfy0l8zr4pg5Nm%2fJBuA8AAA%3d%3d') - self.mechanism = 'X-MESSENGER-OAUTH2' - self.startsasl = SASL_IN_PROCESS - self._owner.send(str(node)) - raise NodeProcessed self.startsasl = SASL_FAILURE log.info('I can only use EXTERNAL, SCRAM-SHA-1, DIGEST-MD5, GSSAPI and ' 'PLAIN mecanisms.')

1 0

gajim: gtkspell is available under windows
by Yann Leboulanger 19 Dec '11

19 Dec '11

changeset bf24584b4424 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=bf24584b4424 description: gtkspell is available under windows diffstat: src/features_window.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 0064fffbfd93 -r bf24584b4424 src/features_window.py --- a/src/features_window.py Sun Dec 18 18:19:03 2011 +0100 +++ b/src/features_window.py Mon Dec 19 10:05:34 2011 +0100 @@ -82,7 +82,7 @@ _('Spell Checker'): (self.speller_available, _('Spellchecking of composed messages.'), _('Requires libgtkspell.'), - _('Feature not available under Windows.')), + _('Requires libgtkspell and libenchant.')), _('Notification'): (self.notification_available, _('Passive popups notifying for new events.'), _('Requires python-notify or instead python-dbus in conjunction with notification-daemon.'),

1 0

gajim: prevent traceback
by Yann Leboulanger 19 Dec '11

19 Dec '11

changeset 19ad7cbca461 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=19ad7cbca461 description: prevent traceback diffstat: src/roster_window.py | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diffs (18 lines): diff -r d09221875ba8 -r 19ad7cbca461 src/roster_window.py --- a/src/roster_window.py Sun Dec 18 23:21:51 2011 +0100 +++ b/src/roster_window.py Sun Dec 18 17:14:30 2011 +0100 @@ -1654,8 +1654,12 @@ if type2 == 'self_contact': return 1 if type1 == 'group': - name1 = model[iter1][C_JID].decode('utf-8') - name2 = model[iter2][C_JID].decode('utf-8') + name1 = model[iter1][C_JID] + if name1: + name1 = name1.decode('utf-8') + name2 = model[iter2][C_JID] + if name2: + name2 = name2.decode('utf-8') if name1 == _('Transports'): return 1 if name2 == _('Transports'):

1 0

gajim: gtkspell is available under windows
by Yann Leboulanger 19 Dec '11

19 Dec '11

changeset b45c7b9c16fb in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=b45c7b9c16fb description: gtkspell is available under windows diffstat: src/features_window.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 64b195b0f374 -r b45c7b9c16fb src/features_window.py --- a/src/features_window.py Sun Dec 18 23:20:30 2011 +0100 +++ b/src/features_window.py Mon Dec 19 10:05:34 2011 +0100 @@ -82,7 +82,7 @@ _('Spell Checker'): (self.speller_available, _('Spellchecking of composed messages.'), _('Requires libgtkspell.'), - _('Feature not available under Windows.')), + _('Requires libgtkspell and libenchant.')), _('Notification'): (self.notification_available, _('Passive popups notifying for new events.'), _('Requires python-notify or instead python-dbus in conjunction with notification-daemon.'),

1 0

gtk-win32-bin: add gtkspell support
by Yann Leboulanger 19 Dec '11

19 Dec '11

changeset 5e8b57a15fd6 in /home/hg/repos/gtk-win32-bin details:http://hg.gajim.org/gtk-win32-bin?cmd=changeset;node=5e8b57a15fd6 description: add gtkspell support diffstat: bin/gtkspell.dll | Bin bin/lib/enchant/libenchant_ispell.dll | Bin bin/lib/enchant/libenchant_myspell.dll | Bin bin/libenchant.dll | Bin bin/libintl-8.dll | Bin bin/share/enchant/README.txt | 4 + bin/share/enchant/enchant.ordering | 8 + bin/share/enchant/myspell/README.txt | 3 + bin/share/enchant/myspell/cs_CZ.aff | 2596 + bin/share/enchant/myspell/cs_CZ.dic | 302542 ++++++++++++++++++++++++++++ bin/share/enchant/myspell/da_DK.aff | 1489 + bin/share/enchant/myspell/da_DK.dic | 154834 ++++++++++++++ bin/share/enchant/myspell/de_DE.aff | 721 + bin/share/enchant/myspell/de_DE.dic | 71680 ++++++ bin/share/enchant/myspell/en_GB.aff | 1150 + bin/share/enchant/myspell/en_GB.dic | 46281 ++++ bin/share/enchant/myspell/en_US.aff | 201 + bin/share/enchant/myspell/en_US.dic | 62120 +++++ bin/share/enchant/myspell/es_ES.aff | 6893 + bin/share/enchant/myspell/es_ES.dic | 71935 ++++++ bin/share/enchant/myspell/fr_FR.aff | 694 + bin/share/enchant/myspell/fr_FR.dic | 92483 ++++++++ bin/share/enchant/myspell/hr_HR.aff | 108 + bin/share/enchant/myspell/hr_HR.dic | 215957 ++++++++++++++++++++ bin/share/enchant/myspell/it_IT.aff | 3406 + bin/share/enchant/myspell/it_IT.dic | 95222 ++++++++ bin/share/enchant/myspell/nb_NO.aff | 627 + bin/share/enchant/myspell/nb_NO.dic | 322044 ++++++++++++++++++++++++++++++ bin/share/enchant/myspell/nl_NL.aff | 1418 + bin/share/enchant/myspell/nl_NL.dic | 142520 +++++++++++++ bin/share/enchant/myspell/pl_PL.aff | 7233 + bin/share/enchant/myspell/pl_PL.dic | 280963 ++++++++++++++++++++++++++ bin/share/enchant/myspell/ru_RU.aff | 1632 + bin/share/enchant/myspell/ru_RU.dic | 146270 +++++++++++++ bin/share/enchant/myspell/sk_SK.aff | 2536 + bin/share/enchant/myspell/sk_SK.dic | 317018 +++++++++++++++++++++++++++++ bin/share/enchant/myspell/sv_SE.aff | 674 + bin/share/enchant/myspell/sv_SE.dic | 72372 ++++++ 38 files changed, 2425634 insertions(+), 0 deletions(-) diffs (truncated from 2425777 to 300 lines): diff -r c64057cab8e5 -r 5e8b57a15fd6 bin/gtkspell.dll Binary file bin/gtkspell.dll has changed diff -r c64057cab8e5 -r 5e8b57a15fd6 bin/lib/enchant/libenchant_ispell.dll Binary file bin/lib/enchant/libenchant_ispell.dll has changed diff -r c64057cab8e5 -r 5e8b57a15fd6 bin/lib/enchant/libenchant_myspell.dll Binary file bin/lib/enchant/libenchant_myspell.dll has changed diff -r c64057cab8e5 -r 5e8b57a15fd6 bin/libenchant.dll Binary file bin/libenchant.dll has changed diff -r c64057cab8e5 -r 5e8b57a15fd6 bin/libintl-8.dll Binary file bin/libintl-8.dll has changed diff -r c64057cab8e5 -r 5e8b57a15fd6 bin/share/enchant/README.txt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/bin/share/enchant/README.txt Mon Dec 19 10:01:10 2011 +0100 @@ -0,0 +1,4 @@ + +This directory contains dictionary files for Enchant when installed on a +Microsoft Windows system. Each subdirectory contains dictionaries for +a particular spellchecking system. diff -r c64057cab8e5 -r 5e8b57a15fd6 bin/share/enchant/enchant.ordering --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/bin/share/enchant/enchant.ordering Mon Dec 19 10:01:10 2011 +0100 @@ -0,0 +1,8 @@ +*:myspell,aspell,ispell +fi:voikko,ispell,myspell,aspell +fi_FI:voikko,ispell,myspell,aspell +he:hspell,myspell +he_IL:hspell,myspell +yi:uspell +tr:zemberek +tr_TR:zemberek diff -r c64057cab8e5 -r 5e8b57a15fd6 bin/share/enchant/myspell/README.txt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/bin/share/enchant/myspell/README.txt Mon Dec 19 10:01:10 2011 +0100 @@ -0,0 +1,3 @@ + +This directory contains dictionaries for the myspell backend to enchant. + diff -r c64057cab8e5 -r 5e8b57a15fd6 bin/share/enchant/myspell/cs_CZ.aff --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/bin/share/enchant/myspell/cs_CZ.aff Mon Dec 19 10:01:10 2011 +0100 @@ -0,0 +1,2596 @@ +SET ISO8859-2 +TRY aáeéìiíoóuúùyýbcèdïlmnòfjkprøs¹t»vghqwxz¾AÁEÉÌIÍOÓUÚÙYÝBCÈDÏLMNÒFJKPRØS©T«VGHQWXZ® + +PFX N Y 1 +PFX N 0 ne . + +PFX E Y 1 +PFX E 0 nej . + +PFX W Y 3 +PFX W 0 ne . +PFX W 0 nej . +PFX W 0 nejne . + +PFX F Y 10 +PFX F 0 jedna . +PFX F 0 dvaa . +PFX F 0 tøia . +PFX F 0 ètyøia . +PFX F 0 ètyrya . +PFX F 0 pìta . +PFX F 0 ¹esta . +PFX F 0 sedma . +PFX F 0 osma . +PFX F 0 devìta . + +SFX P Y 124 +SFX P 0 a [^aeokl] +SFX P 0 u [^aeoklu] +SFX P 0 ovi [^aeokl] +SFX P 0 e [^aeoklurcgh] +SFX P 0 e [aeiouyáéíóúùýì]r +SFX P r øe [^aeiouyáéíóúùýì]r +SFX P 0 em [^aeokl] +SFX P 0 ù [^aeokl] +SFX P 0 ùm [^aeokl] +SFX P 0 y [^aeokl] +SFX P 0 ech [^aeoklghu] +SFX P g zích g +SFX P h zích [^c]h +SFX P ch ¹ích ch +SFX P 0 ích u +SFX P 0 a [^eì]k +SFX P 0 u [^eì]k +SFX P 0 ovi [^eì]k +SFX P 0 em [^eì]k +SFX P 0 ù [^eì]k +SFX P 0 ùm [^eì]k +SFX P k cích [^eì]k +SFX P 0 y [^eì]k +SFX P ek ka ek +SFX P ek ku ek +SFX P ek kovi ek +SFX P ek kem ek +SFX P ek kù ek +SFX P ek kùm ek +SFX P ek cích ek +SFX P ek ky ek +SFX P 0 a [^dtn]ìk +SFX P 0 u [^dtn]ìk +SFX P 0 ovi [^dtn]ìk +SFX P 0 em [^dtn]ìk +SFX P 0 kù [^dtn]ìk +SFX P 0 kùm [^dtn]ìk +SFX P 0 cích [^dtn]ìk +SFX P 0 ky [^dtn]ìk +SFX P dìk ïka dìk +SFX P dìk ïku dìk +SFX P dìk ïkovi dìk +SFX P dìk ïkem dìk +SFX P dìk ïkù dìk +SFX P dìk ïkùm dìk +SFX P dìk ïcích dìk +SFX P dìk ïky dìk +SFX P nìk òka nìk +SFX P nìk òku nìk +SFX P nìk òkovi nìk +SFX P nìk òkem nìk +SFX P nìk òkù nìk +SFX P nìk òkùm nìk +SFX P nìk òcích nìk +SFX P nìk òky nìk +SFX P tìk »ka tìk +SFX P tìk »ku tìk +SFX P tìk »kovi tìk +SFX P tìk »kem tìk +SFX P tìk »kù tìk +SFX P tìk »kùm tìk +SFX P tìk »cích tìk +SFX P tìk »ky tìk +SFX P 0 a [bdt¹¾iou]el +SFX P 0 u [bdt¹¾iou]el +SFX P 0 ovi [bdt¹¾iou]el +SFX P 0 e [bdt¹¾iou]el +SFX P 0 em [bdt¹¾iou]el +SFX P 0 ù [bdt¹¾iou]el +SFX P 0 ùm [bdt¹¾iou]el +SFX P 0 y [bdt¹¾iou]el +SFX P 0 ech [bdt¹¾iou]el +SFX P el la [^bdt¹¾iou]el +SFX P el lu [^bdt¹¾iou]el +SFX P el lovi [^bdt¹¾iou]el +SFX P el le [^bdt¹¾iou]el +SFX P el li [^bdt¹¾iou]el +SFX P el lem [^bdt¹¾iou]el +SFX P el lù [^bdt¹¾iou]el +SFX P el lùm [^bdt¹¾iou]el +SFX P el ly [^bdt¹¾iou]el +SFX P el lech [^bdt¹¾iou]el +SFX P 0 a [^e]l +SFX P 0 u [^e]l +SFX P 0 ovi [^e]l +SFX P 0 e [^e]l +SFX P 0 em [^e]l +SFX P 0 ù [^e]l +SFX P 0 ùm [^e]l +SFX P 0 y [^e]l +SFX P 0 ech [^e]l +SFX P o a o +SFX P o u o +SFX P o ovi o +SFX P o em o +SFX P o ù o +SFX P o ùm o +SFX P o y o +SFX P o ech [^gk]o +SFX P o ách [gk]o +SFX P a y [^cèïijòø¹»¾]a +SFX P a i [cèijø¹¾]a +SFX P ïa di ïa +SFX P òa ni òa +SFX P »a ti »a +SFX P a ovi a +SFX P a u a +SFX P a o a +SFX P a ou a +SFX P a ù a +SFX P a ùm a +SFX P a ech [^kïò»h]a +SFX P ka cích ka +SFX P ïa dìch ïa +SFX P òa nìch òa +SFX P »a tìch »a +SFX P e a e +SFX P e u e +SFX P e ovi e +SFX P 0 m e +SFX P e ù e +SFX P e ùm e +SFX P e y e +SFX P 0 ch e + +SFX I Y 18 +SFX I ï di ï +SFX I ò ni ò +SFX I » ti » +SFX I h zi [^c]h +SFX I ch ¹i ch +SFX I r øi r +SFX I 0 i [bdfmnptvwcèjøs¹z¾] +SFX I o i o +SFX I el li [^bdt¹¾iou]el +SFX I 0 i [bdt¹¾iou]el +SFX I 0 i [^e]l +SFX I k ci [^eì]k +SFX I ek ci ek +SFX I dìk ïci dìk +SFX I nìk òci nìk +SFX I tìk »ci tìk +SFX I re øi re +SFX I a i a + +SFX V Y 14 +SFX V 0 ové [^aekloò] +SFX V a ové a +SFX V e ové e +SFX V 0 ové [^aeiouyáéíóúýì][^bdaeiouyáéíóúýì]el +SFX V el lové [aeiouyáéíóúýì][^bdaeiouyáéíóúýì]el +SFX V 0 ové [bdaeiouyáéíóúýì]el +SFX V 0 ové [^e]l +SFX V 0 ové [^dtn]ìk +SFX V 0 vé o +SFX V 0 ové [^eì]k +SFX V ek kové ek +SFX V 0 ové leò +SFX V eò òové [^l]eò +SFX V 0 ové [^e]ò + +SFX U Y 61 +SFX U ec ce ec +SFX U ec ci ec +SFX U ec èe ec +SFX U ec cem ec +SFX U ec cù ec +SFX U ec cùm ec +SFX U ec cích ec +SFX U 0 e [^e]c +SFX U 0 i [^e]c +SFX U 0 em [^e]c +SFX U 0 ù [^e]c +SFX U 0 ùm [^e]c +SFX U 0 ích [^e]c +SFX U 0 e [^acïeò»] +SFX U 0 i [^acïeò»i] +SFX U 0 ovi [^acïeò»] +SFX U 0 em [^acïeò»] +SFX U 0 ù [^aceò] +SFX U 0 ùm [^aceò] +SFX U 0 ích [^acïeò»sx] +SFX U 0 ech [sx] +SFX U 0 y x +SFX U a e a +SFX U a ovi a +SFX U a em a +SFX U a ové a +SFX U a ù a +SFX U a ùm a +SFX U a i a +SFX U a ích a +SFX U ï dì ï +SFX U ï di ï +SFX U ï dìm ï +SFX U ï dích ï +SFX U ò nì leò +SFX U ò ni leò +SFX U ò nìm leò +SFX U 0 ù leò +SFX U 0 ùm leò +SFX U ò ních leò +SFX U eò nì [^l]eò +SFX U eò ni [^l]eò +SFX U eò nìm [^l]eò +SFX U eò òù [^l]eò +SFX U eò òùm [^l]eò +SFX U eò ních [^l]eò +SFX U ò nì [^e]ò +SFX U ò ni [^e]ò +SFX U ò nìm [^e]ò +SFX U 0 ù [^e]ò +SFX U 0 ùm [^e]ò +SFX U ò ních [^e]ò +SFX U » tì » +SFX U » ti » +SFX U » tìm » +SFX U » tích » +SFX U e i e +SFX U 0 m e +SFX U e ù e +SFX U e ùm e +SFX U e ích e + +SFX D Y 68 +SFX D es a es +SFX D es u es +SFX D es ovi es +SFX D es e [^ghk]es +SFX D es em es +SFX D es ové es +SFX D es ù es

1 0

gajim: revert unwanted change
by Yann Leboulanger 18 Dec '11

18 Dec '11

changeset d09221875ba8 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=d09221875ba8 description: revert unwanted change diffstat: src/gajim.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 9903fad02c40 -r d09221875ba8 src/gajim.py --- a/src/gajim.py Sun Dec 18 15:06:02 2011 +0100 +++ b/src/gajim.py Sun Dec 18 23:21:51 2011 +0100 @@ -63,7 +63,7 @@ os.environ['PATH'] = ';'.join(new_list) from common import demandimport -#demandimport.enable() +demandimport.enable() demandimport.ignore += ['gobject._gobject', 'libasyncns', 'i18n', 'logging.NullHandler', 'dbus.glib', 'dbus.service', 'command_system.implementation.standard',

1 0

gajim: implements Oauth2 mechanism to connect to MSN xmpp server...
by Yann Leboulanger 18 Dec '11

18 Dec '11

changeset 64b195b0f374 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=64b195b0f374 description: implements Oauth2 mechanism to connect to MSN xmpp server. Fixes #6978 diffstat: src/common/config.py | 3 +++ src/common/connection.py | 27 +++++++++++++++++++++++++++ src/common/connection_handlers_events.py | 4 ++++ src/common/xmpp/auth_nb.py | 10 ++++++++++ src/dialogs.py | 1 + src/gajim.py | 2 +- src/gui_interface.py | 25 +++++++++++++++++++++++++ 7 files changed, 71 insertions(+), 1 deletions(-) diffs (163 lines): diff -r f3b7ceae7d1b -r 64b195b0f374 src/common/config.py --- a/src/common/config.py Sun Dec 18 22:02:31 2011 +0400 +++ b/src/common/config.py Sun Dec 18 23:20:30 2011 +0100 @@ -384,6 +384,9 @@ 'last_archiving_time': [opt_str, '1970-01-01T00:00:00Z', _('Last time we syncronized with logs from server.')], 'enable_message_carbons': [ opt_bool, False, _('If enabled and if server supports this feature, Gajim will receive messages sent and received by other resources.')], 'ft_send_local_ips': [ opt_bool, True, _('If enabled, Gajim will send your local IPs so your contact can connect to your machine to transfer files.')], + 'oauth2_refresh_token': [ opt_str, '', _('Latest token for Oauth2 authentication.')], + 'oauth2_client_id': [ opt_str, '0000000044077801', _('client_id for Oauth2 authentication.')], + 'oauth2_redirect_url': [ opt_str, 'http%3A%2F%2Fgajim.org%2Fmsnauth%2Findex.cgi', _('redirect_url for Oauth2 authentication.')], }, {}), 'statusmsg': ({ 'message': [ opt_str, '' ], diff -r f3b7ceae7d1b -r 64b195b0f374 src/common/connection.py --- a/src/common/connection.py Sun Dec 18 22:02:31 2011 +0400 +++ b/src/common/connection.py Sun Dec 18 23:20:30 2011 +0100 @@ -40,6 +40,7 @@ import time import locale import hmac +import json try: randomsource = random.SystemRandom() @@ -2492,6 +2493,32 @@ def get_password(self, callback, type_): self.pasword_callback = (callback, type_) + if type_ == 'X-MESSENGER-OAUTH2': + client_id = gajim.config.get_per('accounts', self.name, + 'oauth2_client_id') + refresh_token = gajim.config.get_per('accounts', self.name, + 'oauth2_refresh_token') + if refresh_token: + renew_URL = 'https://oauth.live.com/token?client_id=' \ + '%(client_id)s&redirect_uri=https%%3A%%2F%%2Foauth.live.' \ + 'com%%2Fdesktop&grant_type=refresh_token&refresh_token=' \ + '%(refresh_token)s' % locals() + result = helpers.download_image(self.name, {'src': renew_URL})[0] + if result: + dict_ = json.loads(result) + if 'access_token' in dict_: + self.set_password(dict_['access_token']) + return + script_url = gajim.config.get_per('accounts', self.name, + 'oauth2_redirect_url') + token_URL = 'https://oauth.live.com/authorize?client_id=' \ + '%(client_id)s&scope=wl.messenger%%20wl.offline_access&' \ + 'response_type=code&redirect_uri=%(script_url)s' % locals() + helpers.launch_browser_mailer('url', token_URL) + self.disconnect(on_purpose=True) + gajim.nec.push_incoming_event(Oauth2CredentialsRequiredEvent(None, + conn=self)) + return if self.password: self.set_password(self.password) return diff -r f3b7ceae7d1b -r 64b195b0f374 src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Sun Dec 18 22:02:31 2011 +0400 +++ b/src/common/connection_handlers_events.py Sun Dec 18 23:20:30 2011 +0100 @@ -1783,6 +1783,10 @@ name = 'password-required' base_network_events = [] +class Oauth2CredentialsRequiredEvent(nec.NetworkIncomingEvent): + name = 'oauth2-credentials-required' + base_network_events = [] + class FailedDecryptEvent(nec.NetworkIncomingEvent): name = 'failed-decrypt' base_network_events = [] diff -r f3b7ceae7d1b -r 64b195b0f374 src/common/xmpp/auth_nb.py --- a/src/common/xmpp/auth_nb.py Sun Dec 18 22:02:31 2011 +0400 +++ b/src/common/xmpp/auth_nb.py Sun Dec 18 23:20:30 2011 +0100 @@ -264,6 +264,12 @@ self._owner._caller.get_password(self.set_password, self.mechanism) self.startsasl = SASL_IN_PROCESS raise NodeProcessed + if 'X-MESSENGER-OAUTH2' in self.mecs: + self.mecs.remove('X-MESSENGER-OAUTH2') + self.mechanism = 'X-MESSENGER-OAUTH2' + self._owner._caller.get_password(self.set_password, self.mechanism) + self.startsasl = SASL_IN_PROCESS + raise NodeProcessed self.startsasl = SASL_FAILURE log.info('I can only use EXTERNAL, SCRAM-SHA-1, DIGEST-MD5, GSSAPI and ' 'PLAIN mecanisms.') @@ -497,6 +503,10 @@ '\n', '') node = Node('auth', attrs={'xmlns': NS_SASL, 'mechanism': 'PLAIN'}, payload=[sasl_data]) + elif self.mechanism == 'X-MESSENGER-OAUTH2': + node = Node('auth', attrs={'xmlns': NS_SASL, + 'mechanism': 'X-MESSENGER-OAUTH2'}) + node.addData(password) self._owner.send(str(node)) diff -r f3b7ceae7d1b -r 64b195b0f374 src/dialogs.py --- a/src/dialogs.py Sun Dec 18 22:02:31 2011 +0400 +++ b/src/dialogs.py Sun Dec 18 23:20:30 2011 +0100 @@ -2165,6 +2165,7 @@ def on_okbutton_clicked(self, widget): user_input1 = self.input_entry1.get_text().decode('utf-8') user_input2 = self.input_entry2.get_text().decode('utf-8') + self.cancel_handler = None self.dialog.destroy() if not self.ok_handler: return diff -r f3b7ceae7d1b -r 64b195b0f374 src/gajim.py --- a/src/gajim.py Sun Dec 18 22:02:31 2011 +0400 +++ b/src/gajim.py Sun Dec 18 23:20:30 2011 +0100 @@ -63,7 +63,7 @@ os.environ['PATH'] = ';'.join(new_list) from common import demandimport -#demandimport.enable() +demandimport.enable() demandimport.ignore += ['gobject._gobject', 'libasyncns', 'i18n', 'logging.NullHandler', 'dbus.glib', 'dbus.service', 'command_system.implementation.standard', diff -r f3b7ceae7d1b -r 64b195b0f374 src/gui_interface.py --- a/src/gui_interface.py Sun Dec 18 22:02:31 2011 +0400 +++ b/src/gui_interface.py Sun Dec 18 23:20:30 2011 +0100 @@ -701,6 +701,30 @@ _('Password Required'), text, _('Save password'), ok_handler=on_ok, cancel_handler=on_cancel) + def handle_oauth2_credentials(self, obj): + account = obj.conn.name + def on_ok(refresh): + gajim.config.set_per('accounts', account, 'oauth2_refresh_token', + refresh) + st = gajim.config.get_per('accounts', account, 'last_status') + msg = helpers.from_one_line(gajim.config.get_per('accounts', + account, 'last_status_msg')) + gajim.interface.roster.send_status(account, st, msg) + del self.pass_dialog[account] + + def on_cancel(): + gajim.config.set_per('accounts', account, 'oauth2_refresh_token', + '') + self.roster.set_state(account, 'offline') + self.roster.update_status_combobox() + del self.pass_dialog[account] + + instruction = _('Please copy / paste the refresh token from the website' + ' that has just been opened.') + self.pass_dialog[account] = dialogs.InputTextDialog( + _('Oauth2 Credentials'), instruction, is_modal=False, + ok_handler=on_ok, cancel_handler=on_cancel) + def handle_event_roster_info(self, obj): #('ROSTER_INFO', account, (jid, name, sub, ask, groups)) account = obj.conn.name @@ -1412,6 +1436,7 @@ 'metacontacts-received': [self.handle_event_metacontacts], 'muc-admin-received': [self.handle_event_gc_affiliation], 'muc-owner-received': [self.handle_event_gc_config], + 'oauth2-credentials-required': [self.handle_oauth2_credentials], 'our-show': [self.handle_event_status], 'password-required': [self.handle_event_password_required], 'plain-connection': [self.handle_event_plain_connection],

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 December 2011