Move header window to src/widgets

[modest] / src / hildon2 / modest-default-account-settings-dialog.c

diff --git a/src/hildon2/modest-default-account-settings-dialog.c b/src/hildon2/modest-default-account-settings-dialog.c
index 540ca69..618173d 100644 (file)
--- a/src/hildon2/modest-default-account-settings-dialog.c
+++ b/src/hildon2/modest-default-account-settings-dialog.c
@@ -38,7 +38,6 @@
 #include "modest-hildon-includes.h"
 #include "modest-default-account-settings-dialog.h"
 #include "modest-account-mgr.h"
-#include "modest-secureauth-picker.h"
 #include "widgets/modest-validating-entry.h"
 #include "modest-text-utils.h"
 #include "modest-account-mgr.h"
@@ -268,9 +267,9 @@ create_captioned (ModestDefaultAccountSettingsDialog *self,
 
        GtkWidget *result;
 
-       result = modest_maemo_utils_create_captioned_with_size_type (title_sizegroup, value_sizegroup,
-                                                                    label_text, use_markup, control,
-                                                                    MODEST_EDITABLE_SIZE);
+       result = modest_toolkit_utils_create_captioned_with_size_type (title_sizegroup, value_sizegroup,
+                                                                      label_text, use_markup, control,
+                                                                      MODEST_EDITABLE_SIZE);
 
        /* Connect to the appropriate changed signal for the widget, 
         * so we can ask for the prev/next buttons to be enabled/disabled appropriately:
@@ -617,7 +616,7 @@ update_incoming_server_title (ModestDefaultAccountSettingsDialog *self,
        incomingserver_title = g_strconcat(_("mcen_li_emailsetup_servertype"), "*", 
                                           "\n<small>(", protocol_display_name, ")</small>", NULL);
        
-       modest_maemo_utils_captioned_set_label (priv->caption_incoming, incomingserver_title, TRUE);
+       modest_toolkit_utils_captioned_set_label (priv->caption_incoming, incomingserver_title, TRUE);
        g_free (incomingserver_title);
 }
 
@@ -655,9 +654,10 @@ create_page_incoming (ModestDefaultAccountSettingsDialog *self,
 
        /* Incoming security widgets */
        priv->incoming_security =
-               modest_maemo_security_options_view_new (MODEST_SECURITY_OPTIONS_INCOMING,
-                                                       TRUE, security_title_sizegroup,
-                                                       security_value_sizegroup);
+               modest_toolkit_factory_create_security_options_view (modest_runtime_get_toolkit_factory (),
+                                                                    MODEST_SECURITY_OPTIONS_INCOMING,
+                                                                    TRUE, security_title_sizegroup,
+                                                                    security_value_sizegroup);
        gtk_box_pack_start (GTK_BOX (box), priv->incoming_security,
                            FALSE, FALSE, 0);
 
@@ -747,9 +747,10 @@ create_page_outgoing (ModestDefaultAccountSettingsDialog *self,
 
        /* Outgoing security widgets */
        priv->outgoing_security = 
-               modest_maemo_security_options_view_new (MODEST_SECURITY_OPTIONS_OUTGOING,
-                                                       TRUE, security_title_sizegroup,
-                                                       security_value_sizegroup);
+               modest_toolkit_factory_create_security_options_view (modest_runtime_get_toolkit_factory (),
+                                                                    MODEST_SECURITY_OPTIONS_OUTGOING,
+                                                                    TRUE, security_title_sizegroup,
+                                                                    security_value_sizegroup);
        gtk_box_pack_start (GTK_BOX (box), priv->outgoing_security, 
                            FALSE, FALSE, 0);
        gtk_widget_show (priv->outgoing_security);