summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2014-09-25 12:06:38 -0500
committerTimothy Pearson <[email protected]>2014-09-25 12:06:38 -0500
commita2389c3d3950851aa0d378d6a8186c2cde8fb22a (patch)
tree1cd061ad3b330fd23e2991a3af09b937c78e8400
parent2c418928fcd42d68fc54bda96fb76cd1ca078d1e (diff)
downloadknetworkmanager8-a2389c3d3950851aa0d378d6a8186c2cde8fb22a.tar.gz
knetworkmanager8-a2389c3d3950851aa0d378d6a8186c2cde8fb22a.zip
Fix FTBFS from changes in dbus-1-tqt hash a111d4
This resolves Bug 1967
-rw-r--r--knetworkmanager-0.8/src/knetworkmanager-connection_secrets_dbus.cpp6
-rw-r--r--knetworkmanager-0.8/src/knetworkmanager-connection_secrets_dbus.h4
2 files changed, 10 insertions, 0 deletions
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 @@ ConnectionSecretsDBus::objectPath() const
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 @@ namespace ConnectionSettings
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);