1 Index: src/modest-platform.h
\r
2 ===================================================================
\r
3 --- src/modest-platform.h (revision 4240)
\r
4 +++ src/modest-platform.h (working copy)
\r
6 } ModestSortDialogType;
\r
8 typedef enum _ModestConnectedVia {
\r
9 - MODEST_CONNECTED_VIA_WLAN_OR_WIMAX = 1,
\r
10 + MODEST_CONNECTED_VIA_WLAN = 1,
\r
11 MODEST_CONNECTED_VIA_ANY,
\r
12 } ModestConnectedVia;
\r
14 Index: src/widgets/modest-global-settings-dialog.c
\r
15 ===================================================================
\r
16 --- src/widgets/modest-global-settings-dialog.c (revision 4240)
\r
17 +++ src/widgets/modest-global-settings-dialog.c (working copy)
\r
20 GSList *list = NULL;
\r
22 - add_to_modest_pair_list (MODEST_CONNECTED_VIA_WLAN_OR_WIMAX,
\r
23 - _("mcen_va_options_connectiontype_wlan_wimax"),
\r
24 + add_to_modest_pair_list (MODEST_CONNECTED_VIA_WLAN,
\r
25 + _("mcen_va_options_connectiontype_wlan"),
\r
27 add_to_modest_pair_list (MODEST_CONNECTED_VIA_ANY,
\r
28 _("mcen_va_options_connectiontype_all"),
\r
31 g_error_free (error);
\r
33 - combo_id = MODEST_CONNECTED_VIA_WLAN_OR_WIMAX;
\r
34 + combo_id = MODEST_CONNECTED_VIA_WLAN;
\r
36 modest_combo_box_set_active_id (MODEST_COMBO_BOX (priv->connect_via),
\r
37 (gpointer) &combo_id);
\r
38 Index: src/modest-init.c
\r
39 ===================================================================
\r
40 --- src/modest-init.c (revision 4240)
\r
41 +++ src/modest-init.c (working copy)
\r
43 modest_conf_set_bool (conf, MODEST_CONF_AUTO_UPDATE, TRUE, NULL);
\r
45 if (!modest_conf_key_exists (conf, MODEST_CONF_UPDATE_WHEN_CONNECTED_BY, NULL))
\r
46 - modest_conf_set_int (conf, MODEST_CONF_UPDATE_WHEN_CONNECTED_BY, MODEST_CONNECTED_VIA_WLAN_OR_WIMAX, NULL);
\r
47 + modest_conf_set_int (conf, MODEST_CONF_UPDATE_WHEN_CONNECTED_BY, MODEST_CONNECTED_VIA_WLAN, NULL);
\r
49 if (!modest_conf_key_exists (conf, MODEST_CONF_UPDATE_INTERVAL, NULL))
\r
50 modest_conf_set_int (conf, MODEST_CONF_UPDATE_INTERVAL, MODEST_UPDATE_INTERVAL_15_MIN, NULL);
\r
51 Index: src/maemo/modest-platform.c
\r
52 ===================================================================
\r
53 --- src/maemo/modest-platform.c (revision 4240)
\r
54 +++ src/maemo/modest-platform.c (working copy)
\r
55 @@ -2229,9 +2229,8 @@
\r
56 const gchar *bearer_type = con_ic_iap_get_bearer_type (iap);
\r
58 if (!strcmp (bearer_type, CON_IC_BEARER_WLAN_INFRA) ||
\r
59 - !strcmp (bearer_type, CON_IC_BEARER_WLAN_ADHOC) ||
\r
60 - !strcmp (bearer_type, "WIMAX")) {
\r
61 - retval = MODEST_CONNECTED_VIA_WLAN_OR_WIMAX;
\r
62 + !strcmp (bearer_type, CON_IC_BEARER_WLAN_ADHOC)) {
\r
63 + retval = MODEST_CONNECTED_VIA_WLAN;
\r
65 retval = MODEST_CONNECTED_VIA_ANY;
\r
67 @@ -2240,7 +2239,7 @@
\r
68 g_object_unref (iap);
\r
71 - retval = MODEST_CONNECTED_VIA_WLAN_OR_WIMAX; /* assume WLAN (fast) internet */
\r
72 + retval = MODEST_CONNECTED_VIA_WLAN; /* assume WLAN (fast) internet */
\r
73 #endif /* MODEST_HAVE_CONIC */
\r