Commits

commits@gajim.org

17632 discussions

gajim: do not delay the import of libxml2, it's needed by gst. F...
by Gajim 04 Nov '15

04 Nov '15

changeset d6d76868b184 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=d6d76868b184 description: do not delay the import of libxml2, it's needed by gst. Fixes #7836 diffstat: src/gajim.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 734617cd5463 -r d6d76868b184 src/gajim.py --- a/src/gajim.py Sun Nov 01 16:30:27 2015 +0100 +++ b/src/gajim.py Wed Nov 04 21:54:24 2015 +0100 @@ -96,7 +96,7 @@ 'logging.NullHandler', 'dbus.service', 'OpenSSL.SSL', 'OpenSSL.crypto', 'common.sleepy', 'DLFCN', 'dl', 'xml.sax', 'xml.sax.handler', 'ic', 'Crypto.PublicKey', 'IPython', 'contextlib', 'imp', 'gst.interfaces', - 'monotonic', 'gtkexcepthook'] + 'libxml2', 'libxml2mod', 'monotonic', 'gtkexcepthook'] if os.name == 'nt': import locale

1 0

gajim-plugins: Assume nbxmpp availability in all plugins
by Gajim Plugins 04 Nov '15

04 Nov '15

changeset 3cb049fa7edb in /home/hg/repos/gajim-plugins author: Michal Schmidt <mschmidt(a)redhat.com> branches: details:gajim-plugins?cmd=changeset;node=3cb049fa7edb description: Assume nbxmpp availability in all plugins Trying to import non-existent common.xmpp would trigger an exception were it not for a a side-effect of demandimport that Gajim uses. It's not nice to rely on it in gotr and juick. juick does not use nbxmpp for anything. Let's just drop the import. whiteboard does a Gajim version check that no other plugin does. nbxmpp has been required since Gajim 0.16. In all plugins let's just assume it's available. Some plugins already do that. diffstat: gotr/otrmodule.py | 14 +++----------- juick/plugin.py | 7 ------- whiteboard/plugin.py | 6 +----- whiteboard/whiteboard_widget.py | 8 +------- 4 files changed, 5 insertions(+), 30 deletions(-) diffs (94 lines): diff -r 3019b29339f6 -r 3cb049fa7edb gotr/otrmodule.py --- a/gotr/otrmodule.py Sun Oct 25 21:08:42 2015 +0100 +++ b/gotr/otrmodule.py Mon Nov 02 20:02:24 2015 +0100 @@ -68,7 +68,6 @@ from pprint import pformat from distutils.version import StrictVersion -import common.xmpp from common import gajim from common import ged from common.connection_handlers_events import MessageOutgoingEvent @@ -93,11 +92,7 @@ except ImportError: HAS_CRYPTO = False -nb_xmpp = False -import common.xmpp -if not dir(common.xmpp): - import nbxmpp - nb_xmpp = True +import nbxmpp HAS_POTR = True try: @@ -133,10 +128,7 @@ msg = unicode(msg) account = self.user.accountname - if not nb_xmpp: - stanza = common.xmpp.Message(to=self.peer, body=msg, typ='chat') - else: - stanza = nbxmpp.Message(to=self.peer, body=msg, typ='chat') + stanza = nbxmpp.Message(to=self.peer, body=msg, typ='chat') if appdata is not None: session = appdata.get('session', None) if session is not None: @@ -741,4 +733,4 @@ def add_message_processing_hints(stanza): stanza.addChild(name='private', namespace=nbxmpp.NS_CARBONS) stanza.addChild(name='no-permanent-store', namespace=nbxmpp.NS_MSG_HINTS) - stanza.addChild(name='no-copy', namespace=nbxmpp.NS_MSG_HINTS) \ No newline at end of file + stanza.addChild(name='no-copy', namespace=nbxmpp.NS_MSG_HINTS) diff -r 3019b29339f6 -r 3cb049fa7edb juick/plugin.py --- a/juick/plugin.py Sun Oct 25 21:08:42 2015 +0100 +++ b/juick/plugin.py Mon Nov 02 20:02:24 2015 +0100 @@ -21,13 +21,6 @@ from conversation_textview import TextViewImage import gtkgui_helpers -nb_xmpp = False -import common.xmpp -if not dir(common.xmpp): - import nbxmpp - nb_xmpp = True - - class JuickPlugin(GajimPlugin): @log_calls('JuickPlugin') def init(self): diff -r 3019b29339f6 -r 3cb049fa7edb whiteboard/plugin.py --- a/whiteboard/plugin.py Sun Oct 25 21:08:42 2015 +0100 +++ b/whiteboard/plugin.py Mon Nov 02 20:02:24 2015 +0100 @@ -34,11 +34,7 @@ from plugins.plugin import GajimPluginException from plugins.helpers import log_calls, log from common import gajim -ver = list(gajim.config.get('version').split('.')) -if ver < [0, 15, 3, 0]: - from common.xmpp import Message -else: - from nbxmpp import Message +from nbxmpp import Message import gtk import chat_control from common import ged diff -r 3019b29339f6 -r 3cb049fa7edb whiteboard/whiteboard_widget.py --- a/whiteboard/whiteboard_widget.py Sun Oct 25 21:08:42 2015 +0100 +++ b/whiteboard/whiteboard_widget.py Mon Nov 02 20:02:24 2015 +0100 @@ -25,13 +25,7 @@ HAS_GOOCANVAS = True except: HAS_GOOCANVAS = False -from common import gajim -ver = list(gajim.config.get('version').split('.')) -if ver < [0, 15, 3, 0]: - from common.xmpp import Node -else: - from nbxmpp import Node - +from nbxmpp import Node from dialogs import FileChooserDialog '''

1 0

gajim: Correctly check and handle the case when we don't trust o...
by Gajim 01 Nov '15

01 Nov '15

changeset 734617cd5463 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=734617cd5463 description: Correctly check and handle the case when we don't trust our own key. Fixes #8122 diffstat: src/common/connection.py | 5 +++-- src/common/gpg.py | 6 +++++- 2 files changed, 8 insertions(+), 3 deletions(-) diffs (45 lines): diff -r ef4172ee5b5a -r 734617cd5463 src/common/connection.py --- a/src/common/connection.py Sun Nov 01 14:01:45 2015 +0100 +++ b/src/common/connection.py Sun Nov 01 16:30:27 2015 +0100 @@ -320,7 +320,7 @@ always_trust) def _on_encrypted(output): msgenc, error = output - if error == 'NOT_TRUSTED': + if error.startswith( 'NOT_TRUSTED'): def _on_always_trust(answer): if answer: gajim.thread_interface(encrypt_thread, [msg, keyID, @@ -333,7 +333,8 @@ form_node, user_nick, keyID, attention, correction_msg, callback) gajim.nec.push_incoming_event(GPGTrustKeyEvent(None, - conn=self, keyID=keyID, callback=_on_always_trust)) + conn=self, keyID=error.split(' ')[-1], + callback=_on_always_trust)) else: self._message_encrypted_cb(output, type_, msg, msgtxt, original_message, fjid, resource, jid, xhtml, diff -r ef4172ee5b5a -r 734617cd5463 src/common/gpg.py --- a/src/common/gpg.py Sun Nov 01 14:01:45 2015 +0100 +++ b/src/common/gpg.py Sun Nov 01 16:30:27 2015 +0100 @@ -50,6 +50,7 @@ def encrypt(self, str_, recipients, always_trust=False): trust = always_trust if not trust: + # check if we trust all keys trust = True for key in recipients: if key not in self.always_trust: @@ -59,7 +60,10 @@ result = super(GnuPG, self).list_keys(keys=recipients) for key in result: if key['trust'] not in ('f', 'u'): - return '', 'NOT_TRUSTED' + if key['keyid'][-8:] not in self.always_trust: + return '', 'NOT_TRUSTED ' + key['keyid'][-8:] + else: + trust = True result = super(GnuPG, self).encrypt(str_, recipients, always_trust=trust, passphrase=self.passphrase)

1 0

gajim: really import gst when testing if it's available instead ...
by Gajim 01 Nov '15

01 Nov '15

changeset ef4172ee5b5a 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=ef4172ee5b5a description: really import gst when testing if it's available instead of depending on demandimport. Fixes #7836 diffstat: src/common/gajim.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r f97e0bf41644 -r ef4172ee5b5a src/common/gajim.py --- a/src/common/gajim.py Sat Oct 24 13:32:07 2015 +0200 +++ b/src/common/gajim.py Sun Nov 01 14:01:45 2015 +0100 @@ -190,7 +190,7 @@ os.environ['FS_PLUGIN_PATH'] = 'gtk\\lib\\farstream-0.1' os.environ['GST_PLUGIN_PATH'] = 'gtk\\lib\\gstreamer-0.10' farstream = __import__('farstream') - import gst + gst = __import__('gst') import glib try: conference = gst.element_factory_make('fsrtpconference')

1 0

gajim-plugins: Better debug output when image loading fails
by Gajim Plugins 25 Oct '15

25 Oct '15

changeset 3019b29339f6 in /home/hg/repos/gajim-plugins author: tmolitor <thilo(a)eightysoft.de> branches: details:gajim-plugins?cmd=changeset;node=3019b29339f6 description: Better debug output when image loading fails diffstat: url_image_preview/manifest.ini | 2 +- url_image_preview/url_image_preview.py | 12 +++++++++--- 2 Dateien ver?ndert, 10 Zeilen hinzugef?gt(+), 4 Zeilen entfernt(-) Unterschiede (68 Zeilen): diff -r 060b01ce7504 -r 3019b29339f6 url_image_preview/manifest.ini --- a/url_image_preview/manifest.ini Sun Oct 25 20:47:27 2015 +0100 +++ b/url_image_preview/manifest.ini Sun Oct 25 21:08:42 2015 +0100 @@ -1,7 +1,7 @@ [info] name: Url image preview short_name: url_image_preview -version: 0.6.3 +version: 0.6.4 description: Url image preview in chatbox. Based on patch in <a href="http://trac.gajim.org/attachment/ticket/5300">ticket #5300</a>. authors = Denis Fomin <fominde(a)gmail.com> diff -r 060b01ce7504 -r 3019b29339f6 url_image_preview/url_image_preview.py --- a/url_image_preview/url_image_preview.py Sun Oct 25 20:47:27 2015 +0100 +++ b/url_image_preview/url_image_preview.py Sun Oct 25 21:08:42 2015 +0100 @@ -109,13 +109,17 @@ def _check_mime_size(self, (file_mime, file_size), url, repl_start, repl_end): # Check if mime type is acceptable + if file_mime == '' and file_size == 0: + # URL is already displayed + log.info("Failed to load HEAD Request for URL: '%s' (see debug log for more info)" % url) + return if file_mime.lower() not in ACCEPTED_MIME_TYPES: # URL is already displayed log.info("Not accepted mime type '%s' for URL: '%s'" % (file_mime.lower(), url)) return # Check if file size is acceptable if file_size > self.plugin.config['MAX_FILE_SIZE'] or file_size == 0: - log.info("File size too big or unknown for URL: '%s'" % url) + log.info("File size (%s) too big or unknown (zero) for URL: '%s'" % (str(file_size), url)) # URL is already displayed return @@ -159,7 +163,7 @@ raise else: # If image could not be downloaded, URL is already displayed - log.error('Could not download image for URL: %s' % url) + log.error('Could not download image for URL: %s -- %s' % (url, alt)) def _get_http_head (self, account, url): # Check if proxy is used @@ -177,14 +181,15 @@ f = urllib2.urlopen(req) except Exception, ex: log.debug('Could not get head response for URL: %s' % url) + log.debug("%s" % str(ex)) return ('', 0) url_headers = f.info() ctype = '' ctype_list = url_headers.getheaders('Content-Type') if ctype_list: ctype = ctype_list[0] + clen = 0 clen_list = url_headers.getheaders('Content-Length') - clen = 0 if clen_list: try: clen = int(clen_list[0]) @@ -233,6 +238,7 @@ headers = b.getvalue() except pycurl.error, ex: log.debug('Could not get head response for URL: %s' % url) + log.debug("%s" % str(ex)) return ('', 0) ctype = ''

1 0

gajim-plugins: Fixed some bugs in the httpupload feature detecti...
by Gajim Plugins 25 Oct '15

25 Oct '15

changeset 060b01ce7504 in /home/hg/repos/gajim-plugins author: tmolitor <thilo(a)eightysoft.de> branches: details:gajim-plugins?cmd=changeset;node=060b01ce7504 description: Fixed some bugs in the httpupload feature detection when reconnecting diffstat: httpupload/httpupload.py | 91 ++++++++++++++++++++++++++++------------------- httpupload/manifest.ini | 2 +- 2 Dateien ver?ndert, 55 Zeilen hinzugef?gt(+), 38 Zeilen entfernt(-) Unterschiede (139 Zeilen): diff -r 873d456200c9 -r 060b01ce7504 httpupload/httpupload.py --- a/httpupload/httpupload.py Sat Oct 24 16:08:04 2015 +0200 +++ b/httpupload/httpupload.py Sun Oct 25 20:47:27 2015 +0100 @@ -80,37 +80,7 @@ @log_calls('HttpuploadPlugin') def connect_with_chat_control(self, control): - global jid_to_servers - global iq_ids_to_callbacks - global last_info_query self.chat_control = control - # query info at most every 300 seconds (5 minutes) in case something goes wrong - if (not self.chat_control.account in last_info_query or \ - last_info_query[self.chat_control.account] + 300 < time.time()) and \ - not gajim.get_jid_from_account(self.chat_control.account) in jid_to_servers and \ - gajim.account_is_connected(self.chat_control.account): - log.info("Account %s: Using dicovery to find jid of httpupload component" % self.chat_control.account) - id_ = gajim.get_an_id() - iq = nbxmpp.Iq( - typ='get', - to=gajim.get_server_from_jid(gajim.get_jid_from_account(self.chat_control.account)), - queryNS="http://jabber.org/protocol/disco#items" - ) - iq.setID(id_) - def query_info(stanza): - global last_info_query - for item in stanza.getTag("query").getTags("item"): - id_ = gajim.get_an_id() - iq = nbxmpp.Iq( - typ='get', - to=item.getAttr("jid"), - queryNS="http://jabber.org/protocol/disco#info" - ) - iq.setID(id_) - gajim.connections[control.account].connection.send(iq) - last_info_query[self.chat_control.account] = time.time() - iq_ids_to_callbacks[str(id_)] = query_info - gajim.connections[self.chat_control.account].connection.send(iq) base = Base(self, self.chat_control) self.controls.append(base) if self.first_run: @@ -129,16 +99,60 @@ @log_calls('HttpuploadPlugin') def update_button_state(self, chat_control): + global jid_to_servers + global iq_ids_to_callbacks + global last_info_query + + if gajim.connections[chat_control.account].connection == None and \ + gajim.get_jid_from_account(chat_control.account) in jid_to_servers: + # maybe don't delete this and detect vanished upload components when actually trying to upload something + log.info("Deleting %s from jid_to_servers (disconnected)" % gajim.get_jid_from_account(chat_control.account)) + del jid_to_servers[gajim.get_jid_from_account(chat_control.account)] + #pass + + # query info at most every 60 seconds in case something goes wrong + if (not chat_control.account in last_info_query or \ + last_info_query[chat_control.account] + 60 < time.time()) and \ + not gajim.get_jid_from_account(chat_control.account) in jid_to_servers and \ + gajim.account_is_connected(chat_control.account): + log.info("Account %s: Using dicovery to find jid of httpupload component" % chat_control.account) + id_ = gajim.get_an_id() + iq = nbxmpp.Iq( + typ='get', + to=gajim.get_server_from_jid(gajim.get_jid_from_account(chat_control.account)), + queryNS="http://jabber.org/protocol/disco#items" + ) + iq.setID(id_) + def query_info(stanza): + global last_info_query + for item in stanza.getTag("query").getTags("item"): + id_ = gajim.get_an_id() + iq = nbxmpp.Iq( + typ='get', + to=item.getAttr("jid"), + queryNS="http://jabber.org/protocol/disco#info" + ) + iq.setID(id_) + last_info_query[chat_control.account] = time.time() + gajim.connections[chat_control.account].connection.send(iq) + iq_ids_to_callbacks[str(id_)] = query_info + gajim.connections[chat_control.account].connection.send(iq) + #send disco query to main server jid + id_ = gajim.get_an_id() + iq = nbxmpp.Iq( + typ='get', + to=gajim.get_server_from_jid(gajim.get_jid_from_account(chat_control.account)), + queryNS="http://jabber.org/protocol/disco#info" + ) + iq.setID(id_) + last_info_query[chat_control.account] = time.time() + gajim.connections[chat_control.account].connection.send(iq) + for base in self.controls: if base.chat_control == chat_control: - if gajim.connections[chat_control.account].connection == None and \ - gajim.get_jid_from_account(chat_control.account) in jid_to_servers: - # maybe don't delete this and detect vanished upload components when actually trying to upload something - log.info("Deleting %s from jid_to_servers (disconnected)" % gajim.get_jid_from_account(chat_control.account)) - del jid_to_servers[gajim.get_jid_from_account(chat_control.account)] - #pass is_supported = gajim.get_jid_from_account(chat_control.account) in jid_to_servers and \ gajim.connections[chat_control.account].connection != None + log.info("Account %s: httpupload is_supported: %s" % (str(chat_control.account), str(is_supported))) if not is_supported: text = _('Your server does not support http uploads') image_text = text @@ -354,6 +368,9 @@ xhtml = '<body> <a href="%s"> <img alt="%s" src="data:image/png;base64,%s"/> </a></body>' % \ (get.getData(), get.getData(), thumb) progress_window.close_dialog() + id_ = gajim.get_an_id() + def add_oob_tag(): + pass self.chat_control.send_message(message=get.getData(), xhtml=xhtml) self.chat_control.msg_textview.grab_focus() else: @@ -391,7 +408,7 @@ is_supported = gajim.get_jid_from_account(self.chat_control.account) in jid_to_servers and \ gajim.connections[self.chat_control.account].connection != None - log.debug("jid_to_servers of %s: %s ; connection: %s" % (gajim.get_jid_from_account(self.chat_control.account), str(jid_to_servers[gajim.get_jid_from_account(self.chat_control.account)]), str(gajim.connections[self.chat_control.account].connection))) + log.info("jid_to_servers of %s: %s ; connection: %s" % (gajim.get_jid_from_account(self.chat_control.account), str(jid_to_servers[gajim.get_jid_from_account(self.chat_control.account)]), str(gajim.connections[self.chat_control.account].connection))) if not is_supported: progress_window.close_dialog() log.error("upload component vanished, account got disconnected??") diff -r 873d456200c9 -r 060b01ce7504 httpupload/manifest.ini --- a/httpupload/manifest.ini Sat Oct 24 16:08:04 2015 +0200 +++ b/httpupload/manifest.ini Sun Oct 25 20:47:27 2015 +0100 @@ -1,7 +1,7 @@ [info] name: HttpUpload short_name: httpupload -version: 0.3.1 +version: 0.3.2 description: This plugin is designed to send a file to a contact or muc by using httpupload. Your server must support <a href="http://xmpp.org/extensions/xep-0363.html">XEP-0363: HTTP Upload</a>. Conversations supported this.

1 0

gajim: add new option to allow popup notifications when a chat c...
by Gajim 25 Oct '15

25 Oct '15

changeset 193495212d31 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=193495212d31 description: add new option to allow popup notifications when a chat control is opened. See #7891, #8158 diffstat: data/gui/preferences_window.ui | 21 +++++++++++++++++++-- src/common/config.py | 1 + src/common/connection_handlers_events.py | 21 +++++++++++---------- src/config.py | 29 +++++++++++++++++++---------- src/conversation_textview.py | 2 +- 5 files changed, 51 insertions(+), 23 deletions(-) diffs (179 lines): diff -r d8128b776f31 -r 193495212d31 data/gui/preferences_window.ui --- a/data/gui/preferences_window.ui Wed Sep 30 20:00:48 2015 +0200 +++ b/data/gui/preferences_window.ui Sun Oct 25 15:06:37 2015 +0100 @@ -683,6 +683,23 @@ </packing> </child> <child> + <object class="GtkCheckButton" id="auto_popup_chat_opened_checkbutton"> + <property name="label" translatable="yes">Allow popup/notifications when a chat window is opened</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_underline">True</property> + <property name="xalign">0</property> + <property name="draw_indicator">True</property> + <signal name="toggled" handler="on_auto_popup_chat_opened_checkbutton_toggled" swapped="no"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">4</property> + </packing> + </child> + <child> <object class="GtkFrame" id="frame_gmail"> <property name="visible">True</property> <property name="sensitive">False</property> @@ -748,7 +765,7 @@ <packing> <property name="expand">False</property> <property name="fill">False</property> - <property name="position">4</property> + <property name="position">5</property> </packing> </child> <child> @@ -791,7 +808,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">5</property> + <property name="position">6</property> </packing> </child> </object> diff -r d8128b776f31 -r 193495212d31 src/common/config.py --- a/src/common/config.py Wed Sep 30 20:00:48 2015 +0200 +++ b/src/common/config.py Sun Oct 25 15:06:37 2015 +0100 @@ -73,6 +73,7 @@ 'notify_on_signout': [ opt_bool, False ], 'notify_on_new_message': [ opt_bool, True ], 'autopopupaway': [ opt_bool, False ], + 'autopopup_chat_opened': [ opt_bool, False, _('Show desktop notification even when a chat window is opened for this contact and does not have focus') ], 'sounddnd': [ opt_bool, False, _('Play sound when user is busy')], 'use_notif_daemon': [ opt_bool, True, _('Use D-Bus and Notification-Daemon to show notifications') ], 'showoffline': [ opt_bool, False ], diff -r d8128b776f31 -r 193495212d31 src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Wed Sep 30 20:00:48 2015 +0200 +++ b/src/common/connection_handlers_events.py Sun Oct 25 15:06:37 2015 +0100 @@ -2302,7 +2302,7 @@ if self.control: parent_win = self.control.parent_win if parent_win and self.control == parent_win.get_active_control() \ - and parent_win.window.has_focus: + and parent_win.window.get_property('has-toplevel-focus'): self.control_focused = True def handle_incoming_msg_event(self, msg_obj): @@ -2364,15 +2364,16 @@ self.popup_title = _('New Message from %(nickname)s') % \ {'nickname': nick} - if not gajim.config.get('notify_on_new_message') or \ - not self.first_unread: - self.do_popup = False - elif gajim.config.get('autopopupaway'): - # always show notification - self.do_popup = True - elif gajim.connections[self.conn.name].connected in (2, 3): - # we're online or chat - self.do_popup = True + + if gajim.config.get('notify_on_new_message'): + if self.first_unread or (gajim.config.get('autopopup_chat_opened') \ + and not self.control_focused): + if gajim.config.get('autopopupaway'): + # always show notification + self.do_popup = True + if gajim.connections[self.conn.name].connected in (2, 3): + # we're online or chat + self.do_popup = True if msg_obj.attention and not gajim.config.get( 'ignore_incoming_attention'): diff -r d8128b776f31 -r 193495212d31 src/config.py --- a/src/config.py Wed Sep 30 20:00:48 2015 +0200 +++ b/src/config.py Sun Oct 25 15:06:37 2015 +0100 @@ -97,36 +97,38 @@ self.window = self.xml.get_object('preferences_window') self.window.set_transient_for(gajim.interface.roster.window) self.notebook = self.xml.get_object('preferences_notebook') - self.one_window_type_combobox =\ - self.xml.get_object('one_window_type_combobox') + self.one_window_type_combobox = self.xml.get_object( + 'one_window_type_combobox') self.iconset_combobox = self.xml.get_object('iconset_combobox') self.notify_on_signin_checkbutton = self.xml.get_object( - 'notify_on_signin_checkbutton') + 'notify_on_signin_checkbutton') self.notify_on_signout_checkbutton = self.xml.get_object( - 'notify_on_signout_checkbutton') + 'notify_on_signout_checkbutton') self.auto_popup_away_checkbutton = self.xml.get_object( - 'auto_popup_away_checkbutton') + 'auto_popup_away_checkbutton') + self.auto_popup_chat_opened_checkbutton = self.xml.get_object( + 'auto_popup_chat_opened_checkbutton') self.sound_dnd_checkbutton = self.xml.get_object('sound_dnd_checkbutton') self.auto_away_checkbutton = self.xml.get_object('auto_away_checkbutton') self.auto_away_time_spinbutton = self.xml.get_object( - 'auto_away_time_spinbutton') + 'auto_away_time_spinbutton') self.auto_away_message_entry = self.xml.get_object( - 'auto_away_message_entry') + 'auto_away_message_entry') self.auto_xa_checkbutton = self.xml.get_object('auto_xa_checkbutton') self.auto_xa_time_spinbutton = self.xml.get_object( - 'auto_xa_time_spinbutton') + 'auto_xa_time_spinbutton') self.auto_xa_message_entry = self.xml.get_object('auto_xa_message_entry') ### General tab ### # Display avatars in roster st = gajim.config.get('show_avatars_in_roster') self.xml.get_object('show_avatars_in_roster_checkbutton'). \ - set_active(st) + set_active(st) # Display status msg under contact name in roster st = gajim.config.get('show_status_msgs_in_roster') self.xml.get_object('show_status_msgs_in_roster_checkbutton'). \ - set_active( st) + set_active( st) # Display PEP in roster st1 = gajim.config.get('show_mood_in_roster') @@ -313,6 +315,10 @@ st = gajim.config.get('autopopupaway') self.auto_popup_away_checkbutton.set_active(st) + # autopopup_chat_opened + st = gajim.config.get('autopopup_chat_opened') + self.auto_popup_chat_opened_checkbutton.set_active(st) + # sounddnd st = gajim.config.get('sounddnd') self.sound_dnd_checkbutton.set_active(st) @@ -847,6 +853,9 @@ def on_auto_popup_away_checkbutton_toggled(self, widget): self.on_checkbutton_toggled(widget, 'autopopupaway') + def on_auto_popup_chat_opened_checkbutton_toggled(self, widget): + self.on_checkbutton_toggled(widget, 'autopopup_chat_opened') + def on_sound_dnd_checkbutton_toggled(self, widget): self.on_checkbutton_toggled(widget, 'sounddnd') diff -r d8128b776f31 -r 193495212d31 src/conversation_textview.py --- a/src/conversation_textview.py Wed Sep 30 20:00:48 2015 +0200 +++ b/src/conversation_textview.py Sun Oct 25 15:06:37 2015 +0100 @@ -125,7 +125,7 @@ if not parent: self._disconnect_signals() return - if isinstance(parent, gtk.EventBox): + if isinstance(parent, Gtk.EventBox): parent = parent.get_parent() if not parent: self._disconnect_signals()

1 0

gajim-plugins: Fixed version detection bug
by Gajim Plugins 24 Oct '15

24 Oct '15

changeset 873d456200c9 in /home/hg/repos/gajim-plugins author: tmolitor <thilo(a)eightysoft.de> branches: details:gajim-plugins?cmd=changeset;node=873d456200c9 description: Fixed version detection bug diffstat: gotr/manifest.ini | 2 +- gotr/otrmodule.py | 3 +-- 2 Dateien ver?ndert, 2 Zeilen hinzugef?gt(+), 3 Zeilen entfernt(-) Unterschiede (32 Zeilen): diff -r c307cf81f963 -r 873d456200c9 gotr/manifest.ini --- a/gotr/manifest.ini Sat Oct 24 13:36:43 2015 +0200 +++ b/gotr/manifest.ini Sat Oct 24 16:08:04 2015 +0200 @@ -1,7 +1,7 @@ [info] name: Off-The-Record Encryption short_name: gotr -version: 1.9 +version: 1.9.1 description: Provide OTR encryption. Read <a href="https://github.com/python-otr/gajim-otr/wiki">https://github.com/python-otr/gajim-otr/wiki</a> before use. authors: Kjell Braden <afflux.gajim(a)pentabarf.de> homepage: http://gajim-otr.pentabarf.de diff -r c307cf81f963 -r 873d456200c9 gotr/otrmodule.py --- a/gotr/otrmodule.py Sat Oct 24 13:36:43 2015 +0200 +++ b/gotr/otrmodule.py Sat Oct 24 16:08:04 2015 +0200 @@ -69,7 +69,6 @@ from distutils.version import StrictVersion import common.xmpp -from common import defs from common import gajim from common import ged from common.connection_handlers_events import MessageOutgoingEvent @@ -288,7 +287,7 @@ self.handle_incoming_msg) self.events_handlers['before-change-show'] = (ged.PRECORE, self.handle_change_show) - if StrictVersion(defs.version) < StrictVersion(MINVERSION_OUTGOING_MSG_STAZA): + if StrictVersion(gajim.config.get('version')) < StrictVersion(MINVERSION_OUTGOING_MSG_STAZA): self.events_handlers['message-outgoing'] = (ged.OUT_PRECORE, self.handle_outgoing_msg) else:

1 0

gajim-plugins: [OTR] update description
by Gajim Plugins 24 Oct '15

24 Oct '15

changeset c307cf81f963 in /home/hg/repos/gajim-plugins author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:gajim-plugins?cmd=changeset;node=c307cf81f963 description: [OTR] update description diffstat: gotr/manifest.ini | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 0d88137a1b6c -r c307cf81f963 gotr/manifest.ini --- a/gotr/manifest.ini Sat Oct 24 13:08:35 2015 +0200 +++ b/gotr/manifest.ini Sat Oct 24 13:36:43 2015 +0200 @@ -2,7 +2,7 @@ name: Off-The-Record Encryption short_name: gotr version: 1.9 -description: Provide OTR encryption. See <a href="http://www.cypherpunks.ca/otr/">Author website</a> +description: Provide OTR encryption. Read <a href="https://github.com/python-otr/gajim-otr/wiki">https://github.com/python-otr/gajim-otr/wiki</a> before use. authors: Kjell Braden <afflux.gajim(a)pentabarf.de> homepage: http://gajim-otr.pentabarf.de max_gajim_version: 0.16.9

1 0

gajim: stop requesting MAM archive when we get the complete='tru...
by Gajim 24 Oct '15

24 Oct '15

changeset f97e0bf41644 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=f97e0bf41644 description: stop requesting MAM archive when we get the complete='true' attribute. Fixes #8170 diffstat: src/common/message_archiving.py | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diffs (14 lines): diff -r 676775867517 -r f97e0bf41644 src/common/message_archiving.py --- a/src/common/message_archiving.py Wed Sep 30 20:00:48 2015 +0200 +++ b/src/common/message_archiving.py Sat Oct 24 13:32:07 2015 +0200 @@ -103,7 +103,9 @@ last = set_.getTagData('last') if last: gajim.config.set_per('accounts', self.name, 'last_mam_id', last) - self.request_archive(after=last) + complete = fin_.getAttr('complete') + if complete != 'true': + self.request_archive(after=last) del self.awaiting_answers[queryid_]

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