Don't build networkmanager.cpp at all if NM is disabled

daemon/src/dbus/Makefile.am

@@ -15,10 +15,10 @@ libdbus_la_SOURCES = \
     callmanager.cpp \
     configurationmanager.cpp  \
     instance.cpp  \
-    dbusmanager.cpp  \
-    networkmanager.cpp
+    dbusmanager.cpp
 
 if USE_NETWORKMANAGER
+libdbus_la_SOURCES += networkmanager.cpp
 NETWORKMANAGER=-DUSE_NETWORKMANAGER
 else
 NETWORKMANAGER=

daemon/src/dbus/dbusmanager.cpp

@@ -57,10 +57,10 @@ DBusManager::DBusManager()
         _configurationManager = new ConfigurationManager (sessionConnection);
         _instanceManager = new Instance (sessionConnection);
 
-    #ifdef USE_NETWORKMANAGER
+#ifdef USE_NETWORKMANAGER
         DBus::Connection systemConnection = DBus::Connection::SystemBus();
         _networkManager = new NetworkManager (systemConnection, "/org/freedesktop/NetworkManager", "");
-    #endif
+#endif
 
         _connected = true;
     } catch (const DBus::Error &err) {
@@ -88,4 +88,3 @@ DBusManager::exit()
 {
     _dispatcher.leave();
 }
-

daemon/src/dbus/networkmanager.cpp

@@ -28,8 +28,6 @@
  *  as that of the covered work.
  */
 
-#ifdef USE_NETWORKMANAGER
-
 #include <global.h>
 #include "networkmanager.h"
 #include <iostream>
@@ -52,38 +50,11 @@ void NetworkManager::PropertiesChanged (const std::map< std::string, ::DBus::Var
 {
     const std::map< std::string, ::DBus::Variant >::const_iterator iter = argin0.begin();
 
-    std::string message = iter->first;
-
     _warn ("Properties changed: %s", iter->first.c_str());
-    /*
-    	DBus::Variant variant = iter->second;
-    	DBus::MessageIter i = variant.reader();
-    	cout << i.type() << endl;// 97
-    	cout << (char )i.type() << endl;
-    	cout << (char)i.array_type() << endl;
-
-    	cout << i.is_array() << endl;// 1
-    	cout << i.is_dict() << endl;// 0
-    	cout << i.array_type() << endl;// 111
 
-    	int size;
-    	::DBus::Path* value = new ::DBus::Path[10];
-    	size = i.get_array(value);
-    	cout << "length: " << size << endl;
-
-    	while (!i.at_end())
-    	{
-    		char **array = new char*[2];
-    		size_t length = i.get_array(&array);
-    		cout << "length: " << length << endl;
-    		i = i.recurse();
-    	}
-    */
     Manager::instance().registerAccounts();
 }
 
 NetworkManager::NetworkManager (DBus::Connection& connection, const DBus::Path& path, const char* destination) : DBus::ObjectProxy (connection, path, destination)
 {
 }
-
-#endif