Commits October 2009

commits@gajim.org

6 participants
172 discussions

gajim: Use pylint instead of pychecker.
by Stephan Erb 18 Oct '09

18 Oct '09

changeset 8bde50303ae8 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=8bde50303ae8 description: Use pylint instead of pychecker. The latter one has to execute the modules and does not work all the time. diffstat: scripts/dev/run-pychecker.py | 14 -------------- scripts/dev/run-pylint.py | 13 +++++++++++++ 2 files changed, 13 insertions(+), 14 deletions(-) diffs (35 lines): diff -r 4261f0222eee -r 8bde50303ae8 scripts/dev/run-pychecker.py --- a/scripts/dev/run-pychecker.py Sun Oct 18 19:38:32 2009 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,14 +0,0 @@ -#!/usr/bin/env python -# (C) 2006 Nikos Kouremenos <kourem(a)gmail.com> - -import os -import sys - -if os.getcwd().endswith('dev'): - os.chdir('../../src/') # we were in scripts/dev - -os.system('pychecker --limit 10000 --no-shadowbuiltin *.py &> /tmp/pychecker-gajim.log') -os.system('$EDITOR /tmp/pychecker-gajim.log') - - -# vim: se ts=3: diff -r 4261f0222eee -r 8bde50303ae8 scripts/dev/run-pylint.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/scripts/dev/run-pylint.py Sun Oct 18 19:40:09 2009 +0200 @@ -0,0 +1,13 @@ +#!/usr/bin/env python +# (C) 2006 Nikos Kouremenos <kourem(a)gmail.com> + +import os +import sys + +if os.getcwd().endswith('dev'): + os.chdir('../../src/') # we were in scripts/dev + +os.system("pylint --indent-string='\t' --additional-builtins='_' --disable-msg=C0111,C0103,C0111,C0112 --disable-checker=design " + "".join(sys.argv[1:])) + + +# vim: se ts=3:

1 0

gajim: Add 'make doc' and 'make test' directives.
by Stephan Erb 18 Oct '09

18 Oct '09

changeset 4261f0222eee in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=4261f0222eee description: Add 'make doc' and 'make test' directives. (requires you to re-run ./autogen.sh) diffstat: Makefile.am | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diffs (16 lines): diff -r 6e37e70a394b -r 4261f0222eee Makefile.am --- a/Makefile.am Sun Oct 18 18:43:25 2009 +0200 +++ b/Makefile.am Sun Oct 18 19:38:32 2009 +0200 @@ -57,3 +57,12 @@ autom4te.cache \ build \ dist + + +test: + python test/runtests.py +.PHONY: test + +doc: + epydoc --config=doc/epydoc.conf +.PHONY: doc

1 0

gajim: Also run 'make check' in the build-test.
by Stephan Erb 18 Oct '09

18 Oct '09

changeset 6e37e70a394b in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=6e37e70a394b description: Also run 'make check' in the build-test. diffstat: scripts/dev/run-build-test.py | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diffs (19 lines): diff -r 76815f9cd319 -r 6e37e70a394b scripts/dev/run-build-test.py --- a/scripts/dev/run-build-test.py Sun Oct 18 18:38:13 2009 +0200 +++ b/scripts/dev/run-build-test.py Sun Oct 18 18:43:25 2009 +0200 @@ -6,10 +6,12 @@ if os.getcwd().endswith('dev'): os.chdir('../../') # we were in scripts/dev -ret1 = os.system("make clean > " + os.devnull + " 2>&1") -ret2 = os.system("make > " + os.devnull + " 2>&1") +ret = 0 +ret += os.system("make clean > " + os.devnull) +ret += os.system("make > " + os.devnull) +ret += os.system("make check > " + os.devnull) -if ret1 + ret2 == 0: +if ret == 0: print "Build successfull" sys.exit(0) else:

1 0

gajim: Add simple build check script
by Stephan Erb 18 Oct '09

18 Oct '09

