[maemo-commits] [maemo-commits] r15599 - in projects/haf/trunk/hildon-fm: . debian hildon-fm

[From: subversion at stage.maemo.org]

Author: marivoll
Date: 2008-05-23 18:29:11 +0300 (Fri, 23 May 2008)
New Revision: 15599

Modified:
   projects/haf/trunk/hildon-fm/ChangeLog
   projects/haf/trunk/hildon-fm/debian/changelog
   projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-system-remote-device.c
Log:
	* hildon-fm/hildon-file-system-remote-device.c (flightmode_changed):
	Do not make the bluetooth root node inaccessible. (N81561)


Modified: projects/haf/trunk/hildon-fm/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-fm/ChangeLog	2008-05-23 15:28:49 UTC (rev 15598)
+++ projects/haf/trunk/hildon-fm/ChangeLog	2008-05-23 15:29:11 UTC (rev 15599)
@@ -1,3 +1,8 @@
+2008-05-23  Marius Vollmer  <marius.vollmer at nokia.com>
+
+	* hildon-fm/hildon-file-system-remote-device.c (flightmode_changed):
+	Do not make the bluetooth root node inaccessible. (N81561)
+
 2008-04-29  Kimmo Hämäläinen  <kimmo.hamalainen at nokia.com>
 
 	* hildon-fm/hildon-file-system-model.c: Add new member

Modified: projects/haf/trunk/hildon-fm/debian/changelog
===================================================================
--- projects/haf/trunk/hildon-fm/debian/changelog	2008-05-23 15:28:49 UTC (rev 15598)
+++ projects/haf/trunk/hildon-fm/debian/changelog	2008-05-23 15:29:11 UTC (rev 15599)
@@ -1,6 +1,7 @@
 libhildonfm (1:2.0.6~unreleased) unstable; urgency=low
 
   * Patch to add voldev-mounted signal. Related to NB#76324
+  * Do not make the bluetooth root node inaccessible. Fixes: NB#81561.
 
  -- Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>  Tue, 29 Apr 2008 13:50:11 +0300
 

Modified: projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-system-remote-device.c
===================================================================
--- projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-system-remote-device.c	2008-05-23 15:28:49 UTC (rev 15598)
+++ projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-system-remote-device.c	2008-05-23 15:29:11 UTC (rev 15599)
@@ -114,11 +114,17 @@
 flightmode_changed (GObject *settings, GParamSpec *param, gpointer data)
 {
     HildonFileSystemRemoteDevice *device;
+    gboolean was_accessible;
 
     device = HILDON_FILE_SYSTEM_REMOTE_DEVICE (data);
+    was_accessible = device->accessible;
 
     g_object_get (settings, "flight-mode", &device->accessible, NULL);
     device->accessible = !device->accessible;
+    if (was_accessible && !device->accessible && !g_ascii_strcasecmp(HILDON_FILE_SYSTEM_SPECIAL_LOCATION(device)->basepath, "obex://")) {
+            //we want a Bluetooth folder be accessible in flight mode but not any of its children
+            device->accessible = TRUE;
+    }
 
     g_signal_emit_by_name (device, "connection-state");
 }