[Xfce4-commits] <thunar:andrzejr/utf8_collate> Renamed collate_key fields

[Andrzej]

Updating branch refs/heads/andrzejr/utf8_collate
         to 877a761a745629a85da12cb07f8aa9f1d65097af (commit)
       from ffc240ed53dec84a914ecba5effa340f631f02e8 (commit)

commit 877a761a745629a85da12cb07f8aa9f1d65097af
Author: Andrzej <ndrwrdck at gmail.com>
Date:   Tue May 1 22:52:09 2012 +0900

    Renamed collate_key fields

 thunar/thunar-file.c |   24 ++++++++++++------------
 thunar/thunar-file.h |    4 ++--
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/thunar/thunar-file.c b/thunar/thunar-file.c
index 6b3ce2f..ea36864 100644
--- a/thunar/thunar-file.c
+++ b/thunar/thunar-file.c
@@ -307,8 +307,8 @@ thunar_file_finalize (GObject *object)
   /* free display name, basename and collate keys*/
   g_free (file->display_name);
   g_free (file->basename);
-  g_free (file->collate_key);
-  g_free (file->collate_key_fc);
+  g_free (file->collate_key_case);
+  g_free (file->collate_key_nocase);
 
   /* free the thumbnail path */
   g_free (file->thumbnail_path);
@@ -632,8 +632,8 @@ thunar_file_get (GFile   *gfile,
       file->info = NULL;
       file->custom_icon_name = NULL;
       file->display_name = NULL;
-      file->collate_key = NULL;
-      file->collate_key_fc = NULL;
+      file->collate_key_case = NULL;
+      file->collate_key_nocase = NULL;
       file->basename = NULL;
 
       if (thunar_file_load (file, NULL, error))
@@ -743,11 +743,11 @@ thunar_file_load (ThunarFile   *file,
   g_free (file->basename);
   file->basename = NULL;
 
-  g_free (file->collate_key);
-  file->collate_key = NULL;
+  g_free (file->collate_key_case);
+  file->collate_key_case = NULL;
 
-  g_free (file->collate_key_fc);
-  file->collate_key_fc = NULL;
+  g_free (file->collate_key_nocase);
+  file->collate_key_nocase = NULL;
 
   /* free thumbnail path */
   g_free (file->thumbnail_path);
@@ -905,9 +905,9 @@ thunar_file_load (ThunarFile   *file,
     }
 
   /* cache a collate keys for display name */
-  file->collate_key = g_utf8_collate_key_for_filename (file->display_name, -1);
+  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_fc = g_utf8_collate_key_for_filename (name_fc, -1);
+  file->collate_key_nocase = g_utf8_collate_key_for_filename (name_fc, -1);
   g_free (name_fc);
 
   /* set thumb state to unknown */
@@ -3322,13 +3322,13 @@ thunar_file_compare_by_name (const ThunarFile *file_a,
   /* check if we should ignore case */
   if (case_sensitive == FALSE)
     {
-      result = strcmp (file_a->collate_key_fc, file_b->collate_key_fc);
+      result = strcmp (file_a->collate_key_nocase, file_b->collate_key_nocase);
     }
 
   /* if case sensitive or if ci comparison didn't find a difference */
   if (case_sensitive == TRUE || result == 0)
     {
-      result = strcmp (file_a->collate_key, file_b->collate_key);
+      result = strcmp (file_a->collate_key_case, file_b->collate_key_case);
     }
 
 #ifdef G_ENABLE_DEBUG
diff --git a/thunar/thunar-file.h b/thunar/thunar-file.h
index 4794bf6..b5591c3 100644
--- a/thunar/thunar-file.h
+++ b/thunar/thunar-file.h
@@ -117,8 +117,8 @@ struct _ThunarFile
   GFile         *gfile;
   gchar         *custom_icon_name;
   gchar         *display_name;
-  gchar         *collate_key;
-  gchar         *collate_key_fc;
+  gchar         *collate_key_case;
+  gchar         *collate_key_nocase;
   gchar         *basename;
   gchar         *thumbnail_path;
   guint          flags;