Commits October 2006

commits@gajim.org

5 participants
297 discussions

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

21 Oct '06

Author: sb Date: 2006-10-21 02:54:21 +0200 (Sat, 21 Oct 2006) New Revision: 7306 Modified: trunk/src/network_manager_listener.py trunk/src/roster_window.py Log: fix previous commit, don't do nm stuff if account is not synchronized to global status Modified: trunk/src/network_manager_listener.py =================================================================== --- trunk/src/network_manager_listener.py 2006-10-21 00:49:30 UTC (rev 7305) +++ trunk/src/network_manager_listener.py 2006-10-21 00:54:21 UTC (rev 7306) @@ -17,12 +17,12 @@ def device_now_active(self, *args): for connection in gajim.connections.itervalues(): - if gajim.config.get_per('accounts', connection.name, 'listen_to_network_manager'): + if gajim.config.get_per('accounts', connection.name, 'listen_to_network_manager') and gajim.config.get_per('accounts', connection.name, 'sync_with_global_status'): connection.change_status('online', '') def device_no_longer_active(self, *args): for connection in gajim.connections.itervalues(): - if gajim.config.get_per('accounts', connection.name, 'listen_to_network_manager'): + if gajim.config.get_per('accounts', connection.name, 'listen_to_network_manager') and gajim.config.get_per('accounts', connection.name, 'sync_with_global_status'): connection.change_status('offline', '') Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2006-10-21 00:49:30 UTC (rev 7305) +++ trunk/src/roster_window.py 2006-10-21 00:54:21 UTC (rev 7306) @@ -3117,7 +3117,7 @@ gajim.last_message_time[account][ctrl.get_full_jid()] = 0 win.set_active_tab(fjid, account) if gajim.connections[account].is_zeroconf and \ - gajim.connections[account].status in ('offline', 'invisible') + gajim.connections[account].status in ('offline', 'invisible'): win.get_control(fjid, account).got_disconnected() win.window.present()

1 0

[commit-gajim] r7305 - in trunk/src: . common
by sb＠gajim.org 21 Oct '06

21 Oct '06

