Move grab zoom to ModestWindow, as we have to handle it in all the app

[modest] / src / widgets / modest-security-options-view.c

diff --git a/src/widgets/modest-security-options-view.c b/src/widgets/modest-security-options-view.c
index c56a2fb..9f88f09 100644 (file)
--- a/src/widgets/modest-security-options-view.c
+++ b/src/widgets/modest-security-options-view.c
@@ -234,11 +234,15 @@ get_current_state (ModestSecurityOptionsView* self,
 
        /* Get security */
 #ifdef MODEST_TOOLKIT_HILDON2
-       state->security = 
+       state->security =
                modest_serversecurity_picker_get_active_serversecurity (MODEST_SERVERSECURITY_PICKER (priv->security_view));
+       state->port =
+               modest_serversecurity_picker_get_active_serversecurity_port (MODEST_SERVERSECURITY_PICKER (priv->security_view));
 #else
-       state->security = 
+       state->security =
                modest_serversecurity_combo_box_get_active_serversecurity (MODEST_SERVERSECURITY_COMBO_BOX (priv->security_view));
+       state->port =
+               modest_serversecurity_combo_box_get_active_serversecurity_port (MODEST_SERVERSECURITY_COMBO_BOX (priv->security_view));
 #endif
 
        /* Get auth */
@@ -356,7 +360,11 @@ modest_security_options_view_get_connection_protocol (ModestSecurityOptionsView
        g_return_val_if_fail (MODEST_IS_SECURITY_OPTIONS_VIEW (self), MODEST_PROTOCOL_REGISTRY_TYPE_INVALID);
        priv = MODEST_SECURITY_OPTIONS_VIEW_GET_PRIVATE (self);
 
+#ifdef MODEST_TOOLKIT_HILDON2
        return modest_serversecurity_picker_get_active_serversecurity (MODEST_SERVERSECURITY_PICKER (priv->security_view));
+#else
+       return modest_serversecurity_combo_box_get_active_serversecurity (MODEST_SERVERSECURITY_COMBO_BOX (priv->security_view));
+#endif
 }
 
 static void