diff options
| author | Jonny Lamb <jonny.lamb@collabora.co.uk> | 2011-10-07 11:34:52 +0100 |
|---|---|---|
| committer | Jonny Lamb <jonny.lamb@collabora.co.uk> | 2011-10-07 11:34:52 +0100 |
| commit | cc746edd95fdc1802cd656eca664a7089de61745 (patch) | |
| tree | c08d8c61f63c2757aaeeeb255efcf7560c15cc64 | |
| parent | 85a8950dff6ddf53bb78c780e003561c111a26f8 (diff) | |
connectivity-monitor: fix build with UPower but no NM or ConnMan
http://bugs.debian.org/644589
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
| -rw-r--r-- | src/connectivity-monitor.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/connectivity-monitor.c b/src/connectivity-monitor.c index 4ecccde2..2c94e3f6 100644 --- a/src/connectivity-monitor.c +++ b/src/connectivity-monitor.c @@ -317,10 +317,12 @@ mcd_connectivity_monitor_init (McdConnectivityMonitor *connectivity_monitor) static void connectivity_monitor_finalize (GObject *object) { -#ifdef HAVE_NM +#if defined(HAVE_NM) || defined(HAVE_CONNMAN) || defined(HAVE_UPOWER) McdConnectivityMonitor *connectivity_monitor = MCD_CONNECTIVITY_MONITOR (object); McdConnectivityMonitorPrivate *priv = connectivity_monitor->priv; +#endif +#ifdef HAVE_NM if (priv->nm_client != NULL) { g_signal_handler_disconnect (priv->nm_client, @@ -332,9 +334,6 @@ connectivity_monitor_finalize (GObject *object) #endif #ifdef HAVE_CONNMAN - McdConnectivityMonitor *connectivity_monitor = MCD_CONNECTIVITY_MONITOR (object); - McdConnectivityMonitorPrivate *priv = connectivity_monitor->priv; - if (priv->proxy != NULL) { dbus_g_proxy_disconnect_signal (priv->proxy, "StateChanged", |