Mercurial > geeqie

changeset 1416:9fe2fede7ae5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use gboolean pseudo type where applicable.
author zas_
date Wed, 11 Mar 2009 22:56:56 +0000
parents 74d1fa5af269
children 8036c5b779ca
files src/layout.c src/layout.h src/remote.c
diffstat 3 files changed, 45 insertions(+), 45 deletions(-) [+]
line wrap: on
line diff
--- a/src/layout.c	Wed Mar 11 22:28:37 2009 +0000
+++ b/src/layout.c	Wed Mar 11 22:56:56 2009 +0000
@@ -69,7 +69,7 @@
  *-----------------------------------------------------------------------------
  */
 
-gint layout_valid(LayoutWindow **lw)
+gboolean layout_valid(LayoutWindow **lw)
 {
 	if (*lw == NULL)
 		{
@@ -415,11 +415,11 @@
 	GtkWidget *menu;
 	GtkWidget *item;
 	gchar *buf;
-	gint active;
+	gboolean active;
 	gint input = 0;
 	gint screen = 0;
 	gint use_image = 0;
-	gint from_image = 0;
+	gboolean from_image = FALSE;
 	gint image_profile;
 	gint i;
 	
@@ -501,7 +501,7 @@
 {
 	GtkWidget *button;
 	GtkWidget *image;
-	gint enable;
+	gboolean enable;
 
 	button = gtk_button_new();
 	image = gtk_image_new_from_stock(GTK_STOCK_SELECT_COLOR, GTK_ICON_SIZE_MENU);
@@ -1024,10 +1024,10 @@
 	if (lw->vf) vf_set_fd(lw->vf, lw->dir_fd);
 }
 
-gint layout_set_path(LayoutWindow *lw, const gchar *path)
+gboolean layout_set_path(LayoutWindow *lw, const gchar *path)
 {
 	FileData *fd;
-	gint ret;
+	gboolean ret;
 
 	if (!path) return FALSE;
 	
@@ -1038,9 +1038,9 @@
 }
 
 
-gint layout_set_fd(LayoutWindow *lw, FileData *fd)
+gboolean layout_set_fd(LayoutWindow *lw, FileData *fd)
 {
-	gint have_file = FALSE;
+	gboolean have_file = FALSE;
 
 	if (!layout_valid(&lw)) return FALSE;
 
@@ -1135,7 +1135,7 @@
 	if (lw->image) layout_image_refresh(lw);
 }
 
-void layout_thumb_set(LayoutWindow *lw, gint enable)
+void layout_thumb_set(LayoutWindow *lw, gboolean enable)
 {
 	if (!layout_valid(&lw)) return;
 
@@ -1147,7 +1147,7 @@
 	layout_list_sync_thumb(lw);
 }
 
-void layout_marks_set(LayoutWindow *lw, gint enable)
+void layout_marks_set(LayoutWindow *lw, gboolean enable)
 {
 	if (!layout_valid(&lw)) return;
 
@@ -1159,21 +1159,21 @@
 	layout_list_sync_marks(lw);
 }
 
-gint layout_thumb_get(LayoutWindow *lw)
+gboolean layout_thumb_get(LayoutWindow *lw)
 {
 	if (!layout_valid(&lw)) return FALSE;
 
 	return lw->options.show_thumbnails;
 }
 
-gint layout_marks_get(LayoutWindow *lw)
+gboolean layout_marks_get(LayoutWindow *lw)
 {
 	if (!layout_valid(&lw)) return FALSE;
 
 	return lw->options.show_marks;
 }
 
-void layout_sort_set(LayoutWindow *lw, SortType type, gint ascend)
+void layout_sort_set(LayoutWindow *lw, SortType type, gboolean ascend)
 {
 	if (!layout_valid(&lw)) return;
 	if (lw->sort_method == type && lw->sort_ascend == ascend) return;
@@ -1186,7 +1186,7 @@
 	layout_list_sync_sort(lw);
 }
 
-gint layout_sort_get(LayoutWindow *lw, SortType *type, gint *ascend)
+gboolean layout_sort_get(LayoutWindow *lw, SortType *type, gboolean *ascend)
 {
 	if (!layout_valid(&lw)) return FALSE;
 
@@ -1196,7 +1196,7 @@
 	return TRUE;
 }
 
-gint layout_geometry_get(LayoutWindow *lw, gint *x, gint *y, gint *w, gint *h)
+gboolean layout_geometry_get(LayoutWindow *lw, gint *x, gint *y, gint *w, gint *h)
 {
 	if (!layout_valid(&lw)) return FALSE;
 
@@ -1206,7 +1206,7 @@
 	return TRUE;
 }
 
-gint layout_geometry_get_dividers(LayoutWindow *lw, gint *h, gint *v)
+gboolean layout_geometry_get_dividers(LayoutWindow *lw, gint *h, gint *v)
 {
 	if (!layout_valid(&lw)) return FALSE;
 
@@ -1243,7 +1243,7 @@
 	layout_style_set(lw, -1, NULL);
 }
 
-gint layout_views_get(LayoutWindow *lw, DirViewType *dir_view_type, FileViewType *file_view_type)
+gboolean layout_views_get(LayoutWindow *lw, DirViewType *dir_view_type, FileViewType *file_view_type)
 {
 	if (!layout_valid(&lw)) return FALSE;
 
@@ -1259,7 +1259,7 @@
  *-----------------------------------------------------------------------------
  */
 
-static gint layout_location_single(LayoutLocation l)
+static gboolean layout_location_single(LayoutLocation l)
 {
 	return (l == LAYOUT_LEFT ||
 		l == LAYOUT_RIGHT ||
@@ -1267,13 +1267,13 @@
 		l == LAYOUT_BOTTOM);
 }
 
-static gint layout_location_vertical(LayoutLocation l)
+static gboolean layout_location_vertical(LayoutLocation l)
 {
 	return (l & LAYOUT_TOP ||
 		l & LAYOUT_BOTTOM);
 }
 
-static gint layout_location_first(LayoutLocation l)
+static gboolean layout_location_first(LayoutLocation l)
 {
 	return (l & LAYOUT_TOP ||
 		l & LAYOUT_LEFT);
@@ -1313,7 +1313,7 @@
  *-----------------------------------------------------------------------------
  */
 
-gint layout_geometry_get_tools(LayoutWindow *lw, gint *x, gint *y, gint *w, gint *h, gint *divider_pos)
+gboolean layout_geometry_get_tools(LayoutWindow *lw, gint *x, gint *y, gint *w, gint *h, gint *divider_pos)
 {
 	if (!layout_valid(&lw)) return FALSE;
 
@@ -1347,7 +1347,7 @@
 				  &options->layout.float_window.w, &options->layout.float_window.h, &lw->options.float_window.vdivider_pos);
 }
 
-static void layout_tools_hide(LayoutWindow *lw, gint hide)
+static void layout_tools_hide(LayoutWindow *lw, gboolean hide)
 {
 	if (!lw->tools) return;
 
@@ -1385,7 +1385,7 @@
 	GtkWidget *vbox;
 	GtkWidget *w1, *w2;
 	gint vertical;
-	gint new_window = FALSE;
+	gboolean new_window = FALSE;
 
 	vertical = (layout_location_single(lw->image_location) && !layout_location_vertical(lw->image_location)) ||
 		   (!layout_location_single(lw->image_location) && layout_location_vertical(layout_grid_compass(lw)));
@@ -1815,7 +1815,7 @@
 
 void layout_tools_float_toggle(LayoutWindow *lw)
 {
-	gint popped;
+	gboolean popped;
 
 	if (!lw) return;
 
@@ -1855,7 +1855,7 @@
 	layout_tools_float_set(lw, lw->options.tools_float, !lw->options.tools_hidden);
 }
 
-void layout_tools_float_set(LayoutWindow *lw, gint popped, gint hidden)
+void layout_tools_float_set(LayoutWindow *lw, gboolean popped, gboolean hidden)
 {
 	if (!layout_valid(&lw)) return;
 
@@ -1873,7 +1873,7 @@
 	layout_style_set(lw, -1, NULL);
 }
 
-gint layout_tools_float_get(LayoutWindow *lw, gint *popped, gint *hidden)
+gboolean layout_tools_float_get(LayoutWindow *lw, gboolean *popped, gboolean *hidden)
 {
 	if (!layout_valid(&lw)) return FALSE;
 
--- a/src/layout.h	Wed Mar 11 22:28:37 2009 +0000
+++ b/src/layout.h	Wed Mar 11 22:56:56 2009 +0000
@@ -25,7 +25,7 @@
 void layout_close(LayoutWindow *lw);
 void layout_free(LayoutWindow *lw);
 
-gint layout_valid(LayoutWindow **lw);
+gboolean layout_valid(LayoutWindow **lw);
 
 void layout_sync_options_with_current_state(LayoutWindow *lw);
 void layout_load_attributes(LayoutOptions *layout, const gchar **attribute_names, const gchar **attribute_values);
@@ -37,8 +37,8 @@
 LayoutWindow *layout_find_by_image_fd(ImageWindow *imd);
 
 const gchar *layout_get_path(LayoutWindow *lw);
-gint layout_set_path(LayoutWindow *lw, const gchar *path);
-gint layout_set_fd(LayoutWindow *lw, FileData *fd);
+gboolean layout_set_path(LayoutWindow *lw, const gchar *path);
+gboolean layout_set_fd(LayoutWindow *lw, FileData *fd);
 
 void layout_status_update_progress(LayoutWindow *lw, gdouble val, const gchar *text);
 void layout_status_update_info(LayoutWindow *lw, const gchar *text);
@@ -67,20 +67,20 @@
 
 void layout_refresh(LayoutWindow *lw);
 
-void layout_thumb_set(LayoutWindow *lw, gint enable);
-gint layout_thumb_get(LayoutWindow *lw);
+void layout_thumb_set(LayoutWindow *lw, gboolean enable);
+gboolean layout_thumb_get(LayoutWindow *lw);
 
-void layout_marks_set(LayoutWindow *lw, gint enable);
-gint layout_marks_get(LayoutWindow *lw);
+void layout_marks_set(LayoutWindow *lw, gboolean enable);
+gboolean layout_marks_get(LayoutWindow *lw);
 
-void layout_sort_set(LayoutWindow *lw, SortType type, gint ascend);
-gint layout_sort_get(LayoutWindow *lw, SortType *type, gint *ascend);
+void layout_sort_set(LayoutWindow *lw, SortType type, gboolean ascend);
+gboolean layout_sort_get(LayoutWindow *lw, SortType *type, gboolean *ascend);
 
-gint layout_geometry_get(LayoutWindow *lw, gint *x, gint *y, gint *w, gint *h);
-gint layout_geometry_get_dividers(LayoutWindow *lw, gint *h, gint *v);
+gboolean layout_geometry_get(LayoutWindow *lw, gint *x, gint *y, gint *w, gint *h);
+gboolean layout_geometry_get_dividers(LayoutWindow *lw, gint *h, gint *v);
 
 void layout_views_set(LayoutWindow *lw, DirViewType dir_view_type, FileViewType file_view_type);
-gint layout_views_get(LayoutWindow *lw, DirViewType *dir_view_type, FileViewType *file_view_type);
+gboolean layout_views_get(LayoutWindow *lw, DirViewType *dir_view_type, FileViewType *file_view_type);
 
 void layout_status_update(LayoutWindow *lw, const gchar *text);
 
@@ -91,9 +91,9 @@
 void layout_colors_update(void);
 
 
-gint layout_geometry_get_tools(LayoutWindow *lw, gint *x, gint *y, gint *w, gint *h, gint *divider_pos);
-void layout_tools_float_set(LayoutWindow *lw, gint popped, gint hidden);
-gint layout_tools_float_get(LayoutWindow *lw, gint *popped, gint *hidden);
+gboolean layout_geometry_get_tools(LayoutWindow *lw, gint *x, gint *y, gint *w, gint *h, gint *divider_pos);
+void layout_tools_float_set(LayoutWindow *lw, gboolean popped, gboolean hidden);
+gboolean layout_tools_float_get(LayoutWindow *lw, gboolean *popped, gboolean *hidden);
 
 void layout_tools_float_toggle(LayoutWindow *lw);
 void layout_tools_hide_toggle(LayoutWindow *lw);
--- a/src/remote.c	Wed Mar 11 22:28:37 2009 +0000
+++ b/src/remote.c	Wed Mar 11 22:56:56 2009 +0000
@@ -437,8 +437,8 @@
 
 static void gr_tools_show(const gchar *text, gpointer data)
 {
-	gint popped;
-	gint hidden;
+	gboolean popped;
+	gboolean hidden;
 
 	if (layout_tools_float_get(NULL, &popped, &hidden) && hidden)
 		{
@@ -448,8 +448,8 @@
 
 static void gr_tools_hide(const gchar *text, gpointer data)
 {
-	gint popped;
-	gint hidden;
+	gboolean popped;
+	gboolean hidden;
 
 	if (layout_tools_float_get(NULL, &popped, &hidden) && !hidden)
 		{