X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fwidgets%2Fmodest-validating-entry.c;h=24cca531f59a651e4203dcf52217b8241e2eef40;hb=ebc09089cbbe14c4418b9da613710d58b072f4c6;hp=08994c3438e2b061a75ae3ce0fbdb7174527c7a2;hpb=cdc0247db5d354177cf8d230a891b58fde2af99e;p=modest

diff --git a/src/widgets/modest-validating-entry.c b/src/widgets/modest-validating-entry.c
index 08994c3..24cca53 100644
--- a/src/widgets/modest-validating-entry.c
+++ b/src/widgets/modest-validating-entry.c
@@ -1,10 +1,34 @@
 /* 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.
  */
 
 #include "modest-validating-entry.h"
-#include <gtk/gtksignal.h> /* For the gtk_signal_stop_emit_by_name() convenience function. */
+#include <modest-ui-constants.h>
 #include <string.h> /* For strlen(). */
 
 /* Include config.h so that _() works: */
@@ -12,7 +36,11 @@
 #include <config.h>
 #endif
 
+#ifdef USE_GTK_ENTRY
 G_DEFINE_TYPE (ModestValidatingEntry, modest_validating_entry, GTK_TYPE_ENTRY);
+#else
+G_DEFINE_TYPE (ModestValidatingEntry, modest_validating_entry, HILDON_TYPE_ENTRY);
+#endif
 
 #define VALIDATING_ENTRY_GET_PRIVATE(o) \
 	(G_TYPE_INSTANCE_GET_PRIVATE ((o), MODEST_TYPE_VALIDATING_ENTRY, ModestValidatingEntryPrivate))
@@ -180,12 +208,10 @@ on_insert_text(GtkEditable *editable,
 	}
 	
 	if(!allow) {
-		/* The signal documentation says 
-		 * "by connecting to this signal and then stopping the signal with 
-		 * gtk_signal_emit_stop(), it is possible to modify the inserted text, 
-		 * or prevent it from being inserted entirely."
-		 */
-		 gtk_signal_emit_stop_by_name (GTK_OBJECT (self), "insert-text");
+		/* The signal documentation says: */
+		/*   "by connecting to this signal and then stopping the signal with */
+		/*   g_signal_stop_emission(), it is possible to modify the inserted text, */
+		g_signal_stop_emission_by_name (self, "insert-text");
 	}
 
 } 
@@ -203,7 +229,15 @@ modest_validating_entry_init (ModestValidatingEntry *self)
 ModestValidatingEntry*
 modest_validating_entry_new (void)
 {
-	return g_object_new (MODEST_TYPE_VALIDATING_ENTRY, NULL);
+	ModestValidatingEntry *entry;
+	
+	entry = g_object_new (MODEST_TYPE_VALIDATING_ENTRY, NULL);
+
+#ifdef MODEST_TOOLKIT_HILDON2
+	hildon_gtk_widget_set_theme_size (GTK_WIDGET (entry), MODEST_EDITABLE_SIZE);
+#endif
+
+	return entry;
 }
 
 /** Specify characters that may not be entered into this GtkEntry.