[gnome-settings-daemon] sharing: set_properties() was unused when NM is there



commit b0b07f23d53e30bf4be889d14b6a780868d00075
Author: Bastien Nocera <hadess hadess net>
Date:   Wed Jun 25 15:21:19 2014 +0200

    sharing: set_properties() was unused when NM is there

 plugins/sharing/gsd-sharing-manager.c |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/plugins/sharing/gsd-sharing-manager.c b/plugins/sharing/gsd-sharing-manager.c
index 084c9db..bb013b0 100644
--- a/plugins/sharing/gsd-sharing-manager.c
+++ b/plugins/sharing/gsd-sharing-manager.c
@@ -559,14 +559,6 @@ on_bus_gotten (GObject               *source_object,
                                                                NULL);
 }
 
-static void
-set_properties (GsdSharingManager *manager)
-{
-                manager->priv->current_network = g_strdup ("");
-                manager->priv->carrier_type = g_strdup ("");
-                manager->priv->sharing_status = GSD_SHARING_STATUS_OFFLINE;
-}
-
 #ifdef HAVE_NETWORK_MANAGER
 static void
 primary_connection_changed (GObject    *gobject,
@@ -655,6 +647,14 @@ remote_settings_ready_cb (GObject      *source_object,
 
         manager->priv->remote_settings = remote_settings;
 }
+#else
+static void
+set_properties (GsdSharingManager *manager)
+{
+                manager->priv->current_network = g_strdup ("");
+                manager->priv->carrier_type = g_strdup ("");
+                manager->priv->sharing_status = GSD_SHARING_STATUS_OFFLINE;
+}
 #endif /* HAVE_NETWORK_MANAGER */
 
 #define RYGEL_BUS_NAME "org.gnome.Rygel1"


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]