Drop unused variables and associated code.

[geeqie.git] / src / cache_maint.c

diff --git a/src/cache_maint.c b/src/cache_maint.c
index eb43888..1bb5b87 100644 (file)
--- a/src/cache_maint.c
+++ b/src/cache_maint.c
@@ -1,7 +1,7 @@
 /*
  * Geeqie
  * (C) 2006 John Ellis
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2012 The Geeqie Team
  *
  * Author: John Ellis
  *
@@ -30,14 +30,14 @@ struct _CMData
 {
        GList *list;
        GList *done_list;
-       gint idle_id;
+       guint idle_id; /* event source id */
        GenericDialog *gd;
        GtkWidget *entry;
        GtkWidget *spinner;
        GtkWidget *button_stop;
        GtkWidget *button_close;
-       gint clear;
-       gint metadata;
+       gboolean clear;
+       gboolean metadata;
 };
 
 #define PURGE_DIALOG_WIDTH 400
@@ -83,7 +83,7 @@ static gchar *extension_find_dot(gchar *path)
        return dot;
 }
 
-static gint isempty(const gchar *path)
+static gboolean isempty(const gchar *path)
 {
        DIR *dp;
        struct dirent *dir;
@@ -111,7 +111,7 @@ static gint isempty(const gchar *path)
 
 static void cache_maintain_home_close(CMData *cm)
 {
-       if (cm->idle_id != -1) g_source_remove(cm->idle_id);
+       if (cm->idle_id) g_source_remove(cm->idle_id);
        if (cm->gd) generic_dialog_close(cm->gd);
        filelist_free(cm->list);
        g_list_free(cm->done_list);
@@ -120,10 +120,10 @@ static void cache_maintain_home_close(CMData *cm)
 
 static void cache_maintain_home_stop(CMData *cm)
 {
-       if (cm->idle_id != -1)
+       if (cm->idle_id)
                {
                g_source_remove(cm->idle_id);
-               cm->idle_id = -1;
+               cm->idle_id = 0;
                }
 
        gtk_entry_set_text(GTK_ENTRY(cm->entry), _("done"));
@@ -133,7 +133,7 @@ static void cache_maintain_home_stop(CMData *cm)
        gtk_widget_set_sensitive(cm->button_close, TRUE);
 }
 
-static gint cache_maintain_home_cb(gpointer data)
+static gboolean cache_maintain_home_cb(gpointer data)
 {
        CMData *cm = data;
        GList *dlist = NULL;
@@ -158,7 +158,7 @@ static gint cache_maintain_home_cb(gpointer data)
        if (!cm->list)
                {
                DEBUG_1("purge chk done.");
-               cm->idle_id = -1;
+               cm->idle_id = 0;
                cache_maintain_home_stop(cm);
                return FALSE;
                }
@@ -256,7 +256,7 @@ static void cache_maintain_home_close_cb(GenericDialog *gd, gpointer data)
 {
        CMData *cm = data;
 
-       if (!GTK_WIDGET_SENSITIVE(cm->button_close)) return;
+       if (!gtk_widget_get_sensitive(cm->button_close)) return;
 
        cache_maintain_home_close(cm);
 }
@@ -269,7 +269,7 @@ static void cache_maintain_home_stop_cb(GenericDialog *gd, gpointer data)
 }
 
 /* sorry for complexity (cm->done_list), but need it to remove empty dirs */
-void cache_maintain_home(gint metadata, gint clear, GtkWidget *parent)
+void cache_maintain_home(gboolean metadata, gboolean clear, GtkWidget *parent)
 {
        CMData *cm;
        GList *dlist;
@@ -287,7 +287,7 @@ void cache_maintain_home(gint metadata, gint clear, GtkWidget *parent)
                cache_folder = get_thumbnails_cache_dir();
                }
 
-       dir_fd = file_data_new_simple(cache_folder);
+       dir_fd = file_data_new_dir(cache_folder);
        if (!filelist_read(dir_fd, NULL, &dlist))
                {
                file_data_unref(dir_fd);
@@ -334,7 +334,7 @@ void cache_maintain_home(gint metadata, gint clear, GtkWidget *parent)
        gtk_widget_show(hbox);
 
        cm->entry = gtk_entry_new();
-       GTK_WIDGET_UNSET_FLAGS(cm->entry, GTK_CAN_FOCUS);
+       gtk_widget_set_can_focus(cm->entry, FALSE);
        gtk_editable_set_editable(GTK_EDITABLE(cm->entry), FALSE);
        gtk_box_pack_start(GTK_BOX(hbox), cm->entry, TRUE, TRUE, 0);
        gtk_widget_show(cm->entry);
@@ -360,13 +360,13 @@ gint cache_maintain_home_dir(const gchar *dir, gint recursive, gint clear)
        GList *dlist = NULL;
        FileData *dir_fd;
        GList *flist = NULL;
-       gint still_have_a_file = FALSE;
+       gboolean still_have_a_file = FALSE;
 
        DEBUG_1("maintainance check: %s", dir);
 
        base_length = strlen(homedir()) + strlen("/") + strlen(GQ_CACHE_RC_THUMB);
        base = g_strconcat(homedir(), "/", GQ_CACHE_RC_THUMB, dir, NULL);
-       dir_fd = file_data_new_simple(base);
+       dir_fd = file_data_new_dir(base);
        g_free(base);
 
        if (filelist_read(dir_fd, &flist, &dlist))
@@ -434,11 +434,11 @@ gint cache_maintain_dir(FileData *dir_fd, gint recursive, gint clear)
        GList *list = NULL;
        gchar *cachedir;
        FileData *cachedir_fd;
-       gint still_have_a_file = FALSE;
+       gboolean still_have_a_file = FALSE;
        GList *work;
 
        cachedir = g_build_filename(dir, GQ_CACHE_LOCAL_THUMB, NULL);
-       cachedir_fd = file_data_new_simple(cachedir);
+       cachedir_fd = file_data_new_dir(cachedir);
        g_free(cachedir);
 
        filelist_read(cachedir_fd, &list, NULL);
@@ -621,8 +621,9 @@ static void cache_maint_copied(FileData *fd)
 
 void cache_notify_cb(FileData *fd, NotifyType type, gpointer data)
 {
-       if (type != NOTIFY_TYPE_CHANGE || !fd->change) return;
+       if (!(type & NOTIFY_CHANGE) || !fd->change) return;
        
+       DEBUG_1("Notify cache_maint: %s %04x", fd->path, type);
        switch (fd->change->type)
                {
                case FILEDATA_CHANGE_MOVE:
@@ -671,7 +672,7 @@ struct _CleanData
        GList *list_dir;
 
        gint days;
-       gint clear;
+       gboolean clear;
 
        GtkWidget *button_close;
        GtkWidget *button_stop;
@@ -685,10 +686,10 @@ struct _CleanData
        gint count_total;
        gint count_done;
 
-       gint local;
-       gint recurse;
+       gboolean local;
+       gboolean recurse;
 
-       gint idle_id;
+       guint idle_id; /* event source id */
 };
 
 static void cache_manager_render_reset(CleanData *cd)
@@ -707,7 +708,7 @@ static void cache_manager_render_close_cb(GenericDialog *fd, gpointer data)
 {
        CleanData *cd = data;
 
-       if (!GTK_WIDGET_SENSITIVE(cd->button_close)) return;
+       if (!gtk_widget_get_sensitive(cd->button_close)) return;
 
        cache_manager_render_reset(cd);
        generic_dialog_close(cd->gd);
@@ -755,7 +756,7 @@ static void cache_manager_render_folder(CleanData *cd, FileData *dir_fd)
        cd->list_dir = g_list_concat(list_d, cd->list_dir);
 }
 
-static gint cache_manager_render_file(CleanData *cd);
+static gboolean cache_manager_render_file(CleanData *cd);
 
 static void cache_manager_render_thumb_done_cb(ThumbLoader *tl, gpointer data)
 {
@@ -767,7 +768,7 @@ static void cache_manager_render_thumb_done_cb(ThumbLoader *tl, gpointer data)
        while (cache_manager_render_file(cd));
 }
 
-static gint cache_manager_render_file(CleanData *cd)
+static gboolean cache_manager_render_file(CleanData *cd)
 {
        if (cd->list)
                {
@@ -822,7 +823,7 @@ static void cache_manager_render_start_cb(GenericDialog *fd, gpointer data)
        CleanData *cd = data;
        gchar *path;
 
-       if (cd->list || !GTK_WIDGET_SENSITIVE(cd->button_start)) return;
+       if (cd->list || !gtk_widget_get_sensitive(cd->button_start)) return;
 
        path = remove_trailing_slash((gtk_entry_get_text(GTK_ENTRY(cd->entry))));
        parse_out_relatives(path);
@@ -843,7 +844,7 @@ static void cache_manager_render_start_cb(GenericDialog *fd, gpointer data)
 
                spinner_set_interval(cd->spinner, SPINNER_SPEED);
 
-               dir_fd = file_data_new_simple(path);
+               dir_fd = file_data_new_dir(path);
                cache_manager_render_folder(cd, dir_fd);
                file_data_unref(dir_fd);
                while (cache_manager_render_file(cd));
@@ -897,7 +898,7 @@ static void cache_manager_render_dialog(GtkWidget *widget, const gchar *path)
        hbox = pref_box_new(cd->gd->vbox, FALSE, GTK_ORIENTATION_HORIZONTAL, PREF_PAD_SPACE);
 
        cd->progress = gtk_entry_new();
-       GTK_WIDGET_UNSET_FLAGS(cd->progress, GTK_CAN_FOCUS);
+       gtk_widget_set_can_focus(cd->progress, FALSE);
        gtk_editable_set_editable(GTK_EDITABLE(cd->progress), FALSE);
        gtk_entry_set_text(GTK_ENTRY(cd->progress), _("click start to begin"));
        gtk_box_pack_start(GTK_BOX(hbox), cd->progress, TRUE, TRUE, 0);
@@ -919,7 +920,7 @@ static void cache_manager_standard_clean_close_cb(GenericDialog *gd, gpointer da
 {
        CleanData *cd = data;
 
-       if (!GTK_WIDGET_SENSITIVE(cd->button_close)) return;
+       if (!gtk_widget_get_sensitive(cd->button_close)) return;
 
        generic_dialog_close(cd->gd);
 
@@ -936,10 +937,10 @@ static void cache_manager_standard_clean_done(CleanData *cd)
        gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(cd->progress), 1.0);
        gtk_progress_bar_set_text(GTK_PROGRESS_BAR(cd->progress), _("done"));
 
-       if (cd->idle_id != -1)
+       if (cd->idle_id)
                {
                g_source_remove(cd->idle_id);
-               cd->idle_id = -1;
+               cd->idle_id = 0;
                }
 
        thumb_loader_std_thumb_file_validate_cancel(cd->tl);
@@ -982,12 +983,12 @@ static gint cache_manager_standard_clean_clear_cb(gpointer data)
                return TRUE;
                }
 
-       cd->idle_id = -1;
+       cd->idle_id = 0;
        cache_manager_standard_clean_done(cd);
        return FALSE;
 }
 
-static void cache_manager_standard_clean_valid_cb(const gchar *path, gint valid, gpointer data)
+static void cache_manager_standard_clean_valid_cb(const gchar *path, gboolean valid, gpointer data)
 {
        CleanData *cd = data;
 
@@ -1032,7 +1033,7 @@ static void cache_manager_standard_clean_start_cb(GenericDialog *gd, gpointer da
        gchar *path;
        FileData *dir_fd;
 
-       if (cd->list || !GTK_WIDGET_SENSITIVE(cd->button_start)) return;
+       if (cd->list || !gtk_widget_get_sensitive(cd->button_start)) return;
 
        gtk_widget_set_sensitive(cd->button_start, FALSE);
        gtk_widget_set_sensitive(cd->button_stop, TRUE);
@@ -1041,21 +1042,21 @@ static void cache_manager_standard_clean_start_cb(GenericDialog *gd, gpointer da
        gtk_progress_bar_set_text(GTK_PROGRESS_BAR(cd->progress), _("running..."));
 
        path = g_build_filename(homedir(), THUMB_FOLDER_GLOBAL, THUMB_FOLDER_NORMAL, NULL);
-       dir_fd = file_data_new_simple(path);
+       dir_fd = file_data_new_dir(path);
        filelist_read(dir_fd, &list, NULL);
        cd->list = list;
        file_data_unref(dir_fd);
        g_free(path);
 
        path = g_build_filename(homedir(), THUMB_FOLDER_GLOBAL, THUMB_FOLDER_LARGE, NULL);
-       dir_fd = file_data_new_simple(path);
+       dir_fd = file_data_new_dir(path);
        filelist_read(dir_fd, &list, NULL);
        cd->list = g_list_concat(cd->list, list);
        file_data_unref(dir_fd);
        g_free(path);
 
        path = g_build_filename(homedir(), THUMB_FOLDER_GLOBAL, THUMB_FOLDER_FAIL, NULL);
-       dir_fd = file_data_new_simple(path);
+       dir_fd = file_data_new_dir(path);
        filelist_read(dir_fd, &list, NULL);
        cd->list = g_list_concat(cd->list, list);
        file_data_unref(dir_fd);
@@ -1075,7 +1076,7 @@ static void cache_manager_standard_clean_start_cb(GenericDialog *gd, gpointer da
                }
 }
 
-static void cache_manager_standard_process(GtkWidget *widget, gint clear)
+static void cache_manager_standard_process(GtkWidget *widget, gboolean clear)
 {
        CleanData *cd;
        const gchar *stock_id;
@@ -1117,7 +1118,7 @@ static void cache_manager_standard_process(GtkWidget *widget, gint clear)
 
        cd->days = 30;
        cd->tl = NULL;
-       cd->idle_id = -1;
+       cd->idle_id = 0;
 
        gtk_widget_show(cd->gd->dialog);
 }