Skip to content

Commit

Permalink
gint -> gboolean where applicable.
Browse files Browse the repository at this point in the history
  • Loading branch information
Laurent Monin committed Mar 16, 2009
1 parent 4cd4d86 commit 0b6b977
Show file tree
Hide file tree
Showing 9 changed files with 68 additions and 66 deletions.
10 changes: 5 additions & 5 deletions src/uri_utils.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ static gint escape_char_list[] = {

static gchar *hex_char = "0123456789ABCDEF";

static gint escape_test(guchar c)
static gboolean escape_test(guchar c)
{
if (c < 32 || c > 127) return TRUE;
return (escape_char_list[c] != 0);
Expand Down Expand Up @@ -169,7 +169,7 @@ static void uri_list_parse_encoded_chars(GList *list)
}
}

GList *uri_list_from_text(gchar *data, gint files_only)
GList *uri_list_from_text(gchar *data, gboolean files_only)
{
GList *list = NULL;
gint b, e;
Expand Down Expand Up @@ -205,15 +205,15 @@ GList *uri_list_from_text(gchar *data, gint files_only)
return list;
}

GList *uri_filelist_from_text(gchar *data, gint files_only)
GList *uri_filelist_from_text(gchar *data, gboolean files_only)
{
GList *path_list = uri_list_from_text(data, files_only);
GList *filelist = filelist_from_path_list(path_list);
string_list_free(path_list);
return filelist;
}

gchar *uri_text_from_list(GList *list, gint *len, gint plain_text)
gchar *uri_text_from_list(GList *list, gint *len, gboolean plain_text)
{
gchar *uri_text = NULL;
GString *string;
Expand Down Expand Up @@ -261,7 +261,7 @@ gchar *uri_text_from_list(GList *list, gint *len, gint plain_text)
return uri_text;
}

gchar *uri_text_from_filelist(GList *list, gint *len, gint plain_text)
gchar *uri_text_from_filelist(GList *list, gint *len, gboolean plain_text)
{
GList *path_list = filelist_to_path_list(list);
gchar *ret = uri_text_from_list(path_list, len, plain_text);
Expand Down
8 changes: 4 additions & 4 deletions src/uri_utils.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@
gchar *uri_text_escape(const gchar *text);
void uri_text_decode(gchar *text);

GList *uri_list_from_text(gchar *data, gint files_only);
GList *uri_filelist_from_text(gchar *data, gint files_only);
gchar *uri_text_from_list(GList *list, gint *len, gint plain_text);
gchar *uri_text_from_filelist(GList *list, gint *len, gint plain_text);
GList *uri_list_from_text(gchar *data, gboolean files_only);
GList *uri_filelist_from_text(gchar *data, gboolean files_only);
gchar *uri_text_from_list(GList *list, gint *len, gboolean plain_text);
gchar *uri_text_from_filelist(GList *list, gint *len, gboolean plain_text);

#endif /* URI_UTILS_H */
/* vim: set shiftwidth=8 softtabstop=0 cindent cinoptions={1s: */
17 changes: 9 additions & 8 deletions src/utilops.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ static GdkPixbuf *file_util_get_error_icon(FileData *fd, GtkWidget *widget);
static void generic_dialog_add_image(GenericDialog *gd, GtkWidget *box,
FileData *fd1, const gchar *header1,
FileData *fd2, const gchar *header2,
gint show_filename)
gboolean show_filename)
{
ImageWindow *imd;
GtkWidget *hbox = NULL;
Expand Down Expand Up @@ -154,7 +154,7 @@ static void generic_dialog_image_set(GenericDialog *gd, FileData *fd)

GenericDialog *file_util_gen_dlg(const gchar *title,
const gchar *role,
GtkWidget *parent, gint auto_close,
GtkWidget *parent, gboolean auto_close,
void (*cancel_cb)(GenericDialog *, gpointer), gpointer data)
{
GenericDialog *gd;
Expand Down Expand Up @@ -411,7 +411,7 @@ static void file_util_dialog_list_select(GtkWidget *view, gint n)
}
}

