Commits

commits@gajim.org

17632 discussions

gajim-plugins: Try update Plugin Installer manifest file in ftp(...
by Gajim Plugins 28 Aug '13

28 Aug '13

changeset 9bb38e6a99e9 in /home/hg/repos/gajim-plugins buthor: Denis Fomin <fominde(a)gmail.com> ranches: gajim_0.15 details:gajim-plugins?cmd=changeset;node=9bb38e6a99e9 description: Try update Plugin Installer manifest file in ftp(version 0.11.7 at moment) diffstat: plugin_installer/manifest.ini | 2 +- 1 файлов изменено, 1 вставок(+), 1 удалений(-) различия (12 строк): diff -r 9f858eb63313 -r 9bb38e6a99e9 plugin_installer/manifest.ini --- a/plugin_installer/manifest.ini Wed Aug 28 12:12:52 2013 +0400 +++ b/plugin_installer/manifest.ini Wed Aug 28 12:18:53 2013 +0400 @@ -3,7 +3,7 @@ short_name: plugin_installer version: 0.11.6 description: Install and upgrade plugins from ftp -authors: Denis Fomin <fominde(a)gmail.com> +authors: Denis Fomin <fominde(a)gmail.com> Yann Leboulanger <asterix(a)lagaule.org> homepage: http://trac-plugins.gajim.org/wiki/PluginInstallerPlugin max_gajim_version: 0.15.9

1 0

gajim-plugins: Split long line
by Gajim Plugins 28 Aug '13

28 Aug '13

changeset 9f858eb63313 in /home/hg/repos/gajim-plugins buthor: Denis Fomin <fominde(a)gmail.com> ranches: gajim_0.15 details:gajim-plugins?cmd=changeset;node=9f858eb63313 description: Split long line diffstat: plugin_installer/plugin_installer.py | 3 ++- 1 файлов изменено, 2 вставок(+), 1 удалений(-) различия (13 строк): diff -r b5419ea8913d -r 9f858eb63313 plugin_installer/plugin_installer.py --- a/plugin_installer/plugin_installer.py Sun Aug 25 17:00:04 2013 +0200 +++ b/plugin_installer/plugin_installer.py Wed Aug 28 12:12:52 2013 +0400 @@ -506,7 +506,8 @@ if not self.remote_dirs: gobject.idle_add(self.progressbar.set_text, _('Scan files on the server')) - self.ftp.retrbinary('RETR manifests_images.zip', self.handleDownload) + self.ftp.retrbinary('RETR manifests_images.zip', + self.handleDownload) zip_file = zipfile.ZipFile(self.buffer_) manifest_list = zip_file.namelist() progress_step = 1.0 / len(manifest_list)

1 0

gajim: Set gajim version to 0.16-alpha2
by Gajim 28 Aug '13

28 Aug '13

changeset cbe40841ba1e in /home/hg/repos/gajim author: Denis Fomin <fominde(a)gmail.com> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=cbe40841ba1e description: Set gajim version to 0.16-alpha2 diffstat: autogen.sh | 2 +- 1 файлов изменено, 1 вставок(+), 1 удалений(-) различия (10 строк): diff -r 0ec1f7cd1b26 -r cbe40841ba1e autogen.sh --- a/autogen.sh Wed Aug 28 11:31:17 2013 +0400 +++ b/autogen.sh Wed Aug 28 11:55:21 2013 +0400 @@ -1,5 +1,5 @@ #!/usr/bin/env bash - gajimversion="0.15.4" + gajimversion="0.16-alpha2" if [ -d ".hg" ]; then node=$(hg tip --template "{node}") hgversion="-${node:0:12}"

1 0

gajim: Rename acronyms file
by Gajim 28 Aug '13

28 Aug '13

changeset 0ec1f7cd1b26 in /home/hg/repos/gajim author: Denis Fomin <fominde(a)gmail.com> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=0ec1f7cd1b26 description: Rename acronyms file diffstat: plugins/acronyms_expander/acronyms | 69 -------------------------- plugins/acronyms_expander/acronyms.py | 69 ++++++++++++++++++++++++++ plugins/acronyms_expander/acronyms_expander.py | 2 +- 3 файлов изменено, 70 вставок(+), 70 удалений(-) различия (158 строк): diff -r aa9047fb19be -r 0ec1f7cd1b26 plugins/acronyms_expander/acronyms --- a/plugins/acronyms_expander/acronyms Wed Aug 28 10:06:57 2013 +0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,69 +0,0 @@ -{"afaik": "as far as I know", -"afaict": "as far as I can tell", -"afk": "away from keyboard", -"atm": "at the moment", -"bbiab": "be back in a bit", -"bbiaf": "be back in a few (minutes)", -"bbl": "be back later", -"bbs": "be back soon", -"b/c": "because", -"bf": "boyfriend", -"bfo": "blinding flash of the obvious", -"brb": "be right back", -"bsod": "blue screen of death", -"btw": "by the way", -"ciao": "Italian for goodbye", -"ctrn": "can't talk right now", -"cul8r": "see you later", -"cya": "see ya", -"dhtb": "don't have the bandwidth", -"f2f": "face to face", -"fubar": "fucked up beyond all recognition", -"fwiw": "for what it's worth", -"fyi": "for your information", -"gmta": "great minds think alike", -"iam": "in a meeting", -"ianal": "I am not a lawyer", -"ihmb": "I hate my boss", -"iirc": "if I recall correctly", -"imho": "in my humble opinion", -"imo": "in my opinion", -"iow": "in other words", -"irl": "in real life", -"<g>": "grin", -"*g*": "grin", -"gf": "girlfriend", -"gmta": "great minds think alike", -"g2g": "got to go", -"jid": "jabber identifier", -"j/k": "just kidding", -"ok": "okay", -"lol": "laugh out loud", -"l8r": "later", -"msg": "message", -"n/m": "never mind", -"n/p": "no problem", -"oAo": "over and out!", -"omg": "oh my god", -"oob": "out of band", -"otoh": "on the other hand", -"oww": "oops, wrong window!", -"otp": "on the phone", -"pita": "pain in the ass", -"pov": "point of view", -"pw": "password", -"rotfl": "rolling on the floor laughing", -"rsn": "real soon now", -"rtfm": "read the friendly manual", -"slap": "sounds like a plan", -"thx": "thanks", -"tia": "thanks in advance", -"tla": "three-letter arconym", -"ttfn": "ta ta for now", -"ttyl": "talk to you later", -"wb": "welcome back", -"wfm": "works for me", -"wtf": "what the fuck?!", -"wtg": "way to go!", -"xfer": "transfer", -"ymmv": "your mileage may vary",} diff -r aa9047fb19be -r 0ec1f7cd1b26 plugins/acronyms_expander/acronyms.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/plugins/acronyms_expander/acronyms.py Wed Aug 28 11:31:17 2013 +0400 @@ -0,0 +1,69 @@ +{"afaik": "as far as I know", +"afaict": "as far as I can tell", +"afk": "away from keyboard", +"atm": "at the moment", +"bbiab": "be back in a bit", +"bbiaf": "be back in a few (minutes)", +"bbl": "be back later", +"bbs": "be back soon", +"b/c": "because", +"bf": "boyfriend", +"bfo": "blinding flash of the obvious", +"brb": "be right back", +"bsod": "blue screen of death", +"btw": "by the way", +"ciao": "Italian for goodbye", +"ctrn": "can't talk right now", +"cul8r": "see you later", +"cya": "see ya", +"dhtb": "don't have the bandwidth", +"f2f": "face to face", +"fubar": "fucked up beyond all recognition", +"fwiw": "for what it's worth", +"fyi": "for your information", +"gmta": "great minds think alike", +"iam": "in a meeting", +"ianal": "I am not a lawyer", +"ihmb": "I hate my boss", +"iirc": "if I recall correctly", +"imho": "in my humble opinion", +"imo": "in my opinion", +"iow": "in other words", +"irl": "in real life", +"<g>": "grin", +"*g*": "grin", +"gf": "girlfriend", +"gmta": "great minds think alike", +"g2g": "got to go", +"jid": "jabber identifier", +"j/k": "just kidding", +"ok": "okay", +"lol": "laugh out loud", +"l8r": "later", +"msg": "message", +"n/m": "never mind", +"n/p": "no problem", +"oAo": "over and out!", +"omg": "oh my god", +"oob": "out of band", +"otoh": "on the other hand", +"oww": "oops, wrong window!", +"otp": "on the phone", +"pita": "pain in the ass", +"pov": "point of view", +"pw": "password", +"rotfl": "rolling on the floor laughing", +"rsn": "real soon now", +"rtfm": "read the friendly manual", +"slap": "sounds like a plan", +"thx": "thanks", +"tia": "thanks in advance", +"tla": "three-letter arconym", +"ttfn": "ta ta for now", +"ttyl": "talk to you later", +"wb": "welcome back", +"wfm": "works for me", +"wtf": "what the fuck?!", +"wtg": "way to go!", +"xfer": "transfer", +"ymmv": "your mileage may vary",} diff -r aa9047fb19be -r 0ec1f7cd1b26 plugins/acronyms_expander/acronyms_expander.py --- a/plugins/acronyms_expander/acronyms_expander.py Wed Aug 28 10:06:57 2013 +0400 +++ b/plugins/acronyms_expander/acronyms_expander.py Wed Aug 28 11:31:17 2013 +0400 @@ -62,7 +62,7 @@ @log_calls('AcronymsExpanderPlugin') def get_own_acronyms_list(self): - data_file = self.local_file_path('acronyms') + data_file = self.local_file_path('acronyms.py') data = open(data_file, 'r') acronyms = eval(data.read()) data.close()

1 0

gajim: Fix merged accounts.See [574655470339]
by Gajim 28 Aug '13

28 Aug '13

changeset aa9047fb19be in /home/hg/repos/gajim author: Denis Fomin <fominde(a)gmail.com> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=aa9047fb19be description: Fix merged accounts.See [574655470339] diffstat: src/roster_window.py | 4 +--- 1 файлов изменено, 1 вставок(+), 3 удалений(-) различия (17 строк): diff -r 61620d0da17a -r aa9047fb19be src/roster_window.py --- a/src/roster_window.py Tue Aug 27 23:35:11 2013 +0400 +++ b/src/roster_window.py Wed Aug 28 10:06:57 2013 +0400 @@ -1456,12 +1456,10 @@ for acct in gajim.contacts.get_accounts(): self._iters[acct] = {'account': None, 'groups': {}, 'contacts': {}} - self._before_fill() for acct in gajim.contacts.get_accounts(): self.add_account(acct) - self.add_account_contacts(acct, improve_speed=False, + self.add_account_contacts(acct, improve_speed=True, draw_contacts=False) - self._after_fill() # Recalculate column width for ellipsizing self.tree.columns_autosize()

1 0

gajim: Add account name to SSL Certificate Verification dialog t...
by Gajim 27 Aug '13

27 Aug '13

changeset 61620d0da17a in /home/hg/repos/gajim author: Denis Fomin <fominde(a)gmail.com> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=61620d0da17a description: Add account name to SSL Certificate Verification dialog title diffstat: src/gui_interface.py | 2 +- 1 файлов изменено, 1 вставок(+), 1 удалений(-) различия (12 строк): diff -r f46b67dbc11e -r 61620d0da17a src/gui_interface.py --- a/src/gui_interface.py Tue Aug 27 23:21:16 2013 +0400 +++ b/src/gui_interface.py Tue Aug 27 23:35:11 2013 +0400 @@ -1352,7 +1352,7 @@ sectext, checktext1, checktext2, on_response_ok=on_ok, on_response_cancel=on_cancel) self.instances[account]['online_dialog']['ssl_error'].set_title( - _('SSL Certificate Verification')) + _('SSL Certificate Verification for %s') % account) def handle_event_fingerprint_error(self, obj): # ('FINGERPRINT_ERROR', account, (new_fingerprint,))

