Commits September 2006

commits@gajim.org

7 participants
321 discussions

[commit-gajim] r7018 - in branches/zeroconf_network/src: . common/zeroconf
by sb＠gajim.org 30 Sep '06

30 Sep '06

Author: sb Date: 2006-09-30 20:23:47 +0200 (Sat, 30 Sep 2006) New Revision: 7018 Modified: branches/zeroconf_network/src/common/zeroconf/connection_zeroconf.py branches/zeroconf_network/src/common/zeroconf/zeroconf.py branches/zeroconf_network/src/config.py branches/zeroconf_network/src/gajim.py branches/zeroconf_network/src/roster_window.py Log: proper handling of normal accounts with the name 'Local', don't use account's name but is_zeroconf flag for checks Modified: branches/zeroconf_network/src/common/zeroconf/connection_zeroconf.py =================================================================== --- branches/zeroconf_network/src/common/zeroconf/connection_zeroconf.py 2006-09-30 14:53:05 UTC (rev 7017) +++ branches/zeroconf_network/src/common/zeroconf/connection_zeroconf.py 2006-09-30 18:23:47 UTC (rev 7018) @@ -140,13 +140,9 @@ self.email = gajim.config.get_per('accounts', gajim.ZEROCONF_ACC_NAME, 'zeroconf_email') # END __init__ - def put_event(self, ev): - if gajim.handlers.has_key(ev[0]): - gajim.handlers[ev[0]](self.name, ev[1]) - def dispatch(self, event, data): - '''always passes account name as first param''' - self.put_event((event, data)) + if gajim.handlers.has_key(event): + gajim.handlers[event](self.name, data) def _reconnect(self): gajim.log.debug('reconnect') Modified: branches/zeroconf_network/src/common/zeroconf/zeroconf.py =================================================================== --- branches/zeroconf_network/src/common/zeroconf/zeroconf.py 2006-09-30 14:53:05 UTC (rev 7017) +++ branches/zeroconf_network/src/common/zeroconf/zeroconf.py 2006-09-30 18:23:47 UTC (rev 7018) @@ -74,18 +74,18 @@ def new_service_callback(self, interface, protocol, name, stype, domain, flags): gajim.log.debug('Found service %s in domain %s on %i.%i.' % (name, domain, interface, protocol)) - if not self.connected: - return + # if not self.connected: + # return - #synchronous resolving + # synchronous resolving self.server.ResolveService( int(interface), int(protocol), name, stype, \ domain, avahi.PROTO_UNSPEC, dbus.UInt32(0), \ reply_handler=self.service_resolved_callback, error_handler=self.error_callback) def remove_service_callback(self, interface, protocol, name, stype, domain, flags): gajim.log.debug('Service %s in domain %s on %i.%i disappeared.' % (name, domain, interface, protocol)) - #if not self.connected: - # return + # if not self.connected: + # return if name != self.name: for key in self.contacts.keys(): if self.contacts[key][C_BARE_NAME] == name: @@ -98,7 +98,6 @@ if self.service_browser: return - object_path = self.server.ServiceBrowserNew(interface, protocol, \ stype, domain, dbus.UInt32(0)) Modified: branches/zeroconf_network/src/config.py =================================================================== --- branches/zeroconf_network/src/config.py 2006-09-30 14:53:05 UTC (rev 7017) +++ branches/zeroconf_network/src/config.py 2006-09-30 18:23:47 UTC (rev 7018) @@ -1357,6 +1357,9 @@ config['custom_host'] = self.xml.get_widget( 'custom_host_entry').get_text().decode('utf-8') + # update in case the name changed to local accounts name + config['is_zeroconf'] = False + config['keyname'] = self.xml.get_widget('gpg_name_label').get_text().decode('utf-8') if config['keyname'] == '': #no key selected config['keyid'] = '' @@ -1804,7 +1807,7 @@ w.set_active(st) if os.name == 'nt' or (avahi_error and not w.get_active()): w.set_sensitive(False) - w.connect('toggled', self.on_enable_zeroconf_checkbutton_toggled) + self.zeroconf_toggled_id = w.connect('toggled', self.on_enable_zeroconf_checkbutton_toggled) def on_accounts_window_key_press_event(self, widget, event): if event.keyval == gtk.keysyms.Escape: @@ -1845,7 +1848,7 @@ dialogs.ErrorDialog(_('Unread events'), _('Read all pending events before removing this account.')) return - if account == gajim.ZEROCONF_ACC_NAME: + if gajim.config.get_per('accounts', account, 'is_zeroconf'): w = self.xml.get_widget('enable_zeroconf_checkbutton') w.set_active(False) else: @@ -1871,7 +1874,7 @@ self.show_modification_window(account) def show_modification_window(self, account): - if account == gajim.ZEROCONF_ACC_NAME: + if gajim.config.get_per('accounts', account, 'is_zeroconf'): if gajim.interface.instances.has_key('zeroconf_properties'): gajim.interface.instances['zeroconf_properties'].window.present() else: @@ -1902,6 +1905,14 @@ def on_enable_zeroconf_checkbutton_toggled(self, widget): + # don't do anything if there is an account with the local name but is a normal account + if gajim.connections.has_key(gajim.ZEROCONF_ACC_NAME) and not gajim.connections[gajim.ZEROCONF_ACC_NAME].is_zeroconf: + gajim.connections[gajim.ZEROCONF_ACC_NAME].dispatch('ERROR', (_('Account Local already exists.'),_('Please rename or remove it before enabling link-local messaging.'))) + widget.disconnect(self.zeroconf_toggled_id) + widget.set_active(False) + self.zeroconf_toggled_id = widget.connect('toggled', self.on_enable_zeroconf_checkbutton_toggled) + return + if gajim.config.get('enable_zeroconf'): #disable gajim.interface.roster.close_all(gajim.ZEROCONF_ACC_NAME) Modified: branches/zeroconf_network/src/gajim.py =================================================================== --- branches/zeroconf_network/src/gajim.py 2006-09-30 14:53:05 UTC (rev 7017) +++ branches/zeroconf_network/src/gajim.py 2006-09-30 18:23:47 UTC (rev 7018) @@ -1888,7 +1888,7 @@ if gajim.config.get('enable_zeroconf'): gajim.connections[gajim.ZEROCONF_ACC_NAME] = common.zeroconf.connection_zeroconf.ConnectionZeroconf(gajim.ZEROCONF_ACC_NAME) for account in gajim.config.get_per('accounts'): - if account != gajim.ZEROCONF_ACC_NAME: + if not gajim.config.get_per('accounts', account, 'is_zeroconf'): gajim.connections[account] = common.connection.Connection(account) # gtk hooks Modified: branches/zeroconf_network/src/roster_window.py =================================================================== --- branches/zeroconf_network/src/roster_window.py 2006-09-30 14:53:05 UTC (rev 7017) +++ branches/zeroconf_network/src/roster_window.py 2006-09-30 18:23:47 UTC (rev 7018) @@ -1369,7 +1369,7 @@ if not contact: return - if account == gajim.ZEROCONF_ACC_NAME: + if gajim.config.get_per('accounts', account, 'is_zeroconf'): xml = gtkgui_helpers.get_glade('zeroconf_contact_context_menu.glade') zeroconf_contact_context_menu = xml.get_widget('zeroconf_contact_context_menu') @@ -3730,7 +3730,7 @@ account_dest, c_dest, path) return - if account_dest == gajim.ZEROCONF_ACC_NAME: + if gajim.config.get_per('accounts', account_dest, 'is_zeroconf'): # drop on zeroconf account, no contact adds possible return @@ -3745,7 +3745,7 @@ return if type_dest == 'account' and account_source == account_dest: return - if account_source == gajim.ZEROCONF_ACC_NAME: + if gajim.config.get_per('accounts', account_source, 'is_zeroconf'): return it = iter_source while model[it][C_TYPE] == 'contact':

