Proper insertion of resolved addresses in recpt editor

[modest] / src / hildon2 / modest-number-editor.c

diff --git a/src/hildon2/modest-number-editor.c b/src/hildon2/modest-number-editor.c
index c8ea2db..027a894 100644 (file)
--- a/src/hildon2/modest-number-editor.c
+++ b/src/hildon2/modest-number-editor.c
@@ -191,7 +191,7 @@ modest_number_editor_class_init                 (ModestNumberEditorClass *editor
         g_signal_new ("valid_changed", MODEST_TYPE_NUMBER_EDITOR,
                 G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET
                 (ModestNumberEditorClass, valid_changed),
-                g_signal_accumulator_true_handled, NULL,
+                NULL, NULL,
                 g_cclosure_marshal_VOID__BOOLEAN,
                 G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
 }
@@ -356,8 +356,8 @@ modest_number_editor_validate_value             (ModestNumberEditor *editor,
        }
 
        if (priv->is_valid != is_valid) {
-               g_signal_emit (editor, ModestNumberEditor_signal[VALID_CHANGED], 0, is_valid);
                priv->is_valid = is_valid;
+               g_signal_emit (editor, ModestNumberEditor_signal[VALID_CHANGED], 0, is_valid);
        }
 }
 
@@ -375,10 +375,15 @@ modest_number_editor_entry_focusout             (GtkWidget *widget,
                                                  GdkEventFocus *event,
                                                  gpointer data)
 {
-    g_assert (MODEST_IS_NUMBER_EDITOR(data));
+       GtkWidget *window;
+       
+       g_assert (MODEST_IS_NUMBER_EDITOR(data));
 
-    modest_number_editor_validate_value (MODEST_NUMBER_EDITOR(data), FALSE);
-    return FALSE;
+       window = gtk_widget_get_toplevel (widget);
+       if (window && gtk_window_has_toplevel_focus (GTK_WINDOW (window)))
+               modest_number_editor_validate_value (MODEST_NUMBER_EDITOR(data), FALSE);
+
+       return FALSE;
 }
 
 static gboolean
@@ -483,6 +488,26 @@ modest_number_editor_set_range                  (ModestNumberEditor *editor,
 }
 
 /**
+ * modest_number_editor_is_valid:
+ * @editor: pointer to #ModestNumberEditor
+ *
+ * Returns: if @editor contents are valid
+ */
+gboolean
+modest_number_editor_is_valid                  (ModestNumberEditor *editor)
+{
+    ModestNumberEditorPrivate *priv;
+
+    g_return_val_if_fail (MODEST_IS_NUMBER_EDITOR (editor), FALSE);
+
+    priv = MODEST_NUMBER_EDITOR_GET_PRIVATE (editor);
+    g_assert (priv);
+
+    return priv->is_valid;
+
+}
+
+/**
  * modest_number_editor_get_value:
  * @editor: pointer to #ModestNumberEditor
  *