[Xfce4-commits] <thunar:andrzejr/utf8_collate> filename sort - some cleanup

[Andrzej]

Updating branch refs/heads/andrzejr/utf8_collate
         to ca5e0a112db6d4daf057d877d705d622c3d868a5 (commit)
       from 915b4845cfd1a8c19aa38c05116fc72deb18b0c1 (commit)

commit ca5e0a112db6d4daf057d877d705d622c3d868a5
Author: Andrzej <ndrwrdck at gmail.com>
Date:   Wed May 2 18:38:33 2012 +0900

    filename sort - some cleanup

 thunar/thunar-file.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/thunar/thunar-file.c b/thunar/thunar-file.c
index 13e35d3..3ecb6a9 100644
--- a/thunar/thunar-file.c
+++ b/thunar/thunar-file.c
@@ -719,7 +719,7 @@ thunar_file_load (ThunarFile   *file,
   gchar       *p;
   gchar       *thumbnail_dir_path;
   gchar       *uri = NULL;
-  gchar       *name_fc;
+  gchar       *name_nocase;
 
   _thunar_return_val_if_fail (THUNAR_IS_FILE (file), FALSE);
   _thunar_return_val_if_fail (error == NULL || *error == NULL, FALSE);
@@ -906,9 +906,9 @@ thunar_file_load (ThunarFile   *file,
 
   /* cache a collate keys for display name */
   file->collate_key_case = g_utf8_collate_key_for_filename (file->display_name, -1);
-  name_fc = g_utf8_casefold (file->display_name, -1);
-  file->collate_key_nocase = g_utf8_collate_key_for_filename (name_fc, -1);
-  g_free (name_fc);
+  name_nocase = g_utf8_casefold (file->display_name, -1);
+  file->collate_key_nocase = g_utf8_collate_key_for_filename (name_nocase, -1);
+  g_free (name_nocase);
 
   /* set thumb state to unknown */
   file->flags = 
@@ -3232,7 +3232,7 @@ thunar_file_compare_by_name (const ThunarFile *file_a,
     }
 
   /* if case sensitive or if ci comparison didn't find a difference */
-  if (case_sensitive || result == 0)
+  if (result == 0)
     {
       result = strcmp (file_a->collate_key_case, file_b->collate_key_case);
     }