Commits August 2013

commits@gajim.org

3 participants
325 discussions

gajim: handle config-path instead of config_path
by Gajim 28 Aug '13

28 Aug '13

changeset 1438eb99ea71 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=1438eb99ea71 description: handle config-path instead of config_path diffstat: src/gajim.py | 2 +- src/history_manager.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diffs (24 lines): diff -r 4add55fe304e -r 1438eb99ea71 src/gajim.py --- a/src/gajim.py Sun Aug 25 15:23:22 2013 +0200 +++ b/src/gajim.py Sun Aug 25 16:14:38 2013 +0200 @@ -127,7 +127,7 @@ try: shortargs = 'hqvl:p:c:' # add gtk/gnome session option as gtk_get_option_group is not wrapped - longargs = 'help quiet verbose loglevel= profile= config_path=' + longargs = 'help quiet verbose loglevel= profile= config-path=' longargs += ' class= name= screen= gtk-module= sync g-fatal-warnings' longargs += ' sm-client-id= sm-client-state-file= sm-disable' opts = getopt.getopt(sys.argv[1:], shortargs, longargs.split())[0] diff -r 4add55fe304e -r 1438eb99ea71 src/history_manager.py --- a/src/history_manager.py Sun Aug 25 15:23:22 2013 +0200 +++ b/src/history_manager.py Sun Aug 25 16:14:38 2013 +0200 @@ -63,7 +63,7 @@ try: shortargs = 'hc:' - longargs = 'help config_path=' + longargs = 'help config-path=' opts = getopt.getopt(sys.argv[1:], shortargs, longargs.split())[0] except getopt.error as msg: print(str(msg))

1 0

gajim: get gtkexcepthook back (Thanks demandimport once again ...)
by Gajim 28 Aug '13

28 Aug '13

changeset ec40a5748adc in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=ec40a5748adc description: get gtkexcepthook back (Thanks demandimport once again ...) diffstat: src/gajim.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diffs (13 lines): diff -r 1438eb99ea71 -r ec40a5748adc src/gajim.py --- a/src/gajim.py Sun Aug 25 16:14:38 2013 +0200 +++ b/src/gajim.py Sun Aug 25 18:57:27 2013 +0200 @@ -73,7 +73,8 @@ #demandimport.ignore += ['GObject._gobject', 'libasyncns', 'i18n', # 'logging.NullHandler', 'dbus.service', 'OpenSSL.SSL', 'OpenSSL.crypto', # 'common.sleepy', 'DLFCN', 'dl', 'xml.sax', 'xml.sax.handler', 'ic', -# 'Crypto.PublicKey', 'IPython', 'contextlib', 'imp', 'monotonic'] +# 'Crypto.PublicKey', 'IPython', 'contextlib', 'imp', 'monotonic', +# 'gtkexcepthook'] if os.name == 'nt': import locale

1 0

gajim: hide useless scrollbar. Fixes #7239
by Gajim 28 Aug '13

28 Aug '13

changeset e174af8f7c2d in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=e174af8f7c2d description: hide useless scrollbar. Fixes #7239 diffstat: data/gui/preferences_window.ui | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diffs (38 lines): diff -r ec40a5748adc -r e174af8f7c2d data/gui/preferences_window.ui --- a/data/gui/preferences_window.ui Sun Aug 25 18:57:27 2013 +0200 +++ b/data/gui/preferences_window.ui Sun Aug 25 19:03:15 2013 +0200 @@ -1432,6 +1432,8 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="tooltip_text" translatable="yes">If enabled, Gajim will not ask for a status message. The specified default message will be used instead.</property> + <property name="hscrollbar_policy">automatic</property> + <property name="vscrollbar_policy">automatic</property> <property name="shadow_type">in</property> <child> <object class="GtkTreeView" id="default_msg_treeview"> @@ -2288,12 +2290,6 @@ </packing> </child> <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> <object class="GtkHBox" id="hbox2"> <property name="visible">True</property> <child> @@ -2338,6 +2334,12 @@ <property name="y_options"/> </packing> </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> </object> </child> </object>

1 0

gajim: [Darlan] Expand --help. Fixes #7439
by Gajim 28 Aug '13

28 Aug '13

changeset a80b394b5d1e in /home/hg/repos/gajim author: Denis Fomin <fominde(a)gmail.com> branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=a80b394b5d1e description: [Darlan] Expand --help. Fixes #7439 diffstat: src/gajim.py | 18 +++++++++++++++--- 1 files changed, 15 insertions(+), 3 deletions(-) diffs (28 lines): diff -r e174af8f7c2d -r a80b394b5d1e src/gajim.py --- a/src/gajim.py Sun Aug 25 19:03:15 2013 +0200 +++ b/src/gajim.py Mon Aug 26 00:40:05 2013 +0400 @@ -138,9 +138,21 @@ sys.exit(2) for o, a in opts: if o in ('-h', '--help'): - print('gajim [--help] [--quiet] [--verbose] ' + \ - '[--loglevel subsystem=level[,subsystem=level[...]]] ' + \ - '[--profile name] [--config-path]') + print('Usage: ' + \ + '\n gajim [options] filename\n' + \ + '\nOptions:' + \ + '\n -h, --help ' + \ + _('Show this help message and exit') + \ + '\n -q, --quiet ' + _\ + ('Show only critical errors') + \ + '\n -v, --verbose ' + \ + _('Print xml stanzas and other debug information') + \ + '\n -p, --profile ' + \ + _('Use config.name in configuration directory') + \ + '\n -c, --config-path ' + \ + _('Set configuration directory') + \ + '\n -l, --loglevel ' + \ + _('Configure logging system')) sys.exit() elif o in ('-q', '--quiet'): logging_helpers.set_quiet()

1 0

gajim: All strings translatable in -help
by Gajim 28 Aug '13

28 Aug '13

