Commits October 2006

commits@gajim.org

5 participants
297 discussions

[commit-gajim] r7286 - in trunk: data/glade src src/common
by asterix＠gajim.org 18 Oct '06

18 Oct '06

Author: asterix Date: 2006-10-18 10:20:49 +0200 (Wed, 18 Oct 2006) New Revision: 7286 Modified: trunk/data/glade/preferences_window.glade trunk/src/common/config.py trunk/src/config.py trunk/src/gajim.py Log: add GUI option to ignore incoming XHTML tag. fixes #2522 Modified: trunk/data/glade/preferences_window.glade =================================================================== --- trunk/data/glade/preferences_window.glade 2006-10-18 07:41:09 UTC (rev 7285) +++ trunk/data/glade/preferences_window.glade 2006-10-18 08:20:49 UTC (rev 7286) @@ -494,6 +494,26 @@ </child> <child> + <widget class="GtkCheckButton" id="xhtml_checkbutton"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">Ignore incoming _XHTML tags</property> + <property name="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> + <property name="active">False</property> + <property name="inconsistent">False</property> + <property name="draw_indicator">True</property> + <signal name="toggled" handler="on_xhtml_checkbutton_toggled" last_modification_time="Wed, 18 Oct 2006 08:17:45 GMT"/> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + + <child> <widget class="GtkHBox" id="hbox2947"> <property name="visible">True</property> <property name="homogeneous">False</property> Modified: trunk/src/common/config.py =================================================================== --- trunk/src/common/config.py 2006-10-18 07:41:09 UTC (rev 7285) +++ trunk/src/common/config.py 2006-10-18 08:20:49 UTC (rev 7286) @@ -86,6 +86,7 @@ 'sort_by_show': [ opt_bool, True, '', True ], 'enable_zeroconf': [opt_bool, False, _('Enable link-local/zeroconf messaging')], 'use_speller': [ opt_bool, False, ], + 'ignore_incoming_xhtml': [ opt_bool, False, ], 'speller_language': [ opt_str, '', _('Language used by speller')], 'print_time': [ opt_str, 'always', _('\'always\' - print time for every message.\n\'sometimes\' - print time every print_ichat_every_foo_minutes minute.\n\'never\' - never print time.')], 'print_time_fuzzy': [ opt_int, 0, _('Print time in chats using Fuzzy Clock. Value of fuzziness from 1 to 4, or 0 to disable fuzzyclock. 1 is the most precise clock, 4 the less precise one. This is used only if print_time is \'sometimes\'.') ], Modified: trunk/src/config.py =================================================================== --- trunk/src/config.py 2006-10-18 07:41:09 UTC (rev 7285) +++ trunk/src/config.py 2006-10-18 08:20:49 UTC (rev 7286) @@ -190,7 +190,7 @@ theme_combobox.set_active(i) i += 1 - #use speller + # use speller if os.name == 'nt': self.xml.get_widget('speller_checkbutton').set_no_show_all(True) else: @@ -200,7 +200,11 @@ else: self.xml.get_widget('speller_checkbutton').set_sensitive(False) - #Print time + # Ignore XHTML + st = gajim.config.get('ignore_incoming_xhtml') + self.xml.get_widget('xhtml_checkbutton').set_active(st) + + # Print time st = gajim.config.get('print_ichat_every_foo_minutes') text = _('Every %s _minutes') % st self.xml.get_widget('time_sometimes_radiobutton').set_label(text) @@ -663,6 +667,9 @@ else: self.remove_speller() + def on_xhtml_checkbutton_toggled(self, widget): + self.on_checkbutton_toggled(widget, 'ignore_incoming_xhtml') + def _set_sensitivity_for_before_after_time_widgets(self, sensitive): self.xml.get_widget('before_time_label').set_sensitive(sensitive) self.xml.get_widget('before_time_textview').set_sensitive(sensitive) Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2006-10-18 07:41:09 UTC (rev 7285) +++ trunk/src/gajim.py 2006-10-18 08:20:49 UTC (rev 7286) @@ -511,6 +511,9 @@ chatstate = array[6] msg_id = array[7] composing_jep = array[8] + xhtml = array[10] + if gajim.config.get('ignore_incoming_xhtml'): + xhtml = None if gajim.jid_is_transport(jid): jid = jid.replace('@', '') @@ -590,7 +593,7 @@ nickname = resource msg_type = 'pm' groupchat_control.on_private_message(nickname, message, array[2], - array[10]) + xhtml) else: # array: (jid, msg, time, encrypted, msg_type, subject) if encrypted: @@ -601,7 +604,7 @@ # xhtml in last element self.roster.on_message(jid, message, array[2], account, array[3], msg_type, subject, resource, msg_id, array[9], - advanced_notif_num, xhtml = array[10]) + advanced_notif_num, xhtml = xhtml) nickname = gajim.get_name_from_jid(account, jid) # Check and do wanted notifications msg = message @@ -904,13 +907,16 @@ gc_control = self.msg_win_mgr.get_control(room_jid, account) if not gc_control: return + xhtml = array[4] + if gajim.config.get('ignore_incoming_xhtml'): + xhtml = None if len(jids) == 1: # message from server nick = '' else: # message from someone nick = jids[1] - gc_control.on_message(nick, array[1], array[2], array[3], array[4]) + gc_control.on_message(nick, array[1], array[2], array[3], xhtml) if self.remote_ctrl: self.remote_ctrl.raise_signal('GCMessage', (account, array))

