Commits January 2009

commits@gajim.org

7 participants
115 discussions

[commit-gajim] r11037 - trunk/src
by asterix＠gajim.org 28 Jan '09

28 Jan '09

Author: asterix Date: 2009-01-28 13:00:31 +0100 (Wed, 28 Jan 2009) New Revision: 11037 Modified: trunk/src/gajim.py Log: add a parameter in GCMessage dbus event: highlight. Fixes #4739 Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2009-01-28 07:54:22 UTC (rev 11036) +++ trunk/src/gajim.py 2009-01-28 12:00:31 UTC (rev 11037) @@ -1253,6 +1253,8 @@ gc_control.on_message(nick, array[1], array[2], array[3], xhtml, array[5]) if self.remote_ctrl: + highlight = gc_control.needs_visual_notification(msg) + array += (highlight,) self.remote_ctrl.raise_signal('GCMessage', (account, array)) def handle_event_gc_subject(self, account, array):

1 0

[commit-gajim] r11036 - trunk/src/common
by asterix＠gajim.org 28 Jan '09

28 Jan '09

Author: asterix Date: 2009-01-28 08:54:22 +0100 (Wed, 28 Jan 2009) New Revision: 11036 Modified: trunk/src/common/dataforms.py Log: fixed fields in dataforms don't have multiple <value/> elements. see #3200 Modified: trunk/src/common/dataforms.py =================================================================== --- trunk/src/common/dataforms.py 2009-01-28 07:47:38 UTC (rev 11035) +++ trunk/src/common/dataforms.py 2009-01-28 07:54:22 UTC (rev 11036) @@ -59,8 +59,7 @@ ''' Helper function to create a field of given type. ''' f = { 'boolean': BooleanField, - # not editable, still can have multiple lines of text - 'fixed': TextMultiField, + 'fixed': StringField, 'hidden': StringField, 'text-private': StringField, 'text-single': StringField, @@ -80,7 +79,7 @@ typ=node.getAttr('type') f = { 'boolean': BooleanField, - 'fixed': TextMultiField, + 'fixed': StringField, 'hidden': StringField, 'text-private': StringField, 'text-single': StringField,

1 0

[commit-gajim] r11035 - trunk/src/common
by asterix＠gajim.org 28 Jan '09

28 Jan '09

Author: asterix Date: 2009-01-28 08:47:38 +0100 (Wed, 28 Jan 2009) New Revision: 11035 Modified: trunk/src/common/dataforms.py Log: coding standards Modified: trunk/src/common/dataforms.py =================================================================== --- trunk/src/common/dataforms.py 2009-01-27 20:33:54 UTC (rev 11034) +++ trunk/src/common/dataforms.py 2009-01-28 07:47:38 UTC (rev 11035) @@ -21,15 +21,18 @@ ## along with Gajim. If not, see <http://www.gnu.org/licenses/>. ## -""" This module contains wrappers for different parts of data forms (JEP 0004). For information -how to use them, read documentation. """ +""" This module contains wrappers for different parts of data forms (JEP 0004). +For information how to use them, read documentation. """ import xmpp # exceptions used in this module -class Error(Exception): pass # base class -class UnknownDataForm(Error): pass # when we get xmpp.Node which we do not understand -class WrongFieldValue(Error): pass # when we get xmpp.Node which contains bad fields +# base class +class Error(Exception): pass +# when we get xmpp.Node which we do not understand +class UnknownDataForm(Error): pass +# when we get xmpp.Node which contains bad fields +class WrongFieldValue(Error): pass # helper class to change class of already existing object class ExtendedNode(xmpp.Node, object): @@ -56,7 +59,8 @@ ''' Helper function to create a field of given type. ''' f = { 'boolean': BooleanField, - 'fixed': TextMultiField, # not editable, still can have multiple lines of text + # not editable, still can have multiple lines of text + 'fixed': TextMultiField, 'hidden': StringField, 'text-private': StringField, 'text-single': StringField, @@ -101,33 +105,40 @@ """ Keeps data about one field - var, field type, labels, instructions... Base class for different kinds of fields. Use Field() function to construct one of these. """ - def __init__(self, typ=None, var=None, value=None, label=None, desc=None, required=False, - options=None, extend=None): + + def __init__(self, typ=None, var=None, value=None, label=None, desc=None, + required=False, options=None, extend=None): if extend is None: ExtendedNode.__init__(self, 'field') self.type = typ self.var = var - if value is not None: self.value = value - if label is not None: self.label = label - if desc is not None: self.desc = desc + if value is not None: + self.value = value + if label is not None: + self.label = label + if desc is not None: + self.desc = desc self.required = required self.options = options @nested_property def type(): - '''Type of field. Recognized values are: 'boolean', 'fixed', 'hidden', 'jid-multi', - 'jid-single', 'list-multi', 'list-single', 'text-multi', 'text-private', - 'text-single'. If you set this to something different, DataField will store - given name, but treat all data as text-single.''' + '''Type of field. Recognized values are: 'boolean', 'fixed', 'hidden', + 'jid-multi', 'jid-single', 'list-multi', 'list-single', 'text-multi', + 'text-private', 'text-single'. If you set this to something different, + DataField will store given name, but treat all data as text-single.''' def fget(self): t = self.getAttr('type') - if t is None: return 'text-single' + if t is None: + return 'text-single' return t + def fset(self, value): assert isinstance(value, basestring) self.setAttr('type', value) + return locals() @nested_property @@ -135,11 +146,14 @@ '''Field identifier.''' def fget(self): return self.getAttr('var') + def fset(self, value): assert isinstance(value, basestring) self.setAttr('var', value) + def fdel(self): self.delAttr('var') + return locals() @nested_property @@ -147,12 +161,15 @@ '''Human-readable field name.''' def fget(self): return self.getAttr('label') + def fset(self, value): assert isinstance(value, basestring) self.setAttr('label', value) + def fdel(self): if self.getAttr('label'): self.delAttr('label') + return locals() @nested_property @@ -160,16 +177,19 @@ '''Human-readable description of field meaning.''' def fget(self): return self.getTagData('desc') or u'' + def fset(self, value): assert isinstance(value, basestring) if value == '': fdel(self) else: self.setTagData('desc', value) + def fdel(self): t = self.getTag('desc') if t is not None: self.delChild(t) + return locals() @nested_property @@ -177,12 +197,14 @@ '''Controls whether this field required to fill. Boolean.''' def fget(self): return bool(self.getTag('required')) + def fset(self, value): t = self.getTag('required') if t and not value: self.delChild(t) elif not t and value: self.addChild('required') + return locals() class BooleanField(DataField): @@ -191,16 +213,22 @@ '''Value of field. May contain True, False or None.''' def fget(self): v = self.getTagData('value') - if v in ('0', 'false'): return False - if v in ('1', 'true'): return True - if v is None: return False # default value is False + if v in ('0', 'false'): + return False + if v in ('1', 'true'): + return True + if v is None: + return False # default value is False raise WrongFieldValue + def fset(self, value): self.setTagData('value', value and '1' or '0') + def fdel(self, value): t = self.getTag('value') if t is not None: self.delChild(t) + return locals() class StringField(DataField): @@ -210,20 +238,23 @@ '''Value of field. May be any unicode string.''' def fget(self): return self.getTagData('value') or u'' + def fset(self, value): assert isinstance(value, basestring) if value == '': return fdel(self) self.setTagData('value', value) + def fdel(self): try: self.delChild(self.getTag('value')) except ValueError: # if there already were no value tag pass + return locals() class ListField(DataField): - ''' Covers fields of types: jid-multi, jid-single, list-multi, list-single. ''' + '''Covers fields of types: jid-multi, jid-single, list-multi, list-single.''' @nested_property def options(): '''Options.''' @@ -231,22 +262,27 @@ options = [] for element in self.getTags('option'): v = element.getTagData('value') - if v is None: raise WrongFieldValue + if v is None: + raise WrongFieldValue options.append((element.getAttr('label'), v)) return options + def fset(self, values): fdel(self) for value, label in values: self.addChild('option', {'label': label}).setTagData('value', value) + def fdel(self): for element in self.getTags('option'): self.delChild(element) + return locals() def iter_options(self): for element in self.iterTags('option'): v = element.getTagData('value') - if v is None: raise WrongFieldValue + if v is None: + raise WrongFieldValue l = element.getAttr('label') if not l: l = v @@ -266,13 +302,16 @@ for element in self.getTags('value'): values.append(element.getData()) return values + def fset(self, values): fdel(self) for value in values: self.addChild('value').setData(value) + def fdel(self): for element in self.getTags('value'): self.delChild(element) + return locals() def iter_values(self): @@ -288,14 +327,18 @@ for element in self.iterTags('value'): value += '\n' + element.getData() return value[1:] + def fset(self, value): fdel(self) - if value == '': return + if value == '': + return for line in value.split('\n'): self.addChild('value').setData(line) + def fdel(self): for element in self.getTags('value'): self.delChild(element) + return locals() class DataRecord(ExtendedNode): @@ -308,7 +351,8 @@ # we have to build this object from scratch xmpp.Node.__init__(self) - if fields is not None: self.fields = fields + if fields is not None: + self.fields = fields else: # we already have xmpp.Node inside - try to convert all # fields into DataField objects @@ -327,15 +371,18 @@ '''List of fields in this record.''' def fget(self): return self.getTags('field') + def fset(self, fields): fdel(self) for field in fields: if not isinstance(field, DataField): ExtendField(extend=field) self.addChild(node=field) + def fdel(self): for element in self.getTags('field'): self.delChild(element) + return locals() def iter_fields(self): @@ -359,9 +406,12 @@ # we have to build form from scratch xmpp.Node.__init__(self, 'x', attrs={'xmlns': xmpp.NS_DATA}) - if type_ is not None: self.type_=type_ - if title is not None: self.title=title - if instructions is not None: self.instructions=instructions + if type_ is not None: + self.type_=type_ + if title is not None: + self.title=title + if instructions is not None: + self.instructions=instructions @nested_property def type(): @@ -370,9 +420,11 @@ filledform = DataForm(replyto=thisform)...''' def fget(self): return self.getAttr('type') + def fset(self, type_): assert type_ in ('form', 'submit', 'cancel', 'result') self.setAttr('type', type_) + return locals() @nested_property @@ -380,13 +432,16 @@ ''' Title of the form. Human-readable, should not contain any \\r\\n.''' def fget(self): return self.getTagData('title') + def fset(self, title): self.setTagData('title', title) + def fdel(self): try: self.delChild('title') except ValueError: pass + return locals() @nested_property @@ -398,19 +453,24 @@ for valuenode in self.getTags('instructions'): value += '\n' + valuenode.getData() return value[1:] + def fset(self, value): fdel(self) if value == '': return for line in value.split('\n'): self.addChild('instructions').setData(line) + def fdel(self): for value in self.getTags('instructions'): self.delChild(value) + return locals() class SimpleDataForm(DataForm, DataRecord): - def __init__(self, type_=None, title=None, instructions=None, fields=None, extend=None): - DataForm.__init__(self, type_=type_, title=title, instructions=instructions, extend=extend) + def __init__(self, type_=None, title=None, instructions=None, fields=None, \ + extend=None): + DataForm.__init__(self, type_=type_, title=title, + instructions=instructions, extend=extend) DataRecord.__init__(self, fields=fields, extend=self, associated=self) def get_purged(self): @@ -433,12 +493,14 @@ return c class MultipleDataForm(DataForm): - def __init__(self, type_=None, title=None, instructions=None, items=None, extend=None): - DataForm.__init__(self, type_=type_, title=title, instructions=instructions, extend=extend) + def __init__(self, type_=None, title=None, instructions=None, items=None, + extend=None): + DataForm.__init__(self, type_=type_, title=title, + instructions=instructions, extend=extend) # all records, recorded into DataRecords if extend is None: - - if items is not None: self.items = items + if items is not None: + self.items = items else: # we already have xmpp.Node inside - try to convert all # fields into DataField objects @@ -449,22 +511,25 @@ self.delChild(item) self.items = items reported_tag = self.getTag('reported') - self.reported = DataRecord(extend = reported_tag) + self.reported = DataRecord(extend=reported_tag) @nested_property def items(): ''' A list of all records. ''' def fget(self): return list(self.iter_records()) + def fset(self, records): fdel(self) for record in records: if not isinstance(record, DataRecord): DataRecord(extend=record) self.addChild(node=record) + def fdel(self): for record in self.getTags('item'): self.delChild(record) + return locals() def iter_records(self):

