More migrations to number editor in hildon 2.2

pmo-drop-split-view-r6914

diff --git a/src/hildon2/modest-connection-specific-smtp-edit-window.c b/src/hildon2/modest-connection-specific-smtp-edit-window.c
index cfbdea1..d2c0f4e 100644 (file)
--- a/src/hildon2/modest-connection-specific-smtp-edit-window.c
+++ b/src/hildon2/modest-connection-specific-smtp-edit-window.c
@@ -160,7 +160,7 @@ on_value_changed(GtkWidget* widget, GValue* value, ModestConnectionSpecificSmtpE
 }
 
 static gboolean
-on_range_error (GtkWidget *widget, HildonNumberEditorErrorType type, gpointer user_data)
+on_range_error (GtkWidget *widget, ModestNumberEditorErrorType type, gpointer user_data)
 {
        gchar *msg;
        ModestConnectionSpecificSmtpEditWindow *self = user_data;
@@ -172,9 +172,9 @@ on_range_error (GtkWidget *widget, HildonNumberEditorErrorType type, gpointer us
         * remember that such an error occured. */
        priv->range_error_occured = TRUE;
 
-       if (type == HILDON_NUMBER_EDITOR_ERROR_MAXIMUM_VALUE_EXCEED) {
+       if (type == MODEST_NUMBER_EDITOR_ERROR_MAXIMUM_VALUE_EXCEED) {
                msg = g_strdup_printf (dgettext ("hildon-libs", "ckct_ib_maximum_value"), 65535);
-       } else if (type == HILDON_NUMBER_EDITOR_ERROR_MINIMUM_VALUE_EXCEED) {
+       } else if (type == MODEST_NUMBER_EDITOR_ERROR_MINIMUM_VALUE_EXCEED) {
                msg = g_strdup_printf (dgettext ("hildon-libs", "ckct_ib_minimum_value"), 1);
        } else {
                msg = g_strdup_printf (_HL("ckct_ib_set_a_value_within_range"), PORT_RANGE_MIN, PORT_RANGE_MAX);
@@ -264,8 +264,8 @@ security_picker_set_port (ModestConnectionSpecificSmtpEditWindowPrivate *priv)
                        MODEST_SERVERSECURITY_PICKER (priv->outgoing_security_picker));
 
        if(port_number != 0) {
-               hildon_number_editor_set_value (
-                       HILDON_NUMBER_EDITOR (priv->entry_port), port_number);
+               modest_number_editor_set_value (
+                       MODEST_NUMBER_EDITOR (priv->entry_port), port_number);
        }
 }
 
@@ -417,7 +417,7 @@ modest_connection_specific_smtp_edit_window_init (ModestConnectionSpecificSmtpEd
        
        /* The port number widgets: */
        if (!priv->entry_port)
-               priv->entry_port = GTK_WIDGET (hildon_number_editor_new (PORT_RANGE_MIN, PORT_RANGE_MAX));
+               priv->entry_port = GTK_WIDGET (modest_number_editor_new (PORT_RANGE_MIN, PORT_RANGE_MAX));
        captioned = modest_maemo_utils_create_captioned (title_sizegroup, value_sizegroup,
                                                         _("mcen_fi_emailsetup_port"), priv->entry_port);
        gtk_widget_add_events(GTK_WIDGET(priv->entry_port), GDK_FOCUS_CHANGE_MASK);
@@ -521,8 +521,8 @@ modest_connection_specific_smtp_edit_window_set_connection (
                modest_server_account_settings_get_auth_protocol (server_settings));
                
                /* port: */
-               hildon_number_editor_set_value (
-                       HILDON_NUMBER_EDITOR (priv->entry_port), 
+               modest_number_editor_set_value (
+                       MODEST_NUMBER_EDITOR (priv->entry_port), 
                        modest_server_account_settings_get_port (server_settings));
                
                
@@ -569,7 +569,7 @@ modest_connection_specific_smtp_edit_window_get_settings (ModestConnectionSpecif
        
        /* port: */
        modest_server_account_settings_set_port (server_settings,
-                                                hildon_number_editor_get_value (HILDON_NUMBER_EDITOR (priv->entry_port)));
+                                                modest_number_editor_get_value (MODEST_NUMBER_EDITOR (priv->entry_port)));
                        
        return server_settings;
 }

diff --git a/src/hildon2/modest-maemo-security-options-view.c b/src/hildon2/modest-maemo-security-options-view.c
index 86c3bdc..7ef6dfb 100644 (file)
--- a/src/hildon2/modest-maemo-security-options-view.c
+++ b/src/hildon2/modest-maemo-security-options-view.c
@@ -38,7 +38,7 @@
 #include "modest-serversecurity-picker.h"
 #include "modest-secureauth-picker.h"
 #include "modest-maemo-utils.h"
-#include <hildon/hildon-number-editor.h>
+#include <modest-number-editor.h>
 #include <hildon/hildon-check-button.h>
 #include "modest-hildon-includes.h"
 
@@ -89,7 +89,7 @@ on_security_changed (GtkWidget *widget,
                        modest_serversecurity_picker_get_active_serversecurity_port (MODEST_SERVERSECURITY_PICKER (ppriv->security_view));
                
                if(port_number) {
-                       hildon_number_editor_set_value (HILDON_NUMBER_EDITOR (ppriv->port_view), 
+                       modest_number_editor_set_value (MODEST_NUMBER_EDITOR (ppriv->port_view), 
                                                        port_number);
                }
        }
@@ -147,7 +147,7 @@ create_incoming_security (ModestSecurityOptionsView* self,
                                               ppriv->security_view);
 
        if (ppriv->full) {              
-               ppriv->port_view = GTK_WIDGET (hildon_number_editor_new (PORT_MIN, PORT_MAX));
+               ppriv->port_view = GTK_WIDGET (modest_number_editor_new (PORT_MIN, PORT_MAX));
                entry_caption = modest_maemo_utils_create_captioned (title_size_group,
                                                                     value_size_group,
                                                                     _("mcen_fi_emailsetup_port"), 
@@ -294,7 +294,7 @@ create_outgoing_security (ModestSecurityOptionsView* self,
                                                                   _("mail_fi_password"), 
                                                                   ppriv->pwd_entry);
 
-               ppriv->port_view = GTK_WIDGET (hildon_number_editor_new (PORT_MIN, PORT_MAX));
+               ppriv->port_view = GTK_WIDGET (modest_number_editor_new (PORT_MIN, PORT_MAX));
                port_caption = modest_maemo_utils_create_captioned (title_size_group,
                                                                    value_size_group,
                                                                    _("mcen_fi_emailsetup_port"), 
@@ -391,7 +391,7 @@ modest_maemo_security_options_view_load_settings (ModestSecurityOptionsView* sel
        } else if (ppriv->full) {
                /* Keep the user-entered port-number, or the
                 * already-appropriate automatic port number */
-               hildon_number_editor_set_value (HILDON_NUMBER_EDITOR (ppriv->port_view), 
+               modest_number_editor_set_value (MODEST_NUMBER_EDITOR (ppriv->port_view), 
                                                port_number);
        }
        /* Frees */
@@ -414,7 +414,7 @@ modest_maemo_security_options_view_save_settings (ModestSecurityOptionsView* sel
                server_settings = modest_account_settings_get_transport_settings (settings);
 
        if (ppriv->full) {
-               server_port = hildon_number_editor_get_value (HILDON_NUMBER_EDITOR (ppriv->port_view));
+               server_port = modest_number_editor_get_value (MODEST_NUMBER_EDITOR (ppriv->port_view));
        } else {
                server_port = modest_serversecurity_picker_get_active_serversecurity_port (MODEST_SERVERSECURITY_PICKER (ppriv->security_view));
        }
@@ -445,7 +445,7 @@ modest_maemo_security_options_view_changed (ModestSecurityOptionsView* self,
                server_settings = modest_account_settings_get_transport_settings (settings);
        
        server_port = 
-               hildon_number_editor_get_value (HILDON_NUMBER_EDITOR (ppriv->port_view));
+               modest_number_editor_get_value (MODEST_NUMBER_EDITOR (ppriv->port_view));
 
        /* Frees */
        g_object_unref (server_settings);