From 7a0399a274737d0402ddda10ed1b851d0da5d619 Mon Sep 17 00:00:00 2001 From: Sergio Villar Senin Date: Fri, 7 Mar 2008 10:30:00 +0000 Subject: [PATCH] New version of the remove WIMAX patch pmo-trunk-r4286 --- remove-wimax-against-4240.patch | 75 ------------------ remove-wimax.patch | 164 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 164 insertions(+), 75 deletions(-) delete mode 100644 remove-wimax-against-4240.patch create mode 100644 remove-wimax.patch diff --git a/remove-wimax-against-4240.patch b/remove-wimax-against-4240.patch deleted file mode 100644 index a040216..0000000 --- a/remove-wimax-against-4240.patch +++ /dev/null @@ -1,75 +0,0 @@ -Index: src/modest-platform.h -=================================================================== ---- src/modest-platform.h (revision 4240) -+++ src/modest-platform.h (working copy) -@@ -45,7 +45,7 @@ - } ModestSortDialogType; - - typedef enum _ModestConnectedVia { -- MODEST_CONNECTED_VIA_WLAN_OR_WIMAX = 1, -+ MODEST_CONNECTED_VIA_WLAN = 1, - MODEST_CONNECTED_VIA_ANY, - } ModestConnectedVia; - -Index: src/widgets/modest-global-settings-dialog.c -=================================================================== ---- src/widgets/modest-global-settings-dialog.c (revision 4240) -+++ src/widgets/modest-global-settings-dialog.c (working copy) -@@ -173,8 +173,8 @@ - { - GSList *list = NULL; - -- add_to_modest_pair_list (MODEST_CONNECTED_VIA_WLAN_OR_WIMAX, -- _("mcen_va_options_connectiontype_wlan_wimax"), -+ add_to_modest_pair_list (MODEST_CONNECTED_VIA_WLAN, -+ _("mcen_va_options_connectiontype_wlan"), - &list); - add_to_modest_pair_list (MODEST_CONNECTED_VIA_ANY, - _("mcen_va_options_connectiontype_all"), -@@ -258,7 +258,7 @@ - if (error) { - g_error_free (error); - error = NULL; -- combo_id = MODEST_CONNECTED_VIA_WLAN_OR_WIMAX; -+ combo_id = MODEST_CONNECTED_VIA_WLAN; - } - modest_combo_box_set_active_id (MODEST_COMBO_BOX (priv->connect_via), - (gpointer) &combo_id); -Index: src/modest-init.c -=================================================================== ---- src/modest-init.c (revision 4240) -+++ src/modest-init.c (working copy) -@@ -704,7 +704,7 @@ - modest_conf_set_bool (conf, MODEST_CONF_AUTO_UPDATE, TRUE, NULL); - - if (!modest_conf_key_exists (conf, MODEST_CONF_UPDATE_WHEN_CONNECTED_BY, NULL)) -- modest_conf_set_int (conf, MODEST_CONF_UPDATE_WHEN_CONNECTED_BY, MODEST_CONNECTED_VIA_WLAN_OR_WIMAX, NULL); -+ modest_conf_set_int (conf, MODEST_CONF_UPDATE_WHEN_CONNECTED_BY, MODEST_CONNECTED_VIA_WLAN, NULL); - - if (!modest_conf_key_exists (conf, MODEST_CONF_UPDATE_INTERVAL, NULL)) - modest_conf_set_int (conf, MODEST_CONF_UPDATE_INTERVAL, MODEST_UPDATE_INTERVAL_15_MIN, NULL); -Index: src/maemo/modest-platform.c -=================================================================== ---- src/maemo/modest-platform.c (revision 4240) -+++ src/maemo/modest-platform.c (working copy) -@@ -2229,9 +2229,8 @@ - const gchar *bearer_type = con_ic_iap_get_bearer_type (iap); - if (bearer_type) { - if (!strcmp (bearer_type, CON_IC_BEARER_WLAN_INFRA) || -- !strcmp (bearer_type, CON_IC_BEARER_WLAN_ADHOC) || -- !strcmp (bearer_type, "WIMAX")) { -- retval = MODEST_CONNECTED_VIA_WLAN_OR_WIMAX; -+ !strcmp (bearer_type, CON_IC_BEARER_WLAN_ADHOC)) { -+ retval = MODEST_CONNECTED_VIA_WLAN; - } else { - retval = MODEST_CONNECTED_VIA_ANY; - } -@@ -2240,7 +2239,7 @@ - g_object_unref (iap); - } - #else -- retval = MODEST_CONNECTED_VIA_WLAN_OR_WIMAX; /* assume WLAN (fast) internet */ -+ retval = MODEST_CONNECTED_VIA_WLAN; /* assume WLAN (fast) internet */ - #endif /* MODEST_HAVE_CONIC */ - return retval; - } diff --git a/remove-wimax.patch b/remove-wimax.patch new file mode 100644 index 0000000..9db35e8 --- /dev/null +++ b/remove-wimax.patch @@ -0,0 +1,164 @@ +Index: src/modest-platform.h +=================================================================== +--- src/modest-platform.h (revision 4285) ++++ src/modest-platform.h (working copy) +@@ -45,7 +45,7 @@ + } ModestSortDialogType; + + typedef enum _ModestConnectedVia { +- MODEST_CONNECTED_VIA_WLAN_OR_WIMAX = 1, ++ MODEST_CONNECTED_VIA_WLAN = 1, + MODEST_CONNECTED_VIA_ANY, + } ModestConnectedVia; + +Index: src/widgets/modest-global-settings-dialog.c +=================================================================== +--- src/widgets/modest-global-settings-dialog.c (revision 4285) ++++ src/widgets/modest-global-settings-dialog.c (working copy) +@@ -172,17 +172,9 @@ + GSList *list = NULL; + const gchar *message; + +-#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_WLAN, message, &list); + add_to_modest_pair_list (MODEST_CONNECTED_VIA_ANY, + _("mcen_va_options_connectiontype_all"), + &list); +@@ -265,7 +257,7 @@ + if (error) { + g_error_free (error); + error = NULL; +- combo_id = MODEST_CONNECTED_VIA_WLAN_OR_WIMAX; ++ combo_id = MODEST_CONNECTED_VIA_WLAN; + } + modest_combo_box_set_active_id (MODEST_COMBO_BOX (priv->connect_via), + (gpointer) &combo_id); +Index: src/modest-init.c +=================================================================== +--- src/modest-init.c (revision 4285) ++++ src/modest-init.c (working copy) +@@ -704,7 +704,7 @@ + modest_conf_set_bool (conf, MODEST_CONF_AUTO_UPDATE, TRUE, NULL); + + if (!modest_conf_key_exists (conf, MODEST_CONF_UPDATE_WHEN_CONNECTED_BY, NULL)) +- modest_conf_set_int (conf, MODEST_CONF_UPDATE_WHEN_CONNECTED_BY, MODEST_CONNECTED_VIA_WLAN_OR_WIMAX, NULL); ++ modest_conf_set_int (conf, MODEST_CONF_UPDATE_WHEN_CONNECTED_BY, MODEST_CONNECTED_VIA_WLAN, NULL); + + if (!modest_conf_key_exists (conf, MODEST_CONF_UPDATE_INTERVAL, NULL)) + modest_conf_set_int (conf, MODEST_CONF_UPDATE_INTERVAL, MODEST_UPDATE_INTERVAL_15_MIN, NULL); +Index: src/maemo/modest-platform.c +=================================================================== +--- src/maemo/modest-platform.c (revision 4285) ++++ src/maemo/modest-platform.c (working copy) +@@ -2234,9 +2234,8 @@ + const gchar *bearer_type = con_ic_iap_get_bearer_type (iap); + if (bearer_type) { + if (!strcmp (bearer_type, CON_IC_BEARER_WLAN_INFRA) || +- !strcmp (bearer_type, CON_IC_BEARER_WLAN_ADHOC) || +- !strcmp (bearer_type, "WIMAX")) { +- retval = MODEST_CONNECTED_VIA_WLAN_OR_WIMAX; ++ !strcmp (bearer_type, CON_IC_BEARER_WLAN_ADHOC)) { ++ retval = MODEST_CONNECTED_VIA_WLAN; + } else { + retval = MODEST_CONNECTED_VIA_ANY; + } +@@ -2245,7 +2244,7 @@ + g_object_unref (iap); + } + #else +- retval = MODEST_CONNECTED_VIA_WLAN_OR_WIMAX; /* assume WLAN (fast) internet */ ++ retval = MODEST_CONNECTED_VIA_WLAN; /* assume WLAN (fast) internet */ + #endif /* MODEST_HAVE_CONIC */ + return retval; + } +Index: remove-wimax-against-4240.patch +=================================================================== +--- remove-wimax-against-4240.patch (revision 4285) ++++ remove-wimax-against-4240.patch (working copy) +@@ -1,75 +0,0 @@ +-Index: src/modest-platform.h +-=================================================================== +---- src/modest-platform.h (revision 4240) +-+++ src/modest-platform.h (working copy) +-@@ -45,7 +45,7 @@ +- } ModestSortDialogType; +- +- typedef enum _ModestConnectedVia { +-- MODEST_CONNECTED_VIA_WLAN_OR_WIMAX = 1, +-+ MODEST_CONNECTED_VIA_WLAN = 1, +- MODEST_CONNECTED_VIA_ANY, +- } ModestConnectedVia; +- +-Index: src/widgets/modest-global-settings-dialog.c +-=================================================================== +---- src/widgets/modest-global-settings-dialog.c (revision 4240) +-+++ src/widgets/modest-global-settings-dialog.c (working copy) +-@@ -173,8 +173,8 @@ +- { +- GSList *list = NULL; +- +-- add_to_modest_pair_list (MODEST_CONNECTED_VIA_WLAN_OR_WIMAX, +-- _("mcen_va_options_connectiontype_wlan_wimax"), +-+ add_to_modest_pair_list (MODEST_CONNECTED_VIA_WLAN, +-+ _("mcen_va_options_connectiontype_wlan"), +- &list); +- add_to_modest_pair_list (MODEST_CONNECTED_VIA_ANY, +- _("mcen_va_options_connectiontype_all"), +-@@ -258,7 +258,7 @@ +- if (error) { +- g_error_free (error); +- error = NULL; +-- combo_id = MODEST_CONNECTED_VIA_WLAN_OR_WIMAX; +-+ combo_id = MODEST_CONNECTED_VIA_WLAN; +- } +- modest_combo_box_set_active_id (MODEST_COMBO_BOX (priv->connect_via), +- (gpointer) &combo_id); +-Index: src/modest-init.c +-=================================================================== +---- src/modest-init.c (revision 4240) +-+++ src/modest-init.c (working copy) +-@@ -704,7 +704,7 @@ +- modest_conf_set_bool (conf, MODEST_CONF_AUTO_UPDATE, TRUE, NULL); +- +- if (!modest_conf_key_exists (conf, MODEST_CONF_UPDATE_WHEN_CONNECTED_BY, NULL)) +-- modest_conf_set_int (conf, MODEST_CONF_UPDATE_WHEN_CONNECTED_BY, MODEST_CONNECTED_VIA_WLAN_OR_WIMAX, NULL); +-+ modest_conf_set_int (conf, MODEST_CONF_UPDATE_WHEN_CONNECTED_BY, MODEST_CONNECTED_VIA_WLAN, NULL); +- +- if (!modest_conf_key_exists (conf, MODEST_CONF_UPDATE_INTERVAL, NULL)) +- modest_conf_set_int (conf, MODEST_CONF_UPDATE_INTERVAL, MODEST_UPDATE_INTERVAL_15_MIN, NULL); +-Index: src/maemo/modest-platform.c +-=================================================================== +---- src/maemo/modest-platform.c (revision 4240) +-+++ src/maemo/modest-platform.c (working copy) +-@@ -2229,9 +2229,8 @@ +- const gchar *bearer_type = con_ic_iap_get_bearer_type (iap); +- if (bearer_type) { +- if (!strcmp (bearer_type, CON_IC_BEARER_WLAN_INFRA) || +-- !strcmp (bearer_type, CON_IC_BEARER_WLAN_ADHOC) || +-- !strcmp (bearer_type, "WIMAX")) { +-- retval = MODEST_CONNECTED_VIA_WLAN_OR_WIMAX; +-+ !strcmp (bearer_type, CON_IC_BEARER_WLAN_ADHOC)) { +-+ retval = MODEST_CONNECTED_VIA_WLAN; +- } else { +- retval = MODEST_CONNECTED_VIA_ANY; +- } +-@@ -2240,7 +2239,7 @@ +- g_object_unref (iap); +- } +- #else +-- retval = MODEST_CONNECTED_VIA_WLAN_OR_WIMAX; /* assume WLAN (fast) internet */ +-+ retval = MODEST_CONNECTED_VIA_WLAN; /* assume WLAN (fast) internet */ +- #endif /* MODEST_HAVE_CONIC */ +- return retval; +- } -- 1.7.9.5