changeset 76815f9cd319 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=76815f9cd319 description: Add simple build check script diffstat: scripts/dev/run-build-test.py | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diffs (24 lines): diff -r be08b1f42cb0 -r 76815f9cd319 scripts/dev/run-build-test.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/scripts/dev/run-build-test.py Sun Oct 18 18:38:13 2009 +0200 @@ -0,0 +1,20 @@ +#!/usr/bin/env python + +import os +import sys + +if os.getcwd().endswith('dev'): + os.chdir('../../') # we were in scripts/dev + +ret1 = os.system("make clean > " + os.devnull + " 2>&1") +ret2 = os.system("make > " + os.devnull + " 2>&1") + +if ret1 + ret2 == 0: + print "Build successfull" + sys.exit(0) +else: + print >>sys.stderr, "Build failed" + sys.exit(1) + +# vim: se ts=3: +

1 0

gajim: Rename advanced.py to advanced_configuration_window.py
by Stephan Erb 18 Oct '09

18 Oct '09

changeset be08b1f42cb0 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=be08b1f42cb0 description: Rename advanced.py to advanced_configuration_window.py diffstat: src/advanced.py | 288 ------------------------------------ src/advanced_configuration_window.py | 288 ++++++++++++++++++++++++++++++++++++ src/dialogs.py | 2 +- 3 files changed, 289 insertions(+), 289 deletions(-) diffs (truncated from 596 to 300 lines): diff -r c2869668ccce -r be08b1f42cb0 src/advanced.py --- a/src/advanced.py Sat Oct 17 20:21:32 2009 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,288 +0,0 @@ -# -*- coding:utf-8 -*- -## src/advanced.py -## -## Copyright (C) 2005 Travis Shirk <travis AT pobox.com> -## Vincent Hanquez <tab AT snarc.org> -## Copyright (C) 2005-2007 Yann Leboulanger <asterix AT lagaule.org> -## Nikos Kouremenos <kourem AT gmail.com> -## Copyright (C) 2006 Dimitur Kirov <dkirov AT gmail.com> -## Copyright (C) 2006-2007 Jean-Marie Traissard <jim AT lapin.org> -## -## This file is part of Gajim. -## -## Gajim is free software; you can redistribute it and/or modify -## it under the terms of the GNU General Public License as published -## by the Free Software Foundation; version 3 only. -## -## Gajim is distributed in the hope that it will be useful, -## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -## GNU General Public License for more details. -## -## You should have received a copy of the GNU General Public License -## along with Gajim. If not, see <http://www.gnu.org/licenses/>. -## - -import gtk -import gtkgui_helpers -import gobject - -from common import gajim - -( -OPT_TYPE, -OPT_VAL -) = range(2) - -( -C_PREFNAME, -C_VALUE, -C_TYPE -) = range(3) - -GTKGUI_GLADE = 'manage_accounts_window.glade' - -def rate_limit(rate): - ''' call func at most *rate* times per second ''' - def decorator(func): - timeout = [None] - def f(*args, **kwargs): - if timeout[0] is not None: - gobject.source_remove(timeout[0]) - timeout[0] = None - def timeout_func(): - func(*args, **kwargs) - timeout[0] = None - timeout[0] = gobject.timeout_add(int(1000.0 / rate), timeout_func) - return f - return decorator - -def tree_model_iter_children(model, treeiter): - it = model.iter_children(treeiter) - while it: - yield it - it = model.iter_next(it) - -def tree_model_pre_order(model, treeiter): - yield treeiter - for childiter in tree_model_iter_children(model, treeiter): - for it in tree_model_pre_order(model, childiter): - yield it - - -class AdvancedConfigurationWindow(object): - def __init__(self): - self.xml = gtkgui_helpers.get_glade('advanced_configuration_window.glade') - self.window = self.xml.get_widget('advanced_configuration_window') - self.window.set_transient_for( - gajim.interface.instances['preferences'].window) - self.entry = self.xml.get_widget('advanced_entry') - self.desc_label = self.xml.get_widget('advanced_desc_label') - self.restart_label = self.xml.get_widget('restart_label') - - # Format: - # key = option name (root/subopt/opt separated by \n then) - # value = array(oldval, newval) - self.changed_opts = {} - - # For i18n - self.right_true_dict = {True: _('Activated'), False: _('Deactivated')} - self.types = { - 'boolean': _('Boolean'), - 'integer': _('Integer'), - 'string': _('Text'), - 'color': _('Color')} - - treeview = self.xml.get_widget('advanced_treeview') - self.treeview = treeview - self.model = gtk.TreeStore(str, str, str) - self.fill_model() - self.model.set_sort_column_id(0, gtk.SORT_ASCENDING) - self.modelfilter = self.model.filter_new() - self.modelfilter.set_visible_func(self.visible_func) - - renderer_text = gtk.CellRendererText() - col = treeview.insert_column_with_attributes(-1, _('Preference Name'), - renderer_text, text = 0) - col.set_resizable(True) - - renderer_text = gtk.CellRendererText() - renderer_text.connect('edited', self.on_config_edited) - col = treeview.insert_column_with_attributes(-1, _('Value'), - renderer_text, text = 1) - col.set_cell_data_func(renderer_text, self.cb_value_column_data) - - col.props.resizable = True - col.set_max_width(250) - - renderer_text = gtk.CellRendererText() - treeview.insert_column_with_attributes(-1, _('Type'), - renderer_text, text = 2) - - treeview.set_model(self.modelfilter) - - # connect signal for selection change - treeview.get_selection().connect('changed', - self.on_advanced_treeview_selection_changed) - - self.xml.signal_autoconnect(self) - self.window.show_all() - self.restart_label.hide() - gajim.interface.instances['advanced_config'] = self - - def cb_value_column_data(self, col, cell, model, iter_): - '''check if it's boolen or holds password stuff and if yes - make the cellrenderertext not editable else it's editable''' - optname = model[iter_][C_PREFNAME] - opttype = model[iter_][C_TYPE] - if opttype == self.types['boolean'] or optname == 'password': - cell.set_property('editable', False) - else: - cell.set_property('editable', True) - - def get_option_path(self, model, iter_): - # It looks like path made from reversed array - # path[0] is the true one optname - # path[1] is the key name - # path[2] is the root of tree - # last two is optional - path = [model[iter_][0].decode('utf-8')] - parent = model.iter_parent(iter_) - while parent: - path.append(model[parent][0].decode('utf-8')) - parent = model.iter_parent(parent) - return path - - def on_advanced_treeview_selection_changed(self, treeselection): - model, iter_ = treeselection.get_selected() - # Check for GtkTreeIter - if iter_: - opt_path = self.get_option_path(model, iter_) - # Get text from first column in this row - desc = None - if len(opt_path) == 3: - desc = gajim.config.get_desc_per(opt_path[2], opt_path[1], - opt_path[0]) - elif len(opt_path) == 1: - desc = gajim.config.get_desc(opt_path[0]) - if desc: - self.desc_label.set_text(desc) - else: - #we talk about option description in advanced configuration editor - self.desc_label.set_text(_('(None)')) - - def remember_option(self, option, oldval, newval): - if option in self.changed_opts: - self.changed_opts[option] = (self.changed_opts[option][0], newval) - else: - self.changed_opts[option] = (oldval, newval) - - def on_advanced_treeview_row_activated(self, treeview, path, column): - modelpath = self.modelfilter.convert_path_to_child_path(path) - modelrow = self.model[modelpath] - option = modelrow[0].decode('utf-8') - if modelrow[2] == self.types['boolean']: - for key in self.right_true_dict.keys(): - if self.right_true_dict[key] == modelrow[1]: - modelrow[1] = key - newval = {'False': True, 'True': False}[modelrow[1]] - if len(modelpath) > 1: - optnamerow = self.model[modelpath[0]] - optname = optnamerow[0].decode('utf-8') - keyrow = self.model[modelpath[:2]] - key = keyrow[0].decode('utf-8') - gajim.config.get_desc_per(optname, key, option) - self.remember_option(option + '\n' + key + '\n' + optname, - modelrow[1], newval) - gajim.config.set_per(optname, key, option, newval) - else: - self.remember_option(option, modelrow[1], newval) - gajim.config.set(option, newval) - gajim.interface.save_config() - modelrow[1] = self.right_true_dict[newval] - self.check_for_restart() - - def check_for_restart(self): - self.restart_label.hide() - for opt in self.changed_opts: - opt_path = opt.split('\n') - if len(opt_path)==3: - restart = gajim.config.get_restart_per(opt_path[2], opt_path[1], - opt_path[0]) - else: - restart = gajim.config.get_restart(opt_path[0]) - if restart: - if self.changed_opts[opt][0] != self.changed_opts[opt][1]: - self.restart_label.show() - break - - def on_config_edited(self, cell, path, text): - # convert modelfilter path to model path - modelpath = self.modelfilter.convert_path_to_child_path(path) - modelrow = self.model[modelpath] - option = modelrow[0].decode('utf-8') - text = text.decode('utf-8') - if len(modelpath) > 1: - optnamerow = self.model[modelpath[0]] - optname = optnamerow[0].decode('utf-8') - keyrow = self.model[modelpath[:2]] - key = keyrow[0].decode('utf-8') - self.remember_option(option + '\n' + key + '\n' + optname, modelrow[1], - text) - gajim.config.set_per(optname, key, option, text) - else: - self.remember_option(option, modelrow[1], text) - gajim.config.set(option, text) - gajim.interface.save_config() - modelrow[1] = text - self.check_for_restart() - - def on_advanced_configuration_window_destroy(self, widget): - del gajim.interface.instances['advanced_config'] - - def on_advanced_close_button_clicked(self, widget): - self.window.destroy() - - def fill_model(self, node=None, parent=None): - for item, option in gajim.config.get_children(node): - name = item[-1] - if option is None: # Node - newparent = self.model.append(parent, [name, '', '']) - self.fill_model(item, newparent) - else: # Leaf - type_ = self.types[option[OPT_TYPE][0]] - if name == 'password': - value = _('Hidden') - else: - if type_ == self.types['boolean']: - value = self.right_true_dict[option[OPT_VAL]] - else: - value = option[OPT_VAL] - self.model.append(parent, [name, value, type_]) - - def visible_func(self, model, treeiter): - search_string = self.entry.get_text().decode('utf-8').lower() - for it in tree_model_pre_order(model,treeiter): - if model[it][C_TYPE] != '': - opt_path = self.get_option_path(model, it) - if len(opt_path) == 3: - desc = gajim.config.get_desc_per(opt_path[2], opt_path[1], - opt_path[0]) - elif len(opt_path) == 1: - desc = gajim.config.get_desc(opt_path[0]) - if search_string in model[it][C_PREFNAME] or (desc and \ - search_string in desc.lower()): - return True - return False - - @rate_limit(3) - def on_advanced_entry_changed(self, widget): - self.modelfilter.refilter() - if not widget.get_text(): - # Maybe the expanded rows should be remembered here ... - self.treeview.collapse_all() - else: - # ... and be restored correctly here - self.treeview.expand_all() - -# vim: se ts=3: diff -r c2869668ccce -r be08b1f42cb0 src/advanced_configuration_window.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/advanced_configuration_window.py Sat Oct 17 20:28:38 2009 +0200 @@ -0,0 +1,288 @@ +# -*- coding:utf-8 -*- +## src/advanced.py +## +## Copyright (C) 2005 Travis Shirk <travis AT pobox.com>

