Set details dialog pannable horizontal policy to "never"

[modest] / src / hildon2 / modest-hildon2-global-settings-dialog.c

diff --git a/src/hildon2/modest-hildon2-global-settings-dialog.c b/src/hildon2/modest-hildon2-global-settings-dialog.c
index ac94324..98f772b 100644 (file)
--- a/src/hildon2/modest-hildon2-global-settings-dialog.c
+++ b/src/hildon2/modest-hildon2-global-settings-dialog.c
@@ -32,6 +32,7 @@
 #endif /*HAVE_CONFIG_H*/
 
 #include <modest-hildon-includes.h>
+#include <modest-scrollable.h>
 #include <modest-maemo-utils.h>
 
 #include <glib/gi18n.h>
@@ -44,7 +45,6 @@
 #include "modest-runtime.h"
 #include "widgets/modest-global-settings-dialog-priv.h"
 #include "modest-selector-picker.h"
-#include "hildon/hildon-pannable-area.h"
 #include "modest-hildon2-global-settings-dialog.h"
 #include "widgets/modest-ui-constants.h"
 #include "modest-text-utils.h"
@@ -196,7 +196,7 @@ create_updating_page (ModestHildon2GlobalSettingsDialog *self)
        GtkSizeGroup *title_size_group;
        GtkSizeGroup *value_size_group;
        ModestGlobalSettingsDialogPrivate *ppriv;
-       GtkWidget *pannable, *separator;
+       GtkWidget *scrollable, *separator;
        ModestHildon2GlobalSettingsDialogPrivate *priv;
 
        priv = MODEST_HILDON2_GLOBAL_SETTINGS_DIALOG_GET_PRIVATE (self);
@@ -252,9 +252,8 @@ create_updating_page (ModestHildon2GlobalSettingsDialog *self)
        gtk_box_pack_start (GTK_BOX (vbox), separator, FALSE, FALSE, MODEST_MARGIN_DEFAULT);
 
        /* Auto update */
-       ppriv->auto_update = hildon_check_button_new (MODEST_EDITABLE_SIZE);
-       gtk_button_set_label (GTK_BUTTON (ppriv->auto_update), _("mcen_fi_options_autoupdate"));
-       gtk_button_set_alignment (GTK_BUTTON (ppriv->auto_update), 0.0, 0.5);
+       ppriv->auto_update = modest_toolkit_factory_create_check_button (modest_runtime_get_toolkit_factory (),
+                                                                        _("mcen_fi_options_autoupdate"));
        gtk_box_pack_start (GTK_BOX (vbox), ppriv->auto_update, FALSE, FALSE, 0);
        g_signal_connect (ppriv->auto_update, "clicked", G_CALLBACK (on_auto_update_clicked), self);
 
@@ -286,16 +285,16 @@ create_updating_page (ModestHildon2GlobalSettingsDialog *self)
                                               ppriv->update_interval);
        gtk_box_pack_start (GTK_BOX (vbox), ppriv->update_interval, FALSE, FALSE, 0);
 
-       pannable = g_object_new (HILDON_TYPE_PANNABLE_AREA, "initial-hint", TRUE, NULL);
+       scrollable = modest_toolkit_factory_create_scrollable (modest_runtime_get_toolkit_factory ());
 
-       hildon_pannable_area_add_with_viewport (HILDON_PANNABLE_AREA (pannable), vbox);
+       modest_scrollable_add_with_viewport (MODEST_SCROLLABLE (scrollable), vbox);
        gtk_widget_show (vbox);
-       gtk_widget_show (pannable);
+       gtk_widget_show (scrollable);
 
        g_object_unref (title_size_group);
        g_object_unref (value_size_group);
 
-       return pannable;
+       return scrollable;
 }
 
 
@@ -307,7 +306,7 @@ update_sensitive (ModestGlobalSettingsDialog *dialog)
        g_return_if_fail (MODEST_IS_GLOBAL_SETTINGS_DIALOG (dialog));
        ppriv = MODEST_GLOBAL_SETTINGS_DIALOG_GET_PRIVATE (dialog);
 
-       if (hildon_check_button_get_active (HILDON_CHECK_BUTTON (ppriv->auto_update))) {
+       if (modest_togglable_get_active (ppriv->auto_update)) {
                gtk_widget_set_sensitive (ppriv->connect_via, TRUE);
                gtk_widget_set_sensitive (ppriv->update_interval, TRUE);
        } else {
@@ -420,7 +419,7 @@ modest_hildon2_global_settings_dialog_load_settings (ModestGlobalSettingsDialog
                error = NULL;
                checked = FALSE;
        }
-       hildon_check_button_set_active (HILDON_CHECK_BUTTON (ppriv->auto_update), checked);
+       modest_togglable_set_active (ppriv->auto_update, checked);
        ppriv->initial_state.auto_update = checked;
 
        /* Connected by */