# HG changeset patch # User zas_ # Date 1237148180 0 # Node ID 89dedc61b1bdaa770e1abf4ee347930a7a47ebd8 # Parent a10d70ae85e9aa17922d8f9ca6ec5c0b0c9f5e30 gint -> gboolean. diff -r a10d70ae85e9 -r 89dedc61b1bd src/ui_fileops.c --- a/src/ui_fileops.c Sun Mar 15 18:41:25 2009 +0000 +++ b/src/ui_fileops.c Sun Mar 15 20:16:20 2009 +0000 @@ -50,7 +50,7 @@ static void encoding_dialog(const gchar *path); -static gint encoding_dialog_idle(gpointer data) +static gboolean encoding_dialog_idle(gpointer data) { gchar *path = data; @@ -301,10 +301,10 @@ return trash_dir; } -gint stat_utf8(const gchar *s, struct stat *st) +gboolean stat_utf8(const gchar *s, struct stat *st) { gchar *sl; - gint ret; + gboolean ret; if (!s) return FALSE; sl = path_from_utf8(s); @@ -314,10 +314,10 @@ return ret; } -gint lstat_utf8(const gchar *s, struct stat *st) +gboolean lstat_utf8(const gchar *s, struct stat *st) { gchar *sl; - gint ret; + gboolean ret; if (!s) return FALSE; sl = path_from_utf8(s); @@ -328,11 +328,11 @@ } /* extension must contain only ASCII characters */ -gint stat_utf8_case_insensitive_ext(GString *base, const gchar *ext, struct stat *st) +gboolean stat_utf8_case_insensitive_ext(GString *base, const gchar *ext, struct stat *st) { gchar *sl; gchar *extl; - gint ret = 0; + gboolean ret = FALSE; gint ext_len; gint base_len = strlen(base->str); @@ -372,28 +372,28 @@ return ret; } -gint isname(const gchar *s) +gboolean isname(const gchar *s) { struct stat st; return stat_utf8(s, &st); } -gint isfile(const gchar *s) +gboolean isfile(const gchar *s) { struct stat st; return (stat_utf8(s, &st) && S_ISREG(st.st_mode)); } -gint isdir(const gchar *s) +gboolean isdir(const gchar *s) { struct stat st; return (stat_utf8(s, &st) && S_ISDIR(st.st_mode)); } -gint islink(const gchar *s) +gboolean islink(const gchar *s) { struct stat st; @@ -416,7 +416,7 @@ return st.st_mtime; } -gint filetime_set(const gchar *s, time_t tval) +gboolean filetime_set(const gchar *s, time_t tval) { gboolean ret = FALSE; @@ -441,7 +441,7 @@ return access_file(s, R_OK); } -gint access_file(const gchar *s, gint mode) +gboolean access_file(const gchar *s, gint mode) { gchar *sl; gint ret; @@ -455,10 +455,10 @@ return ret; } -gint unlink_file(const gchar *s) +gboolean unlink_file(const gchar *s) { gchar *sl; - gint ret; + gboolean ret; if (!s) return FALSE; @@ -469,11 +469,11 @@ return ret; } -gint symlink_utf8(const gchar *source, const gchar *target) +gboolean symlink_utf8(const gchar *source, const gchar *target) { gchar *sl; gchar *tl; - gint ret; + gboolean ret; if (!source || !target) return FALSE; @@ -488,10 +488,10 @@ return ret; } -gint mkdir_utf8(const gchar *s, gint mode) +gboolean mkdir_utf8(const gchar *s, gint mode) { gchar *sl; - gint ret; + gboolean ret; if (!s) return FALSE; @@ -501,10 +501,10 @@ return ret; } -gint rmdir_utf8(const gchar *s) +gboolean rmdir_utf8(const gchar *s) { gchar *sl; - gint ret; + gboolean ret; if (!s) return FALSE; @@ -515,7 +515,7 @@ return ret; } -gint copy_file_attributes(const gchar *s, const gchar *t, gint perms, gint mtime) +gboolean copy_file_attributes(const gchar *s, const gchar *t, gint perms, gint mtime) { struct stat st; gchar *sl, *tl; @@ -549,7 +549,7 @@ } /* paths are in filesystem encoding */ -static gint hard_linked(const gchar *a, const gchar *b) +static gboolean hard_linked(const gchar *a, const gchar *b) { struct stat sta; struct stat stb; @@ -560,7 +560,7 @@ sta.st_ino == stb.st_ino); } -gint copy_file(const gchar *s, const gchar *t) +gboolean copy_file(const gchar *s, const gchar *t) { FILE *fi = NULL; FILE *fo = NULL; @@ -612,7 +612,7 @@ return TRUE; } -gint move_file(const gchar *s, const gchar *t) +gboolean move_file(const gchar *s, const gchar *t) { gchar *sl, *tl; gboolean ret = TRUE; @@ -644,10 +644,10 @@ return ret; } -gint rename_file(const gchar *s, const gchar *t) +gboolean rename_file(const gchar *s, const gchar *t) { gchar *sl, *tl; - gint ret; + gboolean ret; if (!s || !t) return FALSE; @@ -696,7 +696,7 @@ return g_list_reverse(new_list); } -gchar *unique_filename(const gchar *path, const gchar *ext, const gchar *divider, gint pad) +gchar *unique_filename(const gchar *path, const gchar *ext, const gchar *divider, gboolean pad) { gchar *unique; gint n = 1; @@ -791,7 +791,7 @@ return strrchr(path, '.'); } -gint file_extension_match(const gchar *path, const gchar *ext) +gboolean file_extension_match(const gchar *path, const gchar *ext) { gint p; gint e; @@ -863,7 +863,7 @@ path[t] = '\0'; } -gint file_in_path(const gchar *name) +gboolean file_in_path(const gchar *name) { gchar *path; gchar *namel; diff -r a10d70ae85e9 -r 89dedc61b1bd src/ui_fileops.h --- a/src/ui_fileops.h Sun Mar 15 18:41:25 2009 +0000 +++ b/src/ui_fileops.h Sun Mar 15 20:16:20 2009 +0000 @@ -49,28 +49,28 @@ const gchar *get_collections_dir(void); const gchar *get_trash_dir(void); -gint stat_utf8(const gchar *s, struct stat *st); -gint lstat_utf8(const gchar *s, struct stat *st); -gint stat_utf8_case_insensitive_ext(GString *base, const gchar *ext, struct stat *st); +gboolean stat_utf8(const gchar *s, struct stat *st); +gboolean lstat_utf8(const gchar *s, struct stat *st); +gboolean stat_utf8_case_insensitive_ext(GString *base, const gchar *ext, struct stat *st); -gint isname(const gchar *s); -gint isfile(const gchar *s); -gint isdir(const gchar *s); -gint islink(const gchar *s); +gboolean isname(const gchar *s); +gboolean isfile(const gchar *s); +gboolean isdir(const gchar *s); +gboolean islink(const gchar *s); gint64 filesize(const gchar *s); time_t filetime(const gchar *s); -gint filetime_set(const gchar *s, time_t tval); +gboolean filetime_set(const gchar *s, time_t tval); gboolean is_readable_file(const gchar *s); -gint access_file(const gchar *s, gint mode); -gint unlink_file(const gchar *s); -gint symlink_utf8(const gchar *source, const gchar *target); -gint mkdir_utf8(const gchar *s, gint mode); -gint rmdir_utf8(const gchar *s); -gint copy_file_attributes(const gchar *s, const gchar *t, gint perms, gint mtime); -gint copy_file(const gchar *s, const gchar *t); -gint move_file(const gchar *s, const gchar *t); -gint rename_file(const gchar *s, const gchar *t); +gboolean access_file(const gchar *s, gint mode); +gboolean unlink_file(const gchar *s); +gboolean symlink_utf8(const gchar *source, const gchar *target); +gboolean mkdir_utf8(const gchar *s, gint mode); +gboolean rmdir_utf8(const gchar *s); +gboolean copy_file_attributes(const gchar *s, const gchar *t, gint perms, gint mtime); +gboolean copy_file(const gchar *s, const gchar *t); +gboolean move_file(const gchar *s, const gchar *t); +gboolean rename_file(const gchar *s, const gchar *t); gchar *get_current_dir(void); /* return True on success, it is up to you to free @@ -79,7 +79,7 @@ void string_list_free(GList *list); GList *string_list_copy(const GList *list); -gchar *unique_filename(const gchar *path, const gchar *ext, const gchar *divider, gint pad); +gchar *unique_filename(const gchar *path, const gchar *ext, const gchar *divider, gboolean pad); gchar *unique_filename_simple(const gchar *path); const gchar *filename_from_path(const gchar *path); @@ -88,12 +88,12 @@ const gchar *extension_from_path(const gchar *path); gchar *remove_extension_from_path(const gchar *path); -gint file_extension_match(const gchar *path, const gchar *ext); +gboolean file_extension_match(const gchar *path, const gchar *ext); /* warning note: this modifies path string! */ void parse_out_relatives(gchar *path); -gint file_in_path(const gchar *name); +gboolean file_in_path(const gchar *name); gboolean recursive_mkdir_if_not_exists(const gchar *path, mode_t mode); diff -r a10d70ae85e9 -r 89dedc61b1bd src/ui_help.c --- a/src/ui_help.c Sun Mar 15 18:41:25 2009 +0000 +++ b/src/ui_help.c Sun Mar 15 20:16:20 2009 +0000 @@ -146,7 +146,7 @@ gtk_text_view_scroll_to_iter(GTK_TEXT_VIEW(text), &iter, 0.0, TRUE, 0, 0); } -static gint help_window_delete_cb(GtkWidget *widget, GdkEventAny *event, gpointer data) +static gboolean help_window_delete_cb(GtkWidget *widget, GdkEventAny *event, gpointer data) { gtk_widget_destroy(widget); return TRUE; diff -r a10d70ae85e9 -r 89dedc61b1bd src/ui_menu.c --- a/src/ui_menu.c Sun Mar 15 18:41:25 2009 +0000 +++ b/src/ui_menu.c Sun Mar 15 20:16:20 2009 +0000 @@ -63,7 +63,7 @@ return item; } -GtkWidget *menu_item_add_sensitive(GtkWidget *menu, const gchar *label, gint sensitive, +GtkWidget *menu_item_add_sensitive(GtkWidget *menu, const gchar *label, gboolean sensitive, GCallback func, gpointer data) { GtkWidget *item; @@ -74,7 +74,7 @@ return item; } -GtkWidget *menu_item_add_stock_sensitive(GtkWidget *menu, const gchar *label, const gchar *stock_id, gint sensitive, +GtkWidget *menu_item_add_stock_sensitive(GtkWidget *menu, const gchar *label, const gchar *stock_id, gboolean sensitive, GCallback func, gpointer data) { GtkWidget *item; @@ -85,7 +85,7 @@ return item; } -GtkWidget *menu_item_add_check(GtkWidget *menu, const gchar *label, gint active, +GtkWidget *menu_item_add_check(GtkWidget *menu, const gchar *label, gboolean active, GCallback func, gpointer data) { GtkWidget *item; @@ -98,7 +98,7 @@ } GtkWidget *menu_item_add_radio(GtkWidget *menu, GtkWidget *parent, - const gchar *label, gint active, + const gchar *label, gboolean active, GCallback func, gpointer data) { GtkWidget *item; @@ -163,7 +163,7 @@ return menu; } -gint popup_menu_position_clamp(GtkMenu *menu, gint *x, gint *y, gint height) +gboolean popup_menu_position_clamp(GtkMenu *menu, gint *x, gint *y, gint height) { gboolean adjusted = FALSE; gint w, h; diff -r a10d70ae85e9 -r 89dedc61b1bd src/ui_menu.h --- a/src/ui_menu.h Sun Mar 15 18:41:25 2009 +0000 +++ b/src/ui_menu.h Sun Mar 15 20:16:20 2009 +0000 @@ -19,14 +19,14 @@ GCallback func, gpointer data); GtkWidget *menu_item_add_stock(GtkWidget *menu, const gchar *label, const gchar *stock_id, GCallback func, gpointer data); -GtkWidget *menu_item_add_sensitive(GtkWidget *menu, const gchar *label, gint sensitive, +GtkWidget *menu_item_add_sensitive(GtkWidget *menu, const gchar *label, gboolean sensitive, GCallback func, gpointer data); -GtkWidget *menu_item_add_stock_sensitive(GtkWidget *menu, const gchar *label, const gchar *stock_id, gint sensitive, +GtkWidget *menu_item_add_stock_sensitive(GtkWidget *menu, const gchar *label, const gchar *stock_id, gboolean sensitive, GCallback func, gpointer data); -GtkWidget *menu_item_add_check(GtkWidget *menu, const gchar *label, gint active, +GtkWidget *menu_item_add_check(GtkWidget *menu, const gchar *label, gboolean active, GCallback func, gpointer data); GtkWidget *menu_item_add_radio(GtkWidget *menu, GtkWidget *parent, - const gchar *label, gint active, + const gchar *label, gboolean active, GCallback func, gpointer data); void menu_item_add_divider(GtkWidget *menu); @@ -39,7 +39,7 @@ /* clamp a menu's position to within the screen * if menu will attempt to stay out of region y to y+height */ -gint popup_menu_position_clamp(GtkMenu *menu, gint *x, gint *y, gint height); +gboolean popup_menu_position_clamp(GtkMenu *menu, gint *x, gint *y, gint height); #endif diff -r a10d70ae85e9 -r 89dedc61b1bd src/ui_misc.c --- a/src/ui_misc.c Sun Mar 15 18:41:25 2009 +0000 +++ b/src/ui_misc.c Sun Mar 15 20:16:20 2009 +0000 @@ -34,8 +34,8 @@ *----------------------------------------------------------------------------- */ -GtkWidget *pref_box_new(GtkWidget *parent_box, gint fill, - GtkOrientation orientation, gint padding) +GtkWidget *pref_box_new(GtkWidget *parent_box, gboolean fill, + GtkOrientation orientation, gboolean padding) { GtkWidget *box; @@ -54,7 +54,7 @@ return box; } -GtkWidget *pref_group_new(GtkWidget *parent_box, gint fill, +GtkWidget *pref_group_new(GtkWidget *parent_box, gboolean fill, const gchar *text, GtkOrientation orientation) { GtkWidget *box; @@ -121,9 +121,9 @@ return child; } -GtkWidget *pref_frame_new(GtkWidget *parent_box, gint fill, +GtkWidget *pref_frame_new(GtkWidget *parent_box, gboolean fill, const gchar *text, - GtkOrientation orientation, gint padding) + GtkOrientation orientation, gboolean padding) { GtkWidget *box; GtkWidget *frame = NULL; @@ -147,7 +147,7 @@ return box; } -GtkWidget *pref_spacer(GtkWidget *parent_box, gint padding) +GtkWidget *pref_spacer(GtkWidget *parent_box, gboolean padding) { GtkWidget *spacer; @@ -158,7 +158,7 @@ return spacer; } -GtkWidget *pref_line(GtkWidget *parent_box, gint padding) +GtkWidget *pref_line(GtkWidget *parent_box, gboolean padding) { GtkWidget *spacer; @@ -200,7 +200,7 @@ return label; } -void pref_label_bold(GtkWidget *label, gint bold, gint increase_size) +void pref_label_bold(GtkWidget *label, gboolean bold, gboolean increase_size) { PangoAttrList *pal; PangoAttribute *pa; @@ -230,7 +230,7 @@ } GtkWidget *pref_button_new(GtkWidget *parent_box, const gchar *stock_id, - const gchar *text, gint hide_stock_text, + const gchar *text, gboolean hide_stock_text, GCallback func, gpointer data) { GtkWidget *button; @@ -298,8 +298,8 @@ return button; } -static GtkWidget *real_pref_checkbox_new(GtkWidget *parent_box, const gchar *text, gint mnemonic_text, - gint active, GCallback func, gpointer data) +static GtkWidget *real_pref_checkbox_new(GtkWidget *parent_box, const gchar *text, gboolean mnemonic_text, + gboolean active, GCallback func, gpointer data) { GtkWidget *button; @@ -320,13 +320,13 @@ return button; } -GtkWidget *pref_checkbox_new(GtkWidget *parent_box, const gchar *text, gint active, +GtkWidget *pref_checkbox_new(GtkWidget *parent_box, const gchar *text, gboolean active, GCallback func, gpointer data) { return real_pref_checkbox_new(parent_box, text, FALSE, active, func, data); } -GtkWidget *pref_checkbox_new_mnemonic(GtkWidget *parent_box, const gchar *text, gint active, +GtkWidget *pref_checkbox_new_mnemonic(GtkWidget *parent_box, const gchar *text, gboolean active, GCallback func, gpointer data) { return real_pref_checkbox_new(parent_box, text, TRUE, active, func, data); @@ -334,13 +334,13 @@ static void pref_checkbox_int_cb(GtkWidget *widget, gpointer data) { - gint *result = data; + gboolean *result = data; *result = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); } -GtkWidget *pref_checkbox_new_int(GtkWidget *parent_box, const gchar *text, gint active, - gint *result) +GtkWidget *pref_checkbox_new_int(GtkWidget *parent_box, const gchar *text, gboolean active, + gboolean *result) { GtkWidget *button; @@ -382,7 +382,7 @@ } static GtkWidget *real_pref_radiobutton_new(GtkWidget *parent_box, GtkWidget *sibling, - const gchar *text, gint mnemonic_text, gint active, + const gchar *text, gboolean mnemonic_text, gboolean active, GCallback func, gpointer data) { GtkWidget *button; @@ -416,14 +416,14 @@ } GtkWidget *pref_radiobutton_new(GtkWidget *parent_box, GtkWidget *sibling, - const gchar *text, gint active, + const gchar *text, gboolean active, GCallback func, gpointer data) { return real_pref_radiobutton_new(parent_box, sibling, text, FALSE, active, func, data); } GtkWidget *pref_radiobutton_new_mnemonic(GtkWidget *parent_box, GtkWidget *sibling, - const gchar *text, gint active, + const gchar *text, gboolean active, GCallback func, gpointer data) { return real_pref_radiobutton_new(parent_box, sibling, text, TRUE, active, func, data); @@ -433,7 +433,7 @@ static void pref_radiobutton_int_cb(GtkWidget *widget, gpointer data) { - gint *result = data; + gboolean *result = data; if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget))) { @@ -442,8 +442,8 @@ } GtkWidget *pref_radiobutton_new_int(GtkWidget *parent_box, GtkWidget *sibling, - const gchar *text, gint active, - gint *result, gint value, + const gchar *text, gboolean active, + gboolean *result, gboolean value, GCallback func, gpointer data) { GtkWidget *button; @@ -457,7 +457,7 @@ } static GtkWidget *real_pref_spin_new(GtkWidget *parent_box, const gchar *text, const gchar *suffix, - gint mnemonic_text, + gboolean mnemonic_text, gdouble min, gdouble max, gdouble step, gint digits, gdouble value, GCallback func, gpointer data) @@ -573,11 +573,11 @@ } GtkWidget *pref_table_new(GtkWidget *parent_box, gint columns, gint rows, - gint homogenious, gint fill) + gboolean homogeneous, gboolean fill) { GtkWidget *table; - table = gtk_table_new(rows, columns, homogenious); + table = gtk_table_new(rows, columns, homogeneous); gtk_table_set_row_spacings(GTK_TABLE(table), PREF_PAD_GAP); gtk_table_set_col_spacings(GTK_TABLE(table), PREF_PAD_SPACE); @@ -640,7 +640,7 @@ } GtkWidget *pref_table_button(GtkWidget *table, gint column, gint row, - const gchar *stock_id, const gchar *text, gint hide_stock_text, + const gchar *stock_id, const gchar *text, gboolean hide_stock_text, GCallback func, gpointer data) { GtkWidget *button; @@ -769,7 +769,7 @@ } GtkWidget *pref_toolbar_button(GtkWidget *toolbar, - const gchar *stock_id, const gchar *label, gint toggle, + const gchar *stock_id, const gchar *label, gboolean toggle, const gchar *description, GCallback func, gpointer data) { @@ -892,7 +892,7 @@ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(ds->button), FALSE); } -static gint date_selection_popup_release_cb(GtkWidget *widget, GdkEventButton *event, gpointer data) +static gboolean date_selection_popup_release_cb(GtkWidget *widget, GdkEventButton *event, gpointer data) { DateSelection *ds = data; @@ -900,7 +900,7 @@ return TRUE; } -static gint date_selection_popup_press_cb(GtkWidget *widget, GdkEventButton *event, gpointer data) +static gboolean date_selection_popup_press_cb(GtkWidget *widget, GdkEventButton *event, gpointer data) { DateSelection *ds = data; gint x, y; @@ -931,7 +931,7 @@ date_selection_set(ds->box, day, month + 1, year); } -static gint date_selection_popup_keypress_cb(GtkWidget *widget, GdkEventKey *event, gpointer data) +static gboolean date_selection_popup_keypress_cb(GtkWidget *widget, GdkEventKey *event, gpointer data) { DateSelection *ds = data; @@ -1178,13 +1178,13 @@ gint vsize_min; gint vsize_max; - gint in_drag; + gboolean in_drag; gint press_x; gint press_y; gint press_width; gint press_height; - gint handle_prelit; + gboolean handle_prelit; }; @@ -1205,7 +1205,7 @@ return handle_size; } -static gint sizer_motion_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer data) +static gboolean sizer_motion_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer data) { SizerData *sd = data; gint x, y; @@ -1262,7 +1262,7 @@ return TRUE; } -static gint sizer_press_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer data) +static gboolean sizer_press_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer data) { SizerData *sd = data; @@ -1283,7 +1283,7 @@ return TRUE; } -static gint sizer_release_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer data) +static gboolean sizer_release_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer data) { SizerData *sd = data; @@ -1300,14 +1300,14 @@ return TRUE; } -static void sizer_set_prelight(SizerData *sd, gint prelit) +static void sizer_set_prelight(SizerData *sd, gboolean prelit) { sd->handle_prelit = prelit; gtk_widget_queue_draw_area(sd->sizer, 0, 0, sd->sizer->allocation.width, sd->sizer->allocation.height); } -static gint sizer_enter_cb(GtkWidget *widget, GdkEventCrossing *event, gpointer data) +static gboolean sizer_enter_cb(GtkWidget *widget, GdkEventCrossing *event, gpointer data) { SizerData *sd = data; @@ -1315,7 +1315,7 @@ return TRUE; } -static gint sizer_leave_cb(GtkWidget *widget, GdkEventCrossing *event, gpointer data) +static gboolean sizer_leave_cb(GtkWidget *widget, GdkEventCrossing *event, gpointer data) { SizerData *sd = data; @@ -1323,7 +1323,7 @@ return TRUE; } -static gint sizer_expose_cb(GtkWidget *widget, GdkEventExpose *event, gpointer data) +static gboolean sizer_expose_cb(GtkWidget *widget, GdkEventExpose *event, gpointer data) { SizerData *sd = data; GdkRectangle clip; @@ -1494,11 +1494,11 @@ return NULL; } -static gint pref_list_get(const gchar *group, const gchar *key, const gchar *marker, const gchar **result) +static gboolean pref_list_get(const gchar *group, const gchar *key, const gchar *marker, const gchar **result) { gchar *token; GList *work; - gint ret; + gboolean ret; if (!group || !key || !marker) { @@ -1572,7 +1572,7 @@ g_free(text); } -gint pref_list_int_get(const gchar *group, const gchar *key, gint *result) +gboolean pref_list_int_get(const gchar *group, const gchar *key, gint *result) { const gchar *text; @@ -1600,7 +1600,7 @@ pref_list_set(group, key, PREF_LIST_MARKER_DOUBLE, text); } -gint pref_list_double_get(const gchar *group, const gchar *key, gdouble *result) +gboolean pref_list_double_get(const gchar *group, const gchar *key, gdouble *result) { const gchar *text; @@ -1625,7 +1625,7 @@ pref_list_set(group, key, PREF_LIST_MARKER_STRING, value); } -gint pref_list_string_get(const gchar *group, const gchar *key, const gchar **result) +gboolean pref_list_string_get(const gchar *group, const gchar *key, const gchar **result) { return pref_list_get(group, key, PREF_LIST_MARKER_STRING, result); } diff -r a10d70ae85e9 -r 89dedc61b1bd src/ui_misc.h --- a/src/ui_misc.h Sun Mar 15 18:41:25 2009 +0000 +++ b/src/ui_misc.h Sun Mar 15 20:16:20 2009 +0000 @@ -53,49 +53,49 @@ #define PREF_PAD_BUTTON_ICON_GAP 2 -GtkWidget *pref_box_new(GtkWidget *parent_box, gint fill, - GtkOrientation orientation, gint padding); +GtkWidget *pref_box_new(GtkWidget *parent_box, gboolean fill, + GtkOrientation orientation, gboolean padding); -GtkWidget *pref_group_new(GtkWidget *parent_box, gint fill, +GtkWidget *pref_group_new(GtkWidget *parent_box, gboolean fill, const gchar *text, GtkOrientation orientation); GtkWidget *pref_group_parent(GtkWidget *child); -GtkWidget *pref_frame_new(GtkWidget *parent_box, gint fill, +GtkWidget *pref_frame_new(GtkWidget *parent_box, gboolean fill, const gchar *text, - GtkOrientation orientation, gint padding); + GtkOrientation orientation, gboolean padding); -GtkWidget *pref_spacer(GtkWidget *parent_box, gint padding); -GtkWidget *pref_line(GtkWidget *parent_box, gint padding); +GtkWidget *pref_spacer(GtkWidget *parent_box, gboolean padding); +GtkWidget *pref_line(GtkWidget *parent_box, gboolean padding); GtkWidget *pref_label_new(GtkWidget *parent_box, const gchar *text); GtkWidget *pref_label_new_mnemonic(GtkWidget *parent_box, const gchar *text, GtkWidget *widget); -void pref_label_bold(GtkWidget *label, gint bold, gint increase_size); +void pref_label_bold(GtkWidget *label, gboolean bold, gboolean increase_size); GtkWidget *pref_button_new(GtkWidget *parent_box, const gchar *stock_id, - const gchar *text, gint hide_stock_text, + const gchar *text, gboolean hide_stock_text, GCallback func, gpointer data); -GtkWidget *pref_checkbox_new(GtkWidget *parent_box, const gchar *text, gint active, +GtkWidget *pref_checkbox_new(GtkWidget *parent_box, const gchar *text, gboolean active, GCallback func, gpointer data); -GtkWidget *pref_checkbox_new_mnemonic(GtkWidget *parent_box, const gchar *text, gint active, +GtkWidget *pref_checkbox_new_mnemonic(GtkWidget *parent_box, const gchar *text, gboolean active, GCallback func, gpointer data); -GtkWidget *pref_checkbox_new_int(GtkWidget *parent_box, const gchar *text, gint active, - gint *result); +GtkWidget *pref_checkbox_new_int(GtkWidget *parent_box, const gchar *text, gboolean active, + gboolean *result); void pref_checkbox_link_sensitivity(GtkWidget *button, GtkWidget *widget); void pref_checkbox_link_sensitivity_swap(GtkWidget *button, GtkWidget *widget); GtkWidget *pref_radiobutton_new(GtkWidget *parent_box, GtkWidget *sibling, - const gchar *text, gint active, + const gchar *text, gboolean active, GCallback func, gpointer data); GtkWidget *pref_radiobutton_new_mnemonic(GtkWidget *parent_box, GtkWidget *sibling, - const gchar *text, gint active, + const gchar *text, gboolean active, GCallback func, gpointer data); GtkWidget *pref_radiobutton_new_int(GtkWidget *parent_box, GtkWidget *sibling, - const gchar *text, gint active, - gint *result, gint value, + const gchar *text, gboolean active, + gboolean *result, gboolean value, GCallback func, gpointer data); GtkWidget *pref_spin_new(GtkWidget *parent_box, const gchar *text, const gchar *suffix, @@ -118,7 +118,7 @@ GtkWidget *pref_table_new(GtkWidget *parent_box, gint columns, gint rows, - gint homogenious, gint fill); + gboolean homegeneous, gboolean fill); GtkWidget *pref_table_box(GtkWidget *table, gint column, gint row, GtkOrientation orientation, const gchar *text); @@ -127,7 +127,7 @@ const gchar *text, gfloat alignment); GtkWidget *pref_table_button(GtkWidget *table, gint column, gint row, - const gchar *stock_id, const gchar *text, gint hide_stock_text, + const gchar *stock_id, const gchar *text, gboolean hide_stock_text, GCallback func, gpointer data); GtkWidget *pref_table_spin(GtkWidget *table, gint column, gint row, @@ -139,7 +139,7 @@ GtkWidget *pref_toolbar_new(GtkWidget *parent_box, GtkToolbarStyle style); GtkWidget *pref_toolbar_button(GtkWidget *toolbar, - const gchar *stock_id, const gchar *label, gint toggle, + const gchar *stock_id, const gchar *label, gboolean toggle, const gchar *description, GCallback func, gpointer data); void pref_toolbar_button_set_icon(GtkWidget *button, GtkWidget *widget, const gchar *stock_id); @@ -171,13 +171,13 @@ void pref_list_int_set(const gchar *group, const gchar *key, gint value); -gint pref_list_int_get(const gchar *group, const gchar *key, gint *result); +gboolean pref_list_int_get(const gchar *group, const gchar *key, gint *result); void pref_list_double_set(const gchar *group, const gchar *key, gdouble value); -gint pref_list_double_get(const gchar *group, const gchar *key, gdouble *result); +gboolean pref_list_double_get(const gchar *group, const gchar *key, gdouble *result); void pref_list_string_set(const gchar *group, const gchar *key, const gchar *value); -gint pref_list_string_get(const gchar *group, const gchar *key, const gchar **result); +gboolean pref_list_string_get(const gchar *group, const gchar *key, const gchar **result); void pref_color_button_set_cb(GtkWidget *widget, gpointer data); diff -r a10d70ae85e9 -r 89dedc61b1bd src/ui_pathsel.c --- a/src/ui_pathsel.c Sun Mar 15 18:41:25 2009 +0000 +++ b/src/ui_pathsel.c Sun Mar 15 20:16:20 2009 +0000 @@ -67,7 +67,7 @@ GList *filter_text_list; GtkWidget *filter_combo; - gint show_hidden; + gboolean show_hidden; GtkWidget *hidden_button; GtkWidget *bookmark_list; @@ -114,7 +114,7 @@ g_free(dd); } -static gint dest_check_filter(const gchar *filter, const gchar *file) +static gboolean dest_check_filter(const gchar *filter, const gchar *file) { const gchar *f_ptr = filter; const gchar *strt_ptr; @@ -150,7 +150,7 @@ return CASE_SORT((gchar *)a, (gchar *)b); } -static gint is_hidden(const gchar *name) +static gboolean is_hidden(const gchar *name) { if (name[0] != '.') return FALSE; if (name[1] == '\0') return FALSE; @@ -273,7 +273,7 @@ dd->path = g_strdup(path); } -static void dest_change_dir(Dest_Data *dd, const gchar *path, gint retain_name) +static void dest_change_dir(Dest_Data *dd, const gchar *path, gboolean retain_name) { const gchar *old_name = NULL; gchar *full_path; @@ -608,8 +608,8 @@ popup_menu_position_clamp(menu, x, y, 0); } -static gint dest_popup_menu(Dest_Data *dd, GtkTreeView *view, - gint button, guint32 time, gint local) +static gboolean dest_popup_menu(Dest_Data *dd, GtkTreeView *view, + guint button, guint32 time, gboolean local) { GtkWidget *menu; @@ -620,7 +620,7 @@ GtkTreeModel *model; GtkTreeIter iter; gchar *text; - gint normal_dir; + gboolean normal_dir; model = gtk_tree_view_get_model(view); gtk_tree_model_get_iter(model, &iter, dd->right_click_path); @@ -661,7 +661,7 @@ return TRUE; } -static gint dest_press_cb(GtkWidget *view, GdkEventButton *event, gpointer data) +static gboolean dest_press_cb(GtkWidget *view, GdkEventButton *event, gpointer data) { Dest_Data *dd = data; GtkTreePath *tpath; @@ -931,7 +931,7 @@ g_free(old_text); } -static void dest_filter_add(Dest_Data *dd, const gchar *filter, const gchar *description, gint set) +static void dest_filter_add(Dest_Data *dd, const gchar *filter, const gchar *description, gboolean set) { GList *work; gchar *buf; @@ -1279,7 +1279,7 @@ dd->select_data = data; } -void path_selection_add_filter(GtkWidget *entry, const gchar *filter, const gchar *description, gint set) +void path_selection_add_filter(GtkWidget *entry, const gchar *filter, const gchar *description, gboolean set) { Dest_Data *dd = g_object_get_data(G_OBJECT(entry), "destination_data"); diff -r a10d70ae85e9 -r 89dedc61b1bd src/ui_spinner.c --- a/src/ui_spinner.c Sun Mar 15 18:41:25 2009 +0000 +++ b/src/ui_spinner.c Sun Mar 15 20:16:20 2009 +0000 @@ -193,7 +193,7 @@ spinner_set_timeout(sp, interval); } -void spinner_step(GtkWidget *spinner, gint reset) +void spinner_step(GtkWidget *spinner, gboolean reset) { SpinnerData *sp; diff -r a10d70ae85e9 -r 89dedc61b1bd src/ui_spinner.h --- a/src/ui_spinner.h Sun Mar 15 18:41:25 2009 +0000 +++ b/src/ui_spinner.h Sun Mar 15 20:16:20 2009 +0000 @@ -37,7 +37,7 @@ GtkWidget *spinner_new(const gchar *path, gint interval); void spinner_set_interval(GtkWidget *spinner, gint interval); -void spinner_step(GtkWidget *spinner, gint reset); +void spinner_step(GtkWidget *spinner, gboolean reset); #endif diff -r a10d70ae85e9 -r 89dedc61b1bd src/ui_tabcomp.c --- a/src/ui_tabcomp.c Sun Mar 15 18:41:25 2009 +0000 +++ b/src/ui_tabcomp.c Sun Mar 15 20:16:20 2009 +0000 @@ -70,13 +70,13 @@ gpointer tab_append_data; GtkWidget *combo; - gint has_history; + gboolean has_history; gchar *history_key; gint history_levels; FileDialog *fd; gchar *fd_title; - gint fd_folders_only; + gboolean fd_folders_only; GtkWidget *fd_button; guint choices; @@ -178,7 +178,7 @@ return text; } -static gint tab_completion_emit_enter_signal(TabCompData *td) +static gboolean tab_completion_emit_enter_signal(TabCompData *td) { gchar *text; if (!td->enter_func) return FALSE; @@ -228,7 +228,7 @@ } } -static gint tab_completion_popup_key_press(GtkWidget *widget, GdkEventKey *event, gpointer data) +static gboolean tab_completion_popup_key_press(GtkWidget *widget, GdkEventKey *event, gpointer data) { TabCompData *td = data; @@ -403,7 +403,7 @@ #endif -static gint tab_completion_do(TabCompData *td) +static gboolean tab_completion_do(TabCompData *td) { const gchar *entry_text = gtk_entry_get_text(GTK_ENTRY(td->entry)); const gchar *entry_file; @@ -599,7 +599,7 @@ return FALSE; } -static gint tab_completion_key_pressed(GtkWidget *widget, GdkEventKey *event, gpointer data) +static gboolean tab_completion_key_pressed(GtkWidget *widget, GdkEventKey *event, gpointer data) { TabCompData *td = data; gboolean stop_signal = FALSE; @@ -951,7 +951,7 @@ tab_completion_select_show(td); } -void tab_completion_add_select_button(GtkWidget *entry, const gchar *title, gint folders_only) +void tab_completion_add_select_button(GtkWidget *entry, const gchar *title, gboolean folders_only) { TabCompData *td; GtkWidget *parent; diff -r a10d70ae85e9 -r 89dedc61b1bd src/ui_tabcomp.h --- a/src/ui_tabcomp.h Sun Mar 15 18:41:25 2009 +0000 +++ b/src/ui_tabcomp.h Sun Mar 15 20:16:20 2009 +0000 @@ -26,7 +26,7 @@ void tab_completion_add_tab_func(GtkWidget *entry, void (*tab_func)(const gchar *, gpointer), gpointer data); gchar *remove_trailing_slash(const gchar *path); -void tab_completion_add_select_button(GtkWidget *entry, const gchar *title, gint folders_only); +void tab_completion_add_select_button(GtkWidget *entry, const gchar *title, gboolean folders_only); void tab_completion_add_append_func(GtkWidget *entry, void (*tab_append_func)(const gchar *, gpointer, gint), gpointer data); diff -r a10d70ae85e9 -r 89dedc61b1bd src/ui_tree_edit.c --- a/src/ui_tree_edit.c Sun Mar 15 18:41:25 2009 +0000 +++ b/src/ui_tree_edit.c Sun Mar 15 20:16:20 2009 +0000 @@ -61,7 +61,7 @@ } } -static gint tree_edit_click_end_cb(GtkWidget *widget, GdkEventButton *event, gpointer data) +static gboolean tree_edit_click_end_cb(GtkWidget *widget, GdkEventButton *event, gpointer data) { TreeEditData *ted = data; @@ -71,7 +71,7 @@ return TRUE; } -static gint tree_edit_click_cb(GtkWidget *widget, GdkEventButton *event, gpointer data) +static gboolean tree_edit_click_cb(GtkWidget *widget, GdkEventButton *event, gpointer data) { TreeEditData *ted = data; @@ -96,7 +96,7 @@ return FALSE; } -static gint tree_edit_key_press_cb(GtkWidget *widget, GdkEventKey *event, gpointer data) +static gboolean tree_edit_key_press_cb(GtkWidget *widget, GdkEventKey *event, gpointer data) { TreeEditData *ted = data; @@ -174,8 +174,8 @@ return FALSE; } -gint tree_edit_by_path(GtkTreeView *tree, GtkTreePath *tpath, gint column, const gchar *text, - gint (*edit_func)(TreeEditData *, const gchar *, const gchar *, gpointer), gpointer data) +gboolean tree_edit_by_path(GtkTreeView *tree, GtkTreePath *tpath, gint column, const gchar *text, + gboolean (*edit_func)(TreeEditData *, const gchar *, const gchar *, gpointer), gpointer data) { TreeEditData *ted; GtkTreeViewColumn *tcolumn; @@ -249,8 +249,8 @@ *------------------------------------------------------------------- */ -gint tree_view_get_cell_origin(GtkTreeView *widget, GtkTreePath *tpath, gint column, gint text_cell_only, - gint *x, gint *y, gint *width, gint *height) +gboolean tree_view_get_cell_origin(GtkTreeView *widget, GtkTreePath *tpath, gint column, gboolean text_cell_only, + gint *x, gint *y, gint *width, gint *height) { gint x_origin, y_origin; gint x_offset, y_offset; @@ -319,7 +319,7 @@ return TRUE; } -void tree_view_get_cell_clamped(GtkTreeView *widget, GtkTreePath *tpath, gint column, gint text_cell_only, +void tree_view_get_cell_clamped(GtkTreeView *widget, GtkTreePath *tpath, gint column, gboolean text_cell_only, gint *x, gint *y, gint *width, gint *height) { gint wx, wy, ww, wh; @@ -343,7 +343,7 @@ *height = MIN(*height, wy + wh - (*y)); } -gint tree_view_row_get_visibility(GtkTreeView *widget, GtkTreeIter *iter, gint fully_visible) +gint tree_view_row_get_visibility(GtkTreeView *widget, GtkTreeIter *iter, gboolean fully_visible) { GtkTreeModel *store; GtkTreePath *tpath; @@ -380,7 +380,7 @@ return 0; } -gint tree_view_row_make_visible(GtkTreeView *widget, GtkTreeIter *iter, gint center) +gint tree_view_row_make_visible(GtkTreeView *widget, GtkTreeIter *iter, gboolean center) { GtkTreePath *tpath; gint vis; @@ -405,7 +405,7 @@ return vis; } -gint tree_view_move_cursor_away(GtkTreeView *widget, GtkTreeIter *iter, gint only_selected) +gboolean tree_view_move_cursor_away(GtkTreeView *widget, GtkTreeIter *iter, gboolean only_selected) { GtkTreeModel *store; GtkTreePath *tpath; @@ -546,7 +546,7 @@ g_free(sd); } -static gint widget_auto_scroll_cb(gpointer data) +static gboolean widget_auto_scroll_cb(gpointer data) { AutoScrollData *sd = data; GdkWindow *window; diff -r a10d70ae85e9 -r 89dedc61b1bd src/ui_tree_edit.h --- a/src/ui_tree_edit.h Sun Mar 15 18:41:25 2009 +0000 +++ b/src/ui_tree_edit.h Sun Mar 15 20:16:20 2009 +0000 @@ -37,28 +37,28 @@ /* * edit_func: return TRUE if rename successful, FALSE on failure. */ -gint tree_edit_by_path(GtkTreeView *tree, GtkTreePath *tpath, gint column, const gchar *text, - gint (*edit_func)(TreeEditData *, const gchar *, const gchar *, gpointer), gpointer data); +gboolean tree_edit_by_path(GtkTreeView *tree, GtkTreePath *tpath, gint column, const gchar *text, + gboolean (*edit_func)(TreeEditData *, const gchar *, const gchar *, gpointer), gpointer data); /* returns location of cell in screen coordinates */ -gint tree_view_get_cell_origin(GtkTreeView *widget, GtkTreePath *tpath, gint column, gint text_cell_only, - gint *x, gint *y, gint *width, gint *height); +gboolean tree_view_get_cell_origin(GtkTreeView *widget, GtkTreePath *tpath, gint column, gboolean text_cell_only, + gint *x, gint *y, gint *width, gint *height); /* similar to above, but limits the returned area to that of the tree window */ -void tree_view_get_cell_clamped(GtkTreeView *widget, GtkTreePath *tpath, gint column, gint text_cell_only, +void tree_view_get_cell_clamped(GtkTreeView *widget, GtkTreePath *tpath, gint column, gboolean text_cell_only, gint *x, gint *y, gint *width, gint *height); /* return 0 = row visible, -1 = row is above, 1 = row is below visible region * if fully_visible is TRUE, the bahavior changes to return -1/1 if _any_ part of the cell is out of view */ -gint tree_view_row_get_visibility(GtkTreeView *widget, GtkTreeIter *iter, gint fully_visible); +gint tree_view_row_get_visibility(GtkTreeView *widget, GtkTreeIter *iter, gboolean fully_visible); /* scrolls to make row visible, if necessary * return is same as above (before the scroll) */ -gint tree_view_row_make_visible(GtkTreeView *widget, GtkTreeIter *iter, gint center); +gint tree_view_row_make_visible(GtkTreeView *widget, GtkTreeIter *iter, gboolean center); /* if iter is location of cursor, moves cursor to nearest row */ -gint tree_view_move_cursor_away(GtkTreeView *widget, GtkTreeIter *iter, gint only_selected); +gboolean tree_view_move_cursor_away(GtkTreeView *widget, GtkTreeIter *iter, gboolean only_selected); /* utility to return row position of given GtkTreePath */