Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] 2 commits: fix some import warnings and errors pointed out by pylint
by Philipp Hörist 24 Aug '17

24 Aug '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 663176cf by André Apitzsch at 2017-08-24T01:18:01+02:00 fix some import warnings and errors pointed out by pylint - - - - - 94cbccec by Philipp Hörist at 2017-08-24T14:44:36+02:00 Merge branch 'imports' into 'master' fix some import warnings and errors pointed out by pylint See merge request !121 - - - - - 3 changed files: - gajim/common/app.py - gajim/common/commands.py - gajim/ipython_view.py Changes: ===================================== gajim/common/app.py ===================================== --- a/gajim/common/app.py +++ b/gajim/common/app.py @@ -30,13 +30,16 @@ import os import logging import locale -import gi import uuid from distutils.version import LooseVersion as V +import gi +import nbxmpp from gajim.common import config -import nbxmpp +from gajim.common import configpaths from gajim.common import ged as ged_module +from gajim.common.contacts import LegacyContactsAPI +from gajim.common.events import Events interface = None # The actual interface (the gtk one for the moment) thread_interface = None # Interface to run a thread and then a callback @@ -54,7 +57,6 @@ log = logging.getLogger('gajim') logger = None -from gajim.common import configpaths gajimpaths = configpaths.gajimpaths VCARD_PATH = gajimpaths['VCARD'] @@ -86,9 +88,6 @@ else: os_info = None # used to cache os information -from gajim.common.contacts import LegacyContactsAPI -from gajim.common.events import Events - gmail_domains = ['gmail.com', 'googlemail.com'] transport_type = {} # list the type of transport @@ -182,7 +181,6 @@ try: except ImportError: HAVE_GPG = False else: - import os import subprocess def test_gpg(binary='gpg'): if os.name == 'nt': ===================================== gajim/common/commands.py ===================================== --- a/gajim/common/commands.py +++ b/gajim/common/commands.py @@ -163,11 +163,11 @@ class ChangeStatusCommand(AdHocCommand): return False # finish the session def find_current_groupchats(account): - import message_control + from gajim import message_control rooms = [] for gc_control in app.interface.msg_win_mgr.get_controls( - message_control.TYPE_GC) + app.interface.minimized_controls[account].\ - values(): + message_control.TYPE_GC) + \ + app.interface.minimized_controls[account].values(): acct = gc_control.account # check if account is the good one if acct != account: ===================================== gajim/ipython_view.py ===================================== --- a/gajim/ipython_view.py +++ b/gajim/ipython_view.py @@ -52,7 +52,7 @@ import re import sys import os from gi.repository import Pango -from StringIO import StringIO +from io import StringIO try: import IPython View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/b9363fe9838c792e1e75f4ed038f11bf8… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/b9363fe9838c792e1e75f4ed038f11bf8… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Remove pylint.rc from gajim folder
by Philipp Hörist 23 Aug '17

