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

[From: subversion at stage.maemo.org]

Author: marivoll
Date: 2007-10-01 13:47:40 +0300 (Mon, 01 Oct 2007)
New Revision: 14219

Modified:
   projects/haf/trunk/hildon-fm/ChangeLog
   projects/haf/trunk/hildon-fm/debian/changelog
   projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-system-voldev.c
Log:
	* hildon-fm/hildon-file-system-voldev.c (GCONF_PATH_MMC): New.
	(CORRUPTED_MMC_KEY, CORRUPTED_INTERNAL_MMC_KEY): Use it to pick up
	the right GConf key (N71426).


Modified: projects/haf/trunk/hildon-fm/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-fm/ChangeLog	2007-10-01 10:47:14 UTC (rev 14218)
+++ projects/haf/trunk/hildon-fm/ChangeLog	2007-10-01 10:47:40 UTC (rev 14219)
@@ -1,3 +1,9 @@
+2007-10-01  Marius Vollmer  <marius.vollmer at nokia.com>
+
+	* hildon-fm/hildon-file-system-voldev.c (GCONF_PATH_MMC): New.
+	(CORRUPTED_MMC_KEY, CORRUPTED_INTERNAL_MMC_KEY): Use it to pick up
+	the right GConf key (N71426).
+
 2007-09-28  Marius Vollmer  <marius.vollmer at nokia.com>
 
 	Released 1.9.41, "The rope of torture".

Modified: projects/haf/trunk/hildon-fm/debian/changelog
===================================================================
--- projects/haf/trunk/hildon-fm/debian/changelog	2007-10-01 10:47:14 UTC (rev 14218)
+++ projects/haf/trunk/hildon-fm/debian/changelog	2007-10-01 10:47:40 UTC (rev 14219)
@@ -1,6 +1,6 @@
 libhildonfm (1:1.9.42~unreleased) unstable; urgency=low
 
-  *
+  * Fixes: NB#71426.
   
  -- Marius Vollmer <marius.vollmer at nokia.com>  Mon, 01 Oct 2007 13:46:31 +0300
 

Modified: projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-system-voldev.c
===================================================================
--- projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-system-voldev.c	2007-10-01 10:47:14 UTC (rev 14218)
+++ projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-system-voldev.c	2007-10-01 10:47:40 UTC (rev 14219)
@@ -32,10 +32,11 @@
 #include "hildon-file-system-private.h"
 
 #define GCONF_PATH "/system/osso/af"
+#define GCONF_PATH_MMC "/system/osso/af/mmc"
 #define USED_OVER_USB_KEY GCONF_PATH "/mmc-used-over-usb"
 #define USED_OVER_USB_INTERNAL_KEY GCONF_PATH "/internal-mmc-used-over-usb"
-#define CORRUPTED_MMC_KEY GCONF_PATH "/mmc-corrupted"
-#define CORRUPTED_INTERNAL_MMC_KEY GCONF_PATH "/internal-mmc-corrupted"
+#define CORRUPTED_MMC_KEY GCONF_PATH_MMC "/mmc-corrupted"
+#define CORRUPTED_INTERNAL_MMC_KEY GCONF_PATH_MMC "/internal-mmc-corrupted"
 #define OPEN_MMC_COVER_KEY GCONF_PATH "/mmc-cover-open"
 #define OPEN_INTERNAL_MMC_COVER_KEY GCONF_PATH "/internal-mmc-cover-open"