1 0

gajim: [Darlan] Set title for ssl error dialogs
by Gajim 27 Aug '13

27 Aug '13

changeset f46b67dbc11e in /home/hg/repos/gajim author: Denis Fomin <fominde(a)gmail.com> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=f46b67dbc11e description: [Darlan] Set title for ssl error dialogs diffstat: src/dialogs.py | 1 + src/gui_interface.py | 2 ++ 2 файлов изменено, 3 вставок(+), 0 удалений(-) различия (20 строк): diff -r 5912786d1485 -r f46b67dbc11e src/dialogs.py --- a/src/dialogs.py Tue Aug 27 20:22:20 2013 +0400 +++ b/src/dialogs.py Tue Aug 27 23:21:16 2013 +0400 @@ -5433,3 +5433,4 @@ def on_cert_clicked(self, button): d = CertificatDialog(self, self.account, self.cert) + d.set_title(_('Certificate')) diff -r 5912786d1485 -r f46b67dbc11e src/gui_interface.py --- a/src/gui_interface.py Tue Aug 27 20:22:20 2013 +0400 +++ b/src/gui_interface.py Tue Aug 27 23:21:16 2013 +0400 @@ -1351,6 +1351,8 @@ dialogs.SSLErrorDialog(obj.conn.name, obj.certificate, pritext, sectext, checktext1, checktext2, on_response_ok=on_ok, on_response_cancel=on_cancel) + self.instances[account]['online_dialog']['ssl_error'].set_title( + _('SSL Certificate Verification')) def handle_event_fingerprint_error(self, obj): # ('FINGERPRINT_ERROR', account, (new_fingerprint,))

1 0

gajim-website: fix he translation
by Gajim Website 27 Aug '13

27 Aug '13

changeset 7134a8f6539a in /home/hg/repos/gajim-website author: Yann Leboulanger <asterix(a)lagaule.org> details:http://hg.gajim.org/gajim-website?cmd=changeset;node=7134a8f6539a description: fix he translation diffstat: locale/he_IL/LC_MESSAGES/msg.po | 2 +- msg.pot | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diffs (24 lines): diff -r 42732cd95eaf -r 7134a8f6539a locale/he_IL/LC_MESSAGES/msg.po --- a/locale/he_IL/LC_MESSAGES/msg.po Mon Aug 26 18:02:11 2013 +0200 +++ b/locale/he_IL/LC_MESSAGES/msg.po Tue Aug 27 20:04:58 2013 +0200 @@ -647,7 +647,7 @@ # קישוריות מסרים מקומית #: index.php:38 msgid "Link local (bonjour / zeroconf), BOSH" -msgstr "קישורית מקומית (bonjour / zeroconf), $rlm;BOSH" +msgstr "קישורית מקומית (bonjour / zeroconf), &rlm;BOSH" #: index.php:39 msgid "Other features via plugins" diff -r 42732cd95eaf -r 7134a8f6539a msg.pot --- a/msg.pot Mon Aug 26 18:02:11 2013 +0200 +++ b/msg.pot Tue Aug 27 20:04:58 2013 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-08-26 16:08+0200\n" +"POT-Creation-Date: 2013-08-26 18:01+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n"

