Sophie

Sophie

distrib > Fedora > 13 > i386 > by-pkgid > 4fe0eac35e20eb2d09b83f78a19ab835 > files > 8

gwibber-3.0.0.1-2.fc13.src.rpm

diff -up gwibber-3.0.0/gwibber/microblog/dispatcher.py.nm09 gwibber-3.0.0/gwibber/microblog/dispatcher.py
--- gwibber-3.0.0/gwibber/microblog/dispatcher.py.nm09	2011-04-05 22:47:27.000000000 -0400
+++ gwibber-3.0.0/gwibber/microblog/dispatcher.py	2011-04-05 22:49:14.892000093 -0400
@@ -772,14 +772,10 @@ class ConnectionMonitor(dbus.service.Obj
   def on_connection_changed(self, state):
     log.logger.debug("Network state changed, new state is %d", state)
     """
-    NM_STATE_UNKNOWN = 0
-    NM_STATE_ASLEEP = 1
-    NM_STATE_CONNECTING = 2
-    NM_STATE_CONNECTED = 3
-    NM_STATE_DISCONNECTED = 4
+    See util/const.py for states.
     """
 
-    if state == NM_STATE_CONNECTED:
+    if state in NM_CONNECTED_STATES:
       log.logger.info("Network state changed to Online")
       self.ConnectionOnline()
     else:
@@ -798,7 +794,7 @@ class ConnectionMonitor(dbus.service.Obj
       log.logger.info("Can't determine network state, assuming online")
       return True
     try:
-      if self.nm.state() == NM_STATE_CONNECTED:
+      if self.nm.state() in NM_CONNECTED_STATES:
         return True
       else:
         return False
diff -up gwibber-3.0.0/gwibber/microblog/util/const.py.nm09 gwibber-3.0.0/gwibber/microblog/util/const.py
--- gwibber-3.0.0/gwibber/microblog/util/const.py.nm09	2011-04-05 22:47:27.860000094 -0400
+++ gwibber-3.0.0/gwibber/microblog/util/const.py	2011-04-05 22:47:27.867000094 -0400
@@ -75,11 +75,24 @@ NM_DBUS_SERVICE = "org.freedesktop.Netwo
 NM_DBUS_OBJECT_PATH = "/org/freedesktop/NetworkManager"
 NM_DBUS_INTERFACE = "org.freedesktop.NetworkManager"
 NM_STATE_UNKNOWN = 0
-NM_STATE_ASLEEP = 1
-NM_STATE_CONNECTING = 2
-NM_STATE_CONNECTED = 3
-NM_STATE_DISCONNECTED = 4
-
+NM_STATE_ASLEEP_OLD = 1
+NM_STATE_CONNECTING_OLD = 2
+NM_STATE_CONNECTED_OLD = 3
+NM_STATE_DISCONNECTED_OLD = 4
+NM_STATE_ASLEEP = 10,
+NM_STATE_DISCONNECTED = 20,
+NM_STATE_DISCONNECTING = 30,
+NM_STATE_CONNECTING = 40,
+NM_STATE_CONNECTED_LOCAL = 50,
+NM_STATE_CONNECTED_SITE = 60,
+NM_STATE_CONNECTED_GLOBAL = 70
+
+NM_CONNECTED_STATES = (
+  NM_STATE_CONNECTED_OLD,
+  NM_STATE_CONNECTED_LOCAL,
+  NM_STATE_CONNECTED_SITE,
+  NM_STATE_CONNECTED_GLOBAL
+)
 
 GWIBBER_OPERATIONS = """
 {