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

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

diff --git a/liblightdm-gobject/lightdm/language.h b/liblightdm-gobject/lightdm/language.h
index 154a33824ba6ab42388472cb21b5d7ac1048cd0f..6c3f83bcd89811a69b159b1253d30fcdf26cdef6 100644 (file)
--- a/liblightdm-gobject/lightdm/language.h
+++ b/liblightdm-gobject/lightdm/language.h
@@ -1,16 +1,15 @@
 /*
  * Copyright (C) 2010 Robert Ancell.
  * Author: Robert Ancell <robert.ancell@canonical.com>
- * 
+ *
  * This library is free software; you can redistribute it and/or modify it under
  * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 3 of the License, or (at your option) any
- * later version. See http://www.gnu.org/copyleft/lgpl.html the full text of the
- * license.
+ * Software Foundation; either version 2 or version 3 of the License.
+ * See http://www.gnu.org/copyleft/lgpl.html the full text of the license.
  */
 
-#ifndef _LIGHTDM_LANGUAGE_H_
-#define _LIGHTDM_LANGUAGE_H_
+#ifndef LIGHTDM_LANGUAGE_H_
+#define LIGHTDM_LANGUAGE_H_
 
 #include <glib-object.h>
 
@@ -32,20 +31,28 @@ typedef struct
 {
     GObjectClass parent_class;
 
-       /* Reserved */
-       void (*reserved1) (void);
-       void (*reserved2) (void);
-       void (*reserved3) (void);
-       void (*reserved4) (void);
-       void (*reserved5) (void);
-       void (*reserved6) (void);
+    /* Reserved */
+    void (*reserved1) (void);
+    void (*reserved2) (void);
+    void (*reserved3) (void);
+    void (*reserved4) (void);
+    void (*reserved5) (void);
+    void (*reserved6) (void);
 } LightDMLanguageClass;
 
+#ifdef GLIB_VERSION_2_44
+typedef LightDMLanguage *LightDMLanguage_autoptr;
+static inline void glib_autoptr_cleanup_LightDMLanguage (LightDMLanguage **_ptr)
+{
+    glib_autoptr_cleanup_GObject ((GObject **) _ptr);
+}
+#endif
+
 GType lightdm_language_get_type (void);
 
 GList *lightdm_get_languages (void);
 
-const LightDMLanguage *lightdm_get_language (void);
+LightDMLanguage *lightdm_get_language (void);
 
 const gchar *lightdm_language_get_code (LightDMLanguage *language);
 
@@ -57,4 +64,4 @@ gboolean lightdm_language_matches (LightDMLanguage *language, const gchar *code)
 
 G_END_DECLS
 
-#endif /* _LIGHTDM_LANGUAGE_H_ */
+#endif /* LIGHTDM_LANGUAGE_H_ */