tags 625221 + pending thanks Dear maintainer,
I've prepared an NMU for gwibber (versioned as 3.0.0.1-2.1) and
uploaded it to DELAYED/5. Please feel free to tell me if I
should delay it longer.
Regards.
--
Jan Dittberner - Debian Developer
GPG-key: 4096R/558FB8DD 2009-05-10
B2FF 1D95 CE8F 7A22 DF4C F09B A73E 0055 558F B8DD
http://ddportfolio.debian.net/ - http://people.debian.org/~jandd/
diff -Nru gwibber-3.0.0.1/debian/changelog gwibber-3.0.0.1/debian/changelog --- gwibber-3.0.0.1/debian/changelog 2011-05-04 08:08:04.000000000 +0200 +++ gwibber-3.0.0.1/debian/changelog 2012-01-27 10:55:57.000000000 +0100 @@ -1,3 +1,11 @@ +gwibber (3.0.0.1-2.1) unstable; urgency=low + + * Non-maintainer upload. + * Fix "cannot send notices when using network manager" by applying patch + from launchpad (Closes: #625221) + + -- Jan Dittberner <[email protected]> Fri, 27 Jan 2012 10:55:57 +0100 + gwibber (3.0.0.1-2) unstable; urgency=low * Added patches from Ubuntu for various issues diff -Nru gwibber-3.0.0.1/debian/patches/debbug-625221.patch gwibber-3.0.0.1/debian/patches/debbug-625221.patch --- gwibber-3.0.0.1/debian/patches/debbug-625221.patch 1970-01-01 01:00:00.000000000 +0100 +++ gwibber-3.0.0.1/debian/patches/debbug-625221.patch 2012-01-27 10:38:34.000000000 +0100 @@ -0,0 +1,83 @@ +Subject: make gwibber work with NetworkManager and GNOME 3 +Origin: http://bazaar.launchpad.net/~gwibber-committers/gwibber/trunk/diff/991 +Bug: https://bugs.launchpad.net/ubuntu/+source/update-manager/+bug/791548 +Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=625221 +--- a/gwibber/microblog/dispatcher.py ++++ b/gwibber/microblog/dispatcher.py +@@ -807,6 +807,9 @@ + self.sysbus = dbus.SystemBus() + + self.has_nm = None ++ NM_DBUS_SERVICE = "org.freedesktop.NetworkManager" ++ NM_DBUS_OBJECT_PATH = "/org/freedesktop/NetworkManager" ++ NM_DBUS_INTERFACE = "org.freedesktop.NetworkManager" + + try: + self.nm = self.sysbus.get_object(NM_DBUS_SERVICE, NM_DBUS_OBJECT_PATH) +@@ -815,17 +818,29 @@ + except: + pass + ++ self.NM_STATE_UNKNOWN = 0 ++ ++ log.logger.debug("NM Version is %s", str(self.nm.Get(NM_DBUS_INTERFACE, "Version"))) ++ ++ if str(self.nm.Get(NM_DBUS_INTERFACE, "Version")) >= "0.8.998": ++ log.logger.debug("NM Version is greater than 0.8.997") ++ self.NM_STATE_ASLEEP = 10 ++ self.NM_STATE_DISCONNECTED = 20 ++ self.NM_STATE_CONNECTING = 40 ++ self.NM_STATE_CONNECTED = 70 ++ else: ++ log.logger.debug("NM Version is less than 0.8.998") ++ self.NM_STATE_ASLEEP = 1 ++ self.NM_STATE_CONNECTING = 2 ++ self.NM_STATE_CONNECTED = 3 ++ self.NM_STATE_DISCONNECTED = 4 ++ ++ ++ + 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 +- """ + +- if state == NM_STATE_CONNECTED: ++ if state == self.NM_STATE_CONNECTED: + log.logger.info("Network state changed to Online") + self.ConnectionOnline() + else: +@@ -844,7 +859,7 @@ + log.logger.info("Can't determine network state, assuming online") + return True + try: +- if self.nm.state() == NM_STATE_CONNECTED: ++ if self.nm.state() == self.NM_STATE_CONNECTED: + return True + else: + return False +--- a/gwibber/microblog/util/const.py ++++ b/gwibber/microblog/util/const.py +@@ -69,17 +69,6 @@ + QUESTIONS_URL = "https://answers.launchpad.net/gwibber"; + TRANSLATE_URL = "https://translations.launchpad.net/gwibber"; + +-# Setup some Network Manager stuff to query for online state +-NM_DBUS_SERVICE = "org.freedesktop.NetworkManager" +-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 +- +- + GWIBBER_OPERATIONS = """ + { + "delete": { diff -Nru gwibber-3.0.0.1/debian/patches/series gwibber-3.0.0.1/debian/patches/series --- gwibber-3.0.0.1/debian/patches/series 2011-05-03 17:06:42.000000000 +0200 +++ gwibber-3.0.0.1/debian/patches/series 2012-01-27 10:32:09.000000000 +0100 @@ -1,3 +1,4 @@ fix_facebook_ext_perms.patch lp_735609.patch lp_757451.patch +debbug-625221.patch
signature.asc
Description: Digital signature
