Commits August 2017

commits@gajim.org

1 participants
94 discussions

[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

[Git][gajim/gajim][master] 2 commits: fix import
by Yann Leboulanger 22 Aug '17

22 Aug '17

Yann Leboulanger pushed to branch master at gajim / gajim Commits: 1f506a14 by mimi89999 at 2017-08-22T12:39:26+02:00 fix import - - - - - 7de4aa1a by Yann Leboulanger at 2017-08-22T13:57:06+02:00 Merge branch 'master' into 'master' fix import See merge request !119 - - - - - 1 changed file: - gajim/chat_control_base.py Changes: ===================================== gajim/chat_control_base.py ===================================== --- a/gajim/chat_control_base.py +++ b/gajim/chat_control_base.py @@ -66,7 +66,7 @@ from gajim.command_system.implementation import standard from gajim.command_system.implementation import execute try: - import gtkspell + from gajim import gtkspell HAS_GTK_SPELL = True except (ImportError, ValueError): HAS_GTK_SPELL = False View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/d070d141bb3cf4caf11cc94ba9233b134… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/d070d141bb3cf4caf11cc94ba9233b134… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix scrolling to iter in groupchat when we receive a pm. Fixes #8635
by Yann Leboulanger 21 Aug '17

21 Aug '17

Yann Leboulanger pushed to branch master at gajim / gajim Commits: d070d141 by Yann Leboulanger at 2017-08-21T21:59:47+02:00 fix scrolling to iter in groupchat when we receive a pm. Fixes #8635 - - - - - 1 changed file: - gajim/groupchat_control.py Changes: ===================================== gajim/groupchat_control.py ===================================== --- a/gajim/groupchat_control.py +++ b/gajim/groupchat_control.py @@ -1142,7 +1142,7 @@ class GroupchatControl(ChatControlBase): else: self._start_private_message(nick) # Scroll to line - path_ = path + path_ = path.copy() path_.up() self.list_treeview.expand_row(path_, False) self.list_treeview.scroll_to_cell(path) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/d070d141bb3cf4caf11cc94ba9233b134d… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/d070d141bb3cf4caf11cc94ba9233b134d… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix import
by Yann Leboulanger 21 Aug '17

21 Aug '17

Yann Leboulanger pushed to branch master at gajim / gajim Commits: 3c693a7a by Yann Leboulanger at 2017-08-21T16:38:27+02:00 fix import - - - - - 2 changed files: - gajim/chat_control.py - gajim/dialogs.py Changes: ===================================== gajim/chat_control.py ===================================== --- a/gajim/chat_control.py +++ b/gajim/chat_control.py @@ -59,7 +59,7 @@ from gajim.common.exceptions import GajimGeneralException from gajim.command_system.implementation.hosts import ChatCommands try: - import gtkspell + from gajim import gtkspell HAS_GTK_SPELL = True except (ImportError, ValueError): HAS_GTK_SPELL = False ===================================== gajim/dialogs.py ===================================== --- a/gajim/dialogs.py +++ b/gajim/dialogs.py @@ -49,7 +49,7 @@ from gajim.common import pep from gajim.common import ged try: - import gtkspell + from gajim import gtkspell HAS_GTK_SPELL = True except (ImportError, ValueError): HAS_GTK_SPELL = False View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/3c693a7a2237e25921899acac4ba4dc2ea… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/3c693a7a2237e25921899acac4ba4dc2ea… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix import
by Yann Leboulanger 21 Aug '17

21 Aug '17

Yann Leboulanger pushed to branch master at gajim / gajim Commits: 144c862d by Yann Leboulanger at 2017-08-21T16:34:50+02:00 fix import - - - - - 1 changed file: - gajim/config.py Changes: ===================================== gajim/config.py ===================================== --- a/gajim/config.py +++ b/gajim/config.py @@ -51,7 +51,7 @@ from gajim import profile_window from gajim import gui_menu_builder try: - import gtkspell + from gajim import gtkspell HAS_GTK_SPELL = True except (ImportError, ValueError): HAS_GTK_SPELL = False View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/144c862dabb6660cd992253e21bb912869… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/144c862dabb6660cd992253e21bb912869… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Ability to be notified on all message. Option is now perroom. Fixes #8646
by Yann Leboulanger 20 Aug '17

20 Aug '17

Yann Leboulanger pushed to branch master at gajim / gajim Commits: 07ba85b4 by Yann Leboulanger at 2017-08-20T23:07:58+02:00 Ability to be notified on all message. Option is now perroom. Fixes #8646 - - - - - 6 changed files: - data/gui/gc_control_popup_menu.ui - gajim/chat_control_base.py - gajim/common/config.py - gajim/groupchat_control.py - gajim/message_window.py - gajim/notify.py Changes: ===================================== data/gui/gc_control_popup_menu.ui ===================================== --- a/data/gui/gc_control_popup_menu.ui +++ b/data/gui/gc_control_popup_menu.ui @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> <requires lib="gtk+" version="3.12"/> <object class="GtkMenu" id="gc_control_popup_menu"> @@ -66,6 +66,13 @@ </object> </child> <child> + <object class="GtkCheckMenuItem" id="notify_menuitem"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Notify on all messages</property> + </object> + </child> + <child> <object class="GtkSeparatorMenuItem" id="request_voice_separator"> <property name="can_focus">False</property> <property name="no_show_all">True</property> ===================================== gajim/chat_control_base.py ===================================== --- a/gajim/chat_control_base.py +++ b/gajim/chat_control_base.py @@ -957,6 +957,7 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): if kind == 'incoming': if not self.type_id == message_control.TYPE_GC or \ app.config.get('notify_on_all_muc_messages') or \ + app.config.get_per('rooms', jid, 'notify_on_all_messages') or \ 'marked' in other_tags_for_text: # it's a normal message, or a muc message with want to be # notified about if quitting just after @@ -1141,6 +1142,10 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): app.config.set_per('accounts', self.account, 'non_minimized_gc', ' '.join(non_minimized_gc)) + def on_notify_menuitem_toggled(self, widget): + app.config.set_per('rooms', self.contact.jid, 'notify_on_all_messages', + widget.get_active()) + def set_control_active(self, state): if state: self.set_emoticon_popover() ===================================== gajim/common/config.py ===================================== --- a/gajim/common/config.py +++ b/gajim/common/config.py @@ -492,6 +492,7 @@ class Config: 'speller_language': [ opt_str, '', _('Language for which we want to check misspelled words')], 'muc_restore_lines': [opt_int, -2, _('How many lines to request from server when entering a groupchat. -1 means no limit, -2 means global value')], 'muc_restore_timeout': [opt_int, -2, _('Minutes of backlog to request when entering a groupchat. -1 means no limit, -2 means global value')], + 'notify_on_all_messages': [opt_bool, False, _('State whether we want a notification for every message in this room')], }, {}), 'plugins': ({ 'active': [opt_bool, False, _('State whether plugins should be activated on startup (this is saved on Gajim exit). This option SHOULD NOT be used to (de)activate plug-ins. Use GUI instead.')], ===================================== gajim/groupchat_control.py ===================================== --- a/gajim/groupchat_control.py +++ b/gajim/groupchat_control.py @@ -905,6 +905,7 @@ class GroupchatControl(ChatControlBase): history_menuitem = xml.get_object('history_menuitem') disconnect_menuitem = xml.get_object('disconnect_menuitem') minimize_menuitem = xml.get_object('minimize_menuitem') + notify_menuitem = xml.get_object('notify_menuitem') request_voice_menuitem = xml.get_object('request_voice_menuitem') bookmark_separator = xml.get_object('bookmark_separator') separatormenuitem2 = xml.get_object('separatormenuitem2') @@ -943,6 +944,8 @@ class GroupchatControl(ChatControlBase): if self.contact.jid not in app.config.get_per('accounts', self.account, 'non_minimized_gc').split(' '): minimize_menuitem.set_active(True) + notify_menuitem.set_active(app.config.get_per('rooms', self.contact.jid, + 'notify_on_all_messages')) conn = app.connections[self.account] if not conn.private_storage_supported and (not conn.pubsub_supported or \ not conn.pubsub_publish_options_supported): @@ -1009,6 +1012,10 @@ class GroupchatControl(ChatControlBase): self.on_minimize_menuitem_toggled) self.handlers[id_] = minimize_menuitem + id_ = notify_menuitem.connect('toggled', + self.on_notify_menuitem_toggled) + self.handlers[id_] = notify_menuitem + menu.connect('selection-done', self.destroy_menu, change_nick_menuitem, change_subject_menuitem, bookmark_room_menuitem, history_menuitem) @@ -1245,7 +1252,8 @@ class GroupchatControl(ChatControlBase): def get_nb_unread(self): type_events = ['printed_marked_gc_msg'] - if app.config.get('notify_on_all_muc_messages'): + if app.config.get('notify_on_all_muc_messages') or \ + app.config.get_per('rooms', self.room_jid, 'notify_on_all_messages'): type_events.append('printed_gc_msg') nb = len(app.events.get_events(self.account, self.room_jid, type_events)) ===================================== gajim/message_window.py ===================================== --- a/gajim/message_window.py +++ b/gajim/message_window.py @@ -501,7 +501,8 @@ class MessageWindow(object): for ctrl in self.controls(): if ctrl.type_id == message_control.TYPE_GC and not \ app.config.get('notify_on_all_muc_messages') and not \ - ctrl.attention_flag: + app.config.get_per('rooms', ctrl.room_jid, + 'notify_on_all_messages') and not ctrl.attention_flag: # count only pm messages unread += ctrl.get_nb_unread_pm() continue @@ -518,7 +519,9 @@ class MessageWindow(object): if control.type_id == message_control.TYPE_GC: name = control.room_jid.split('@')[0] urgent = control.attention_flag or \ - app.config.get('notify_on_all_muc_messages') + app.config.get('notify_on_all_muc_messages') or \ + app.config.get_per('rooms', control.room_jid, + 'notify_on_all_messages') else: name = control.contact.get_shown_name() if control.resource: ===================================== gajim/notify.py ===================================== --- a/gajim/notify.py +++ b/gajim/notify.py @@ -68,7 +68,8 @@ def get_show_in_systray(event, account, contact, type_=None): Return True if this event must be shown in systray, else False """ if type_ == 'printed_gc_msg' and not app.config.get( - 'notify_on_all_muc_messages'): + 'notify_on_all_muc_messages') and not app.config.get_per('rooms', + contact.jid, 'notify_on_all_messages'): # it's not an highlighted message, don't show in systray return False return app.config.get('trayicon_notification_on_events') View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/07ba85b45675990f0a9de46b22ffd2df93… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/07ba85b45675990f0a9de46b22ffd2df93… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] make log history checkbutton sensitive when we open history window with an account. Fixes #8705
by Yann Leboulanger 20 Aug '17

20 Aug '17

Yann Leboulanger pushed to branch master at gajim / gajim Commits: 163306f7 by Yann Leboulanger at 2017-08-20T14:57:18+02:00 make log history checkbutton sensitive when we open history window with an account. Fixes #8705 - - - - - 1 changed file: - gajim/history_window.py Changes: ===================================== gajim/history_window.py ===================================== --- a/gajim/history_window.py +++ b/gajim/history_window.py @@ -66,7 +66,7 @@ class HistoryWindow: Class for browsing logs of conversations with contacts """ - def __init__(self, jid = None, account = None): + def __init__(self, jid=None, account=None): xml = gtkgui_helpers.get_gtk_builder('history_window.ui') self.window = xml.get_object('history_window') self.calendar = xml.get_object('calendar') @@ -75,7 +75,7 @@ class HistoryWindow: account, used_in_history_window = True) scrolledwindow.add(self.history_textview.tv) self.history_buffer = self.history_textview.tv.get_buffer() - self.history_buffer.create_tag('highlight', background = 'yellow') + self.history_buffer.create_tag('highlight', background='yellow') self.history_buffer.create_tag('invisible', invisible=True) self.checkbutton = xml.get_object('log_history_checkbutton') self.checkbutton.connect('toggled', @@ -224,7 +224,7 @@ class HistoryWindow: self.completion_dict[completed2] = (info_jid, info_acc, info_name, info_completion2) if key == actual_jid: - self._load_history(info_jid, info_acc) + self._load_history(info_jid, self.account or info_acc) yield True keys.sort() yield False View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/163306f78a31739acc8cd5bc88e07f5e7a… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/163306f78a31739acc8cd5bc88e07f5e7a… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix ci script
by Yann Leboulanger 19 Aug '17

19 Aug '17

Yann Leboulanger pushed to branch master at gajim / gajim Commits: d11b40ca by Yann Leboulanger at 2017-08-19T23:13:47+02:00 fix ci script - - - - - 1 changed file: - .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,5 +1,5 @@ before_script: - - sudo apt-get update -qq && sudo apt-get install -y -qq libtool pkg-config python3-openssl $(apt-cache depends gajim-default-nightly | grep Depends | sed "s/.*ends:\ //" | tr '\n' ' ') + - sudo apt-get update -qq && sudo apt-get install -y -qq libtool pkg-config python3-openssl gir1.2-gtk-3.0 python3-gi python3-nbxmpp-nightly - sudo apt-get build-dep -y -qq gajim-default-nightly stages: View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/d11b40ca3956d1159abc7f3cccf48cc72d… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/d11b40ca3956d1159abc7f3cccf48cc72d… You're receiving this email because of your account on dev.gajim.org.

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