[Pkg-telepathy-commits] [SCM] Empathy packaging branch, debian-wheezy, updated. debian/2.30.3-3-1-gb390dec

[Laurent Bigonville]

The following commit has been merged in the debian-wheezy branch:
commit b390dec10647c2e533756f6e1ebd46d9122435ca
Author: Laurent Bigonville <bigon at bigon.be>
Date:   Mon Sep 19 14:32:58 2011 +0200

    debian/patches/0004-nm-0.9.patch: Add support for network-manager 0.9 (Closes: #640402)

diff --git a/debian/changelog b/debian/changelog
index e1b426c..235ac6f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+empathy (2.30.3-4) UNRELEASED; urgency=low
+
+  * debian/patches/0004-nm-0.9.patch: Add support for network-manager 0.9
+    (Closes: #640402)
+
+ -- Laurent Bigonville <bigon at debian.org>  Mon, 19 Sep 2011 14:33:07 +0200
+
 empathy (2.30.3-3) unstable; urgency=low
 
   * debian/control:
diff --git a/debian/patches/0004-nm-0.9.patch b/debian/patches/0004-nm-0.9.patch
new file mode 100644
index 0000000..155cb23
--- /dev/null
+++ b/debian/patches/0004-nm-0.9.patch
@@ -0,0 +1,31 @@
+From 1b68d34282947697e1c173456bdb35700dc0f19e Mon Sep 17 00:00:00 2001
+From: Dan Williams <dcbw at redhat.com>
+Date: Tue, 22 Mar 2011 09:04:24 +0000
+Subject: Handle new NM 0.9 states (#644412)
+
+---
+--- a/libempathy/empathy-connectivity.c
++++ b/libempathy/empathy-connectivity.c
+@@ -87,6 +87,11 @@
+ }
+ 
+ #ifdef HAVE_NM
++
++#if !defined(NM_CHECK_VERSION)
++#define NM_CHECK_VERSION(x,y,z) 0
++#endif
++
+ static void
+ connectivity_nm_state_change_cb (NMClient *client,
+     const GParamSpec *pspec,
+@@ -103,6 +108,10 @@
+ 
+   state = nm_client_get_state (priv->nm_client);
+   new_nm_connected = !(state == NM_STATE_CONNECTING
++#if NM_CHECK_VERSION(0,8,992)
++      || state == NM_STATE_DISCONNECTING
++#endif
++      || state == NM_STATE_ASLEEP
+       || state == NM_STATE_DISCONNECTED);
+ 
+   DEBUG ("New NetworkManager network state %d (connected: %s)", state,
diff --git a/debian/patches/series b/debian/patches/series
index c427bd7..3d2fef4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 0001-Transition-to-libchamplain-0.8.patch
 0002-port-libnotify-0.7.patch
 0003-use-gtk-clutter-init.patch
+0004-nm-0.9.patch

-- 
Empathy packaging