1 0

[commit-gajim] r7285 - trunk/src
by asterix＠gajim.org 18 Oct '06

18 Oct '06

Author: asterix Date: 2006-10-18 09:41:09 +0200 (Wed, 18 Oct 2006) New Revision: 7285 Modified: trunk/src/roster_window.py Log: catch network manager not present error. fixes #2597, #2599 Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2006-10-17 22:26:25 UTC (rev 7284) +++ trunk/src/roster_window.py 2006-10-18 07:41:09 UTC (rev 7285) @@ -18,6 +18,7 @@ import gtk import gobject import os +import sys import time import urllib @@ -4173,7 +4174,11 @@ gajim.interface.instances['account_creation_wizard'] = \ config.AccountCreationWizardWindow() - nm_listener = NetworkManagerListener(self.nm_activated_CB, self.nm_deactivated_CB) + try: + nm_listener = NetworkManagerListener(self.nm_activated_CB, + self.nm_deactivated_CB) + except: + print >> sys.stderr, _('Network manager support not available') def nm_activated_CB(self, dev, net): for acc in gajim.contacts.get_accounts():

1 0

[commit-gajim] r7284 - trunk/src/common
by jim++＠gajim.org 17 Oct '06

17 Oct '06

Author: jim++ Date: 2006-10-18 00:26:25 +0200 (Wed, 18 Oct 2006) New Revision: 7284 Modified: trunk/src/common/config.py Log: Better description of chat_merge_consecutive_nickname option Modified: trunk/src/common/config.py =================================================================== --- trunk/src/common/config.py 2006-10-17 22:15:20 UTC (rev 7283) +++ trunk/src/common/config.py 2006-10-17 22:26:25 UTC (rev 7284) @@ -210,7 +210,7 @@ 'hide_groupchat_banner': [opt_bool, False, _('Hides the banner in a group chat window')], 'hide_chat_banner': [opt_bool, False, _('Hides the banner in two persons chat window')], 'hide_groupchat_occupants_list': [opt_bool, False, _('Hides the group chat occupants list in group chat window.')], - 'chat_merge_consecutive_nickname': [opt_bool, False, _('Merge consecutive nickname in chat window.')], + 'chat_merge_consecutive_nickname': [opt_bool, False, _('In a chat, show the nickname at the beginning of a line only when it\'s not the same person talking than in previous message.')], 'chat_merge_consecutive_nickname_indent': [opt_str, ' ', _('Indentation when using merge consecutive nickame.')], 'gc_nicknames_colors': [ opt_str, '#a34526:#c000ff:#0012ff:#388a99:#38995d:#519938:#ff8a00:#94452d:#244b5a:#32645a', _('List of colors that will be used to color nicknames in group chats.'), True ], 'ctrl_tab_go_to_next_composing': [opt_bool, True, _('Ctrl-Tab go to next composing tab when none is unread.')],