Author: sb Date: 2006-10-21 02:49:30 +0200 (Sat, 21 Oct 2006) New Revision: 7305 Modified: trunk/src/common/config.py trunk/src/common/dbus_support.py trunk/src/gajim.py trunk/src/network_manager_listener.py trunk/src/roster_window.py Log: fix #860, add patch from <jeff at ocjtech.us>, add per account options, (options are in ACE only) Modified: trunk/src/common/config.py =================================================================== --- trunk/src/common/config.py 2006-10-20 23:19:57 UTC (rev 7304) +++ trunk/src/common/config.py 2006-10-21 00:49:30 UTC (rev 7305) @@ -151,6 +151,7 @@ 'always_english_wikipedia': [opt_bool, False], 'always_english_wiktionary': [opt_bool, True], 'remote_control': [opt_bool, True, _('If checked, Gajim can be controlled remotely using gajim-remote.'), True], + 'networkmanager_support': [opt_bool, True, _('If checked, listen for DBus signals from NetworkManager and change the status of your Jabber connections based upon the status of your network connection.'), True], 'chat_state_notifications': [opt_str, 'all'], # 'all', 'composing_only', 'disabled' 'autodetect_browser_mailer': [opt_bool, False, '', True], 'print_ichat_every_foo_minutes': [opt_int, 5, _('When not printing time for every message (print_time==sometimes), print it every x minutes.')], @@ -263,6 +264,7 @@ 'msgwin-y-position': [opt_int, -1], # Default is to let the wm decide 'msgwin-width': [opt_int, 480], 'msgwin-height': [opt_int, 440], + 'listen_to_network_manager' : [opt_bool, True], 'is_zeroconf': [opt_bool, False], 'zeroconf_first_name': [ opt_str, '', '', True ], 'zeroconf_last_name': [ opt_str, '', '', True ], Modified: trunk/src/common/dbus_support.py =================================================================== --- trunk/src/common/dbus_support.py 2006-10-20 23:19:57 UTC (rev 7304) +++ trunk/src/common/dbus_support.py 2006-10-21 00:49:30 UTC (rev 7305) @@ -34,6 +34,37 @@ print _('D-Bus python bindings are missing in this computer') print _('D-Bus capabilities of Gajim cannot be used') +class SystemBus: + '''A Singleton for the DBus SystemBus''' + def __init__(self): + self.system_bus = None + + def SystemBus(self): + if not supported: + raise exceptions.DbusNotSupported + + if not self.present(): + raise exceptions.SystemBusNotPresent + return self.system_bus + + def bus(self): + return self.SystemBus() + + def present(self): + if not supported: + return False + if self.system_bus is None: + try: + self.system_bus = dbus.SystemBus() + except dbus.dbus_bindings.DBusException: + self.system_bus = None + return False + if self.system_bus is None: + return False + return True + +system_bus = SystemBus() + class SessionBus: '''A Singleton for the D-Bus SessionBus''' def __init__(self): Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2006-10-20 23:19:57 UTC (rev 7304) +++ trunk/src/gajim.py 2006-10-21 00:49:30 UTC (rev 7305) @@ -1430,7 +1430,8 @@ status = gajim.connections[account].status gajim.connections[account].username = new_name gajim.connections[account].change_status(status, '') - + else: + gajim.connections[account].change_status('offline','') def read_sleepy(self): '''Check idle status and change that status if needed''' @@ -1937,6 +1938,12 @@ else: self.remote_ctrl = None + if gajim.config.get('networkmanager_support'): + try: + import network_manager_listener + except ImportError: + pass + self.show_vcard_when_connect = [] path_to_file = os.path.join(gajim.DATA_DIR, 'pixmaps/gajim.png') Modified: trunk/src/network_manager_listener.py =================================================================== --- trunk/src/network_manager_listener.py 2006-10-20 23:19:57 UTC (rev 7304) +++ trunk/src/network_manager_listener.py 2006-10-21 00:49:30 UTC (rev 7305) @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- ## network_manager_listener.py +## Copyright (C) 2006 Jeffrey C. Ollie <jeff at ocjtech.us> +## Copyright (C) 2006 Stefan Bethge <stefan at lanpartei.de> ## -## 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. @@ -13,22 +13,35 @@ ## GNU General Public License for more details. ## +from common import gajim + +def device_now_active(self, *args): + for connection in gajim.connections.itervalues(): + if gajim.config.get_per('accounts', connection.name, 'listen_to_network_manager'): + connection.change_status('online', '') + +def device_no_longer_active(self, *args): + for connection in gajim.connections.itervalues(): + if gajim.config.get_per('accounts', connection.name, 'listen_to_network_manager'): + connection.change_status('offline', '') + + +from common.dbus_support import system_bus + import dbus import dbus.glib -NM_OBJ_PATH = '/org/freedesktop/NetworkManager' -NM_INTERFACE = 'org.freedesktop.NetworkManager' -NM_SERVICE = 'org.freedesktop.NetworkManager' +bus = system_bus.SystemBus() -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) +bus.add_signal_receiver(device_no_longer_active, + 'DeviceNoLongerActive', + 'org.freedesktop.NetworkManager', + 'org.freedesktop.NetworkManager', + '/org/freedesktop/NetworkManager') - self._devices = self._nm_iface.getDevices() +bus.add_signal_receiver(device_now_active, + 'DeviceNowActive', + 'org.freedesktop.NetworkManager', + 'org.freedesktop.NetworkManager', + '/org/freedesktop/NetworkManager') - 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-20 23:19:57 UTC (rev 7304) +++ trunk/src/roster_window.py 2006-10-21 00:49:30 UTC (rev 7305) @@ -48,10 +48,6 @@ 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) @@ -3121,8 +3117,9 @@ gajim.last_message_time[account][ctrl.get_full_jid()] = 0 win.set_active_tab(fjid, account) if gajim.connections[account].is_zeroconf and \ - gajim.connections[account].status in ('offline', 'invisible'): + gajim.connections[account].status in ('offline', 'invisible') win.get_control(fjid, account).got_disconnected() + win.window.present() def on_roster_treeview_row_activated(self, widget, path, col = 0): @@ -4176,18 +4173,3 @@ if len(gajim.connections) == 0: # if we have no account gajim.interface.instances['account_creation_wizard'] = \ config.AccountCreationWizardWindow() - - 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(): - 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] r7304 - trunk/src/common/zeroconf
by sb＠gajim.org 20 Oct '06

20 Oct '06

Author: sb Date: 2006-10-21 01:19:57 +0200 (Sat, 21 Oct 2006) New Revision: 7304 Modified: trunk/src/common/zeroconf/zeroconf.py Log: add fixme notice to workaround for #2585 Modified: trunk/src/common/zeroconf/zeroconf.py =================================================================== --- trunk/src/common/zeroconf/zeroconf.py 2006-10-20 21:25:47 UTC (rev 7303) +++ trunk/src/common/zeroconf/zeroconf.py 2006-10-20 23:19:57 UTC (rev 7304) @@ -59,11 +59,11 @@ ## handlers for dbus callbacks def entrygroup_commit_error_CB(self, err): - # left for eventual later use + # left blank for possible later usage pass def error_callback1(self, err): - gajim.log.debug('RR' + str(err)) + gajim.log.debug('Error while resolving: ' + str(err)) def error_callback(self, err): gajim.log.debug(str(err)) @@ -116,6 +116,7 @@ for els in txt_array: key, val = '', None for c in els: + #FIXME: remove when outdated, this is for avahi < 0.6.14 if c < 0 or c > 255: c = '.' else: @@ -178,7 +179,6 @@ gajim.log.debug('Error while adding service. %s' % str(err)) if str(err) == 'Local name collision': alternative_name = self.server.GetAlternativeServiceName(self.username) - self.disconnect() self.name_conflictCB(alternative_name) return self.error_CB(_('Error while adding service. %s') % str(err))

1 0

[commit-gajim] r7303 - trunk/src
by nk＠gajim.org 20 Oct '06

20 Oct '06

Author: nk Date: 2006-10-20 23:25:47 +0200 (Fri, 20 Oct 2006) New Revision: 7303 Modified: trunk/src/config.py Log: missing logic on prefs window for exo-open stuff. fixes #2606. thanks baze for ur attention to detail Modified: trunk/src/config.py =================================================================== --- trunk/src/config.py 2006-10-20 17:02:38 UTC (rev 7302) +++ trunk/src/config.py 2006-10-20 21:25:47 UTC (rev 7303) @@ -443,13 +443,15 @@ if gajim.config.get('autodetect_browser_mailer'): self.applications_combobox.set_active(0) # else autodetect_browser_mailer is False. - # so user has 'Always Use GNOME/KDE' or Custom + # so user has 'Always Use GNOME/KDE/XFCE4' or Custom elif gajim.config.get('openwith') == 'gnome-open': self.applications_combobox.set_active(1) elif gajim.config.get('openwith') == 'kfmclient exec': self.applications_combobox.set_active(2) + elif gajim.config.get('openwith') == 'exo-open': + self.applications_combobox.set_active(3) elif gajim.config.get('openwith') == 'custom': - self.applications_combobox.set_active(3) + self.applications_combobox.set_active(4) self.xml.get_widget('custom_apps_frame').show() self.xml.get_widget('custom_browser_entry').set_text(

1 0

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

20 Oct '06

Author: sb Date: 2006-10-20 19:02:38 +0200 (Fri, 20 Oct 2006) New Revision: 7302 Modified: trunk/src/gajim.py trunk/src/roster_window.py Log: don't allow sending messages via local account when offline or invisible Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2006-10-20 10:14:15 UTC (rev 7301) +++ trunk/src/gajim.py 2006-10-20 17:02:38 UTC (rev 7302) @@ -329,7 +329,8 @@ # Inform all controls for this account of the connection state change for ctrl in self.msg_win_mgr.get_controls(): if ctrl.account == account: - if status == 'offline': + if status == 'offline' or (status == 'invisible' and \ + gajim.connections[account].is_zeroconf): ctrl.got_disconnected() else: # Other code rejoins all GCs, so we don't do it here Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2006-10-20 10:14:15 UTC (rev 7301) +++ trunk/src/roster_window.py 2006-10-20 17:02:38 UTC (rev 7302) @@ -3120,6 +3120,9 @@ # last message is long time ago gajim.last_message_time[account][ctrl.get_full_jid()] = 0 win.set_active_tab(fjid, account) + if gajim.connections[account].is_zeroconf and \ + gajim.connections[account].status in ('offline', 'invisible'): + win.get_control(fjid, account).got_disconnected() win.window.present() def on_roster_treeview_row_activated(self, widget, path, col = 0):

1 0

[commit-gajim] r7301 - trunk/src/common
by nk＠gajim.org 20 Oct '06

20 Oct '06

