* added the 6 bug fixes for week 27 release for diablo pe2

[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 936cd16..9c0d724 100644 (file)
--- a/src/widgets/modest-global-settings-dialog.c
+++ b/src/widgets/modest-global-settings-dialog.c
@@ -32,6 +32,7 @@
 #include <gtk/gtkstock.h>
 #include <gtk/gtklabel.h>
 #include <gtk/gtktogglebutton.h>
+#include <string.h>
 #include "widgets/modest-global-settings-dialog.h"
 #include "widgets/modest-global-settings-dialog-priv.h"
 #include "modest-defs.h"
@@ -124,12 +125,7 @@ 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), _("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);
 
@@ -166,17 +162,23 @@ add_to_modest_pair_list (const gint num, const gchar *str, GSList **list)
        *list = g_slist_prepend (*list, pair);
 }
 
-/*
- * Gets a list of pairs 
- */
 ModestPairList *
 _modest_global_settings_dialog_get_connected_via (void)
 {
        GSList *list = NULL;
+       const gchar *message;
 
-       add_to_modest_pair_list (MODEST_CONNECTED_VIA_WLAN, 
-                                _("mcen_va_options_connectiontype_wlan"), 
-                                &list);
+#ifdef MODEST_PLATFORM_MAEMO
+       const gchar *env_var = getenv ("OSSO_PRODUCT_HARDWARE");
+       /* Check if WIMAX is available */
+       if (env_var && !strncmp (env_var, "RX-48", 5))
+               message = _("mcen_va_options_connectiontype_wlan_wimax");
+       else
+               message = _("mcen_va_options_connectiontype_wlan");
+#else
+       message = _("mcen_va_options_connectiontype_wlan");
+#endif
+       add_to_modest_pair_list (MODEST_CONNECTED_VIA_WLAN_OR_WIMAX, message, &list);
        add_to_modest_pair_list (MODEST_CONNECTED_VIA_ANY, 
                                 _("mcen_va_options_connectiontype_all"), 
                                 &list);
@@ -259,7 +261,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 +408,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:
@@ -448,11 +450,11 @@ on_response (GtkDialog *dialog,
 
                        saved = _modest_global_settings_dialog_save_conf (MODEST_GLOBAL_SETTINGS_DIALOG (dialog));
                        if (saved) {
-                               modest_platform_run_information_dialog (GTK_WINDOW (user_data),
-                                                                       _("mcen_ib_advsetup_settings_saved"));
+                               modest_platform_information_banner (NULL, NULL,
+                                                                   _("mcen_ib_advsetup_settings_saved"));
                        } else {
-                               modest_platform_run_information_dialog (GTK_WINDOW (user_data),
-                                                                       _("mail_ib_setting_failed"));
+                               modest_platform_information_banner (NULL, NULL,
+                                                                   _("mail_ib_setting_failed"));
                        }
                }
        } else {