1 0

gajim: Depend on Python 2.5. Remove workaround for older versions.
by Stephan Erb 18 Oct '09

18 Oct '09

changeset c2869668ccce in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=c2869668ccce description: Depend on Python 2.5. Remove workaround for older versions. diffstat: src/advanced.py | 8 -------- 1 files changed, 0 insertions(+), 8 deletions(-) diffs (18 lines): diff -r f6f16e7e3737 -r c2869668ccce src/advanced.py --- a/src/advanced.py Sat Oct 17 10:18:11 2009 +0200 +++ b/src/advanced.py Sat Oct 17 20:21:32 2009 +0200 @@ -69,14 +69,6 @@ for it in tree_model_pre_order(model, childiter): yield it -try: - any(()) # builtin since python 2.5 -except Exception: - def any(iterable): - for element in iterable: - if element: - return True - return False class AdvancedConfigurationWindow(object): def __init__(self):

1 0

gajim: prevent traceback
by Yann Leboulanger 18 Oct '09

18 Oct '09

changeset c95685f83fe2 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=c95685f83fe2 description: prevent traceback diffstat: src/common/helpers.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (21 lines): diff -r f6f16e7e3737 -r c95685f83fe2 src/common/helpers.py --- a/src/common/helpers.py Sat Oct 17 10:18:11 2009 +0200 +++ b/src/common/helpers.py Sun Oct 18 10:56:23 2009 +0200 @@ -1191,7 +1191,7 @@ '%d event pending', '%d events pending', total_non_messages, total_non_messages, total_non_messages) - accounts[account]['event_lines'].append(text) + account['event_lines'].append(text) else: for jid in non_messages.keys(): text = ngettext( @@ -1199,7 +1199,7 @@ '%d events pending', non_messages[jid], non_messages[jid], non_messages[jid]) text += _(' from user %s') % (jid) - accounts[account]['event_lines'].append(text) + account[account]['event_lines'].append(text) return accounts

