# HG changeset patch # User zas_ # Date 1237129267 0 # Node ID a005287bffc7fb8a6b8b4b3c9e9b14a7f3f7fce5 # Parent f879e7d94c6d40113c674f77ef17619e8bf1c6a7 gint -> gboolean. diff -r f879e7d94c6d -r a005287bffc7 src/collect-io.c --- a/src/collect-io.c Sun Mar 15 13:33:56 2009 +0000 +++ b/src/collect-io.c Sun Mar 15 15:01:07 2009 +0000 @@ -155,7 +155,7 @@ *p = 0; if (*buf) { - gint valid; + gboolean valid; if (!flush) changed |= collect_manager_process_action(entry, &buf); diff -r f879e7d94c6d -r a005287bffc7 src/dupe.c --- a/src/dupe.c Sun Mar 15 13:33:56 2009 +0000 +++ b/src/dupe.c Sun Mar 15 15:01:07 2009 +0000 @@ -245,7 +245,7 @@ GtkTreeIter iter; gboolean color_set = TRUE; DupeItem *parent = NULL; - gint valid; + gboolean valid; store = gtk_tree_view_get_model(GTK_TREE_VIEW(dw->listview)); valid = gtk_tree_model_get_iter_first(store, &iter); @@ -457,7 +457,7 @@ static gint dupe_listview_find_item(GtkListStore *store, DupeItem *item, GtkTreeIter *iter) { - gint valid; + gboolean valid; gint row = 0; valid = gtk_tree_model_get_iter_first(GTK_TREE_MODEL(store), iter); @@ -632,7 +632,7 @@ { GtkTreeModel *store; GtkTreeIter iter; - gint valid; + gboolean valid; GList *list = NULL; store = gtk_tree_view_get_model(GTK_TREE_VIEW(listview)); @@ -714,7 +714,7 @@ GtkTreeModel *store; GtkTreeSelection *selection; GtkTreeIter iter; - gint valid; + gboolean valid; selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(dw->listview)); gtk_tree_selection_unselect_all(selection); @@ -1280,7 +1280,7 @@ GtkTreeModel *store; GtkTreeIter iter; DupeItem *di = NULL; - gint valid; + gboolean valid; gint row = 0; gint length = 0; @@ -2806,7 +2806,7 @@ { GtkTreeModel *store; GtkTreeIter iter; - gint valid; + gboolean valid; thumb_loader_free(dw->thumb_loader); dw->thumb_loader = NULL; diff -r f879e7d94c6d -r a005287bffc7 src/layout_config.c --- a/src/layout_config.c Sun Mar 15 13:33:56 2009 +0000 +++ b/src/layout_config.c Sun Mar 15 15:01:07 2009 +0000 @@ -110,7 +110,7 @@ { GtkListStore *store; GtkTreeIter iter; - gint valid; + gboolean valid; gint n; store = GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(lc->listview))); @@ -133,7 +133,7 @@ { GtkTreeModel *store; GtkTreeIter iter; - gint valid; + gboolean valid; gint c = 0; store = gtk_tree_view_get_model(GTK_TREE_VIEW(lc->listview)); diff -r f879e7d94c6d -r a005287bffc7 src/rcfile.c --- a/src/rcfile.c Sun Mar 15 13:33:56 2009 +0000 +++ b/src/rcfile.c Sun Mar 15 15:01:07 2009 +0000 @@ -549,11 +549,8 @@ LayoutWindow *lw = work->data; layout_write_config(lw, outstr, indent); work = work->next; - } - - secure_fputs(ssi, outstr->str); g_string_free(outstr, TRUE); @@ -736,7 +733,6 @@ const gchar *option = *attribute_names++; const gchar *value = *attribute_values++; - if (READ_BOOL(options->color_profile, enabled)) continue; if (READ_BOOL(options->color_profile, use_image)) continue; if (READ_INT(options->color_profile, input_type)) continue; diff -r f879e7d94c6d -r a005287bffc7 src/remote.c --- a/src/remote.c Sun Mar 15 13:33:56 2009 +0000 +++ b/src/remote.c Sun Mar 15 15:01:07 2009 +0000 @@ -182,7 +182,7 @@ return TRUE; } -static gint remote_server_exists(const gchar *path) +static gboolean remote_server_exists(const gchar *path) { RemoteConnection *rc; @@ -291,7 +291,7 @@ sigpipe_occured = TRUE; } -static gint remote_client_send(RemoteConnection *rc, const gchar *text) +static gboolean remote_client_send(RemoteConnection *rc, const gchar *text) { struct sigaction new_action, old_action; gboolean ret = FALSE; @@ -457,7 +457,7 @@ } } -static gint gr_quit_idle_cb(gpointer data) +static gboolean gr_quit_idle_cb(gpointer data) { exit_program(); @@ -563,8 +563,8 @@ gchar *opt_s; gchar *opt_l; void (*func)(const gchar *text, gpointer data); - gint needs_extra; - gint prefer_command_line; + gboolean needs_extra; + gboolean prefer_command_line; gchar *description; }; diff -r f879e7d94c6d -r a005287bffc7 src/search.c --- a/src/search.c Sun Mar 15 13:33:56 2009 +0000 +++ b/src/search.c Sun Mar 15 15:01:07 2009 +0000 @@ -131,9 +131,9 @@ GtkWidget *entry_comment; FileData *search_dir_fd; - gint search_path_recurse; + gboolean search_path_recurse; gchar *search_name; - gint search_name_match_case; + gboolean search_name_match_case; gint64 search_size; gint64 search_size_end; gint search_date_y; @@ -151,7 +151,7 @@ CacheData *search_similarity_cd; GList *search_keyword_list; gchar *search_comment; - gint search_comment_match_case; + gboolean search_comment_match_case; MatchType search_type; @@ -188,7 +188,7 @@ FileData *click_fd; ThumbLoader *thumb_loader; - gint thumb_enable; + gboolean thumb_enable; FileData *thumb_fd; /* file list for edit menu */ @@ -310,7 +310,7 @@ g_free(buf); } -static void search_progress_update(SearchData *sd, gint search, gdouble thumbs) +static void search_progress_update(SearchData *sd, gboolean search, gdouble thumbs) { if (search || thumbs >= 0.0) @@ -347,7 +347,7 @@ static gint search_result_find_row(SearchData *sd, FileData *fd, GtkTreeIter *iter) { GtkTreeModel *store; - gint valid; + gboolean valid; gint n = 0; store = gtk_tree_view_get_model(GTK_TREE_VIEW(sd->result_view)); @@ -365,7 +365,7 @@ return -1; } -static gint search_result_row_selected(SearchData *sd, FileData *fd) +static gboolean search_result_row_selected(SearchData *sd, FileData *fd) { GtkTreeModel *store; GtkTreeSelection *selection; @@ -452,7 +452,7 @@ { GtkTreeModel *store; GtkTreeIter iter; - gint valid; + gboolean valid; gint n = 0; gint64 total = 0; GList *plist = NULL; @@ -531,7 +531,7 @@ GList *list = NULL; GtkTreeModel *store; GtkTreeIter iter; - gint valid; + gboolean valid; store = gtk_tree_view_get_model(GTK_TREE_VIEW(sd->result_view)); @@ -603,7 +603,7 @@ { GtkTreeModel *store; GtkTreeIter iter; - gint valid; + gboolean valid; store = gtk_tree_view_get_model(GTK_TREE_VIEW(sd->result_view)); valid = gtk_tree_model_get_iter_first(store, &iter); @@ -680,7 +680,7 @@ filelist_free(list); } -static gint search_result_update_idle_cb(gpointer data) +static gboolean search_result_update_idle_cb(gpointer data) { SearchData *sd = data; @@ -755,7 +755,7 @@ GtkTreeModel *store; GtkTreeIter iter; MatchFileData *mfd = NULL; - gint valid; + gboolean valid; gint row = 0; gint length = 0; @@ -838,7 +838,7 @@ gtk_tree_view_columns_autosize(GTK_TREE_VIEW(sd->result_view)); } -static void search_result_thumb_enable(SearchData *sd, gint enable) +static void search_result_thumb_enable(SearchData *sd, gboolean enable) { if (sd->thumb_enable == enable) return; @@ -846,7 +846,7 @@ { GtkTreeModel *store; GtkTreeIter iter; - gint valid; + gboolean valid; thumb_loader_free(sd->thumb_loader); sd->thumb_loader = NULL; @@ -991,7 +991,7 @@ sd->editmenu_fd_list = NULL; } -static GtkWidget *search_result_menu(SearchData *sd, gint on_row, gint empty) +static GtkWidget *search_result_menu(SearchData *sd, gboolean on_row, gboolean empty) { GtkWidget *menu; GtkWidget *item; @@ -1063,7 +1063,7 @@ *------------------------------------------------------------------- */ -static gint search_result_press_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer data) +static gboolean search_result_press_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer data) { SearchData *sd = data; GtkTreeModel *store; @@ -1130,7 +1130,7 @@ return FALSE; } -static gint search_result_release_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer data) +static gboolean search_result_release_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer data) { SearchData *sd = data; GtkTreeModel *store; @@ -1192,7 +1192,7 @@ return FALSE; } -static gint search_result_keypress_cb(GtkWidget *widget, GdkEventKey *event, gpointer data) +static gboolean search_result_keypress_cb(GtkWidget *widget, GdkEventKey *event, gpointer data) { SearchData *sd = data; gboolean stop_signal = FALSE; @@ -1335,7 +1335,7 @@ return stop_signal; } -static gint search_window_keypress_cb(GtkWidget *widget, GdkEventKey *event, gpointer data) +static gboolean search_window_keypress_cb(GtkWidget *widget, GdkEventKey *event, gpointer data) { SearchData *sd = data; gboolean stop_signal = FALSE; @@ -1457,7 +1457,7 @@ #define MATCH_IS_BETWEEN(val, a, b) (b > a ? (val >= a && val <= b) : (val >= b && val <= a)) -static gint search_step_cb(gpointer data); +static gboolean search_step_cb(gpointer data); static void search_buffer_flush(SearchData *sd) @@ -1570,8 +1570,8 @@ search_file_load_process(sd, sd->img_cd); } -static gint search_file_do_extra(SearchData *sd, FileData *fd, gint *match, - gint *width, gint *height, gint *simval) +static gboolean search_file_do_extra(SearchData *sd, FileData *fd, gint *match, + gint *width, gint *height, gint *simval) { gboolean new_data = FALSE; gboolean tmatch = TRUE; @@ -1681,7 +1681,7 @@ return FALSE; } -static gint search_file_next(SearchData *sd) +static gboolean search_file_next(SearchData *sd) { FileData *fd; gboolean match = TRUE; @@ -1892,7 +1892,7 @@ if (comment) { - if (! sd->search_comment_match_case) + if (!sd->search_comment_match_case) { gchar *tmp = g_utf8_strdown(comment, -1); g_free(comment); @@ -1954,7 +1954,7 @@ return FALSE; } -static gint search_step_cb(gpointer data) +static gboolean search_step_cb(gpointer data) { SearchData *sd = data; FileData *fd; @@ -2326,7 +2326,7 @@ return 0; } -static void search_result_add_column(SearchData * sd, gint n, const gchar *title, gint image, gint right_justify) +static void search_result_add_column(SearchData * sd, gint n, const gchar *title, gboolean image, gboolean right_justify) { GtkTreeViewColumn *column; GtkCellRenderer *renderer; @@ -2359,7 +2359,7 @@ gtk_tree_view_append_column(GTK_TREE_VIEW(sd->result_view), column); } -static void menu_choice_set_visible(GtkWidget *widget, gint visible) +static void menu_choice_set_visible(GtkWidget *widget, gboolean visible) { if (visible) { @@ -2560,7 +2560,7 @@ gtk_widget_destroy(sd->window); } -static gint search_window_delete_cb(GtkWidget *widget, GdkEventAny *event, gpointer data) +static gboolean search_window_delete_cb(GtkWidget *widget, GdkEventAny *event, gpointer data) { SearchData *sd = data; @@ -2912,7 +2912,7 @@ { GtkTreeModel *store; GtkTreeIter iter; - gint valid; + gboolean valid; store = gtk_tree_view_get_model(GTK_TREE_VIEW(sd->result_view)); valid = gtk_tree_model_get_iter_first(store, &iter);