1 0

[commit-gajim] r7283 - trunk/src
by sb＠gajim.org 17 Oct '06

17 Oct '06

Author: sb Date: 2006-10-18 00:15:20 +0200 (Wed, 18 Oct 2006) New Revision: 7283 Added: trunk/src/network_manager_listener.py Modified: trunk/src/roster_window.py Log: add simple implementation of network manager awareness (should find a better place) - see #860 Added: trunk/src/network_manager_listener.py =================================================================== --- trunk/src/network_manager_listener.py (rev 0) +++ trunk/src/network_manager_listener.py 2006-10-17 22:15:20 UTC (rev 7283) @@ -0,0 +1,32 @@ +# -*- coding: utf-8 -*- +## network_manager_listener.py +## +## Copyright (C) 2006 Stefan Bethge <stefan(a)lanpartei.de> +## +## This program is free software; you can redistribute it and/or modify +## it under the terms of the GNU General Public License as published +## by the Free Software Foundation; version 2 only. +## +## This program is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## GNU General Public License for more details. +## + +import dbus +import dbus.glib + +NM_OBJ_PATH = "/org/freedesktop/NetworkManager" +NM_INTERFACE = "org.freedesktop.NetworkManager" +NM_SERVICE = "org.freedesktop.NetworkManager" + +class NetworkManagerListener: + def __init__(self, nm_activated_CB, nm_deactivated_CB): + sys_bus = dbus.SystemBus() + proxy_obj = sys_bus.get_object(NM_SERVICE, NM_OBJ_PATH) + self._nm_iface = dbus.Interface(proxy_obj, NM_INTERFACE) + + self._devices = self._nm_iface.getDevices() + + self._nm_iface.connect_to_signal('DeviceNowActive', nm_activated_CB) + self._nm_iface.connect_to_signal('DeviceNoLongerActive', nm_deactivated_CB) Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2006-10-17 21:56:59 UTC (rev 7282) +++ trunk/src/roster_window.py 2006-10-17 22:15:20 UTC (rev 7283) @@ -47,6 +47,10 @@ if dbus_support.supported: from music_track_listener import MusicTrackListener +from common import dbus_support +if dbus_support.supported: + from network_manager_listener import NetworkManagerListener + #(icon, name, type, jid, account, editable, second pixbuf) ( C_IMG, # image to show state (online, new message etc) @@ -4169,3 +4173,13 @@ gajim.interface.instances['account_creation_wizard'] = \ config.AccountCreationWizardWindow() + nm_listener = NetworkManagerListener(self.nm_activated_CB, self.nm_deactivated_CB) + + def nm_activated_CB(self, dev, net): + for acc in gajim.contacts.get_accounts(): + gajim.interface.roster.send_status(acc, 'online', '') + + def nm_deactivated_CB(self, dev): + for acc in gajim.contacts.get_accounts(): + gajim.interface.roster.send_status(acc, 'offline', '') +

1 0

[commit-gajim] r7282 - trunk/src/common
by asterix＠gajim.org 17 Oct '06

17 Oct '06