1 0

gajim: [louizatakk] fix bash completion patch. Fixes #5328
by Yann Leboulanger 17 Oct '09

17 Oct '09

changeset f6f16e7e3737 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=f6f16e7e3737 description: [louizatakk] fix bash completion patch. Fixes #5328 diffstat: src/groupchat_control.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (21 lines): diff -r 8de463f88280 -r f6f16e7e3737 src/groupchat_control.py --- a/src/groupchat_control.py Fri Oct 16 19:51:29 2009 +0200 +++ b/src/groupchat_control.py Sat Oct 17 10:18:11 2009 +0200 @@ -1848,7 +1848,7 @@ # have to accomodate for the added space from last # completion start_iter.backward_chars(len(begin) + 2) - elif self.last_key_tabs: + elif self.last_key_tabs and not gajim.config.get('shell_like_completion'): # have to accomodate for the added space from last # completion start_iter.backward_chars(len(begin) + 1) @@ -1871,7 +1871,7 @@ end = True cur = cur[:-1] completion = cur - add = "" # if nick is not complete, don't but any comma or so + add = "" # if nick is not complete, don't add anything message_buffer.insert_at_cursor(completion + add) self.last_key_tabs = True return True

1 0

gajim: refactor jingle functions in chat_control.py
by Yann Leboulanger 16 Oct '09

