Commits

commits@gajim.org

17632 discussions

gajim: prevent traceback
by Gajim 28 Jul '15

28 Jul '15

changeset 2127559a62b2 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=2127559a62b2 description: prevent traceback diffstat: src/common/connection.py | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diffs (14 lines): diff -r 7aa8b24aa913 -r 2127559a62b2 src/common/connection.py --- a/src/common/connection.py Mon Jul 27 22:58:47 2015 +0200 +++ b/src/common/connection.py Tue Jul 28 20:19:19 2015 +0200 @@ -913,7 +913,9 @@ self.sm.enabled = False gajim.nec.push_incoming_event(OurShowEvent(None, conn=self, show='error')) - self.connection.UnregisterDisconnectHandler(self._disconnectedReconnCB) + if self.connection: + self.connection.UnregisterDisconnectHandler( + self._disconnectedReconnCB) self.disconnect() if gajim.config.get_per('accounts', self.name, 'autoreconnect'): self.connected = -1

1 0

gajim: do not try to go autoaway or come back from autoaway if w...
by Gajim 27 Jul '15

27 Jul '15

changeset 7aa8b24aa913 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=7aa8b24aa913 description: do not try to go autoaway or come back from autoaway if we are not connected. See #8062 diffstat: src/gui_interface.py | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diffs (22 lines): diff -r 312de2800974 -r 7aa8b24aa913 src/gui_interface.py --- a/src/gui_interface.py Mon Jul 27 21:19:25 2015 +0200 +++ b/src/gui_interface.py Mon Jul 27 22:58:47 2015 +0200 @@ -2936,7 +2936,8 @@ def gnome_screensaver_ActiveChanged_cb(active): if not active: for account in gajim.connections: - if gajim.sleeper_state[account] == 'autoaway-forced': + if gajim.account_is_connected(account) and \ + gajim.sleeper_state[account] == 'autoaway-forced': # We came back online ofter gnome-screensaver # autoaway self.roster.send_status(account, 'online', @@ -2952,6 +2953,8 @@ not gajim.sleeper_state[account]: continue if gajim.sleeper_state[account] == 'online': + if not gajim.account_is_connected(account): + continue # we save out online status gajim.status_before_autoaway[account] = \ gajim.connections[account].status

1 0

gajim: fix loading secret files that have been created with gaji...
by Gajim 27 Jul '15

27 Jul '15

changeset 312de2800974 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=312de2800974 description: fix loading secret files that have been created with gajim <= 0.16.1. Fixes #8114 diffstat: src/secrets.py | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diffs (37 lines): diff -r ec23fdfcbcd2 -r 312de2800974 src/secrets.py --- a/src/secrets.py Mon Jul 27 13:36:49 2015 +0200 +++ b/src/secrets.py Mon Jul 27 21:19:25 2015 +0200 @@ -31,7 +31,7 @@ secrets_filename = gajimpaths['SECRETS_FILE'] secrets_cache = None -class Secrets(object): +class Secrets(): def __init__(self, filename): self.filename = filename self.srs = {} @@ -95,13 +95,23 @@ return pk def load_secrets(filename): - f = open(filename, 'r') + global Secrets + f = open(filename, 'rb') try: secrets = pickle.load(f) except (KeyError, EOFError): f.close() secrets = Secrets(filename) + except (AttributeError, TypeError): + class Secrets(object, Secrets): + pass + try: + f.seek(0) + secrets = pickle.load(f) + except (KeyError, EOFError): + f.close() + secrets = Secrets(filename) return secrets

1 0

gajim: do not crash when authentication with server fails. Fixes...
by Gajim 27 Jul '15

27 Jul '15

changeset ec23fdfcbcd2 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=ec23fdfcbcd2 description: do not crash when authentication with server fails. Fixes #8115 diffstat: src/common/connection.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 48bf7f9c7861 -r ec23fdfcbcd2 src/common/connection.py --- a/src/common/connection.py Sun Jul 26 14:25:21 2015 +0200 +++ b/src/common/connection.py Mon Jul 27 13:36:49 2015 +0200 @@ -1512,7 +1512,7 @@ if self.on_connect_auth: self.on_connect_auth(None) self.on_connect_auth = None - return + return if not self.connected: # We went offline during connecting process if self.on_connect_auth: self.on_connect_auth(None)

