From 3b0f24b35dfbc87b91c669f4b6132931d593a130 Mon Sep 17 00:00:00 2001 From: Jose Dapena Paz Date: Tue, 17 Nov 2009 17:58:21 +0100 Subject: [PATCH] Fix easysetup wizard in gtk --- src/hildon2/modest-easysetup-wizard-dialog.c | 4 +++- src/widgets/modest-toolkit-factory.c | 24 ++++++++++++------------ 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/src/hildon2/modest-easysetup-wizard-dialog.c b/src/hildon2/modest-easysetup-wizard-dialog.c index 377397c..01495ec 100644 --- a/src/hildon2/modest-easysetup-wizard-dialog.c +++ b/src/hildon2/modest-easysetup-wizard-dialog.c @@ -575,6 +575,8 @@ create_page_account_details (ModestEasysetupWizardDialog *self) _("mcen_fi_serviceprovider"), FALSE, priv->account_serviceprovider_selector); + g_signal_connect (G_OBJECT (priv->account_serviceprovider_selector), "changed", + G_CALLBACK (on_serviceprovider_selector_value_changed), self); gtk_box_pack_start (GTK_BOX (box), captioned, FALSE, FALSE, MODEST_MARGIN_HALF); gtk_widget_show (captioned); } else { @@ -637,7 +639,7 @@ create_page_account_details (ModestEasysetupWizardDialog *self) g_list_free (list_prevent); list_prevent = NULL; modest_validating_entry_set_func(MODEST_VALIDATING_ENTRY(priv->entry_account_title), - modest_utils_on_entry_invalid_character, self); + modest_utils_on_entry_invalid_character, self); /* Set max length as in the UI spec: * The UI spec seems to want us to show a dialog if we hit the maximum. */ diff --git a/src/widgets/modest-toolkit-factory.c b/src/widgets/modest-toolkit-factory.c index e4b4317..c16cfd1 100644 --- a/src/widgets/modest-toolkit-factory.c +++ b/src/widgets/modest-toolkit-factory.c @@ -315,40 +315,40 @@ modest_toolkit_factory_create_entry_default (ModestToolkitFactory *self) void modest_entry_set_text (GtkWidget *widget, const gchar *text) { -#ifdef MODEST_TOOLKIT_HILDON2 - hildon_entry_set_text (HILDON_ENTRY (widget), text); -#else +#ifdef USE_GTK_ENTRY gtk_entry_set_text (GTK_ENTRY (widget), text); +#else + hildon_entry_set_text (HILDON_ENTRY (widget), text); #endif } const gchar * modest_entry_get_text (GtkWidget *widget) { -#ifdef MODEST_TOOLKIT_HILDON2 - return hildon_entry_get_text (HILDON_ENTRY (widget)); +#ifdef USE_GTK_ENTRY + return gtk_entry_get_text (GTK_ENTRY (widget)); #else - return gtk_entry_set_text (GTK_ENTRY (widget)); + return hildon_entry_get_text (HILDON_ENTRY (widget)); #endif } void modest_entry_set_hint (GtkWidget *widget, const gchar *hint) { -#ifdef MODEST_TOOLKIT_HILDON2 - hildon_entry_set_placeholder (HILDON_ENTRY (widget), hint); -#else +#ifdef USE_GTK_ENTRY gtk_widget_set_tooltip_text (widget, hint); +#else + hildon_entry_set_placeholder (HILDON_ENTRY (widget), hint); #endif } gboolean modest_is_entry (GtkWidget *widget) { -#ifdef MODEST_TOOLKIT_HILDON2 - return HILDON_IS_ENTRY (widget); -#else +#ifdef USE_GTK_ENTRY return GTK_IS_ENTRY (widget); +#else + return HILDON_IS_ENTRY (widget); #endif } -- 1.7.9.5