From f43c1318545b49bc9f7d44f5d440a07f2289709d Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 25 Sep 2014 12:06:38 -0500 Subject: [PATCH] Fix FTBFS from changes in dbus-1-tqt hash a111d4 This resolves Bug 1967 (cherry picked from commit a2389c3d3950851aa0d378d6a8186c2cde8fb22a) --- .../src/knetworkmanager-connection_secrets_dbus.cpp | 6 ++++++ .../src/knetworkmanager-connection_secrets_dbus.h | 4 ++++ 2 files changed, 10 insertions(+) diff --git a/knetworkmanager-0.8/src/knetworkmanager-connection_secrets_dbus.cpp b/knetworkmanager-0.8/src/knetworkmanager-connection_secrets_dbus.cpp index 07eea38..2a42529 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&, 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 36136f1..1f2575b 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&, TQT_DBusError&); + signals: void SecretsNeeded(const TQString& setting_name, const TQStringList& hints, bool request_new);