23 Aug '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: b9363fe9 by Philipp Hörist at 2017-08-24T00:13:18+02:00 Remove pylint.rc from gajim folder - - - - - 1 changed file: - − gajim/pylint.rc Changes: ===================================== gajim/pylint.rc deleted ===================================== --- a/gajim/pylint.rc +++ /dev/null @@ -1,310 +0,0 @@ -# lint Python modules using external checkers. -# -# This is the main checker controling the other ones and the reports -# generation. It is itself both a raw checker and an astng checker in order -# to: -# * handle message activation / deactivation at the module level -# * handle some basic but necessary stats'data (number of classes, methods...) -# -[MASTER] - -# Specify a configuration file. -#rcfile= - -# Python code to execute, usually for sys.path manipulation such as -# pygtk.require(). -#init-hook= - -# Profiled execution. -profile=no - -# Add <file or directory> to the black list. It should be a base name, not a -# path. You may set this option multiple times. -ignore=CVS - -# Pickle collected data for later comparisons. -persistent=yes - -# Set the cache size for astng objects. -cache-size=500 - -# List of plugins (as comma separated values of python modules names) to load, -# usually to register additional checkers. -load-plugins= - - -[MESSAGES CONTROL] - -# Enable only checker(s) with the given id(s). This option conflicts with the -# disable-checker option -#enable-checker= - -# Enable all checker(s) except those with the given id(s). This option -# conflicts with the enable-checker option -#disable-checker= - -# Enable all messages in the listed categories. -#enable-msg-cat= - -# Disable all messages in the listed categories. -#disable-msg-cat= - -# Enable the message(s) with the given id(s). -enable-msg=R0801 - -# Disable the message(s) with the given id(s). -disable-msg=W0312 -# disable-msg= - - -[REPORTS] - -# set the output format. Available formats are text, parseable, colorized, msvs -# (visual studio) and html -output-format=text - -# Include message's id in output -include-ids=yes - -# Put messages in a separate file for each module / package specified on the -# command line instead of printing them on stdout. Reports (if any) will be -# written in a file name "pylint_global.[txt|html]". -files-output=no - -# Tells wether to display a full report or only the messages -reports=yes - -# Python expression which should return a note less than 10 (10 is the highest -# note).You have access to the variables errors warning, statement which -# respectivly contain the number of errors / warnings messages and the total -# number of statements analyzed. This is used by the global evaluation report -# (R0004). -evaluation=10.0 - ((float(5 * error + warning + refactor + convention) / statement) * 10) - -# Add a comment according to your evaluation note. This is used by the global -# evaluation report (R0004). -comment=no - -# Enable the report(s) with the given id(s). -#enable-report= - -# Disable the report(s) with the given id(s). -#disable-report= - - -# try to find bugs in the code using type inference -# -[TYPECHECK] - -# Tells wether missing members accessed in mixin class should be ignored. A -# mixin class is detected if its name ends with "mixin" (case insensitive). -ignore-mixin-members=yes - -# List of classes names for which member attributes should not be checked -# (useful for classes with attributes dynamicaly set). -ignored-classes=SQLObject - -# When zope mode is activated, consider the acquired-members option to ignore -# access to some undefined attributes. -zope=no - -# List of members which are usually get through zope's acquisition mecanism and -# so shouldn't trigger E0201 when accessed (need zope=yes to be considered). -acquired-members=REQUEST,acl_users,aq_parent - - -# checks for -# * unused variables / imports -# * undefined variables -# * redefinition of variable from builtins or from an outer scope -# * use of variable before assigment -# -[VARIABLES] - -# Tells wether we should check for unused import in __init__ files. -init-import=no - -# A regular expression matching names used for dummy variables (i.e. not used). -dummy-variables-rgx=_|dummy - -# List of additional names supposed to be defined in builtins. Remember that -# you should avoid to define new builtins when possible. -additional-builtins= - - -# checks for : -# * doc strings -# * modules / classes / functions / methods / arguments / variables name -# * number of arguments, local variables, branchs, returns and statements in -# functions, methods -# * required module attributes -# * dangerous default values as arguments -# * redefinition of function / method / class -# * uses of the global statement -# -[BASIC] - -# Required attributes for module, separated by a comma -required-attributes= - -# Regular expression which should only match functions or classes name which do -# not require a docstring -no-docstring-rgx=__.*__ - -# Regular expression which should only match correct module names -module-rgx=(([a-z_][a-z0-9_]*)|([A-Z][a-zA-Z0-9]+))$ - -# Regular expression which should only match correct module level names -const-rgx=(([A-Z_][A-Z1-9_]*)|(__.*__))$ - -# Regular expression which should only match correct class names -class-rgx=[A-Z_][a-zA-Z0-9]+$ - -# Regular expression which should only match correct function names -function-rgx=[a-z_][a-z0-9_]{2,30}$ - -# Regular expression which should only match correct method names -method-rgx=[a-z_][a-z0-9_]{2,30}$ - -# Regular expression which should only match correct instance attribute names -attr-rgx=[a-z_][a-z0-9_]{2,30}$ - -# Regular expression which should only match correct argument names -argument-rgx=[a-z_][a-z0-9_]{2,30}$ - -# Regular expression which should only match correct variable names -variable-rgx=[a-z_][a-z0-9_]{2,30}$ - -# Regular expression which should only match correct list comprehension / -# generator expression variable names -inlinevar-rgx=[A-Za-z_][A-Za-z0-9_]*$ - -# Good variable names which should always be accepted, separated by a comma -good-names=i,j,k,ex,Run,_ - -# Bad variable names which should always be refused, separated by a comma -bad-names=foo,bar,baz,toto,tutu,tata - -# List of builtins function names that should not be used, separated by a comma -bad-functions=map,filter,apply,input - - -# checks for sign of poor/misdesign: -# * number of methods, attributes, local variables... -# * size, complexity of functions, methods -# -[DESIGN] - -# Maximum number of arguments for function / method -max-args=5 - -# Maximum number of locals for function / method body -max-locals=15 - -# Maximum number of return / yield for function / method body -max-returns=6 - -# Maximum number of branch for function / method body -max-branchs=12 - -# Maximum number of statements in function / method body -max-statements=50 - -# Maximum number of parents for a class (see R0901). -max-parents=7 - -# Maximum number of attributes for a class (see R0902). -max-attributes=7 - -# Minimum number of public methods for a class (see R0903). -min-public-methods=2 - -# Maximum number of public methods for a class (see R0904). -max-public-methods=20 - - -# checks for -# * external modules dependencies -# * relative / wildcard imports -# * cyclic imports -# * uses of deprecated modules -# -[IMPORTS] - -# Deprecated modules which should not be used, separated by a comma -deprecated-modules=regsub,string,TERMIOS,Bastion,rexec - -# Create a graph of every (i.e. internal and external) dependencies in the -# given file (report R0402 must not be disabled) -import-graph= - -# Create a graph of external dependencies in the given file (report R0402 must -# not be disabled) -ext-import-graph= - -# Create a graph of internal dependencies in the given file (report R0402 must -# not be disabled) -int-import-graph= - - -# checks for : -# * methods without self as first argument -# * overridden methods signature -# * access only to existant members via self -# * attributes not defined in the __init__ method -# * supported interfaces implementation -# * unreachable code -# -[CLASSES] - -# List of interface methods to ignore, separated by a comma. This is used for -# instance to not check methods defines in Zope's Interface base class. -ignore-iface-methods=isImplementedBy,deferred,extends,names,namesAndDescriptions,queryDescriptionFor,getBases,getDescriptionFor,getDoc,getName,getTaggedValue,getTaggedValueTags,isEqualOrExtendedBy,setTaggedValue,isImplementedByInstancesOf,adaptWith,is_implemented_by - -# List of method names used to declare (i.e. assign) instance attributes. -defining-attr-methods=__init__,__new__,setUp - - -# checks for similarities and duplicated code. This computation may be -# memory / CPU intensive, so you should disable it if you experiments some -# problems. -# -[SIMILARITIES] - -# Minimum lines number of a similarity. -min-similarity-lines=4 - -# Ignore comments when computing similarities. -ignore-comments=yes - -# Ignore docstrings when computing similarities. -ignore-docstrings=yes - - -# checks for: -# * warning notes in the code like FIXME, XXX -# * PEP 263: source code with non ascii character but no encoding declaration -# -[MISCELLANEOUS] - -# List of note tags to take in consideration, separated by a comma. -notes=FIXME,XXX,TODO - - -# checks for : -# * unauthorized constructions -# * strict indentation -# * line length -# * use of <> instead of != -# -[FORMAT] - -# Maximum number of characters on a single line. -max-line-length=80 - -# Maximum number of lines in a module -max-module-lines=1000 - -# String used as indentation unit. This is usually " " (4 spaces) or "\t" (1 -# tab). -indent-string=' ' View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/b9363fe9838c792e1e75f4ed038f11bf88… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/b9363fe9838c792e1e75f4ed038f11bf88… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] remove unused import / variable
by Yann Leboulanger 23 Aug '17