static GtkWidget *file_util_dialog_add_list(GtkWidget *box, GList *list, gint full_paths, gboolean with_sidecars)
static GtkWidget *file_util_dialog_add_list(GtkWidget *box, GList *list, gboolean full_paths, gboolean with_sidecars)
{
GtkWidget *scrolled;
GtkWidget *view;
Expand Down Expand Up @@ -1131,7 +1131,7 @@ static void file_util_rename_preview_update(UtilityData *ud)
const gchar *front;
const gchar *end;
const gchar *format;
gint valid;
gboolean valid;
gint start_n;
gint padding;
gint n;
Expand Down Expand Up @@ -1231,7 +1231,7 @@ static gboolean file_util_rename_idle_cb(gpointer data)
}

static void file_util_rename_preview_order_cb(GtkTreeModel *treemodel, GtkTreePath *tpath,
GtkTreeIter *iter, gpointer data)
GtkTreeIter *iter, gpointer data)
{
UtilityData *ud = data;

Expand All @@ -1242,8 +1242,8 @@ static void file_util_rename_preview_order_cb(GtkTreeModel *treemodel, GtkTreePa


static gboolean file_util_preview_cb(GtkTreeSelection *selection, GtkTreeModel *store,
GtkTreePath *tpath, gboolean path_currently_selected,
gpointer data)
GtkTreePath *tpath, gboolean path_currently_selected,
gpointer data)
{
UtilityData *ud = data;
GtkTreeIter iter;
Expand Down Expand Up @@ -1385,7 +1385,7 @@ static void file_util_dialog_init_dest_folder(UtilityData *ud)
}


static GtkWidget *furm_simple_vlabel(GtkWidget *box, const gchar *text, gint expand)
static GtkWidget *furm_simple_vlabel(GtkWidget *box, const gchar *text, gboolean expand)
{
GtkWidget *vbox;
GtkWidget *label;
Expand Down Expand Up @@ -1740,6 +1740,7 @@ static void file_util_move_full(FileData *source_fd, GList *source_list, const g

file_util_dialog_run(ud);
}

static void file_util_copy_full(FileData *source_fd, GList *source_list, const gchar *dest_path, GtkWidget *parent, UtilityPhase phase)
{
UtilityData *ud;
Expand Down
20 changes: 10 additions & 10 deletions src/view_dir.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ void vd_set_layout(ViewDir *vd, LayoutWindow *layout)
vd->layout = layout;
}

gint vd_set_fd(ViewDir *vd, FileData *dir_fd)
gboolean vd_set_fd(ViewDir *vd, FileData *dir_fd)
{
gboolean ret = FALSE;

Expand Down Expand Up @@ -166,7 +166,7 @@ void vd_select_row(ViewDir *vd, FileData *fd)
}
}

gint vd_find_row(ViewDir *vd, FileData *fd, GtkTreeIter *iter)
gboolean vd_find_row(ViewDir *vd, FileData *fd, GtkTreeIter *iter)
{
gboolean ret = FALSE;

Expand Down Expand Up @@ -204,7 +204,7 @@ FileData *vd_get_fd_from_tree_path(ViewDir *vd, GtkTreeView *tview, GtkTreePath
return fd;
}

static gint vd_rename_cb(TreeEditData *td, const gchar *old, const gchar *new, gpointer data)
static gboolean vd_rename_cb(TreeEditData *td, const gchar *old, const gchar *new, gpointer data)
{
ViewDir *vd = data;
FileData *fd;
Expand Down Expand Up @@ -556,7 +556,7 @@ GtkWidget *vd_pop_menu(ViewDir *vd, FileData *fd)
GtkWidget *menu;
GtkWidget *submenu;
GtkWidget *item;
gint active;
gboolean active;
gboolean rename_delete_active = FALSE;
gboolean new_folder_active = FALSE;
gint i;
Expand Down Expand Up @@ -808,7 +808,7 @@ void vd_dnd_drop_scroll_cancel(ViewDir *vd)
vd->drop_scroll_id = -1;
}

static gint vd_auto_scroll_idle_cb(gpointer data)
static gboolean vd_auto_scroll_idle_cb(gpointer data)
{
ViewDir *vd = data;

Expand All @@ -831,7 +831,7 @@ static gint vd_auto_scroll_idle_cb(gpointer data)
return FALSE;
}

static gint vd_auto_scroll_notify_cb(GtkWidget *widget, gint x, gint y, gpointer data)
static gboolean vd_auto_scroll_notify_cb(GtkWidget *widget, gint x, gint y, gpointer data)
{
ViewDir *vd = data;

Expand All @@ -842,7 +842,7 @@ static gint vd_auto_scroll_notify_cb(GtkWidget *widget, gint x, gint y, gpointer
return TRUE;
}

static gint vd_dnd_drop_motion(GtkWidget *widget, GdkDragContext *context,
static gboolean vd_dnd_drop_motion(GtkWidget *widget, GdkDragContext *context,
gint x, gint y, guint time, gpointer data)
{
ViewDir *vd = data;
Expand Down Expand Up @@ -964,7 +964,7 @@ void vd_color_cb(GtkTreeViewColumn *tree_column, GtkCellRenderer *cell,
"cell-background-set", set, NULL);
}

gint vd_release_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer data)
gboolean vd_release_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer data)
{
ViewDir *vd = data;
GtkTreePath *tpath;
Expand All @@ -991,7 +991,7 @@ gint vd_release_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer data)
return FALSE;
}

gint vd_press_key_cb(GtkWidget *widget, GdkEventKey *event, gpointer data)
gboolean vd_press_key_cb(GtkWidget *widget, GdkEventKey *event, gpointer data)
{
ViewDir *vd = data;
gboolean ret = FALSE;
Expand All @@ -1005,7 +1005,7 @@ gint vd_press_key_cb(GtkWidget *widget, GdkEventKey *event, gpointer data)
return ret;
}

gint vd_press_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer data)
gboolean vd_press_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer data)
{
ViewDir *vd = data;
gboolean ret = FALSE;
Expand Down
10 changes: 5 additions & 5 deletions src/view_dir.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ void vd_set_select_func(ViewDir *vdl, void (*func)(ViewDir *vdl, const gchar *pa

void vd_set_layout(ViewDir *vdl, LayoutWindow *layout);

gint vd_set_fd(ViewDir *vdl, FileData *dir_fd);
gboolean vd_set_fd(ViewDir *vdl, FileData *dir_fd);
void vd_refresh(ViewDir *vdl);
gint vd_find_row(ViewDir *vd, FileData *fd, GtkTreeIter *iter);
gboolean vd_find_row(ViewDir *vd, FileData *fd, GtkTreeIter *iter);

const gchar *vd_row_get_path(ViewDir *vdl, gint row);

Expand All @@ -50,9 +50,9 @@ void vd_menu_position_cb(GtkMenu *menu, gint *x, gint *y, gboolean *push_in, gpo
void vd_activate_cb(GtkTreeView *tview, GtkTreePath *tpath, GtkTreeViewColumn *column, gpointer data);
void vd_color_cb(GtkTreeViewColumn *tree_column, GtkCellRenderer *cell, GtkTreeModel *tree_model, GtkTreeIter *iter, gpointer data);

gint vd_release_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer data);
gint vd_press_key_cb(GtkWidget *widget, GdkEventKey *event, gpointer data);
gint vd_press_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer data);
gboolean vd_release_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer data);
gboolean vd_press_key_cb(GtkWidget *widget, GdkEventKey *event, gpointer data);
gboolean vd_press_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer data);

