X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fwidgets%2Fmodest-validating-entry.h;h=bad8cc5c8848bcf6fe7e47d277566b20c3ce2477;hb=e92e65e9ee319e8fee212bab3b3089e63d252647;hp=956cf2aa1f75d105d3139ddcab14c581226596b9;hpb=0638f028b32698761d1e064ad0c0c5283dc4f8b9;p=modest

diff --git a/src/widgets/modest-validating-entry.h b/src/widgets/modest-validating-entry.h
index 956cf2a..bad8cc5 100644
--- a/src/widgets/modest-validating-entry.h
+++ b/src/widgets/modest-validating-entry.h
@@ -1,12 +1,40 @@
 /* Copyright (c) 2007, 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 _MODEST_VALIDATING_ENTRY
 #define _MODEST_VALIDATING_ENTRY
 
+#ifdef MODEST_TOOLKIT_HILDON2
+#include <hildon/hildon-entry.h>
+#else
 #include <gtk/gtkentry.h>
+#endif
 
 G_BEGIN_DECLS
 
@@ -33,11 +61,19 @@ G_BEGIN_DECLS
 	MODEST_TYPE_VALIDATING_ENTRY, ModestValidatingEntryClass))
 
 typedef struct {
+#ifdef MODEST_TOOLKIT_HILDON2
+	HildonEntry parent;
+#else
 	GtkEntry parent;
+#endif
 } ModestValidatingEntry;
 
 typedef struct {
+#ifdef MODEST_TOOLKIT_HILDON2
+	HildonEntryClass parent_class;
+#else
 	GtkEntryClass parent_class;
+#endif
 } ModestValidatingEntryClass;
 
 GType modest_validating_entry_get_type (void);