Temporarily adding the wimax removal patch, to help the integration process.

pmo-trunk-r4241

diff --git a/remove-wimax-against-4240.patch b/remove-wimax-against-4240.patch
new file mode 100644 (file)
index 0000000..a040216
--- /dev/null
+++ b/remove-wimax-against-4240.patch
@@ -0,0 +1,75 @@
+Index: src/modest-platform.h\r
+===================================================================\r
+--- src/modest-platform.h      (revision 4240)\r
++++ src/modest-platform.h      (working copy)\r
+@@ -45,7 +45,7 @@\r
+ } ModestSortDialogType;\r
+ \r
+ typedef enum _ModestConnectedVia {\r
+-      MODEST_CONNECTED_VIA_WLAN_OR_WIMAX = 1,\r
++      MODEST_CONNECTED_VIA_WLAN = 1,\r
+       MODEST_CONNECTED_VIA_ANY,\r
+ } ModestConnectedVia;\r
+ \r
+Index: src/widgets/modest-global-settings-dialog.c\r
+===================================================================\r
+--- src/widgets/modest-global-settings-dialog.c        (revision 4240)\r
++++ src/widgets/modest-global-settings-dialog.c        (working copy)\r
+@@ -173,8 +173,8 @@\r
+ {\r
+       GSList *list = NULL;\r
+ \r
+-      add_to_modest_pair_list (MODEST_CONNECTED_VIA_WLAN_OR_WIMAX, \r
+-                               _("mcen_va_options_connectiontype_wlan_wimax"), \r
++      add_to_modest_pair_list (MODEST_CONNECTED_VIA_WLAN, \r
++                               _("mcen_va_options_connectiontype_wlan"), \r
+                                &list);\r
+       add_to_modest_pair_list (MODEST_CONNECTED_VIA_ANY, \r
+                                _("mcen_va_options_connectiontype_all"), \r
+@@ -258,7 +258,7 @@\r
+       if (error) {\r
+               g_error_free (error);\r
+               error = NULL;\r
+-              combo_id = MODEST_CONNECTED_VIA_WLAN_OR_WIMAX;\r
++              combo_id = MODEST_CONNECTED_VIA_WLAN;\r
+       }\r
+       modest_combo_box_set_active_id (MODEST_COMBO_BOX (priv->connect_via), \r
+                                       (gpointer) &combo_id);\r
+Index: src/modest-init.c\r
+===================================================================\r
+--- src/modest-init.c  (revision 4240)\r
++++ src/modest-init.c  (working copy)\r
+@@ -704,7 +704,7 @@\r
+               modest_conf_set_bool (conf, MODEST_CONF_AUTO_UPDATE, TRUE, NULL);\r
+ \r
+       if (!modest_conf_key_exists (conf, MODEST_CONF_UPDATE_WHEN_CONNECTED_BY, NULL))\r
+-              modest_conf_set_int (conf, MODEST_CONF_UPDATE_WHEN_CONNECTED_BY, MODEST_CONNECTED_VIA_WLAN_OR_WIMAX, NULL);\r
++              modest_conf_set_int (conf, MODEST_CONF_UPDATE_WHEN_CONNECTED_BY, MODEST_CONNECTED_VIA_WLAN, NULL);\r
+ \r
+       if (!modest_conf_key_exists (conf, MODEST_CONF_UPDATE_INTERVAL, NULL))\r
+               modest_conf_set_int (conf, MODEST_CONF_UPDATE_INTERVAL, MODEST_UPDATE_INTERVAL_15_MIN, NULL);\r
+Index: src/maemo/modest-platform.c\r
+===================================================================\r
+--- src/maemo/modest-platform.c        (revision 4240)\r
++++ src/maemo/modest-platform.c        (working copy)\r
+@@ -2229,9 +2229,8 @@\r
+               const gchar *bearer_type = con_ic_iap_get_bearer_type (iap);\r
+               if (bearer_type) {\r
+                       if (!strcmp (bearer_type, CON_IC_BEARER_WLAN_INFRA) ||\r
+-                          !strcmp (bearer_type, CON_IC_BEARER_WLAN_ADHOC) ||\r
+-                          !strcmp (bearer_type, "WIMAX")) {\r
+-                              retval = MODEST_CONNECTED_VIA_WLAN_OR_WIMAX;\r
++                          !strcmp (bearer_type, CON_IC_BEARER_WLAN_ADHOC)) {\r
++                              retval = MODEST_CONNECTED_VIA_WLAN;\r
+                       } else {\r
+                               retval = MODEST_CONNECTED_VIA_ANY;\r
+                       }\r
+@@ -2240,7 +2239,7 @@\r
+               g_object_unref (iap);\r
+       }\r
+ #else\r
+-      retval = MODEST_CONNECTED_VIA_WLAN_OR_WIMAX; /* assume WLAN (fast) internet */  \r
++      retval = MODEST_CONNECTED_VIA_WLAN; /* assume WLAN (fast) internet */  \r
+ #endif /* MODEST_HAVE_CONIC */\r
+       return retval;\r
+ }\r