23 Aug '17

Yann Leboulanger pushed to branch master at gajim / gajim Commits: 2b065c0e by Yann Leboulanger at 2017-08-24T00:07:14+02:00 remove unused import / variable - - - - - 1 changed file: - gajim/gajim.py Changes: ===================================== gajim/gajim.py ===================================== --- a/gajim/gajim.py +++ b/gajim/gajim.py @@ -39,7 +39,6 @@ import sys import os -import logging import signal import locale import gi @@ -161,7 +160,7 @@ class GajimApplication(Gtk.Application): sys.path.append('.') APP = 'gajim' DIR = '../po' - lang, enc = locale.getdefaultlocale() + lang = locale.getdefaultlocale()[0] os.environ['LANG'] = lang gettext.bindtextdomain(APP, DIR) gettext.textdomain(APP) @@ -228,9 +227,6 @@ class GajimApplication(Gtk.Application): signal.signal(signal.SIGINT, sigint_cb) signal.signal(signal.SIGTERM, sigint_cb) - print("Encodings: d:{}, fs:{}, p:{}".format(sys.getdefaultencoding(), - sys.getfilesystemencoding(), locale.getpreferredencoding())) - # Set Application Menu app.app = self path = os.path.join(configpaths.get('GUI'), 'application_menu.ui') @@ -409,5 +405,5 @@ class GajimApplication(Gtk.Application): if __name__ == '__main__': - app = GajimApplication() - app.run(sys.argv) + appli = GajimApplication() + appli.run(sys.argv) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/2b065c0e58fec0ce691c9501fcb33f94da… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/2b065c0e58fec0ce691c9501fcb33f94da… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Zeroconf: Call method with correct arguments
by Philipp Hörist 23 Aug '17

23 Aug '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 1a352c0e by Philipp Hörist at 2017-08-23T23:34:16+02:00 Zeroconf: Call method with correct arguments - - - - - 1 changed file: - gajim/common/zeroconf/zeroconf_bonjour.py Changes: ===================================== gajim/common/zeroconf/zeroconf_bonjour.py ===================================== --- a/gajim/common/zeroconf/zeroconf_bonjour.py +++ b/gajim/common/zeroconf/zeroconf_bonjour.py @@ -93,7 +93,7 @@ class Zeroconf: def new_domain_callback(self, interface, protocol, domain, flags): if domain != "local": - self.browse_domain(interface, protocol, domain) + self.browse_domain(domain) # takes a TXTRecord instance def txt_array_to_dict(self, txt): View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/1a352c0e4723acd345b20a24334bd3fa76… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/1a352c0e4723acd345b20a24334bd3fa76… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Resolver: Raise correct error
by Philipp Hörist 23 Aug '17

