Rename ldm_greeter_connect to ldm_greeter_connect_to_server so it doesn't clash with...

diff --git a/NEWS b/NEWS
index 4fb83fa7179da32327de3d1236f06ef2ec5d0aa2..766c992efc17bb7468ce9fe0e8530c65f00d26ae 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -11,6 +11,8 @@ Overview of changes in lightdm 0.3.0
     * Use the engine process name instead of a hardcoded value in theme files
     * Rename gnome theme to example-gtk-gnome
     * Add basic QT engine and theme
+    * Rename ldm_greeter_connect to ldm_greeter_connect_to_server so it doesn't
+      clash with GObject method name
 
 Overview of changes in lightdm 0.2.3
 

diff --git a/doc/lightdm-gobject-0-sections.txt b/doc/lightdm-gobject-0-sections.txt
index 53a9feb8df8b07179c882a7993a993f7a90e4623..381b506d2e2921b02733fe90beda558ecce9ce0b 100644 (file)
--- a/doc/lightdm-gobject-0-sections.txt
+++ b/doc/lightdm-gobject-0-sections.txt
@@ -95,7 +95,7 @@ ldm_session_new
 <TITLE>LdmGreeter</TITLE>
 LdmGreeter
 ldm_greeter_new
-ldm_greeter_connect
+ldm_greeter_connect_to_server
 ldm_greeter_get_hostname
 ldm_greeter_get_theme
 ldm_greeter_get_string_property

diff --git a/doc/tmpl/greeter.sgml b/doc/tmpl/greeter.sgml
index b087cfba519a554f1df0879b5fa14c5304e53613..fc3a462c38433cbcd5e1c7a688aa8535b71fb911 100644 (file)
--- a/doc/tmpl/greeter.sgml
+++ b/doc/tmpl/greeter.sgml
@@ -207,7 +207,7 @@ g_object_connect (G_OBJECT (greeter), "quit", G_CALLBACK (quit_cb), NULL);
 @Returns: 
 
 
-<!-- ##### FUNCTION ldm_greeter_connect ##### -->
+<!-- ##### FUNCTION ldm_greeter_connect_to_server ##### -->
 <para>
 
 </para>

diff --git a/greeters/gtk/lightdm-gtk-greeter.c b/greeters/gtk/lightdm-gtk-greeter.c
index 7ab29210ddd5fef202cf83a82f3d31f3286f8469..859a05d825ccb654e1470849a8d6f982105ab7a7 100644 (file)
--- a/greeters/gtk/lightdm-gtk-greeter.c
+++ b/greeters/gtk/lightdm-gtk-greeter.c
@@ -727,7 +727,7 @@ main(int argc, char **argv)
     g_signal_connect (G_OBJECT (greeter), "authentication-complete", G_CALLBACK (authentication_complete_cb), NULL);
     g_signal_connect (G_OBJECT (greeter), "timed-login", G_CALLBACK (timed_login_cb), NULL);
     g_signal_connect (G_OBJECT (greeter), "quit", G_CALLBACK (quit_cb), NULL);
-    ldm_greeter_connect (greeter);
+    ldm_greeter_connect_to_server (greeter);
 
     gtk_init (&argc, &argv);
 

diff --git a/liblightdm-gobject/greeter.c b/liblightdm-gobject/greeter.c
index c181da777b8fbc20602606ebc28e5c01333839cf..cc2389e3f28a3d61da5d2171376b59c949b4b22b 100644 (file)
--- a/liblightdm-gobject/greeter.c
+++ b/liblightdm-gobject/greeter.c
@@ -342,7 +342,7 @@ from_server_cb (GIOChannel *source, GIOCondition condition, gpointer data)
 }
 
 /**
- * ldm_greeter_connect:
+ * ldm_greeter_connect_to_server:
  * @greeter: The greeter to connect
  *
  * Connects the greeter to the display manager.
@@ -350,7 +350,7 @@ from_server_cb (GIOChannel *source, GIOCondition condition, gpointer data)
  * Return value: TRUE if successfully connected
  **/
 gboolean
-ldm_greeter_connect (LdmGreeter *greeter)
+ldm_greeter_connect_to_server (LdmGreeter *greeter)
 {
     GError *error = NULL;
     const gchar *bus_address, *fd;

diff --git a/liblightdm-gobject/greeter.h b/liblightdm-gobject/greeter.h
index e5ff9e4f7590f3ea4b8e96d15da33cd7e78c9262..6a0aed51c362dfa2795e050b4ee0d60cab4cd7f6 100644 (file)
--- a/liblightdm-gobject/greeter.h
+++ b/liblightdm-gobject/greeter.h
@@ -55,7 +55,7 @@ GType ldm_greeter_get_type (void);
 
 LdmGreeter *ldm_greeter_new (void);
 
-gboolean ldm_greeter_connect (LdmGreeter *greeter);
+gboolean ldm_greeter_connect_to_server (LdmGreeter *greeter);
 
 const gchar *ldm_greeter_get_hostname (LdmGreeter *greeter);