telepathy-mission-control: connectivity-monitor.c: fix unused variable warning when compiling without nm support
George Kiagiadakis
gkiagia at kemper.freedesktop.org
Sat Jan 28 11:43:23 UTC 2017
Module: telepathy-mission-control
Branch: master
Commit: 497e26593446d343105f594997ef0689aac4be4f
URL: http://cgit.freedesktop.org/telepathy/telepathy-mission-control/commit/?id=497e26593446d343105f594997ef0689aac4be4f
Author: George Kiagiadakis <gkiagia at tolabaki.gr>
Date: Fri Jul 1 16:04:36 2016 +0300
connectivity-monitor.c: fix unused variable warning when compiling without nm support
This GError variable is not used anywhere else in this function.
---
src/connectivity-monitor.c | 32 ++++++++++++++++++--------------
1 file changed, 18 insertions(+), 14 deletions(-)
diff --git a/src/connectivity-monitor.c b/src/connectivity-monitor.c
index bb09096..6d69972 100644
--- a/src/connectivity-monitor.c
+++ b/src/connectivity-monitor.c
@@ -498,7 +498,6 @@ static void
mcd_connectivity_monitor_init (McdConnectivityMonitor *connectivity_monitor)
{
McdConnectivityMonitorPrivate *priv;
- GError *error = NULL;
priv = G_TYPE_INSTANCE_GET_PRIVATE (connectivity_monitor,
MCD_TYPE_CONNECTIVITY_MONITOR, McdConnectivityMonitorPrivate);
@@ -527,19 +526,24 @@ mcd_connectivity_monitor_init (McdConnectivityMonitor *connectivity_monitor)
#endif
#ifdef HAVE_NM
- priv->nm_client = nm_client_new (NULL, &error);
- if (priv->nm_client != NULL)
- {
- priv->state_change_signal_id = g_signal_connect (priv->nm_client,
- "notify::" NM_CLIENT_STATE,
- G_CALLBACK (connectivity_monitor_nm_state_change_cb), connectivity_monitor);
-
- connectivity_monitor_nm_state_change_cb (priv->nm_client, NULL, connectivity_monitor);
- }
- else
- {
- DEBUG ("Failed to get NetworkManager proxy: %s", error->message);
- }
+ {
+ GError *error = NULL;
+ priv->nm_client = nm_client_new (NULL, &error);
+ if (priv->nm_client != NULL)
+ {
+ priv->state_change_signal_id = g_signal_connect (priv->nm_client,
+ "notify::" NM_CLIENT_STATE,
+ G_CALLBACK (connectivity_monitor_nm_state_change_cb),
+ connectivity_monitor);
+
+ connectivity_monitor_nm_state_change_cb (priv->nm_client, NULL,
+ connectivity_monitor);
+ }
+ else
+ {
+ DEBUG ("Failed to get NetworkManager proxy: %s", error->message);
+ }
+ }
#endif
#ifdef HAVE_UPOWER
More information about the telepathy-commits
mailing list