Rename lightdm_greeter_connect to lightdm_greeter_connect_to_daemon as it conflicts...

diff --git a/debian/liblightdm-gobject-1-0.symbols b/debian/liblightdm-gobject-1-0.symbols
index 53a08cad9a483e796ac6d4e5f234be3bd192aee4..8baa6ca5ec0e48580dd2eafc4e951ffde2e3430d 100644 (file)
--- a/debian/liblightdm-gobject-1-0.symbols
+++ b/debian/liblightdm-gobject-1-0.symbols
@@ -16,9 +16,10 @@ liblightdm-gobject-1.so.0 liblightdm-gobject-1-0 #MINVER#
  lightdm_greeter_authenticate_remote@Base 1.3.3
  lightdm_greeter_cancel_authentication@Base 0.9.2
  lightdm_greeter_cancel_autologin@Base 0.9.2
- lightdm_greeter_connect@Base 1.11.1
- lightdm_greeter_connect_finish@Base 1.11.1
  lightdm_greeter_connect_sync@Base 0.9.2
+ lightdm_greeter_connect_to_daemon@Base 1.11.1
+ lightdm_greeter_connect_to_daemon_finish@Base 1.11.1
+ lightdm_greeter_connect_to_daemon_sync@Base 1.11.1
  lightdm_greeter_ensure_shared_data_dir@Base 1.11.1
  lightdm_greeter_ensure_shared_data_dir_finish@Base 1.11.1
  lightdm_greeter_ensure_shared_data_dir_sync@Base 1.9.8

diff --git a/doc/lightdm-gobject-1-sections.txt b/doc/lightdm-gobject-1-sections.txt
index 231c9dfcd29dfb71774c82f98d1d274ce3d051b9..d60fda9ef9de99dd9cf1a3e3fefbbf182197ee37 100644 (file)
--- a/doc/lightdm-gobject-1-sections.txt
+++ b/doc/lightdm-gobject-1-sections.txt
@@ -133,9 +133,9 @@ LightDMMessageType
 LightDMPromptType
 lightdm_greeter_new
 lightdm_greeter_set_resettable
-lightdm_greeter_connect
-lightdm_greeter_connect_finish
-lightdm_greeter_connect_sync
+lightdm_greeter_connect_to_daemon
+lightdm_greeter_connect_to_daemon_finish
+lightdm_greeter_connect_to_daemon_sync
 lightdm_greeter_ensure_shared_data_dir
 lightdm_greeter_ensure_shared_data_dir_finish
 lightdm_greeter_ensure_shared_data_dir_sync

diff --git a/doc/tmpl/greeter.sgml b/doc/tmpl/greeter.sgml
index 35258096b0ad3ed90fdfad481ae4c1754497cace..682433edfe46ed7d18e284af595cb641f6823205 100644 (file)
--- a/doc/tmpl/greeter.sgml
+++ b/doc/tmpl/greeter.sgml
@@ -24,7 +24,7 @@ int main ()
     g_object_connect (greeter, "authentication-complete", G_CALLBACK (authentication_complete_cb), NULL);
 
     // Connect to LightDM daemon
-    if (!lightdm_greeter_connect_sync (greeter, NULL))
+    if (!lightdm_greeter_connect_to_daemon_sync (greeter, NULL))
         return EXIT_FAILURE;
 
     // Start authentication
@@ -155,7 +155,7 @@ static void authentication_complete_cb (LightDMGreeter *greeter)
 @resettable: 
 
 
-<!-- ##### FUNCTION lightdm_greeter_connect ##### -->
+<!-- ##### FUNCTION lightdm_greeter_connect_to_daemon ##### -->
 <para>
 
 </para>
@@ -166,7 +166,7 @@ static void authentication_complete_cb (LightDMGreeter *greeter)
 @user_data: 
 
 
-<!-- ##### FUNCTION lightdm_greeter_connect_finish ##### -->
+<!-- ##### FUNCTION lightdm_greeter_connect_to_daemon_finish ##### -->
 <para>
 
 </para>
@@ -177,7 +177,7 @@ static void authentication_complete_cb (LightDMGreeter *greeter)
 @Returns: 
 
 
-<!-- ##### FUNCTION lightdm_greeter_connect_sync ##### -->
+<!-- ##### FUNCTION lightdm_greeter_connect_to_daemon_sync ##### -->
 <para>
 
 </para>

