[maemo-commits] [maemo-commits] r8736 - in projects/connectivity/osso-gwconnect/trunk: . debian src

[From: subversion at stage.maemo.org]

Author: jh
Date: 2006-12-13 11:14:18 +0200 (Wed, 13 Dec 2006)
New Revision: 8736

Modified:
   projects/connectivity/osso-gwconnect/trunk/configure.ac
   projects/connectivity/osso-gwconnect/trunk/debian/changelog
   projects/connectivity/osso-gwconnect/trunk/src/state.c
Log:
Ignore flight->flight and normal->normal mode transitions

Modified: projects/connectivity/osso-gwconnect/trunk/configure.ac
===================================================================
--- projects/connectivity/osso-gwconnect/trunk/configure.ac	2006-12-12 19:25:40 UTC (rev 8735)
+++ projects/connectivity/osso-gwconnect/trunk/configure.ac	2006-12-13 09:14:18 UTC (rev 8736)
@@ -1,5 +1,5 @@
 # configure.ac
-AC_INIT([osso-gwconnect],[1.0.5])
+AC_INIT([osso-gwconnect],[1.0.6])
 
 AM_CONFIG_HEADER(config.h)
 AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)

Modified: projects/connectivity/osso-gwconnect/trunk/debian/changelog
===================================================================
--- projects/connectivity/osso-gwconnect/trunk/debian/changelog	2006-12-12 19:25:40 UTC (rev 8735)
+++ projects/connectivity/osso-gwconnect/trunk/debian/changelog	2006-12-13 09:14:18 UTC (rev 8736)
@@ -1,3 +1,9 @@
+osso-gwconnect (1.0.6) unstable; urgency=low
+
+  * Ignore normal->normal and flight->flight mode transitions. Fixes: NB#49368
+
+ -- Johan Hedberg <johan.hedberg at nokia.com>  Wed, 13 Dec 2006 11:14:28 +0200
+
 osso-gwconnect (1.0.5) unstable; urgency=low
 
   * Restore correct device mode (UP/DOWN) on return to normal mode 

Modified: projects/connectivity/osso-gwconnect/trunk/src/state.c
===================================================================
--- projects/connectivity/osso-gwconnect/trunk/src/state.c	2006-12-12 19:25:40 UTC (rev 8735)
+++ projects/connectivity/osso-gwconnect/trunk/src/state.c	2006-12-13 09:14:18 UTC (rev 8736)
@@ -227,11 +227,17 @@
 void mode_change(const char *mode)
 {
     if (g_str_equal(mode, "flight")) {
+        /* Ignore flight->flight mode transition */
+        if (_flight_mode)
+            return;
         _down_before_flight = _bt_down;
         disable_bt();
         _flight_mode = TRUE;
     }
     else if (g_str_equal(mode, "normal")) {
+        /* Ignore normal->normal mode transition */
+        if (!_flight_mode)
+            return;
         _flight_mode = FALSE;
 #ifdef USE_MCE
         if (_cover_closed)