broadband-modem-longcheer: fix handling of preferred modes

Treat NONE the same as ANY and handle specific preferred modes too.
2013-02-06 16:18:51 -06:00
parent 18436a8f77
commit a4ad95e3da
1 changed files with 8 additions and 4 deletions
@@ -152,10 +152,14 @@ set_allowed_modes (MMIfaceModem *self,
        mododr = 3;
    else if (allowed == MM_MODEM_MODE_3G)
        mododr = 1;
-    else if (allowed == MM_MODEM_MODE_ANY &&
-             preferred == MM_MODEM_MODE_NONE)
-        /* Not sure about this, it may be '3G preferred' */
-        mododr = 2;
+    else if (allowed == MM_MODEM_MODE_ANY || (allowed == (MM_MODEM_MODE_2G | MM_MODEM_MODE_3G))) {
+        if (preferred == MM_MODEM_MODE_2G)
+            mododr = 4;
+        else if (preferred == MM_MODEM_MODE_3G ||
+                 preferred == MM_MODEM_MODE_NONE ||
+                 preferred == MM_MODEM_MODE_ANY)
+            mododr = 2;
+    }

    if (mododr == 0) {
        gchar *allowed_str;