From 1caadea2e68b30a7fa72e74471137bf71c9d4881 Mon Sep 17 00:00:00 2001 From: Jose Dapena Paz Date: Wed, 17 Dec 2008 10:46:21 +0000 Subject: [PATCH] Migrate to HildonEntry in connection specific smtp edit window pmo-drop-split-view-r6898 --- .../modest-connection-specific-smtp-edit-window.c | 28 +++++++++++--------- src/widgets/modest-validating-entry.c | 10 ++++++- 2 files changed, 24 insertions(+), 14 deletions(-) diff --git a/src/hildon2/modest-connection-specific-smtp-edit-window.c b/src/hildon2/modest-connection-specific-smtp-edit-window.c index 786b31b..cfbdea1 100644 --- a/src/hildon2/modest-connection-specific-smtp-edit-window.c +++ b/src/hildon2/modest-connection-specific-smtp-edit-window.c @@ -36,6 +36,8 @@ #include "modest-secureauth-picker.h" #include "widgets/modest-validating-entry.h" #include +#include +#include #include #include #include @@ -207,7 +209,7 @@ on_response (GtkDialog *dialog, int response_id, gpointer user_data) ModestConnectionSpecificSmtpEditWindowPrivate *priv = CONNECTION_SPECIFIC_SMTP_EDIT_WINDOW_GET_PRIVATE (self); - hostname = gtk_entry_get_text (GTK_ENTRY (priv->entry_outgoingserver)); + hostname = hildon_entry_get_text (HILDON_ENTRY (priv->entry_outgoingserver)); /* Don't close the dialog if a range error occured */ if(response_id == GTK_RESPONSE_OK && priv->range_error_occured) @@ -338,7 +340,7 @@ modest_connection_specific_smtp_edit_window_init (ModestConnectionSpecificSmtpEd /* The outgoing server widgets: */ if (!priv->entry_outgoingserver) - priv->entry_outgoingserver = gtk_entry_new (); + priv->entry_outgoingserver = hildon_entry_new (MODEST_EDITABLE_SIZE); /* Auto-capitalization is the default, so let's turn it off: */ hildon_gtk_entry_set_input_mode (GTK_ENTRY (priv->entry_outgoingserver), HILDON_GTK_INPUT_MODE_FULL); g_signal_connect(G_OBJECT(priv->entry_outgoingserver), "changed", G_CALLBACK(on_change), self); @@ -385,7 +387,7 @@ modest_connection_specific_smtp_edit_window_init (ModestConnectionSpecificSmtpEd gtk_entry_set_max_length (GTK_ENTRY (priv->entry_user_username), 64); /* The password widgets: */ - priv->entry_user_password = gtk_entry_new (); + priv->entry_user_password = hildon_entry_new (MODEST_EDITABLE_SIZE); /* Auto-capitalization is the default, so let's turn it off: */ hildon_gtk_entry_set_input_mode (GTK_ENTRY (priv->entry_user_password), HILDON_GTK_INPUT_MODE_FULL | HILDON_GTK_INPUT_MODE_INVISIBLE); @@ -503,12 +505,12 @@ modest_connection_specific_smtp_edit_window_set_connection ( if (priv->account_name) g_free (priv->account_name); priv->account_name = g_strdup (modest_server_account_settings_get_account_name (server_settings)); - gtk_entry_set_text (GTK_ENTRY (priv->entry_outgoingserver), - modest_server_account_settings_get_hostname (server_settings)); - gtk_entry_set_text (GTK_ENTRY (priv->entry_user_username), - modest_server_account_settings_get_username (server_settings)); - gtk_entry_set_text (GTK_ENTRY (priv->entry_user_password), - modest_server_account_settings_get_password (server_settings)); + hildon_entry_set_text (HILDON_ENTRY (priv->entry_outgoingserver), + modest_server_account_settings_get_hostname (server_settings)); + hildon_entry_set_text (HILDON_ENTRY (priv->entry_user_username), + modest_server_account_settings_get_username (server_settings)); + hildon_entry_set_text (HILDON_ENTRY (priv->entry_user_password), + modest_server_account_settings_get_password (server_settings)); modest_serversecurity_picker_set_active_serversecurity ( MODEST_SERVERSECURITY_PICKER (priv->outgoing_security_picker), @@ -537,7 +539,7 @@ modest_connection_specific_smtp_edit_window_get_settings (ModestConnectionSpecif const gchar *outgoing_server = NULL; priv = CONNECTION_SPECIFIC_SMTP_EDIT_WINDOW_GET_PRIVATE (window); - outgoing_server = gtk_entry_get_text (GTK_ENTRY (priv->entry_outgoingserver)); + outgoing_server = hildon_entry_get_text (HILDON_ENTRY (priv->entry_outgoingserver)); /* If the outgoing server is NULL, we are removing the connection specific * settings */ @@ -548,13 +550,13 @@ modest_connection_specific_smtp_edit_window_get_settings (ModestConnectionSpecif server_settings = modest_server_account_settings_new (); modest_server_account_settings_set_hostname (server_settings, - gtk_entry_get_text (GTK_ENTRY (priv->entry_outgoingserver))); + hildon_entry_get_text (HILDON_ENTRY (priv->entry_outgoingserver))); modest_server_account_settings_set_protocol (server_settings, MODEST_PROTOCOLS_TRANSPORT_SMTP); modest_server_account_settings_set_username (server_settings, - gtk_entry_get_text (GTK_ENTRY (priv->entry_user_username))); + hildon_entry_get_text (HILDON_ENTRY (priv->entry_user_username))); modest_server_account_settings_set_password (server_settings, - gtk_entry_get_text (GTK_ENTRY (priv->entry_user_password))); + hildon_entry_get_text (HILDON_ENTRY (priv->entry_user_password))); modest_server_account_settings_set_security_protocol (server_settings, modest_serversecurity_picker_get_active_serversecurity ( diff --git a/src/widgets/modest-validating-entry.c b/src/widgets/modest-validating-entry.c index eb57805..182b5a9 100644 --- a/src/widgets/modest-validating-entry.c +++ b/src/widgets/modest-validating-entry.c @@ -4,6 +4,7 @@ */ #include "modest-validating-entry.h" +#include #include /* For the gtk_signal_stop_emit_by_name() convenience function. */ #include /* For strlen(). */ @@ -12,6 +13,7 @@ #include #endif + #ifdef MODEST_TOOLKIT_HILDON2 G_DEFINE_TYPE (ModestValidatingEntry, modest_validating_entry, HILDON_TYPE_ENTRY); #else @@ -207,7 +209,13 @@ 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); + + hildon_gtk_widget_set_theme_size (GTK_WIDGET (entry), MODEST_EDITABLE_SIZE); + + return entry; } /** Specify characters that may not be entered into this GtkEntry. -- 1.7.9.5