X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fwidgets%2Fmodest-validating-entry.c;h=24cca531f59a651e4203dcf52217b8241e2eef40;hp=1515f7f75e45cb4c7ee0f199796856d633eab124;hb=HEAD;hpb=3d57d7b35bab2209eac6847e43821388f8697da8

diff --git a/src/widgets/modest-validating-entry.c b/src/widgets/modest-validating-entry.c
index 1515f7f..24cca53 100644
--- a/src/widgets/modest-validating-entry.c
+++ b/src/widgets/modest-validating-entry.c
@@ -29,7 +29,6 @@
 
 #include "modest-validating-entry.h"
 #include <modest-ui-constants.h>
-#include <gtk/gtksignal.h> /* For the gtk_signal_stop_emit_by_name() convenience function. */
 #include <string.h> /* For strlen(). */
 
 /* Include config.h so that _() works: */
@@ -37,11 +36,10 @@
 #include <config.h>
 #endif
 
-
-#ifdef MODEST_TOOLKIT_HILDON2
-G_DEFINE_TYPE (ModestValidatingEntry, modest_validating_entry, HILDON_TYPE_ENTRY);
-#else
+#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) \
@@ -210,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");
 	}
 
 }