Commits April 2012

commits@gajim.org

3 participants
95 discussions

gajim: save config regulary when we change an option.
by Yann Leboulanger 18 Apr '12

18 Apr '12

changeset 0b2601d11f2d in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=0b2601d11f2d description: save config regulary when we change an option. diffstat: src/advanced_configuration_window.py | 3 --- src/common/config.py | 16 ++++++++++++++++ src/config.py | 25 ------------------------- src/dialogs.py | 1 - src/disco.py | 1 - src/gajim_themes_window.py | 3 --- src/history_window.py | 2 -- src/message_window.py | 1 - src/statusicon.py | 1 - 9 files changed, 16 insertions(+), 37 deletions(-) diffs (truncated from 358 to 300 lines): diff -r 221cd3b14781 -r 0b2601d11f2d src/advanced_configuration_window.py --- a/src/advanced_configuration_window.py Tue Apr 17 20:57:34 2012 -0400 +++ b/src/advanced_configuration_window.py Wed Apr 18 10:15:53 2012 +0200 @@ -209,7 +209,6 @@ 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() @@ -244,7 +243,6 @@ else: self.remember_option(option, modelrow[1], text) gajim.config.set(option, text) - gajim.interface.save_config() modelrow[1] = text self.check_for_restart() @@ -279,7 +277,6 @@ else: self.remember_option(option, modelrow[C_VALUE], default) gajim.config.set(option, default) - gajim.interface.save_config() modelrow[C_VALUE] = self.right_true_dict[default] self.check_for_restart() else: diff -r 221cd3b14781 -r 0b2601d11f2d src/common/config.py --- a/src/common/config.py Tue Apr 17 20:57:34 2012 -0400 +++ b/src/common/config.py Wed Apr 18 10:15:53 2012 +0200 @@ -36,7 +36,9 @@ import re import copy import defs +import gobject +from common import gajim ( OPT_TYPE, @@ -618,6 +620,7 @@ return self.__options[1][optname] = value + self._timeout_save() def get(self, optname=None): if not optname: @@ -660,6 +663,7 @@ opt[1][name] = {} for o in opt[0]: opt[1][name][o] = opt[0][o][OPT_VAL] + self._timeout_save() def del_per(self, typename, name, subname = None): # per_group_of_option if typename not in self.__options_per_key: @@ -672,6 +676,7 @@ # if subname is specified, delete the item in the group. elif subname in opt[1][name]: del opt[1][name][subname] + self._timeout_save() def set_per(self, optname, key, subname, value): # per_group_of_option if optname not in self.__options_per_key: @@ -693,6 +698,7 @@ # raise RuntimeError, '%s of %s cannot be None' % optname return obj[subname] = value + self._timeout_save() def get_per(self, optname, key=None, subname=None): # per_group_of_option if optname not in self.__options_per_key: @@ -778,9 +784,19 @@ for opt in self.__options[0]: self.__options[1][opt] = self.__options[0][opt][OPT_VAL] + def _really_save(self): + gajim.interface.save_config() + return False + + def _timeout_save(self): + if self.save_timeout_id: + return + self.save_timeout_id = gobject.timeout_add(1000, self._really_save) + def __init__(self): #init default values self._init_options() + self.save_timeout_id = None for event in self.soundevents_default: default = self.soundevents_default[event] self.add_per('soundevents', event) diff -r 221cd3b14781 -r 0b2601d11f2d src/config.py --- a/src/config.py Tue Apr 17 20:57:34 2012 -0400 +++ b/src/config.py Wed Apr 18 10:15:53 2012 +0200 @@ -610,7 +610,6 @@ if change_sensitivity_widgets: for w in change_sensitivity_widgets: w.set_sensitive(widget.get_active()) - gajim.interface.save_config() def on_per_account_checkbutton_toggled(self, widget, config_name, change_sensitivity_widgets=None): @@ -620,7 +619,6 @@ if change_sensitivity_widgets: for w in change_sensitivity_widgets: w.set_sensitive(widget.get_active()) - gajim.interface.save_config() def _get_all_controls(self): for ctrl in gajim.interface.msg_win_mgr.get_controls(): @@ -700,21 +698,18 @@ active = widget.get_active() config_type = common.config.opt_one_window_types[active] gajim.config.set('one_message_window', config_type) - gajim.interface.save_config() gajim.interface.msg_win_mgr.reconfig() def on_show_roster_on_startup_changed(self, widget): active = widget.get_active() config_type = common.config.opt_show_roster_on_startup[active] gajim.config.set('show_roster_on_startup', config_type) - gajim.interface.save_config() def on_compact_view_checkbutton_toggled(self, widget): active = widget.get_active() for ctrl in self._get_all_controls(): ctrl.chat_buttons_set_visible(active) gajim.config.set('compact_view', active) - gajim.interface.save_config() def on_xhtml_checkbutton_toggled(self, widget): self.on_checkbutton_toggled(widget, 'ignore_incoming_xhtml') @@ -744,7 +739,6 @@ def on_speller_checkbutton_toggled(self, widget): active = widget.get_active() gajim.config.set('use_speller', active) - gajim.interface.save_config() if active: lang = gajim.config.get('speller_language') if not lang: @@ -776,7 +770,6 @@ # begin repainting themed widgets throughout gajim.interface.roster.repaint_themed_widgets() gajim.interface.roster.change_roster_style(None) - gajim.interface.save_config() def update_theme_list(self): theme_combobox = self.xml.get_object('theme_combobox') @@ -803,7 +796,6 @@ icon_string = model[active][1].decode('utf-8') gajim.config.set('iconset', icon_string) gtkgui_helpers.reload_jabber_state_images() - gajim.interface.save_config() def on_transports_iconsets_checkbutton_toggled(self, widget): self.on_checkbutton_toggled(widget, 'use_transports_iconsets') @@ -898,7 +890,6 @@ color_string = gtkgui_helpers.make_color_string(color) gajim.config.set(text, color_string) self.update_text_tags() - gajim.interface.save_config() def on_preference_widget_font_set(self, widget, text): if widget: @@ -907,7 +898,6 @@ font = '' gajim.config.set(text, font) self.update_text_font() - gajim.interface.save_config() def update_text_font(self): """ @@ -988,7 +978,6 @@ self.draw_color_widgets() self.update_text_tags() - gajim.interface.save_config() def _set_color(self, state, widget_name, option): """ @@ -1000,7 +989,6 @@ else: color_string = '' gajim.config.set(option, color_string) - gajim.interface.save_config() def on_incoming_msg_checkbutton_toggled(self, widget): state = widget.get_active() @@ -1022,7 +1010,6 @@ gajim.interface.sleeper = common.sleepy.Sleepy( gajim.config.get('autoawaytime') * 60, gajim.config.get('autoxatime') * 60) - gajim.interface.save_config() def on_auto_away_message_entry_changed(self, widget): gajim.config.set('autoaway_message', widget.get_text().decode('utf-8')) @@ -1037,7 +1024,6 @@ gajim.interface.sleeper = common.sleepy.Sleepy( gajim.config.get('autoawaytime') * 60, gajim.config.get('autoxatime') * 60) - gajim.interface.save_config() def on_auto_xa_message_entry_changed(self, widget): gajim.config.set('autoxa_message', widget.get_text().decode('utf-8')) @@ -1106,7 +1092,6 @@ model[iter_][i].decode('utf-8')) i += 1 iter_ = model.iter_next(iter_) - gajim.interface.save_config() def on_msg_treemodel_row_changed(self, model, path, iter_): self.save_status_messages(model) @@ -1152,19 +1137,15 @@ elif widget.get_active() == 1: gajim.config.set('autodetect_browser_mailer', False) self.xml.get_object('custom_apps_frame').show() - gajim.interface.save_config() def on_custom_browser_entry_changed(self, widget): gajim.config.set('custombrowser', widget.get_text().decode('utf-8')) - gajim.interface.save_config() def on_custom_mail_client_entry_changed(self, widget): gajim.config.set('custommailapp', widget.get_text().decode('utf-8')) - gajim.interface.save_config() def on_custom_file_manager_entry_changed(self, widget): gajim.config.set('custom_file_manager', widget.get_text().decode('utf-8')) - gajim.interface.save_config() def on_log_show_changes_checkbutton_toggled(self, widget): self.on_checkbutton_toggled(widget, 'log_contact_status_changes') @@ -2472,7 +2453,6 @@ if change_sensitivity_widgets: for w in change_sensitivity_widgets: w.set_sensitive(widget.get_active()) - gajim.interface.save_config() def on_merge_checkbutton_toggled(self, widget): self.on_checkbutton_toggled(widget, 'mergeaccounts') @@ -2487,7 +2467,6 @@ if account == gajim.ZEROCONF_ACC_NAME: gajim.connections[account].disable_account() del gajim.connections[account] - gajim.interface.save_config() del gajim.interface.instances[account] del gajim.interface.minimized_controls[account] del gajim.nicks[account] @@ -2557,7 +2536,6 @@ gajim.interface.roster.regroup = False gajim.interface.roster.setup_and_draw_roster() gajim.interface.roster.set_actions_menu_needs_rebuild() - gajim.interface.save_config() def on_enable_zeroconf_checkbutton2_toggled(self, widget): # don't do anything if there is an account with the local name but is a @@ -3072,7 +3050,6 @@ del gajim.connections[self.account] gajim.logger.remove_roster(gajim.get_jid_from_account(self.account)) gajim.config.del_per('accounts', self.account) - gajim.interface.save_config() del gajim.interface.instances[self.account] if self.account in gajim.nicks: del gajim.interface.minimized_controls[self.account] @@ -4025,7 +4002,6 @@ gajim.interface.roster.regroup = False gajim.interface.roster.setup_and_draw_roster() gajim.interface.roster.set_actions_menu_needs_rebuild() - gajim.interface.save_config() class ManagePEPServicesWindow: def __init__(self, account): @@ -4173,7 +4149,6 @@ bool(model[path][0])) gajim.config.set_per('soundevents', sound_event, 'path', model[iter_][2].decode('utf-8')) - gajim.interface.save_config() def sound_toggled_cb(self, cell, path): model = self.sound_tree.get_model() diff -r 221cd3b14781 -r 0b2601d11f2d src/dialogs.py --- a/src/dialogs.py Tue Apr 17 20:57:34 2012 -0400 +++ b/src/dialogs.py Wed Apr 18 10:15:53 2012 +0200 @@ -2983,7 +2983,6 @@ width, height = self.window.get_size() gajim.config.set('single-msg-width', width) gajim.config.set('single-msg-height', height) - gajim.interface.save_config() def on_single_message_window_delete_event(self, window, ev): self.save_pos() diff -r 221cd3b14781 -r 0b2601d11f2d src/disco.py --- a/src/disco.py Tue Apr 17 20:57:34 2012 -0400 +++ b/src/disco.py Wed Apr 18 10:15:53 2012 +0200 @@ -828,7 +828,6 @@ self.address_comboboxentry.append_text(j) gajim.config.set('latest_disco_addresses', ' '.join(self.latest_addresses)) - gajim.interface.save_config()

1 0

gajim: small fix
by Jefry Lagrange 18 Apr '12

18 Apr '12

changeset 221cd3b14781 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=221cd3b14781 description: small fix diffstat: src/common/jingle_ft.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 7cd68d37f5a1 -r 221cd3b14781 src/common/jingle_ft.py --- a/src/common/jingle_ft.py Tue Apr 17 20:47:52 2012 -0400 +++ b/src/common/jingle_ft.py Tue Apr 17 20:57:34 2012 -0400 @@ -284,7 +284,7 @@ def _on_connect_error(self, sid): log.info('connect error, sid=' + sid) - args = {'candError' : True + args = {'candError' : True, 'sendCand' : True} self.__sendCand(args)

1 0

gajim: add missing argument
by Jefry Lagrange 18 Apr '12

18 Apr '12

changeset 7cd68d37f5a1 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=7cd68d37f5a1 description: add missing argument diffstat: src/common/jingle_ft.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diffs (13 lines): diff -r ecb971dc6501 -r 7cd68d37f5a1 src/common/jingle_ft.py --- a/src/common/jingle_ft.py Wed Apr 18 00:14:11 2012 +0200 +++ b/src/common/jingle_ft.py Tue Apr 17 20:47:52 2012 -0400 @@ -284,7 +284,8 @@ def _on_connect_error(self, sid): log.info('connect error, sid=' + sid) - args = {'candError' : True} + args = {'candError' : True + 'sendCand' : True} self.__sendCand(args) def __sendCand(self, args):

1 0

gajim: cleanup temp file correctly
by Yann Leboulanger 17 Apr '12

17 Apr '12

changeset ecb971dc6501 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=ecb971dc6501 description: cleanup temp file correctly diffstat: src/common/latex.py | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diffs (12 lines): diff -r 9e2d1da2a036 -r ecb971dc6501 src/common/latex.py --- a/src/common/latex.py Tue Apr 17 15:40:24 2012 +0200 +++ b/src/common/latex.py Wed Apr 18 00:14:11 2012 +0200 @@ -166,6 +166,8 @@ if exitcode == 0: os.rename(tmpfile + '.png', tmppng) + else: + os.remove(tmppng) os.rmdir(tmpdir)

1 0

gajim: improve the left arrow behaviour in treeview: select pare...
by Yann Leboulanger 17 Apr '12

17 Apr '12

changeset 9e2d1da2a036 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=9e2d1da2a036 description: improve the left arrow behaviour in treeview: select parent row when we cannot collapse row diffstat: src/roster_window.py | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diffs (17 lines): diff -r 7dad053a3abc -r 9e2d1da2a036 src/roster_window.py --- a/src/roster_window.py Tue Apr 17 15:23:32 2012 +0200 +++ b/src/roster_window.py Tue Apr 17 15:40:24 2012 +0200 @@ -3441,9 +3441,12 @@ return path = list_of_paths[0] iter_ = model.get_iter(path) - if model.iter_has_child(iter_): + if model.iter_has_child(iter_) and self.tree.row_expanded(path): self.tree.collapse_row(path) return True + elif len(path) > 1: + self.tree.set_cursor(path[:-1]) + return True elif event.keyval == gtk.keysyms.Right: treeselection = self.tree.get_selection() model, list_of_paths = treeselection.get_selected_rows()

1 0

gajim: make output of adhoc command selectable. Fixes #3697
by Yann Leboulanger 17 Apr '12

17 Apr '12

changeset 7dad053a3abc in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=7dad053a3abc description: make output of adhoc command selectable. Fixes #3697 diffstat: data/gui/adhoc_commands_window.ui | 1 + src/adhoc_commands.py | 1 + src/dataforms_widget.py | 16 +++++++++++++--- 3 files changed, 15 insertions(+), 3 deletions(-) diffs (83 lines): diff -r dfe8d85fdbf5 -r 7dad053a3abc data/gui/adhoc_commands_window.ui --- a/data/gui/adhoc_commands_window.ui Tue Apr 17 11:49:48 2012 +0200 +++ b/data/gui/adhoc_commands_window.ui Tue Apr 17 15:23:32 2012 +0200 @@ -172,6 +172,7 @@ <object class="GtkLabel" id="notes_label"> <property name="visible">True</property> <property name="label" translatable="yes">Please wait while the command is sending...</property> + <property name="selectable">True</property> </object> <packing> <property name="expand">False</property> diff -r dfe8d85fdbf5 -r 7dad053a3abc src/adhoc_commands.py --- a/src/adhoc_commands.py Tue Apr 17 11:49:48 2012 +0200 +++ b/src/adhoc_commands.py Tue Apr 17 15:23:32 2012 +0200 @@ -408,6 +408,7 @@ self.data_form_widget.set_sensitive(True) try: + self.data_form_widget.selectable = True self.data_form_widget.data_form = self.dataform except dataforms.Error: self.stage5(error=_('Service sent malformed data'), diff -r dfe8d85fdbf5 -r 7dad053a3abc src/dataforms_widget.py --- a/src/dataforms_widget.py Tue Apr 17 11:49:48 2012 +0200 +++ b/src/dataforms_widget.py Tue Apr 17 15:23:32 2012 +0200 @@ -52,6 +52,7 @@ gtk.Alignment.__init__(self, xscale=1.0, yscale=1.0) self._data_form = None + self.selectable = False self.xml = gtkgui_helpers.get_gtk_builder('data_form_window.ui', 'data_form_vbox') @@ -147,7 +148,8 @@ self.clean_data_form() - self.singleform = SingleForm(self._data_form) + self.singleform = SingleForm(self._data_form, + selectable=self.selectable) def _on_validated(widget): self.emit('validated') self.singleform.connect('validated', _on_validated) @@ -314,7 +316,7 @@ validated = (gobject.SIGNAL_RUN_LAST | gobject.SIGNAL_ACTION, None, ()) ) - def __init__(self, dataform): + def __init__(self, dataform, selectable=False): assert isinstance(dataform, dataforms.SimpleDataForm) gtk.Table.__init__(self) @@ -368,6 +370,7 @@ commonwidget = False widget = gtk.Label(field.value) + widget.set_property('selectable', selectable) widget.set_line_wrap(True) self.attach(widget, leftattach, rightattach, linecounter, linecounter+1, xoptions=gtk.FILL, yoptions=gtk.FILL) @@ -506,7 +509,13 @@ textwidget.get_buffer().connect('changed', self.on_text_multi_textbuffer_changed, field) textwidget.get_buffer().set_text(field.value) - textwidget.set_sensitive(readwrite) + if readwrite: + textwidget.set_sensitive(True) + else: + if selectable: + textwidget.set_editable(True) + else: + textwidget.set_sensitive(False) widget = gtk.ScrolledWindow() widget.add(textwidget) @@ -535,6 +544,7 @@ else: commonwidget=False widget = gtk.Label(field.value) + widget.set_property('selectable', selectable) widget.set_sensitive(True) widget.set_alignment(0.0, 0.5) widget=decorate_with_tooltip(widget, field)

1 0

gajim: make metacontact visible when we use roster filter, even ...
by Yann Leboulanger 17 Apr '12

17 Apr '12

changeset dfe8d85fdbf5 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=dfe8d85fdbf5 description: make metacontact visible when we use roster filter, even if big brother is filtered. Fixes #7137 diffstat: src/roster_window.py | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diffs (16 lines): diff -r f046e4aaf7d4 -r dfe8d85fdbf5 src/roster_window.py --- a/src/roster_window.py Tue Apr 17 10:45:55 2012 +0200 +++ b/src/roster_window.py Tue Apr 17 11:49:48 2012 +0200 @@ -1598,6 +1598,12 @@ return False if type_ == 'contact': if self.rfilter_enabled: + if model.iter_has_child(titer): + iter_c = model.iter_children(titer) + while iter_c: + if self.rfilter_string in model[iter_c][C_NAME].lower(): + return True + iter_c = model.iter_next(iter_c) return self.rfilter_string in model[titer][C_NAME].lower() if gajim.config.get('showoffline'): return True

1 0

gajim: more secure tmp file creation for latex
by Yann Leboulanger 17 Apr '12

17 Apr '12

changeset f046e4aaf7d4 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=f046e4aaf7d4 description: more secure tmp file creation for latex diffstat: src/common/latex.py | 65 +++++++++++++++++++++++++--------------------------- 1 files changed, 31 insertions(+), 34 deletions(-) diffs (141 lines): diff -r 0a8585330cca -r f046e4aaf7d4 src/common/latex.py --- a/src/common/latex.py Mon Apr 16 23:03:30 2012 +0200 +++ b/src/common/latex.py Tue Apr 17 10:45:55 2012 +0200 @@ -29,7 +29,7 @@ import os import random -from tempfile import gettempdir +from tempfile import mkstemp, mkdtemp from subprocess import Popen, PIPE import logging @@ -57,24 +57,6 @@ return True return False -def get_tmpfile_name(): - random.seed() - nb = 0 - while(nb < 100): - int_ = random.randint(0, 10000) - filename = os.path.join(gettempdir(), 'gajimtex_' + int_.__str__()) - # Check if a file to not overwrite it - ok = True - extensions = ['.tex', '.log', '.aux', '.dvi'] - for ext in extensions: - if os.path.exists(filename + ext): - ok = False - break - if ok: - return filename - nb += 1 - return filename - def write_latex(filename, str_): texstr = '\\documentclass[12pt]{article}\\usepackage[dvips]{graphicx}' texstr += '\\usepackage{amsmath}\\usepackage{amssymb}' @@ -91,12 +73,13 @@ # a wrapper for Popen so that no window gets opened on Windows # (i think this is the reason we're using Popen rather than just system()) # stdout goes to a pipe so that it can be read -def popen_nt_friendly(command): +def popen_nt_friendly(command, directory): if os.name == 'nt': # CREATE_NO_WINDOW - return Popen(command, creationflags=0x08000000, cwd=gettempdir(), stdout=PIPE) + return Popen(command, creationflags=0x08000000, cwd=directory, + stdout=PIPE) else: - return Popen(command, cwd=gettempdir(), stdout=PIPE) + return Popen(command, cwd=directory, stdout=PIPE) def check_for_latex_support(): """ @@ -112,16 +95,16 @@ except LatexError: return False -def try_run(argv): +def try_run(argv, directory): try: - p = popen_nt_friendly(argv) + p = popen_nt_friendly(argv, directory) out = p.communicate()[0] log.info(out) return p.wait() except Exception, e: return _('Error executing "%(command)s": %(error)s') % { - 'command': " ".join(argv), - 'error': helpers.decode_string(str(e))} + 'command': " ".join(argv), + 'error': helpers.decode_string(str(e))} def latex_to_image(str_): @@ -137,32 +120,41 @@ return [] except AttributeError: # interface may not be available when we test latext at startup - return ['-fg', 'rgb 0.0 0.0 0.0'] + return {'hex': ['+level-colors', '0x000000'], + 'tex': ['-fg', 'rgb 0.0 0.0 0.0']}[fmt] # filter latex code with bad commands if check_blacklist(str_): # we triggered the blacklist, immediately return None return None - tmpfile = get_tmpfile_name() + try: + tmpdir = mkdtemp(prefix='gajimtex') + tmppng = mkstemp(prefix='gajim_tex', suffix='.png')[1] + except Exception: + raise LatexError('could not securely create one or more temporary files' + ' for LaTeX conversion') + + tmpfile = os.path.join(tmpdir, 'gajim_tex') # build latex string - write_latex(os.path.join(tmpfile + '.tex'), str_) + write_latex(tmpfile + '.tex', str_) # convert TeX to dvi - exitcode = try_run(['latex', '--interaction=nonstopmode', - tmpfile + '.tex']) + exitcode = try_run(['latex', '--interaction=nonstopmode', tmpfile + '.tex'], + tmpdir) if exitcode == 0: # convert dvi to png latex_png_dpi = gajim.config.get('latex_png_dpi') exitcode = try_run(['dvipng'] + fg_str('tex') + ['-T', 'tight', '-D', - latex_png_dpi, tmpfile + '.dvi', '-o', tmpfile + '.png']) + latex_png_dpi, tmpfile + '.dvi', '-o', tmpfile + '.png'], tmpdir) if exitcode: # dvipng failed, try convert exitcode = try_run(['convert'] + fg_str('hex') + ['-trim', - '-density', latex_png_dpi, tmpfile + '.dvi', tmpfile + '.png']) + '-density', latex_png_dpi, tmpfile + '.dvi', tmpfile + '.png'], + tmpdir) # remove temp files created by us and TeX extensions = ['.tex', '.log', '.aux', '.dvi'] @@ -172,10 +164,15 @@ except Exception: pass + if exitcode == 0: + os.rename(tmpfile + '.png', tmppng) + + os.rmdir(tmpdir) + if isinstance(exitcode, (unicode, str)): raise LatexError(exitcode) if exitcode == 0: - result = tmpfile + '.png' + result = tmppng return result

1 0

gajim: request ad-hoc commands to muc occupant real JID if room ...
by Yann Leboulanger 16 Apr '12

16 Apr '12

changeset 0a8585330cca in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=0a8585330cca description: request ad-hoc commands to muc occupant real JID if room is not anonymous. Fixes #2820 diffstat: src/groupchat_control.py | 3 ++- src/gui_menu_builder.py | 12 +++++++++--- 2 files changed, 11 insertions(+), 4 deletions(-) diffs (42 lines): diff -r 6763cf2504e6 -r 0a8585330cca src/groupchat_control.py --- a/src/groupchat_control.py Sun Apr 15 23:42:53 2012 +0200 +++ b/src/groupchat_control.py Mon Apr 16 23:03:30 2012 +0200 @@ -272,7 +272,8 @@ use_multiple_contacts=False, show_start_chat=False, show_encryption=True, control=self, show_buttonbar_items=not hide_buttonbar_items, - gc_contact=self.gc_contact) + gc_contact=self.gc_contact, + is_anonymous=self.room_ctrl.is_anonymous) return menu class GroupchatControl(ChatControlBase): diff -r 6763cf2504e6 -r 0a8585330cca src/gui_menu_builder.py --- a/src/gui_menu_builder.py Sun Apr 15 23:42:53 2012 +0200 +++ b/src/gui_menu_builder.py Mon Apr 16 23:03:30 2012 +0200 @@ -153,7 +153,7 @@ def get_contact_menu(contact, account, use_multiple_contacts=True, show_start_chat=True, show_encryption=False, show_buttonbar_items=True, -control=None, gc_contact=None): +control=None, gc_contact=None, is_anonymous=True): """ Build contact popup menu for roster and chat window. If control is not set, we hide invite_contacts_menuitem @@ -236,8 +236,14 @@ if contact.supports(NS_COMMANDS): execute_command_menuitem.set_sensitive(True) - execute_command_menuitem.connect('activate', roster.on_execute_command, - contact, account, contact.resource) + if gc_contact and gc_contact.jid and not is_anonymous: + execute_command_menuitem.connect('activate', + roster.on_execute_command, gc_contact, account, + gc_contact.resource) + else: + execute_command_menuitem.connect('activate', + roster.on_execute_command, contact, account, + contact.resource) else: execute_command_menuitem.set_sensitive(False)

1 0

gajim: handle see-other-host stream error. Fixes #7134
by Yann Leboulanger 15 Apr '12

15 Apr '12

changeset 6763cf2504e6 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=6763cf2504e6 description: handle see-other-host stream error. Fixes #7134 diffstat: src/common/connection.py | 18 ++++++++++++++---- src/common/connection_handlers.py | 17 ++++++++++++++++- 2 files changed, 30 insertions(+), 5 deletions(-) diffs (78 lines): diff -r 77bf2919b7ed -r 6763cf2504e6 src/common/connection.py --- a/src/common/connection.py Sat Apr 14 13:40:55 2012 +0200 +++ b/src/common/connection.py Sun Apr 15 23:42:53 2012 +0200 @@ -689,6 +689,7 @@ self.try_connecting_for_foo_secs = 45 # holds the actual hostname to which we are connected self.connected_hostname = None + self.redirected = None self.last_time_to_reconnect = None self.new_account_info = None self.new_account_form = None @@ -1039,10 +1040,17 @@ self.name, 'try_connecting_for_foo_secs') proxy = helpers.get_proxy_info(self.name) use_srv = gajim.config.get_per('accounts', self.name, 'use_srv') - use_custom = gajim.config.get_per('accounts', self.name, + if self.redirected: + use_custom = True + custom_h = self.redirected['host'] + custom_p = self.redirected['port'] + else: + use_custom = gajim.config.get_per('accounts', self.name, 'use_custom_host') - custom_h = gajim.config.get_per('accounts', self.name, 'custom_host') - custom_p = gajim.config.get_per('accounts', self.name, 'custom_port') + custom_h = gajim.config.get_per('accounts', self.name, + 'custom_host') + custom_p = gajim.config.get_per('accounts', self.name, + 'custom_port') # create connection if it doesn't already exist self.connected = 1 @@ -1054,8 +1062,10 @@ h = custom_h p = custom_p ssl_p = custom_p - use_srv = False + if not self.redirected: + use_srv = False + self.redirected = None # SRV resolver self._proxy = proxy self._hosts = [ {'host': h, 'port': p, 'ssl_port': ssl_p, 'prio': 10, diff -r 77bf2919b7ed -r 6763cf2504e6 src/common/connection_handlers.py --- a/src/common/connection_handlers.py Sat Apr 14 13:40:55 2012 +0200 +++ b/src/common/connection_handlers.py Sun Apr 15 23:42:53 2012 +0200 @@ -190,7 +190,7 @@ query.setAttr('node', 'http://gajim.org#' + gajim.version.split('-', 1)[ 0]) for f in (common.xmpp.NS_BYTESTREAM, common.xmpp.NS_SI, - common.xmpp.NS_FILE, common.xmpp.NS_COMMANDS, + common.xmpp.NS_FILE, common.xmpp.NS_COMMANDS, common.xmpp.NS_JINGLE_FILE_TRANSFER, common.xmpp.NS_JINGLE_XTLS, common.xmpp.NS_PUBKEY_PUBKEY, common.xmpp.NS_PUBKEY_REVOKE, common.xmpp.NS_PUBKEY_ATTEST): @@ -2014,6 +2014,21 @@ if obj.getTag('conflict'): # disconnected because of a resource conflict self.dispatch('RESOURCE_CONFLICT', ()) + other_host = obj.getTag('see-other-host') + if other_host and self.last_connection_type in ('ssl', 'tls'): + host = other_host.getData() + if ':' in host: + host_l = host.split(':', 1) + h = host_l[0] + p = host_l[1] + else: + h = host + p = 5222 + if h.startswith('[') and h.endswith(']'): + h = h[1:-1] + self.redirected = {'host': h, 'port': p} + self.disconnect(on_purpose=True) + self.connect() def _register_handlers(self, con, con_type): # try to find another way to register handlers in each class

1 0

← Newer
1
2
3
4
5
6
7
8
9
10
Older →

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits April 2012