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 0d563b47b0fc982f2761f5e54f3cdf93df12425e..6c3f83bcd89811a69b159b1253d30fcdf26cdef6 100644 (file)
--- a/liblightdm-gobject/lightdm/language.h
+++ b/liblightdm-gobject/lightdm/language.h
@@ -1,50 +1,67 @@
 /*
  * 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 _LDM_LANGUAGE_H_
-#define _LDM_LANGUAGE_H_
+#ifndef LIGHTDM_LANGUAGE_H_
+#define LIGHTDM_LANGUAGE_H_
 
 #include <glib-object.h>
 
 G_BEGIN_DECLS
 
-#define LDM_TYPE_LANGUAGE            (ldm_language_get_type())
-#define LDM_LANGUAGE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), LDM_TYPE_LANGUAGE, LdmLanguage));
-#define LDM_LANGUAGE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), LDM_TYPE_LANGUAGE, LdmLanguageClass))
-#define LDM_IS_LANGUAGE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), LDM_TYPE_LANGUAGE))
-#define LDM_IS_LANGUAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), LDM_TYPE_LANGUAGE))
-#define LDM_LANGUAGE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), LDM_TYPE_LANGUAGE, LdmLanguageClass))
+#define LIGHTDM_TYPE_LANGUAGE            (lightdm_language_get_type())
+#define LIGHTDM_LANGUAGE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), LIGHTDM_TYPE_LANGUAGE, LightDMLanguage));
+#define LIGHTDM_LANGUAGE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), LIGHTDM_TYPE_LANGUAGE, LightDMLanguageClass))
+#define LIGHTDM_IS_LANGUAGE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), LIGHTDM_TYPE_LANGUAGE))
+#define LIGHTDM_IS_LANGUAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), LIGHTDM_TYPE_LANGUAGE))
+#define LIGHTDM_LANGUAGE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), LIGHTDM_TYPE_LANGUAGE, LightDMLanguageClass))
 
 typedef struct
 {
     GObject parent_instance;
-} LdmLanguage;
+} LightDMLanguage;
 
 typedef struct
 {
     GObjectClass parent_class;
-} LdmLanguageClass;
 
-GType ldm_language_get_type (void);
+    /* Reserved */
+    void (*reserved1) (void);
+    void (*reserved2) (void);
+    void (*reserved3) (void);
+    void (*reserved4) (void);
+    void (*reserved5) (void);
+    void (*reserved6) (void);
+} LightDMLanguageClass;
 
-LdmLanguage *ldm_language_new (const gchar *code);
+#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);
+
+LightDMLanguage *lightdm_get_language (void);
 
-const gchar *ldm_language_get_code (LdmLanguage *language);
+const gchar *lightdm_language_get_code (LightDMLanguage *language);
 
-const gchar *ldm_language_get_name (LdmLanguage *language);
+const gchar *lightdm_language_get_name (LightDMLanguage *language);
 
-const gchar *ldm_language_get_territory (LdmLanguage *language);
+const gchar *lightdm_language_get_territory (LightDMLanguage *language);
 
-gboolean ldm_language_matches (LdmLanguage *language, const gchar *code);
+gboolean lightdm_language_matches (LightDMLanguage *language, const gchar *code);
 
 G_END_DECLS
 
-#endif /* _LDM_LANGUAGE_H_ */
+#endif /* LIGHTDM_LANGUAGE_H_ */