1 0

[commit-gajim] r7017 - trunk/src
by jim++＠gajim.org 30 Sep '06

30 Sep '06

Author: jim++ Date: 2006-09-30 16:53:05 +0200 (Sat, 30 Sep 2006) New Revision: 7017 Modified: trunk/src/groupchat_control.py Log: Seems to fail, load icons differently Modified: trunk/src/groupchat_control.py =================================================================== --- trunk/src/groupchat_control.py 2006-09-30 14:28:10 UTC (rev 7016) +++ trunk/src/groupchat_control.py 2006-09-30 14:53:05 UTC (rev 7017) @@ -402,14 +402,11 @@ def get_tab_image(self): # Set tab image (always 16x16) - img_16 = gajim.interface.roster.get_appropriate_state_images( - self.room_jid) - tab_image = None if gajim.gc_connected[self.account][self.room_jid]: - tab_image = img_16['muc_active'] + tab_image = gajim.interface.roster.load_icon('muc_active') else: - tab_image = img_16['muc_inactive'] + tab_image = gajim.interface.roster.load_icon('muc_inactive') return tab_image def update_ui(self):

1 0

[commit-gajim] r7016 - trunk/src
by jim++＠gajim.org 30 Sep '06

30 Sep '06

Author: jim++ Date: 2006-09-30 16:28:10 +0200 (Sat, 30 Sep 2006) New Revision: 7016 Modified: trunk/src/chat_control.py trunk/src/groupchat_control.py trunk/src/roster_window.py Log: Count only gc HIGHLIGHTED messages, except if notify_o_all_muc_meessages. Show count in tab. Note that this disable previous inconsistent behaviour where all gc_messages were counted in systray whereas tray icon was not animated. notify_on_all_muc_messages can still be used for that. Modified: trunk/src/chat_control.py =================================================================== --- trunk/src/chat_control.py 2006-09-30 13:09:41 UTC (rev 7015) +++ trunk/src/chat_control.py 2006-09-30 14:28:10 UTC (rev 7016) @@ -112,7 +112,7 @@ acct, resource = None): MessageControl.__init__(self, type_id, parent_win, widget_name, display_names, contact, acct, resource = resource); - # when/if we do XHTML we will but formatting buttons back + # when/if we do XHTML we will put formatting buttons back widget = self.xml.get_widget('emoticons_button') id = widget.connect('clicked', self.on_emoticons_button_clicked) self.handlers[id] = widget @@ -554,9 +554,15 @@ full_jid != self.parent_win.get_active_jid() or \ not self.parent_win.is_active() or not end) and \ kind in ('incoming', 'incoming_queue'): - if self.notify_on_new_messages(): + gc_message = False + if self.type_id == message_control.TYPE_GC: + gc_message = True + if self.notify_on_new_messages() or \ + (gc_message and other_tags_for_text == ['marked']): + # we want to have save this message in events list + # other_tags_for_text == ['marked'] --> highlighted gc message type_ = 'printed_' + self.type_id - if self.type_id == message_control.TYPE_GC: + if gc_message: type_ = 'printed_gc_msg' show_in_roster = notify.get_show_in_roster('message_received', self.account, self.contact) Modified: trunk/src/groupchat_control.py =================================================================== --- trunk/src/groupchat_control.py 2006-09-30 13:09:41 UTC (rev 7015) +++ trunk/src/groupchat_control.py 2006-09-30 14:28:10 UTC (rev 7016) @@ -322,8 +322,7 @@ menu.show_all() def notify_on_new_messages(self): - return gajim.config.get('notify_on_all_muc_messages') or \ - self.attention_flag + return gajim.config.get('notify_on_all_muc_messages') def on_treeview_size_allocate(self, widget, allocation): '''The MUC treeview has resized. Move the hpaned in all tabs to match''' @@ -390,21 +389,27 @@ color = gtk.gdk.colormap_get_system().alloc_color(color_name) label_str = self.name + + # count waiting highlighted messages + unread = '' + jid = self.contact.jid + num_unread = len(gajim.events.get_events(self.account, jid, + ['printed_gc_msg'])) + if num_unread > 1: + unread = '[' + unicode(num_unread) + ']' + label_str = unread + label_str return (label_str, color) def get_tab_image(self): - # Set tab image (always 16x16); unread messages show the 'message' image + # Set tab image (always 16x16) img_16 = gajim.interface.roster.get_appropriate_state_images( - self.room_jid, icon_name = 'message') + self.room_jid) tab_image = None - if self.attention_flag and gajim.config.get('show_unread_tab_icon'): - tab_image = img_16['message'] + if gajim.gc_connected[self.account][self.room_jid]: + tab_image = img_16['muc_active'] else: - if gajim.gc_connected[self.account][self.room_jid]: - tab_image = img_16['muc_active'] - else: - tab_image = img_16['muc_inactive'] + tab_image = img_16['muc_inactive'] return tab_image def update_ui(self): Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2006-09-30 13:09:41 UTC (rev 7015) +++ trunk/src/roster_window.py 2006-09-30 14:28:10 UTC (rev 7016) @@ -464,7 +464,7 @@ def get_appropriate_state_images(self, jid, size = '16', icon_name = 'online'): '''check jid and return the appropriate state images dict for - the demanded size. icon_name is taken into account when jis is from + the demanded size. icon_name is taken into account when jid is from transport: transport iconset doesn't contain all icons, so we fall back to jabber one''' transport = gajim.get_transport_name_from_jid(jid)

