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

[From: subversion at stage.maemo.org]

Author: marivoll
Date: 2007-11-01 15:32:19 +0200 (Thu, 01 Nov 2007)
New Revision: 14694

Modified:
   projects/haf/trunk/hildon-fm/ChangeLog
   projects/haf/trunk/hildon-fm/debian/changelog
   projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-selection.c
Log:
	* hildon-fm/hildon-file-selection.c (sort_function): Fall back to
	sorting by name when time or size are identical (N69201).


Modified: projects/haf/trunk/hildon-fm/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-fm/ChangeLog	2007-11-01 13:31:02 UTC (rev 14693)
+++ projects/haf/trunk/hildon-fm/ChangeLog	2007-11-01 13:32:19 UTC (rev 14694)
@@ -1,3 +1,13 @@
+2007-11-01  Marius Vollmer  <marius.vollmer at nokia.com>
+
+	* hildon-fm/hildon-file-selection.c (sort_function): Fall back to
+	sorting by name when time or size are identical (N69201).
+
+	* hildon-fm/hildon-file-system-model.c
+	(hildon_file_system_model_get): do not show the loading preview
+	for remote locations, the thumbnail is not going to be
+	loaded. (N37279)
+
 2007-10-12  Marius Vollmer  <marius.vollmer at nokia.com>
 
 	Released 1.9.45

Modified: projects/haf/trunk/hildon-fm/debian/changelog
===================================================================
--- projects/haf/trunk/hildon-fm/debian/changelog	2007-11-01 13:31:02 UTC (rev 14693)
+++ projects/haf/trunk/hildon-fm/debian/changelog	2007-11-01 13:32:19 UTC (rev 14694)
@@ -1,6 +1,6 @@
 libhildonfm (1:1.9.47~unreleased) unstable; urgency=low
 
-  * Fixes: NB#37279.
+  * Fixes: NB#37279, NB#69201.
 
  -- Marius Vollmer <marius.vollmer at nokia.com>  Thu, 01 Nov 2007 15:08:44 +0200
 

Modified: projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-selection.c
===================================================================
--- projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-selection.c	2007-11-01 13:31:02 UTC (rev 14693)
+++ projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-selection.c	2007-11-01 13:32:19 UTC (rev 14694)
@@ -737,6 +737,38 @@
         return diff;
     }
 
+    if (key == HILDON_FILE_SELECTION_SORT_MODIFIED) {
+        GtkFileTime time_a, time_b;
+		gint retval;
+
+        gtk_tree_model_get(model, a,
+                           HILDON_FILE_SYSTEM_MODEL_COLUMN_FILE_TIME,
+                           &time_a, -1);
+        gtk_tree_model_get(model, b,
+                           HILDON_FILE_SYSTEM_MODEL_COLUMN_FILE_TIME,
+                           &time_b, -1);
+
+        retval = time_a > time_b ? 1 : (time_a == time_b ? 0 : -1);
+		if (retval != 0) return retval;
+		else key = HILDON_FILE_SELECTION_SORT_NAME;
+    }
+
+    if (key == HILDON_FILE_SELECTION_SORT_SIZE) {
+        gint64 size_a, size_b;
+		gint retval;
+
+        gtk_tree_model_get(model, a,
+                           HILDON_FILE_SYSTEM_MODEL_COLUMN_FILE_SIZE,
+                           &size_a, -1);
+        gtk_tree_model_get(model, b,
+                           HILDON_FILE_SYSTEM_MODEL_COLUMN_FILE_SIZE,
+                           &size_b, -1);
+
+        retval = size_a > size_b ? 1 : (size_a == size_b ? 0 : -1);
+		if (retval != 0) return retval;
+		else key = HILDON_FILE_SELECTION_SORT_NAME;
+    }
+
     /* Sort by name. This allways applies for directories and also for
        files when name sorting is selected */
     if (weight_a < 0 || key == HILDON_FILE_SELECTION_SORT_NAME) {
@@ -765,32 +797,6 @@
         return value;
     }
 
-    if (key == HILDON_FILE_SELECTION_SORT_SIZE) {
-        gint64 size_a, size_b;
-
-        gtk_tree_model_get(model, a,
-                           HILDON_FILE_SYSTEM_MODEL_COLUMN_FILE_SIZE,
-                           &size_a, -1);
-        gtk_tree_model_get(model, b,
-                           HILDON_FILE_SYSTEM_MODEL_COLUMN_FILE_SIZE,
-                           &size_b, -1);
-
-        return size_a > size_b ? 1 : (size_a == size_b ? 0 : -1);
-    }
-
-    if (key == HILDON_FILE_SELECTION_SORT_MODIFIED) {
-        GtkFileTime time_a, time_b;
-
-        gtk_tree_model_get(model, a,
-                           HILDON_FILE_SYSTEM_MODEL_COLUMN_FILE_TIME,
-                           &time_a, -1);
-        gtk_tree_model_get(model, b,
-                           HILDON_FILE_SYSTEM_MODEL_COLUMN_FILE_TIME,
-                           &time_b, -1);
-
-        return time_a > time_b ? 1 : (time_a == time_b ? 0 : -1);
-    }
-
     /* Note! Actually we should sort by extension, not by MIME type.
        Getting extension is also related to other problem */
     gtk_tree_model_get(model, a, HILDON_FILE_SYSTEM_MODEL_COLUMN_MIME_TYPE,