1 0

gajim: [Darlan] Update Hebrew translation
by Gajim 27 Aug '13

27 Aug '13

changeset 5912786d1485 in /home/hg/repos/gajim author: Denis Fomin <fominde(a)gmail.com> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=5912786d1485 description: [Darlan] Update Hebrew translation diffstat: po/he.po | 8 ++++---- 1 файлов изменено, 4 вставок(+), 4 удалений(-) различия (39 строк): diff -r 11e7eac368a0 -r 5912786d1485 po/he.po --- a/po/he.po Tue Aug 27 17:24:41 2013 +0200 +++ b/po/he.po Tue Aug 27 20:22:20 2013 +0400 @@ -9,7 +9,7 @@ "Project-Id-Version: gajim 0.15\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-08-27 10:18+0300\n" -"PO-Revision-Date: 2013-08-27 10:25+0200\n" +"PO-Revision-Date: 2013-08-27 19:26+0200\n" "Last-Translator: Isratine Citizen <genghiskhan(a)gmx.ca>\n" "Language-Team: Rahut\n" "Language: he\n" @@ -3246,7 +3246,7 @@ #: ../src/chat_control.py:2283 msgid "is NOT" -msgstr "*אינה*" +msgstr "אינה" #. chat session %s be logged #: ../src/chat_control.py:2285 @@ -3255,7 +3255,7 @@ #: ../src/chat_control.py:2285 msgid "will NOT" -msgstr "*לא* יירשם" +msgstr "לא יירשם" #. About encrypted chat session #: ../src/chat_control.py:2289 @@ -3265,7 +3265,7 @@ #. About encrypted chat session #: ../src/chat_control.py:2293 msgid "and NOT authenticated" -msgstr "ו*אינה* מאומתת" +msgstr "ואינה מאומתת" #. status will become 'is' or 'is not', authentificaed will become #. 'and authentificated' or 'and not authentificated', logged will become

