[gnome-commander] GnomeCmdFileList: fix for sort_by_dir() function
- From: Piotr Eljasiak <epiotr src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-commander] GnomeCmdFileList: fix for sort_by_dir() function
- Date: Fri, 6 Jan 2012 19:07:30 +0000 (UTC)
commit fb4eb7ec692cb58157b254e6acf69ba5d4833ee3
Author: Piotr Eljasiak <epiotr src gnome org>
Date: Fri Jan 6 20:05:32 2012 +0100
GnomeCmdFileList: fix for sort_by_dir() function
src/gnome-cmd-file-list.cc | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
---
diff --git a/src/gnome-cmd-file-list.cc b/src/gnome-cmd-file-list.cc
index 09a291a..656a64a 100644
--- a/src/gnome-cmd-file-list.cc
+++ b/src/gnome-cmd-file-list.cc
@@ -935,8 +935,18 @@ static gint sort_by_dir (GnomeCmdFile *f1, GnomeCmdFile *f2, GnomeCmdFileList *f
return 1;
gboolean raising = fl->priv->sort_raising[fl->priv->current_col];
+ gchar *dirname1 = f1->get_dirname();
+ gchar *dirname2 = f2->get_dirname();
- return my_strcmp (f1->get_collation_fname(), f2->get_collation_fname(), raising);
+ gint ret = my_strcmp (dirname1, dirname2, raising);
+
+ g_free (dirname1);
+ g_free (dirname2);
+
+ if (!ret)
+ ret = my_strcmp (f1->get_collation_fname(), f2->get_collation_fname(), raising);
+
+ return ret;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]