diff --git a/liblightdm-gobject/greeter.c b/liblightdm-gobject/greeter.c
index 9c8b347484689da6d9bc567a49ca2995a0463645..36f7b06c8922af1148b064ab98e075ed2b65d52a 100644 (file)
--- a/liblightdm-gobject/greeter.c
+++ b/liblightdm-gobject/greeter.c
@@ -723,7 +723,7 @@ send_ensure_shared_data_dir (LightDMGreeter *greeter, const gchar *username)
 }
 
 /**
- * lightdm_greeter_connect:
+ * lightdm_greeter_connect_to_daemon:
  * @greeter: The greeter to connect
  * @cancellable: (allow-none): A #GCancellable or %NULL.
  * @callback: (allow-none): A #GAsyncReadyCallback to call when completed or %NULL.
@@ -731,12 +731,12 @@ send_ensure_shared_data_dir (LightDMGreeter *greeter, const gchar *username)
  *
  * Asynchronously connects the greeter to the display manager.
  *
- * When the operation is finished, @callback will be invoked. You can then call lightdm_greeter_connect_finish() to get the result of the operation.
+ * When the operation is finished, @callback will be invoked. You can then call lightdm_greeter_connect_to_daemon_finish() to get the result of the operation.
  *
- * See lightdm_greeter_connect_sync() for the synchronous version.
+ * See lightdm_greeter_connect_to_daemon_sync() for the synchronous version.
  **/
 void
