Commits

commits@gajim.org

17632 discussions

[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

[Git][gajim/gajim][master] Fix wrong call to Sleepy()
by Philipp Hörist 19 Aug '17

19 Aug '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: e8399dc2 by Philipp Hörist at 2017-08-19T22:32:50+02:00 Fix wrong call to Sleepy() And place a log call so we can gather exceptions to lose the general exception in the future. - - - - - 1 changed file: - gajim/common/connection_handlers.py Changes: ===================================== gajim/common/connection_handlers.py ===================================== --- a/gajim/common/connection_handlers.py +++ b/gajim/common/connection_handlers.py @@ -1383,9 +1383,10 @@ ConnectionHandlersBase, ConnectionJingle, ConnectionIBBytestream): self.privacy_default_list = None try: - self.sleeper = common.sleepy.Sleepy() + 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 View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/e8399dc2ed5db2d6631590d44ca657b266… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/e8399dc2ed5db2d6631590d44ca657b266… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Update README
by Philipp Hörist 19 Aug '17

19 Aug '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 763eba0a by Philipp Hörist at 2017-08-19T02:29:07+02:00 Update README - - - - - 1 changed file: - README Changes: ===================================== README ===================================== --- a/README +++ b/README @@ -30,7 +30,7 @@ <li>For zeroconf (bonjour), the "enable link-local messaging" checkbox, you need dbus-glib, python-avahi</li> <li>dnsutils (or whatever package provides the nslookup binary) for SRV support</li> <li>gir1.2-gtkspell3-3.0 and aspell-LANG where lang is your locale eg. en, fr etc</li> -<li>gir1.2-secret-1 for GNOME Keyring or KDE support as password storage</li> +<li>gir1.2-secret-1 for GNOME Keyring or KDE support as password storage</li> <li>gir1.2-notify-0.7 to get cooler popups</li> <li>D-Bus running to have gajim-remote working. Some distributions split dbus-x11, which is needed for dbus to work with Gajim. Version >= 0.80 is required.</li> <li>python3-dbus bindings (>=1.2.0)</li> @@ -67,10 +67,10 @@ <h2>Running Gajim</h2> <p>Just do <em>gajim</em> or you can run Gajim from your GNOME/Xfce/KDE/whatever menus.<br/><br/> -or if you use hg version and you didn't 'make install' you can also run from gajim folder with<em>./launch.sh</em></p> +or if you use Git version and you didn't 'make install' you can also run from gajim folder with<em>./launch.py</em></p> <hr /> -<h3>Note for hg users</h3> -<p>You will need GNU autotools in order to install Gajim from svn. This includes:</p> +<h3>Note for Git users</h3> +<p>You will need GNU autotools in order to install Gajim from Git. This includes:</p> <ul> <li>automake >= 1.8 </li> <li>autoconf >= 2.59 </li> @@ -109,8 +109,8 @@ If you don't want to make this permanent, execute gajim with --verbose everytime you want to have verbose output.</p> <h3>FAQ/Wiki</h3> -<p>FAQ can be found at <a href="http://trac.gajim.org/wiki/GajimFaq">http://trac.gajim.org/wiki/GajimFaq</a><br/> -Wiki can be found at <a href="http://trac.gajim.org/wiki">http://trac.gajim.org/wiki</a></p> +<p>FAQ can be found at <a href="https://dev.gajim.org/gajim/gajim/wikis/help/gajimfaq">https://dev.gajim.org/gajim/gajim/wikis/help/gajimfaq</a><br/> +Wiki can be found at <a href="https://dev.gajim.org/gajim/gajim/wikis/home">https://dev.gajim.org/gajim/gajim/wikis/home</a></p> <p>That is all, <strong>enjoy!</strong></p> @@ -119,7 +119,7 @@ Wiki can be found at <a href="http://trac.gajim.org/wiki">http://trac.gajim.org/ <br/> <br/> <br/> -(C) 2003-2015<br/> +(C) 2003-2017<br/> The Gajim Team<br/> https://gajim.org<br/> <br/> View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/763eba0acc1b49391703980f65c4d0fd96… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/763eba0acc1b49391703980f65c4d0fd96… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Update README.md
by Philipp Hörist 19 Aug '17

19 Aug '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 2198c2f4 by Philipp Hörist at 2017-08-19T02:20:00+02:00 Update README.md - - - - - 1 changed file: - win/README.md Changes: ===================================== win/README.md ===================================== --- a/win/README.md +++ b/win/README.md @@ -16,7 +16,7 @@ Download [msys2](http://www.msys2.org/) (msys2-x86_64-xxx.exe) and follow the in * Run ``cd gajim/win`` to end up where this README exists. * Execute ``./dev_env.sh`` to install all the needed dependencies. * Now go to the git root dir ``cd ..`` -* Launch Gajim ``./launch.sh`` +* Launch Gajim ``./launch.py`` ### Build Gajim / Creating an Installer View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/2198c2f478598b2103e6ae002b9e65655f… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/2198c2f478598b2103e6ae002b9e65655f… 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