Author: asterix Date: 2006-10-17 23:56:59 +0200 (Tue, 17 Oct 2006) New Revision: 7282 Modified: trunk/src/common/connection_handlers.py Log: ignor wrong mail from gmail. fixes #2587 Modified: trunk/src/common/connection_handlers.py =================================================================== --- trunk/src/common/connection_handlers.py 2006-10-17 21:48:10 UTC (rev 7281) +++ trunk/src/common/connection_handlers.py 2006-10-17 21:56:59 UTC (rev 7282) @@ -1308,7 +1308,10 @@ if gm.getTag('mailbox').getTag('mail-thread-info'): gmail_messages = gm.getTag('mailbox').getTags('mail-thread-info') for gmessage in gmail_messages: - gmail_from = gmessage.getTag('senders').getTag('sender').getAttr('address') + sender = gmessage.getTag('senders').getTag('sender') + if not sender: + continue + gmail_from = sender.getAttr('address') gmail_subject = gmessage.getTag('subject').getData() gmail_snippet = gmessage.getTag('snippet').getData() gmail_messages_list.append({ \

1 0

[commit-gajim] r7281 - trunk/src/common
by asterix＠gajim.org 17 Oct '06

17 Oct '06

Author: asterix Date: 2006-10-17 23:48:10 +0200 (Tue, 17 Oct 2006) New Revision: 7281 Modified: trunk/src/common/passwords.py Log: [Gustavo] make gnomekeyring code more robust. Modified: trunk/src/common/passwords.py =================================================================== --- trunk/src/common/passwords.py 2006-10-17 21:40:48 UTC (rev 7280) +++ trunk/src/common/passwords.py 2006-10-17 21:48:10 UTC (rev 7281) @@ -85,7 +85,7 @@ def get_storage(): global storage if storage is None: # None is only in first time get_storage is called - if USER_HAS_GNOMEKEYRING: + if USER_HAS_GNOMEKEYRING and gnomekeyring.is_available(): try: storage = GnomePasswordStorage() except gnomekeyring.NoKeyringDaemonError:

1 0

[commit-gajim] r7280 - trunk/src
by asterix＠gajim.org 17 Oct '06

17 Oct '06

Author: asterix Date: 2006-10-17 23:40:48 +0200 (Tue, 17 Oct 2006) New Revision: 7280 Modified: trunk/src/roster_window.py Log: add missing () in a test. fices #2589 Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2006-10-17 21:10:16 UTC (rev 7279) +++ trunk/src/roster_window.py 2006-10-17 21:40:48 UTC (rev 7280) @@ -395,7 +395,7 @@ show_offline = gajim.config.get('showoffline') show_transports = gajim.config.get('show_transports_group') if (_('Transports') in contact.groups and not show_transports) or \ - (contact.show in ('offline', 'error') or hide and not show_offline and \ + ((contact.show in ('offline', 'error') or hide) and not show_offline and \ (not _('Transports') in contact.groups or \ gajim.account_is_disconnected(account))) and \ len(gajim.events.get_events(account, contact.jid, ['chat'])) == 0:

1 0

[commit-gajim] r7279 - trunk/data/glade
by asterix＠gajim.org 17 Oct '06

17 Oct '06

Author: asterix Date: 2006-10-17 23:10:16 +0200 (Tue, 17 Oct 2006) New Revision: 7279 Modified: trunk/data/glade/preferences_window.glade Log: add a tooltip to adjust_status_tu_music_player to tell which players arre supported Modified: trunk/data/glade/preferences_window.glade =================================================================== --- trunk/data/glade/preferences_window.glade 2006-10-17 19:38:43 UTC (rev 7278) +++ trunk/data/glade/preferences_window.glade 2006-10-17 21:10:16 UTC (rev 7279) @@ -2609,6 +2609,7 @@ <child> <widget class="GtkCheckButton" id="set_status_msg_from_current_music_track_checkbutton"> <property name="visible">True</property> + <property name="tooltip" translatable="yes">Works only for Muine and Rhythmbox players</property> <property name="can_focus">True</property> <property name="label" translatable="yes">Set status message to reflect currently playing _music track</property> <property name="use_underline">True</property>

1 0

[commit-gajim] r7278 - in trunk/src: . common/zeroconf
by sb＠gajim.org 17 Oct '06

17 Oct '06