1 0

[commit-gajim] r7015 - trunk/src
by asterix＠gajim.org 30 Sep '06

30 Sep '06

Author: asterix Date: 2006-09-30 15:09:41 +0200 (Sat, 30 Sep 2006) New Revision: 7015 Modified: trunk/src/music_track_listener.py Log: import dbus_support where it is. Fixes #2472 Modified: trunk/src/music_track_listener.py =================================================================== --- trunk/src/music_track_listener.py 2006-09-30 02:13:51 UTC (rev 7014) +++ trunk/src/music_track_listener.py 2006-09-30 13:09:41 UTC (rev 7015) @@ -18,7 +18,7 @@ # install _() func before importing dbus_support from common import i18n -import dbus_support +from common import dbus_support if dbus_support.supported: import dbus import dbus.glib

1 0

[commit-gajim] r7014 - trunk/src
by jim++＠gajim.org 30 Sep '06

30 Sep '06

Author: jim++ Date: 2006-09-30 04:13:51 +0200 (Sat, 30 Sep 2006) New Revision: 7014 Modified: trunk/src/roster_window.py trunk/src/tooltips.py Log: [nk'slave]Cut status message to 100 in tray also, better var names :D Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2006-09-30 01:50:10 UTC (rev 7013) +++ trunk/src/roster_window.py 2006-09-30 02:13:51 UTC (rev 7014) @@ -495,15 +495,16 @@ if self.regroup: add_acct = False # look through all contacts of all accounts - for a in gajim.connections: - if a == account: # useless to add accout name + for account_iter in gajim.connections: + if account_iter == account: # useless to add accout name continue - for j in gajim.contacts.get_jid_list(a): + for jid_iter in gajim.contacts.get_jid_list(account_iter): # [0] cause it'fster than highest_prio - c = gajim.contacts.get_first_contact_from_jid(a, j) - if c.get_shown_name() == \ + contact_iter = gajim.contacts.\ + get_first_contact_from_jid(account_iter, jid_iter) + if contact_iter.get_shown_name() == \ contact.get_shown_name() and\ - (j, a) != (jid, account): + (jid_iter, account_iter) != (jid, account): add_acct = True break if add_acct: Modified: trunk/src/tooltips.py =================================================================== --- trunk/src/tooltips.py 2006-09-30 01:50:10 UTC (rev 7013) +++ trunk/src/tooltips.py 2006-09-30 02:13:51 UTC (rev 7014) @@ -254,7 +254,7 @@ # there are possible pango TBs on 'set_markup' if isinstance(message, str): message = unicode(message, encoding = 'utf-8') - message = gtkgui_helpers.reduce_chars_newlines(message, 50, 1) + message = gtkgui_helpers.reduce_chars_newlines(message, 100, 1) message = gtkgui_helpers.escape_for_pango_markup(message) if gajim.con_types.has_key(acct['name']) and \ gajim.con_types[acct['name']] in ('tls', 'ssl'): @@ -329,7 +329,7 @@ elif len(accounts) == 1: message = accounts[0]['status_line'] - message = gtkgui_helpers.reduce_chars_newlines(message, 50, 1) + message = gtkgui_helpers.reduce_chars_newlines(message, 100, 1) message = gtkgui_helpers.escape_for_pango_markup(message) text = _('Gajim - %s') % message else:

1 0

[commit-gajim] r7013 - branches/zeroconf_network/src/common/zeroconf
by sb＠gajim.org 30 Sep '06

30 Sep '06

Author: sb Date: 2006-09-30 03:50:10 +0200 (Sat, 30 Sep 2006) New Revision: 7013 Modified: branches/zeroconf_network/src/common/zeroconf/connection_zeroconf.py Log: fix typo Modified: branches/zeroconf_network/src/common/zeroconf/connection_zeroconf.py =================================================================== --- branches/zeroconf_network/src/common/zeroconf/connection_zeroconf.py 2006-09-30 01:42:46 UTC (rev 7012) +++ branches/zeroconf_network/src/common/zeroconf/connection_zeroconf.py 2006-09-30 01:50:10 UTC (rev 7013) @@ -296,8 +296,8 @@ self.dispatch('STATUS', 'offline') self.status = 'offline' self.dispatch('CONNECTION_LOST', - (_('Could not connect "%s"') % self.name, - _('Please check if avahi is installed.'))) + (_('Could not connect to "%s"') % self.name, + _('Please check if Avahi is installed.'))) return # 'connect'

