summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Neumair <chris@gnome-de.org>2006-04-25 12:25:20 +0000
committerChristian Neumair <cneumair@src.gnome.org>2006-04-25 12:25:20 +0000
commitbf48d464b79b36ed32271ed1a0913f5ecbe45a88 (patch)
treec2769d52254cd701544de432b369034b5ac3b32e
parent18ffc41c2876dd110ddc4d72751719bca614a932 (diff)
downloadnautilus-bf48d464b79b36ed32271ed1a0913f5ecbe45a88.tar.gz
Require gnome-vfs 2.14.2, gnome_vfs_volume_compare fixes.GNOME_2_14_BRANCHPOINT
2006-04-25 Christian Neumair <chris@gnome-de.org> * configure.in: Require gnome-vfs 2.14.2, gnome_vfs_volume_compare fixes. * src/file-manager/fm-tree-view.c: (create_tree): Use gnome_vfs_volume_compare to sort volumes from the volume monitor.
-rw-r--r--ChangeLog8
-rw-r--r--configure.in2
-rw-r--r--src/file-manager/fm-tree-view.c1
3 files changed, 10 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 2adc8101e..ef50ec9f5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-04-25 Christian Neumair <chris@gnome-de.org>
+
+ * configure.in:
+ Require gnome-vfs 2.14.2, gnome_vfs_volume_compare fixes.
+
+ * src/file-manager/fm-tree-view.c: (create_tree):
+ Use gnome_vfs_volume_compare to sort volumes from the volume monitor.
+
2006-04-18 Alexander Larsson <alexl@redhat.com>
* libnautilus-private/nautilus-file-attributes.h:
diff --git a/configure.in b/configure.in
index fdef01334..6786455c0 100644
--- a/configure.in
+++ b/configure.in
@@ -11,7 +11,7 @@ m4_define(glib_minver, 2.6.0)
m4_define(gnome_desktop_minver, 2.9.91)
m4_define(gnome_minver, 2.1.1)
m4_define(gnome_ui_minver, 2.6.0)
-m4_define(gnome_vfs_minver, 2.13.92)
+m4_define(gnome_vfs_minver, 2.14.2)
m4_define(orbit_minver, 2.4.0)
m4_define(pango_minver, 1.1.2)
m4_define(gtk_minver, 2.6.0)
diff --git a/src/file-manager/fm-tree-view.c b/src/file-manager/fm-tree-view.c
index f0793baf5..34c3a6ff6 100644
--- a/src/file-manager/fm-tree-view.c
+++ b/src/file-manager/fm-tree-view.c
@@ -1251,6 +1251,7 @@ create_tree (FMTreeView *view)
volume_monitor = gnome_vfs_get_volume_monitor ();
volumes = gnome_vfs_volume_monitor_get_mounted_volumes (volume_monitor);
+ volumes = g_list_sort (volumes, (GCompareFunc) gnome_vfs_volume_compare);
for (l = volumes; l != NULL; l = l->next) {
add_root_for_volume (view, l->data);
gnome_vfs_volume_unref (l->data);