Author: sb Date: 2006-10-17 21:38:43 +0200 (Tue, 17 Oct 2006) New Revision: 7278 Modified: trunk/src/common/zeroconf/roster_zeroconf.py trunk/src/roster_window.py Log: complete [7275] - remove send file for offline users (dkirov) Modified: trunk/src/common/zeroconf/roster_zeroconf.py =================================================================== --- trunk/src/common/zeroconf/roster_zeroconf.py 2006-10-17 19:18:25 UTC (rev 7277) +++ trunk/src/common/zeroconf/roster_zeroconf.py 2006-10-17 19:38:43 UTC (rev 7278) @@ -47,8 +47,12 @@ def setItem(self, jid, name = '', groups = ''): #print 'roster_zeroconf.py: setItem %s' % jid + contact = self.zeroconf.get_contact(jid) + if not contact: + return + (service_jid, domain, interface, protocol, host, address, port, bare_jid, txt) \ - = self.zeroconf.get_contact(jid) + = contact self._data[jid]={} self._data[jid]['ask'] = 'no' #? Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2006-10-17 19:18:25 UTC (rev 7277) +++ trunk/src/roster_window.py 2006-10-17 19:38:43 UTC (rev 7278) @@ -1137,6 +1137,11 @@ if info.has_key(contact.jid): info[contact.jid].window.present() else: + contact = gajim.contacts.get_first_contact_from_jid(account, + contact.jid) + if contact.show in ('offline', 'error'): + # don't show info on offline contacts + return info[contact.jid] = vcard.ZeroconfVcardWindow(contact, account) @@ -1454,8 +1459,9 @@ send_file_menuitem.set_no_show_all(True) rename_menuitem.connect('activate', self.on_rename, iter, tree_path) - if contact.show == 'offline': + if contact.show in ('offline', 'error'): information_menuitem.set_sensitive(False) + send_file_menuitem.set_sensitive(False) else: information_menuitem.connect('activate', self.on_info_zeroconf, contact, account)

1 0

[commit-gajim] r7277 - trunk/src/common/zeroconf
by sb＠gajim.org 17 Oct '06

17 Oct '06

Author: sb Date: 2006-10-17 21:18:25 +0200 (Tue, 17 Oct 2006) New Revision: 7277 Modified: trunk/src/common/zeroconf/zeroconf.py Log: temporarily replace unicode txt data from local contacts with a dot until we get info from avahi Modified: trunk/src/common/zeroconf/zeroconf.py =================================================================== --- trunk/src/common/zeroconf/zeroconf.py 2006-10-17 19:13:36 UTC (rev 7276) +++ trunk/src/common/zeroconf/zeroconf.py 2006-10-17 19:18:25 UTC (rev 7277) @@ -116,22 +116,26 @@ for els in txt_array: key, val = '', None for c in els: - c = chr(c) - if val is None: - if c == '=': - val = '' + if c < 0 or c > 255: + c = '.' else: - key += c - else: - val += c + c = chr(c) + if val is None: + if c == '=': + val = '' + else: + key += c + else: + val += c if val is None: # missing '=' val = '' txt_dict[key] = val.decode('utf-8') return txt_dict def service_resolved_callback(self, interface, protocol, name, stype, domain, host, aprotocol, address, port, txt, flags): - gajim.log.debug('Service data for service %s in domain %s on %i.%i:' % (name, domain, interface, protocol)) - gajim.log.debug('Host %s (%s), port %i, TXT data: %s' % (host, address, port, + gajim.log.debug('Service data for service %s in domain %s on %i.%i:' + % (name, domain, interface, protocol)) + gajim.log.debug('Host %s (%s), port %i, TXT data: %s' % (host, address, port, self.txt_array_to_dict(txt))) if not self.connected: return @@ -393,6 +397,8 @@ reply_handler=self.service_resolved_all_callback, error_handler=self.error_callback) def get_contacts(self): + if not jid in self.contacts: + return None return self.contacts def get_contact(self, jid):

1 0

← Newer
1
2
3
4
5
6
7
...
30
Older →

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 October 2006