1 0

[commit-gajim] r11034 - trunk/src
by asterix＠gajim.org 27 Jan '09

27 Jan '09

Author: asterix Date: 2009-01-27 21:33:54 +0100 (Tue, 27 Jan 2009) New Revision: 11034 Modified: trunk/src/message_textview.py Log: escape & in HTML messages. Modified: trunk/src/message_textview.py =================================================================== --- trunk/src/message_textview.py 2009-01-27 08:48:17 UTC (rev 11033) +++ trunk/src/message_textview.py 2009-01-27 20:33:54 UTC (rev 11034) @@ -217,6 +217,7 @@ def xhtml_special(text): text = text.replace('<', '<') text = text.replace('>', '>') + text = text.replace('&', '&') text = text.replace('\n', '<br />') return text

1 0

[commit-gajim] r11033 - in trunk: . src src/common
by asterix＠gajim.org 27 Jan '09

27 Jan '09

Author: asterix Date: 2009-01-27 09:48:17 +0100 (Tue, 27 Jan 2009) New Revision: 11033 Modified: trunk/configure.ac trunk/src/common/config.py trunk/src/common/optparser.py trunk/src/config.py Log: allow ignore_unknown_contacts, send_os_info and log_encrypted_sessions to be set per_account in ACE. Fixes #4730 Modified: trunk/configure.ac =================================================================== --- trunk/configure.ac 2009-01-26 18:05:04 UTC (rev 11032) +++ trunk/configure.ac 2009-01-27 08:48:17 UTC (rev 11033) @@ -1,5 +1,5 @@ AC_INIT([Gajim - A Jabber Instant Messager], - [0.12.1.1-svn],[http://trac.gajim.org/],[gajim]) + [0.12.1.2-svn],[http://trac.gajim.org/],[gajim]) AC_PREREQ([2.59]) AC_CONFIG_HEADER(config.h) Modified: trunk/src/common/config.py =================================================================== --- trunk/src/common/config.py 2009-01-26 18:05:04 UTC (rev 11032) +++ trunk/src/common/config.py 2009-01-27 08:48:17 UTC (rev 11033) @@ -80,7 +80,6 @@ 'notify_on_new_message': [ opt_bool, True ], 'autopopupaway': [ opt_bool, False ], 'use_notif_daemon': [ opt_bool, True , _('Use D-Bus and Notification-Daemon to show notifications') ], - 'ignore_unknown_contacts': [ opt_bool, False ], 'showoffline': [ opt_bool, False ], 'show_transports_group': [ opt_bool, True ], 'autoaway': [ opt_bool, True ], @@ -166,7 +165,6 @@ 'time_stamp': [ opt_str, '[%X] ', _('This option let you customize timestamp that is printed in conversation. For exemple "[%H:%M] " will show "[hour:minute] ". See python doc on strftime for full documentation: http://docs.python.org/lib/module-time.html') ], 'before_nickname': [ opt_str, '', _('Characters that are printed before the nickname in conversations') ], 'after_nickname': [ opt_str, ':', _('Characters that are printed after the nickname in conversations') ], - 'send_os_info': [ opt_bool, True ], 'notify_on_new_gmail_email': [ opt_bool, True ], 'notify_on_new_gmail_email_extra': [ opt_bool, False ], 'use_gpg_agent': [ opt_bool, False ], @@ -205,7 +203,6 @@ 'tabs_always_visible': [opt_bool, False, _('Show tab when only one conversation?')], 'tabs_border': [opt_bool, False, _('Show tabbed notebook border in chat windows?')], 'tabs_close_button': [opt_bool, True, _('Show close button in tab?')], - 'log_encrypted_sessions': [opt_bool, True, _('When negotiating an encrypted session, should Gajim assume you want your messages to be logged?')], 'esession_modp': [opt_str, '5,14', _('A list of modp groups to use in a Diffie-Hellman, highest preference first, separated by commas. Valid groups are 1, 2, 5, 14, 15, 16, 17 and 18. Higher numbers are more secure, but take longer to calculate when you start a session.')], 'chat_avatar_width': [opt_int, 52], 'chat_avatar_height': [opt_int, 52], @@ -343,6 +340,9 @@ 'subscribe_activity': [opt_bool, True], 'subscribe_tune': [opt_bool, True], 'subscribe_nick': [opt_bool, True], + 'ignore_unknown_contacts': [ opt_bool, False ], + 'send_os_info': [ opt_bool, True ], + 'log_encrypted_sessions': [opt_bool, True, _('When negotiating an encrypted session, should Gajim assume you want your messages to be logged?')], }, {}), 'statusmsg': ({ 'message': [ opt_str, '' ], Modified: trunk/src/common/optparser.py =================================================================== --- trunk/src/common/optparser.py 2009-01-26 18:05:04 UTC (rev 11032) +++ trunk/src/common/optparser.py 2009-01-27 08:48:17 UTC (rev 11033) @@ -189,6 +189,8 @@ self.update_config_to_01201() if old < [0, 12, 1, 1] and new >= [0, 12, 1, 1]: self.update_config_to_01211() + if old < [0, 12, 1, 2] and new >= [0, 12, 1, 2]: + self.update_config_to_01212() gajim.logger.init_vars() gajim.config.set('version', new_version) @@ -618,4 +620,13 @@ gajim.config.set('trayicon', 'always') gajim.config.set('version', '0.12.1.1') + def update_config_to_01212(self): + for opt in ('ignore_unknown_contacts', 'send_os_info', + 'log_encrypted_sessions'): + if opt in self.old_values: + val = self.old_values[opt] + for account in gajim.config.get_per('accounts'): + gajim.config.set_per('accounts', account, opt, val) + gajim.config.set('version', '0.12.1.2') + # vim: se ts=3: Modified: trunk/src/config.py =================================================================== --- trunk/src/config.py 2009-01-26 18:05:04 UTC (rev 11032) +++ trunk/src/config.py 2009-01-27 08:48:17 UTC (rev 11033) @@ -468,20 +468,32 @@ self.xml.get_widget('log_show_changes_checkbutton').set_active(st) # log encrypted chat sessions - st = gajim.config.get('log_encrypted_sessions') - self.xml.get_widget('log_encrypted_chats_checkbutton').set_active(st) + w = self.xml.get_widget('log_encrypted_chats_checkbutton') + st = self.get_per_account_option('log_encrypted_sessions') + if st == 'mixed': + w.set_inconsistent(True) + else: + w.set_active(st) # send os info - st = gajim.config.get('send_os_info') - self.xml.get_widget('send_os_info_checkbutton').set_active(st) + w = self.xml.get_widget('send_os_info_checkbutton') + st = self.get_per_account_option('send_os_info') + if st == 'mixed': + w.set_inconsistent(True) + else: + w.set_active(st) # check if gajm is default st = gajim.config.get('check_if_gajim_is_default') self.xml.get_widget('check_default_client_checkbutton').set_active(st) # Ignore messages from unknown contacts - self.xml.get_widget('ignore_events_from_unknown_contacts_checkbutton').\ - set_active(gajim.config.get('ignore_unknown_contacts')) + w = self.xml.get_widget('ignore_events_from_unknown_contacts_checkbutton') + st = self.get_per_account_option('ignore_unknown_contacts') + if st == 'mixed': + w.set_inconsistent(True) + else: + w.set_active(st) self.xml.signal_autoconnect(self) @@ -504,14 +516,36 @@ if event.keyval == gtk.keysyms.Escape: self.window.hide() + def get_per_account_option(self, opt): + '''Return the value of the option opt if it's the same in all accoutns + else returns "mixed"''' + val = None + for account in gajim.connections: + v = gajim.config.get_per('accounts', account, opt) + if val is None: + val = v + elif val != v: + return 'mixed' + return val + def on_checkbutton_toggled(self, widget, config_name, - change_sensitivity_widgets = None): + change_sensitivity_widgets=None): gajim.config.set(config_name, widget.get_active()) if change_sensitivity_widgets: for w in change_sensitivity_widgets: w.set_sensitive(widget.get_active()) gajim.interface.save_config() + def on_per_account_checkbutton_toggled(self, widget, config_name, + change_sensitivity_widgets=None): + for account in gajim.connections: + gajim.config.set_per('accounts', account, config_name, + widget.get_active()) + if change_sensitivity_widgets: + for w in change_sensitivity_widgets: + w.set_sensitive(widget.get_active()) + gajim.interface.save_config() + def on_sort_by_show_in_roster_checkbutton_toggled(self, widget): self.on_checkbutton_toggled(widget, 'sort_by_show_in_roster') gajim.interface.roster.setup_and_draw_roster() @@ -706,7 +740,8 @@ gajim.config.set('displayed_chat_state_notifications', 'disabled') def on_ignore_events_from_unknown_contacts_checkbutton_toggled(self, widget): - self.on_checkbutton_toggled(widget, 'ignore_unknown_contacts') + widget.set_inconsistent(False) + self.on_per_account_checkbutton_toggled(widget, 'ignore_unknown_contacts') def on_on_event_combobox_changed(self, widget): active = widget.get_active() @@ -953,10 +988,12 @@ self.on_checkbutton_toggled(widget, 'log_contact_status_changes') def on_log_encrypted_chats_checkbutton_toggled(self, widget): - self.on_checkbutton_toggled(widget, 'log_encrypted_sessions') + widget.set_inconsistent(False) + self.on_per_account_checkbutton_toggled(widget, 'log_encrypted_sessions') def on_send_os_info_checkbutton_toggled(self, widget): - self.on_checkbutton_toggled(widget, 'send_os_info') + widget.set_inconsistent(False) + self.on_per_account_checkbutton_toggled(widget, 'send_os_info') def on_check_default_client_checkbutton_toggled(self, widget): self.on_checkbutton_toggled(widget, 'check_if_gajim_is_default')

