1 Index: src/modest-platform.h
2 ===================================================================
3 --- src/modest-platform.h (revision 4285)
4 +++ src/modest-platform.h (working copy)
6 } ModestSortDialogType;
8 typedef enum _ModestConnectedVia {
9 - MODEST_CONNECTED_VIA_WLAN_OR_WIMAX = 1,
10 + MODEST_CONNECTED_VIA_WLAN = 1,
11 MODEST_CONNECTED_VIA_ANY,
14 Index: src/widgets/modest-global-settings-dialog.c
15 ===================================================================
16 --- src/widgets/modest-global-settings-dialog.c (revision 4285)
17 +++ src/widgets/modest-global-settings-dialog.c (working copy)
22 -#ifdef MODEST_PLATFORM_MAEMO
23 - const gchar *env_var = getenv ("OSSO_PRODUCT_HARDWARE");
24 - /* Check if WIMAX is available */
25 - if (env_var && !strncmp (env_var, "RX-48", 5))
26 - message = _("mcen_va_options_connectiontype_wlan_wimax");
28 - message = _("mcen_va_options_connectiontype_wlan");
30 message = _("mcen_va_options_connectiontype_wlan");
32 - add_to_modest_pair_list (MODEST_CONNECTED_VIA_WLAN_OR_WIMAX, message, &list);
34 + add_to_modest_pair_list (MODEST_CONNECTED_VIA_WLAN, message, &list);
35 add_to_modest_pair_list (MODEST_CONNECTED_VIA_ANY,
36 _("mcen_va_options_connectiontype_all"),
42 - combo_id = MODEST_CONNECTED_VIA_WLAN_OR_WIMAX;
43 + combo_id = MODEST_CONNECTED_VIA_WLAN;
45 modest_combo_box_set_active_id (MODEST_COMBO_BOX (priv->connect_via),
46 (gpointer) &combo_id);
47 Index: src/modest-init.c
48 ===================================================================
49 --- src/modest-init.c (revision 4285)
50 +++ src/modest-init.c (working copy)
52 modest_conf_set_bool (conf, MODEST_CONF_AUTO_UPDATE, TRUE, NULL);
54 if (!modest_conf_key_exists (conf, MODEST_CONF_UPDATE_WHEN_CONNECTED_BY, NULL))
55 - modest_conf_set_int (conf, MODEST_CONF_UPDATE_WHEN_CONNECTED_BY, MODEST_CONNECTED_VIA_WLAN_OR_WIMAX, NULL);
56 + modest_conf_set_int (conf, MODEST_CONF_UPDATE_WHEN_CONNECTED_BY, MODEST_CONNECTED_VIA_WLAN, NULL);
58 if (!modest_conf_key_exists (conf, MODEST_CONF_UPDATE_INTERVAL, NULL))
59 modest_conf_set_int (conf, MODEST_CONF_UPDATE_INTERVAL, MODEST_UPDATE_INTERVAL_15_MIN, NULL);
60 Index: src/maemo/modest-platform.c
61 ===================================================================
62 --- src/maemo/modest-platform.c (revision 4285)
63 +++ src/maemo/modest-platform.c (working copy)
65 const gchar *bearer_type = con_ic_iap_get_bearer_type (iap);
67 if (!strcmp (bearer_type, CON_IC_BEARER_WLAN_INFRA) ||
68 - !strcmp (bearer_type, CON_IC_BEARER_WLAN_ADHOC) ||
69 - !strcmp (bearer_type, "WIMAX")) {
70 - retval = MODEST_CONNECTED_VIA_WLAN_OR_WIMAX;
71 + !strcmp (bearer_type, CON_IC_BEARER_WLAN_ADHOC)) {
72 + retval = MODEST_CONNECTED_VIA_WLAN;
74 retval = MODEST_CONNECTED_VIA_ANY;
80 - retval = MODEST_CONNECTED_VIA_WLAN_OR_WIMAX; /* assume WLAN (fast) internet */
81 + retval = MODEST_CONNECTED_VIA_WLAN; /* assume WLAN (fast) internet */
82 #endif /* MODEST_HAVE_CONIC */
85 Index: remove-wimax-against-4240.patch
86 ===================================================================
87 --- remove-wimax-against-4240.patch (revision 4285)
88 +++ remove-wimax-against-4240.patch (working copy)
90 -Index: src/modest-platform.h
\r
91 -===================================================================
\r
92 ---- src/modest-platform.h (revision 4240)
\r
93 -+++ src/modest-platform.h (working copy)
\r
95 - } ModestSortDialogType;
\r
97 - typedef enum _ModestConnectedVia {
\r
98 -- MODEST_CONNECTED_VIA_WLAN_OR_WIMAX = 1,
\r
99 -+ MODEST_CONNECTED_VIA_WLAN = 1,
\r
100 - MODEST_CONNECTED_VIA_ANY,
\r
101 - } ModestConnectedVia;
\r
103 -Index: src/widgets/modest-global-settings-dialog.c
\r
104 -===================================================================
\r
105 ---- src/widgets/modest-global-settings-dialog.c (revision 4240)
\r
106 -+++ src/widgets/modest-global-settings-dialog.c (working copy)
\r
107 -@@ -173,8 +173,8 @@
\r
109 - GSList *list = NULL;
\r
111 -- add_to_modest_pair_list (MODEST_CONNECTED_VIA_WLAN_OR_WIMAX,
\r
112 -- _("mcen_va_options_connectiontype_wlan_wimax"),
\r
113 -+ add_to_modest_pair_list (MODEST_CONNECTED_VIA_WLAN,
\r
114 -+ _("mcen_va_options_connectiontype_wlan"),
\r
116 - add_to_modest_pair_list (MODEST_CONNECTED_VIA_ANY,
\r
117 - _("mcen_va_options_connectiontype_all"),
\r
118 -@@ -258,7 +258,7 @@
\r
120 - g_error_free (error);
\r
122 -- combo_id = MODEST_CONNECTED_VIA_WLAN_OR_WIMAX;
\r
123 -+ combo_id = MODEST_CONNECTED_VIA_WLAN;
\r
125 - modest_combo_box_set_active_id (MODEST_COMBO_BOX (priv->connect_via),
\r
126 - (gpointer) &combo_id);
\r
127 -Index: src/modest-init.c
\r
128 -===================================================================
\r
129 ---- src/modest-init.c (revision 4240)
\r
130 -+++ src/modest-init.c (working copy)
\r
131 -@@ -704,7 +704,7 @@
\r
132 - modest_conf_set_bool (conf, MODEST_CONF_AUTO_UPDATE, TRUE, NULL);
\r
134 - if (!modest_conf_key_exists (conf, MODEST_CONF_UPDATE_WHEN_CONNECTED_BY, NULL))
\r
135 -- modest_conf_set_int (conf, MODEST_CONF_UPDATE_WHEN_CONNECTED_BY, MODEST_CONNECTED_VIA_WLAN_OR_WIMAX, NULL);
\r
136 -+ modest_conf_set_int (conf, MODEST_CONF_UPDATE_WHEN_CONNECTED_BY, MODEST_CONNECTED_VIA_WLAN, NULL);
\r
138 - if (!modest_conf_key_exists (conf, MODEST_CONF_UPDATE_INTERVAL, NULL))
\r
139 - modest_conf_set_int (conf, MODEST_CONF_UPDATE_INTERVAL, MODEST_UPDATE_INTERVAL_15_MIN, NULL);
\r
140 -Index: src/maemo/modest-platform.c
\r
141 -===================================================================
\r
142 ---- src/maemo/modest-platform.c (revision 4240)
\r
143 -+++ src/maemo/modest-platform.c (working copy)
\r
144 -@@ -2229,9 +2229,8 @@
\r
145 - const gchar *bearer_type = con_ic_iap_get_bearer_type (iap);
\r
146 - if (bearer_type) {
\r
147 - if (!strcmp (bearer_type, CON_IC_BEARER_WLAN_INFRA) ||
\r
148 -- !strcmp (bearer_type, CON_IC_BEARER_WLAN_ADHOC) ||
\r
149 -- !strcmp (bearer_type, "WIMAX")) {
\r
150 -- retval = MODEST_CONNECTED_VIA_WLAN_OR_WIMAX;
\r
151 -+ !strcmp (bearer_type, CON_IC_BEARER_WLAN_ADHOC)) {
\r
152 -+ retval = MODEST_CONNECTED_VIA_WLAN;
\r
154 - retval = MODEST_CONNECTED_VIA_ANY;
\r
156 -@@ -2240,7 +2239,7 @@
\r
157 - g_object_unref (iap);
\r
160 -- retval = MODEST_CONNECTED_VIA_WLAN_OR_WIMAX; /* assume WLAN (fast) internet */
\r
161 -+ retval = MODEST_CONNECTED_VIA_WLAN; /* assume WLAN (fast) internet */
\r
162 - #endif /* MODEST_HAVE_CONIC */
\r