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

[From: subversion at stage.maemo.org]

Author: marivoll
Date: 2008-02-20 18:40:34 +0200 (Wed, 20 Feb 2008)
New Revision: 15212

Modified:
   projects/haf/trunk/hildon-fm/ChangeLog
   projects/haf/trunk/hildon-fm/debian/changelog
   projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-system-private.c
Log:
	* hildon-fm/hildon-file-system-private.c
	(_hildon_file_system_compare_ignore_last_separator): actually
	ignore all appended slashes in both paths instead of just removing
	one to each. This way paths like upnpav:/// and upnpav:// are
	equivalent. (N76327)


Modified: projects/haf/trunk/hildon-fm/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-fm/ChangeLog	2008-02-20 16:34:50 UTC (rev 15211)
+++ projects/haf/trunk/hildon-fm/ChangeLog	2008-02-20 16:40:34 UTC (rev 15212)
@@ -1,5 +1,11 @@
 2008-02-20  Marius Vollmer  <marius.vollmer at nokia.com>
 
+	* hildon-fm/hildon-file-system-private.c
+	(_hildon_file_system_compare_ignore_last_separator): actually
+	ignore all appended slashes in both paths instead of just removing
+	one to each. This way paths like upnpav:/// and upnpav:// are
+	equivalent. (N76327)
+
 	* hildon-fm/hildon-file-selection.c
 	(hildon_file_selection_matches_current_view): Also recognize a
 	path that has just been deleted (N79697).

Modified: projects/haf/trunk/hildon-fm/debian/changelog
===================================================================
--- projects/haf/trunk/hildon-fm/debian/changelog	2008-02-20 16:34:50 UTC (rev 15211)
+++ projects/haf/trunk/hildon-fm/debian/changelog	2008-02-20 16:40:34 UTC (rev 15212)
@@ -1,6 +1,7 @@
 libhildonfm (1:2.0.1~unreleased) unstable; urgency=low
 
   * Fixes: NB#76517, NB#79427, NB#76380, NB#76271, NB#79697.
+  * Fixes: NB#76327.
 
  -- Marius Vollmer <marius.vollmer at nokia.com>  Wed, 20 Feb 2008 16:42:40 +0200
 

Modified: projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-system-private.c
===================================================================
--- projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-system-private.c	2008-02-20 16:34:50 UTC (rev 15211)
+++ projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-system-private.c	2008-02-20 16:40:34 UTC (rev 15212)
@@ -74,9 +74,10 @@
     len_a = strlen(a);
     len_b = strlen(b);
 
-    if (len_a > 1 && a[len_a - 1] == G_DIR_SEPARATOR)
+    while (len_a > 1 && a[len_a - 1] == G_DIR_SEPARATOR)
       len_a--;
-    if (len_b > 1 && b[len_b - 1] == G_DIR_SEPARATOR)
+
+    while (len_b > 1 && b[len_b - 1] == G_DIR_SEPARATOR)
       len_b--;
 
     if (len_a != len_b)