1 0

[commit-gajim] r7012 - trunk/src
by jim++＠gajim.org 30 Sep '06

30 Sep '06

Author: jim++ Date: 2006-09-30 03:42:46 +0200 (Sat, 30 Sep 2006) New Revision: 7012 Modified: trunk/src/roster_window.py Log: Open gc-invit via roster Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2006-09-30 00:18:58 UTC (rev 7011) +++ trunk/src/roster_window.py 2006-09-30 01:42:46 UTC (rev 7012) @@ -2893,6 +2893,11 @@ gajim.interface.remove_first_event(account, jid, event.type_) ft.show_completed(jid, data) return True + elif event.type_ == 'gc-invitation': + dialogs.InvitationReceivedDialog(account, data[0], jid, data[2], + data[1]) + gajim.interface.remove_first_event(account, jid, event.type_) + return True return False def on_open_chat_window(self, widget, contact, account, resource = None):

1 0

[commit-gajim] r7011 - trunk/src
by jim++＠gajim.org 30 Sep '06

30 Sep '06

Author: jim++ Date: 2006-09-30 02:18:58 +0200 (Sat, 30 Sep 2006) New Revision: 7011 Modified: trunk/src/chat_control.py Log: Spelling language submenu more close from spell hints one Modified: trunk/src/chat_control.py =================================================================== --- trunk/src/chat_control.py 2006-09-30 00:12:30 UTC (rev 7010) +++ trunk/src/chat_control.py 2006-09-30 00:18:58 UTC (rev 7011) @@ -228,6 +228,11 @@ item = gtk.SeparatorMenuItem() menu.prepend(item) + item = gtk.ImageMenuItem(gtk.STOCK_CLEAR) + menu.prepend(item) + id = item.connect('activate', self.msg_textview.clear) + self.handlers[id] = item + if gajim.config.get('use_speller') and HAS_GTK_SPELL: item = gtk.MenuItem(_('Spelling language')) menu.prepend(item) @@ -241,11 +246,6 @@ id = item.connect('activate', _on_select_dictionary, langs[lang]) self.handlers[id] = item - item = gtk.ImageMenuItem(gtk.STOCK_CLEAR) - menu.prepend(item) - id = item.connect('activate', self.msg_textview.clear) - self.handlers[id] = item - menu.show_all() # moved from ChatControl