#endif
/* vim: set shiftwidth=8 softtabstop=0 cindent cinoptions={1s: */
21 changes: 11 additions & 10 deletions src/view_dir_list.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,10 @@
*-----------------------------------------------------------------------------
*/

gint vdlist_find_row(ViewDir *vd, FileData *fd, GtkTreeIter *iter)
gboolean vdlist_find_row(ViewDir *vd, FileData *fd, GtkTreeIter *iter)
{
GtkTreeModel *store;
gint valid;
gboolean valid;
gint row = 0;

store = gtk_tree_view_get_model(GTK_TREE_VIEW(vd->view));
Expand Down Expand Up @@ -142,15 +142,15 @@ const gchar *vdlist_row_get_path(ViewDir *vd, gint row)
return NULL;
}

static gint vdlist_populate(ViewDir *vd, gboolean clear)
static gboolean vdlist_populate(ViewDir *vd, gboolean clear)
{
GtkListStore *store;
GList *work;
GtkTreeIter iter;
gint valid;
gboolean valid;
gchar *filepath;
GList *old_list;
gint ret;
gboolean ret;
FileData *fd;

old_list = VDLIST(vd)->list;
Expand Down Expand Up @@ -187,8 +187,9 @@ static gint vdlist_populate(ViewDir *vd, gboolean clear)
gint match;
GdkPixbuf *pixbuf;
const gchar *date = "";
fd = work->data;
gboolean done = FALSE;

fd = work->data;

if (access_file(fd->path, R_OK | X_OK) && fd->name)
{
Expand Down Expand Up @@ -297,9 +298,9 @@ static gint vdlist_populate(ViewDir *vd, gboolean clear)
return ret;
}

gint vdlist_set_fd(ViewDir *vd, FileData *dir_fd)
gboolean vdlist_set_fd(ViewDir *vd, FileData *dir_fd)
{
gint ret;
gboolean ret;
gchar *old_path = NULL;

if (!dir_fd) return FALSE;
Expand Down Expand Up @@ -355,7 +356,7 @@ void vdlist_refresh(ViewDir *vd)
vdlist_populate(vd, FALSE);
}

gint vdlist_press_key_cb(GtkWidget *widget, GdkEventKey *event, gpointer data)
gboolean vdlist_press_key_cb(GtkWidget *widget, GdkEventKey *event, gpointer data)
{
ViewDir *vd = data;
GtkTreePath *tpath;
Expand Down Expand Up @@ -388,7 +389,7 @@ gint vdlist_press_key_cb(GtkWidget *widget, GdkEventKey *event, gpointer data)
return TRUE;
}

gint vdlist_press_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer data)
gboolean vdlist_press_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer data)
{
ViewDir *vd = data;
GtkTreePath *tpath;
Expand Down
8 changes: 4 additions & 4 deletions src/view_dir_list.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,17 +18,17 @@ ViewDir *vdlist_new(ViewDir *vd, FileData *dir_fd);

void vdlist_select_row(ViewDir *vd, FileData *fd);

gint vdlist_set_fd(ViewDir *vd, FileData *dir_fd);
gboolean vdlist_set_fd(ViewDir *vd, FileData *dir_fd);
void vdlist_refresh(ViewDir *vd);

const gchar *vdlist_row_get_path(ViewDir *vd, gint row);
gint vdlist_find_row(ViewDir *vd, FileData *fd, GtkTreeIter *iter);
gboolean vdlist_find_row(ViewDir *vd, FileData *fd, GtkTreeIter *iter);

void vdlist_rename_by_row(ViewDir *vd, FileData *fd);
FileData *vdlist_row_by_path(ViewDir *vd, const gchar *path, gint *row);

gint vdlist_press_key_cb(GtkWidget *widget, GdkEventKey *event, gpointer data);
gint vdlist_press_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer data);
gboolean vdlist_press_key_cb(GtkWidget *widget, GdkEventKey *event, gpointer data);
gboolean vdlist_press_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer data);

void vdlist_destroy_cb(GtkWidget *widget, gpointer data);

Expand Down
Loading

0 comments on commit 0b6b977

Please sign in to comment.