Author: nk Date: 2006-10-20 12:14:15 +0200 (Fri, 20 Oct 2006) New Revision: 7301 Modified: trunk/src/common/passwords.py Log: do not do gnomekeyring.is_available check eveyrytime (only once); remove an assert Modified: trunk/src/common/passwords.py =================================================================== --- trunk/src/common/passwords.py 2006-10-20 10:08:08 UTC (rev 7300) +++ trunk/src/common/passwords.py 2006-10-20 10:14:15 UTC (rev 7301) @@ -21,9 +21,12 @@ try: import gnomekeyring except ImportError: - USER_HAS_GNOMEKEYRING = False + USER_USES_GNOMEKEYRING = False else: - USER_HAS_GNOMEKEYRING = True + if gnomekeyring.is_available(): + USER_USES_GNOMEKEYRING = True + else: + USER_USES_GNOMEKEYRING = False class PasswordStorage(object): def get_password(self, account_name): @@ -85,7 +88,7 @@ def get_storage(): global storage if storage is None: # None is only in first time get_storage is called - if USER_HAS_GNOMEKEYRING and gnomekeyring.is_available(): + if USER_USES_GNOMEKEYRING: try: storage = GnomePasswordStorage() except gnomekeyring.NoKeyringDaemonError: @@ -96,7 +99,6 @@ def set_storage(storage_): global storage - assert isinstance(storage, PasswordStorage) storage = storage_

1 0

[commit-gajim] r7300 - trunk/src/common
by nk＠gajim.org 20 Oct '06

20 Oct '06

Author: nk Date: 2006-10-20 12:08:08 +0200 (Fri, 20 Oct 2006) New Revision: 7300 Modified: trunk/src/common/helpers.py Log: rm the print Modified: trunk/src/common/helpers.py =================================================================== --- trunk/src/common/helpers.py 2006-10-20 09:48:29 UTC (rev 7299) +++ trunk/src/common/helpers.py 2006-10-20 10:08:08 UTC (rev 7300) @@ -379,7 +379,6 @@ return is_in_dir def exec_command(command): - print command subprocess.Popen(command, shell = True) def build_command(executable, parameter):

1 0

[commit-gajim] r7299 - trunk/data/glade
by nk＠gajim.org 20 Oct '06

20 Oct '06

Author: nk Date: 2006-10-20 11:48:29 +0200 (Fri, 20 Oct 2006) New Revision: 7299 Modified: trunk/data/glade/preferences_window.glade Log: mention the link to use more music track players in the tooltip of set_status_msg_from_current_music_track_checkbutton Modified: trunk/data/glade/preferences_window.glade =================================================================== --- trunk/data/glade/preferences_window.glade 2006-10-20 09:43:40 UTC (rev 7298) +++ trunk/data/glade/preferences_window.glade 2006-10-20 09:48:29 UTC (rev 7299) @@ -2630,7 +2630,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="tooltip" translatable="yes">Works for Rhythmbox and Muine players. For more players, please visit http://trac.gajim.org/wiki/GajimAndMusicPlayer</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] r7298 - trunk/src/common
by nk＠gajim.org 20 Oct '06

20 Oct '06

Author: nk Date: 2006-10-20 11:43:40 +0200 (Fri, 20 Oct 2006) New Revision: 7298 Modified: trunk/src/common/helpers.py Log: add print to assist baze. see #2600 Modified: trunk/src/common/helpers.py =================================================================== --- trunk/src/common/helpers.py 2006-10-20 09:42:33 UTC (rev 7297) +++ trunk/src/common/helpers.py 2006-10-20 09:43:40 UTC (rev 7298) @@ -379,6 +379,7 @@ return is_in_dir def exec_command(command): + print command subprocess.Popen(command, shell = True) def build_command(executable, parameter):

1 0

[commit-gajim] r7297 - trunk/src
by nk＠gajim.org 20 Oct '06

20 Oct '06

Author: nk Date: 2006-10-20 11:42:33 +0200 (Fri, 20 Oct 2006) New Revision: 7297 Modified: trunk/src/gtkgui_helpers.py Log: damn typo Modified: trunk/src/gtkgui_helpers.py =================================================================== --- trunk/src/gtkgui_helpers.py 2006-10-20 09:37:24 UTC (rev 7296) +++ trunk/src/gtkgui_helpers.py 2006-10-20 09:42:33 UTC (rev 7297) @@ -199,7 +199,7 @@ def user_runs_kde(): return 'startkde' in get_running_processes() -der user_runs_xfce(): +def user_runs_xfce(): procs = get_running_processes() if 'startxfce4' in procs or 'xfce4-session' in procs: return True

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