16 Oct '09

changeset dba1920bc533 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=dba1920bc533 description: refactor jingle functions in chat_control.py diffstat: src/chat_control.py | 107 ++++++++++++++++++----------------------------------- 1 files changed, 36 insertions(+), 71 deletions(-) diffs (153 lines): diff -r 4312affab769 -r dba1920bc533 src/chat_control.py --- a/src/chat_control.py Fri Oct 16 20:21:42 2009 +0200 +++ b/src/chat_control.py Fri Oct 16 21:48:28 2009 +0200 @@ -1536,38 +1536,33 @@ else: self._tune_image.hide() - def update_audio(self): - if self.audio_state in (self.JINGLE_STATE_NOT_AVAILABLE, - self.JINGLE_STATE_AVAILABLE): - self._audio_banner_image.hide() + def _update_jingle(self, jingle_type): + if jingle_type not in ('audio', 'video'): + return + if self.__dict__[jingle_type + '_state'] in ( + self.JINGLE_STATE_NOT_AVAILABLE, self.JINGLE_STATE_AVAILABLE): + self.__dict__['_' + jingle_type + '_banner_image'].hide() else: - self._audio_banner_image.show() + self.__dict__['_' + jingle_type + '_banner_image'].show() if self.audio_state == self.JINGLE_STATE_CONNECTING: - self._audio_banner_image.set_from_stock(gtk.STOCK_CONVERT, 1) + self.__dict__['_' + jingle_type + '_banner_image'].set_from_stock( + gtk.STOCK_CONVERT, 1) elif self.audio_state == self.JINGLE_STATE_CONNECTION_RECEIVED: - self._audio_banner_image.set_from_stock(gtk.STOCK_NETWORK, 1) + self.__dict__['_' + jingle_type + '_banner_image'].set_from_stock( + gtk.STOCK_NETWORK, 1) elif self.audio_state == self.JINGLE_STATE_CONNECTED: - self._audio_banner_image.set_from_stock(gtk.STOCK_CONNECT, 1) + self.__dict__['_' + jingle_type + '_banner_image'].set_from_stock( + gtk.STOCK_CONNECT, 1) elif self.audio_state == self.JINGLE_STATE_ERROR: - self._audio_banner_image.set_from_stock(gtk.STOCK_DIALOG_WARNING, 1) + self.__dict__['_' + jingle_type + '_banner_image'].set_from_stock( + gtk.STOCK_DIALOG_WARNING, 1) self.update_toolbar() + def update_audio(self): + self._update_jingle('audio') + def update_video(self): - #TODO: Share code with update_audio? - if self.video_state in (self.JINGLE_STATE_NOT_AVAILABLE, - self.JINGLE_STATE_AVAILABLE): - self._video_banner_image.hide() - else: - self._video_banner_image.show() - if self.video_state == self.JINGLE_STATE_CONNECTING: - self._video_banner_image.set_from_stock(gtk.STOCK_CONVERT, 1) - elif self.video_state == self.JINGLE_STATE_CONNECTION_RECEIVED: - self._video_banner_image.set_from_stock(gtk.STOCK_NETWORK, 1) - elif self.video_state == self.JINGLE_STATE_CONNECTED: - self._video_banner_image.set_from_stock(gtk.STOCK_CONNECT, 1) - elif self.video_state == self.JINGLE_STATE_ERROR: - self._video_banner_image.set_from_stock(gtk.STOCK_DIALOG_WARNING, 1) - self.update_toolbar() + self._update_jingle('video') def change_resource(self, resource): old_full_jid = self.get_full_jid() @@ -1582,11 +1577,12 @@ # update MessageWindow._controls self.parent_win.change_jid(self.account, old_full_jid, new_full_jid) - def set_audio_state(self, state, sid=None, reason=None): - if state in ('connecting', 'connected', 'stop'): - str = _('Audio state : %s') % state - if reason: - str += ', ' + _('reason: %s') % reason + def _set_jingle_state(self, jingle_type, state, sid=None, reason=None): + if jingle_type not in ('audio', 'video'): + return + if state in ('connecting', 'connected', 'stop') and reason: + str = _('%(type)s state : %(state)s, reason: %(reason)s') % { + 'type': jingle_type.capitalize(), 'state': state, 'reason': reason} self.print_conversation(str, 'info') states = {'not_available': self.JINGLE_STATE_NOT_AVAILABLE, @@ -1598,62 +1594,31 @@ 'error': self.JINGLE_STATE_ERROR} if state in states: - self.audio_state = states[state] + self.__dict__[jingle_type + '_state'] = states[state] # Destroy existing session with the user when he signs off # We need to do that before modifying the sid if state == 'not_available': gajim.connections[self.account].delete_jingle_session( - self.contact.get_full_jid(), self.audio_sid) + self.contact.get_full_jid(), self.__dict__[jingle_type + '_sid']) if state in ('not_available', 'available', 'stop'): - self.audio_sid = None + self.__dict__[jingle_type + '_sid'] = None if state in ('connection_received', 'connecting'): - self.audio_sid = sid + self.__dict__[jingle_type + '_sid'] = sid if state in ('connecting', 'connected', 'connection_received'): - self._audio_button.set_active(True) + self.__dict__['_' + jingle_type + '_button'].set_active(True) elif state in ('not_available', 'stop'): - self._audio_button.set_active(False) + self.__dict__['_' + jingle_type + '_button'].set_active(False) - self.update_audio() + eval('self.update_' + jingle_type)() + + def set_audio_state(self, state, sid=None, reason=None): + self._set_jingle_state('audio', state, sid=sid, reason=reason) def set_video_state(self, state, sid=None, reason=None): - #TODO: Share code with set_audio_state? - if state in ('connecting', 'connected', 'stop'): - str = _('Video state : %s') % state - if reason: - str += ', ' + _('reason: %s') % reason - self.print_conversation(str, 'info') - - states = {'not_available': self.JINGLE_STATE_NOT_AVAILABLE, - 'available': self.JINGLE_STATE_AVAILABLE, - 'connecting': self.JINGLE_STATE_CONNECTING, - 'connection_received': self.JINGLE_STATE_CONNECTION_RECEIVED, - 'connected': self.JINGLE_STATE_CONNECTED, - 'stop': self.JINGLE_STATE_AVAILABLE, - 'error': self.JINGLE_STATE_ERROR} - - if state in states: - self.video_state = states[state] - - # Destroy existing session with the user when he signs off - # We need to do that before modifying the sid - if state == 'not_available': - gajim.connections[self.account].delete_jingle_session( - self.contact.get_full_jid(), self.video_sid) - - if state in ('not_available', 'available', 'stop'): - self.video_sid = None - if state in ('connection_received', 'connecting'): - self.video_sid = sid - - if state in ('connecting', 'connected', 'connection_received'): - self._video_button.set_active(True) - elif state in ('not_available', 'stop'): - self._video_button.set_active(False) - - self.update_video() + self._set_jingle_state('video', state, sid=sid, reason=reason) def on_avatar_eventbox_enter_notify_event(self, widget, event): '''

