Pull the search UI construction code out into a distinct function.

[geeqie.git] / src / trash.c

diff --git a/src/trash.c b/src/trash.c
index 35a9573..2665df5 100644 (file)
--- a/src/trash.c
+++ b/src/trash.c
@@ -1,16 +1,24 @@
 /*
- * Geeqie
- * (C) 2006 John Ellis
- * Copyright (C) 2008 The Geeqie Team
+ * Copyright (C) 2006 John Ellis
+ * Copyright (C) 2008 - 2016 The Geeqie Team
  *
  * Author: John Ellis
  *
- * This software is released under the GNU General Public License (GNU GPL).
- * Please read the included file COPYING for more information.
- * This software comes with no warranty of any kind, use at your own risk!
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-
 #include "main.h"
 #include "trash.h"
 #include "utilops.h"
@@ -33,11 +41,11 @@ static gint file_util_safe_number(gint64 free_space)
        gint64 total = 0;
        GList *list;
        GList *work;
-       gint sorted = FALSE;
-       gint warned = FALSE;
+       gboolean sorted = FALSE;
+       gboolean warned = FALSE;
        FileData *dir_fd;
 
-       dir_fd = file_data_new_simple(options->file_ops.safe_delete_path);
+       dir_fd = file_data_new_dir(options->file_ops.safe_delete_path);
        if (!filelist_read(dir_fd, &list, NULL))
                {
                file_data_unref(dir_fd);
@@ -122,11 +130,11 @@ static void file_util_safe_del_close_cb(GtkWidget *dialog, gpointer data)
        *gd = NULL;
 }
 
-gint file_util_safe_unlink(const gchar *path)
+gboolean file_util_safe_unlink(const gchar *path)
 {
        static GenericDialog *gd = NULL;
        gchar *result = NULL;
-       gint success = TRUE;
+       gboolean success = TRUE;
 
        if (!isfile(path)) return FALSE;
 
@@ -210,6 +218,7 @@ gchar *file_util_safe_delete_status(void)
                        buf = g_strdup_printf(_("Safe delete: %s"), _("off"));
                        }
                }
-               
+
        return buf;
 }
+/* vim: set shiftwidth=8 softtabstop=0 cindent cinoptions={1s: */