1 0

gajim: set urgency_hint when notify_on_all_muc_messages is True....
by Gajim 26 Jul '15

26 Jul '15

changeset 48bf7f9c7861 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=48bf7f9c7861 description: set urgency_hint when notify_on_all_muc_messages is True. Fixes #8110 diffstat: src/message_window.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diffs (13 lines): diff -r a1582f292e62 -r 48bf7f9c7861 src/message_window.py --- a/src/message_window.py Sun Jul 26 14:05:47 2015 +0200 +++ b/src/message_window.py Sun Jul 26 14:25:21 2015 +0200 @@ -519,7 +519,8 @@ if control.type_id == message_control.TYPE_GC: name = control.room_jid.split('@')[0] - urgent = control.attention_flag + urgent = control.attention_flag or \ + gajim.config.get('notify_on_all_muc_messages') else: name = control.contact.get_shown_name() if control.resource:

1 0

gajim: don't reconnect twice when connection is lost
by Gajim 26 Jul '15

26 Jul '15

changeset a1582f292e62 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=a1582f292e62 description: don't reconnect twice when connection is lost diffstat: src/common/connection.py | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diffs (19 lines): diff -r aa1b7f9b942b -r a1582f292e62 src/common/connection.py --- a/src/common/connection.py Fri Jul 24 22:25:24 2015 +0200 +++ b/src/common/connection.py Sun Jul 26 14:05:47 2015 +0200 @@ -884,6 +884,7 @@ self.connection.disconnect() self.last_connection = None self.connection = None + def set_oldst(self): # Set old state if self.old_show: self.connected = gajim.SHOW_LIST.index(self.old_show) @@ -912,6 +913,7 @@ self.sm.enabled = False gajim.nec.push_incoming_event(OurShowEvent(None, conn=self, show='error')) + self.connection.UnregisterDisconnectHandler(self._disconnectedReconnCB) self.disconnect() if gajim.config.get_per('accounts', self.name, 'autoreconnect'): self.connected = -1

1 0

python-nbxmpp: make xsend work with python3
by Python-nbxmpp 26 Jul '15

26 Jul '15

changeset ffa6dc7501b6 in /home/hg/repos/python-nbxmpp details:http://hg.gajim.org/python-nbxmpp?cmd=changeset;node=ffa6dc7501b6 description: make xsend work with python3 diffstat: README | 2 +- doc/examples/xsend.py | 23 +++++++++++++---------- 2 files changed, 14 insertions(+), 11 deletions(-) diffs (89 lines): diff -r cd50e6d917aa -r ffa6dc7501b6 README --- a/README Thu Jul 16 21:11:51 2015 +0200 +++ b/README Sun Jul 26 13:10:42 2015 +0200 @@ -11,7 +11,7 @@ Usage -You have to 'import xmpppy' in your program. Then look at examples in ths doc +You have to 'import xmpppy' in your program. Then look at examples in the doc folder. 2012-05-08 Yann Leboulanger diff -r cd50e6d917aa -r ffa6dc7501b6 doc/examples/xsend.py --- a/doc/examples/xsend.py Thu Jul 16 21:11:51 2015 +0200 +++ b/doc/examples/xsend.py Sun Jul 26 13:10:42 2015 +0200 @@ -1,11 +1,14 @@ -#!/usr/bin/python +#!/usr/bin/python3 import sys import os import nbxmpp import time import logging -import gobject +try: + from gi.repository import GObject as gobject +except Exception: + import gobject consoleloghandler = logging.StreamHandler() root_log = logging.getLogger('nbxmpp') @@ -13,7 +16,7 @@ root_log.addHandler(consoleloghandler) if len(sys.argv) < 2: - print "Syntax: xsend JID text" + print("Syntax: xsend JID text") sys.exit(0) to_jid = sys.argv[1] @@ -28,7 +31,7 @@ for mandatory in ['jid', 'password']: if mandatory not in jidparams.keys(): open(os.environ['HOME']+'/.xsend','w').write('#Uncomment fields before use and type in correct credentials.\n#JID=romeo(a)montague.net/resource (/resource is optional)\n#PASSWORD=juliet\n') - print 'Please point ~/.xsend config file to valid JID for sending messages.' + print('Please point ~/.xsend config file to valid JID for sending messages.') sys.exit(0) class Connection: @@ -40,20 +43,20 @@ def on_auth(self, con, auth): if not auth: - print 'could not authenticate!' + print('could not authenticate!') sys.exit() - print 'authenticated using', auth + print('authenticated using ' + auth) self.send_message(to_jid, text) def on_connected(self, con, con_type): - print 'connected with', con_type + print('connected with ' + con_type) auth = self.client.auth(self.jid.getNode(), self.password, resource=self.jid.getResource(), sasl=1, on_auth=self.on_auth) def get_password(self, cb, mech): cb(self.password) def on_connection_failed(self): - print 'could not connect!' + print('could not connect!') def _event_dispatcher(self, realm, event, data): pass @@ -61,11 +64,11 @@ def connect(self): idle_queue = nbxmpp.idlequeue.get_idlequeue() self.client = nbxmpp.NonBlockingClient(self.jid.getDomain(), idle_queue, caller=self) - self.con = self.client.connect(self.on_connected, self.on_connection_failed, secure_tuple=('tls', '', '', None)) + self.con = self.client.connect(self.on_connected, self.on_connection_failed, secure_tuple=('tls', '', '', None, None)) def send_message(self, to_jid, text): id_ = self.client.send(nbxmpp.protocol.Message(to_jid, text, typ='chat')) - print 'sent message with id', id_ + print('sent message with id ' + id_) gobject.timeout_add(1000, self.quit) def quit(self):