1 0

gajim: Fixes an indentation error aswell as the previous commit
by Thibaut GIRKA 16 Oct '09

16 Oct '09

changeset 4312affab769 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=4312affab769 description: Fixes an indentation error aswell as the previous commit diffstat: src/chat_control.py | 24 +++++++++++++----------- 1 files changed, 13 insertions(+), 11 deletions(-) diffs (59 lines): diff -r 55e126c5394e -r 4312affab769 src/chat_control.py --- a/src/chat_control.py Fri Oct 16 19:36:55 2009 +0200 +++ b/src/chat_control.py Fri Oct 16 20:21:42 2009 +0200 @@ -1600,6 +1600,12 @@ if state in states: self.audio_state = states[state] + # Destroy existing session with the user when he signs off + # We need to do that before modifying the sid + if state == 'not_available': + gajim.connections[self.account].delete_jingle_session( + self.contact.get_full_jid(), self.audio_sid) + if state in ('not_available', 'available', 'stop'): self.audio_sid = None if state in ('connection_received', 'connecting'): @@ -1610,16 +1616,11 @@ elif state in ('not_available', 'stop'): self._audio_button.set_active(False) - # Destroy existing session with the user when he signs off - if state == 'not_available': - gajim.connections[self.account].delete_jingle_session( - self.contact.get_full_jid(), self.audio_sid) - self.update_audio() def set_video_state(self, state, sid=None, reason=None): #TODO: Share code with set_audio_state? - if state in ('connecting', 'connected', 'stop'): + if state in ('connecting', 'connected', 'stop'): str = _('Video state : %s') % state if reason: str += ', ' + _('reason: %s') % reason @@ -1636,6 +1637,12 @@ if state in states: self.video_state = states[state] + # Destroy existing session with the user when he signs off + # We need to do that before modifying the sid + if state == 'not_available': + gajim.connections[self.account].delete_jingle_session( + self.contact.get_full_jid(), self.video_sid) + if state in ('not_available', 'available', 'stop'): self.video_sid = None if state in ('connection_received', 'connecting'): @@ -1646,11 +1653,6 @@ elif state in ('not_available', 'stop'): self._video_button.set_active(False) - # Destroy existing session with the user when he signs off - if state == 'not_available': - gajim.connections[self.account].delete_jingle_session( - self.contact.get_full_jid(), self.video_sid) - self.update_video() def on_avatar_eventbox_enter_notify_event(self, widget, event):

1 0

← Newer
1
...
7
8
9
10
11
12
13
...
18
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 October 2009