summaryrefslogtreecommitdiff
path: root/liblightdm-qt
diff options
context:
space:
mode:
authorRobert Ancell <robert.ancell@canonical.com>2014-05-06 16:06:32 +1200
committerRobert Ancell <robert.ancell@canonical.com>2014-05-06 16:06:32 +1200
commit295b51ffb710af8e4c816e509d3a7f33a9621578 (patch)
tree0ce07973e8d0c1efdb53cf639d9870854ddbba0b /liblightdm-qt
parentbd4732c86967cdf3c61114f7b69563f1af3137ad (diff)
downloadlightdm-295b51ffb710af8e4c816e509d3a7f33a9621578.tar.gz
Rename lightdm_greeter_connect to lightdm_greeter_connect_to_daemon as it conflicts with g_signal_connect in Python
Diffstat (limited to 'liblightdm-qt')
-rw-r--r--liblightdm-qt/QLightDM/greeter.h1
-rw-r--r--liblightdm-qt/greeter.cpp8
2 files changed, 8 insertions, 1 deletions
diff --git a/liblightdm-qt/QLightDM/greeter.h b/liblightdm-qt/QLightDM/greeter.h
index 8abf5e92..91a2a059 100644
--- a/liblightdm-qt/QLightDM/greeter.h
+++ b/liblightdm-qt/QLightDM/greeter.h
@@ -71,6 +71,7 @@ public:
QString hostname() const;
public Q_SLOTS:
+ bool connectToDaemonSync();
bool connectSync();
void authenticate(const QString &username=QString());
void authenticateAsGuest();
diff --git a/liblightdm-qt/greeter.cpp b/liblightdm-qt/greeter.cpp
index 406a6321..5a52618e 100644
--- a/liblightdm-qt/greeter.cpp
+++ b/liblightdm-qt/greeter.cpp
@@ -118,10 +118,16 @@ Greeter::~Greeter()
}
+bool Greeter::connectToDaemonSync()
+{
+ Q_D(Greeter);
+ return lightdm_greeter_connect_to_daemon_sync(d->ldmGreeter, NULL);
+}
+
bool Greeter::connectSync()
{
Q_D(Greeter);
- return lightdm_greeter_connect_sync(d->ldmGreeter, NULL);
+ return lightdm_greeter_connect_to_daemon_sync(d->ldmGreeter, NULL);
}
void Greeter::authenticate(const QString &username)