X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fwidgets%2Fmodest-global-settings-dialog.c;h=1cfb1b22f7a530b9681834cd85fd63ddd8ad86e3;hb=4a97c4a2b6ba57b415de727f389f44505f032824;hp=2498700a0c97bfecd63f210d6bc439776b62ae09;hpb=f8ec795f1726017d14b4fe188ee63f8e9c2eea0a;p=modest

diff --git a/src/widgets/modest-global-settings-dialog.c b/src/widgets/modest-global-settings-dialog.c
index 2498700..1cfb1b2 100644
--- 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"
@@ -165,17 +166,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_OR_WIMAX, 
-				 _("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);
@@ -447,11 +454,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 {