From 440f38fb2be4ac78f6036cf28e9071daa6396139 Mon Sep 17 00:00:00 2001 From: DrFrasierCrane Date: Mon, 14 Jan 2008 21:24:46 +0100 Subject: [PATCH] Code cleanup, temporarily disabled Config in MessageManager. --- straw/MessageManager.py | 83 ++++++++++++++++++++++--------------------------- straw/feedproperties.py | 75 -------------------------------------------- 2 files changed, 38 insertions(+), 120 deletions(-) diff --git a/straw/MessageManager.py b/straw/MessageManager.py index 6513b41..fe58f1a 100644 --- a/straw/MessageManager.py +++ b/straw/MessageManager.py @@ -33,60 +33,53 @@ NM_STATE_CONNECTED = 3 NM_STATE_DISCONNECTED = 4 class FeedReader(dbus.service.Object): - service_name = "org.gnome.feed.Reader" - object_path = "/org/gnome/feed/Reader" + service_name = "org.gnome.feed.Reader" + object_path = "/org/gnome/feed/Reader" - def __init__(self): - try: - self._session_bus = dbus.SessionBus() - self._service = dbus.service.BusName(self.service_name, bus=self._session_bus) - dbus.service.Object.__init__(self, self._service, self.object_path) - except DBusException, e: - logging.info(_("Error while initializing feed subscribe service")) - - @dbus.service.method("org.gnome.feed.Reader") - def Subscribe(self, url): - subscribe_show(url) - return True + def __init__(self): + try: + self._session_bus = dbus.SessionBus() + self._service = dbus.service.BusName(self.service_name, bus=self._session_bus) + dbus.service.Object.__init__(self, self._service, self.object_path) + except DBusException, e: + logging.info(_("Error while initializing feed subscribe service: [%s]" % str(e))) -class NetworkListener: - SERVICE_NAME = "org.freedesktop.NetworkManager" - SERVICE_PATH = "/org/freedesktop/NetworkManager" + @dbus.service.method("org.gnome.feed.Reader") + def Subscribe(self, url): + subscribe_show(url) + return True - def __init__(self): - self._config = Config.get_instance() +class NetworkListener(object): + SERVICE_NAME = "org.freedesktop.NetworkManager" + SERVICE_PATH = "/org/freedesktop/NetworkManager" - def set_state(self, state): - if state == NM_STATE_CONNECTED: - self._config.offline = False - else: - self._config.offline = True + def __init__(self): + pass - def active_cb(self, path): - self._config.offline = False + def set_state(self, state): + pass #self._config.offline = not (state == NM_STATE_CONNECTED) - def inactive_cb(self, path): - self._config.offline = True + def active_cb(self, path): + pass #self._config.offline = False + def inactive_cb(self, path): + pass #self._config.offline = True def start_services(): - fr = FeedReader() - - try: - systemBus = dbus.SystemBus() - proxy_obj = systemBus.get_object(NetworkListener.SERVICE_NAME, - NetworkListener.SERVICE_PATH) - nl = NetworkListener() - # don't touch offline if it has been previously set. - if not Config.get_instance().offline: - nl.set_state(proxy_obj.state()) - - nm_interface = dbus.Interface(proxy_obj, NetworkListener.SERVICE_NAME) - nm_interface.connect_to_signal('DeviceNowActive', nl.active_cb) - nm_interface.connect_to_signal('DeviceNoLongerActive', nl.inactive_cb) - except DBusException, de: - logging.info(_("Unable to find NetworkManager service")) - + try: + systemBus = dbus.SystemBus() + proxy_obj = systemBus.get_object(NetworkListener.SERVICE_NAME, NetworkListener.SERVICE_PATH) + nl = NetworkListener() + + # don't touch offline if it has been previously set. + #if not Config.get_instance().offline: + # nl.set_state(proxy_obj.state()) + + nm_interface = dbus.Interface(proxy_obj, NetworkListener.SERVICE_NAME) + nm_interface.connect_to_signal('DeviceNowActive', nl.active_cb) + nm_interface.connect_to_signal('DeviceNoLongerActive', nl.inactive_cb) + except DBusException, e: + logging.info(_("Unable to find NetworkManager service: [%s]" % str(e))) class StatusMessageManager(gobject.GObject): diff --git a/straw/feedproperties.py b/straw/feedproperties.py index 2c38ef2..4854104 100644 --- a/straw/feedproperties.py +++ b/straw/feedproperties.py @@ -116,81 +116,6 @@ class FeedPropertyView(MVP.GladeView): if window: window.show() - """self._defaults['title'] = self._feed.title - loc, un, pw = "", "", ""#self._feed.access_info - self._defaults['url'] = loc - self._defaults['username'] = un - self._defaults['password'] = pw - self._defaults['frequency'] = self._feed.poll_frequency - self._defaults['stored'] = self._feed.number_of_items_stored - - self._title.set_text(self._feed.title) - self._location.set_text(self._feed.access_info[0]) - - config = Config.get_instance() - if self._feed.poll_frequency == feeds.Feed.DEFAULT: - freq = config.poll_frequency - fdefault = True - self._refresh_keep = True - else: - freq = self._feed.poll_frequency - fdefault = False - self._refresh_keep = False - self._refresh_spin.set_value(float(freq / 60)) - self._refresh_spin.set_sensitive(not fdefault) - self._refresh_default_check.set_active(fdefault) - if self._feed.number_of_items_stored == feeds.Feed.DEFAULT: - nitems = config.number_of_items_stored - nidefault = True - self._articles_keep = True - else: - nitems = self._feed.number_of_items_stored - nidefault = False - self._articles_keep = False - self._articles_spin.set_value(float(nitems)) - self._articles_spin.set_sensitive(not nidefault) - self._articles_default_check.set_active(nidefault) - - if un: - self._username.set_text(un) - if pw: - self._password.set_text(pw) - - model = self._categories_treeview.get_model() - model.clear() - fclist = feeds.category_list - for c in fclist.user_categories: - iter = model.append() - model.set(iter, - self.COLUMN_NAME, c.title, - self.COLUMN_MEMBER, self._feed in c.feeds, - self.COLUMN_OBJECT, c) - - self._previous_refresh_label.set_text( - helpers.format_date(time.gmtime(self._feed.last_poll))) - next = self._feed.next_refresh - if next: - self._next_refresh_label.set_text( - helpers.format_date(time.gmtime(next))) - self._next_refresh_label.show() - else: - self._next_refresh_label.hide() - - description = helpers.convert_entities(feed.channel_description.strip()) - if description and description != title: - description = read_text(description, len(description)) - self._feed_info_description.set_text(helpers.convert_entities(description)) - self._feed_info_description.show() - else: - self._feed_info_description.hide() - - copyright = helpers.convert_entities(feed.channel_copyright) - if copyright: - self._feed_info_copyright.set_text(copyright) - self._feed_info_copyright.show() - else: - self._feed_info_copyright.hide()""" - def _load_uri(self, widget, event): helpers.url_show(widget.get_uri()) -- 2.11.4.GIT