[Xfce4-commits] <thunar:master> Fix missing return and wrong function name in the ThunarFile header.

[Jannis Pohlmann]

Updating branch refs/heads/master
         to 9b51302524c768a60b0246350025b8a092c987fb (commit)
       from cd18a3b02008d5ed194ae6fea9148a545f3e7c3a (commit)

commit 9b51302524c768a60b0246350025b8a092c987fb
Author: Jannis Pohlmann <jannis at xfce.org>
Date:   Thu Sep 10 20:35:08 2009 +0200

    Fix missing return and wrong function name in the ThunarFile header.
    
    I wonder how the trash even worked without returning the original path
    from thunar_file_get_original_path()...

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

diff --git a/thunar/thunar-file.c b/thunar/thunar-file.c
index 8f723f7..e4c3965 100644
--- a/thunar/thunar-file.c
+++ b/thunar/thunar-file.c
@@ -2286,7 +2286,7 @@ thunar_file_get_original_path (const ThunarFile *file)
   if (file->info == NULL)
     return NULL;
 
-  g_file_info_get_attribute_byte_string (file->info, "trash::orig-path");
+  return g_file_info_get_attribute_byte_string (file->info, "trash::orig-path");
 }
 
 
diff --git a/thunar/thunar-file.h b/thunar/thunar-file.h
index 7bd9887..a777298 100644
--- a/thunar/thunar-file.h
+++ b/thunar/thunar-file.h
@@ -204,7 +204,7 @@ const gchar      *thunar_file_get_display_name     (const ThunarFile       *file
 gchar            *thunar_file_get_deletion_date    (const ThunarFile       *file,
                                                     ThunarDateStyle         date_style) G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT;
 const gchar      *thunar_file_get_original_path    (const ThunarFile       *file);
-guint32           thunar_file_get_trash_item_count (const ThunarFile       *file);
+guint32           thunar_file_get_item_count       (const ThunarFile       *file);
 
 gboolean          thunar_file_is_chmodable         (const ThunarFile       *file);
 gboolean          thunar_file_is_renameable        (const ThunarFile       *file);