gnome-commander r2045 - in trunk: . src

[epiotr svn gnome org]

Author: epiotr
Date: Fri Sep  5 16:46:14 2008
New Revision: 2045
URL: http://svn.gnome.org/viewvc/gnome-commander?rev=2045&view=rev

Log:
Move gnome_cmd_get_collation_fname() to gnome-cmd-file.h

Modified:
   trunk/ChangeLog
   trunk/src/gnome-cmd-file-list.cc
   trunk/src/gnome-cmd-file.h

Modified: trunk/src/gnome-cmd-file-list.cc
==============================================================================
--- trunk/src/gnome-cmd-file-list.cc	(original)
+++ trunk/src/gnome-cmd-file-list.cc	Fri Sep  5 16:46:14 2008
@@ -252,12 +252,6 @@
 }
 
 
-inline char *gnome_cmd_get_collation_fname (GnomeCmdFile *f)
-{
-    return f->collate_key ? f->collate_key : f->info->name;
-}
-
-
 inline GnomeCmdFile *get_file_at_row (GnomeCmdFileList *fl, gint row)
 {
     g_return_val_if_fail (GNOME_CMD_IS_FILE_LIST (fl), NULL);
@@ -818,7 +812,7 @@
 
     gboolean raising = fl->priv->sort_raising[fl->priv->current_col];
 
-    return my_strcmp (gnome_cmd_get_collation_fname (f1), gnome_cmd_get_collation_fname (f2), raising);
+    return my_strcmp (gnome_cmd_file_get_collation_fname (f1), gnome_cmd_file_get_collation_fname (f2), raising);
 }
 
 
@@ -839,7 +833,7 @@
     gboolean raising = fl->priv->sort_raising[fl->priv->current_col];
 
     if (!gnome_cmd_file_get_extension (f1) && !gnome_cmd_file_get_extension (f2))
-        return my_strcmp (gnome_cmd_get_collation_fname (f1), gnome_cmd_get_collation_fname (f2), fl->priv->sort_raising[1]);
+        return my_strcmp (gnome_cmd_file_get_collation_fname (f1), gnome_cmd_file_get_collation_fname (f2), fl->priv->sort_raising[1]);
 
     if (!gnome_cmd_file_get_extension (f1))
         return raising?1:-1;
@@ -848,7 +842,7 @@
 
     gint ret = my_strcmp (gnome_cmd_file_get_extension (f1), gnome_cmd_file_get_extension (f2), raising);
 
-    return ret ? ret : my_strcmp (gnome_cmd_get_collation_fname (f1), gnome_cmd_get_collation_fname (f2), fl->priv->sort_raising[1]);
+    return ret ? ret : my_strcmp (gnome_cmd_file_get_collation_fname (f1), gnome_cmd_file_get_collation_fname (f2), fl->priv->sort_raising[1]);
 }
 
 
@@ -881,7 +875,7 @@
 
     // return ret;
 
-    return my_strcmp (gnome_cmd_get_collation_fname (f1), gnome_cmd_get_collation_fname (f2), raising);
+    return my_strcmp (gnome_cmd_file_get_collation_fname (f1), gnome_cmd_file_get_collation_fname (f2), raising);
 }
 
 
@@ -902,7 +896,7 @@
     {
         ret = my_intcmp (f1->info->size, f2->info->size, raising);
         if (!ret)
-            ret = my_strcmp (gnome_cmd_get_collation_fname (f1), gnome_cmd_get_collation_fname (f2), file_raising);
+            ret = my_strcmp (gnome_cmd_file_get_collation_fname (f1), gnome_cmd_file_get_collation_fname (f2), file_raising);
     }
     return ret;
 }
@@ -924,7 +918,7 @@
     {
         ret = my_intcmp (f1->info->permissions, f2->info->permissions, raising);
         if (!ret)
-            ret = my_strcmp (gnome_cmd_get_collation_fname (f1), gnome_cmd_get_collation_fname (f2), file_raising);
+            ret = my_strcmp (gnome_cmd_file_get_collation_fname (f1), gnome_cmd_file_get_collation_fname (f2), file_raising);
     }
     return ret;
 }
@@ -946,7 +940,7 @@
     {
         ret = my_intcmp (f1->info->mtime, f2->info->mtime, raising);
         if (!ret)
-            ret = my_strcmp (gnome_cmd_get_collation_fname (f1), gnome_cmd_get_collation_fname (f2), file_raising);
+            ret = my_strcmp (gnome_cmd_file_get_collation_fname (f1), gnome_cmd_file_get_collation_fname (f2), file_raising);
     }
     return ret;
 }
@@ -968,7 +962,7 @@
     {
         ret = my_intcmp (f1->info->uid, f2->info->uid, raising);
         if (!ret)
-            ret = my_strcmp (gnome_cmd_get_collation_fname (f1), gnome_cmd_get_collation_fname (f2), file_raising);
+            ret = my_strcmp (gnome_cmd_file_get_collation_fname (f1), gnome_cmd_file_get_collation_fname (f2), file_raising);
     }
     return ret;
 }
@@ -990,7 +984,7 @@
     {
         ret = my_intcmp (f1->info->gid, f2->info->gid, raising);
         if (!ret)
-            ret = my_strcmp (gnome_cmd_get_collation_fname (f1), gnome_cmd_get_collation_fname (f2), file_raising);
+            ret = my_strcmp (gnome_cmd_file_get_collation_fname (f1), gnome_cmd_file_get_collation_fname (f2), file_raising);
     }
     return ret;
 }

Modified: trunk/src/gnome-cmd-file.h
==============================================================================
--- trunk/src/gnome-cmd-file.h	(original)
+++ trunk/src/gnome-cmd-file.h	Fri Sep  5 16:46:14 2008
@@ -85,6 +85,11 @@
 GnomeVFSURI *gnome_cmd_file_get_uri (GnomeCmdFile *f);
 gchar *gnome_cmd_file_get_uri_str (GnomeCmdFile *f, GnomeVFSURIHideOptions hide_options=GNOME_VFS_URI_HIDE_NONE);
 
+inline char *gnome_cmd_file_get_collation_fname (GnomeCmdFile *f)
+{
+    return f->collate_key ? f->collate_key : f->info->name;
+}
+
 const gchar *gnome_cmd_file_get_extension (GnomeCmdFile *f);
 const gchar *gnome_cmd_file_get_owner (GnomeCmdFile *f);
 const gchar *gnome_cmd_file_get_group (GnomeCmdFile *f);