X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fwidgets%2Fmodest-validating-entry.h;h=7fb0a41f61b4edbae12fdb7df435571dcbfb2a81;hb=f0d738c2f55101eca82723d61289d2eb9c3b67fa;hp=3571ac43d56aeee793f76dd4e5c8f1f9f73dab00;hpb=cdc0247db5d354177cf8d230a891b58fde2af99e;p=modest

diff --git a/src/widgets/modest-validating-entry.h b/src/widgets/modest-validating-entry.h
index 3571ac4..7fb0a41 100644
--- a/src/widgets/modest-validating-entry.h
+++ b/src/widgets/modest-validating-entry.h
@@ -1,12 +1,44 @@
 /* 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
 
-#include <gtk/gtkentry.h>
+#ifndef MODEST_TOOLKIT_HILDON2
+#define USE_GTK_ENTRY
+#endif
+
+#ifndef USE_GTK_ENTRY
+#include <hildon/hildon-entry.h>
+#else
+#include <gtk/gtk.h>
+#endif
 
 G_BEGIN_DECLS
 
@@ -33,11 +65,19 @@ G_BEGIN_DECLS
 	MODEST_TYPE_VALIDATING_ENTRY, ModestValidatingEntryClass))
 
 typedef struct {
+#ifndef USE_GTK_ENTRY
+	HildonEntry parent;
+#else
 	GtkEntry parent;
+#endif
 } ModestValidatingEntry;
 
 typedef struct {
+#ifndef USE_GTK_ENTRY
+	HildonEntryClass parent_class;
+#else
 	GtkEntryClass parent_class;
+#endif
 } ModestValidatingEntryClass;
 
 GType modest_validating_entry_get_type (void);
@@ -46,11 +86,10 @@ ModestValidatingEntry* modest_validating_entry_new (void);
 
 void modest_validating_entry_set_unallowed_characters (ModestValidatingEntry *self, GList *list);
 void modest_validating_entry_set_unallowed_characters_whitespace (ModestValidatingEntry *self);
+
 typedef void (* EasySetupValidatingEntryFunc) (ModestValidatingEntry *self, const gchar* character, gpointer user_data);
 void modest_validating_entry_set_func (ModestValidatingEntry *self, EasySetupValidatingEntryFunc func, gpointer user_data);
 
-
-
 typedef void (* EasySetupValidatingEntryMaxFunc) (ModestValidatingEntry *self, gpointer user_data);
 void modest_validating_entry_set_max_func (ModestValidatingEntry *self, EasySetupValidatingEntryMaxFunc func, gpointer user_data);