1 0

[commit-gajim] r11032 - trunk/src
by asterix＠gajim.org 26 Jan '09

26 Jan '09

Author: asterix Date: 2009-01-26 19:05:04 +0100 (Mon, 26 Jan 2009) New Revision: 11032 Modified: trunk/src/gajim.py Log: metion account name in fingerprint changed dialog. Fixes $4735 Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2009-01-26 16:15:05 UTC (rev 11031) +++ trunk/src/gajim.py 2009-01-26 18:05:04 UTC (rev 11032) @@ -2022,10 +2022,11 @@ gajim.connections[account].disconnect(on_purpose=True) self.handle_event_status(account, 'offline') pritext = _('SSL certificate error') - sectext = _('It seems the SSL certificate has changed or your connection ' - 'is being hacked.\nOld fingerprint: %(old)s\nNew fingerprint: %(new)s' - '\n\nDo you still want to connect and update the fingerprint of the ' - 'certificate?') % {'old': gajim.config.get_per('accounts', account, + sectext = _('It seems the SSL certificate of account %(account)s has ' + 'changed or your connection is being hacked.\nOld fingerprint: %(old)s' + '\nNew fingerprint: %(new)s\n\nDo you still want to connect and update' + ' the fingerprint of the certificate?') % {'account': account, + 'old': gajim.config.get_per('accounts', account, 'ssl_fingerprint_sha1'), 'new': data[0]} if 'fingerprint_error' in self.instances[account]['online_dialog']: self.instances[account]['online_dialog']['fingerprint_error'].destroy()

1 0

[commit-gajim] r11031 - in trunk: . src src/common
by asterix＠gajim.org 26 Jan '09

26 Jan '09

Author: asterix Date: 2009-01-26 17:15:05 +0100 (Mon, 26 Jan 2009) New Revision: 11031 Modified: trunk/README.html trunk/src/common/dbus_support.py trunk/src/gajim-remote.py Log: test if dbus0x11 is installed before using dbus. Fixes #4715 Modified: trunk/README.html =================================================================== --- trunk/README.html 2009-01-26 10:27:46 UTC (rev 11030) +++ trunk/README.html 2009-01-26 16:15:05 UTC (rev 11031) @@ -32,12 +32,12 @@ <li>python-crypto to enable End to end encryption</li> <li>For idle module, libxss library</li> <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; if you don't know what that is, you don't need it</li> +<li>dnsutils (or whatever package provides the nslookup binary) for SRV support</li> <li>gtkspell and aspell-LANG where lang is your locale eg. en, fr etc</li> <li>GnomePythonExtras 2.10 or above (aka gnome-python-desktop) so you can avoid compiling trayicon and gtkspell</li> <li>gnome-python-desktop (for GnomeKeyring support)</li> <li>notification-daemon or notify-python (and D-Bus) to get cooler popups</li> -<li>D-Bus running to have gajim-remote working</li> +<li>D-Bus running to have gajim-remote working. Some distributions split dbus-x11, which is needed for dbus to work with Gajim.</li> <li>python-dbus bindings</li> <li>python-sexy to have clickable URLs in chat windows</li> <li>python-kerberos to use GSSAPI authentification. Note: version1.1 or higher is required</li> Modified: trunk/src/common/dbus_support.py =================================================================== --- trunk/src/common/dbus_support.py 2009-01-26 10:27:46 UTC (rev 11030) +++ trunk/src/common/dbus_support.py 2009-01-26 16:15:05 UTC (rev 11031) @@ -40,6 +40,8 @@ pass import dbus import dbus.glib + # test if dbus-x11 is installed + bus = dbus.SessionBus() supported = True # does user have D-Bus bindings? except ImportError: supported = False Modified: trunk/src/gajim-remote.py =================================================================== --- trunk/src/gajim-remote.py 2009-01-26 10:27:46 UTC (rev 11030) +++ trunk/src/gajim-remote.py 2009-01-26 16:15:05 UTC (rev 11031) @@ -52,6 +52,8 @@ import dbus import dbus.service import dbus.glib + # test if dbus-x11 is installed + bus = dbus.SessionBus() except Exception: print str(exceptions.DbusNotSupported()) sys.exit(1)

1 0

[commit-gajim] r11030 - trunk/src/common
by asterix＠gajim.org 26 Jan '09

26 Jan '09

Author: asterix Date: 2009-01-26 11:27:46 +0100 (Mon, 26 Jan 2009) New Revision: 11030 Modified: trunk/src/common/connection_handlers.py Log: infor user about success or failure of registration with an agent. Fixes #3474 Modified: trunk/src/common/connection_handlers.py =================================================================== --- trunk/src/common/connection_handlers.py 2009-01-26 09:22:28 UTC (rev 11029) +++ trunk/src/common/connection_handlers.py 2009-01-26 10:27:46 UTC (rev 11030) @@ -661,16 +661,26 @@ def request_register_agent_info(self, agent): if not self.connection or self.connected < 2: return None - iq=common.xmpp.Iq('get', common.xmpp.NS_REGISTER, to=agent) + iq = common.xmpp.Iq('get', common.xmpp.NS_REGISTER, to=agent) id_ = self.connection.getAnID() iq.setID(id_) # Wait the answer during 30 secondes self.awaiting_timeouts[gajim.idlequeue.current_time() + 30] = (id_, - _('Registration information for transport %s has not arrived in time') % \ - agent) + _('Registration information for transport %s has not arrived in time')\ + % agent) self.connection.SendAndCallForResponse(iq, self._ReceivedRegInfo, {'agent': agent}) + def _agent_registered_cb(self, con, resp, agent): + if resp.getType() == 'result': + self.dispatch('INFORMATION', (_('Registration succeeded'), + _('Resgitration with agent %s succeeded') % agent)) + if resp.getType() == 'error': + self.dispatch('ERROR', (_('Registration failed'), _('Resgitration with' + ' agent %(agent)s failed with error %(error)s: %(error_msg)s') % { + 'agent': agent, 'error': resp.getError(), + 'error_msg': resp.getErrorMsg()})) + def register_agent(self, agent, info, is_form = False): if not self.connection or self.connected < 2: return @@ -679,7 +689,8 @@ query = iq.getTag('query') info.setAttr('type', 'submit') query.addChild(node = info) - self.connection.send(iq) + self.connection.SendAndCallForResponse(iq, self._agent_registered_cb, + {'agent': agent}) else: # fixed: blocking common.xmpp.features_nb.register(self.connection, agent, info, None)

1 0

[commit-gajim] r11029 - trunk/src
by asterix＠gajim.org 26 Jan '09

26 Jan '09

Author: asterix Date: 2009-01-26 10:22:28 +0100 (Mon, 26 Jan 2009) New Revision: 11029 Modified: trunk/src/message_window.py Log: better way to get window maximized state. Fixes #4710, see #4630 Modified: trunk/src/message_window.py =================================================================== --- trunk/src/message_window.py 2009-01-25 21:38:35 UTC (rev 11028) +++ trunk/src/message_window.py 2009-01-26 09:22:28 UTC (rev 11029) @@ -887,7 +887,6 @@ # we track the lifetime of this window win.window.connect('delete-event', self._on_window_delete) win.window.connect('destroy', self._on_window_destroy) - win.window.connect('window-state-event', self._on_window_state_change) return win def _gtk_win_to_msg_win(self, gtk_win): @@ -1024,10 +1023,6 @@ del self._windows[old_key] win.change_key(old_jid, new_jid, acct) - def _on_window_state_change(self,widget, event, *args): - "track window state" - self.win_maximized = (event.new_window_state == gtk.gdk.WINDOW_STATE_MAXIMIZED) - def _on_window_delete(self, win, event): self.save_state(self._gtk_win_to_msg_win(win)) gajim.interface.save_config() @@ -1123,7 +1118,9 @@ gajim.config.set_per('accounts', acct, pos_y_key, y) else: - gajim.config.set(max_win_key , self.win_maximized ) + win_maximized = msg_win.window.window.get_state() == \ + gtk.gdk.WINDOW_STATE_MAXIMIZED + gajim.config.set(max_win_key, win_maximized) width += width_adjust gajim.config.set(size_width_key, width) gajim.config.set(size_height_key, height)

1 0

[commit-gajim] r11028 - trunk/src
by asterix＠gajim.org 25 Jan '09

25 Jan '09

Author: asterix Date: 2009-01-25 22:38:35 +0100 (Sun, 25 Jan 2009) New Revision: 11028 Modified: trunk/src/gajim-remote.py Log: [Merwok] decode correctly URLs in gajim-remote handle_uri. Fixes #4703 Modified: trunk/src/gajim-remote.py =================================================================== --- trunk/src/gajim-remote.py 2009-01-25 21:29:07 UTC (rev 11027) +++ trunk/src/gajim-remote.py 2009-01-25 21:38:35 UTC (rev 11028) @@ -28,6 +28,7 @@ import sys import locale +import urllib import signal signal.signal(signal.SIGINT, signal.SIG_DFL) # ^C exits the application @@ -507,6 +508,10 @@ self.command = sys.argv[1] = 'open_chat' return (jid, action) = uri.split('?', 1) + try: + jid = urllib.unquote(jid) + except UnicodeDecodeError: + pass sys.argv[2] = jid if action == 'join': self.command = sys.argv[1] = 'join_room'

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits January 2009