From ae1192ba99ced938a5053c3ad2d3a594ff71c2d8 Mon Sep 17 00:00:00 2001 From: Denis Kenzior Date: Mon, 26 Oct 2009 16:58:24 -0500 Subject: Get rid of the AFTER_ROAMING stuff --- src/gprs.c | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) (limited to 'src') diff --git a/src/gprs.c b/src/gprs.c index c321aac9..49971697 100644 --- a/src/gprs.c +++ b/src/gprs.c @@ -38,7 +38,6 @@ #define DATA_CONTEXT_INTERFACE "org.ofono.PrimaryDataContext" #define GPRS_FLAG_ATTACHING 0x1 -#define GPRS_FLAG_DETACHED_AFTER_ROAMING 0x2 static GSList *g_drivers = NULL; static GSList *g_context_drivers = NULL; @@ -554,13 +553,7 @@ static void gprs_netreg_update(struct ofono_gprs *gprs) int operator_ok; operator_ok = gprs->roaming_allowed || - (gprs->status != NETWORK_REGISTRATION_STATUS_ROAMING && - !(gprs->flags & GPRS_FLAG_DETACHED_AFTER_ROAMING)); - - if (gprs->powered && !operator_ok) - gprs->flags |= GPRS_FLAG_DETACHED_AFTER_ROAMING; - - gprs_set_attached(gprs); + (gprs->status != NETWORK_REGISTRATION_STATUS_ROAMING); attach = gprs->powered && operator_ok; @@ -587,17 +580,9 @@ static void netreg_status_changed(int status, int lac, int ci, int tech, return; gprs->netreg_status = status; - if (!(gprs->flags & GPRS_FLAG_DETACHED_AFTER_ROAMING)) - return; - if (status != NETWORK_REGISTRATION_STATUS_REGISTERED) return; - /* If the circuit switched radio just registered to home PLMN then - * we also make an attempt to attach. - */ - gprs->flags &= ~GPRS_FLAG_DETACHED_AFTER_ROAMING; - gprs_netreg_update(gprs); } @@ -705,7 +690,6 @@ static DBusMessage *gprs_set_property(DBusConnection *conn, return dbus_message_new_method_return(msg); gprs->roaming_allowed = value; - gprs->flags &= ~GPRS_FLAG_DETACHED_AFTER_ROAMING; gprs_netreg_update(gprs); } else if (!strcmp(property, "Powered")) { @@ -721,7 +705,6 @@ static DBusMessage *gprs_set_property(DBusConnection *conn, return dbus_message_new_method_return(msg); gprs->powered = value; - gprs->flags &= ~GPRS_FLAG_DETACHED_AFTER_ROAMING; gprs_netreg_update(gprs); } else -- cgit v1.2.3