23 Aug '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 28045e9d by Philipp Hörist at 2017-08-23T23:29:38+02:00 Resolver: Raise correct error - - - - - 1 changed file: - gajim/common/resolver.py Changes: ===================================== gajim/common/resolver.py ===================================== --- a/gajim/common/resolver.py +++ b/gajim/common/resolver.py @@ -96,7 +96,7 @@ class GioResolver(CommonResolver): if type_ == 'txt': # TXT record resolution isn't used anywhere at the moment so # implementing it here isn't urgent - raise NotImplemented("Gio resolver does not currently implement TXT records") + raise NotImplementedError("Gio resolver does not currently implement TXT records") else: callback = functools.partial(self._on_ready_srv, host) type_ = Gio.ResolverRecordType.SRV View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/28045e9d36b2061a7949d77bda98cc8120… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/28045e9d36b2061a7949d77bda98cc8120… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Add keyword arg to prototype
by Philipp Hörist 23 Aug '17

23 Aug '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 00d091dd by Philipp Hörist at 2017-08-23T23:26:26+02:00 Add keyword arg to prototype this was probably forgotten - - - - - 1 changed file: - gajim/message_control.py Changes: ===================================== gajim/message_control.py ===================================== --- a/gajim/message_control.py +++ b/gajim/message_control.py @@ -169,7 +169,7 @@ class MessageControl(object): # None clears any current label. return None - def prepare_context_menu(self): + def prepare_context_menu(self, hide_buttonbar_items=False): """ Derived classes SHOULD implement this """ View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/00d091dd548436900ec04354f69a1a2104… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/00d091dd548436900ec04354f69a1a2104… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 8 commits: Remove unused code
by Philipp Hörist 23 Aug '17