1 0

[commit-gajim] r7010 - trunk/src
by nk＠gajim.org 30 Sep '06

30 Sep '06

Author: nk Date: 2006-09-30 02:12:30 +0200 (Sat, 30 Sep 2006) New Revision: 7010 Modified: trunk/src/disco.py Log: long live python decorators Modified: trunk/src/disco.py =================================================================== --- trunk/src/disco.py 2006-09-30 00:05:43 UTC (rev 7009) +++ trunk/src/disco.py 2006-09-30 00:12:30 UTC (rev 7010) @@ -390,7 +390,7 @@ if self._cbs.has_key(cbkey): del self._cbs[cbkey] -# object is needed so that property() works +# object is needed so that @property works class ServiceDiscoveryWindow(object): '''Class that represents the Services Discovery window.''' def __init__(self, account, jid = '', node = '', @@ -473,15 +473,16 @@ self.travel(jid, node) self.window.show_all() + @property def _get_account(self): return self._account + @property def _set_account(self, value): self._account = value self.cache.account = value if self.browser: self.browser.account = value - account = property(_get_account, _set_account) def _initial_state(self): '''Set some initial state on the window. Separated in a method because

1 0

[commit-gajim] r7009 - trunk/src
by nk＠gajim.org 30 Sep '06

30 Sep '06

