From c62256319010fee60e00aec6dedeaccd98aee563 Mon Sep 17 00:00:00 2001 From: Jose Dapena Paz Date: Wed, 17 Dec 2008 10:46:16 +0000 Subject: [PATCH] Migrate some entries to HildonEntry pmo-drop-split-view-r6897 --- src/hildon2/modest-maemo-security-options-view.c | 4 ++-- src/widgets/modest-validating-entry.c | 4 ++++ src/widgets/modest-validating-entry.h | 12 ++++++++++++ 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/src/hildon2/modest-maemo-security-options-view.c b/src/hildon2/modest-maemo-security-options-view.c index 41e55d9..86c3bdc 100644 --- a/src/hildon2/modest-maemo-security-options-view.c +++ b/src/hildon2/modest-maemo-security-options-view.c @@ -215,7 +215,7 @@ on_entry_changed (GtkEditable *editable, auth_proto); if (is_secure && - !g_ascii_strcasecmp (gtk_entry_get_text (GTK_ENTRY (ppriv->user_entry)), "")) { + !g_ascii_strcasecmp (hildon_entry_get_text (HILDON_ENTRY (ppriv->user_entry)), "")) { missing = TRUE; } else { missing = FALSE; @@ -281,7 +281,7 @@ create_outgoing_security (ModestSecurityOptionsView* self, on_entry_max, self); /* Password widgets */ - ppriv->pwd_entry = gtk_entry_new (); + ppriv->pwd_entry = 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 (ppriv->pwd_entry), diff --git a/src/widgets/modest-validating-entry.c b/src/widgets/modest-validating-entry.c index 08994c3..eb57805 100644 --- a/src/widgets/modest-validating-entry.c +++ b/src/widgets/modest-validating-entry.c @@ -12,7 +12,11 @@ #include #endif +#ifdef MODEST_TOOLKIT_HILDON2 +G_DEFINE_TYPE (ModestValidatingEntry, modest_validating_entry, HILDON_TYPE_ENTRY); +#else G_DEFINE_TYPE (ModestValidatingEntry, modest_validating_entry, GTK_TYPE_ENTRY); +#endif #define VALIDATING_ENTRY_GET_PRIVATE(o) \ (G_TYPE_INSTANCE_GET_PRIVATE ((o), MODEST_TYPE_VALIDATING_ENTRY, ModestValidatingEntryPrivate)) diff --git a/src/widgets/modest-validating-entry.h b/src/widgets/modest-validating-entry.h index 956cf2a..f664289 100644 --- a/src/widgets/modest-validating-entry.h +++ b/src/widgets/modest-validating-entry.h @@ -6,7 +6,11 @@ #ifndef _MODEST_VALIDATING_ENTRY #define _MODEST_VALIDATING_ENTRY +#ifdef MODEST_TOOLKIT_HILDON2 +#include +#else #include +#endif G_BEGIN_DECLS @@ -33,11 +37,19 @@ G_BEGIN_DECLS MODEST_TYPE_VALIDATING_ENTRY, ModestValidatingEntryClass)) typedef struct { +#ifdef MODEST_TOOLKIT_HILDON2 + HildonEntry parent; +#else GtkEntry parent; +#endif } ModestValidatingEntry; typedef struct { +#ifdef MODEST_TOOLKIT_HILDON2 + HildonEntryClass parent_class; +#else GtkEntryClass parent_class; +#endif } ModestValidatingEntryClass; GType modest_validating_entry_get_type (void); -- 1.7.9.5