23 Aug '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 00e72b1d by Philipp Hörist at 2017-08-23T18:34:17+02:00 Remove unused code Whatever this was, its not used since 4 years see 8f71d9f21955d30cd47fabdf0b95869603887cb9 - - - - - 44a28770 by Philipp Hörist at 2017-08-23T18:46:43+02:00 Fix method call Regression from making gajim a module - - - - - b72c3c10 by Philipp Hörist at 2017-08-23T18:47:39+02:00 Remove unused event handler There exists no 'default_status_eventbox' anymore in Gajim - - - - - 80e5c27f by Philipp Hörist at 2017-08-23T18:57:38+02:00 Use correct inherit pattern - - - - - 6cacc559 by Philipp Hörist at 2017-08-23T19:50:29+02:00 Dont use internal members in Dialogs vbox and action_area are internal members of Gtk.Dialog. We should use the methods provided by the API to get these Objects. - - - - - 4a9ba28a by Philipp Hörist at 2017-08-23T20:01:48+02:00 Fix typo - - - - - 26dda615 by Philipp Hörist at 2017-08-23T20:15:32+02:00 Fix undefined-variable - - - - - 95f4703d by Philipp Hörist at 2017-08-23T20:24:55+02:00 Fix unexpected-keyword-arg - - - - - 6 changed files: - gajim/common/connection_handlers.py - gajim/common/dataforms.py - gajim/config.py - gajim/conversation_textview.py - gajim/dialogs.py - gajim/roster_window.py Changes: ===================================== gajim/common/connection_handlers.py ===================================== --- a/gajim/common/connection_handlers.py +++ b/gajim/common/connection_handlers.py @@ -1788,7 +1788,7 @@ ConnectionHandlersBase, ConnectionJingle, ConnectionIBBytestream): return if result.getType() == 'result': - data = msg.getTags('data', namespace=nbxmpp.NS_BOB) + data = result.getTags('data', namespace=nbxmpp.NS_BOB) if data.getAttr('cid') == cid: for func in self.awaiting_cids[cid]: cb = func[0] ===================================== gajim/common/dataforms.py ===================================== --- a/gajim/common/dataforms.py +++ b/gajim/common/dataforms.py @@ -551,7 +551,7 @@ class DataRecord(ExtendedNode): fdel(self) for field in fields: if not isinstance(field, DataField): - ExtendField(extend=field) + ExtendField(field) self.addChild(node=field) def fdel(self): ===================================== gajim/config.py ===================================== --- a/gajim/config.py +++ b/gajim/config.py @@ -1049,12 +1049,6 @@ class PreferencesWindow: model[iter_][3]) app.config.set_per('defaultstatusmsg', status, 'message', message) - def on_default_status_expander_activate(self, expander): - eventbox = self.xml.get_object('default_status_eventbox') - vbox = self.xml.get_object('status_vbox') - vbox.set_child_packing(eventbox, not expander.get_expanded(), True, 0, - Gtk.PACK_START) - def save_status_messages(self, model): for msg in app.config.get_per('statusmsg'): app.config.del_per('statusmsg', msg) @@ -2155,8 +2149,8 @@ class AccountsWindow: app.interface.roster.setup_and_draw_roster() self.init_accounts() self.select_account(new_name) - gajim.app.remove_account_actions(old_name) - gajim.app.add_account_actions(new_name) + app.app.remove_account_actions(old_name) + app.app.add_account_actions(new_name) gui_menu_builder.build_accounts_menu() title = _('Rename Account') ===================================== gajim/conversation_textview.py ===================================== --- a/gajim/conversation_textview.py +++ b/gajim/conversation_textview.py @@ -220,8 +220,6 @@ class ConversationTextview(GObject.GObject): id_ = self.tv.connect('button_press_event', self.on_textview_button_press_event) self.handlers[id_] = self.tv - id_ = self.tv.connect('draw', self.on_textview_draw) - self.handlers[id_] = self.tv self.account = account self.cursor_changed = False @@ -520,34 +518,6 @@ class ConversationTextview(GObject.GObject): # appeared) GLib.idle_add(self.scroll_to_end_iter) - def on_textview_draw(self, widget, ctx): - return - #TODO - expalloc = event.area - exp_x0 = expalloc.x - exp_y0 = expalloc.y - exp_x1 = exp_x0 + expalloc.width - exp_y1 = exp_y0 + expalloc.height - - try: - tryfirst = [self.image_cache[(exp_x0, exp_y0)]] - except KeyError: - tryfirst = [] - - for image in tryfirst + self.images: - imgalloc = image.allocation - img_x0 = imgalloc.x - img_y0 = imgalloc.y - img_x1 = img_x0 + imgalloc.width - img_y1 = img_y0 + imgalloc.height - - if img_x0 <= exp_x0 and img_y0 <= exp_y0 and \ - exp_x1 <= img_x1 and exp_y1 <= img_y1: - self.image_cache[(img_x0, img_y0)] = image - widget.propagate_expose(image, event) - return True - return False - def clear(self, tv = None): """ Clear text in the textview ===================================== gajim/dialogs.py ===================================== --- a/gajim/dialogs.py +++ b/gajim/dialogs.py @@ -565,18 +565,17 @@ class TimeoutDialog: Class designed to be derivated to create timeout'd dialogs (dialogs that closes automatically after a timeout) """ - def __init__(self, timeout, on_timeout): + def __init__(self, timeout): self.countdown_left = timeout self.countdown_enabled = True self.title_text = '' - self.on_timeout = on_timeout def run_timeout(self): if self.countdown_left > 0: self.countdown() GLib.timeout_add_seconds(1, self.countdown) - def on_timeout(): + def on_timeout(self): """ To be implemented in derivated classes """ @@ -598,7 +597,7 @@ class TimeoutDialog: class ChangeStatusMessageDialog(TimeoutDialog): def __init__(self, on_response, show=None, show_pep=True): countdown_time = app.config.get('change_status_window_timeout') - TimeoutDialog.__init__(self, countdown_time, self.on_timeout) + TimeoutDialog.__init__(self, countdown_time) self.show = show self.pep_dict = {} self.show_pep = show_pep @@ -1390,7 +1389,7 @@ class Dialog(Gtk.Dialog): self.user_response_ok = on_response_ok self.user_response_cancel = on_response_cancel self.set_border_width(6) - self.vbox.set_spacing(12) + self.get_content_area().set_spacing(12) self.set_resizable(False) for stock, response in buttons: @@ -1423,7 +1422,7 @@ class Dialog(Gtk.Dialog): self.destroy() def get_button(self, index): - buttons = self.action_area.get_children() + buttons = self.get_action_area().get_children() return index < len(buttons) and buttons[index] or None @@ -1674,20 +1673,21 @@ class YesNoDialog(HigDialog): sectext, on_response_yes=self.on_response_yes, on_response_no=self.on_response_no) + vbox = self.get_content_area() if checktext: self.checkbutton = Gtk.CheckButton.new_with_mnemonic(checktext) - self.vbox.pack_start(self.checkbutton, False, True, 0) + vbox.pack_start(self.checkbutton, False, True, 0) else: self.checkbutton = None if text_label: label = Gtk.Label(label=text_label) - self.vbox.pack_start(label, False, True, 0) + vbox.pack_start(label, False, True, 0) buff = Gtk.TextBuffer() self.textview = Gtk.TextView.new_with_buffer(buff) frame = Gtk.Frame() frame.set_shadow_type(Gtk.ShadowType.IN) frame.add(self.textview) - self.vbox.pack_start(frame, False, True, 0) + vbox.pack_start(frame, False, True, 0) else: self.textview = None self.set_modal(False) @@ -1765,11 +1765,11 @@ class ConfirmationDialogCheck(ConfirmationDialog): self.set_default_response(Gtk.ResponseType.OK) - ok_button = self.action_area.get_children()[0] # right to left + ok_button = self.get_action_area().get_children()[0] # right to left ok_button.grab_focus() self.checkbutton = Gtk.CheckButton.new_with_mnemonic(checktext) - self.vbox.pack_start(self.checkbutton, False, True, 0) + self.get_content_area().pack_start(self.checkbutton, False, True, 0) self.set_modal(is_modal) self.popup() @@ -1820,21 +1820,22 @@ class ConfirmationDialogDoubleCheck(ConfirmationDialog): self.set_default_response(Gtk.ResponseType.OK) - ok_button = self.action_area.get_children()[0] # right to left + ok_button = self.get_action_area().get_children()[0] # right to left ok_button.grab_focus() + vbox = self.get_content_area() if checktext1: self.checkbutton1 = Gtk.CheckButton.new_with_mnemonic(checktext1) if tooltip1: self.checkbutton1.set_tooltip_text(tooltip1) - self.vbox.pack_start(self.checkbutton1, False, True, 0) + vbox.pack_start(self.checkbutton1, False, True, 0) else: self.checkbutton1 = None if checktext2: self.checkbutton2 = Gtk.CheckButton.new_with_mnemonic(checktext2) if tooltip2: self.checkbutton2.set_tooltip_text(tooltip2) - self.vbox.pack_start(self.checkbutton2, False, True, 0) + vbox.pack_start(self.checkbutton2, False, True, 0) else: self.checkbutton2 = None @@ -1889,7 +1890,7 @@ class PlainConnectionDialog(ConfirmationDialogDoubleCheck): ConfirmationDialogDoubleCheck.__init__(self, pritext, sectext, checktext1, checktext2, tooltip1=tooltip1, on_response_ok=on_ok, on_response_cancel=on_cancel, is_modal=False) - self.ok_button = self.action_area.get_children()[0] # right to left + self.ok_button = self.get_action_area().get_children()[0] # right to left self.ok_button.set_sensitive(False) self.checkbutton1.connect('clicked', self.on_checkbutton_clicked) self.set_title(_('Insecure connection')) @@ -1917,15 +1918,16 @@ class ConfirmationDialogDoubleRadio(ConfirmationDialog): self.set_default_response(Gtk.ResponseType.OK) - ok_button = self.action_area.get_children()[0] # right to left + ok_button = self.get_action_area().get_children()[0] # right to left ok_button.grab_focus() + vbox = self.get_content_area() self.radiobutton1 = Gtk.RadioButton(label=radiotext1) - self.vbox.pack_start(self.radiobutton1, False, True, 0) + vbox.pack_start(self.radiobutton1, False, True, 0) self.radiobutton2 = Gtk.RadioButton(group=self.radiobutton1, label=radiotext2) - self.vbox.pack_start(self.radiobutton2, False, True, 0) + vbox.pack_start(self.radiobutton2, False, True, 0) self.set_modal(is_modal) self.popup() @@ -4770,8 +4772,9 @@ class AvatarChooserDialog(ImageChooserDialog): if on_response_clear: button.connect('clicked', self.on_clear) button.show_all() - self.action_area.pack_start(button, True, True, 0) - self.action_area.reorder_child(button, 0) + action_area = self.get_action_area() + action_area.pack_start(button, True, True, 0) + action_area.reorder_child(button, 0) def on_clear(self, widget): if isinstance(self.response_clear, tuple): @@ -5038,7 +5041,7 @@ class DataFormWindow(Dialog): self.dataform_widget.set_sensitive(True) self.dataform_widget.data_form = self.dataform self.dataform_widget.show_all() - self.vbox.pack_start(self.dataform_widget, True, True, 0) + self.get_content_area().pack_start(self.dataform_widget, True, True, 0) def on_ok(self): form = self.dataform_widget.data_form @@ -5051,7 +5054,7 @@ class DataFormWindow(Dialog): class ResourceConflictDialog(TimeoutDialog, InputDialog): def __init__(self, title, text, resource, ok_handler): - TimeoutDialog.__init__(self, 15, self.on_timeout) + TimeoutDialog.__init__(self, 15) InputDialog.__init__(self, title, text, input_str=resource, is_modal=False, ok_handler=ok_handler) self.title_text = title ===================================== gajim/roster_window.py ===================================== --- a/gajim/roster_window.py +++ b/gajim/roster_window.py @@ -3698,7 +3698,7 @@ class RosterWindow: _('You are participating in one or more group chats'), _('Changing your status to invisible will result in ' 'disconnection from those group chats. Are you sure you ' - 'want to go invisible?'), on_reponse_ok=on_ok, + 'want to go invisible?'), on_response_ok=on_ok, on_response_cancel=on_cancel) return View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/1750217e7fa7a4f1424b7de2437617c47… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/1750217e7fa7a4f1424b7de2437617c47… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: pylint: Ignore a few useless warnings.
by Yann Leboulanger 22 Aug '17

22 Aug '17

Yann Leboulanger pushed to branch master at gajim / gajim Commits: de05dab6 by Emmanuel Gil Peyrot at 2017-08-22T22:51:24+01:00 pylint: Ignore a few useless warnings. - - - - - 1750217e by Yann Leboulanger at 2017-08-23T00:27:22+02:00 Merge branch 'pylint' into 'master' Ignore a few useless warnings in pylint See merge request !120 - - - - - 1 changed file: - pylintrc Changes: ===================================== pylintrc ===================================== --- a/pylintrc +++ b/pylintrc @@ -50,7 +50,7 @@ confidence= # --enable=similarities". If you want to run only the classes checker, but have # no Warning level messages displayed, use"--disable=all --enable=classes # --disable=W" -disable=print-statement,parameter-unpacking,unpacking-in-except,old-raise-syntax,backtick,long-suffix,old-ne-operator,old-octal-literal,import-star-module-level,raw-checker-failed,bad-inline-option,locally-disabled,locally-enabled,file-ignored,suppressed-message,useless-suppression,deprecated-pragma,apply-builtin,basestring-builtin,buffer-builtin,cmp-builtin,coerce-builtin,execfile-builtin,file-builtin,long-builtin,raw_input-builtin,reduce-builtin,standarderror-builtin,unicode-builtin,xrange-builtin,coerce-method,delslice-method,getslice-method,setslice-method,no-absolute-import,old-division,dict-iter-method,dict-view-method,next-method-called,metaclass-assignment,indexing-exception,raising-string,reload-builtin,oct-method,hex-method,nonzero-method,cmp-method,input-builtin,round-builtin,intern-builtin,unichr-builtin,map-builtin-not-iterating,zip-builtin-not-iterating,range-builtin-not-iterating,filter-builtin-not-iterating,using-cmp-argument,eq-without-hash,div-method,idiv-method,rdiv-method,exception-message-attribute,invalid-str-codec,sys-max-int,bad-python3-import,deprecated-string-function,deprecated-str-translate-call,missing-docstring,not-callable +disable=print-statement,parameter-unpacking,unpacking-in-except,old-raise-syntax,backtick,long-suffix,old-ne-operator,old-octal-literal,import-star-module-level,raw-checker-failed,bad-inline-option,locally-disabled,locally-enabled,file-ignored,suppressed-message,useless-suppression,deprecated-pragma,apply-builtin,basestring-builtin,buffer-builtin,cmp-builtin,coerce-builtin,execfile-builtin,file-builtin,long-builtin,raw_input-builtin,reduce-builtin,standarderror-builtin,unicode-builtin,xrange-builtin,coerce-method,delslice-method,getslice-method,setslice-method,no-absolute-import,old-division,dict-iter-method,dict-view-method,next-method-called,metaclass-assignment,indexing-exception,raising-string,reload-builtin,oct-method,hex-method,nonzero-method,cmp-method,input-builtin,round-builtin,intern-builtin,unichr-builtin,map-builtin-not-iterating,zip-builtin-not-iterating,range-builtin-not-iterating,filter-builtin-not-iterating,using-cmp-argument,eq-without-hash,div-method,idiv-method,rdiv-method,exception-message-attribute,invalid-str-codec,sys-max-int,bad-python3-import,deprecated-string-function,deprecated-str-translate-call,missing-docstring,not-callable,invalid-name,unused-argument,too-few-public-methods,too-many-branches,too-many-instance-attributes,too-many-locals # Enable the message, report, category or checker with the given id(s). You can # either give multiple identifier separated by comma (,) or put this option View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/3357622c2dc0b6fe75ac573321a1403ee… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/3357622c2dc0b6fe75ac573321a1403ee… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix enabling accounts
by Yann Leboulanger 22 Aug '17

22 Aug '17

Yann Leboulanger pushed to branch master at gajim / gajim Commits: 3357622c by Yann Leboulanger at 2017-08-22T23:25:07+02:00 fix enabling accounts - - - - - 1 changed file: - gajim/config.py Changes: ===================================== gajim/config.py ===================================== --- a/gajim/config.py +++ b/gajim/config.py @@ -2582,7 +2582,7 @@ class AccountsWindow: if app.connections[account].gpg: self.xml.get_object('gpg_choose_button2').set_sensitive(True) else: - app.connections[account] = common.connection.Connection(account) + app.connections[account] = connection.Connection(account) if app.connections[account].gpg: self.xml.get_object('gpg_choose_button1').set_sensitive(True) self.init_account_gpg() View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/3357622c2dc0b6fe75ac573321a1403ee4… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/3357622c2dc0b6fe75ac573321a1403ee4… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] No need to have one sleepy instance per connection object
by Yann Leboulanger 22 Aug '17

22 Aug '17

Yann Leboulanger pushed to branch master at gajim / gajim Commits: ce719a83 by Yann Leboulanger at 2017-08-22T21:55:18+02:00 No need to have one sleepy instance per connection object - - - - - 4 changed files: - gajim/common/app.py - gajim/common/connection.py - gajim/common/connection_handlers.py - gajim/common/zeroconf/connection_handlers_zeroconf.py Changes: ===================================== gajim/common/app.py ===================================== --- a/gajim/common/app.py +++ b/gajim/common/app.py @@ -244,6 +244,14 @@ try: except ImportError: HAVE_PYCURL = False +try: + from gajim.common import sleepy + if sleepy.SUPPORTED: + HAVE_IDLE = True +except Exception: + log.debug(_('Unable to load idle module')) + HAVE_IDLE = False + gajim_identity = {'type': 'pc', 'category': 'client', 'name': 'Gajim'} gajim_common_features = [nbxmpp.NS_BYTESTREAM, nbxmpp.NS_SI, nbxmpp.NS_FILE, ===================================== gajim/common/connection.py ===================================== --- a/gajim/common/connection.py +++ b/gajim/common/connection.py @@ -630,9 +630,8 @@ class CommonConnection: self.connected = app.SHOW_LIST.index(show) idle_time = None if auto: - global HAS_IDLE - if HAS_IDLE and app.config.get('autoaway'): - idle_sec = int(self.sleeper.getIdleSec()) + if app.HAVE_IDLE and app.config.get('autoaway'): + idle_sec = int(app.interface.sleeper.getIdleSec()) idle_time = time.strftime('%Y-%m-%dT%H:%M:%SZ', time.gmtime(time.time() - idle_sec)) app.nec.push_incoming_event(BeforeChangeShowEvent(None, @@ -2705,9 +2704,8 @@ class Connection(CommonConnection, ConnectionHandlers): p = self.add_sha(p, ptype != 'unavailable') self.add_lang(p) if auto: - global HAS_IDLE - if HAS_IDLE and app.config.get('autoaway'): - idle_sec = int(self.sleeper.getIdleSec()) + if app.HAVE_IDLE and app.config.get('autoaway'): + idle_sec = int(app.interface.sleeper.getIdleSec()) idle_time = time.strftime('%Y-%m-%dT%H:%M:%SZ', time.gmtime(time.time() - idle_sec)) idle = p.setTag('idle', namespace=nbxmpp.NS_IDLE) ===================================== gajim/common/connection_handlers.py ===================================== --- a/gajim/common/connection_handlers.py +++ b/gajim/common/connection_handlers.py @@ -47,6 +47,7 @@ from gajim.common import app from gajim.common import exceptions from gajim.common import dataforms from gajim.common import jingle_xtls +from gajim.common import sleepy from gajim.common.commands import ConnectionCommands from gajim.common.pubsub import ConnectionPubSub from gajim.common.protocol.caps import ConnectionCaps @@ -74,13 +75,6 @@ DELIMITER_ARRIVED = 'delimiter_arrived' PRIVACY_ARRIVED = 'privacy_arrived' BLOCKING_ARRIVED = 'blocking_arrived' PEP_CONFIG = 'pep_config' -HAS_IDLE = True -try: -# import idle - from gajim.common import sleepy -except Exception: - log.debug(_('Unable to load idle module')) - HAS_IDLE = False class ConnectionDisco: @@ -1345,7 +1339,6 @@ ConnectionVcard, ConnectionSocks5Bytestream, ConnectionDisco, ConnectionCommands, ConnectionPubSub, ConnectionPEP, ConnectionCaps, ConnectionHandlersBase, ConnectionJingle, ConnectionIBBytestream): def __init__(self): - global HAS_IDLE ConnectionArchive313.__init__(self) ConnectionVcard.__init__(self) ConnectionSocks5Bytestream.__init__(self) @@ -1382,13 +1375,6 @@ ConnectionHandlersBase, ConnectionJingle, ConnectionIBBytestream): self.privacy_default_list = None - try: - self.sleeper = sleepy.Sleepy() - HAS_IDLE = True - except Exception: - log.warning('Error while calling Sleepy()', exc_info=True) - HAS_IDLE = False - self.gmail_last_tid = None self.gmail_last_time = None @@ -1659,14 +1645,13 @@ ConnectionHandlersBase, ConnectionJingle, ConnectionIBBytestream): raise nbxmpp.NodeProcessed def _nec_last_request_received(self, obj): - global HAS_IDLE if obj.conn.name != self.name: return - if HAS_IDLE and app.config.get_per('accounts', self.name, + if app.HAVE_IDLE and app.config.get_per('accounts', self.name, 'send_idle_time'): iq_obj = obj.stanza.buildReply('result') qp = iq_obj.setQuery() - qp.attrs['seconds'] = int(self.sleeper.getIdleSec()) + qp.attrs['seconds'] = int(app.interface.sleeper.getIdleSec()) else: iq_obj = obj.stanza.buildReply('error') err = nbxmpp.ErrorNode(name=nbxmpp.NS_STANZAS + \ ===================================== gajim/common/zeroconf/connection_handlers_zeroconf.py ===================================== --- a/gajim/common/zeroconf/connection_handlers_zeroconf.py +++ b/gajim/common/zeroconf/connection_handlers_zeroconf.py @@ -39,12 +39,6 @@ STATUS_LIST = ['offline', 'connecting', 'online', 'chat', 'away', 'xa', 'dnd', VCARD_PUBLISHED = 'vcard_published' VCARD_ARRIVED = 'vcard_arrived' AGENT_REMOVED = 'agent_removed' -HAS_IDLE = True -try: - import idle -except Exception: - log.debug(_('Unable to load idle module')) - HAS_IDLE = False from gajim.common import connection_handlers @@ -73,12 +67,6 @@ connection_handlers.ConnectionJingle): connection_handlers.ConnectionJingle.__init__(self) connection_handlers.ConnectionHandlersBase.__init__(self) - try: - idle.init() - except Exception: - global HAS_IDLE - HAS_IDLE = False - def _messageCB(self, ip, con, msg): """ Called when we receive a message View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/ce719a8317fb67d9b78589c3abd68329a2… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/ce719a8317fb67d9b78589c3abd68329a2… You're receiving this email because of your account on dev.gajim.org.

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