Revert r2392 - it seems to have broken ABI in liblightdm-gobject

[sojka/lightdm.git] / liblightdm-gobject / lightdm / greeter.h

diff --git a/liblightdm-gobject/lightdm/greeter.h b/liblightdm-gobject/lightdm/greeter.h
index ae7dba3da5763f1c38bf9ef3a03718075df0071f..047708ed038d525b45b7e0f3a915a3dc863823c7 100644 (file)
--- a/liblightdm-gobject/lightdm/greeter.h
+++ b/liblightdm-gobject/lightdm/greeter.h
@@ -16,9 +16,12 @@
 
 G_BEGIN_DECLS
 
-#define LIGHTDM_TYPE_GREETER (lightdm_greeter_get_type())
-
-G_DECLARE_DERIVABLE_TYPE (LightDMGreeter, lightdm_greeter, LIGHTDM, GREETER, GObject)
+#define LIGHTDM_TYPE_GREETER            (lightdm_greeter_get_type())
+#define LIGHTDM_GREETER(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), LIGHTDM_TYPE_GREETER, LightDMGreeter))
+#define LIGHTDM_GREETER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), LIGHTDM_TYPE_GREETER, LightDMGreeterClass))
+#define LIGHTDM_IS_GREETER(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), LIGHTDM_TYPE_GREETER))
+#define LIGHTDM_IS_GREETER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), LIGHTDM_TYPE_GREETER))
+#define LIGHTDM_GREETER_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), LIGHTDM_TYPE_GREETER, LightDMGreeterClass))
 
 #define LIGHTDM_GREETER_ERROR lightdm_greeter_error_quark ()
 
@@ -55,7 +58,12 @@ typedef enum
 
 GType lightdm_message_type_get_type (void);
 
-struct _LightDMGreeterClass
+typedef struct
+{
+    GObject parent_instance;
+} LightDMGreeter;
+
+typedef struct
 {
     GObjectClass parent_class;
 
@@ -71,31 +79,41 @@ struct _LightDMGreeterClass
     void (*reserved2) (void);
     void (*reserved3) (void);
     void (*reserved4) (void);
-};
+} LightDMGreeterClass;
+
+#ifdef GLIB_VERSION_2_44
+typedef LightDMGreeter *LightDMGreeter_autoptr;
+static inline void glib_autoptr_cleanup_LightDMGreeter (LightDMGreeter **_ptr)
+{
+    glib_autoptr_cleanup_GObject ((GObject **) _ptr);
+}
+#endif
 
 /**
  * LightDMGreeterError:
- * @LIGHTDM_GREETER_ERROR_COMMUNICATION_ERROR: Error communicating with daemon
- * @LIGHTDM_GREETER_ERROR_CONNECTION_FAILED: Failed to connect to the daemon
- * @LIGHTDM_GREETER_ERROR_SESSION_FAILED: Requested session failed to start
- * @LIGHTDM_GREETER_ERROR_NO_AUTOLOGIN: Autologin not configured
- * @LIGHTDM_GREETER_ERROR_INVALID_USER: Autologin not configured
+ * @LIGHTDM_GREETER_ERROR_COMMUNICATION_ERROR: error communicating with daemon.
+ * @LIGHTDM_GREETER_ERROR_CONNECTION_FAILED: failed to connect to the daemon.
+ * @LIGHTDM_GREETER_ERROR_SESSION_FAILED: requested session failed to start.
+ * @LIGHTDM_GREETER_ERROR_NO_AUTOLOGIN: autologin not configured.
+ * @LIGHTDM_GREETER_ERROR_INVALID_USER: autologin not configured.
  *
  * Error codes returned by greeter operations.
  */
 typedef enum
 {
-  LIGHTDM_GREETER_ERROR_COMMUNICATION_ERROR,
-  LIGHTDM_GREETER_ERROR_CONNECTION_FAILED,
-  LIGHTDM_GREETER_ERROR_SESSION_FAILED,
-  LIGHTDM_GREETER_ERROR_NO_AUTOLOGIN,
-  LIGHTDM_GREETER_ERROR_INVALID_USER
+    LIGHTDM_GREETER_ERROR_COMMUNICATION_ERROR,
+    LIGHTDM_GREETER_ERROR_CONNECTION_FAILED,
+    LIGHTDM_GREETER_ERROR_SESSION_FAILED,
+    LIGHTDM_GREETER_ERROR_NO_AUTOLOGIN,
+    LIGHTDM_GREETER_ERROR_INVALID_USER
 } LightDMGreeterError;
 
 GQuark lightdm_greeter_error_quark (void);
 
 GType lightdm_greeter_error_get_type (void);
 
+GType lightdm_greeter_get_type (void);
+
 LightDMGreeter *lightdm_greeter_new (void);
 
 void lightdm_greeter_set_resettable (LightDMGreeter *greeter, gboolean resettable);