1 0

gajim: specify module version before importing
by Gajim 25 Jul '15

25 Jul '15

changeset cee42c275cc2 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=cee42c275cc2 description: specify module version before importing diffstat: src/common/gajim.py | 3 ++- src/common/passwords.py | 2 ++ src/gtkgui_helpers.py | 2 ++ src/notify.py | 2 ++ 4 files changed, 8 insertions(+), 1 deletions(-) diffs (77 lines): diff -r 88d74b9f4ea1 -r cee42c275cc2 src/common/gajim.py --- a/src/common/gajim.py Sat Jul 25 21:40:51 2015 +0200 +++ b/src/common/gajim.py Sat Jul 25 22:03:24 2015 +0200 @@ -31,6 +31,7 @@ import os import logging import locale +import gi from common import config import nbxmpp @@ -188,7 +189,6 @@ if os.name == 'nt': os.environ['FS_PLUGIN_PATH'] = 'gtk\\lib\\farstream-0.1' os.environ['GST_PLUGIN_PATH'] = 'gtk\\lib\\gstreamer-0.10' - import gi gi.require_version('Farstream', '0.2') from gi.repository import Farstream gi.require_version('Gst', '1.0') @@ -208,6 +208,7 @@ HAVE_UPNP_IGD = True try: + gi.require_version('GUPnPIgd', '1.0') from gi.repository import GUPnPIgd gupnp_igd = GUPnPIgd.SimpleIgd() except ImportError: diff -r 88d74b9f4ea1 -r cee42c275cc2 src/common/passwords.py --- a/src/common/passwords.py Sat Jul 25 21:40:51 2015 +0200 +++ b/src/common/passwords.py Sat Jul 25 22:03:24 2015 +0200 @@ -30,6 +30,7 @@ from common import gajim from common import kwalletbinding from common.exceptions import GnomeKeyringError +import gi USER_HAS_LIBSECRET = False USER_HAS_GNOMEKEYRING = False @@ -253,6 +254,7 @@ if gajim.config.get('use_gnomekeyring'): global Secret try: + gi.require_version('Secret', '1') gir = __import__('gi.repository', globals(), locals(), ['Secret'], 0) Secret = gir.Secret diff -r 88d74b9f4ea1 -r cee42c275cc2 src/gtkgui_helpers.py --- a/src/gtkgui_helpers.py Sat Jul 25 21:40:51 2015 +0200 +++ b/src/gtkgui_helpers.py Sat Jul 25 22:03:24 2015 +0200 @@ -28,6 +28,7 @@ ## import xml.sax.saxutils +import gi from gi.repository import Gtk from gi.repository import Gdk from gi.repository import GdkPixbuf @@ -732,6 +733,7 @@ gajim.config.set('check_if_gajim_is_default', False) try: + gi.require_version('GConf', '2.0') GConf = importlib.import_module('gi.repository.GConf') # in try because daemon may not be there client = GConf.Client.get_default() diff -r 88d74b9f4ea1 -r cee42c275cc2 src/notify.py --- a/src/notify.py Sat Jul 25 21:40:51 2015 +0200 +++ b/src/notify.py Sat Jul 25 22:03:24 2015 +0200 @@ -46,6 +46,8 @@ USER_HAS_PYNOTIFY = True # user has pynotify module try: + import gi + gi.require_version('Notify', '0.7') from gi.repository import Notify Notify.init('Gajim Notification') except ImportError:

1 0

gajim: remove stock usage
by Gajim 25 Jul '15

25 Jul '15

changeset f21a251c01b5 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=f21a251c01b5 description: remove stock usage diffstat: data/gui/filetransfers.ui | 25 ++++++++++++++++++------- data/gui/roster_window.ui | 2 +- 2 files changed, 19 insertions(+), 8 deletions(-) diffs (84 lines): diff -r cee42c275cc2 -r f21a251c01b5 data/gui/filetransfers.ui --- a/data/gui/filetransfers.ui Sat Jul 25 22:03:24 2015 +0200 +++ b/data/gui/filetransfers.ui Sat Jul 25 22:03:48 2015 +0200 @@ -56,12 +56,22 @@ <object class="GtkImage" id="image1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="stock">gtk-clear</property> + <property name="icon_name">gtk-clear</property> </object> <object class="GtkImage" id="image2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="stock">gtk-media-pause</property> + <property name="icon_name">media-playback-pause</property> + </object> + <object class="GtkImage" id="image3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="icon_name">gtk-cancel</property> + </object> + <object class="GtkImage" id="image4"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="icon_name">gtk-close</property> </object> <object class="GtkWindow" id="file_transfers_window"> <property name="can_focus">False</property> @@ -86,7 +96,6 @@ <object class="GtkTreeView" id="transfers_list"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="rules_hint">True</property> <property name="enable_search">False</property> <signal name="button-press-event" handler="on_transfers_list_button_press_event" swapped="no"/> <signal name="button-release-event" handler="on_transfers_list_button_release_event" swapped="no"/> @@ -163,14 +172,15 @@ </child> <child> <object class="GtkButton" id="cancel_button"> - <property name="label">gtk-cancel</property> + <property name="label">_Cancel</property> <property name="visible">True</property> <property name="sensitive">False</property> <property name="can_focus">True</property> <property name="can_default">True</property> <property name="receives_default">False</property> <property name="tooltip_text" translatable="yes">Cancels the selected file transfer and removes incomplete files</property> - <property name="use_stock">True</property> + <property name="image">image3</property> + <property name="use_underline">True</property> <signal name="clicked" handler="on_cancel_button_clicked" swapped="no"/> <child internal-child="accessible"> <object class="AtkObject" id="cancel_button-atkobject"> @@ -187,14 +197,15 @@ </child> <child> <object class="GtkButton" id="close_button"> - <property name="label">gtk-close</property> + <property name="label">_Close</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="has_focus">True</property> <property name="can_default">True</property> <property name="receives_default">False</property> <property name="tooltip_text" translatable="yes">Hides the window</property> - <property name="use_stock">True</property> + <property name="image">image4</property> + <property name="use_underline">True</property> <signal name="clicked" handler="on_close_button_clicked" swapped="no"/> </object> <packing> diff -r cee42c275cc2 -r f21a251c01b5 data/gui/roster_window.ui --- a/data/gui/roster_window.ui Sat Jul 25 22:03:24 2015 +0200 +++ b/data/gui/roster_window.ui Sat Jul 25 22:03:48 2015 +0200 @@ -341,7 +341,7 @@ <property name="can_focus">True</property> <property name="no_show_all">True</property> <property name="editable">False</property> - <property name="primary_icon_stock">gtk-clear</property> + <property name="primary_icon_name">gtk-clear</property> <signal name="changed" handler="on_rfilter_entry_changed" swapped="no"/> <signal name="icon-press" handler="on_rfilter_entry_icon_press" swapped="no"/> </object>