changeset 9567dc337b9e in /home/hg/repos/gajim author: Denis Fomin <fominde(a)gmail.com> branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=9567dc337b9e description: All strings translatable in -help diffstat: src/gajim.py | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diffs (22 lines): diff -r a80b394b5d1e -r 9567dc337b9e src/gajim.py --- a/src/gajim.py Mon Aug 26 00:40:05 2013 +0400 +++ b/src/gajim.py Mon Aug 26 00:59:46 2013 +0400 @@ -138,13 +138,13 @@ sys.exit(2) for o, a in opts: if o in ('-h', '--help'): - print('Usage: ' + \ - '\n gajim [options] filename\n' + \ - '\nOptions:' + \ + print(_('Usage:') + \ + '\n gajim [options] filename\n\n' + \ + _('Options:') + \ '\n -h, --help ' + \ _('Show this help message and exit') + \ - '\n -q, --quiet ' + _\ - ('Show only critical errors') + \ + '\n -q, --quiet ' + \ + _('Show only critical errors') + \ '\n -v, --verbose ' + \ _('Print xml stanzas and other debug information') + \ '\n -p, --profile ' + \

1 0

gajim: [Darlan]Fix gajim-history-manager -help and gajim-remote ...
by Gajim 28 Aug '13

28 Aug '13

changeset 8c3594b5c940 in /home/hg/repos/gajim author: Denis Fomin <fominde(a)gmail.com> branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=8c3594b5c940 description: [Darlan]Fix gajim-history-manager -help and gajim-remote -help. See #7439 diffstat: src/gajim-remote.py | 3 ++- src/history_manager.py | 7 ++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diffs (30 lines): diff -r 9567dc337b9e -r 8c3594b5c940 src/gajim-remote.py --- a/src/gajim-remote.py Mon Aug 26 00:59:46 2013 +0400 +++ b/src/gajim-remote.py Mon Aug 26 09:16:51 2013 +0400 @@ -439,7 +439,8 @@ """ Print usage, and list available commands """ - s = _('Usage: %s command [arguments]\nCommand is one of:\n' ) % BASENAME + s = _('Usage:\n %s command [arguments]\n\nCommand is one of:\n' ) % ( + BASENAME) for command in sorted(self.commands): s += ' ' + command for arg in self.commands[command][1]: diff -r 9567dc337b9e -r 8c3594b5c940 src/history_manager.py --- a/src/history_manager.py Mon Aug 26 00:59:46 2013 +0400 +++ b/src/history_manager.py Mon Aug 26 09:16:51 2013 +0400 @@ -71,7 +71,12 @@ sys.exit(2) for o, a in opts: if o in ('-h', '--help'): - print('history_manager [--help] [--config-path]') + print(_('Usage:') + \ + '\n gajim-history-manager [options] filename\n\n' + \ + _('Options:') + \ + '\n -h, --help ' + \ + _('Show this help message and exit') + \ + '\n -c, --config-path ' + _('Set logs directory')) sys.exit() elif o in ('-c', '--config-path'): config_path = a

1 0

gajim: [Darlan]Fix gajim-remote -help.
by Gajim 28 Aug '13

28 Aug '13

changeset 4ea1a03124d4 in /home/hg/repos/gajim author: Denis Fomin <fominde(a)gmail.com> branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=4ea1a03124d4 description: [Darlan]Fix gajim-remote -help. diffstat: src/gajim.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 8c3594b5c940 -r 4ea1a03124d4 src/gajim.py --- a/src/gajim.py Mon Aug 26 09:16:51 2013 +0400 +++ b/src/gajim.py Mon Aug 26 09:32:16 2013 +0400 @@ -148,7 +148,7 @@ '\n -v, --verbose ' + \ _('Print xml stanzas and other debug information') + \ '\n -p, --profile ' + \ - _('Use config.name in configuration directory') + \ + _('Use defined profile in configuration directory') + \ '\n -c, --config-path ' + \ _('Set configuration directory') + \ '\n -l, --loglevel ' + \

1 0

gajim: fix traceback with new fileprops.
by Gajim 28 Aug '13

28 Aug '13

changeset 897a65d1e714 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=897a65d1e714 description: fix traceback with new fileprops. diffstat: src/common/jingle_ft.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 4ea1a03124d4 -r 897a65d1e714 src/common/jingle_ft.py --- a/src/common/jingle_ft.py Mon Aug 26 09:32:16 2013 +0400 +++ b/src/common/jingle_ft.py Mon Aug 26 20:34:58 2013 +0200 @@ -95,7 +95,7 @@ if gajim.contacts.is_gc_contact(session.connection.name, session.peerjid): roomjid = session.peerjid.split('/')[0] - dstaddr = hashlib.sha1(('%s%s%s' % (self.file_props['sid'], + dstaddr = hashlib.sha1(('%s%s%s' % (self.file_props.sid, session.ourjid, roomjid)).encode('utf-8')).hexdigest() self.file_props.dstaddr = dstaddr self.state = STATE_NOT_STARTED

1 0

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

28 Aug '13

changeset 632bc717763c in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=632bc717763c 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 897a65d1e714 -r 632bc717763c src/common/connection_handlers.py --- a/src/common/connection_handlers.py Mon Aug 26 20:34:58 2013 +0200 +++ b/src/common/connection_handlers.py Tue Aug 27 17:24:41 2013 +0200 @@ -1365,6 +1365,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 897a65d1e714 -r 632bc717763c src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Mon Aug 26 20:34:58 2013 +0200 +++ b/src/common/connection_handlers_events.py Tue Aug 27 17:24:41 2013 +0200 @@ -1108,8 +1108,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

gajim: [Darlan] improve string
by Gajim 28 Aug '13

28 Aug '13

changeset caddcd3cae91 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=caddcd3cae91 description: [Darlan] improve string diffstat: src/gajim_themes_window.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (14 lines): diff -r 5d4c1129c2ef -r caddcd3cae91 src/gajim_themes_window.py --- a/src/gajim_themes_window.py Fri Aug 23 18:46:35 2013 +0400 +++ b/src/gajim_themes_window.py Sun Aug 25 14:07:49 2013 +0200 @@ -183,8 +183,8 @@ return if self.current_theme == gajim.config.get('roster_theme'): dialogs.ErrorDialog( - _('You cannot delete your current theme'), - _('Please first choose another for your current theme.')) + _('You cannot delete your current theme'), + _('Please first choose another theme as your current theme.')) return self.theme_options_vbox.set_sensitive(False) self.theme_options_table.set_sensitive(False)

1 0

← Newer
1
2
3
4
5
6
7
...
33
Older →

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 August 2013