Changeset 9644

Timestamp:

05/15/08 21:52:04 (2 months ago)

Author:

js

Message:

* Remove old code to update status to current track.
* Don't bind the track listener when not enabled anymore.
* Remove the signal / add the signal when changed in preferences.

Files:

• trunk/src/common/config.py (modified) (1 diff)
• trunk/src/common/connection_handlers.py (modified) (1 diff)
• trunk/src/common/connection.py (modified) (1 diff)
• trunk/src/config.py (modified) (4 diffs)
• trunk/src/roster_window.py (modified) (5 diffs)

trunk/src/common/config.py

@@ -152 +152 @@
-                'after_nickname': [ opt_str, ':', _('Characters that are printed after the nickname in conversations') ],
-                'send_os_info': [ opt_bool, True ],
-                'set_status_msg_from_lastfm': [ opt_bool, False, _('If checked, Gajim can regularly poll a Last.fm account and sends recently played songs through PEP.') ],
-                'lastfm_username': [ opt_str, '', _('The username used to identify the Last.fm account.')],
-                'notify_on_new_gmail_email': [ opt_bool, True ],

trunk/src/common/connection_handlers.py

@@ -821 +821 @@
-                                                        track = listener.get_playing_track()
-                                                        if gajim.config.get('publish_tune'):
-_
+
-                                                                                track, self.name)
-                                                break

trunk/src/common/connection.py

@@ -196 +196 @@
-        # We are doing disconnect at so many places, better use one function in all
-        def disconnect(self, on_purpose=False):
-
-
+
-                self.on_purpose = on_purpose
-                self.connected = 0

trunk/src/config.py

@@ -54 +54 @@
-
-from common.exceptions import GajimGeneralException
+
+if dbus_support.supported:
+        from music_track_listener import MusicTrackListener
+        import dbus
-
-#---------- PreferencesWindow class -------------#
@@ -556 +560 @@
-
-        def on_publish_tune_checkbutton_toggled(self, widget):
-
+
+
+
+
+
+
+
+
+
-                        for account in gajim.connections:
-                                if gajim.connections[account].pep_supported:
@@ -564 +576 @@
-                self.on_checkbutton_toggled(widget, 'publish_tune')
-                helpers.update_optional_features()
-                gajim.interface.roster.enable_syncing_status_msg_from_current_music_track(
-                        widget.get_active())
-
-        def on_publish_nick_checkbutton_toggled(self, widget):
@@ -1169 +1179 @@
-                        gajim.interface.instances['advanced_config'] = \
-                                dialogs.AdvancedConfigurationWindow()
-
-        def set_status_msg_from_current_music_track_checkbutton_toggled(self,
-                widget):
-                self.on_checkbutton_toggled(widget,
-                        'set_status_msg_from_current_music_track')
-                gajim.interface.roster.enable_syncing_status_msg_from_current_music_track(
-                        widget.get_active())
-
-#---------- ManageProxiesWindow class -------------#

trunk/src/roster_window.py

@@ -1549 +1549 @@
-                        for chat_control in gajim.interface.msg_win_mgr.get_chat_controls(ji, account):
-                                chat_control.contact = contact1
-        
-        def enable_syncing_status_msg_from_current_music_track(self, enabled):
-                '''enable setting status msg from currently playing music track
-                
-                if enabled is True, we listen to events from music players about
-                currently played music track, and we update our
-                status message accordinly'''
-                if not dbus_support.supported:
-                        # do nothing if user doesn't have D-Bus bindings
-                        return
-                if enabled:
-                        listener = MusicTrackListener.get()
-                        if self._music_track_changed_signal is None:
-                                self._music_track_changed_signal = listener.connect(
-                                        'music-track-changed', self._music_track_changed)
-                        track = listener.get_playing_track()
-                        self._music_track_changed(listener, track)
-                else:
-                        if self._music_track_changed_signal is not None:
-                                listener = MusicTrackListener.get()
-                                listener.disconnect(self._music_track_changed_signal)
-                                self._music_track_changed_signal = None
-                        self._music_track_changed(None, None)
- 
-        def enable_syncing_status_msg_from_lastfm(self, enabled):
-                ''' enable setting status msg from a Last.fm account
-                
-                if enabled is True, we start polling the Last.fm server,
-                and we update our status message accordinly'''
-                if enabled:
-                        if self._music_track_changed_signal is None:
-                                listener = LastFMTrackListener.get(
-                                        gajim.config.get('lastfm_username'))
-                                self._music_track_changed_signal = listener.connect(
-                                        'music-track-changed', self._music_track_changed)
-                                track = listener.get_playing_track()
-                                self._music_track_changed(listener, track)
-                else:
-                        if self._music_track_changed_signal is not None:
-                                listener = LastFMTrackListener.get(
-                                        gajim.config.get('lastfm_username'))
-                                listener.disconnect(self._music_track_changed_signal)
-                                self._music_track_changed_signal = None
-                                self._music_track_changed(None, None)
-
-        def _change_awn_icon_status(self, status):
@@ -1620 +1576 @@
-                        pass
-
-_
+
-        account=''):
-                from common import pep
@@ -1655 +1611 @@
-                                pep.user_send_tune(account, artist, title, source)
-                                self._music_track_info = music_track_info
-
-
-        def connected_rooms(self, account):
@@ -5712 +5667 @@
-                self.window = self.xml.get_widget('roster_window')
-                self.hpaned = self.xml.get_widget('roster_hpaned')
-_
+
-                gajim.interface.msg_win_mgr = MessageWindowMgr(self.window, self.hpaned)
-                gajim.interface.msg_win_mgr.connect('window-delete',
@@ -5916 +5871 @@
-                publish_tune = gajim.config.get('publish_tune')
-                if publish_tune:
-
-
-
-
-
-
+
+
+
+
+
-
-                if gajim.config.get('show_roster_on_startup'):