Modified webpage: now tinymail repository is in gitorious.

[modest] / src / widgets / modest-validating-entry.c

diff --git a/src/widgets/modest-validating-entry.c b/src/widgets/modest-validating-entry.c
index 22c6c56..24cca53 100644 (file)
--- 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,10 +36,6 @@
 #include <config.h>
 #endif
 
-#ifndef MODEST_TOOLKIT_HILDON2
-#define USE_GTK_ENTRY
-#endif
-
 #ifdef USE_GTK_ENTRY
 G_DEFINE_TYPE (ModestValidatingEntry, modest_validating_entry, GTK_TYPE_ENTRY);
 #else
@@ -213,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");
        }
 
 } 
@@ -240,7 +233,7 @@ modest_validating_entry_new (void)
        
        entry = g_object_new (MODEST_TYPE_VALIDATING_ENTRY, NULL);
 
-#ifndef MODEST_TOOLKIT_HILDON2
+#ifdef MODEST_TOOLKIT_HILDON2
        hildon_gtk_widget_set_theme_size (GTK_WIDGET (entry), MODEST_EDITABLE_SIZE);
 #endif