1 0

gajim: make completion work
by Gajim 25 Jul '15

25 Jul '15

changeset 88d74b9f4ea1 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=88d74b9f4ea1 description: make completion work diffstat: src/chat_control.py | 167 ++++++++++------------------------------------ src/groupchat_control.py | 46 +++--------- src/message_textview.py | 75 --------------------- src/message_window.py | 21 ----- 4 files changed, 50 insertions(+), 259 deletions(-) diffs (truncated from 421 to 300 lines): diff -r 1839ecb719cc -r 88d74b9f4ea1 src/chat_control.py --- a/src/chat_control.py Fri Jul 24 21:49:10 2015 +0200 +++ b/src/chat_control.py Sat Jul 25 21:40:51 2015 +0200 @@ -216,59 +216,6 @@ return self.print_conversation(_('Error.'), 'status') - def handle_message_textview_mykey_press(self, widget, event_keyval, - event_keymod): - """ - Derives types SHOULD implement this, rather than connection to the even - itself - """ - event = Gdk.Event(Gdk.EventType.KEY_PRESS) - event.keyval = event_keyval - event.state = event_keymod - event.time = 0 - - _buffer = widget.get_buffer() - start, end = _buffer.get_bounds() - - if event.keyval -- Gdk.KEY_Tab: - position = _buffer.get_insert() - end = _buffer.get_iter_at_mark(position) - - text = _buffer.get_text(start, end, False) - - splitted = text.split() - - if (text.startswith(self.COMMAND_PREFIX) and not - text.startswith(self.COMMAND_PREFIX * 2) and len(splitted) == 1): - - text = splitted[0] - bare = text.lstrip(self.COMMAND_PREFIX) - - if len(text) == 1: - self.command_hits = [] - for command in self.list_commands(): - for name in command.names: - self.command_hits.append(name) - else: - if (self.last_key_tabs and self.command_hits and - self.command_hits[0].startswith(bare)): - self.command_hits.append(self.command_hits.pop(0)) - else: - self.command_hits = [] - for command in self.list_commands(): - for name in command.names: - if name.startswith(bare): - self.command_hits.append(name) - - if self.command_hits: - _buffer.delete(start, end) - _buffer.insert_at_cursor(self.COMMAND_PREFIX + self.command_hits[0] + ' ') - self.last_key_tabs = True - - return True - - self.last_key_tabs = False - def status_url_clicked(self, widget, url): helpers.launch_browser_mailer('url', url) @@ -401,9 +348,6 @@ # add MessageTextView to UI and connect signals self.msg_scrolledwindow = self.xml.get_object('message_scrolledwindow') self.msg_textview = MessageTextView() - id_ = self.msg_textview.connect('mykeypress', - self._on_message_textview_mykeypress_event) - self.handlers[id_] = self.msg_textview self.msg_scrolledwindow.add(self.msg_textview) id_ = self.msg_textview.connect('key_press_event', self._on_message_textview_key_press_event) @@ -708,10 +652,43 @@ if event.keyval == Gdk.KEY_Tab: # CTRL + TAB self.parent_win.move_to_next_unread_tab(True) return True -################################################################################ - # temporary solution instead Gtk.binding_entry_add_signal + message_buffer = self.msg_textview.get_buffer() event_state = event.get_state() + if event.keyval == Gdk.KEY_Tab: + start, end = message_buffer.get_bounds() + position = message_buffer.get_insert() + end = message_buffer.get_iter_at_mark(position) + text = message_buffer.get_text(start, end, False) + splitted = text.split() + if (text.startswith(self.COMMAND_PREFIX) and not + text.startswith(self.COMMAND_PREFIX * 2) and len(splitted) == 1): + text = splitted[0] + bare = text.lstrip(self.COMMAND_PREFIX) + if len(text) == 1: + self.command_hits = [] + for command in self.list_commands(): + for name in command.names: + self.command_hits.append(name) + else: + if (self.last_key_tabs and self.command_hits and + self.command_hits[0].startswith(bare)): + self.command_hits.append(self.command_hits.pop(0)) + else: + self.command_hits = [] + for command in self.list_commands(): + for name in command.names: + if name.startswith(bare): + self.command_hits.append(name) + + if self.command_hits: + message_buffer.delete(start, end) + message_buffer.insert_at_cursor(self.COMMAND_PREFIX + \ + self.command_hits[0] + ' ') + self.last_key_tabs = True + return True + if self.widget_name != 'groupchat_control': + self.last_key_tabs = False if event.keyval == Gdk.KEY_Up: if event_state & Gdk.ModifierType.CONTROL_MASK: if event_state & Gdk.ModifierType.SHIFT_MASK: # Ctrl+Shift+UP @@ -764,81 +741,9 @@ if event_state & Gdk.ModifierType.CONTROL_MASK: self.msg_textview.undo() return True -################################################################################ + return False - def _on_message_textview_mykeypress_event(self, widget, event_keyval, - event_keymod): - """ - When a key is pressed: if enter is pressed without the shift key, message - (if not empty) is sent and printed in the conversation - """ - # NOTE: handles mykeypress which is custom signal connected to this - # CB in new_tab(). for this singal see message_textview.py - message_textview = widget - message_buffer = message_textview.get_buffer() - start_iter, end_iter = message_buffer.get_bounds() - message = message_buffer.get_text(start_iter, end_iter, False) - xhtml = self.msg_textview.get_xhtml() - - # construct event instance from binding - event = Gdk.Event(Gdk.EventType.KEY_PRESS) # it's always a key-press here - event.keyval = event_keyval - event.state = event_keymod - event.time = 0 # assign current time - - if event.keyval == Gdk.KEY_Up: - if event.get_state() == Gdk.ModifierType.CONTROL_MASK: # Ctrl+UP - self.scroll_messages('up', message_buffer, 'sent') - # Ctrl+Shift+UP - elif event.get_state() == (Gdk.ModifierType.CONTROL_MASK | Gdk.ModifierType.SHIFT_MASK): - self.scroll_messages('up', message_buffer, 'received') - elif event.keyval == Gdk.KEY_Down: - if event.get_state() == Gdk.ModifierType.CONTROL_MASK: # Ctrl+Down - self.scroll_messages('down', message_buffer, 'sent') - # Ctrl+Shift+Down - elif event.get_state() == (Gdk.ModifierType.CONTROL_MASK | Gdk.ModifierType.SHIFT_MASK): - self.scroll_messages('down', message_buffer, 'received') - elif event.keyval == Gdk.KEY_Return or \ - event.keyval == Gdk.KEY_KP_Enter: # ENTER - # NOTE: SHIFT + ENTER is not needed to be emulated as it is not - # binding at all (textview's default action is newline) - - if gajim.config.get('send_on_ctrl_enter'): - # here, we emulate GTK default action on ENTER (add new line) - # normally I would add in keypress but it gets way to complex - # to get instant result on changing this advanced setting - if event.get_state() == 0: # no ctrl, no shift just ENTER add newline - end_iter = message_buffer.get_end_iter() - message_buffer.insert_at_cursor('\n') - send_message = False - elif event.get_state() & Gdk.ModifierType.CONTROL_MASK: # CTRL + ENTER - send_message = True - else: # send on Enter, do newline on Ctrl Enter - if event.get_state() & Gdk.ModifierType.CONTROL_MASK: # Ctrl + ENTER - end_iter = message_buffer.get_end_iter() - message_buffer.insert_at_cursor('\n') - send_message = False - else: # ENTER - send_message = True - - if gajim.connections[self.account].connected < 2 and send_message: - # we are not connected - dialogs.ErrorDialog(_('A connection is not available'), - _('Your message can not be sent until you are connected.'), - transient_for=self.parent_win.window) - send_message = False - - if send_message: - self.send_message(message, xhtml=xhtml) # send the message - elif event.keyval == Gdk.KEY_z: # CTRL+z - if event.get_state() & Gdk.ModifierType.CONTROL_MASK: - self.msg_textview.undo() - else: - # Give the control itself a chance to process - self.handle_message_textview_mykey_press(widget, event_keyval, - event_keymod) - def _on_drag_data_received(self, widget, context, x, y, selection, target_type, timestamp): """ diff -r 1839ecb719cc -r 88d74b9f4ea1 src/groupchat_control.py --- a/src/groupchat_control.py Fri Jul 24 21:49:10 2015 +0200 +++ b/src/groupchat_control.py Sat Jul 25 21:40:51 2015 +0200 @@ -2290,39 +2290,21 @@ self.print_conversation(_('%(jid)s has been invited in this room') % { 'jid': contact_jid}, graphics=False) - def handle_message_textview_mykey_press(self, widget, event_keyval, - event_keymod): - # NOTE: handles mykeypress which is custom signal connected to this - # CB in new_room(). for this singal see message_textview.py - - if not widget.get_sensitive(): - # Textview is not sensitive, don't handle keypress - return - # construct event instance from binding - event = Gdk.Event(Gdk.EventType.KEY_PRESS) # it's always a key-press here - event.keyval = event_keyval - event.state = event_keymod - event.time = 0 # assign current time - - message_buffer = widget.get_buffer() - start_iter, end_iter = message_buffer.get_bounds() + def _on_message_textview_key_press_event(self, widget, event): + res = ChatControlBase._on_message_textview_key_press_event(self, widget, + event) + if res: + return True if event.keyval == Gdk.KEY_Tab: # TAB + message_buffer = widget.get_buffer() + start_iter, end_iter = message_buffer.get_bounds() cursor_position = message_buffer.get_insert() end_iter = message_buffer.get_iter_at_mark(cursor_position) - text = message_buffer.get_text(start_iter, end_iter, False).decode( - 'utf-8') + text = message_buffer.get_text(start_iter, end_iter, False) splitted_text = text.split() - # HACK: Not the best soltution. - if (text.startswith(self.COMMAND_PREFIX) and not - text.startswith(self.COMMAND_PREFIX * 2) and \ - len(splitted_text) == 1): - return super(GroupchatControl, self).\ - handle_message_textview_mykey_press(widget, event_keyval, - event_keymod) - # nick completion # check if tab is pressed with empty message if len(splitted_text): # if there are any words @@ -2340,7 +2322,7 @@ with_refer_to_nick_char = True after_nick_len = len(gc_refer_to_nick_char + ' ') if len(self.nick_hits) and self.last_key_tabs and \ - text[:-after_nick_len].endswith(self.nick_hits[0]): + text[:-after_nick_len].endswith(self.nick_hits[0]): # we should cycle # Previous nick in list may had a space inside, so we check text # and not splitted_text and store it into 'begin' var @@ -2349,7 +2331,7 @@ else: self.nick_hits = [] # clear the hit list list_nick = gajim.contacts.get_nick_list(self.account, - self.room_jid) + self.room_jid) list_nick.sort(key=str.lower) # case-insensitive sort if begin == '': # empty message, show lasts nicks that highlighted us first @@ -2362,7 +2344,7 @@ for nick in list_nick: fjid = self.room_jid + '/' + nick if nick.lower().startswith(begin.lower()) and not \ - helpers.jid_is_blocked(self.account, fjid): + helpers.jid_is_blocked(self.account, fjid): # the word is the begining of a nick self.nick_hits.append(nick) if len(self.nick_hits): @@ -2374,17 +2356,17 @@ add = ' ' start_iter = end_iter.copy() if self.last_key_tabs and with_refer_to_nick_char or (text and \ - text[-1] == ' '): + text[-1] == ' '): # have to accomodate for the added space from last # completion # gc_refer_to_nick_char may be more than one char! start_iter.backward_chars(len(begin) + len(add)) elif self.last_key_tabs and not gajim.config.get( - 'shell_like_completion'): + 'shell_like_completion'): # have to accomodate for the added space from last # completion start_iter.backward_chars(len(begin) + \ - len(gc_refer_to_nick_char)) + len(gc_refer_to_nick_char)) else: start_iter.backward_chars(len(begin))

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