* Fixes NB#80917, added wimax support

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

diff --git a/src/widgets/modest-global-settings-dialog.c b/src/widgets/modest-global-settings-dialog.c
index e9dc3d1..c21f03d 100644 (file)
--- a/src/widgets/modest-global-settings-dialog.c
+++ b/src/widgets/modest-global-settings-dialog.c
@@ -124,11 +124,10 @@ modest_global_settings_dialog_init (ModestGlobalSettingsDialog *self)
        priv = MODEST_GLOBAL_SETTINGS_DIALOG_GET_PRIVATE (self);
 
        priv->notebook = gtk_notebook_new ();
-       priv->changed = FALSE;
 
        /* Add the buttons: */
-       gtk_dialog_add_button (GTK_DIALOG (self), GTK_STOCK_OK, GTK_RESPONSE_OK);
-       gtk_dialog_add_button (GTK_DIALOG (self), GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
+       gtk_dialog_add_button (GTK_DIALOG (self), _("mcen_bd_dialog_ok"), GTK_RESPONSE_OK);
+       gtk_dialog_add_button (GTK_DIALOG (self), _("mcen_bd_dialog_cancel"), GTK_RESPONSE_CANCEL);
     
        /* Connect to the dialog's response signal: */
        g_signal_connect (G_OBJECT (self), "response", G_CALLBACK (on_response), self);
@@ -174,8 +173,8 @@ _modest_global_settings_dialog_get_connected_via (void)
 {
        GSList *list = NULL;
 
-       add_to_modest_pair_list (MODEST_CONNECTED_VIA_WLAN, 
-                                _("mcen_va_options_connectiontype_wlan"), 
+       add_to_modest_pair_list (MODEST_CONNECTED_VIA_WLAN_OR_WIMAX, 
+                                _("mcen_va_options_connectiontype_wlan_wimax"), 
                                 &list);
        add_to_modest_pair_list (MODEST_CONNECTED_VIA_ANY, 
                                 _("mcen_va_options_connectiontype_all"), 
@@ -259,7 +258,7 @@ _modest_global_settings_dialog_load_conf (ModestGlobalSettingsDialog *self)
        if (error) {
                g_error_free (error);
                error = NULL;
-               combo_id = MODEST_CONNECTED_VIA_WLAN;
+               combo_id = MODEST_CONNECTED_VIA_WLAN_OR_WIMAX;
        }
        modest_combo_box_set_active_id (MODEST_COMBO_BOX (priv->connect_via), 
                                        (gpointer) &combo_id);
@@ -406,7 +405,7 @@ _modest_global_settings_dialog_save_conf (ModestGlobalSettingsDialog *self)
                        /* Disable autoupdate in offline mode */
                        modest_platform_set_update_interval (0);
                }
-               g_object_unref (device);                
+               g_object_unref (device);
        }
 
 exit: