Commits

commits@gajim.org

17632 discussions

gajim: easy way to clear plugin_description_textview
by Denis Fomin 24 Aug '13

24 Aug '13

changeset 193e9b398e11 in /home/hg/repos/gajim branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=193e9b398e11 description: easy way to clear plugin_description_textview diffstat: src/plugins/gui.py | 10 +++------- 1 files changed, 3 insertions(+), 7 deletions(-) diffs (34 lines): diff -r b2e34a50828c -r 193e9b398e11 src/plugins/gui.py --- a/src/plugins/gui.py Fri Aug 16 23:29:48 2013 +0400 +++ b/src/plugins/gui.py Mon Aug 19 11:28:50 2013 +0400 @@ -39,6 +39,7 @@ from plugins.helpers import log_calls, log from conversation_textview import ConversationTextview from plugins.helpers import GajimPluginActivateException +from plugins.plugins_i18n import _ from common.exceptions import PluginsystemError ( @@ -139,7 +140,6 @@ self._clear_installed_plugin_info() def _display_installed_plugin_info(self, plugin): - from plugins.plugins_i18n import _ self.plugin_name_label.set_text(plugin.name) self.plugin_version_label.set_text(plugin.version) self.plugin_authors_label.set_text(plugin.authors) @@ -149,12 +149,8 @@ label.set_ellipsize(Pango.EllipsizeMode.END) self.plugin_homepage_linkbutton.set_property('sensitive', True) - sw = self.xml.get_object('scrolledwindow2') - old_tv = sw.get_children()[0] - old_tv.destroy() - self.plugin_description_textview = HtmlTextView() - sw.add(self.plugin_description_textview) - sw.show_all() + desc_textbuffer = self.plugin_description_textview.get_buffer() + desc_textbuffer.set_text('') txt = plugin.description txt.replace('</body>', '') if plugin.available_text:

1 0

gajim: [axcel] update AcronymsExpanderPlugin
by Denis Fomin 24 Aug '13

24 Aug '13

changeset b5cca6321af8 in /home/hg/repos/gajim branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=b5cca6321af8 description: [axcel] update AcronymsExpanderPlugin diffstat: plugins/acronyms_expander/acronyms | 69 ++++++++++++++++++++++++++ plugins/acronyms_expander/acronyms_expander.py | 16 ++++- 2 files changed, 82 insertions(+), 3 deletions(-) diffs (106 lines): diff -r 193e9b398e11 -r b5cca6321af8 plugins/acronyms_expander/acronyms --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/plugins/acronyms_expander/acronyms Tue Aug 20 14:08:54 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 193e9b398e11 -r b5cca6321af8 plugins/acronyms_expander/acronyms_expander.py --- a/plugins/acronyms_expander/acronyms_expander.py Mon Aug 19 11:28:50 2013 +0400 +++ b/plugins/acronyms_expander/acronyms_expander.py Tue Aug 20 14:08:54 2013 +0400 @@ -47,16 +47,26 @@ self.config_default_values = { 'INVOKER': (' ', ''), - 'ACRONYMS': ({'RTFM': 'Read The Friendly Manual', - '/slap': '/me slaps', + 'ACRONYMS': ({'/slap': '/me slaps', 'PS-': 'plug-in system', 'G-': 'Gajim', 'GNT-': 'http://trac.gajim.org/newticket', 'GW-': 'http://trac.gajim.org/', 'GTS-': 'http://trac.gajim.org/report', }, - ''), + ''), } + if 'ACRONYMS' not in self.config: + myAcronyms = self.get_own_acronyms_list() + self.config['ACRONYMS'].update(myAcronyms) + + @log_calls('AcronymsExpanderPlugin') + def get_own_acronyms_list(self): + data_file = self.local_file_path('acronyms') + data = open(data_file, 'r') + acronyms = eval(data.read()) + data.close() + return acronyms @log_calls('AcronymsExpanderPlugin') def textbuffer_live_acronym_expander(self, tb):

1 0

gajim: show scrollbar only when needed. Fixes #7239
by Yann Leboulanger 24 Aug '13

24 Aug '13

changeset 7963223c0f2d in /home/hg/repos/gajim branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=7963223c0f2d description: show scrollbar only when needed. Fixes #7239 diffstat: data/gui/preferences_window.ui | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diffs (12 lines): diff -r 393692d13295 -r 7963223c0f2d data/gui/preferences_window.ui --- a/data/gui/preferences_window.ui Fri Aug 16 09:21:32 2013 +0200 +++ b/data/gui/preferences_window.ui Fri Aug 16 09:25:07 2013 +0200 @@ -1546,6 +1546,8 @@ <object class="GtkScrolledWindow" id="scrolledwindow22"> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="hscrollbar_policy">automatic</property> + <property name="vscrollbar_policy">automatic</property> <property name="shadow_type">in</property> <child> <object class="GtkTreeView" id="msg_treeview">

1 0

gajim: we release under GPL v3
by Yann Leboulanger 24 Aug '13

24 Aug '13

changeset 0b8855fbefd1 in /home/hg/repos/gajim branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=0b8855fbefd1 description: we release under GPL v3 diffstat: src/common/jingle.py | 10 ++++++---- src/common/jingle_content.py | 10 ++++++---- src/common/jingle_ftstates.py | 10 ++++++---- src/common/jingle_rtp.py | 10 ++++++---- src/common/jingle_session.py | 10 ++++++---- src/common/jingle_transport.py | 10 ++++++---- src/common/multimedia_helpers.py | 10 ++++++---- 7 files changed, 42 insertions(+), 28 deletions(-) diffs (175 lines): diff -r 7963223c0f2d -r 0b8855fbefd1 src/common/jingle.py --- a/src/common/jingle.py Fri Aug 16 09:25:07 2013 +0200 +++ b/src/common/jingle.py Fri Aug 16 09:33:15 2013 +0200 @@ -1,15 +1,17 @@ ## ## Copyright (C) 2006 Gajim Team ## -## This program is free software; you can redistribute it and/or modify +## 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 2 only. +## by the Free Software Foundation; version 3 only. ## -## This program is distributed in the hope that it will be useful, +## 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 +## 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/>. """ Handles the jingle signalling protocol """ diff -r 7963223c0f2d -r 0b8855fbefd1 src/common/jingle_content.py --- a/src/common/jingle_content.py Fri Aug 16 09:25:07 2013 +0200 +++ b/src/common/jingle_content.py Fri Aug 16 09:33:15 2013 +0200 @@ -1,15 +1,17 @@ ## ## Copyright (C) 2006 Gajim Team ## -## This program is free software; you can redistribute it and/or modify +## 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 2 only. +## by the Free Software Foundation; version 3 only. ## -## This program is distributed in the hope that it will be useful, +## 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 +## 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/>. """ Handles Jingle contents (XEP 0166) diff -r 7963223c0f2d -r 0b8855fbefd1 src/common/jingle_ftstates.py --- a/src/common/jingle_ftstates.py Fri Aug 16 09:25:07 2013 +0200 +++ b/src/common/jingle_ftstates.py Fri Aug 16 09:33:15 2013 +0200 @@ -1,15 +1,17 @@ ## ## Copyright (C) 2006 Gajim Team ## -## This program is free software; you can redistribute it and/or modify +## 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 2 only. +## by the Free Software Foundation; version 3 only. ## -## This program is distributed in the hope that it will be useful, +## 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 +## 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/>. from common import gajim import nbxmpp diff -r 7963223c0f2d -r 0b8855fbefd1 src/common/jingle_rtp.py --- a/src/common/jingle_rtp.py Fri Aug 16 09:25:07 2013 +0200 +++ b/src/common/jingle_rtp.py Fri Aug 16 09:33:15 2013 +0200 @@ -1,15 +1,17 @@ ## ## Copyright (C) 2006 Gajim Team ## -## This program is free software; you can redistribute it and/or modify +## 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 2 only. +## by the Free Software Foundation; version 3 only. ## -## This program is distributed in the hope that it will be useful, +## 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 +## 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/>. """ Handles Jingle RTP sessions (XEP 0167) diff -r 7963223c0f2d -r 0b8855fbefd1 src/common/jingle_session.py --- a/src/common/jingle_session.py Fri Aug 16 09:25:07 2013 +0200 +++ b/src/common/jingle_session.py Fri Aug 16 09:33:15 2013 +0200 @@ -1,15 +1,17 @@ ## ## Copyright (C) 2006 Gajim Team ## -## This program is free software; you can redistribute it and/or modify +## 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 2 only. +## by the Free Software Foundation; version 3 only. ## -## This program is distributed in the hope that it will be useful, +## 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 +## 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/>. """ Handles Jingle sessions (XEP 0166) diff -r 7963223c0f2d -r 0b8855fbefd1 src/common/jingle_transport.py --- a/src/common/jingle_transport.py Fri Aug 16 09:25:07 2013 +0200 +++ b/src/common/jingle_transport.py Fri Aug 16 09:33:15 2013 +0200 @@ -1,15 +1,17 @@ ## ## Copyright (C) 2006 Gajim Team ## -## This program is free software; you can redistribute it and/or modify +## 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 2 only. +## by the Free Software Foundation; version 3 only. ## -## This program is distributed in the hope that it will be useful, +## 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 +## 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/>. """ Handles Jingle Transports (currently only ICE-UDP) diff -r 7963223c0f2d -r 0b8855fbefd1 src/common/multimedia_helpers.py --- a/src/common/multimedia_helpers.py Fri Aug 16 09:25:07 2013 +0200 +++ b/src/common/multimedia_helpers.py Fri Aug 16 09:33:15 2013 +0200 @@ -1,15 +1,17 @@ ## ## Copyright (C) 2009 Thibaut GIRKA <thib AT sitedethib.com> ## -## This program is free software; you can redistribute it and/or modify +## 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 2 only. +## by the Free Software Foundation; version 3 only. ## -## This program is distributed in the hope that it will be useful, +## 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 +## 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 gst

1 0

gajim: remove external unused file
by Yann Leboulanger 24 Aug '13

24 Aug '13

changeset 4f55e5523c0c in /home/hg/repos/gajim branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=4f55e5523c0c description: remove external unused file diffstat: src/pycallgraph.py | 410 ----------------------------------------------------- 1 files changed, 0 insertions(+), 410 deletions(-) diffs (truncated from 414 to 300 lines): diff -r 0b8855fbefd1 -r 4f55e5523c0c src/pycallgraph.py --- a/src/pycallgraph.py Fri Aug 16 09:33:15 2013 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,410 +0,0 @@ -""" -pycallgraph - -U{http://pycallgraph.slowchop.com/} - -Copyright Gerald Kaszuba 2007 - -This program 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; either version 2 of the License, or -(at your option) any later version. - -This program 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 this program; if not, write to the Free Software -Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -""" - -__version__ = '0.4.1' -__author__ = 'Gerald Kaszuba' - -import inspect -import sys -import os -import re -import tempfile -import time -from distutils import sysconfig - -# Initialise module variables. -# TODO Move these into settings -trace_filter = None -time_filter = None - - -def colourize_node(calls, total_time): - value = float(total_time * 2 + calls) / 3 - return '%f %f %f' % (value / 2 + .5, value, 0.9) - - -def colourize_edge(calls, total_time): - value = float(total_time * 2 + calls) / 3 - return '%f %f %f' % (value / 2 + .5, value, 0.7) - - -def reset_settings(): - global settings - global graph_attributes - global __version__ - - settings = { - 'node_attributes': { - 'label': r'%(func)s\ncalls: %(hits)i\ntotal time: %(total_time)f', - 'color': '%(col)s', - }, - 'node_colour': colourize_node, - 'edge_colour': colourize_edge, - 'dont_exclude_anything': False, - 'include_stdlib': True, - } - - # TODO: Move this into settings - graph_attributes = { - 'graph': { - 'fontname': 'Verdana', - 'fontsize': 7, - 'fontcolor': '0 0 0.5', - 'label': r'Generated by Python Call Graph v%s\n' \ - r'http://pycallgraph.slowchop.com' % __version__, - }, - 'node': { - 'fontname': 'Verdana', - 'fontsize': 7, - 'color': '.5 0 .9', - 'style': 'filled', - 'shape': 'rect', - }, - } - - -def reset_trace(): - """Resets all collected statistics. This is run automatically by - start_trace(reset=True) and when the module is loaded. - """ - global call_dict - global call_stack - global func_count - global func_count_max - global func_time - global func_time_max - global call_stack_timer - - call_dict = {} - - # current call stack - call_stack = ['__main__'] - - # counters for each function - func_count = {} - func_count_max = 0 - - # accumative time per function - func_time = {} - func_time_max = 0 - - # keeps track of the start time of each call on the stack - call_stack_timer = [] - - -class PyCallGraphException(Exception): - """Exception used for pycallgraph""" - pass - - -class GlobbingFilter(object): - """Filter module names using a set of globs. - - Objects are matched against the exclude list first, then the include list. - Anything that passes through without matching either, is excluded. - """ - - def __init__(self, include=None, exclude=None, max_depth=None, - min_depth=None): - if include is None and exclude is None: - include = ['*'] - exclude = [] - elif include is None: - include = ['*'] - elif exclude is None: - exclude = [] - self.include = include - self.exclude = exclude - self.max_depth = max_depth or 9999 - self.min_depth = min_depth or 0 - - def __call__(self, stack, module_name=None, class_name=None, - func_name=None, full_name=None): - from fnmatch import fnmatch - if len(stack) > self.max_depth: - return False - if len(stack) < self.min_depth: - return False - for pattern in self.exclude: - if fnmatch(full_name, pattern): - return False - for pattern in self.include: - if fnmatch(full_name, pattern): - return True - return False - - -def is_module_stdlib(file_name): - """Returns True if the file_name is in the lib directory.""" - # TODO: Move these calls away from this function so it doesn't have to run - # every time. - lib_path = sysconfig.get_python_lib() - path = os.path.split(lib_path) - if path[1] == 'site-packages': - lib_path = path[0] - return file_name.lower().startswith(lib_path.lower()) - - -def start_trace(reset=True, filter_func=None, time_filter_func=None): - """Begins a trace. Setting reset to True will reset all previously recorded - trace data. filter_func needs to point to a callable function that accepts - the parameters (call_stack, module_name, class_name, func_name, full_name). - Every call will be passed into this function and it is up to the function - to decide if it should be included or not. Returning False means the call - will be filtered out and not included in the call graph. - """ - global trace_filter - global time_filter - if reset: - reset_trace() - - if filter_func: - trace_filter = filter_func - else: - trace_filter = GlobbingFilter(exclude=['pycallgraph.*']) - - if time_filter_func: - time_filter = time_filter_func - else: - time_filter = GlobbingFilter() - - sys.settrace(tracer) - - -def stop_trace(): - """Stops the currently running trace, if any.""" - sys.settrace(None) - - -def tracer(frame, event, arg): - """This is an internal function that is called every time a call is made - during a trace. It keeps track of relationships between calls. - """ - global func_count_max - global func_count - global trace_filter - global time_filter - global call_stack - global func_time - global func_time_max - - if event == 'call': - keep = True - code = frame.f_code - - # Stores all the parts of a human readable name of the current call. - full_name_list = [] - - # Work out the module name - module = inspect.getmodule(code) - if module: - module_name = module.__name__ - module_path = module.__file__ - if not settings['include_stdlib'] \ - and is_module_stdlib(module_path): - keep = False - if module_name == '__main__': - module_name = '' - else: - module_name = '' - if module_name: - full_name_list.append(module_name) - - # Work out the class name. - try: - class_name = frame.f_locals['self'].__class__.__name__ - full_name_list.append(class_name) - except (KeyError, AttributeError): - class_name = '' - - # Work out the current function or method - func_name = code.co_name - if func_name == '?': - func_name = '__main__' - full_name_list.append(func_name) - - # Create a readable representation of the current call - full_name = '.'.join(full_name_list) - - # Load the trace filter, if any. 'keep' determines if we should ignore - # this call - if keep and trace_filter: - keep = trace_filter(call_stack, module_name, class_name, - func_name, full_name) - - # Store the call information - if keep: - - fr = call_stack[-1] - if fr not in call_dict: - call_dict[fr] = {} - if full_name not in call_dict[fr]: - call_dict[fr][full_name] = 0 - call_dict[fr][full_name] += 1 - - if full_name not in func_count: - func_count[full_name] = 0 - func_count[full_name] += 1 - if func_count[full_name] > func_count_max: - func_count_max = func_count[full_name] - - call_stack.append(full_name) - call_stack_timer.append(time.time()) - - else: - call_stack.append('') - call_stack_timer.append(None) - - if event == 'return': - if call_stack: - full_name = call_stack.pop(-1) - t = call_stack_timer.pop(-1) - if t and time_filter(stack=call_stack, full_name=full_name): - if full_name not in func_time: - func_time[full_name] = 0 - call_time = (time.time() - t) - func_time[full_name] += call_time - if func_time[full_name] > func_time_max: - func_time_max = func_time[full_name] - - return tracer - - -def get_dot(stop=True): - """Returns a string containing a DOT file. Setting stop to True will cause - the trace to stop. - """ - global func_time_max

1 0

gajim: disable rfilter only when we have finished getting the co...
by Yann Leboulanger 24 Aug '13

24 Aug '13

changeset 00cba73b45cb in /home/hg/repos/gajim branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=00cba73b45cb description: disable rfilter only when we have finished getting the correct iter. Fixes #7430 diffstat: src/roster_window.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 4f55e5523c0c -r 00cba73b45cb src/roster_window.py --- a/src/roster_window.py Fri Aug 16 09:34:01 2013 +0200 +++ b/src/roster_window.py Fri Aug 16 09:39:10 2013 +0200 @@ -4069,7 +4069,7 @@ self.tree.expand_row(path, False) return if self.rfilter_enabled: - self.disable_rfilter() + Gobject.idle_add(self.disable_rfilter) jid = model[path][C_JID] resource = None contact = gajim.contacts.get_contact_with_highest_priority(account, jid)

1 0

gajim: add monotonic to the list of ignored modules by demandimp...
by Yann Leboulanger 24 Aug '13

24 Aug '13

changeset d725d13a1069 in /home/hg/repos/gajim branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=d725d13a1069 description: add monotonic to the list of ignored modules by demandimport. Fixes #7409 diffstat: src/gajim.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 00cba73b45cb -r d725d13a1069 src/gajim.py --- a/src/gajim.py Fri Aug 16 09:39:10 2013 +0200 +++ b/src/gajim.py Fri Aug 16 09:55:55 2013 +0200 @@ -73,7 +73,7 @@ #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'] +# 'Crypto.PublicKey', 'IPython', 'contextlib', 'imp', 'monotonic'] if os.name == 'nt': import locale

1 0

gajim: show error dialog of profile window transient for profile...
by Yann Leboulanger 24 Aug '13

24 Aug '13

changeset a11bca1a96ac in /home/hg/repos/gajim branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=a11bca1a96ac description: show error dialog of profile window transient for profile window. see #7185 diffstat: src/profile_window.py | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diffs (50 lines): diff -r 5cddd914a01a -r a11bca1a96ac src/profile_window.py --- a/src/profile_window.py Thu Aug 15 19:45:34 2013 +0200 +++ b/src/profile_window.py Thu Aug 15 22:20:13 2013 +0200 @@ -146,7 +146,8 @@ invalid_file = True if invalid_file: if True: # keep identation - dialogs.ErrorDialog(_('Could not load image'), msg) + dialogs.ErrorDialog(_('Could not load image'), msg, + transient_for=self.window) return if filesize > 16384: if scaled_pixbuf: @@ -162,7 +163,8 @@ # rescale it pixbuf = gtkgui_helpers.get_scaled_pixbuf(pixbuf, 'vcard') except AttributeError: # unknown format - dialogs.ErrorDialog(_('Could not load image')) + dialogs.ErrorDialog(_('Could not load image'), + transient_for=self.window) return self.dialog.destroy() self.dialog = None @@ -237,7 +239,7 @@ if not widget.is_focus(): pritext = _('Wrong date format') dialogs.ErrorDialog(pritext, _('Format of the date must be ' - 'YYYY-MM-DD')) + 'YYYY-MM-DD'), transient_for=self.window) GLib.idle_add(lambda: widget.grab_focus()) return True @@ -373,7 +375,7 @@ if gajim.connections[self.account].connected < 2: dialogs.ErrorDialog(_('You are not connected to the server'), _('Without a connection, you can not publish your contact ' - 'information.')) + 'information.'), transient_for=self.window) return vcard_ = self.make_vcard() nick = '' @@ -413,7 +415,7 @@ self.update_progressbar_timeout_id = None dialogs.InformationDialog(_('vCard publication failed'), _('There was an error while publishing your personal information, ' - 'try again later.')) + 'try again later.'), transient_for=self.window) def on_cancel_button_clicked(self, widget): self.window.destroy()

1 0

gajim: fix transient for windows. Fixes #7185
by Yann Leboulanger 24 Aug '13

24 Aug '13

changeset 5103d04fb24e in /home/hg/repos/gajim branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=5103d04fb24e description: fix transient for windows. Fixes #7185 diffstat: src/chat_control.py | 12 +++++++----- src/dialogs.py | 33 ++++++++++++++++++++++----------- src/disco.py | 8 +++++--- src/groupchat_control.py | 12 ++++++++---- src/session.py | 3 ++- 5 files changed, 44 insertions(+), 24 deletions(-) diffs (205 lines): diff -r a11bca1a96ac -r 5103d04fb24e src/chat_control.py --- a/src/chat_control.py Thu Aug 15 22:20:13 2013 +0200 +++ b/src/chat_control.py Thu Aug 15 23:14:42 2013 +0200 @@ -2834,11 +2834,13 @@ on_no(self) dialogs.ConfirmationDialog( - # %s is being replaced in the code with JID - _('You just received a new message from "%s"') % self.contact.jid, - _('If you close this tab and you have history disabled, '\ - 'this message will be lost.'), on_response_ok=on_ok, - on_response_cancel=on_cancel) + #%s is being replaced in the code with JID + _('You just received a new message from "%s"') % \ + self.contact.jid, + _('If you close this tab and you have history disabled, '\ + 'this message will be lost.'), on_response_ok=on_ok, + on_response_cancel=on_cancel, + transient_for=self.parent_win.window) return on_yes(self) diff -r a11bca1a96ac -r 5103d04fb24e src/dialogs.py --- a/src/dialogs.py Thu Aug 15 22:20:13 2013 +0200 +++ b/src/dialogs.py Thu Aug 15 23:14:42 2013 +0200 @@ -1531,10 +1531,10 @@ """ def __init__(self, pritext, sectext='', on_response_ok=None, - on_response_cancel=None): + on_response_cancel=None, transient_for=None): self.user_response_ok = on_response_ok self.user_response_cancel = on_response_cancel - HigDialog.__init__(self, None, + HigDialog.__init__(self, transient_for, Gtk.MessageType.QUESTION, Gtk.ButtonsType.OK_CANCEL, pritext, sectext, self.on_response_ok, self.on_response_cancel) self.popup() @@ -1612,8 +1612,10 @@ HIG compliant info dialog """ - def __init__(self, pritext, sectext=''): - if hasattr(gajim.interface, 'roster') and gajim.interface.roster: + def __init__(self, pritext, sectext='', transient_for=None): + if transient_for: + parent = transient_for + elif hasattr(gajim.interface, 'roster') and gajim.interface.roster: parent = gajim.interface.roster.window else: parent = None @@ -1735,11 +1737,13 @@ """ def __init__(self, pritext, sectext='', checktext='', on_response_ok=None, - on_response_cancel=None, is_modal=True): + on_response_cancel=None, is_modal=True, transient_for=None): self.user_response_ok = on_response_ok self.user_response_cancel = on_response_cancel - if hasattr(gajim.interface, 'roster') and gajim.interface.roster: + if transient_for: + parent = transient_for + elif hasattr(gajim.interface, 'roster') and gajim.interface.roster: parent = gajim.interface.roster.window else: parent = None @@ -1995,13 +1999,16 @@ Common Class for Input dialogs """ - def __init__(self, title, label_str, is_modal, ok_handler, cancel_handler): + def __init__(self, title, label_str, is_modal, ok_handler, cancel_handler, + transient_for=None): self.dialog = self.xml.get_object('input_dialog') label = self.xml.get_object('label') self.dialog.set_title(title) label.set_markup(label_str) self.cancel_handler = cancel_handler self.vbox = self.xml.get_object('vbox') + if transient_for: + self.dialog.set_transient_for(transient_for) self.ok_handler = ok_handler okbutton = self.xml.get_object('okbutton') @@ -2038,10 +2045,10 @@ """ def __init__(self, title, label_str, input_str=None, is_modal=True, - ok_handler=None, cancel_handler=None): + ok_handler=None, cancel_handler=None, transient_for=None): self.xml = gtkgui_helpers.get_gtk_builder('input_dialog.ui') CommonInputDialog.__init__(self, title, label_str, is_modal, ok_handler, - cancel_handler) + cancel_handler, transient_for=transient_for) self.input_entry = self.xml.get_object('input_entry') if input_str: self.set_entry(input_str) @@ -2221,7 +2228,8 @@ """ def __init__(self, title, label_str1, label_str2, input_str1=None, - input_str2=None, is_modal=True, ok_handler=None, cancel_handler=None): + input_str2=None, is_modal=True, ok_handler=None, cancel_handler=None, + transient_for=None): self.xml = gtkgui_helpers.get_gtk_builder('dubbleinput_dialog.ui') self.dialog = self.xml.get_object('dubbleinput_dialog') label1 = self.xml.get_object('label1') @@ -2238,6 +2246,8 @@ if input_str2: self.input_entry2.set_text(input_str2) self.input_entry2.select_region(0, -1) # select all + if transient_for: + self.dialog.set_transient_for(transient_for) self.dialog.set_modal(is_modal) @@ -4574,7 +4584,8 @@ name = self.new_privacy_list_entry.get_text() if not name: ErrorDialog(_('Invalid List Name'), - _('You must enter a name to create a privacy list.')) + _('You must enter a name to create a privacy list.'), + transient_for=self.window) return key_name = 'privacy_list_%s' % name if key_name in gajim.interface.instances[self.account]: diff -r a11bca1a96ac -r 5103d04fb24e src/disco.py --- a/src/disco.py Thu Aug 15 22:20:13 2013 +0200 +++ b/src/disco.py Thu Aug 15 23:14:42 2013 +0200 @@ -765,13 +765,15 @@ # We can't travel anywhere else. self.destroy() dialogs.ErrorDialog(_('The service could not be found'), -_('There is no service at the address you entered, or it is not responding. ' - 'Check the address and try again.')) + _('There is no service at the address you entered, or it is ' + 'not responding. Check the address and try again.'), + transient_for=self.window) return klass = self.cache.get_browser(identities, features) if not klass: dialogs.ErrorDialog(_('The service is not browsable'), -_('This type of service does not contain any items to browse.')) + _('This type of service does not contain any items to browse.'), + transient_for=self.window) return elif klass is None: klass = AgentBrowser diff -r a11bca1a96ac -r 5103d04fb24e src/groupchat_control.py --- a/src/groupchat_control.py Thu Aug 15 22:20:13 2013 +0200 +++ b/src/groupchat_control.py Thu Aug 15 23:14:42 2013 +0200 @@ -2139,7 +2139,8 @@ dialogs.ConfirmationDialogCheck(pritext, sectext, _('_Do not ask me again'), on_response_ok=on_ok, - on_response_cancel=on_cancel) + on_response_cancel=on_cancel, + transient_for=self.parent_win.window) return on_yes(self) @@ -2215,7 +2216,8 @@ dialogs.DoubleInputDialog(_('Destroying %s') % '\u200E' + \ self.room_jid, _('You are going to definitively destroy this ' 'room.\nYou may specify a reason below:'), - _('You may also enter an alternate venue:'), ok_handler=on_ok) + _('You may also enter an alternate venue:'), ok_handler=on_ok, + transient_for=self.parent_win.window) def _on_bookmark_room_menuitem_activate(self, widget): """ @@ -2415,7 +2417,8 @@ # ask for reason dialogs.InputDialog(_('Kicking %s') % nick, - _('You may specify a reason below:'), ok_handler=on_ok) + _('You may specify a reason below:'), ok_handler=on_ok, + transient_for=self.parent_win.window) def mk_menu(self, event, iter_): """ @@ -2754,7 +2757,8 @@ nick = gajim.get_nick_from_jid(jid) # ask for reason dialogs.InputDialog(_('Banning %s') % nick, - _('You may specify a reason below:'), ok_handler=on_ok) + _('You may specify a reason below:'), ok_handler=on_ok, + transient_for=self.parent_win.window) def grant_membership(self, widget, jid): """ diff -r a11bca1a96ac -r 5103d04fb24e src/session.py --- a/src/session.py Thu Aug 15 22:20:13 2013 +0200 +++ b/src/session.py Thu Aug 15 23:14:42 2013 +0200 @@ -413,7 +413,8 @@ 'acceptable?''') % ( negotiation.describe_features(ask_user)), on_response_yes=accept_nondefault_options, - on_response_no=reject_nondefault_options) + on_response_no=reject_nondefault_options, + transient_for=self.control.parent_win.window) else: self.respond_e2e_bob(form, negotiated, not_acceptable)

1 0

gajim: fix transient for. See #7185
by Yann Leboulanger 24 Aug '13

24 Aug '13

changeset 8e55e54d541a in /home/hg/repos/gajim branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=8e55e54d541a description: fix transient for. See #7185 diffstat: src/session.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diffs (13 lines): diff -r 5103d04fb24e -r 8e55e54d541a src/session.py --- a/src/session.py Thu Aug 15 23:14:42 2013 +0200 +++ b/src/session.py Thu Aug 15 23:16:38 2013 +0200 @@ -473,7 +473,8 @@ negotiation.describe_features(ask_user)), _('Always accept for this contact'), on_response_yes = accept_nondefault_options, - on_response_no = reject_nondefault_options) + on_response_no = reject_nondefault_options, + transient_for=self.control.parent_win.window) else: try: self.accept_e2e_alice(form, negotiated)

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