From 96a26903f49ddab4a63213310c9da8d2c0457dc0 Mon Sep 17 00:00:00 2001 From: Laurent Monin Date: Sat, 28 Feb 2009 20:48:47 +0000 Subject: [PATCH] No space between function name and first parenthesis, it eases greping (see CODING). --- src/bar_histogram.c | 2 +- src/bar_keywords.c | 8 ++--- src/cache-loader.c | 4 +-- src/cellrenderericon.c | 36 +++++++++++----------- src/cellrenderericon.h | 9 +++--- src/dupe.c | 4 +-- src/gq-marshal.c | 68 +++++++++++++++++++++--------------------- src/image-load.c | 18 +++++------ src/image.c | 4 +-- src/main.c | 2 +- src/md5-util.c | 2 +- src/md5-util.h | 8 ++--- src/pan-view.c | 4 +-- src/pixbuf-renderer.h | 2 +- src/preferences.c | 4 +-- src/print.c | 4 +-- src/rcfile.c | 6 ++-- src/search.c | 8 ++--- src/thumb.c | 10 +++---- src/thumb_standard.c | 6 ++-- src/view_file_list.c | 2 +- 21 files changed, 105 insertions(+), 106 deletions(-) diff --git a/src/bar_histogram.c b/src/bar_histogram.c index b9391a39..baddf377 100644 --- a/src/bar_histogram.c +++ b/src/bar_histogram.c @@ -130,7 +130,7 @@ static void bar_pane_histogram_notify_cb(FileData *fd, NotifyType type, gpointer if (fd == phd->fd) bar_pane_histogram_update(phd); } -static gboolean bar_pane_histogram_expose_event_cb (GtkWidget *widget, GdkEventExpose *event, gpointer data) +static gboolean bar_pane_histogram_expose_event_cb(GtkWidget *widget, GdkEventExpose *event, gpointer data) { PaneHistogramData *phd = data; if (!phd) return TRUE; diff --git a/src/bar_keywords.c b/src/bar_keywords.c index d734c277..edad71df 100644 --- a/src/bar_keywords.c +++ b/src/bar_keywords.c @@ -625,7 +625,7 @@ static void bar_pane_keywords_changed(GtkTextBuffer *buffer, gpointer data) file_data_register_notify_func(bar_pane_keywords_notify_cb, pkd, NOTIFY_PRIORITY_LOW); } -static void bar_pane_keywords_mark_edited (GtkCellRendererText *cell, const gchar *path, const gchar *text, gpointer data) +static void bar_pane_keywords_mark_edited(GtkCellRendererText *cell, const gchar *path, const gchar *text, gpointer data) { PaneKeywordsData *pkd = data; GtkTreeModel *store; @@ -705,10 +705,10 @@ static GtkTreeModel *create_marks_list(void) { gchar str[10]; g_sprintf(str, " %d ", i + 1); - gtk_list_store_append (model, &iter); + gtk_list_store_append(model, &iter); gtk_list_store_set(model, &iter, 0, str, -1); } - gtk_list_store_append (model, &iter); + gtk_list_store_append(model, &iter); gtk_list_store_set(model, &iter, 0, " ... ", -1); return GTK_TREE_MODEL(model); } @@ -803,7 +803,7 @@ GtkWidget *bar_pane_keywords_new(const gchar *title, const gchar *key, gboolean gtk_tree_view_column_pack_start(column, renderer, TRUE); gtk_tree_view_column_add_attribute(column, renderer, "text", KEYWORD_COLUMN_MARK); - g_signal_connect (renderer, "edited", + g_signal_connect(renderer, "edited", G_CALLBACK (bar_pane_keywords_mark_edited), pkd); gtk_tree_view_append_column(GTK_TREE_VIEW(pkd->keyword_treeview), column); diff --git a/src/cache-loader.c b/src/cache-loader.c index 24c87474..3b2932b3 100644 --- a/src/cache-loader.c +++ b/src/cache-loader.c @@ -49,8 +49,8 @@ static gboolean cache_loader_process(CacheLoader *cl) if (!cl->il && !cl->error) { cl->il = image_loader_new(cl->fd); - g_signal_connect (G_OBJECT(cl->il), "error", (GCallback)cache_loader_error_cb, cl); - g_signal_connect (G_OBJECT(cl->il), "done", (GCallback)cache_loader_done_cb, cl); + g_signal_connect(G_OBJECT(cl->il), "error", (GCallback)cache_loader_error_cb, cl); + g_signal_connect(G_OBJECT(cl->il), "done", (GCallback)cache_loader_done_cb, cl); if (image_loader_start(cl->il)) { return FALSE; diff --git a/src/cellrenderericon.c b/src/cellrenderericon.c index ea887c7c..66598b76 100644 --- a/src/cellrenderericon.c +++ b/src/cellrenderericon.c @@ -56,13 +56,13 @@ static void gqv_cell_renderer_icon_render(GtkCellRenderer *cell, GdkRectangle *expose_area, GtkCellRendererState flags); -static gint gqv_cell_renderer_icon_activate (GtkCellRenderer *cell, - GdkEvent *event, - GtkWidget *widget, - const gchar *path, - GdkRectangle *background_area, - GdkRectangle *cell_area, - GtkCellRendererState flags); +static gint gqv_cell_renderer_icon_activate(GtkCellRenderer *cell, + GdkEvent *event, + GtkWidget *widget, + const gchar *path, + GdkRectangle *background_area, + GdkRectangle *cell_area, + GtkCellRendererState flags); enum { TOGGLED, @@ -263,7 +263,7 @@ gqv_cell_renderer_icon_class_init(GQvCellRendererIconClass *class) 0, G_PARAM_READWRITE)); toggle_cell_signals[TOGGLED] = - g_signal_new ("toggled", + g_signal_new("toggled", G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GQvCellRendererIconClass, toggled), @@ -746,7 +746,7 @@ gqv_cell_renderer_icon_render(GtkCellRenderer *cell, { for (i = 0; i < cellicon->num_marks; i++) { - gtk_paint_check (widget->style, window, + gtk_paint_check(widget->style, window, state, (cellicon->marks & (1 << i)) ? GTK_SHADOW_IN : GTK_SHADOW_OUT, cell_area, widget, "cellcheck", pix_rect.x + i * TOGGLE_SPACING + (TOGGLE_WIDTH - TOGGLE_SPACING) / 2, @@ -768,16 +768,16 @@ gqv_cell_renderer_icon_render(GtkCellRenderer *cell, } static gint -gqv_cell_renderer_icon_activate (GtkCellRenderer *cell, - GdkEvent *event, - GtkWidget *widget, - const gchar *path, - GdkRectangle *background_area, - GdkRectangle *cell_area, - GtkCellRendererState flags) +gqv_cell_renderer_icon_activate(GtkCellRenderer *cell, + GdkEvent *event, + GtkWidget *widget, + const gchar *path, + GdkRectangle *background_area, + GdkRectangle *cell_area, + GtkCellRendererState flags) { GQvCellRendererIcon *cellicon = (GQvCellRendererIcon *) cell; - GdkEventButton *bevent = &event->button; + GdkEventButton *bevent = &event->button; if (cellicon->show_marks && event->type == GDK_BUTTON_PRESS && @@ -808,7 +808,7 @@ gqv_cell_renderer_icon_activate (GtkCellRenderer *cell, bevent->y >= rect.y && bevent->y < rect.y + rect.height) { cellicon->toggled_mark = i; - g_signal_emit (cell, toggle_cell_signals[TOGGLED], 0, path); + g_signal_emit(cell, toggle_cell_signals[TOGGLED], 0, path); break; } } diff --git a/src/cellrenderericon.h b/src/cellrenderericon.h index bfe1eb78..ce9411cb 100644 --- a/src/cellrenderericon.h +++ b/src/cellrenderericon.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -#define GQV_TYPE_CELL_RENDERER_ICON (gqv_cell_renderer_icon_get_type ()) +#define GQV_TYPE_CELL_RENDERER_ICON (gqv_cell_renderer_icon_get_type()) #define GQV_CELL_RENDERER_ICON(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GQV_TYPE_CELL_RENDERER_ICON, GQvCellRendererIcon)) #define GQV_CELL_RENDERER_ICON_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GQV_TYPE_CELL_RENDERER_ICON, GQvCellRendererIconClass)) #define GQV_IS_CELL_RENDERER_ICON(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GQV_TYPE_CELL_RENDERER_ICON)) @@ -70,8 +70,7 @@ struct _GQvCellRendererIconClass { GtkCellRendererClass parent_class; - void (* toggled) (GQvCellRendererIcon *cell_renderer, - const gchar *path); + void (*toggled)(GQvCellRendererIcon *cell_renderer, const gchar *path); /* Padding for future expansion */ void (*_gtk_reserved1)(void); @@ -80,8 +79,8 @@ struct _GQvCellRendererIconClass void (*_gtk_reserved4)(void); }; -GType gqv_cell_renderer_icon_get_type (void); -GtkCellRenderer *gqv_cell_renderer_icon_new (void); +GType gqv_cell_renderer_icon_get_type(void); +GtkCellRenderer *gqv_cell_renderer_icon_new(void); #ifdef __cplusplus } diff --git a/src/dupe.c b/src/dupe.c index 8e9f6513..ac3518cf 100644 --- a/src/dupe.c +++ b/src/dupe.c @@ -1534,8 +1534,8 @@ static gint dupe_check_cb(gpointer data) dw->img_loader = image_loader_new(di->fd); image_loader_set_buffer_size(dw->img_loader, 8); - g_signal_connect (G_OBJECT(dw->img_loader), "error", (GCallback)dupe_loader_done_cb, dw); - g_signal_connect (G_OBJECT(dw->img_loader), "done", (GCallback)dupe_loader_done_cb, dw); + g_signal_connect(G_OBJECT(dw->img_loader), "error", (GCallback)dupe_loader_done_cb, dw); + g_signal_connect(G_OBJECT(dw->img_loader), "done", (GCallback)dupe_loader_done_cb, dw); if (!image_loader_start(dw->img_loader)) { diff --git a/src/gq-marshal.c b/src/gq-marshal.c index b846b59b..0bfd5671 100644 --- a/src/gq-marshal.c +++ b/src/gq-marshal.c @@ -4,24 +4,24 @@ #ifdef G_ENABLE_DEBUG -#define g_marshal_value_peek_boolean(v) g_value_get_boolean (v) -#define g_marshal_value_peek_char(v) g_value_get_char (v) -#define g_marshal_value_peek_uchar(v) g_value_get_uchar (v) -#define g_marshal_value_peek_int(v) g_value_get_int (v) -#define g_marshal_value_peek_uint(v) g_value_get_uint (v) -#define g_marshal_value_peek_long(v) g_value_get_long (v) -#define g_marshal_value_peek_ulong(v) g_value_get_ulong (v) -#define g_marshal_value_peek_int64(v) g_value_get_int64 (v) -#define g_marshal_value_peek_uint64(v) g_value_get_uint64 (v) -#define g_marshal_value_peek_enum(v) g_value_get_enum (v) -#define g_marshal_value_peek_flags(v) g_value_get_flags (v) -#define g_marshal_value_peek_float(v) g_value_get_float (v) -#define g_marshal_value_peek_double(v) g_value_get_double (v) -#define g_marshal_value_peek_string(v) (char*) g_value_get_string (v) -#define g_marshal_value_peek_param(v) g_value_get_param (v) -#define g_marshal_value_peek_boxed(v) g_value_get_boxed (v) -#define g_marshal_value_peek_pointer(v) g_value_get_pointer (v) -#define g_marshal_value_peek_object(v) g_value_get_object (v) +#define g_marshal_value_peek_boolean(v) g_value_get_boolean(v) +#define g_marshal_value_peek_char(v) g_value_get_char(v) +#define g_marshal_value_peek_uchar(v) g_value_get_uchar(v) +#define g_marshal_value_peek_int(v) g_value_get_int(v) +#define g_marshal_value_peek_uint(v) g_value_get_uint(v) +#define g_marshal_value_peek_long(v) g_value_get_long(v) +#define g_marshal_value_peek_ulong(v) g_value_get_ulong(v) +#define g_marshal_value_peek_int64(v) g_value_get_int64(v) +#define g_marshal_value_peek_uint64(v) g_value_get_uint64(v) +#define g_marshal_value_peek_enum(v) g_value_get_enum(v) +#define g_marshal_value_peek_flags(v) g_value_get_flags(v) +#define g_marshal_value_peek_float(v) g_value_get_float(v) +#define g_marshal_value_peek_double(v) g_value_get_double(v) +#define g_marshal_value_peek_string(v) (char*) g_value_get_string(v) +#define g_marshal_value_peek_param(v) g_value_get_param(v) +#define g_marshal_value_peek_boxed(v) g_value_get_boxed(v) +#define g_marshal_value_peek_pointer(v) g_value_get_pointer(v) +#define g_marshal_value_peek_object(v) g_value_get_object(v) #else /* !G_ENABLE_DEBUG */ /* WARNING: This code accesses GValues directly, which is UNSUPPORTED API. * Do not access GValues directly in your code. Instead, use the @@ -52,12 +52,12 @@ /* VOID:INT,INT,INT,INT (gq-marshal.list:2) */ void -gq_marshal_VOID__INT_INT_INT_INT (GClosure *closure, - GValue *return_value G_GNUC_UNUSED, - guint n_param_values, - const GValue *param_values, - gpointer invocation_hint G_GNUC_UNUSED, - gpointer marshal_data) +gq_marshal_VOID__INT_INT_INT_INT(GClosure *closure, + GValue *return_value G_GNUC_UNUSED, + guint n_param_values, + const GValue *param_values, + gpointer invocation_hint G_GNUC_UNUSED, + gpointer marshal_data) { typedef void (*GMarshalFunc_VOID__INT_INT_INT_INT) (gpointer data1, gint arg_1, @@ -69,26 +69,26 @@ gq_marshal_VOID__INT_INT_INT_INT (GClosure *closure, register GCClosure *cc = (GCClosure*) closure; register gpointer data1, data2; - g_return_if_fail (n_param_values == 5); + g_return_if_fail(n_param_values == 5); - if (G_CCLOSURE_SWAP_DATA (closure)) + if (G_CCLOSURE_SWAP_DATA(closure)) { data1 = closure->data; - data2 = g_value_peek_pointer (param_values + 0); + data2 = g_value_peek_pointer(param_values + 0); } else { - data1 = g_value_peek_pointer (param_values + 0); + data1 = g_value_peek_pointer(param_values + 0); data2 = closure->data; } callback = (GMarshalFunc_VOID__INT_INT_INT_INT) (marshal_data ? marshal_data : cc->callback); - callback (data1, - g_marshal_value_peek_int (param_values + 1), - g_marshal_value_peek_int (param_values + 2), - g_marshal_value_peek_int (param_values + 3), - g_marshal_value_peek_int (param_values + 4), - data2); + callback(data1, + g_marshal_value_peek_int(param_values + 1), + g_marshal_value_peek_int(param_values + 2), + g_marshal_value_peek_int(param_values + 3), + g_marshal_value_peek_int(param_values + 4), + data2); } /* VOID:DOUBLE (gq-marshal.list:3) */ diff --git a/src/image-load.c b/src/image-load.c index b44b7723..87438767 100644 --- a/src/image-load.c +++ b/src/image-load.c @@ -24,7 +24,7 @@ /**************************************************************************************/ -/* image looader class */ +/* image loader class */ enum { @@ -37,34 +37,34 @@ enum { static guint signals[SIGNAL_COUNT] = { 0 }; -static void image_loader_init (GTypeInstance *instance, gpointer g_class); -static void image_loader_class_init (ImageLoaderClass *class); +static void image_loader_init(GTypeInstance *instance, gpointer g_class); +static void image_loader_class_init(ImageLoaderClass *class); static void image_loader_finalize(GObject *object); static void image_loader_stop(ImageLoader *il); -GType image_loader_get_type (void) +GType image_loader_get_type(void) { static GType type = 0; if (type == 0) { static const GTypeInfo info = { - sizeof (ImageLoaderClass), + sizeof(ImageLoaderClass), NULL, /* base_init */ NULL, /* base_finalize */ (GClassInitFunc)image_loader_class_init, /* class_init */ NULL, /* class_finalize */ NULL, /* class_data */ - sizeof (ImageLoader), + sizeof(ImageLoader), 0, /* n_preallocs */ (GInstanceInitFunc)image_loader_init, /* instance_init */ NULL /* value_table */ }; - type = g_type_register_static (G_TYPE_OBJECT, "ImageLoaderType", &info, 0); + type = g_type_register_static(G_TYPE_OBJECT, "ImageLoaderType", &info, 0); } return type; } -static void image_loader_init (GTypeInstance *instance, gpointer g_class) +static void image_loader_init(GTypeInstance *instance, gpointer g_class) { ImageLoader *il = (ImageLoader *)instance; @@ -96,7 +96,7 @@ static void image_loader_init (GTypeInstance *instance, gpointer g_class) DEBUG_1("new image loader %p, bufsize=%u idle_loop=%u", il, il->read_buffer_size, il->idle_read_loop_count); } -static void image_loader_class_init (ImageLoaderClass *class) +static void image_loader_class_init(ImageLoaderClass *class) { GObjectClass *gobject_class = G_OBJECT_CLASS (class); diff --git a/src/image.c b/src/image.c index c798f06e..4becafae 100644 --- a/src/image.c +++ b/src/image.c @@ -437,8 +437,8 @@ static void image_read_ahead_start(ImageWindow *imd) image_loader_delay_area_ready(imd->read_ahead_il, TRUE); /* we will need the area_ready signals later */ - g_signal_connect (G_OBJECT(imd->read_ahead_il), "error", (GCallback)image_read_ahead_error_cb, imd); - g_signal_connect (G_OBJECT(imd->read_ahead_il), "done", (GCallback)image_read_ahead_done_cb, imd); + g_signal_connect(G_OBJECT(imd->read_ahead_il), "error", (GCallback)image_read_ahead_error_cb, imd); + g_signal_connect(G_OBJECT(imd->read_ahead_il), "done", (GCallback)image_read_ahead_done_cb, imd); if (!image_loader_start(imd->read_ahead_il)) { diff --git a/src/main.c b/src/main.c index 1ba2e6c1..a7a74a8f 100644 --- a/src/main.c +++ b/src/main.c @@ -732,7 +732,7 @@ gint main(gint argc, gchar *argv[]) CollectionData *cd = NULL; #ifdef HAVE_GTHREAD - g_thread_init (NULL); + g_thread_init(NULL); gdk_threads_init(); gdk_threads_enter(); #endif diff --git a/src/md5-util.c b/src/md5-util.c index 8a3b76e8..09d37703 100644 --- a/src/md5-util.c +++ b/src/md5-util.c @@ -34,7 +34,7 @@ #include "ui_fileops.h" /* for utf-8 filename conversion */ -static void md5_transform (guint32 buf[4], const guint32 in[16]); +static void md5_transform(guint32 buf[4], const guint32 in[16]); static gint _ie = 0x44332211; static union _endian { gint i; gchar b[4]; } *_endian = (union _endian *)&_ie; diff --git a/src/md5-util.h b/src/md5-util.h index c68b67b1..ad14f553 100644 --- a/src/md5-util.h +++ b/src/md5-util.h @@ -37,12 +37,12 @@ typedef struct _MD5Context { /* raw routines */ -void md5_init (MD5Context *ctx); -void md5_update (MD5Context *ctx, const guchar *buf, guint32 len); -void md5_final (MD5Context *ctx, guchar digest[16]); +void md5_init(MD5Context *ctx); +void md5_update(MD5Context *ctx, const guchar *buf, guint32 len); +void md5_final(MD5Context *ctx, guchar digest[16]); /* generate digest from memory buffer */ -void md5_get_digest (const guchar *buffer, gint buffer_size, guchar digest[16]); +void md5_get_digest(const guchar *buffer, gint buffer_size, guchar digest[16]); /* generate digest from file */ gboolean md5_get_digest_from_file(const gchar *path, guchar digest[16]); diff --git a/src/pan-view.c b/src/pan-view.c index a64726da..16759023 100644 --- a/src/pan-view.c +++ b/src/pan-view.c @@ -210,8 +210,8 @@ static gint pan_queue_step(PanWindow *pw) #if 0 image_loader_set_area_ready_func(pw->il, pan_queue_image_area_cb, pw); #endif - g_signal_connect (G_OBJECT(pw->il), "error", (GCallback)pan_queue_image_done_cb, pw); - g_signal_connect (G_OBJECT(pw->il), "done", (GCallback)pan_queue_image_done_cb, pw); + g_signal_connect(G_OBJECT(pw->il), "error", (GCallback)pan_queue_image_done_cb, pw); + g_signal_connect(G_OBJECT(pw->il), "done", (GCallback)pan_queue_image_done_cb, pw); if (image_loader_start(pw->il)) return FALSE; diff --git a/src/pixbuf-renderer.h b/src/pixbuf-renderer.h index 52a0739a..ad484a2a 100644 --- a/src/pixbuf-renderer.h +++ b/src/pixbuf-renderer.h @@ -169,7 +169,7 @@ struct _PixbufRendererClass }; -GType pixbuf_renderer_get_type (void); +GType pixbuf_renderer_get_type(void); PixbufRenderer *pixbuf_renderer_new(void); diff --git a/src/preferences.c b/src/preferences.c index a720693e..b532b87b 100644 --- a/src/preferences.c +++ b/src/preferences.c @@ -1228,10 +1228,10 @@ static GtkTreeModel *create_class_model(void) gint i; /* create list store */ - model = gtk_list_store_new (1, G_TYPE_STRING); + model = gtk_list_store_new(1, G_TYPE_STRING); for (i = 0; i < FILE_FORMAT_CLASSES; i++) { - gtk_list_store_append (model, &iter); + gtk_list_store_append(model, &iter); gtk_list_store_set(model, &iter, 0, _(format_class_list[i]), -1); } return GTK_TREE_MODEL (model); diff --git a/src/print.c b/src/print.c index ab8ac7e2..87490dc2 100644 --- a/src/print.c +++ b/src/print.c @@ -2217,7 +2217,7 @@ static gint print_job_render_image(PrintWindow *pw) if (!fd) return FALSE; pw->job_loader = image_loader_new(fd); - g_signal_connect (G_OBJECT(pw->job_loader), "done", (GCallback)print_job_render_image_loader_done, pw); + g_signal_connect(G_OBJECT(pw->job_loader), "done", (GCallback)print_job_render_image_loader_done, pw); if (!image_loader_start(pw->job_loader)) { image_loader_free(pw->job_loader); @@ -2364,7 +2364,7 @@ static gint print_job_render_proof(PrintWindow *pw) image_loader_free(pw->job_loader); pw->job_loader = image_loader_new(fd); - g_signal_connect (G_OBJECT(pw->job_loader), "done", (GCallback)print_job_render_proof_loader_done, pw); + g_signal_connect(G_OBJECT(pw->job_loader), "done", (GCallback)print_job_render_proof_loader_done, pw); if (!image_loader_start(pw->job_loader)) { image_loader_free(pw->job_loader); diff --git a/src/rcfile.c b/src/rcfile.c index 876eb4a1..ff5e8e60 100644 --- a/src/rcfile.c +++ b/src/rcfile.c @@ -1049,7 +1049,7 @@ gboolean load_options_from(const gchar *utf8_path, ConfOptions *options, gboolea gboolean ret = TRUE; GQParserData *parser_data; - if (g_file_get_contents (utf8_path, &buf, &size, NULL) == FALSE) + if (g_file_get_contents(utf8_path, &buf, &size, NULL) == FALSE) { return FALSE; } @@ -1061,7 +1061,7 @@ gboolean load_options_from(const gchar *utf8_path, ConfOptions *options, gboolea context = g_markup_parse_context_new(&parser, 0, parser_data, NULL); - if (g_markup_parse_context_parse (context, buf, size, NULL) == FALSE) + if (g_markup_parse_context_parse(context, buf, size, NULL) == FALSE) { ret = FALSE; DEBUG_1("Parse failed"); @@ -1070,7 +1070,7 @@ gboolean load_options_from(const gchar *utf8_path, ConfOptions *options, gboolea g_free(parser_data); g_free(buf); - g_markup_parse_context_free (context); + g_markup_parse_context_free(context); return ret; } diff --git a/src/search.c b/src/search.c index 322f2e53..9bf898c3 100644 --- a/src/search.c +++ b/src/search.c @@ -1585,8 +1585,8 @@ static gint search_file_do_extra(SearchData *sd, FileData *fd, gint *match, (sd->match_similarity_enable && !sd->img_cd->similarity)) { sd->img_loader = image_loader_new(fd); - g_signal_connect (G_OBJECT(sd->img_loader), "error", (GCallback)search_file_load_done_cb, sd); - g_signal_connect (G_OBJECT(sd->img_loader), "done", (GCallback)search_file_load_done_cb, sd); + g_signal_connect(G_OBJECT(sd->img_loader), "error", (GCallback)search_file_load_done_cb, sd); + g_signal_connect(G_OBJECT(sd->img_loader), "done", (GCallback)search_file_load_done_cb, sd); if (image_loader_start(sd->img_loader)) { return TRUE; @@ -2110,8 +2110,8 @@ static void search_start(SearchData *sd) } sd->img_loader = image_loader_new(file_data_new_simple(sd->search_similarity_path)); - g_signal_connect (G_OBJECT(sd->img_loader), "error", (GCallback)search_similarity_load_done_cb, sd); - g_signal_connect (G_OBJECT(sd->img_loader), "done", (GCallback)search_similarity_load_done_cb, sd); + g_signal_connect(G_OBJECT(sd->img_loader), "error", (GCallback)search_similarity_load_done_cb, sd); + g_signal_connect(G_OBJECT(sd->img_loader), "done", (GCallback)search_similarity_load_done_cb, sd); if (image_loader_start(sd->img_loader)) { return; diff --git a/src/thumb.c b/src/thumb.c index 9bedcaed..0021be6b 100644 --- a/src/thumb.c +++ b/src/thumb.c @@ -163,7 +163,7 @@ static void thumb_loader_done_cb(ImageLoader *il, gpointer data) thumb_loader_setup(tl, tl->fd->path); - g_signal_connect (G_OBJECT(tl->il), "done", (GCallback)thumb_loader_done_cb, tl); + g_signal_connect(G_OBJECT(tl->il), "done", (GCallback)thumb_loader_done_cb, tl); if (!image_loader_start(tl->il)) { @@ -276,8 +276,8 @@ static void thumb_loader_setup(ThumbLoader *tl, const gchar *path) image_loader_set_requested_size(tl->il, tl->max_w, tl->max_h); } - g_signal_connect (G_OBJECT(tl->il), "error", (GCallback)thumb_loader_error_cb, tl); - if (tl->func_progress) g_signal_connect (G_OBJECT(tl->il), "percent", (GCallback)thumb_loader_percent_cb, tl); + g_signal_connect(G_OBJECT(tl->il), "error", (GCallback)thumb_loader_error_cb, tl); + if (tl->func_progress) g_signal_connect(G_OBJECT(tl->il), "percent", (GCallback)thumb_loader_percent_cb, tl); } void thumb_loader_set_callbacks(ThumbLoader *tl, @@ -389,7 +389,7 @@ gint thumb_loader_start(ThumbLoader *tl, FileData *fd) thumb_loader_setup(tl, tl->fd->path); } - g_signal_connect (G_OBJECT(tl->il), "done", (GCallback)thumb_loader_done_cb, tl); + g_signal_connect(G_OBJECT(tl->il), "done", (GCallback)thumb_loader_done_cb, tl); if (!image_loader_start(tl->il)) { /* try from original if cache attempt */ @@ -399,7 +399,7 @@ gint thumb_loader_start(ThumbLoader *tl, FileData *fd) log_printf("%s", _("Thumbnail image in cache failed to load, trying to recreate.\n")); thumb_loader_setup(tl, tl->fd->path); - g_signal_connect (G_OBJECT(tl->il), "done", (GCallback)thumb_loader_done_cb, tl); + g_signal_connect(G_OBJECT(tl->il), "done", (GCallback)thumb_loader_done_cb, tl); if (image_loader_start(tl->il)) return TRUE; } /* mark failed thumbnail in cache with 0 byte file */ diff --git a/src/thumb_standard.c b/src/thumb_standard.c index 095c22a9..0657a8d6 100644 --- a/src/thumb_standard.c +++ b/src/thumb_standard.c @@ -614,12 +614,12 @@ static gint thumb_loader_std_setup(ThumbLoaderStd *tl, FileData *fd) } } - g_signal_connect (G_OBJECT(tl->il), "error", (GCallback)thumb_loader_std_error_cb, tl); + g_signal_connect(G_OBJECT(tl->il), "error", (GCallback)thumb_loader_std_error_cb, tl); if (tl->func_progress) { - g_signal_connect (G_OBJECT(tl->il), "percent", (GCallback)thumb_loader_std_progress_cb, tl); + g_signal_connect(G_OBJECT(tl->il), "percent", (GCallback)thumb_loader_std_progress_cb, tl); } - g_signal_connect (G_OBJECT(tl->il), "done", (GCallback)thumb_loader_std_done_cb, tl); + g_signal_connect(G_OBJECT(tl->il), "done", (GCallback)thumb_loader_std_done_cb, tl); if (image_loader_start(tl->il)) { diff --git a/src/view_file_list.c b/src/view_file_list.c index 2ec33232..030e052f 100644 --- a/src/view_file_list.c +++ b/src/view_file_list.c @@ -227,7 +227,7 @@ static gint vflist_column_idx(ViewFile *vf, gint store_idx) while (work) { GtkTreeViewColumn *column = work->data; - if (store_idx == GPOINTER_TO_INT(g_object_get_data (G_OBJECT(column), "column_store_idx"))) + if (store_idx == GPOINTER_TO_INT(g_object_get_data(G_OBJECT(column), "column_store_idx"))) break; work = work->next; i++; -- 2.20.1