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

[From: subversion at stage.maemo.org]

Author: marivoll
Date: 2007-08-16 19:16:38 +0300 (Thu, 16 Aug 2007)
New Revision: 13271

Modified:
   projects/haf/trunk/hildon-fm/ChangeLog
   projects/haf/trunk/hildon-fm/debian/changelog
Log:


Modified: projects/haf/trunk/hildon-fm/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-fm/ChangeLog	2007-08-16 16:14:50 UTC (rev 13270)
+++ projects/haf/trunk/hildon-fm/ChangeLog	2007-08-16 16:16:38 UTC (rev 13271)
@@ -1,5 +1,21 @@
 2007-08-16  Marius Vollmer  <marius.vollmer at nokia.com>
 
+	Get sort order of special locations straightened out (N65611).
+	
+	* hildon-fm/hildon-file-common-private.h: Define sort weights for
+	all top-level special locations.
+	* hildon-fm/hildon-file-system-voldev.c
+	(hildon_file_system_voldev_volumes_changed): Set sort weight to
+	one of SORT_WEIGHT_USB, SORT_WEIGHT_INTERNAL_MMC or
+	SORT_WEIGHT_EXTERNAL_MMC, as appropsiate.
+	* hildon-fm/hildon-file-system-upnp.c
+	(hildon_file_system_upnp_init): Use SORT_WEIGHT_UPNP.
+	* hildon-fm/hildon-file-system-smb.c
+	(hildon_file_system_smb_init): Use SORT_WEIGHT_SMB.
+	* hildon-fm/hildon-file-system-local-device.c
+	(hildon_file_system_local_device_init): Use SORT_WEIGHT_DEVICE
+	unchanged instead of sibtracting one from it...
+
 	* hildon-fm/hildon-file-system-obex.c
 	(hildon_file_system_obex_create_child_location): Use the escaped
 	version of the URI as the base_path so that we can correctly find

Modified: projects/haf/trunk/hildon-fm/debian/changelog
===================================================================
--- projects/haf/trunk/hildon-fm/debian/changelog	2007-08-16 16:14:50 UTC (rev 13270)
+++ projects/haf/trunk/hildon-fm/debian/changelog	2007-08-16 16:16:38 UTC (rev 13271)
@@ -3,7 +3,8 @@
   * Fixes: NB#52803.
   * Do not show USB mass storage device when no volumes are mounted.
     Fixes: NB#62319
-
+  * Correct sort order of top-level items.  Fixes: NB#65611.
+  
  -- Marius Vollmer <marius.vollmer at nokia.com>  Tue, 14 Aug 2007 19:48:47 +0300
 
 libhildonfm (1:1.9.38) unstable; urgency=low