# HG changeset patch # User zas_ # Date 1237100872 0 # Node ID a3d3208b0c502feaad0635d21bf1a1187bdb8298 # Parent d7a6fb7a90ddfdcc36820c89b0517ea3fb4ce7c5 gint -> gboolean. diff -r d7a6fb7a90dd -r a3d3208b0c50 src/cache_maint.c --- a/src/cache_maint.c Sat Mar 14 23:26:42 2009 +0000 +++ b/src/cache_maint.c Sun Mar 15 07:07:52 2009 +0000 @@ -360,7 +360,7 @@ 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); @@ -434,7 +434,7 @@ 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); diff -r d7a6fb7a90dd -r a3d3208b0c50 src/format_canon.c --- a/src/format_canon.c Sat Mar 14 23:26:42 2009 +0000 +++ b/src/format_canon.c Sun Mar 15 07:07:52 2009 +0000 @@ -95,7 +95,7 @@ static gint canon_cr2_tiff_table(guchar *data, const guint len, guint offset, ExifByteOrder bo, guint *image_offset) { - gint jpeg_encoding = FALSE; + gboolean jpeg_encoding = FALSE; guint count; guint i; diff -r d7a6fb7a90dd -r a3d3208b0c50 src/format_raw.c --- a/src/format_raw.c Sat Mar 14 23:26:42 2009 +0000 +++ b/src/format_raw.c Sun Mar 15 07:07:52 2009 +0000 @@ -310,7 +310,7 @@ if (path) { const gchar *ext; - gint match = FALSE; + gboolean match = FALSE; gint i; ext = strrchr(path, '.'); diff -r d7a6fb7a90dd -r a3d3208b0c50 src/fullscreen.c --- a/src/fullscreen.c Sat Mar 14 23:26:42 2009 +0000 +++ b/src/fullscreen.c Sun Mar 15 07:07:52 2009 +0000 @@ -180,8 +180,8 @@ static void fullscreen_saver_deactivate(void) { - static gint checked = FALSE; - static gint found = FALSE; + static gboolean checked = FALSE; + static gboolean found = FALSE; if (!checked) { diff -r d7a6fb7a90dd -r a3d3208b0c50 src/layout.c --- a/src/layout.c Sat Mar 14 23:26:42 2009 +0000 +++ b/src/layout.c Sun Mar 15 07:07:52 2009 +0000 @@ -2124,8 +2124,8 @@ void layout_apply_options(LayoutWindow *lw, LayoutOptions *lop) { - gint refresh_style; - gint refresh_lists; + gboolean refresh_style; + gboolean refresh_lists; if (!layout_valid(&lw)) return; /* FIXME: add other options too */ diff -r d7a6fb7a90dd -r a3d3208b0c50 src/main.c --- a/src/main.c Sat Mar 14 23:26:42 2009 +0000 +++ b/src/main.c Sun Mar 15 07:07:52 2009 +0000 @@ -198,7 +198,7 @@ GList *list = NULL; GList *remote_list = NULL; GList *remote_errors = NULL; - gint remote_do = FALSE; + gboolean remote_do = FALSE; gchar *first_dir = NULL; command_line = g_new0(CommandLine, 1); diff -r d7a6fb7a90dd -r a3d3208b0c50 src/pixbuf_util.c --- a/src/pixbuf_util.c Sat Mar 14 23:26:42 2009 +0000 +++ b/src/pixbuf_util.c Sun Mar 15 07:07:52 2009 +0000 @@ -860,7 +860,7 @@ gint slope1_x, slope1_y; gint y; gint t; - gint middle = FALSE; + gboolean middle = FALSE; if (!pb) return; @@ -961,7 +961,7 @@ gdouble x1, gdouble y1, gdouble x2, gdouble y2, gdouble *rx1, gdouble *ry1, gdouble *rx2, gdouble *ry2) { - gint flip = FALSE; + gboolean flip = FALSE; gdouble d; if (x1 > x2) diff -r d7a6fb7a90dd -r a3d3208b0c50 src/preferences.c --- a/src/preferences.c Sat Mar 14 23:26:42 2009 +0000 +++ b/src/preferences.c Sun Mar 15 07:07:52 2009 +0000 @@ -219,7 +219,7 @@ static void config_window_apply(void) { gint i; - gint refresh = FALSE; + gboolean refresh = FALSE; // config_parse_editor_entries(editor_name_entry, editor_command_entry); // layout_edit_update_all(); diff -r d7a6fb7a90dd -r a3d3208b0c50 src/print.c --- a/src/print.c Sat Mar 14 23:26:42 2009 +0000 +++ b/src/print.c Sun Mar 15 07:07:52 2009 +0000 @@ -1525,7 +1525,7 @@ static gint print_job_rgb_page_done(PrintWindow *pw) { gchar *pathl; - gint ret = FALSE; + gboolean ret = FALSE; if (!pw->job_pixbuf) return FALSE; @@ -1624,7 +1624,7 @@ if (dpi < 25.0) { - static gint warned = FALSE; + static gboolean warned = FALSE; gdouble fallback_dpi = 96.0; if (!warned) @@ -1909,7 +1909,7 @@ gdouble x, gdouble y, gdouble w, gdouble h, gdouble offx, gdouble offy) { - gint success = FALSE; + gboolean success = FALSE; if (w <= 0.0 || h <= 0.0) return TRUE; @@ -1933,7 +1933,7 @@ gdouble x, gdouble y, gdouble width, guint8 r, guint8 g, guint8 b) { - gint success = TRUE; + gboolean success = TRUE; if (!text) return TRUE; @@ -2034,8 +2034,8 @@ gint sw, gint sh, gint proof) { GString *string; - gint space = FALSE; - gint newline = FALSE; + gboolean space = FALSE; + gboolean newline = FALSE; gint ret; if (pw->text_fields == 0) return TRUE; @@ -2097,7 +2097,7 @@ { PrintWindow *pw = data; GdkPixbuf *pixbuf; - gint success = TRUE; + gboolean success = TRUE; pixbuf = image_loader_get_pixbuf(il); if (pixbuf) @@ -2236,7 +2236,7 @@ gdouble proof_w, proof_h; gdouble icon_w, icon_h; gdouble scale; - gint success = TRUE; + gboolean success = TRUE; if (pw->proof_columns < 1 || pw->proof_rows < 1) { @@ -2436,7 +2436,7 @@ static gint print_job_init(PrintWindow *pw) { - gint success = FALSE; + gboolean success = FALSE; pw->job_page = 0; @@ -2459,7 +2459,7 @@ static gint print_job_finish(PrintWindow *pw) { - gint success = FALSE; + gboolean success = FALSE; switch (pw->job_format) { @@ -3046,9 +3046,9 @@ static void print_output_set(PrintWindow *pw, PrintOutput output) { - gint use_file = FALSE; - gint use_custom = FALSE; - gint use_format = FALSE; + gboolean use_file = FALSE; + gboolean use_custom = FALSE; + gboolean use_format = FALSE; pw->output = output; diff -r d7a6fb7a90dd -r a3d3208b0c50 src/remote.c --- a/src/remote.c Sat Mar 14 23:26:42 2009 +0000 +++ b/src/remote.c Sun Mar 15 07:07:52 2009 +0000 @@ -294,7 +294,7 @@ static gint remote_client_send(RemoteConnection *rc, const gchar *text) { struct sigaction new_action, old_action; - gint ret = FALSE; + gboolean ret = FALSE; if (!rc || rc->server) return FALSE; if (!text) return TRUE; @@ -521,7 +521,7 @@ static void gr_list_add(const gchar *text, gpointer data) { RemoteData *remote_data = data; - gint new = TRUE; + gboolean new = TRUE; if (!remote_data->command_collection) { @@ -595,7 +595,7 @@ static RemoteCommandEntry *remote_command_find(const gchar *text, const gchar **offset) { - gint match = FALSE; + gboolean match = FALSE; gint i; i = 0; @@ -697,7 +697,7 @@ GList *cmd_list, GList *collection_list) { RemoteConnection *rc; - gint started = FALSE; + gboolean started = FALSE; gchar *buf; buf = g_build_filename(get_rc_dir(), ".command", NULL); @@ -707,7 +707,7 @@ GString *command; GList *work; gint retry_count = 12; - gint blank = FALSE; + gboolean blank = FALSE; printf_term(_("Remote %s not running, starting..."), GQ_APPNAME); @@ -763,8 +763,8 @@ { GList *work; const gchar *prefix; - gint use_path = TRUE; - gint sent = FALSE; + gboolean use_path = TRUE; + gboolean sent = FALSE; work = remote_list; while (work) diff -r d7a6fb7a90dd -r a3d3208b0c50 src/search.c --- a/src/search.c Sat Mar 14 23:26:42 2009 +0000 +++ b/src/search.c Sun Mar 15 07:07:52 2009 +0000 @@ -371,7 +371,7 @@ GtkTreeSelection *selection; GList *slist; GList *work; - gint found = FALSE; + gboolean found = FALSE; selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(sd->result_view)); slist = gtk_tree_selection_get_selected_rows(selection, &store); @@ -1195,7 +1195,7 @@ static gint search_result_keypress_cb(GtkWidget *widget, GdkEventKey *event, gpointer data) { SearchData *sd = data; - gint stop_signal = FALSE; + gboolean stop_signal = FALSE; GtkTreeModel *store; GtkTreeSelection *selection; GList *slist; @@ -1338,7 +1338,7 @@ static gint search_window_keypress_cb(GtkWidget *widget, GdkEventKey *event, gpointer data) { SearchData *sd = data; - gint stop_signal = FALSE; + gboolean stop_signal = FALSE; if (event->state & GDK_CONTROL_MASK) { @@ -1573,9 +1573,9 @@ static gint search_file_do_extra(SearchData *sd, FileData *fd, gint *match, gint *width, gint *height, gint *simval) { - gint new_data = FALSE; - gint tmatch = TRUE; - gint tested = FALSE; + gboolean new_data = FALSE; + gboolean tmatch = TRUE; + gboolean tested = FALSE; if (!sd->img_cd) { @@ -1684,9 +1684,9 @@ static gint search_file_next(SearchData *sd) { FileData *fd; - gint match = TRUE; - gint tested = FALSE; - gint extra_only = FALSE; + gboolean match = TRUE; + gboolean tested = FALSE; + gboolean extra_only = FALSE; gint width = 0; gint height = 0; gint sim = 0; @@ -1817,7 +1817,7 @@ if (sd->match_keywords == SEARCH_MATCH_ALL) { - gint found = TRUE; + gboolean found = TRUE; needle = sd->search_keyword_list; while (needle && found) @@ -1837,7 +1837,7 @@ } else if (sd->match_keywords == SEARCH_MATCH_ANY) { - gint found = FALSE; + gboolean found = FALSE; needle = sd->search_keyword_list; while (needle && !found) @@ -1856,7 +1856,7 @@ } else if (sd->match_keywords == SEARCH_MATCH_NONE) { - gint found = FALSE; + gboolean found = FALSE; needle = sd->search_keyword_list; while (needle && !found) @@ -1991,7 +1991,7 @@ { GList *list = NULL; GList *dlist = NULL; - gint success = FALSE; + gboolean success = FALSE; sd->search_done_list = g_list_prepend(sd->search_done_list, fd); diff -r d7a6fb7a90dd -r a3d3208b0c50 src/thumb_standard.c --- a/src/thumb_standard.c Sat Mar 14 23:26:42 2009 +0000 +++ b/src/thumb_standard.c Sun Mar 15 07:07:52 2009 +0000 @@ -197,7 +197,7 @@ static gint thumb_loader_std_fail_check(ThumbLoaderStd *tl) { gchar *fail_path; - gint result = FALSE; + gboolean result = FALSE; fail_path = thumb_loader_std_cache_path(tl, FALSE, NULL, TRUE); if (isfile(fail_path)) @@ -776,7 +776,7 @@ { ThumbValidate *tv = data; GdkPixbuf *pixbuf; - gint valid = FALSE; + gboolean valid = FALSE; /* this function is called on success, so the pixbuf should not be a fallback*/ pixbuf = thumb_loader_std_get_pixbuf(tv->tl); diff -r d7a6fb7a90dd -r a3d3208b0c50 src/trash.c --- a/src/trash.c Sat Mar 14 23:26:42 2009 +0000 +++ b/src/trash.c Sun Mar 15 07:07:52 2009 +0000 @@ -33,8 +33,8 @@ 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); @@ -126,7 +126,7 @@ { static GenericDialog *gd = NULL; gchar *result = NULL; - gint success = TRUE; + gboolean success = TRUE; if (!isfile(path)) return FALSE; diff -r d7a6fb7a90dd -r a3d3208b0c50 src/ui_fileops.c --- a/src/ui_fileops.c Sat Mar 14 23:26:42 2009 +0000 +++ b/src/ui_fileops.c Sun Mar 15 07:07:52 2009 +0000 @@ -69,7 +69,7 @@ static void encoding_dialog(const gchar *path) { - static gint warned_user = FALSE; + static gboolean warned_user = FALSE; GenericDialog *gd; GString *string; const gchar *lc; @@ -418,7 +418,7 @@ gint filetime_set(const gchar *s, time_t tval) { - gint ret = FALSE; + gboolean ret = FALSE; if (tval > 0) { @@ -519,7 +519,7 @@ { struct stat st; gchar *sl, *tl; - gint ret = FALSE; + gboolean ret = FALSE; if (!s || !t) return FALSE; @@ -615,7 +615,7 @@ gint move_file(const gchar *s, const gchar *t) { gchar *sl, *tl; - gint ret = TRUE; + gboolean ret = TRUE; if (!s || !t) return FALSE; @@ -868,7 +868,7 @@ gchar *path; gchar *namel; gint p, l; - gint ret = FALSE; + gboolean ret = FALSE; if (!name) return FALSE; path = g_strdup(getenv("PATH")); @@ -909,7 +909,7 @@ p++; if (p[0] == G_DIR_SEPARATOR || p[0] == '\0') { - gint end = TRUE; + gboolean end = TRUE; if (p[0] != '\0') { diff -r d7a6fb7a90dd -r a3d3208b0c50 src/ui_menu.c --- a/src/ui_menu.c Sat Mar 14 23:26:42 2009 +0000 +++ b/src/ui_menu.c Sun Mar 15 07:07:52 2009 +0000 @@ -165,7 +165,7 @@ gint popup_menu_position_clamp(GtkMenu *menu, gint *x, gint *y, gint height) { - gint adjusted = FALSE; + gboolean adjusted = FALSE; gint w, h; gint xw, xh; diff -r d7a6fb7a90dd -r a3d3208b0c50 src/ui_pathsel.c --- a/src/ui_pathsel.c Sat Mar 14 23:26:42 2009 +0000 +++ b/src/ui_pathsel.c Sun Mar 15 07:07:52 2009 +0000 @@ -735,7 +735,7 @@ gchar *path; gchar *buf; const gchar *tmp; - gint from_text = FALSE; + gboolean from_text = FALSE; tmp = gtk_entry_get_text(GTK_ENTRY(dd->entry)); if (!isname(tmp)) diff -r d7a6fb7a90dd -r a3d3208b0c50 src/ui_tabcomp.c --- a/src/ui_tabcomp.c Sat Mar 14 23:26:42 2009 +0000 +++ b/src/ui_tabcomp.c Sun Mar 15 07:07:52 2009 +0000 @@ -409,7 +409,7 @@ const gchar *entry_file; gchar *entry_dir; gchar *ptr; - gint home_exp = FALSE; + gboolean home_exp = FALSE; if (entry_text[0] == '\0') { @@ -547,7 +547,7 @@ else { gsize c = strlen(entry_file); - gint done = FALSE; + gboolean done = FALSE; gchar *test_file = poss->data; while (!done) @@ -602,7 +602,7 @@ static gint tab_completion_key_pressed(GtkWidget *widget, GdkEventKey *event, gpointer data) { TabCompData *td = data; - gint stop_signal = FALSE; + gboolean stop_signal = FALSE; switch (event->keyval) { diff -r d7a6fb7a90dd -r a3d3208b0c50 src/ui_tree_edit.c --- a/src/ui_tree_edit.c Sat Mar 14 23:26:42 2009 +0000 +++ b/src/ui_tree_edit.c Sun Mar 15 07:07:52 2009 +0000 @@ -410,7 +410,7 @@ GtkTreeModel *store; GtkTreePath *tpath; GtkTreePath *fpath; - gint move = FALSE; + gboolean move = FALSE; if (!iter) return FALSE; diff -r d7a6fb7a90dd -r a3d3208b0c50 src/ui_utildlg.c --- a/src/ui_utildlg.c Sat Mar 14 23:26:42 2009 +0000 +++ b/src/ui_utildlg.c Sun Mar 15 07:07:52 2009 +0000 @@ -125,7 +125,7 @@ { GtkSettings *settings; GObjectClass *klass; - gint alternative_order = FALSE; + gboolean alternative_order = FALSE; settings = gtk_settings_get_for_screen(gtk_widget_get_screen(widget)); klass = G_OBJECT_CLASS(GTK_SETTINGS_GET_CLASS(settings)); diff -r d7a6fb7a90dd -r a3d3208b0c50 src/view_dir.c --- a/src/view_dir.c Sat Mar 14 23:26:42 2009 +0000 +++ b/src/view_dir.c Sun Mar 15 07:07:52 2009 +0000 @@ -120,7 +120,7 @@ gint vd_set_fd(ViewDir *vd, FileData *dir_fd) { - gint ret = FALSE; + gboolean ret = FALSE; file_data_unregister_notify_func(vd_notify_cb, vd); @@ -168,7 +168,7 @@ gint vd_find_row(ViewDir *vd, FileData *fd, GtkTreeIter *iter) { - gint ret = FALSE; + gboolean ret = FALSE; switch (vd->type) { @@ -557,8 +557,8 @@ GtkWidget *submenu; GtkWidget *item; gint active; - gint rename_delete_active = FALSE; - gint new_folder_active = FALSE; + gboolean rename_delete_active = FALSE; + gboolean new_folder_active = FALSE; gint i; active = (fd != NULL); @@ -746,7 +746,7 @@ { GList *list; gint active; - gint done = FALSE; + gboolean done = FALSE; list = uri_filelist_from_text((gchar *)selection_data->data, TRUE); if (!list) return; @@ -994,7 +994,7 @@ gint vd_press_key_cb(GtkWidget *widget, GdkEventKey *event, gpointer data) { ViewDir *vd = data; - gint ret = FALSE; + gboolean ret = FALSE; switch (vd->type) { @@ -1008,7 +1008,7 @@ gint vd_press_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer data) { ViewDir *vd = data; - gint ret = FALSE; + gboolean ret = FALSE; switch (vd->type) { diff -r d7a6fb7a90dd -r a3d3208b0c50 src/view_dir_list.c --- a/src/view_dir_list.c Sat Mar 14 23:26:42 2009 +0000 +++ b/src/view_dir_list.c Sun Mar 15 07:07:52 2009 +0000 @@ -188,7 +188,7 @@ GdkPixbuf *pixbuf; const gchar *date = ""; fd = work->data; - gint done = FALSE; + gboolean done = FALSE; if (access_file(fd->path, R_OK | X_OK) && fd->name) { diff -r d7a6fb7a90dd -r a3d3208b0c50 src/view_dir_tree.c --- a/src/view_dir_tree.c Sat Mar 14 23:26:42 2009 +0000 +++ b/src/view_dir_tree.c Sun Mar 15 07:07:52 2009 +0000 @@ -665,7 +665,7 @@ *---------------------------------------------------------------------------- */ -static gint selection_is_ok = FALSE; +static gboolean selection_is_ok = FALSE; static gboolean vdtree_select_cb(GtkTreeSelection *selection, GtkTreeModel *store, GtkTreePath *tpath, gboolean path_currently_selected, gpointer data) diff -r d7a6fb7a90dd -r a3d3208b0c50 src/view_file.c --- a/src/view_file.c Sat Mar 14 23:26:42 2009 +0000 +++ b/src/view_file.c Sun Mar 15 07:07:52 2009 +0000 @@ -115,7 +115,7 @@ static gint vf_press_key_cb(GtkWidget *widget, GdkEventKey *event, gpointer data) { ViewFile *vf = data; - gint ret = FALSE; + gboolean ret = FALSE; switch (vf->type) { @@ -135,7 +135,7 @@ static gint vf_press_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer data) { ViewFile *vf = data; - gint ret = FALSE; + gboolean ret = FALSE; switch (vf->type) { @@ -149,7 +149,7 @@ static gint vf_release_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer data) { ViewFile *vf = data; - gint ret = FALSE; + gboolean ret = FALSE; switch (vf->type) { @@ -603,7 +603,7 @@ gint vf_refresh(ViewFile *vf) { - gint ret = FALSE; + gboolean ret = FALSE; switch (vf->type) { @@ -616,7 +616,7 @@ gint vf_set_fd(ViewFile *vf, FileData *dir_fd) { - gint ret = FALSE; + gboolean ret = FALSE; switch (vf->type) { diff -r d7a6fb7a90dd -r a3d3208b0c50 src/view_file_icon.c --- a/src/view_file_icon.c Sat Mar 14 23:26:42 2009 +0000 +++ b/src/view_file_icon.c Sun Mar 15 07:07:52 2009 +0000 @@ -1962,7 +1962,7 @@ { GtkTreeModel *store; GtkTreeIter iter; - gint valid = TRUE; + gboolean valid = TRUE; store = gtk_tree_view_get_model(GTK_TREE_VIEW(vf->listview)); gtk_tree_model_get_iter(store, &iter, tpath); @@ -2162,7 +2162,7 @@ static gint vficon_refresh_real(ViewFile *vf, gint keep_position) { - gint ret = TRUE; + gboolean ret = TRUE; GList *work, *work_fd; IconData *focus_id; GList *new_filelist = NULL; diff -r d7a6fb7a90dd -r a3d3208b0c50 src/view_file_list.c --- a/src/view_file_list.c Sat Mar 14 23:26:42 2009 +0000 +++ b/src/view_file_list.c Sun Mar 15 07:07:52 2009 +0000 @@ -851,7 +851,7 @@ { gint match; FileData *fd = work->data; - gint done = FALSE; + gboolean done = FALSE; while (!done) { @@ -1124,7 +1124,7 @@ { GtkTreeModel *store; GtkTreeIter iter; - gint valid = TRUE; + gboolean valid = TRUE; store = gtk_tree_view_get_model(GTK_TREE_VIEW(vf->listview)); gtk_tree_model_get_iter(store, &iter, tpath); @@ -1286,7 +1286,7 @@ GtkTreeSelection *selection; GList *slist; GList *work; - gint found = FALSE; + gboolean found = FALSE; selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(vf->listview)); slist = gtk_tree_selection_get_selected_rows(selection, &store); @@ -1724,7 +1724,7 @@ gint vflist_refresh(ViewFile *vf) { GList *old_list; - gint ret = TRUE; + gboolean ret = TRUE; old_list = vf->list; vf->list = NULL;