1 0

gajim: don't create a new session when we get an error message i...
by Gajim 27 Aug '13

27 Aug '13

changeset 11e7eac368a0 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=11e7eac368a0 description: don't create a new session when we get an error message in a pm. Fixes #7435 diffstat: src/common/connection_handlers.py | 11 +++++++++++ src/common/connection_handlers_events.py | 13 +++++++++++-- 2 files changed, 22 insertions(+), 2 deletions(-) diffs (44 lines): diff -r 4ff65caaa912 -r 11e7eac368a0 src/common/connection_handlers.py --- a/src/common/connection_handlers.py Tue Aug 27 15:49:08 2013 +0400 +++ b/src/common/connection_handlers.py Tue Aug 27 17:24:41 2013 +0200 @@ -1367,6 +1367,17 @@ else: return None + def get_latest_session(self, jid): + """ + Get the session that we last sent a message to + """ + if jid not in self.sessions: + return None + sessions = self.sessions[jid].values() + if not sessions: + return None + return sorted(sessions, key=operator.attrgetter('last_send'))[-1] + def find_controlless_session(self, jid, resource=None): """ Find an active session that doesn't have a control attached diff -r 4ff65caaa912 -r 11e7eac368a0 src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Tue Aug 27 15:49:08 2013 +0400 +++ b/src/common/connection_handlers_events.py Tue Aug 27 17:24:41 2013 +0200 @@ -1109,8 +1109,17 @@ self.session = None if self.mtype != 'groupchat': - self.session = self.conn.get_or_create_session(self.fjid, - self.thread_id) + if gajim.interface.is_pm_contact(self.fjid, account) and \ + self.mtype == 'error': + self.session = self.conn.find_session(self.fjid, self.thread_id) + if not self.session: + self.session = self.conn.get_latest_session(self.fjid) + if not self.session: + self.session = self.conn.make_new_session(self.fjid, + self.thread_id, type_='pm') + else: + self.session = self.conn.get_or_create_session(self.fjid, + self.thread_id) if self.thread_id and not self.session.received_thread_id: self.session.received_thread_id = True

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits