* Changes in the autotools stuff affecting a lot of platform dependent

[modest] / src / maemo / easysetup / modest-easysetup-country-combo-box.h

diff --git a/src/maemo/easysetup/modest-easysetup-country-combo-box.h b/src/maemo/easysetup/modest-easysetup-country-combo-box.h
index 410e638..56f1741 100644 (file)
--- a/src/maemo/easysetup/modest-easysetup-country-combo-box.h
+++ b/src/maemo/easysetup/modest-easysetup-country-combo-box.h
@@ -1,37 +1,66 @@
-/* Copyright (c) 2007, Nokia Corporation
+/* Copyright (c) 2006, Nokia Corporation
  * All rights reserved.
  *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * * Neither the name of the Nokia Corporation nor the names of its
+ *   contributors may be used to endorse or promote products derived from
+ *   this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
+ * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _EASYSETUP_COUNTRY_COMBO_BOX
-#define _EASYSETUP_COUNTRY_COMBO_BOX
+#ifndef _MODEST_EASYSETUP_COUNTRY_COMBO_BOX
+#define _MODEST_EASYSETUP_COUNTRY_COMBO_BOX
 
+#if MODEST_HILDON_API < 2
 #include <gtk/gtkcombobox.h>
+#else
+#include <hildon/hildon-picker-button.h>
+#endif
 
 G_BEGIN_DECLS
 
-#define EASYSETUP_TYPE_COUNTRY_COMBO_BOX easysetup_country_combo_box_get_type()
+#define MODEST_EASYSETUP_TYPE_COUNTRY_COMBO_BOX easysetup_country_combo_box_get_type()
 
-#define EASYSETUP_COUNTRY_COMBO_BOX(obj) \
+#define MODEST_EASYSETUP_COUNTRY_COMBO_BOX(obj) \
        (G_TYPE_CHECK_INSTANCE_CAST ((obj), \
-       EASYSETUP_TYPE_COUNTRY_COMBO_BOX, EasysetupCountryComboBox))
+       MODEST_EASYSETUP_TYPE_COUNTRY_COMBO_BOX, EasysetupCountryComboBox))
 
-#define EASYSETUP_COUNTRY_COMBO_BOX_CLASS(klass) \
+#define MODEST_EASYSETUP_COUNTRY_COMBO_BOX_CLASS(klass) \
        (G_TYPE_CHECK_CLASS_CAST ((klass), \
-       EASYSETUP_TYPE_COUNTRY_COMBO_BOX, EasysetupCountryComboBoxClass))
+       MODEST_EASYSETUP_TYPE_COUNTRY_COMBO_BOX, EasysetupCountryComboBoxClass))
 
-#define EASYSETUP_IS_COUNTRY_COMBO_BOX(obj) \
+#define MODEST_EASYSETUP_IS_COUNTRY_COMBO_BOX(obj) \
        (G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
-       EASYSETUP_TYPE_COUNTRY_COMBO_BOX))
+       MODEST_EASYSETUP_TYPE_COUNTRY_COMBO_BOX))
 
-#define EASYSETUP_IS_COUNTRY_COMBO_BOX_CLASS(klass) \
+#define MODEST_EASYSETUP_IS_COUNTRY_COMBO_BOX_CLASS(klass) \
        (G_TYPE_CHECK_CLASS_TYPE ((klass), \
-       EASYSETUP_TYPE_COUNTRY_COMBO_BOX))
+       MODEST_EASYSETUP_TYPE_COUNTRY_COMBO_BOX))
 
-#define EASYSETUP_COUNTRY_COMBO_BOX_GET_CLASS(obj) \
+#define MODEST_EASYSETUP_COUNTRY_COMBO_BOX_GET_CLASS(obj) \
        (G_TYPE_INSTANCE_GET_CLASS ((obj), \
-       EASYSETUP_TYPE_COUNTRY_COMBO_BOX, EasysetupCountryComboBoxClass))
+       MODEST_EASYSETUP_TYPE_COUNTRY_COMBO_BOX, EasysetupCountryComboBoxClass))
 
+#if MODEST_HILDON_API < 2
 typedef struct {
        GtkComboBox parent;
 } EasysetupCountryComboBox;
@@ -39,14 +68,26 @@ typedef struct {
 typedef struct {
        GtkComboBoxClass parent_class;
 } EasysetupCountryComboBoxClass;
+#else
+typedef struct {
+       HildonPickerButton parent;
+} EasysetupCountryComboBox;
 
+typedef struct {
+       HildonPickerButtonClass parent_class;
+} EasysetupCountryComboBoxClass;
+#endif
 GType easysetup_country_combo_box_get_type (void);
 
 EasysetupCountryComboBox* easysetup_country_combo_box_new (void);
 
-guint easysetup_country_combo_box_get_active_country_id (EasysetupCountryComboBox *self);
-gboolean easysetup_country_combo_box_set_active_country_id (EasysetupCountryComboBox *self, guint mcc_id);
+void easysetup_country_combo_box_load_data(EasysetupCountryComboBox *self);
+
+gint easysetup_country_combo_box_get_active_country_mcc (EasysetupCountryComboBox *self);
+
+
+gboolean easysetup_country_combo_box_set_active_country_locale (EasysetupCountryComboBox *self);
 
 G_END_DECLS
 
-#endif /* _EASYSETUP_COUNTRY_COMBO_BOX */
+#endif /* _MODEST_EASYSETUP_COUNTRY_COMBO_BOX */