Author: nk Date: 2006-09-30 02:05:43 +0200 (Sat, 30 Sep 2006) New Revision: 7009 Modified: trunk/src/disco.py trunk/src/gtkexcepthook.py Log: clean Modified: trunk/src/disco.py =================================================================== --- trunk/src/disco.py 2006-09-30 00:01:29 UTC (rev 7008) +++ trunk/src/disco.py 2006-09-30 00:05:43 UTC (rev 7009) @@ -491,7 +491,7 @@ self._set_window_banner_text(_('Service Discovery')) # FIXME: use self.banner_icon.clear() when we switch to GTK 2.8 self.banner_icon.set_from_file(None) - self.banner_icon.hide() # Just clearing it doesn't work + self.banner_icon.hide() # Just clearing it doesn't work def _set_window_banner_text(self, text, text_after = None): theme = gajim.config.get('roster_theme') Modified: trunk/src/gtkexcepthook.py =================================================================== --- trunk/src/gtkexcepthook.py 2006-09-30 00:01:29 UTC (rev 7008) +++ trunk/src/gtkexcepthook.py 2006-09-30 00:05:43 UTC (rev 7009) @@ -1,19 +1,8 @@ ## gtkexcepthook.py ## -## Contributors for this file: -## - Yann Le Boulanger <asterix(a)lagaule.org> -## - Nikos Kouremenos <kourem(a)gmail.com> -## - Dimitur Kirov <dkirov(a)gmail.com> +## Copyright (C) 2005-2006 Yann Le Boulanger <asterix(a)lagaule.org> +## Copyright (C) 2005-2006 Nikos Kouremenos <kourem(a)gmail.com> ## -## Copyright (C) 2003-2004 Yann Le Boulanger <asterix(a)lagaule.org> -## Vincent Hanquez <tab(a)snarc.org> -## Copyright (C) 2005 Yann Le Boulanger <asterix(a)lagaule.org> -## Vincent Hanquez <tab(a)snarc.org> -## Nikos Kouremenos <kourem(a)gmail.com> -## Dimitur Kirov <dkirov(a)gmail.com> -## Travis Shirk <travis(a)pobox.com> -## Norman Rasmussen <norman(a)rasmussen.co.za> -## ## Initially written and submitted by Gustavo J. A. M. Carneiro ## ## This program is free software; you can redistribute it and/or modify

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