-lightdm_greeter_connect (LightDMGreeter *greeter, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data)
+lightdm_greeter_connect_to_daemon (LightDMGreeter *greeter, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data)
 {
     LightDMGreeterPrivate *priv;
     Request *request;
@@ -751,23 +751,23 @@ lightdm_greeter_connect (LightDMGreeter *greeter, GCancellable *cancellable, GAs
 }
 
 /**
- * lightdm_greeter_connect_finish:
+ * lightdm_greeter_connect_to_daemon_finish:
  * @result: A #GAsyncResult.
  * @error: return location for a #GError, or %NULL
  *
- * Finishes an operation started with lightdm_greeter_connect().
+ * Finishes an operation started with lightdm_greeter_connect_to_daemon().
  *
  * Return value: #TRUE if successfully connected
  **/
 gboolean
-lightdm_greeter_connect_finish (LightDMGreeter *greeter, GAsyncResult *result, GError **error)
+lightdm_greeter_connect_to_daemon_finish (LightDMGreeter *greeter, GAsyncResult *result, GError **error)
 {
     g_return_if_fail (LIGHTDM_IS_GREETER (greeter));
     return REQUEST (result)->complete;
 }
 
 /**
- * lightdm_greeter_connect_sync:
+ * lightdm_greeter_connect_to_daemon_sync:
  * @greeter: The greeter to connect
  * @error: return location for a #GError, or %NULL
  *
@@ -776,7 +776,7 @@ lightdm_greeter_connect_finish (LightDMGreeter *greeter, GAsyncResult *result, G
  * Return value: #TRUE if successfully connected
  **/
 gboolean
-lightdm_greeter_connect_sync (LightDMGreeter *greeter, GError **error)
+lightdm_greeter_connect_to_daemon_sync (LightDMGreeter *greeter, GError **error)
 {
     LightDMGreeterPrivate *priv;
     Request *request;
@@ -806,6 +806,23 @@ lightdm_greeter_connect_sync (LightDMGreeter *greeter, GError **error)
     return request->complete;
 }
 
+/**
+ * lightdm_greeter_connect_sync:
+ * @greeter: The greeter to connect
+ * @error: return location for a #GError, or %NULL
+ *
+ * Connects the greeter to the display manager.  Will block until connected.
+ *
+ * Return value: #TRUE if successfully connected
+ *
+ * Deprecated: 1.11.1: Use lightdm_greeter_connect_to_daemon_sync() instead
+ **/
+gboolean
+lightdm_greeter_connect_sync (LightDMGreeter *greeter, GError **error)
+{
+    return lightdm_greeter_connect_to_daemon_sync (greeter, error);
+}
+
 /**
  * lightdm_greeter_get_hint:
  * @greeter: A #LightDMGreeter

diff --git a/liblightdm-gobject/liblightdm-gobject-1.vapi b/liblightdm-gobject/liblightdm-gobject-1.vapi
index 26f1205d0c784368571933e62da866c8a964f903..ed286012ddb41ba789647e867e947dbe441ae8e5 100644 (file)
--- a/liblightdm-gobject/liblightdm-gobject-1.vapi
+++ b/liblightdm-gobject/liblightdm-gobject-1.vapi
@@ -24,8 +24,8 @@ namespace LightDM {
         public signal void authentication_complete ();
         public signal void autologin_timer_expired ();
 
-        public async bool connect_sync () throws GLib.Error;
-        public bool connect_sync () throws GLib.Error;
+        public async bool connect_to_daemon () throws GLib.Error;
+        public bool connect_to_daemon_sync () throws GLib.Error;
         public unowned string get_hint (string name);
         public unowned string default_session_hint { get; }
         public bool hide_users_hint { get; }

diff --git a/liblightdm-gobject/lightdm/greeter.h b/liblightdm-gobject/lightdm/greeter.h
index dde714257d16436e7cddd1c7e48c2245efa92092..68a81b54ab68e7e1dc2724e84ca7f34a26822244 100644 (file)
--- a/liblightdm-gobject/lightdm/greeter.h
+++ b/liblightdm-gobject/lightdm/greeter.h
@@ -74,9 +74,11 @@ LightDMGreeter *lightdm_greeter_new (void);
 
 void lightdm_greeter_set_resettable (LightDMGreeter *greeter, gboolean resettable);
 
-void lightdm_greeter_connect (LightDMGreeter *greeter, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data);
+void lightdm_greeter_connect_to_daemon (LightDMGreeter *greeter, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data);
 
-gboolean lightdm_greeter_connect_finish (LightDMGreeter *greeter, GAsyncResult *result, GError **error);
+gboolean lightdm_greeter_connect_to_daemon_finish (LightDMGreeter *greeter, GAsyncResult *result, GError **error);
+
+gboolean lightdm_greeter_connect_to_daemon_sync (LightDMGreeter *greeter, GError **error);
 
 gboolean lightdm_greeter_connect_sync (LightDMGreeter *greeter, GError **error);
 

diff --git a/liblightdm-qt/QLightDM/greeter.h b/liblightdm-qt/QLightDM/greeter.h
index 8abf5e9260ba686ca4cc4c0ae4335cdfc94384af..91a2a0598e9a436e67c55cef9d1527123103ee1a 100644 (file)
--- 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 406a6321b02c7f12921fdcc6feb8fe3c2115fd56..5a52618e71b45c9dd01e121e8b2da5a9820a333a 100644 (file)
--- 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)

diff --git a/tests/src/test-gobject-greeter.c b/tests/src/test-gobject-greeter.c
index 9b0c43a1b586228418f9c488fe82a73a3e490ee5..16a2e2a0582775552b248beaf2d9d5663342f1f5 100644 (file)
--- a/tests/src/test-gobject-greeter.c
+++ b/tests/src/test-gobject-greeter.c
@@ -374,7 +374,7 @@ connect_finished (GObject *object, GAsyncResult *result, gpointer data)
     LightDMGreeter *greeter = LIGHTDM_GREETER (object);
     GError *error = NULL;
 
-    if (!lightdm_greeter_connect_finish (greeter, result, &error))
+    if (!lightdm_greeter_connect_to_daemon_finish (greeter, result, &error))
     {
         status_notify ("%s FAIL-CONNECT-DAEMON", greeter_id);
         exit_code = EXIT_FAILURE;
@@ -481,7 +481,7 @@ main (int argc, char **argv)
     }
 
     status_notify ("%s CONNECT-TO-DAEMON", greeter_id);
-    lightdm_greeter_connect (greeter, NULL, connect_finished, NULL);
+    lightdm_greeter_connect_to_daemon (greeter, NULL, connect_finished, NULL);
 
     g_main_loop_run (loop);
 

diff --git a/tests/src/test-mir-greeter.c b/tests/src/test-mir-greeter.c
index d32028e2968f23927d443623310ad7062f2f30a8..e005480839926cc4f445e127508f3bbe98bfdf03 100644 (file)
--- a/tests/src/test-mir-greeter.c
+++ b/tests/src/test-mir-greeter.c
@@ -109,7 +109,7 @@ main (int argc, char **argv)
     g_signal_connect (greeter, "authentication-complete", G_CALLBACK (authentication_complete_cb), NULL);
 
     status_notify ("%s CONNECT-TO-DAEMON", greeter_id);
-    if (!lightdm_greeter_connect_sync (greeter, NULL))
+    if (!lightdm_greeter_connect_to_daemon_sync (greeter, NULL))
     {
         status_notify ("%s FAIL-CONNECT-DAEMON", greeter_id);
         return EXIT_FAILURE;

diff --git a/tests/src/test-python-greeter b/tests/src/test-python-greeter
index 2c06e734623f837ce5ce796c01094c4839d816a6..6fb216ef7f8d44cc92bacf69879c2dacd21ffb6b 100755 (executable)
--- a/tests/src/test-python-greeter
+++ b/tests/src/test-python-greeter
@@ -280,7 +280,7 @@ if log_user_changes:
     LightDM.UserList.get_instance ().connect ('user-removed', user_removed_cb)
 
 status_notify ('%s CONNECT-TO-DAEMON' % greeter_id)
-if not greeter.connect_sync ():
+if not greeter.connect_to_daemon_sync ():
     status_notify ('%s FAIL-CONNECT-DAEMON' % greeter_id)
     exit (1)