Branch: master

a2389c3d 2014-09-25 12:06:38 Timothy Pearson
Fix FTBFS from changes in dbus-1-tqt hash a111d4
This resolves Bug 1967
M knetworkmanager-0.8/src/knetworkmanager-connection_secrets_dbus.cpp
M knetworkmanager-0.8/src/knetworkmanager-connection_secrets_dbus.h
diff --git a/knetworkmanager-0.8/src/knetworkmanager-connection_secrets_dbus.cpp b/knetworkmanager-0.8/src/knetworkmanager-connection_secrets_dbus.cpp
index ad30054..d095675 100644
--- a/knetworkmanager-0.8/src/knetworkmanager-connection_secrets_dbus.cpp
+++ b/knetworkmanager-0.8/src/knetworkmanager-connection_secrets_dbus.cpp
@@ -226,5 +226,11 @@
 	return TQString(d->parent->getObjectPath());
 }
 
+bool
+ConnectionSecretsDBus::GetSecrets(const TQString&, const TQStringList&, bool, TQT_DBusDataMap<TQString>&, TQT_DBusError&) {
+	// Dummy method
+	return false;
+}
+
 
 #include "knetworkmanager-connection_secrets_dbus.moc"
diff --git a/knetworkmanager-0.8/src/knetworkmanager-connection_secrets_dbus.h b/knetworkmanager-0.8/src/knetworkmanager-connection_secrets_dbus.h
index 78a6303..62a3d41 100644
--- a/knetworkmanager-0.8/src/knetworkmanager-connection_secrets_dbus.h
+++ b/knetworkmanager-0.8/src/knetworkmanager-connection_secrets_dbus.h
@@ -65,6 +65,10 @@
 			bool handleSignalSend(const TQT_DBusMessage& reply);
 			TQString objectPath() const;
 
+			// synchronous methods are generated by dbus-1-tqt but are not used by network-manager;
+			// create needed do-nothing dummy method(s) here
+			bool GetSecrets(const TQString&, const TQStringList&, bool, TQT_DBusDataMap<TQString>&, TQT_DBusError&);
+
 		signals:
 			void SecretsNeeded(const TQString& setting_name, const TQStringList& hints, bool request_new);