From e436ea53511e1dadab981af18b237fee83fde39b Mon Sep 17 00:00:00 2001 From: Laurent Monin Date: Thu, 30 Aug 2012 18:31:41 +0200 Subject: [PATCH] Trim trailing white spaces. --- src/advanced_exif.c | 10 +++--- src/bar.c | 40 +++++++++++------------ src/bar_comment.c | 4 +-- src/bar_exif.c | 18 +++++----- src/bar_gps.c | 14 ++++---- src/bar_histogram.c | 10 +++--- src/bar_keywords.c | 20 ++++++------ src/cellrenderericon.c | 24 +++++++------- src/compat.c | 2 +- src/compat.h | 2 +- src/desktop_file.c | 24 +++++++------- src/dupe.c | 2 +- src/editors.c | 32 +++++++++--------- src/editors.h | 2 +- src/filecache.c | 2 +- src/filedata.c | 44 ++++++++++++------------- src/filefilter.c | 6 ++-- src/fullscreen.c | 2 +- src/histogram.c | 4 +-- src/image-load.c | 34 +++++++++---------- src/image-overlay.c | 4 +-- src/image.c | 20 ++++++------ src/image_load_jpeg.c | 32 +++++++++--------- src/image_load_tiff.c | 8 ++--- src/img-view.c | 2 +- src/jpeg_parser.c | 10 +++--- src/jpeg_parser.h | 10 +++--- src/layout.c | 8 ++--- src/layout_image.c | 16 ++++----- src/layout_util.c | 26 +++++++-------- src/main.c | 20 ++++++------ src/metadata.c | 74 +++++++++++++++++++++--------------------- src/options.h | 2 +- src/pixbuf-renderer.c | 26 +++++++-------- src/pixbuf_util.c | 2 +- src/preferences.c | 4 +-- src/print.c | 4 +-- src/rcfile.c | 20 ++++++------ src/remote.c | 2 +- src/renderer-clutter.c | 38 +++++++++++----------- src/renderer-tiles.c | 40 +++++++++++------------ src/thumb_standard.c | 10 +++--- src/ui_bookmark.c | 2 +- src/ui_fileops.c | 2 +- src/ui_pathsel.c | 2 +- src/uri_utils.c | 2 +- src/utilops.c | 18 +++++----- src/view_file.c | 2 +- src/view_file_icon.c | 2 +- src/view_file_list.c | 4 +-- src/window.c | 2 +- 51 files changed, 355 insertions(+), 355 deletions(-) diff --git a/src/advanced_exif.c b/src/advanced_exif.c index 0a5e498c..9d9643c7 100644 --- a/src/advanced_exif.c +++ b/src/advanced_exif.c @@ -114,7 +114,7 @@ static void advanced_exif_update(ExifWin *ew) g_free(text); elements = g_strdup_printf("%d", exif_item_get_elements(item)); description = exif_item_get_description(item); - if (!description || *description == '\0') + if (!description || *description == '\0') { g_free(description); description = g_strdup(tag_name); @@ -176,10 +176,10 @@ static void advanced_exif_dnd_get(GtkWidget *listview, GdkDragContext *context, guint time, gpointer data) { //ExifWin *ew = data; - GtkTreeSelection *sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(listview)); + GtkTreeSelection *sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(listview)); GtkTreeIter iter; - if (gtk_tree_selection_get_selected(sel, NULL, &iter)) + if (gtk_tree_selection_get_selected(sel, NULL, &iter)) { GtkTreeModel *store = gtk_tree_view_get_model(GTK_TREE_VIEW(listview)); gchar *key; @@ -196,10 +196,10 @@ static void advanced_exif_dnd_get(GtkWidget *listview, GdkDragContext *context, static void advanced_exif_dnd_begin(GtkWidget *listview, GdkDragContext *context, gpointer data) { //ExifWin *ew = data; - GtkTreeSelection *sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(listview)); + GtkTreeSelection *sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(listview)); GtkTreeIter iter; - if (gtk_tree_selection_get_selected(sel, NULL, &iter)) + if (gtk_tree_selection_get_selected(sel, NULL, &iter)) { GtkTreeModel *store = gtk_tree_view_get_model(GTK_TREE_VIEW(listview)); gchar *key; diff --git a/src/bar.c b/src/bar.c index de4270ca..015e7b2b 100644 --- a/src/bar.c +++ b/src/bar.c @@ -40,7 +40,7 @@ struct _KnownPanes const gchar *config; }; -static const gchar default_config_histogram[] = +static const gchar default_config_histogram[] = "" " " " " @@ -49,7 +49,7 @@ static const gchar default_config_histogram[] = " " ""; -static const gchar default_config_title[] = +static const gchar default_config_title[] = "" " " " " @@ -58,7 +58,7 @@ static const gchar default_config_title[] = " " ""; -static const gchar default_config_keywords[] = +static const gchar default_config_keywords[] = "" " " " " @@ -67,7 +67,7 @@ static const gchar default_config_keywords[] = " " ""; -static const gchar default_config_comment[] = +static const gchar default_config_comment[] = "" " " " " @@ -76,7 +76,7 @@ static const gchar default_config_comment[] = " " ""; -static const gchar default_config_exif[] = +static const gchar default_config_exif[] = "" " " " " @@ -102,7 +102,7 @@ static const gchar default_config_exif[] = " " ""; -static const gchar default_config_file_info[] = +static const gchar default_config_file_info[] = "" " " " " @@ -115,7 +115,7 @@ static const gchar default_config_file_info[] = " " ""; -static const gchar default_config_location[] = +static const gchar default_config_location[] = "" " " " " @@ -132,7 +132,7 @@ static const gchar default_config_location[] = " " ""; -static const gchar default_config_copyright[] = +static const gchar default_config_copyright[] = "" " " " " @@ -147,7 +147,7 @@ static const gchar default_config_copyright[] = #ifdef HAVE_LIBCHAMPLAIN #ifdef HAVE_LIBCHAMPLAIN_GTK -static const gchar default_config_gps[] = +static const gchar default_config_gps[] = "" " " " " @@ -276,10 +276,10 @@ static void bar_menu_popup(GtkWidget *widget) BarData *bd; bd = g_object_get_data(G_OBJECT(widget), "bar_data"); - if (bd) + if (bd) { expander = NULL; - bar = widget; + bar = widget; } else { @@ -315,15 +315,15 @@ static void bar_menu_popup(GtkWidget *widget) } -static gboolean bar_menu_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer data) -{ +static gboolean bar_menu_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer data) +{ if (bevent->button == MOUSE_BUTTON_RIGHT) { bar_menu_popup(widget); return TRUE; } return FALSE; -} +} static void bar_pane_set_fd_cb(GtkWidget *expander, gpointer data) @@ -464,7 +464,7 @@ void bar_write_config(GtkWidget *bar, GString *outstr, gint indent) indent++; WRITE_NL(); WRITE_STRING(""); - list = gtk_container_get_children(GTK_CONTAINER(bd->vbox)); + list = gtk_container_get_children(GTK_CONTAINER(bd->vbox)); work = list; while (work) { @@ -517,7 +517,7 @@ void bar_add(GtkWidget *bar, GtkWidget *pane) gtk_box_pack_start(GTK_BOX(bd->vbox), expander, FALSE, TRUE, 0); - g_signal_connect(expander, "button_release_event", G_CALLBACK(bar_menu_cb), bd); + g_signal_connect(expander, "button_release_event", G_CALLBACK(bar_menu_cb), bd); gtk_container_add(GTK_CONTAINER(expander), pane); @@ -578,7 +578,7 @@ static void bar_destroy(GtkWidget *widget, gpointer data) } #ifdef HAVE_LIBCHAMPLAIN_GTK -/* +/* FIXME: this is an ugly hack that works around this bug: https://bugzilla.gnome.org/show_bug.cgi?id=590692 http://bugzilla.openedhand.com/show_bug.cgi?id=1751 @@ -610,7 +610,7 @@ GtkWidget *bar_new(LayoutWindow *lw) g_signal_connect(G_OBJECT(bd->widget), "size-allocate", G_CALLBACK(bar_size_allocate), bd); - g_signal_connect(G_OBJECT(bd->widget), "button_release_event", G_CALLBACK(bar_menu_cb), bd); + g_signal_connect(G_OBJECT(bd->widget), "button_release_event", G_CALLBACK(bar_menu_cb), bd); bd->width = SIDEBAR_DEFAULT_WIDTH; gtk_widget_set_size_request(bd->widget, bd->width, -1); @@ -639,7 +639,7 @@ GtkWidget *bar_new(LayoutWindow *lw) gtk_viewport_set_shadow_type(GTK_VIEWPORT(gtk_bin_get_child(GTK_BIN(scrolled))), GTK_SHADOW_NONE); #ifdef HAVE_LIBCHAMPLAIN_GTK - g_signal_connect(G_OBJECT(gtk_bin_get_child(GTK_BIN(scrolled))), "unrealize", G_CALLBACK(bar_unrealize_clutter_fix_cb), NULL); + g_signal_connect(G_OBJECT(gtk_bin_get_child(GTK_BIN(scrolled))), "unrealize", G_CALLBACK(bar_unrealize_clutter_fix_cb), NULL); #endif gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolled), GTK_SHADOW_NONE); @@ -666,7 +666,7 @@ GtkWidget *bar_update_from_config(GtkWidget *bar, const gchar **attribute_names, } gtk_widget_set_size_request(bar, width, -1); - if (enabled) + if (enabled) { gtk_widget_show(bar); } diff --git a/src/bar_comment.c b/src/bar_comment.c index 5a750076..36bc50de 100644 --- a/src/bar_comment.c +++ b/src/bar_comment.c @@ -164,14 +164,14 @@ static void bar_pane_comment_write_config(GtkWidget *pane, GString *outstr, gint write_char_option(outstr, indent, "title", gtk_label_get_text(GTK_LABEL(pcd->pane.title))); WRITE_BOOL(pcd->pane, expanded); WRITE_CHAR(*pcd, key); - WRITE_INT(*pcd, height); + WRITE_INT(*pcd, height); WRITE_STRING("/>"); } static void bar_pane_comment_notify_cb(FileData *fd, NotifyType type, gpointer data) { PaneCommentData *pcd = data; - if ((type & (NOTIFY_REREAD | NOTIFY_CHANGE | NOTIFY_METADATA)) && fd == pcd->fd) + if ((type & (NOTIFY_REREAD | NOTIFY_CHANGE | NOTIFY_METADATA)) && fd == pcd->fd) { DEBUG_1("Notify pane_comment: %s %04x", fd->path, type); diff --git a/src/bar_exif.c b/src/bar_exif.c index aeae4166..9c1cc471 100644 --- a/src/bar_exif.c +++ b/src/bar_exif.c @@ -257,7 +257,7 @@ static void bar_pane_exif_update(PaneExifData *ped) ped->all_hidden = TRUE; - list = gtk_container_get_children(GTK_CONTAINER(ped->vbox)); + list = gtk_container_get_children(GTK_CONTAINER(ped->vbox)); work = list; while (work) { @@ -293,7 +293,7 @@ gint bar_pane_exif_event(GtkWidget *bar, GdkEvent *event) ped = g_object_get_data(G_OBJECT(bar), "pane_data"); if (!ped) return FALSE; - list = gtk_container_get_children(GTK_CONTAINER(ped->vbox)); + list = gtk_container_get_children(GTK_CONTAINER(ped->vbox)); work = list; while (!ret && work) { @@ -310,7 +310,7 @@ gint bar_pane_exif_event(GtkWidget *bar, GdkEvent *event) static void bar_pane_exif_notify_cb(FileData *fd, NotifyType type, gpointer data) { PaneExifData *ped = data; - if ((type & (NOTIFY_REREAD | NOTIFY_CHANGE | NOTIFY_METADATA)) && fd == ped->fd) + if ((type & (NOTIFY_REREAD | NOTIFY_CHANGE | NOTIFY_METADATA)) && fd == ped->fd) { DEBUG_1("Notify pane_exif: %s %04x", fd->path, type); bar_pane_exif_update(ped); @@ -385,7 +385,7 @@ static void bar_pane_exif_dnd_receive(GtkWidget *pane, GdkDragContext *context, break; } - list = gtk_container_get_children(GTK_CONTAINER(ped->vbox)); + list = gtk_container_get_children(GTK_CONTAINER(ped->vbox)); work = list; pos = 0; while (work) @@ -474,7 +474,7 @@ static void bar_pane_exif_edit_ok_cb(GenericDialog *gd, gpointer data) if (ped) { - bar_pane_exif_add_entry(ped, + bar_pane_exif_add_entry(ped, gtk_entry_get_text(GTK_ENTRY(cdd->key_entry)), gtk_entry_get_text(GTK_ENTRY(cdd->title_entry)), cdd->if_set, cdd->editable); @@ -627,8 +627,8 @@ static void bar_pane_exif_menu_popup(GtkWidget *widget, PaneExifData *ped) gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, NULL, 0, GDK_CURRENT_TIME); } -static gboolean bar_pane_exif_menu_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer data) -{ +static gboolean bar_pane_exif_menu_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer data) +{ PaneExifData *ped = data; if (bevent->button == MOUSE_BUTTON_RIGHT) { @@ -636,7 +636,7 @@ static gboolean bar_pane_exif_menu_cb(GtkWidget *widget, GdkEventButton *bevent, return TRUE; } return FALSE; -} +} @@ -668,7 +668,7 @@ static void bar_pane_exif_write_config(GtkWidget *pane, GString *outstr, gint in WRITE_STRING(">"); indent++; - list = gtk_container_get_children(GTK_CONTAINER(ped->vbox)); + list = gtk_container_get_children(GTK_CONTAINER(ped->vbox)); work = list; while (work) { diff --git a/src/bar_gps.c b/src/bar_gps.c index f74ad50b..b46bdc15 100644 --- a/src/bar_gps.c +++ b/src/bar_gps.c @@ -294,7 +294,7 @@ static void bar_pane_gps_update(PaneGPSData *pgd) else { return; - } + } } /* Delete any markers currently displayed @@ -522,8 +522,8 @@ static void bar_pane_gps_notify_cb(FileData *fd, NotifyType type, gpointer data) { PaneGPSData *pgd = data; - if ((type & (NOTIFY_REREAD | NOTIFY_CHANGE | NOTIFY_METADATA)) && - g_list_find(pgd->selection_list, fd)) + if ((type & (NOTIFY_REREAD | NOTIFY_CHANGE | NOTIFY_METADATA)) && + g_list_find(pgd->selection_list, fd)) { bar_pane_gps_update(pgd); } @@ -562,11 +562,11 @@ static GtkWidget *bar_pane_gps_menu(PaneGPSData *pgd) { map_desc = (ChamplainMapSourceDesc *)(map_list->data); - menu_item_add_radio(menu, + menu_item_add_radio(menu, champlain_map_source_desc_get_name(map_desc), - (gpointer)champlain_map_source_desc_get_id(map_desc), - strcmp(champlain_map_source_desc_get_id(map_desc), current) == 0, - G_CALLBACK(bar_pane_gps_change_map_cb), pgd); + (gpointer)champlain_map_source_desc_get_id(map_desc), + strcmp(champlain_map_source_desc_get_id(map_desc), current) == 0, + G_CALLBACK(bar_pane_gps_change_map_cb), pgd); map_list = g_slist_next(map_list); } diff --git a/src/bar_histogram.c b/src/bar_histogram.c index 9a218e2f..56ab973a 100644 --- a/src/bar_histogram.c +++ b/src/bar_histogram.c @@ -59,7 +59,7 @@ static void bar_pane_histogram_update(PaneHistogramData *phd) if (!phd->histogram_width || !phd->histogram_height || !phd->fd) return; /* histmap_get is relatively expensive, run it only when we really need it - and with lower priority than pixbuf_renderer + and with lower priority than pixbuf_renderer FIXME: this does not work for fullscreen*/ if (gtk_widget_is_drawable(phd->drawing_area)) { @@ -87,7 +87,7 @@ static gboolean bar_pane_histogram_update_cb(gpointer data) if (phd->fd == NULL) return FALSE; histmap = histmap_get(phd->fd); - if (!histmap) + if (!histmap) { histmap_start_idle(phd->fd); return FALSE; @@ -133,7 +133,7 @@ static void bar_pane_histogram_write_config(GtkWidget *pane, GString *outstr, gi static void bar_pane_histogram_notify_cb(FileData *fd, NotifyType type, gpointer data) { PaneHistogramData *phd = data; - if ((type & (NOTIFY_REREAD | NOTIFY_CHANGE | NOTIFY_HISTMAP | NOTIFY_PIXBUF)) && fd == phd->fd) + if ((type & (NOTIFY_REREAD | NOTIFY_CHANGE | NOTIFY_HISTMAP | NOTIFY_PIXBUF)) && fd == phd->fd) { DEBUG_1("Notify pane_histogram: %s %04x", fd->path, type); bar_pane_histogram_update(phd); @@ -310,10 +310,10 @@ static GtkWidget *bar_pane_histogram_new(const gchar *id, const gchar *title, gi G_CALLBACK(bar_pane_histogram_size_cb), phd); #if GTK_CHECK_VERSION(3,0,0) - g_signal_connect(G_OBJECT(phd->drawing_area), "draw", + g_signal_connect(G_OBJECT(phd->drawing_area), "draw", G_CALLBACK(bar_pane_histogram_draw_cb), phd); #else - g_signal_connect(G_OBJECT(phd->drawing_area), "expose_event", + g_signal_connect(G_OBJECT(phd->drawing_area), "expose_event", G_CALLBACK(bar_pane_histogram_expose_event_cb), phd); #endif diff --git a/src/bar_keywords.c b/src/bar_keywords.c index af903c80..3a0d7453 100644 --- a/src/bar_keywords.c +++ b/src/bar_keywords.c @@ -110,7 +110,7 @@ struct _PaneKeywordsData gboolean collapse_unchecked; gboolean hide_unchecked; - guint idle_id; /* event source id */ + guint idle_id; /* event source id */ FileData *fd; gchar *key; }; @@ -291,7 +291,7 @@ static void bar_pane_keywords_keyword_toggle(GtkCellRendererToggle *toggle, cons gtk_tree_model_filter_convert_iter_to_child_iter(GTK_TREE_MODEL_FILTER(model), &child_iter, &iter); list = keyword_list_pull(pkd->keyword_view); - if (active) + if (active) keyword_tree_set(keyword_tree, &child_iter, &list); else keyword_tree_reset(keyword_tree, &child_iter, &list); @@ -406,7 +406,7 @@ static void bar_pane_keywords_populate_popup_cb(GtkTextView *textview, GtkMenu * static void bar_pane_keywords_notify_cb(FileData *fd, NotifyType type, gpointer data) { PaneKeywordsData *pkd = data; - if ((type & (NOTIFY_REREAD | NOTIFY_CHANGE | NOTIFY_METADATA)) && fd == pkd->fd) + if ((type & (NOTIFY_REREAD | NOTIFY_CHANGE | NOTIFY_METADATA)) && fd == pkd->fd) { DEBUG_1("Notify pane_keywords: %s %04x", fd->path, type); bar_pane_keywords_update(pkd); @@ -463,7 +463,7 @@ static void bar_pane_keywords_dnd_get(GtkWidget *tree_view, GdkDragContext *cont GtkTreeIter child_iter; GtkTreeModel *keyword_tree; - GtkTreeSelection *sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(tree_view)); + GtkTreeSelection *sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(tree_view)); if (!gtk_tree_selection_get_selected(sel, &model, &iter)) return; @@ -499,7 +499,7 @@ static void bar_pane_keywords_dnd_begin(GtkWidget *tree_view, GdkDragContext *co GtkTreeModel *keyword_tree; gchar *name; - GtkTreeSelection *sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(tree_view)); + GtkTreeSelection *sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(tree_view)); if (!gtk_tree_selection_get_selected(sel, &model, &iter)) return; @@ -523,7 +523,7 @@ static gboolean bar_pane_keywords_dnd_can_move(GtkTreeModel *keyword_tree, GtkTr gchar *src_name; GtkTreeIter parent; - if (dest_kw_iter && keyword_same_parent(keyword_tree, src_kw_iter, dest_kw_iter)) + if (dest_kw_iter && keyword_same_parent(keyword_tree, src_kw_iter, dest_kw_iter)) { return TRUE; /* reordering of siblings is ok */ } @@ -1220,8 +1220,8 @@ static void bar_pane_keywords_menu_popup(GtkWidget *widget, PaneKeywordsData *pk } -static gboolean bar_pane_keywords_menu_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer data) -{ +static gboolean bar_pane_keywords_menu_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer data) +{ PaneKeywordsData *pkd = data; if (bevent->button == MOUSE_BUTTON_RIGHT) { @@ -1229,7 +1229,7 @@ static gboolean bar_pane_keywords_menu_cb(GtkWidget *widget, GdkEventButton *bev return TRUE; } return FALSE; -} +} /* *------------------------------------------------------------------- @@ -1400,7 +1400,7 @@ static GtkWidget *bar_pane_keywords_new(const gchar *id, const gchar *title, con g_signal_connect(G_OBJECT(pkd->keyword_treeview), "drag_motion", G_CALLBACK(bar_pane_keywords_dnd_motion), pkd); - g_signal_connect(G_OBJECT(pkd->keyword_treeview), "button_release_event", + g_signal_connect(G_OBJECT(pkd->keyword_treeview), "button_release_event", G_CALLBACK(bar_pane_keywords_menu_cb), pkd); gtk_container_add(GTK_CONTAINER(scrolled), pkd->keyword_treeview); diff --git a/src/cellrenderericon.c b/src/cellrenderericon.c index e1e7579f..e158f2a4 100644 --- a/src/cellrenderericon.c +++ b/src/cellrenderericon.c @@ -50,11 +50,11 @@ static void gqv_cell_renderer_icon_get_size(GtkCellRenderer *cell, gint *width, gint *height); #if GTK_CHECK_VERSION(3,0,0) -static void gqv_cell_renderer_icon_render(GtkCellRenderer *cell, - cairo_t *cr, - GtkWidget *widget, - const GdkRectangle *background_area, - const GdkRectangle *cell_area, +static void gqv_cell_renderer_icon_render(GtkCellRenderer *cell, + cairo_t *cr, + GtkWidget *widget, + const GdkRectangle *background_area, + const GdkRectangle *cell_area, GtkCellRendererState flags); #else static void gqv_cell_renderer_icon_render(GtkCellRenderer *cell, @@ -630,11 +630,11 @@ gqv_cell_renderer_icon_get_size(GtkCellRenderer *cell, } #if GTK_CHECK_VERSION(3,0,0) -static void gqv_cell_renderer_icon_render(GtkCellRenderer *cell, - cairo_t *cr, - GtkWidget *widget, - const GdkRectangle *background_area, - const GdkRectangle *cell_area, +static void gqv_cell_renderer_icon_render(GtkCellRenderer *cell, + cairo_t *cr, + GtkWidget *widget, + const GdkRectangle *background_area, + const GdkRectangle *cell_area, GtkCellRendererState flags) { @@ -714,7 +714,7 @@ gqv_cell_renderer_icon_render(GtkCellRenderer *cell, pix_rect.y = cell_area->y + cell_rect.y; } - if (gdk_rectangle_intersect(cell_area, &pix_rect, &draw_rect) + if (gdk_rectangle_intersect(cell_area, &pix_rect, &draw_rect) #if !GTK_CHECK_VERSION(3,0,0) && gdk_rectangle_intersect(expose_area, &draw_rect, &draw_rect) #endif @@ -798,7 +798,7 @@ gqv_cell_renderer_icon_render(GtkCellRenderer *cell, cairo_save (cr); - cairo_rectangle(cr, + cairo_rectangle(cr, pix_rect.x + i * TOGGLE_SPACING + (TOGGLE_WIDTH - TOGGLE_SPACING) / 2, pix_rect.y, TOGGLE_WIDTH, TOGGLE_WIDTH); diff --git a/src/compat.c b/src/compat.c index 7458d2df..db67a987 100644 --- a/src/compat.c +++ b/src/compat.c @@ -32,7 +32,7 @@ gint compat_gdk_window_get_height(GdkWindow *window) cairo_surface_t *compat_gdk_window_create_similar_surface (GdkWindow *window, cairo_content_t content, gint width, gint height) { cairo_t *cr = gdk_cairo_create(window); - cairo_surface_t *ws = cairo_get_target(cr); + cairo_surface_t *ws = cairo_get_target(cr); cairo_surface_t *ret = cairo_surface_create_similar(ws, content, width, height); cairo_destroy(cr); return ret; diff --git a/src/compat.h b/src/compat.h index fe55f48d..80d667e2 100644 --- a/src/compat.h +++ b/src/compat.h @@ -62,7 +62,7 @@ #define gtk_combo_box_text_append_text gtk_combo_box_append_text #define gtk_combo_box_text_new_with_entry gtk_combo_box_entry_new_text #define gtk_combo_box_new_with_model_and_entry(model) gtk_combo_box_entry_new_with_model(model, FILTER_COLUMN_FILTER) -#define GTK_COMBO_BOX_TEXT(combo) GTK_COMBO_BOX(combo) +#define GTK_COMBO_BOX_TEXT(combo) GTK_COMBO_BOX(combo) #define gdk_window_get_width(window) compat_gdk_window_get_width(window) #define gdk_window_get_height(window) compat_gdk_window_get_height(window) diff --git a/src/desktop_file.c b/src/desktop_file.c index 842e28b2..e4f1a84d 100644 --- a/src/desktop_file.c +++ b/src/desktop_file.c @@ -69,7 +69,7 @@ static gboolean editor_window_save(EditorWindow *ew) gboolean ret = TRUE; const gchar *name = gtk_entry_get_text(GTK_ENTRY(ew->entry)); - if (!name || !name[0]) + if (!name || !name[0]) { file_util_warning_dialog(_("Can't save"), _("Please specify file name."), GTK_STOCK_DIALOG_ERROR, NULL); return FALSE; @@ -87,7 +87,7 @@ static gboolean editor_window_save(EditorWindow *ew) ret = FALSE; } - if (ret && !g_file_set_contents(path, text, -1, &error)) + if (ret && !g_file_set_contents(path, text, -1, &error)) { file_util_warning_dialog(_("Can't save"), error->message, GTK_STOCK_DIALOG_ERROR, NULL); g_error_free(error); @@ -99,7 +99,7 @@ static gboolean editor_window_save(EditorWindow *ew) g_free(text); layout_editors_reload_start(); /* idle function is not needed, everything should be cached */ - layout_editors_reload_finish(); + layout_editors_reload_finish(); return ret; } @@ -297,7 +297,7 @@ static void editor_list_window_delete_dlg_ok_cb(GenericDialog *gd, gpointer data /* refresh list */ layout_editors_reload_start(); /* idle function is not needed, everything should be cached */ - layout_editors_reload_finish(); + layout_editors_reload_finish(); } editor_list_window_delete_dlg_cancel(gd, data); @@ -306,10 +306,10 @@ static void editor_list_window_delete_dlg_ok_cb(GenericDialog *gd, gpointer data static void editor_list_window_delete_cb(GtkWidget *widget, gpointer data) { EditorListWindow *ewl = data; - GtkTreeSelection *sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(ewl->view)); + GtkTreeSelection *sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(ewl->view)); GtkTreeIter iter; - if (gtk_tree_selection_get_selected(sel, NULL, &iter)) + if (gtk_tree_selection_get_selected(sel, NULL, &iter)) { GtkTreeModel *store = gtk_tree_view_get_model(GTK_TREE_VIEW(ewl->view)); gchar *path; @@ -351,10 +351,10 @@ static void editor_list_window_delete_cb(GtkWidget *widget, gpointer data) static void editor_list_window_edit_cb(GtkWidget *widget, gpointer data) { EditorListWindow *ewl = data; - GtkTreeSelection *sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(ewl->view)); + GtkTreeSelection *sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(ewl->view)); GtkTreeIter iter; - if (gtk_tree_selection_get_selected(sel, NULL, &iter)) + if (gtk_tree_selection_get_selected(sel, NULL, &iter)) { GtkTreeModel *store = gtk_tree_view_get_model(GTK_TREE_VIEW(ewl->view)); gchar *path; @@ -363,7 +363,7 @@ static void editor_list_window_edit_cb(GtkWidget *widget, gpointer data) gtk_tree_model_get(store, &iter, DESKTOP_FILE_COLUMN_PATH, &path, DESKTOP_FILE_COLUMN_KEY, &key, -1); - editor_window_new(path, key); + editor_window_new(path, key); g_free(key); g_free(path); } @@ -377,10 +377,10 @@ static void editor_list_window_new_cb(GtkWidget *widget, gpointer data) static void editor_list_window_selection_changed_cb(GtkWidget *widget, gpointer data) { EditorListWindow *ewl = data; - GtkTreeSelection *sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(ewl->view)); + GtkTreeSelection *sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(ewl->view)); GtkTreeIter iter; - if (gtk_tree_selection_get_selected(sel, NULL, &iter)) + if (gtk_tree_selection_get_selected(sel, NULL, &iter)) { GtkTreeModel *store = gtk_tree_view_get_model(GTK_TREE_VIEW(ewl->view)); gchar *path; @@ -528,7 +528,7 @@ static void editor_list_window_create(void) gtk_tree_view_column_add_attribute(column, renderer, "text", DESKTOP_FILE_COLUMN_HIDDEN); gtk_tree_view_append_column(GTK_TREE_VIEW(ewl->view), column); gtk_tree_view_column_set_sort_column_id(column, DESKTOP_FILE_COLUMN_HIDDEN); - gtk_tree_view_column_set_alignment(column, 0.5); + gtk_tree_view_column_set_alignment(column, 0.5); column = gtk_tree_view_column_new(); gtk_tree_view_column_set_title(column, _("Desktop file")); diff --git a/src/dupe.c b/src/dupe.c index ee528eb1..77cc06e7 100644 --- a/src/dupe.c +++ b/src/dupe.c @@ -2210,7 +2210,7 @@ static void dupe_menu_popup_destroy_cb(GtkWidget *widget, gpointer data) GList *editmenu_fd_list = data; filelist_free(editmenu_fd_list); -} +} static GList *dupe_window_get_fd_list(DupeWindow *dw) { diff --git a/src/editors.c b/src/editors.c index 6f480249..270c5d35 100644 --- a/src/editors.c +++ b/src/editors.c @@ -109,7 +109,7 @@ static GList *editor_mime_types_to_extensions(gchar **mime_types) {"image/png", ".png"}, {"image/svg", ".svg"}, {"image/svg+xml", ".svg"}, - {"image/svg+xml-compressed", ".svg"}, + {"image/svg+xml-compressed", ".svg"}, {"image/tiff", ".tiff;.tif"}, {"image/x-bmp", ".bmp"}, {"image/x-canon-crw", ".crw"}, @@ -123,7 +123,7 @@ static GList *editor_mime_types_to_extensions(gchar **mime_types) {"image/x-pcx", ".pcx"}, {"image/xpm", ".xpm"}, {"image/x-png", ".png"}, - {"image/x-portable-anymap", ".pam"}, + {"image/x-portable-anymap", ".pam"}, {"image/x-portable-bitmap", ".pbm"}, {"image/x-portable-graymap", ".pgm"}, {"image/x-portable-pixmap", ".ppm"}, @@ -141,7 +141,7 @@ static GList *editor_mime_types_to_extensions(gchar **mime_types) gint i, j; GList *list = NULL; - for (i = 0; mime_types[i]; i++) + for (i = 0; mime_types[i]; i++) for (j = 0; conv_table[j][0]; j++) if (strcmp(mime_types[i], conv_table[j][0]) == 0) list = g_list_concat(list, filter_to_list(conv_table[j][1])); @@ -198,14 +198,14 @@ gboolean editor_read_desktop_file(const gchar *path) { gboolean found = FALSE; gint i; - for (i = 0; categories[i]; i++) + for (i = 0; categories[i]; i++) { /* IMHO "Graphics" is exactly the category that we are interested in, so this does not have to be configurable */ if (strcmp(categories[i], "Graphics") == 0) { found = TRUE; } - if (strcmp(categories[i], "X-Geeqie") == 0) + if (strcmp(categories[i], "X-Geeqie") == 0) { found = TRUE; category_geeqie = TRUE; @@ -225,7 +225,7 @@ gboolean editor_read_desktop_file(const gchar *path) { gboolean found = FALSE; gint i; - for (i = 0; only_show_in[i]; i++) + for (i = 0; only_show_in[i]; i++) if (strcmp(only_show_in[i], "X-Geeqie") == 0) { found = TRUE; @@ -240,7 +240,7 @@ gboolean editor_read_desktop_file(const gchar *path) { gboolean found = FALSE; gint i; - for (i = 0; not_show_in[i]; i++) + for (i = 0; not_show_in[i]; i++) if (strcmp(not_show_in[i], "X-Geeqie") == 0) { found = TRUE; @@ -260,7 +260,7 @@ gboolean editor_read_desktop_file(const gchar *path) g_free(try_exec); } - if (editor->ignored) + if (editor->ignored) { /* ignored editors will be deleted, no need to parse the rest */ g_key_file_free(key_file); @@ -275,7 +275,7 @@ gboolean editor_read_desktop_file(const gchar *path) { gchar *ext = strrchr(editor->icon, '.'); - if (ext && strlen(ext) == 4 && + if (ext && strlen(ext) == 4 && (!strcmp(ext, ".png") || !strcmp(ext, ".xpm") || !strcmp(ext, ".svg"))) { log_printf(_("Desktop file '%s' should not include extension in Icon key: '%s'\n"), @@ -310,7 +310,7 @@ gboolean editor_read_desktop_file(const gchar *path) { editor->ext_list = editor_mime_types_to_extensions(mime_types); g_strfreev(mime_types); - if (!editor->ext_list) editor->hidden = TRUE; + if (!editor->ext_list) editor->hidden = TRUE; } } @@ -329,14 +329,14 @@ gboolean editor_read_desktop_file(const gchar *path) if (editor->ignored) return TRUE; gtk_list_store_append(desktop_file_list, &iter); - gtk_list_store_set(desktop_file_list, &iter, + gtk_list_store_set(desktop_file_list, &iter, DESKTOP_FILE_COLUMN_KEY, key, DESKTOP_FILE_COLUMN_NAME, editor->name, DESKTOP_FILE_COLUMN_HIDDEN, editor->hidden ? _("yes") : _("no"), DESKTOP_FILE_COLUMN_WRITABLE, access_file(path, W_OK), DESKTOP_FILE_COLUMN_PATH, path, -1); - return TRUE; + return TRUE; } static gboolean editor_remove_desktop_file_cb(gpointer key, gpointer value, gpointer user_data) @@ -357,7 +357,7 @@ void editor_table_clear(void) { gtk_list_store_clear(desktop_file_list); } - else + else { desktop_file_list = gtk_list_store_new(DESKTOP_FILE_COLUMN_COUNT, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_BOOLEAN, G_TYPE_STRING); } @@ -393,7 +393,7 @@ static GList *editor_add_desktop_dir(GList *list, const gchar *path) gchar *dpath = g_build_filename(path, name, NULL); list = g_list_prepend(list, dpath); g_free(name); - } + } } closedir(dp); return list; @@ -439,9 +439,9 @@ static void editor_list_add_cb(gpointer key, gpointer value, gpointer data) GList **listp = data; EditorDescription *editor = value; - /* do not show the special commands in any list, they are called explicitly */ + /* do not show the special commands in any list, they are called explicitly */ if (strcmp(editor->key, CMD_COPY) == 0 || - strcmp(editor->key, CMD_MOVE) == 0 || + strcmp(editor->key, CMD_MOVE) == 0 || strcmp(editor->key, CMD_RENAME) == 0 || strcmp(editor->key, CMD_DELETE) == 0 || strcmp(editor->key, CMD_FOLDER) == 0) return; diff --git a/src/editors.h b/src/editors.h index e0ca1b82..acb06748 100644 --- a/src/editors.h +++ b/src/editors.h @@ -42,7 +42,7 @@ struct _EditorDescription { gchar *name; /* Name, localized name presented to user */ gchar *icon; /* Icon */ gchar *exec; /* Exec */ - gchar *menu_path; + gchar *menu_path; gchar *hotkey; GList *ext_list; gchar *file; diff --git a/src/filecache.c b/src/filecache.c index 4c10c0ce..34432345 100644 --- a/src/filecache.c +++ b/src/filecache.c @@ -70,7 +70,7 @@ gboolean file_cache_get(FileCacheData *fc, FileData *fd) if (file_data_check_changed_files(fd)) { /* file has been changed, cance entry is no longer valid */ - file_cache_remove_fd(fc, fd); + file_cache_remove_fd(fc, fd); return FALSE; } if (debug_file_cache) file_cache_dump(fc); diff --git a/src/filedata.c b/src/filedata.c index 13bab820..105d0161 100644 --- a/src/filedata.c +++ b/src/filedata.c @@ -139,7 +139,7 @@ const gchar *text_from_time(time_t t) /* *----------------------------------------------------------------------------- - * changed files detection and notification + * changed files detection and notification *----------------------------------------------------------------------------- */ @@ -147,7 +147,7 @@ void file_data_increment_version(FileData *fd) { fd->version++; fd->valid_marks = 0; - if (fd->parent) + if (fd->parent) { fd->parent->version++; fd->parent->valid_marks = 0; @@ -251,7 +251,7 @@ gboolean file_data_check_changed_files(FileData *fd) /* *----------------------------------------------------------------------------- - * file name, extension, sorting, ... + * file name, extension, sorting, ... *----------------------------------------------------------------------------- */ @@ -346,7 +346,7 @@ static FileData *file_data_new(const gchar *path_utf8, struct stat *st, gboolean DEBUG_2("file_data_new: '%s' %d", path_utf8, disable_sidecars); - if (S_ISDIR(st->st_mode)) disable_sidecars = TRUE; + if (S_ISDIR(st->st_mode)) disable_sidecars = TRUE; if (!file_data_pool) file_data_pool = g_hash_table_new(g_str_hash, g_str_equal); @@ -647,7 +647,7 @@ static gint sidecar_file_priority(const gchar *extension) static void file_data_check_sidecars(const GList *basename_list) { /* basename_list contains the new group - first is the parent, then sorted sidecars */ - /* all files in the list have ref count > 0 */ + /* all files in the list have ref count > 0 */ const GList *work; GList *s_work, *new_sidecars; @@ -664,7 +664,7 @@ static void file_data_check_sidecars(const GList *basename_list) work = work->next; g_assert(fd->magick == FD_MAGICK); DEBUG_2("basename: %p %s", fd, fd->name); - if (fd->parent) + if (fd->parent) { g_assert(fd->parent->magick == FD_MAGICK); DEBUG_2(" parent: %p", fd->parent); @@ -695,7 +695,7 @@ static void file_data_check_sidecars(const GList *basename_list) s_work = s_work->next; } - if (!work && !s_work) + if (!work && !s_work) { DEBUG_2("basename no change"); return; /* no change in grouping */ @@ -886,8 +886,8 @@ gint filelist_sort_compare_filedata(FileData *fa, FileData *fb) if (ret != 0) return ret; - /* do not return 0 unless the files are really the same - file_data_pool ensures that original_path is unique + /* do not return 0 unless the files are really the same + file_data_pool ensures that original_path is unique */ return strcmp(fa->original_path, fb->original_path); } @@ -956,7 +956,7 @@ static GList * file_data_basename_hash_insert(GHashTable *basename_hash, FileDat list = g_list_insert_sorted(list, file_data_ref(fd), file_data_sort_by_ext); g_hash_table_insert(basename_hash, basename, list); } - else + else { g_free(basename); } @@ -970,7 +970,7 @@ static void file_data_basename_hash_remove_list(gpointer key, gpointer value, gp static void file_data_basename_hash_free(GHashTable *basename_hash) { - g_hash_table_foreach(basename_hash, file_data_basename_hash_remove_list, NULL); + g_hash_table_foreach(basename_hash, file_data_basename_hash_remove_list, NULL); g_hash_table_destroy(basename_hash); } @@ -1082,7 +1082,7 @@ static gboolean filelist_read_real(const gchar *dir_path, GList **files, GList * { FileData *fd = file_data_new_local(filepath, &ent_sbuf, FALSE); flist = g_list_prepend(flist, fd); - if (fd->sidecar_priority && !fd->disable_grouping) + if (fd->sidecar_priority && !fd->disable_grouping) { file_data_basename_hash_insert(basename_hash, fd); } @@ -1105,9 +1105,9 @@ static gboolean filelist_read_real(const gchar *dir_path, GList **files, GList * if (dirs) *dirs = dlist; - if (files) + if (files) { - g_hash_table_foreach(basename_hash, file_data_basename_hash_to_sidecars, NULL); + g_hash_table_foreach(basename_hash, file_data_basename_hash_to_sidecars, NULL); *files = filelist_filter_out_sidecars(flist); } @@ -1394,12 +1394,12 @@ gboolean file_data_get_mark(FileData *fd, gint n) { gboolean valid = (fd->valid_marks & (1 << n)); - if (file_data_get_mark_func[n] && !valid) + if (file_data_get_mark_func[n] && !valid) { guint old = fd->marks; gboolean value = (file_data_get_mark_func[n])(fd, n, file_data_mark_func_data[n]); - if (!value != !(fd->marks & (1 << n))) + if (!value != !(fd->marks & (1 << n))) { fd->marks = fd->marks ^ (1 << n); } @@ -1430,7 +1430,7 @@ void file_data_set_mark(FileData *fd, gint n, gboolean value) guint old; if (!value == !file_data_get_mark(fd, n)) return; - if (file_data_set_mark_func[n]) + if (file_data_set_mark_func[n]) { (file_data_set_mark_func[n])(fd, n, value, file_data_mark_func_data[n]); } @@ -2105,7 +2105,7 @@ gint file_data_verify_ci(FileData *fd) if (options->metadata.save_in_image_file) { - if (file_data_can_write_directly(fd)) + if (file_data_can_write_directly(fd)) { /* we can write the file directly */ if (access_file(fd->path, W_OK)) @@ -2121,7 +2121,7 @@ gint file_data_verify_ci(FileData *fd) } } } - else if (file_data_can_write_sidecar(fd)) + else if (file_data_can_write_sidecar(fd)) { /* we can write sidecar */ gchar *sidecar = file_data_get_sidecar_path(fd, FALSE); @@ -2593,10 +2593,10 @@ GList *file_data_process_groups_in_selection(GList *list, gboolean ungroup, GLis FileData *fd = work->data; work = work->next; - if (!file_data_list_contains_whole_group(list, fd)) + if (!file_data_list_contains_whole_group(list, fd)) { file_data_disable_grouping(fd, TRUE); - if (ungrouped_list) + if (ungrouped_list) { *ungrouped_list = g_list_prepend(*ungrouped_list, file_data_ref(fd)); } @@ -2604,7 +2604,7 @@ GList *file_data_process_groups_in_selection(GList *list, gboolean ungroup, GLis } } - /* remove sidecars from the list, + /* remove sidecars from the list, they can be still acessed via main_fd->sidecar_files */ work = list; while (work) diff --git a/src/filefilter.c b/src/filefilter.c index e456646b..c62ac59f 100644 --- a/src/filefilter.c +++ b/src/filefilter.c @@ -38,7 +38,7 @@ static GList *file_sidecar_list = NULL; /* files with allowed sidecar */ static FilterEntry *filter_entry_new(const gchar *key, const gchar *description, - const gchar *extensions, FileFormatClass file_class, + const gchar *extensions, FileFormatClass file_class, gboolean writable, gboolean allow_sidecar, gboolean enabled) { FilterEntry *fe; @@ -189,7 +189,7 @@ void filter_add_defaults(void) name = gdk_pixbuf_format_get_name(format); - if (strcmp(name, "Digital camera RAW") == 0) + if (strcmp(name, "Digital camera RAW") == 0) { DEBUG_1("Skipped '%s' from loader", name); g_free(name); @@ -300,7 +300,7 @@ GList *filter_to_list(const gchar *extensions) else if (g_ascii_strcasecmp(ext, "%meta") == 0) file_class = FORMAT_CLASS_META; else if (g_ascii_strcasecmp(ext, "%unknown") == 0) file_class = FORMAT_CLASS_UNKNOWN; - if (file_class == -1) + if (file_class == -1) { list = g_list_append(list, ext); } diff --git a/src/fullscreen.c b/src/fullscreen.c index 21dc4f40..4452734e 100644 --- a/src/fullscreen.c +++ b/src/fullscreen.c @@ -354,7 +354,7 @@ void fullscreen_stop(FullScreenData *fs) #ifdef HIDE_WINDOW_IN_FULLSCREEN gtk_widget_show(fs->normal_window); #endif - if (options->stereo.enable_fsmode) + if (options->stereo.enable_fsmode) { image_stereo_set(fs->normal_imd, options->stereo.mode); } diff --git a/src/histogram.c b/src/histogram.c index 10049339..8e379fbe 100644 --- a/src/histogram.c +++ b/src/histogram.c @@ -184,7 +184,7 @@ static gboolean histmap_read(HistMap *histmap, gboolean whole) } } histmap->y = end_line; - return end_line >= h; + return end_line >= h; } const HistMap *histmap_get(FileData *fd) @@ -320,7 +320,7 @@ gboolean histogram_draw(Histogram *histogram, const HistMap *histmap, GdkPixbuf for (j = 0; j < num_chan; j++) { gint chanmax; - if (histogram->histogram_channel == HCHAN_RGB) + if (histogram->histogram_channel == HCHAN_RGB) { chanmax = HCHAN_R; if (v[HCHAN_G] > v[HCHAN_R]) chanmax = HCHAN_G; diff --git a/src/image-load.c b/src/image-load.c index c2a7fdfc..2c00f004 100644 --- a/src/image-load.c +++ b/src/image-load.c @@ -52,7 +52,7 @@ static void image_loader_stop(ImageLoader *il); GType image_loader_get_type(void) { static GType type = 0; - if (type == 0) + if (type == 0) { static const GTypeInfo info = { sizeof(ImageLoaderClass), @@ -185,12 +185,12 @@ static void image_loader_finalize(GObject *object) il->idle_done_id = 0; } - while (g_source_remove_by_user_data(il)) + while (g_source_remove_by_user_data(il)) { DEBUG_2("pending signals detected"); } - while (il->area_param_list) + while (il->area_param_list) { DEBUG_1("pending area_ready signals detected"); while (g_source_remove_by_user_data(il->area_param_list->data)) {} @@ -198,7 +198,7 @@ static void image_loader_finalize(GObject *object) il->area_param_list = g_list_delete_link(il->area_param_list, il->area_param_list); } - while (il->area_param_delayed_list) + while (il->area_param_delayed_list) { g_free(il->area_param_delayed_list->data); il->area_param_delayed_list = g_list_delete_link(il->area_param_delayed_list, il->area_param_delayed_list); @@ -327,7 +327,7 @@ static void image_loader_emit_size(ImageLoader *il) static ImageLoaderAreaParam *image_loader_queue_area_ready(ImageLoader *il, GList **list, guint x, guint y, guint w, guint h) { - if (*list) + if (*list) { ImageLoaderAreaParam *prev_par = (*list)->data; if (prev_par->x == x && prev_par->w == w && @@ -414,7 +414,7 @@ static void image_loader_sync_pixbuf(ImageLoader *il) g_mutex_lock(il->data_mutex); - if (!il->loader) + if (!il->loader) { g_mutex_unlock(il->data_mutex); return; @@ -474,8 +474,8 @@ static void image_loader_area_prepared_cb(gpointer loader, gpointer data) guchar *pix; size_t h, rs; - /* a workaround for - http://bugzilla.gnome.org/show_bug.cgi?id=547669 + /* a workaround for + http://bugzilla.gnome.org/show_bug.cgi?id=547669 http://bugzilla.gnome.org/show_bug.cgi?id=589334 */ gchar *format = il->backend.get_format_name(loader); @@ -509,7 +509,7 @@ static void image_loader_size_cb(gpointer loader, g_mutex_lock(il->data_mutex); il->actual_width = width; il->actual_height = height; - if (il->requested_width < 1 || il->requested_height < 1) + if (il->requested_width < 1 || il->requested_height < 1) { g_mutex_unlock(il->data_mutex); image_loader_emit_size(il); @@ -925,7 +925,7 @@ static void image_loader_thread_leave_high(void) static void image_loader_thread_wait_high(void) { g_mutex_lock(image_loader_prio_mutex); - while (image_loader_prio_num) + while (image_loader_prio_num) { g_cond_wait(image_loader_prio_cond, image_loader_prio_mutex); } @@ -940,7 +940,7 @@ static void image_loader_thread_run(gpointer data, gpointer user_data) gboolean cont; gboolean err; - if (il->idle_priority > G_PRIORITY_DEFAULT_IDLE) + if (il->idle_priority > G_PRIORITY_DEFAULT_IDLE) { /* low prio, wait untill high prio tasks finishes */ image_loader_thread_wait_high(); @@ -955,8 +955,8 @@ static void image_loader_thread_run(gpointer data, gpointer user_data) if (err) { - /* - loader failed, we have to send signal + /* + loader failed, we have to send signal (idle mode returns the image_loader_begin return value directly) (success is always reported indirectly from image_loader_begin) */ @@ -967,7 +967,7 @@ static void image_loader_thread_run(gpointer data, gpointer user_data) while (cont && !image_loader_get_is_done(il) && !image_loader_get_stopping(il)) { - if (il->idle_priority > G_PRIORITY_DEFAULT_IDLE) + if (il->idle_priority > G_PRIORITY_DEFAULT_IDLE) { /* low prio, wait untill high prio tasks finishes */ image_loader_thread_wait_high(); @@ -976,7 +976,7 @@ static void image_loader_thread_run(gpointer data, gpointer user_data) } image_loader_stop_loader(il); - if (il->idle_priority <= G_PRIORITY_DEFAULT_IDLE) + if (il->idle_priority <= G_PRIORITY_DEFAULT_IDLE) { /* high prio */ image_loader_thread_leave_high(); @@ -1000,7 +1000,7 @@ static gboolean image_loader_start_thread(ImageLoader *il) if (!image_loader_setup_source(il)) return FALSE; - if (!image_loader_thread_pool) + if (!image_loader_thread_pool) { image_loader_thread_pool = g_thread_pool_new(image_loader_thread_run, NULL, -1, FALSE, NULL); image_loader_prio_cond = g_cond_new(); @@ -1098,7 +1098,7 @@ gdouble image_loader_get_percent(ImageLoader *il) if (!il) return 0.0; g_mutex_lock(il->data_mutex); - if (il->bytes_total == 0) + if (il->bytes_total == 0) { ret = 0.0; } diff --git a/src/image-overlay.c b/src/image-overlay.c index fe588efa..9a8b706b 100644 --- a/src/image-overlay.c +++ b/src/image-overlay.c @@ -592,7 +592,7 @@ static GdkPixbuf *image_osd_info_render(OverlayStateData *osd) if (with_hist) { histmap = histmap_get(imd->image_fd); - if (!histmap) + if (!histmap) { histmap_start_idle(imd->image_fd); with_hist = FALSE; @@ -856,7 +856,7 @@ static gboolean image_osd_update_cb(gpointer data) if (osd->show & OSD_SHOW_INFO) { - /* redraw when the image was changed, + /* redraw when the image was changed, with histogram we have to redraw also when loading is finished */ if (osd->changed_states & IMAGE_STATE_IMAGE || (osd->changed_states & IMAGE_STATE_LOADING && osd->show & OSD_SHOW_HISTOGRAM) || diff --git a/src/image.c b/src/image.c index aaf98738..826e9203 100644 --- a/src/image.c +++ b/src/image.c @@ -788,7 +788,7 @@ static gboolean image_load_begin(ImageWindow *imd, FileData *fd) { image_change_pixbuf(imd, image_loader_get_pixbuf(imd->il), image_zoom_get(imd), TRUE); } -*/ +*/ return TRUE; } @@ -1058,7 +1058,7 @@ void image_change_pixbuf(ImageWindow *imd, GdkPixbuf *pixbuf, gdouble zoom, gboo /* read_exif and similar functions can actually notice that the file has changed and trigger a notification that removes the pixbuf from cache and unrefs it. Therefore we must ref it here before it is taken over by the renderer. */ - if (pixbuf) g_object_ref(pixbuf); + if (pixbuf) g_object_ref(pixbuf); if (imd->image_fd) { @@ -1149,7 +1149,7 @@ static void image_loader_sync_read_ahead_data(ImageLoader *il, gpointer old_data } static void image_loader_sync_data(ImageLoader *il, gpointer old_data, gpointer data) -{ +{ if (g_signal_handlers_disconnect_by_func(G_OBJECT(il), (GCallback)image_load_area_cb, old_data)) g_signal_connect(G_OBJECT(il), "area_ready", (GCallback)image_load_area_cb, data); @@ -1435,7 +1435,7 @@ gint image_stereo_get(ImageWindow *imd) void image_stereo_set(ImageWindow *imd, gint stereo_mode) { - DEBUG_1("Setting stereo mode %04x for imd %p", stereo_mode, imd); + DEBUG_1("Setting stereo mode %04x for imd %p", stereo_mode, imd); pixbuf_renderer_stereo_set((PixbufRenderer *)imd->pr, stereo_mode); } @@ -1488,8 +1488,8 @@ static void image_notify_cb(FileData *fd, NotifyType type, gpointer data) if ((type & NOTIFY_REREAD) && fd == imd->image_fd) { - /* there is no need to reload on NOTIFY_CHANGE, - modified files should be detacted anyway and NOTIFY_REREAD should be recieved + /* there is no need to reload on NOTIFY_CHANGE, + modified files should be detacted anyway and NOTIFY_REREAD should be recieved or they are removed from the filelist completely on "move" and "delete" */ DEBUG_1("Notify image: %s %04x", fd->path, type); @@ -1707,8 +1707,8 @@ static void image_options_set(ImageWindow *imd) pixbuf_renderer_set_parent((PixbufRenderer *)imd->pr, (GtkWindow *)imd->top_window); image_stereo_set(imd, options->stereo.mode); - pixbuf_renderer_stereo_fixed_set((PixbufRenderer *)imd->pr, - options->stereo.fixed_w, options->stereo.fixed_h, + pixbuf_renderer_stereo_fixed_set((PixbufRenderer *)imd->pr, + options->stereo.fixed_w, options->stereo.fixed_h, options->stereo.fixed_x1, options->stereo.fixed_y1, options->stereo.fixed_x2, options->stereo.fixed_y2); } @@ -1759,7 +1759,7 @@ static void image_destroy_cb(GtkWidget *widget, gpointer data) ImageWindow *imd = data; image_free(imd); } -#if GTK_CHECK_VERSION(3,0,0) +#if GTK_CHECK_VERSION(3,0,0) gboolean selectable_frame_draw_cb(GtkWidget *widget, cairo_t *cr, gpointer data) { GtkAllocation allocation; @@ -1843,7 +1843,7 @@ void image_set_frame(ImageWindow *imd, gboolean frame) gtk_widget_set_can_focus(imd->frame, TRUE); gtk_widget_set_app_paintable(imd->frame, TRUE); -#if GTK_CHECK_VERSION(3,0,0) +#if GTK_CHECK_VERSION(3,0,0) g_signal_connect(G_OBJECT(imd->frame), "draw", G_CALLBACK(selectable_frame_draw_cb), NULL); #else diff --git a/src/image_load_jpeg.c b/src/image_load_jpeg.c index fc00ffc5..0c3c3199 100644 --- a/src/image_load_jpeg.c +++ b/src/image_load_jpeg.c @@ -14,7 +14,7 @@ * * Copyright (C) 1999 Michael Zucchi * Copyright (C) 1999 The Free Software Foundation - * + * * Progressive loading code Copyright (C) 1999 Red Hat, Inc. * * Authors: Michael Zucchi @@ -77,7 +77,7 @@ struct error_handler_data { /* explode gray image data from jpeg library into rgb components in pixbuf */ static void explode_gray_into_buf (struct jpeg_decompress_struct *cinfo, - guchar **lines) + guchar **lines) { gint i, j; guint w; @@ -108,7 +108,7 @@ explode_gray_into_buf (struct jpeg_decompress_struct *cinfo, static void convert_cmyk_to_rgb (struct jpeg_decompress_struct *cinfo, - guchar **lines) + guchar **lines) { gint i, j; @@ -171,8 +171,8 @@ fatal_error_handler (j_common_ptr cinfo) if (errmgr->error && *errmgr->error == NULL) { g_set_error (errmgr->error, GDK_PIXBUF_ERROR, - cinfo->err->msg_code == JERR_OUT_OF_MEMORY - ? GDK_PIXBUF_ERROR_INSUFFICIENT_MEMORY + cinfo->err->msg_code == JERR_OUT_OF_MEMORY + ? GDK_PIXBUF_ERROR_INSUFFICIENT_MEMORY : GDK_PIXBUF_ERROR_CORRUPT_IMAGE, _("Error interpreting JPEG image file (%s)"), buffer); @@ -199,7 +199,7 @@ void image_loader_jpeg_read_scanline(struct jpeg_decompress_struct *cinfo, gucha gint i; lptr = lines; - for (i = 0; i < cinfo->rec_outbuf_height; i++) + for (i = 0; i < cinfo->rec_outbuf_height; i++) { *lptr++ = *dptr; *dptr += rowstride; @@ -207,7 +207,7 @@ void image_loader_jpeg_read_scanline(struct jpeg_decompress_struct *cinfo, gucha jpeg_read_scanlines (cinfo, lines, cinfo->rec_outbuf_height); - switch (cinfo->out_color_space) + switch (cinfo->out_color_space) { case JCS_GRAYSCALE: explode_gray_into_buf (cinfo, lines); @@ -238,7 +238,7 @@ static void skip_input_data (j_decompress_ptr cinfo, long num_bytes) { ERREXIT(cinfo, JERR_INPUT_EOF); } - else if (num_bytes > 0) + else if (num_bytes > 0) { src->next_input_byte += (size_t) num_bytes; src->bytes_in_buffer -= (size_t) num_bytes; @@ -249,7 +249,7 @@ static void set_mem_src (j_decompress_ptr cinfo, void* buffer, long nbytes) { struct jpeg_source_mgr* src; - if (cinfo->src == NULL) + if (cinfo->src == NULL) { /* first time for this JPEG object? */ cinfo->src = (struct jpeg_source_mgr *) (*cinfo->mem->alloc_small) ( (j_common_ptr) cinfo, JPOOL_PERMANENT, @@ -324,7 +324,7 @@ static gboolean image_loader_jpeg_load (gpointer loader, const guchar *buf, gsiz jerr.error = error; - if (setjmp(jerr.setjmp_buffer)) + if (setjmp(jerr.setjmp_buffer)) { /* If we get here, the JPEG code has signaled an error. * We need to clean up the JPEG object, close the input file, and return. @@ -348,7 +348,7 @@ static gboolean image_loader_jpeg_load (gpointer loader, const guchar *buf, gsiz jpeg_read_header(&cinfo2, TRUE); if (cinfo.image_width != cinfo2.image_width || - cinfo.image_height != cinfo2.image_height) + cinfo.image_height != cinfo2.image_height) { DEBUG_1("stereo data with different size"); jpeg_destroy_decompress(&cinfo2); @@ -387,7 +387,7 @@ static gboolean image_loader_jpeg_load (gpointer loader, const guchar *buf, gsiz { if (cinfo.output_width != cinfo2.output_width || cinfo.output_height != cinfo2.output_height || - cinfo.out_color_components != cinfo2.out_color_components) + cinfo.out_color_components != cinfo2.out_color_components) { DEBUG_1("stereo data with different output size"); jpeg_destroy_decompress(&cinfo2); @@ -396,11 +396,11 @@ static gboolean image_loader_jpeg_load (gpointer loader, const guchar *buf, gsiz } - lj->pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, - cinfo.out_color_components == 4 ? TRUE : FALSE, + lj->pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, + cinfo.out_color_components == 4 ? TRUE : FALSE, 8, lj->stereo ? cinfo.output_width * 2: cinfo.output_width, cinfo.output_height); - if (!lj->pixbuf) + if (!lj->pixbuf) { jpeg_destroy_decompress (&cinfo); if (lj->stereo) jpeg_destroy_decompress (&cinfo2); @@ -414,7 +414,7 @@ static gboolean image_loader_jpeg_load (gpointer loader, const guchar *buf, gsiz dptr2 = gdk_pixbuf_get_pixels(lj->pixbuf) + ((cinfo.out_color_components == 4) ? 4 * cinfo.output_width : 3 * cinfo.output_width); - while (cinfo.output_scanline < cinfo.output_height && !lj->abort) + while (cinfo.output_scanline < cinfo.output_height && !lj->abort) { guint scanline = cinfo.output_scanline; image_loader_jpeg_read_scanline(&cinfo, &dptr, rowstride); diff --git a/src/image_load_tiff.c b/src/image_load_tiff.c index a4742f78..fd938b5f 100644 --- a/src/image_load_tiff.c +++ b/src/image_load_tiff.c @@ -223,7 +223,7 @@ static gboolean image_loader_tiff_load (gpointer loader, const guchar *buf, gsiz return FALSE; } - lt->pixbuf = gdk_pixbuf_new_from_data (pixels, GDK_COLORSPACE_RGB, TRUE, 8, + lt->pixbuf = gdk_pixbuf_new_from_data (pixels, GDK_COLORSPACE_RGB, TRUE, 8, width, height, rowstride, free_buffer, NULL); if (!lt->pixbuf) @@ -272,7 +272,7 @@ static gboolean image_loader_tiff_load (gpointer loader, const guchar *buf, gsiz guchar *top_line, *bottom_line; top_line = pixels + (row + i_row) * rowstride; - bottom_line = pixels + (row + rows_to_write - i_row - 1) * rowstride; + bottom_line = pixels + (row + rows_to_write - i_row - 1) * rowstride; memcpy(wrk_line, top_line, 4*width); memcpy(top_line, bottom_line, 4*width); @@ -285,7 +285,7 @@ static gboolean image_loader_tiff_load (gpointer loader, const guchar *buf, gsiz else { /* fallback, tiled tiff */ - if (!TIFFReadRGBAImageOriented (tiff, width, height, (uint32 *)pixels, ORIENTATION_TOPLEFT, 1)) + if (!TIFFReadRGBAImageOriented (tiff, width, height, (uint32 *)pixels, ORIENTATION_TOPLEFT, 1)) { TIFFClose(tiff); return FALSE; @@ -295,7 +295,7 @@ static gboolean image_loader_tiff_load (gpointer loader, const guchar *buf, gsiz /* Turns out that the packing used by TIFFRGBAImage depends on * the host byte order... */ - while (pixels < lt->pixbuf->pixels + bytes) + while (pixels < lt->pixbuf->pixels + bytes) { uint32 pixel = *(uint32 *)pixels; int r = TIFFGetR(pixel); diff --git a/src/img-view.c b/src/img-view.c index 38cd1477..06368d4e 100644 --- a/src/img-view.c +++ b/src/img-view.c @@ -1225,7 +1225,7 @@ static void view_popup_menu_destroy_cb(GtkWidget *widget, gpointer data) GList *editmenu_fd_list = data; filelist_free(editmenu_fd_list); -} +} static GList *view_window_get_fd_list(ViewWindow *vw) { diff --git a/src/jpeg_parser.c b/src/jpeg_parser.c index 636f9f8e..9918aab9 100644 --- a/src/jpeg_parser.c +++ b/src/jpeg_parser.c @@ -10,7 +10,7 @@ * This software comes with no warranty of any kind, use at your own risk! */ -#include "main.h" +#include "main.h" #include "jpeg_parser.h" gboolean jpeg_segment_find(const guchar *data, guint size, @@ -238,7 +238,7 @@ static gint mpo_parse_Index_IFD_entry(const guchar *tiff, guint offset, mpo->images[i].dep1 = tiff_byte_get_int16(tiff + data_offset + i * 16 + 12, bo); mpo->images[i].dep2 = tiff_byte_get_int16(tiff + data_offset + i * 16 + 14, bo); - if (i == 0) + if (i == 0) { mpo->images[i].offset = 0; } @@ -320,7 +320,7 @@ MPOData *jpeg_get_mpo_data(const guchar *data, guint size) MPOData *mpo; guint i; - DEBUG_1("mpo signature found at %x", seg_offset); + DEBUG_1("mpo signature found at %x", seg_offset); seg_offset += 4; seg_size -= 4; @@ -345,7 +345,7 @@ MPOData *jpeg_get_mpo_data(const guchar *data, guint size) for (i = 0; i < mpo->num_images; i++) { - if (i == 0) + if (i == 0) { offset = next_offset; } @@ -359,7 +359,7 @@ MPOData *jpeg_get_mpo_data(const guchar *data, guint size) seg_offset += 4; seg_size -= 4; - if (!tiff_directory_offset(data + mpo->images[i].offset + seg_offset, seg_size, &offset, &bo)) + if (!tiff_directory_offset(data + mpo->images[i].offset + seg_offset, seg_size, &offset, &bo)) { DEBUG_1("MPO image %d: invalid directory offset", i); continue; diff --git a/src/jpeg_parser.h b/src/jpeg_parser.h index 7d572dcd..d96e8f8e 100644 --- a/src/jpeg_parser.h +++ b/src/jpeg_parser.h @@ -50,11 +50,11 @@ struct _MPOEntry { guint dep2; guint MPFVersion; - guint MPIndividualNum; - guint PanOrientation; - double PanOverlap_H; - double PanOverlap_V; - guint BaseViewpointNum; + guint MPIndividualNum; + guint PanOrientation; + double PanOverlap_H; + double PanOverlap_V; + guint BaseViewpointNum; double ConvergenceAngle; double BaselineLength; double VerticalDivergence; diff --git a/src/layout.c b/src/layout.c index a7245ffe..08a8f691 100644 --- a/src/layout.c +++ b/src/layout.c @@ -1550,7 +1550,7 @@ void layout_style_set(LayoutWindow *lw, gint style, const gchar *order) /* remember state */ - /* layout_image_slideshow_stop(lw); slideshow should survive */ + /* layout_image_slideshow_stop(lw); slideshow should survive */ layout_image_full_screen_stop(lw); dir_fd = lw->dir_fd; @@ -1897,7 +1897,7 @@ void layout_show_config_window(LayoutWindow *lw) gtk_container_add(GTK_CONTAINER(hbox), button); GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); gtk_widget_show(button); -*/ +*/ button = pref_button_new(NULL, GTK_STOCK_APPLY, NULL, FALSE, G_CALLBACK(layout_config_apply_cb), lc); gtk_container_add(GTK_CONTAINER(hbox), button); @@ -2365,7 +2365,7 @@ static void layout_config_startup_path(LayoutOptions *lop, gchar **path) *path = get_current_dir(); break; } -} +} static void layout_config_commandline(LayoutOptions *lop, gchar **path) @@ -2409,7 +2409,7 @@ LayoutWindow *layout_new_from_config(const gchar **attribute_names, const gchar { layout_config_commandline(&lop, &path); } - else + else { layout_config_startup_path(&lop, &path); } diff --git a/src/layout_image.c b/src/layout_image.c index 091a75dd..d6038fb4 100644 --- a/src/layout_image.c +++ b/src/layout_image.c @@ -774,7 +774,7 @@ void layout_image_scroll(LayoutWindow *lw, gint x, gint y, gboolean connect_scro if (lw->full_screen && lw->image != lw->full_screen->imd) { - image_scroll(lw->full_screen->imd, x, y); + image_scroll(lw->full_screen->imd, x, y); } if (!connect_scroll) return; @@ -806,7 +806,7 @@ void layout_image_zoom_adjust(LayoutWindow *lw, gdouble increment, gboolean conn if (lw->full_screen && lw->image != lw->full_screen->imd) { - image_zoom_adjust(lw->full_screen->imd, increment); + image_zoom_adjust(lw->full_screen->imd, increment); } if (!connect_zoom) return; @@ -827,7 +827,7 @@ void layout_image_zoom_adjust_at_point(LayoutWindow *lw, gdouble increment, gint if (lw->full_screen && lw->image != lw->full_screen->imd) { - image_zoom_adjust_at_point(lw->full_screen->imd, increment, x, y); + image_zoom_adjust_at_point(lw->full_screen->imd, increment, x, y); } if (!connect_zoom) return; @@ -848,7 +848,7 @@ void layout_image_zoom_set(LayoutWindow *lw, gdouble zoom, gboolean connect_zoom if (lw->full_screen && lw->image != lw->full_screen->imd) { - image_zoom_set(lw->full_screen->imd, zoom); + image_zoom_set(lw->full_screen->imd, zoom); } if (!connect_zoom) return; @@ -869,7 +869,7 @@ void layout_image_zoom_set_fill_geometry(LayoutWindow *lw, gboolean vertical, gb if (lw->full_screen && lw->image != lw->full_screen->imd) { - image_zoom_set_fill_geometry(lw->full_screen->imd, vertical); + image_zoom_set_fill_geometry(lw->full_screen->imd, vertical); } if (!connect_zoom) return; @@ -1485,7 +1485,7 @@ static void layout_image_drag_cb(ImageWindow *imd, GdkEventButton *event, gdoubl LayoutWindow *lw = data; gdouble sx, sy; - if (lw->full_screen && lw->image != lw->full_screen->imd && + if (lw->full_screen && lw->image != lw->full_screen->imd && imd != lw->full_screen->imd) { if (event->state & GDK_CONTROL_MASK) @@ -1611,7 +1611,7 @@ void layout_status_update_pixel_cb(PixbufRenderer *pr, gpointer data) gint r_mouse, g_mouse, b_mouse; pixbuf_renderer_get_pixel_colors(pr, x_pixel, y_pixel, - &r_mouse, &g_mouse, &b_mouse); + &r_mouse, &g_mouse, &b_mouse); text = g_strdup_printf(_("[%*d,%*d]: RGB(%3d,%3d,%3d)"), num_length(width - 1), x_pixel, @@ -1939,7 +1939,7 @@ static void layout_image_maint_removed(LayoutWindow *lw, FileData *fd) layout_image_set_fd(lw, NULL); } - /* the image will be set to the next image from the list soon, + /* the image will be set to the next image from the list soon, setting it to NULL here is not necessary*/ } } diff --git a/src/layout_util.c b/src/layout_util.c index 57619f02..79193b09 100644 --- a/src/layout_util.c +++ b/src/layout_util.c @@ -1754,7 +1754,7 @@ static GList *layout_actions_editor_menu_path(EditorDescription *editor) gint i = 0; GList *ret = NULL; - if (split[0] == NULL) + if (split[0] == NULL) { g_strfreev(split); return NULL; @@ -1864,10 +1864,10 @@ static void layout_actions_setup_editors(LayoutWindow *lw) { GList *path; EditorDescription *editor = work->data; - GtkActionEntry entry = { editor->key, + GtkActionEntry entry = { editor->key, NULL, editor->name, - editor->hotkey, + editor->hotkey, editor->comment ? editor->comment : editor->name, G_CALLBACK(layout_menu_edit_cb) }; @@ -2086,7 +2086,7 @@ GtkWidget *layout_actions_toolbar(LayoutWindow *lw, ToolbarType type) void layout_toolbar_clear(LayoutWindow *lw, ToolbarType type) { - if (lw->toolbar_merge_id[type]) + if (lw->toolbar_merge_id[type]) { gtk_ui_manager_remove_ui(lw->ui_manager, lw->toolbar_merge_id[type]); gtk_ui_manager_ensure_update(lw->ui_manager); @@ -2130,17 +2130,17 @@ void layout_toolbar_add(LayoutWindow *lw, ToolbarType type, const gchar *action) } if (!gtk_action_group_get_action(lw->action_group_editors, action)) { - GtkActionEntry entry = { action, + GtkActionEntry entry = { action, GTK_STOCK_MISSING_IMAGE, action, - NULL, + NULL, NULL, NULL }; DEBUG_1("Creating temporary action %s", action); gtk_action_group_add_actions(lw->action_group_editors, &entry, 1, lw); } } - gtk_ui_manager_add_ui(lw->ui_manager, lw->toolbar_merge_id[type], path, action, action, GTK_UI_MANAGER_TOOLITEM, FALSE); + gtk_ui_manager_add_ui(lw->ui_manager, lw->toolbar_merge_id[type], path, action, action, GTK_UI_MANAGER_TOOLITEM, FALSE); lw->toolbar_actions[type] = g_list_append(lw->toolbar_actions[type], g_strdup(action)); } @@ -2218,7 +2218,7 @@ void layout_toolbar_add_from_config(LayoutWindow *lw, ToolbarType type, const gc } layout_toolbar_add(lw, type, action); - g_free(action); + g_free(action); } /* @@ -2437,7 +2437,7 @@ static void layout_bar_destroyed(GtkWidget *widget, gpointer data) LayoutWindow *lw = data; lw->bar = NULL; -/* +/* do not call layout_util_sync_views(lw) here this is called either when whole layout is destroyed - no need for update or when the bar is replaced - sync is called by upper function at the end of whole operation @@ -2482,7 +2482,7 @@ void layout_bar_set(LayoutWindow *lw, GtkWidget *bar) // gtk_box_pack_start(GTK_BOX(lw->utility_box), lw->bar, FALSE, FALSE, 0); - gtk_paned_pack2(GTK_PANED(lw->utility_paned), lw->bar, FALSE, TRUE); + gtk_paned_pack2(GTK_PANED(lw->utility_paned), lw->bar, FALSE, TRUE); bar_set_fd(lw->bar, layout_image_get_fd(lw)); } @@ -2532,7 +2532,7 @@ static void layout_bar_sort_destroyed(GtkWidget *widget, gpointer data) lw->bar_sort = NULL; -/* +/* do not call layout_util_sync_views(lw) here this is called either when whole layout is destroyed - no need for update or when the bar is replaced - sync is called by upper function at the end of whole operation @@ -2615,7 +2615,7 @@ GtkWidget *layout_bars_prepare(LayoutWindow *lw, GtkWidget *image) lw->utility_paned = gtk_hpaned_new(); gtk_box_pack_start(GTK_BOX(lw->utility_box), lw->utility_paned, TRUE, TRUE, 0); - gtk_paned_pack1(GTK_PANED(lw->utility_paned), image, TRUE, FALSE); + gtk_paned_pack1(GTK_PANED(lw->utility_paned), image, TRUE, FALSE); gtk_widget_show(lw->utility_paned); gtk_widget_show(image); @@ -2638,7 +2638,7 @@ static void layout_exif_window_destroy(GtkWidget *widget, gpointer data) void layout_exif_window_new(LayoutWindow *lw) { - if (lw->exif_window) return; + if (lw->exif_window) return; lw->exif_window = advanced_exif_new(); if (!lw->exif_window) return; diff --git a/src/main.c b/src/main.c index 571a910c..ab5ded32 100644 --- a/src/main.c +++ b/src/main.c @@ -698,7 +698,7 @@ void exit_program(void) exit_program_final(); } -/* This code is supposed to handle situation when a file mmaped by image_loader +/* This code is supposed to handle situation when a file mmaped by image_loader * or by exif loader is truncated by some other process. * This is probably not completely correct according to posix, because * mmap is not in the list of calls that can be used safely in signal handler, @@ -772,7 +772,7 @@ gint main(gint argc, gchar *argv[]) gtkrc_load(); parse_command_line_for_debug_option(argc, argv); - DEBUG_1("%s main: gtk_init", get_exec_time()); + DEBUG_1("%s main: gtk_init", get_exec_time()); #ifdef HAVE_CLUTTER if (gtk_clutter_init(&argc, &argv) != CLUTTER_INIT_SUCCESS) { @@ -793,17 +793,17 @@ gint main(gint argc, gchar *argv[]) log_printf("!!! %s may quit unexpectedly with a relocation error.\n", GQ_APPNAME); } - DEBUG_1("%s main: pixbuf_inline_register_stock_icons", get_exec_time()); + DEBUG_1("%s main: pixbuf_inline_register_stock_icons", get_exec_time()); pixbuf_inline_register_stock_icons(); - DEBUG_1("%s main: setting default options before commandline handling", get_exec_time()); + DEBUG_1("%s main: setting default options before commandline handling", get_exec_time()); options = init_options(NULL); setup_default_options(options); - DEBUG_1("%s main: parse_command_line", get_exec_time()); + DEBUG_1("%s main: parse_command_line", get_exec_time()); parse_command_line(argc, argv); - DEBUG_1("%s main: mkdir_if_not_exists", get_exec_time()); + DEBUG_1("%s main: mkdir_if_not_exists", get_exec_time()); /* these functions don't depend on config file */ mkdir_if_not_exists(get_rc_dir()); mkdir_if_not_exists(get_collections_dir()); @@ -818,16 +818,16 @@ gint main(gint argc, gchar *argv[]) /* restore session from the config file */ - DEBUG_1("%s main: load_options", get_exec_time()); + DEBUG_1("%s main: load_options", get_exec_time()); if (!load_options(options)) { /* load_options calls these functions after it parses global options, we have to call it here if it fails */ filter_add_defaults(); - filter_rebuild(); + filter_rebuild(); } /* handle missing config file and commandline additions*/ - if (!layout_window_list) + if (!layout_window_list) { /* broken or no config file */ layout_new_from_config(NULL, NULL, TRUE); @@ -912,7 +912,7 @@ gint main(gint argc, gchar *argv[]) remote_connection = remote_server_init(buf, cd); g_free(buf); - DEBUG_1("%s main: gtk_main", get_exec_time()); + DEBUG_1("%s main: gtk_main", get_exec_time()); gtk_main(); #ifdef HAVE_GTHREAD gdk_threads_leave(); diff --git a/src/metadata.c b/src/metadata.c index 2e92c22f..88c9cade 100644 --- a/src/metadata.c +++ b/src/metadata.c @@ -82,7 +82,7 @@ static void metadata_cache_update(FileData *fd, const gchar *key, const GList *v GList *entry = work->data; gchar *entry_key = entry->data; - if (strcmp(entry_key, key) == 0) + if (strcmp(entry_key, key) == 0) { /* key found - just replace values */ GList *old_values = entry->next; @@ -97,7 +97,7 @@ static void metadata_cache_update(FileData *fd, const gchar *key, const GList *v } /* key not found - prepend new entry */ - fd->cached_metadata = g_list_prepend(fd->cached_metadata, + fd->cached_metadata = g_list_prepend(fd->cached_metadata, g_list_prepend(string_list_copy(values), g_strdup(key))); DEBUG_1("added %s %s\n", key, fd->path); @@ -113,7 +113,7 @@ static const GList *metadata_cache_get(FileData *fd, const gchar *key) GList *entry = work->data; gchar *entry_key = entry->data; - if (strcmp(entry_key, key) == 0) + if (strcmp(entry_key, key) == 0) { /* key found */ DEBUG_1("found %s %s\n", key, fd->path); @@ -135,7 +135,7 @@ static void metadata_cache_remove(FileData *fd, const gchar *key) GList *entry = work->data; gchar *entry_key = entry->data; - if (strcmp(entry_key, key) == 0) + if (strcmp(entry_key, key) == 0) { /* key found */ string_list_free(entry); @@ -189,7 +189,7 @@ static void metadata_write_queue_add(FileData *fd) layout_util_status_update_write_all(); } - if (metadata_write_idle_id) + if (metadata_write_idle_id) { g_source_remove(metadata_write_idle_id); metadata_write_idle_id = 0; @@ -239,7 +239,7 @@ void metadata_notify_cb(FileData *fd, NotifyType type, gpointer data) { metadata_cache_free(fd); - if (g_list_find(metadata_write_queue, fd)) + if (g_list_find(metadata_write_queue, fd)) { DEBUG_1("Notify metadata: %s %04x", fd->path, type); if (!isname(fd->path)) @@ -293,7 +293,7 @@ gboolean metadata_write_perform(FileData *fd) g_assert(fd->change); - if (fd->change->dest && + if (fd->change->dest && strcmp(extension_from_path(fd->change->dest), GQ_CACHE_EXT_METADATA) == 0) { success = metadata_legacy_write(fd); @@ -302,23 +302,23 @@ gboolean metadata_write_perform(FileData *fd) } /* write via exiv2 */ - /* we can either use cached metadata which have fd->modified_xmp already applied + /* we can either use cached metadata which have fd->modified_xmp already applied or read metadata from file and apply fd->modified_xmp metadata are read also if the file was modified meanwhile */ - exif = exif_read_fd(fd); + exif = exif_read_fd(fd); if (!exif) return FALSE; success = (fd->change->dest) ? exif_write_sidecar(exif, fd->change->dest) : exif_write(exif); /* write modified metadata */ exif_free_fd(fd, exif); if (fd->change->dest) - /* this will create a FileData for the sidecar and link it to the main file + /* this will create a FileData for the sidecar and link it to the main file (we can't wait until the sidecar is discovered by directory scanning because - exif_read_fd is called before that and it would read the main file only and + exif_read_fd is called before that and it would read the main file only and store the metadata in the cache) FIXME: this does not catch new sidecars created by independent external programs */ - file_data_unref(file_data_new_group(fd->change->dest)); + file_data_unref(file_data_new_group(fd->change->dest)); if (success) metadata_legacy_delete(fd, fd->change->dest); return success; @@ -387,7 +387,7 @@ gboolean metadata_write_list(FileData *fd, const gchar *key, const GList *values FileData *sfd = work->data; work = work->next; - if (filter_file_class(sfd->extension, FORMAT_CLASS_META)) continue; + if (filter_file_class(sfd->extension, FORMAT_CLASS_META)) continue; metadata_write_list(sfd, key, values); } @@ -472,7 +472,7 @@ static gboolean metadata_legacy_write(FileData *fd) if (!have_keywords || !have_comment) metadata_file_read(metadata_pathl, &orig_keywords, &orig_comment); - success = metadata_file_write(metadata_pathl, + success = metadata_file_write(metadata_pathl, have_keywords ? (GList *)keywords : orig_keywords, have_comment ? comment : orig_comment); @@ -542,7 +542,7 @@ static gboolean metadata_file_read(gchar *path, GList **keywords, gchar **commen fclose(f); - if (keywords) + if (keywords) { *keywords = g_list_reverse(list); } @@ -584,7 +584,7 @@ static void metadata_legacy_delete(FileData *fd, const gchar *except) if (!fd) return; metadata_path = cache_find_location(CACHE_TYPE_METADATA, fd->path); - if (metadata_path && (!except || strcmp(metadata_path, except) != 0)) + if (metadata_path && (!except || strcmp(metadata_path, except) != 0)) { metadata_pathl = path_from_utf8(metadata_path); unlink(metadata_pathl); @@ -593,10 +593,10 @@ static void metadata_legacy_delete(FileData *fd, const gchar *except) } #ifdef HAVE_EXIV2 - /* without exiv2: do not delete xmp metadata because we are not able to convert it, + /* without exiv2: do not delete xmp metadata because we are not able to convert it, just ignore it */ metadata_path = cache_find_location(CACHE_TYPE_XMP_METADATA, fd->path); - if (metadata_path && (!except || strcmp(metadata_path, except) != 0)) + if (metadata_path && (!except || strcmp(metadata_path, except) != 0)) { metadata_pathl = path_from_utf8(metadata_path); unlink(metadata_pathl); @@ -666,13 +666,13 @@ GList *metadata_read_list(FileData *fd, const gchar *key, MetadataFormat format) } - if (format == METADATA_PLAIN && strcmp(key, KEYWORD_KEY) == 0 + if (format == METADATA_PLAIN && strcmp(key, KEYWORD_KEY) == 0 && (cache_entry = metadata_cache_get(fd, key))) { return string_list_copy(cache_entry->next); } - /* + /* Legacy metadata file is the primary source if it exists. Merging the lists does not make much sense, because the existence of legacy metadata file indicates that the other metadata sources are not @@ -681,9 +681,9 @@ GList *metadata_read_list(FileData *fd, const gchar *key, MetadataFormat format) */ if (strcmp(key, KEYWORD_KEY) == 0) { - if (metadata_legacy_read(fd, &list, NULL)) + if (metadata_legacy_read(fd, &list, NULL)) { - if (format == METADATA_PLAIN) + if (format == METADATA_PLAIN) { metadata_cache_update(fd, key, list); } @@ -754,11 +754,11 @@ gdouble metadata_read_GPS_coord(FileData *fd, const gchar *key, gdouble fallback min = g_ascii_strtod(endptr + 1, &endptr); if (*endptr == ',') sec = g_ascii_strtod(endptr + 1, &endptr); - else + else sec = 0.0; - if (*endptr == 'S' || *endptr == 'W' || *endptr == 'N' || *endptr == 'E') + if (*endptr == 'S' || *endptr == 'W' || *endptr == 'N' || *endptr == 'E') { coord = deg + min /60.0 + sec / 3600.0; ok = TRUE; @@ -780,7 +780,7 @@ gboolean metadata_append_string(FileData *fd, const gchar *key, const char *valu { gchar *str = metadata_read_string(fd, key, METADATA_PLAIN); - if (!str) + if (!str) { return metadata_write_string(fd, key, value); } @@ -798,7 +798,7 @@ gboolean metadata_append_list(FileData *fd, const gchar *key, const GList *value { GList *list = metadata_read_list(fd, key, METADATA_PLAIN); - if (!list) + if (!list) { return metadata_write_list(fd, key, values); } @@ -961,7 +961,7 @@ gboolean meta_data_set_keyword_mark(FileData *fd, gint n, gboolean value, gpoint if (!!keyword_tree_is_set(GTK_TREE_MODEL(keyword_tree), &iter, keywords) != !!value) { - if (value) + if (value) { keyword_tree_set(GTK_TREE_MODEL(keyword_tree), &iter, &keywords); } @@ -990,12 +990,12 @@ void meta_data_connect_mark_with_keyword(GtkTreeModel *keyword_tree, GtkTreeIter for (i = 0; i < FILEDATA_MARKS_SIZE; i++) { file_data_get_registered_mark_func(i, &get_mark_func, &set_mark_func, &mark_func_data); - if (get_mark_func == meta_data_get_keyword_mark) + if (get_mark_func == meta_data_get_keyword_mark) { GtkTreeIter old_kw_iter; GList *old_path = mark_func_data; - if (keyword_tree_get_iter(keyword_tree, &old_kw_iter, old_path) && + if (keyword_tree_get_iter(keyword_tree, &old_kw_iter, old_path) && (i == mark || /* release any previous connection of given mark */ keyword_compare(keyword_tree, &old_kw_iter, kw_iter) == 0)) /* or given keyword */ { @@ -1132,7 +1132,7 @@ gboolean keyword_exists(GtkTreeModel *keyword_tree, GtkTreeIter *parent_ptr, Gtk g_free(iter_casefold); } // if (options->metadata.tags_cas... } - if (ret) + if (ret) { if (result) *result = iter; break; @@ -1220,7 +1220,7 @@ gboolean keyword_tree_get_iter(GtkTreeModel *keyword_tree, GtkTreeIter *iter_ptr if (!gtk_tree_model_iter_next(keyword_tree, &iter)) return FALSE; } path = path->next; - if (!path) + if (!path) { *iter_ptr = iter; return TRUE; @@ -1240,7 +1240,7 @@ static gboolean keyword_tree_is_set_casefold(GtkTreeModel *keyword_tree, GtkTree { /* for the purpose of expanding and hiding, a helper is set if it has any children set */ GtkTreeIter child; - if (!gtk_tree_model_iter_children(keyword_tree, &child, &iter)) + if (!gtk_tree_model_iter_children(keyword_tree, &child, &iter)) return FALSE; /* this should happen only on empty helpers */ while (TRUE) @@ -1435,7 +1435,7 @@ static gboolean keyword_tree_check_empty_children(GtkTreeModel *keyword_tree, Gt { GtkTreeIter iter; - if (!gtk_tree_model_iter_children(keyword_tree, &iter, parent)) + if (!gtk_tree_model_iter_children(keyword_tree, &iter, parent)) return TRUE; /* this should happen only on empty helpers */ while (TRUE) @@ -1531,7 +1531,7 @@ static void keyword_hide_unset_in_recursive(GtkTreeStore *keyword_tree, GtkTreeI else { GtkTreeIter child; - if (gtk_tree_model_iter_children(GTK_TREE_MODEL(keyword_tree), &child, &iter)) + if (gtk_tree_model_iter_children(GTK_TREE_MODEL(keyword_tree), &child, &iter)) { keyword_hide_unset_in_recursive(keyword_tree, &child, id, keywords); } @@ -1672,7 +1672,7 @@ static void keyword_tree_node_write_config(GtkTreeModel *keyword_tree, GtkTreeIt write_char_option(outstr, indent, "name", name); g_free(name); write_bool_option(outstr, indent, "kw", keyword_get_is_keyword(keyword_tree, &iter)); - if (gtk_tree_model_iter_children(keyword_tree, &children, &iter)) + if (gtk_tree_model_iter_children(keyword_tree, &children, &iter)) { WRITE_STRING(">"); indent++; @@ -1680,7 +1680,7 @@ static void keyword_tree_node_write_config(GtkTreeModel *keyword_tree, GtkTreeIt indent--; WRITE_NL(); WRITE_STRING(""); } - else + else { WRITE_STRING("/>"); } @@ -1717,7 +1717,7 @@ GtkTreeIter *keyword_add_from_config(GtkTreeStore *keyword_tree, GtkTreeIter *pa log_printf("unknown attribute %s = %s\n", option, value); } - if (name && name[0]) + if (name && name[0]) { GtkTreeIter iter; /* re-use existing keyword if any */ diff --git a/src/options.h b/src/options.h index f6e66b4e..63141a1f 100644 --- a/src/options.h +++ b/src/options.h @@ -204,7 +204,7 @@ struct _ConfOptions gboolean fs_flip_left; gboolean fs_swap; gboolean fs_temp_disable; - } tmp; + } tmp; } stereo; }; diff --git a/src/pixbuf-renderer.c b/src/pixbuf-renderer.c index addc1cf5..688a480e 100644 --- a/src/pixbuf-renderer.c +++ b/src/pixbuf-renderer.c @@ -390,7 +390,7 @@ static RendererFuncs *pr_backend_renderer_new(PixbufRenderer *pr) #endif } return renderer_tiles_new(pr); -} +} static void pixbuf_renderer_init(PixbufRenderer *pr) @@ -1495,7 +1495,7 @@ static void pixbuf_renderer_sync_scroll_center(PixbufRenderer *pr) gint src_x, src_y; if (!pr->width || !pr->height) return; - /* + /* * Update norm_center only if the image is bigger than the window. * With this condition the stored center survives also a temporary display * of the "broken image" icon. @@ -2217,7 +2217,7 @@ const double pr_dubois_matrix[3][6] = { { 0.456, 0.500, 0.176, -0.043, -0.088, -0.002}, {-0.040, -0.038, -0.016, 0.378, 0.734, -0.018}, {-0.015, -0.021, -0.005, -0.072, -0.113, 1.226} - }; + }; static void pr_create_anaglyph_dubois(GdkPixbuf *pixbuf, GdkPixbuf *right, gint x, gint y, gint w, gint h) { @@ -2242,7 +2242,7 @@ static void pr_create_anaglyph_dubois(GdkPixbuf *pixbuf, GdkPixbuf *right, gint for (j = 0; j < w; j++) { double res[3]; - for (k = 0; k < 3; k++) + for (k = 0; k < 3; k++) { const double *m = pr_dubois_matrix[k]; res[k] = sp[0] * m[0] + sp[1] * m[1] + sp[2] * m[2] + dp[0] * m[3] + dp[1] * m[4] + dp[2] * m[5]; @@ -2286,12 +2286,12 @@ static void pr_pixbuf_size_sync(PixbufRenderer *pr) case EXIF_ORIENTATION_LEFT_BOTTOM: pr->image_width = gdk_pixbuf_get_height(pr->pixbuf); pr->image_height = gdk_pixbuf_get_width(pr->pixbuf); - if (pr->stereo_data == STEREO_PIXBUF_SBS) + if (pr->stereo_data == STEREO_PIXBUF_SBS) { pr->image_height /= 2; pr->stereo_pixbuf_offset_right = pr->image_height; } - else if (pr->stereo_data == STEREO_PIXBUF_CROSS) + else if (pr->stereo_data == STEREO_PIXBUF_CROSS) { pr->image_height /= 2; pr->stereo_pixbuf_offset_left = pr->image_height; @@ -2301,12 +2301,12 @@ static void pr_pixbuf_size_sync(PixbufRenderer *pr) default: pr->image_width = gdk_pixbuf_get_width(pr->pixbuf); pr->image_height = gdk_pixbuf_get_height(pr->pixbuf); - if (pr->stereo_data == STEREO_PIXBUF_SBS) + if (pr->stereo_data == STEREO_PIXBUF_SBS) { pr->image_width /= 2; pr->stereo_pixbuf_offset_right = pr->image_width; } - else if (pr->stereo_data == STEREO_PIXBUF_CROSS) + else if (pr->stereo_data == STEREO_PIXBUF_CROSS) { pr->image_width /= 2; pr->stereo_pixbuf_offset_left = pr->image_width; @@ -2337,7 +2337,7 @@ static void pr_set_pixbuf(PixbufRenderer *pr, GdkPixbuf *pixbuf, gdouble zoom, P return; } - if (pr->stereo_mode & PR_STEREO_TEMP_DISABLE) + if (pr->stereo_mode & PR_STEREO_TEMP_DISABLE) { gint disable = !pr->pixbuf || ! pr->stereo_data; pr_stereo_temp_disable(pr, disable); @@ -2404,7 +2404,7 @@ void pixbuf_renderer_set_stereo_data(PixbufRenderer *pr, StereoPixbufData stereo pr->stereo_data = stereo_data; - if (pr->stereo_mode & PR_STEREO_TEMP_DISABLE) + if (pr->stereo_mode & PR_STEREO_TEMP_DISABLE) { gint disable = !pr->pixbuf || ! pr->stereo_data; pr_stereo_temp_disable(pr, disable); @@ -2649,7 +2649,7 @@ void pixbuf_renderer_stereo_set(PixbufRenderer *pr, gint stereo_mode) pr_stereo_set(pr); - if (redraw) + if (redraw) { pr_size_sync(pr, pr->window_width, pr->window_height); /* recalculate new viewport */ pr_zoom_sync(pr, pr->zoom, PR_ZOOM_FORCE | PR_ZOOM_NEW, 0, 0); @@ -2690,7 +2690,7 @@ static void pr_stereo_temp_disable(PixbufRenderer *pr, gboolean disable) pr_size_sync(pr, pr->window_width, pr->window_height); /* recalculate new viewport */ } -gboolean pixbuf_renderer_get_pixel_colors(PixbufRenderer *pr, gint x_pixel, gint y_pixel, +gboolean pixbuf_renderer_get_pixel_colors(PixbufRenderer *pr, gint x_pixel, gint y_pixel, gint *r_mouse, gint *g_mouse, gint *b_mouse) { GdkPixbuf *pb = pr->pixbuf; @@ -2846,7 +2846,7 @@ gboolean pixbuf_renderer_get_virtual_rect(PixbufRenderer *pr, GdkRectangle *rect void pixbuf_renderer_set_size_early(PixbufRenderer *pr, guint width, guint height) { #if 0 - /* FIXME: this function does not consider the image orientation, + /* FIXME: this function does not consider the image orientation, so it probably only breaks something */ gdouble zoom; gint w, h; diff --git a/src/pixbuf_util.c b/src/pixbuf_util.c index 14978fcc..6d4ad5b4 100644 --- a/src/pixbuf_util.c +++ b/src/pixbuf_util.c @@ -175,7 +175,7 @@ gboolean register_theme_icon_as_stock(const gchar *key, const gchar *icon) 64, /* size */ 0, /* flags */ &error); - if (!pixbuf) + if (!pixbuf) { if (error) { diff --git a/src/preferences.c b/src/preferences.c index 027abe05..1651e7f6 100644 --- a/src/preferences.c +++ b/src/preferences.c @@ -574,7 +574,7 @@ static void add_stereo_mode_menu(GtkWidget *table, gint column, gint row, const gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(combo), _("Side by Side")); gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(combo), _("Side by Side Half size")); - if (option & PR_STEREO_HORIZ) + if (option & PR_STEREO_HORIZ) { current = 4; if (option & PR_STEREO_HALF) current = 5; @@ -582,7 +582,7 @@ static void add_stereo_mode_menu(GtkWidget *table, gint column, gint row, const gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(combo), _("Top - Bottom")); gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(combo), _("Top - Bottom Half size")); - if (option & PR_STEREO_VERT) + if (option & PR_STEREO_VERT) { current = 6; if (option & PR_STEREO_HALF) current = 7; diff --git a/src/print.c b/src/print.c index c81b8881..25eb5cc6 100644 --- a/src/print.c +++ b/src/print.c @@ -1367,10 +1367,10 @@ static gboolean print_job_ps_page_text(PrintWindow *pw, const gchar *text, gdoub pixbuf_draw_layout(pixbuf, layout, pw->dialog->dialog, 0, 0, r, g, b, 255); g_object_unref(G_OBJECT(layout)); - ret = print_job_ps_page_image(pw, pixbuf, x, y, + ret = print_job_ps_page_image(pw, pixbuf, x, y, /* do not allow rescaling of the pixbuf due to rounding errors */ ((gdouble)lw + 0.01) / scale_to_max_dpi, - ((gdouble)lh + 0.01) / scale_to_max_dpi, + ((gdouble)lh + 0.01) / scale_to_max_dpi, 0, 0); g_object_unref(G_OBJECT(pixbuf)); diff --git a/src/rcfile.c b/src/rcfile.c index c5e4efd6..a62ff7e9 100644 --- a/src/rcfile.c +++ b/src/rcfile.c @@ -49,7 +49,7 @@ void write_indent(GString *str, gint indent) void write_char_option(GString *str, gint indent, const gchar *label, const gchar *text) { - /* this is needed for overlay string, because g_markup_escape_text does not handle \n and such, + /* this is needed for overlay string, because g_markup_escape_text does not handle \n and such, ideas for improvement are welcome */ static const unsigned char no_quote_utf[] = { @@ -67,7 +67,7 @@ void write_char_option(GString *str, gint indent, const gchar *label, const gcha '"', 0 /* '"' is handled in g_markup_escape_text */ }; - gchar *escval1 = g_strescape(text ? text : "", (gchar *) no_quote_utf); + gchar *escval1 = g_strescape(text ? text : "", (gchar *) no_quote_utf); gchar *escval2 = g_markup_escape_text(escval1, -1); g_string_append_printf(str, "%s = \"%s\" ", label, escval2); g_free(escval2); @@ -381,7 +381,7 @@ static void write_global_attributes(GString *outstr, gint indent) /* Metadata Options */ WRITE_NL(); WRITE_BOOL(*options, metadata.enable_metadata_dirs); - WRITE_NL(); WRITE_BOOL(*options, metadata.save_in_image_file); + WRITE_NL(); WRITE_BOOL(*options, metadata.save_in_image_file); WRITE_NL(); WRITE_BOOL(*options, metadata.save_legacy_IPTC); WRITE_NL(); WRITE_BOOL(*options, metadata.warn_on_write_problems); WRITE_NL(); WRITE_BOOL(*options, metadata.save_legacy_format); @@ -772,7 +772,7 @@ static void options_parse_filter(GQParserData *parser_data, GMarkupParseContext static void options_parse_filter_end(GQParserData *parser_data, GMarkupParseContext *context, const gchar *element_name, gpointer data, GError **error) { if (parser_data->startup) filter_add_defaults(); - filter_rebuild(); + filter_rebuild(); } static void options_parse_keyword_end(GQParserData *parser_data, GMarkupParseContext *context, const gchar *element_name, gpointer data, GError **error) @@ -1055,7 +1055,7 @@ static void options_parse_toplevel(GQParserData *parser_data, GMarkupParseContex { LayoutWindow *lw; lw = layout_find_by_layout_id(options_get_id(attribute_names, attribute_values)); - if (lw) + if (lw) { layout_update_from_config(lw, attribute_names, attribute_values); } @@ -1118,10 +1118,10 @@ static void start_element(GMarkupParseContext *context, const gchar **attribute_names, const gchar **attribute_values, gpointer user_data, - GError **error) + GError **error) { GQParserData *parser_data = user_data; - GQParserFuncData *func = parser_data->parse_func_stack->data; + GQParserFuncData *func = parser_data->parse_func_stack->data; DEBUG_2("start %s", element_name); if (func->start_func) @@ -1131,10 +1131,10 @@ static void start_element(GMarkupParseContext *context, static void end_element(GMarkupParseContext *context, const gchar *element_name, gpointer user_data, - GError **error) + GError **error) { GQParserData *parser_data = user_data; - GQParserFuncData *func = parser_data->parse_func_stack->data; + GQParserFuncData *func = parser_data->parse_func_stack->data; DEBUG_2("end %s", element_name); if (func->end_func) @@ -1188,7 +1188,7 @@ gboolean load_config_from_file(const gchar *utf8_path, gboolean startup) gchar *buf; gboolean ret = TRUE; - if (g_file_get_contents(utf8_path, &buf, &size, NULL) == FALSE) + if (g_file_get_contents(utf8_path, &buf, &size, NULL) == FALSE) { return FALSE; } diff --git a/src/remote.c b/src/remote.c index 9c40ebe0..b5f47ebb 100644 --- a/src/remote.c +++ b/src/remote.c @@ -218,7 +218,7 @@ static RemoteConnection *remote_server_open(const gchar *path) rc->path = g_strdup(path); channel = g_io_channel_unix_new(rc->fd); - g_io_channel_set_flags(channel, G_IO_FLAG_NONBLOCK, NULL); + g_io_channel_set_flags(channel, G_IO_FLAG_NONBLOCK, NULL); rc->channel_id = g_io_add_watch_full(channel, G_PRIORITY_DEFAULT, G_IO_IN, remote_server_read_cb, rc, NULL); diff --git a/src/renderer-clutter.c b/src/renderer-clutter.c index b23c7249..03699803 100644 --- a/src/renderer-clutter.c +++ b/src/renderer-clutter.c @@ -189,11 +189,11 @@ static void rc_prepare_post_process_lut(RendererClutter *rc) DEBUG_0("%s clut start", get_exec_time()); - for (r = 0; r < CLUT_SIZE; r++) + for (r = 0; r < CLUT_SIZE; r++) { - for (g = 0; g < CLUT_SIZE; g++) + for (g = 0; g < CLUT_SIZE; g++) { - for (b = 0; b < CLUT_SIZE; b++) + for (b = 0; b < CLUT_SIZE; b++) { guchar *ptr = clut + ((b * CLUT_SIZE + g) * CLUT_SIZE + r) * 3; ptr[0] = floor ((double) r / (CLUT_SIZE - 1) * 255.0 + 0.5); @@ -257,7 +257,7 @@ static void rc_sync_actor(RendererClutter *rc) DEBUG_0("scale %d %d", rc->pr->width, rc->pr->height); DEBUG_0("pos %d %d", rc->pr->x_offset, rc->pr->y_offset); - clutter_actor_set_scale(CLUTTER_ACTOR(rc->texture), + clutter_actor_set_scale(CLUTTER_ACTOR(rc->texture), (gfloat)pr->width / pr->image_width, (gfloat)pr->height / pr->image_height); @@ -354,8 +354,8 @@ static void rc_sync_actor(RendererClutter *rc) break; } - clutter_actor_set_position(CLUTTER_ACTOR(rc->texture), - pr->x_offset - pr->x_scroll + anchor_x, + clutter_actor_set_position(CLUTTER_ACTOR(rc->texture), + pr->x_offset - pr->x_scroll + anchor_x, pr->y_offset - pr->y_scroll + anchor_y); } @@ -393,7 +393,7 @@ static void rc_schedule_texture_upload(RendererClutter *rc) { if (g_get_monotonic_time() - rc->last_pixbuf_change < 50000) { - /* delay clutter redraw until the texture has some data + /* delay clutter redraw until the texture has some data set priority between gtk redraw and clutter redraw */ DEBUG_0("%s tex upload high prio", get_exec_time()); rc->idle_update = g_idle_add_full(CLUTTER_PRIORITY_REDRAW - 10, rc_area_changed_cb, rc, NULL); @@ -475,7 +475,7 @@ static void rc_area_changed(void *renderer, gint src_x, gint src_y, gint src_w, gint width = gdk_pixbuf_get_width(pr->pixbuf); gint height = gdk_pixbuf_get_height(pr->pixbuf); - if (pr->stereo_data == STEREO_PIXBUF_SBS || pr->stereo_data == STEREO_PIXBUF_CROSS) + if (pr->stereo_data == STEREO_PIXBUF_SBS || pr->stereo_data == STEREO_PIXBUF_CROSS) { width /= 2; } @@ -491,7 +491,7 @@ static void rc_area_changed(void *renderer, gint src_x, gint src_y, gint src_w, par->w = src_w; par->h = src_h; rc->pending_updates = g_list_append(rc->pending_updates, par); - if (!rc->idle_update) + if (!rc->idle_update) { rc_schedule_texture_upload(rc); } @@ -530,7 +530,7 @@ static void rc_update_pixbuf(void *renderer, gboolean lazy) gint prev_width, prev_height; - if (pr->stereo_data == STEREO_PIXBUF_SBS || pr->stereo_data == STEREO_PIXBUF_CROSS) + if (pr->stereo_data == STEREO_PIXBUF_SBS || pr->stereo_data == STEREO_PIXBUF_CROSS) { width /= 2; } @@ -737,22 +737,22 @@ static gboolean rc_overlay_get(void *renderer, gint id, GdkPixbuf **pixbuf, gint static void rc_update_viewport(void *renderer) { RendererClutter *rc = (RendererClutter *)renderer; - ClutterColor stage_color = { 0x00, 0x00, 0x00, 0xff }; + ClutterColor stage_color = { 0x00, 0x00, 0x00, 0xff }; rc->stereo_off_x = 0; rc->stereo_off_y = 0; - if (rc->stereo_mode & PR_STEREO_RIGHT) + if (rc->stereo_mode & PR_STEREO_RIGHT) { - if (rc->stereo_mode & PR_STEREO_HORIZ) + if (rc->stereo_mode & PR_STEREO_HORIZ) { rc->stereo_off_x = rc->pr->viewport_width; } - else if (rc->stereo_mode & PR_STEREO_VERT) + else if (rc->stereo_mode & PR_STEREO_VERT) { rc->stereo_off_y = rc->pr->viewport_height; } - else if (rc->stereo_mode & PR_STEREO_FIXED) + else if (rc->stereo_mode & PR_STEREO_FIXED) { rc->stereo_off_x = rc->pr->stereo_fixed_x_right; rc->stereo_off_y = rc->pr->stereo_fixed_y_right; @@ -760,7 +760,7 @@ static void rc_update_viewport(void *renderer) } else { - if (rc->stereo_mode & PR_STEREO_FIXED) + if (rc->stereo_mode & PR_STEREO_FIXED) { rc->stereo_off_x = rc->pr->stereo_fixed_x_left; rc->stereo_off_y = rc->pr->stereo_fixed_y_left; @@ -776,7 +776,7 @@ static void rc_update_viewport(void *renderer) clutter_actor_set_rotation(CLUTTER_ACTOR(rc->group), CLUTTER_Y_AXIS, - (rc->stereo_mode & PR_STEREO_MIRROR) ? 180 : 0, + (rc->stereo_mode & PR_STEREO_MIRROR) ? 180 : 0, rc->pr->viewport_width / 2.0, 0, 0); clutter_actor_set_rotation(CLUTTER_ACTOR(rc->group), @@ -871,7 +871,7 @@ RendererFuncs *renderer_clutter_new(PixbufRenderer *pr) return NULL; } } - else + else { rc->widget = gtk_clutter_embed_new(); gtk_container_add(GTK_CONTAINER(rc->pr), rc->widget); @@ -893,5 +893,5 @@ RendererFuncs *renderer_clutter_new(PixbufRenderer *pr) return (RendererFuncs *) rc; } -#endif +#endif /* vim: set shiftwidth=8 softtabstop=0 cindent cinoptions={1s: */ diff --git a/src/renderer-tiles.c b/src/renderer-tiles.c index 6d74becd..8243df9d 100644 --- a/src/renderer-tiles.c +++ b/src/renderer-tiles.c @@ -173,12 +173,12 @@ static void rt_sync_scroll(RendererTiles *rt) { PixbufRenderer *pr = rt->pr; - rt->x_scroll = (rt->stereo_mode & PR_STEREO_MIRROR) ? - pr->width - pr->vis_width - pr->x_scroll + rt->x_scroll = (rt->stereo_mode & PR_STEREO_MIRROR) ? + pr->width - pr->vis_width - pr->x_scroll : pr->x_scroll; - rt->y_scroll = (rt->stereo_mode & PR_STEREO_FLIP) ? - pr->height - pr->vis_height - pr->y_scroll + rt->y_scroll = (rt->stereo_mode & PR_STEREO_FLIP) ? + pr->height - pr->vis_height - pr->y_scroll : pr->y_scroll; } @@ -1228,7 +1228,7 @@ static gboolean rt_source_tile_render(RendererTiles *rt, ImageTile *it, return draw; } -static void rt_tile_get_region(gboolean has_alpha, +static void rt_tile_get_region(gboolean has_alpha, const GdkPixbuf *src, GdkPixbuf *dest, int pb_x, int pb_y, int pb_w, int pb_h, double offset_x, double offset_y, double scale_x, double scale_y, @@ -1244,10 +1244,10 @@ static void rt_tile_get_region(gboolean has_alpha, pb_w, pb_h, dest, pb_x, pb_y); - } + } else { - gdk_pixbuf_scale(src, dest, + gdk_pixbuf_scale(src, dest, pb_x, pb_y, pb_w, pb_h, offset_x, offset_y, @@ -1257,7 +1257,7 @@ static void rt_tile_get_region(gboolean has_alpha, } else { - gdk_pixbuf_composite_color(src, dest, + gdk_pixbuf_composite_color(src, dest, pb_x, pb_y, pb_w, pb_h, offset_x, offset_y, @@ -1336,7 +1336,7 @@ static void rt_tile_render(RendererTiles *rt, ImageTile *it, else if ((pr->zoom == 1.0 || pr->scale == 1.0) && pr->aspect_ratio == 1.0 && !has_alpha && - orientation == EXIF_ORIENTATION_TOP_LEFT && + orientation == EXIF_ORIENTATION_TOP_LEFT && !(pr->func_post_process && !(pr->post_process_slow && fast)) && !(rt->stereo_mode & PR_STEREO_ANAGLYPH)) { @@ -1398,7 +1398,7 @@ static void rt_tile_render(RendererTiles *rt, ImageTile *it, scale_x, scale_y, (fast) ? GDK_INTERP_NEAREST : pr->zoom_quality, it->x + pb_x, it->y + pb_y); - if (rt->stereo_mode & PR_STEREO_ANAGLYPH && + if (rt->stereo_mode & PR_STEREO_ANAGLYPH && (pr->stereo_pixbuf_offset_right > 0 || pr->stereo_pixbuf_offset_left > 0)) { GdkPixbuf *right_pb = rt_get_spare_tile(rt); @@ -1449,7 +1449,7 @@ static void rt_tile_expose(RendererTiles *rt, ImageTile *it, } if (it->x + x + w > rt->x_scroll + pr->vis_width) { - w = rt->x_scroll + pr->vis_width - it->x - x; + w = rt->x_scroll + pr->vis_width - it->x - x; } if (w < 1) return; if (it->y + y < rt->y_scroll) @@ -1459,7 +1459,7 @@ static void rt_tile_expose(RendererTiles *rt, ImageTile *it, } if (it->y + y + h > rt->y_scroll + pr->vis_height) { - h = rt->y_scroll + pr->vis_height - it->y - y; + h = rt->y_scroll + pr->vis_height - it->y - y; } if (h < 1) return; @@ -1501,7 +1501,7 @@ static gint rt_get_queued_area(GList *work) { gint area = 0; - while (work) + while (work) { QueueData *qd = work->data; area += qd->w * qd->h; @@ -1519,7 +1519,7 @@ static gboolean rt_queue_schedule_next_draw(RendererTiles *rt, gboolean force_se if (!pr->loading) { - /* 2pass prio */ + /* 2pass prio */ DEBUG_2("redraw priority: 2pass"); rt->draw_idle_id = g_idle_add_full(G_PRIORITY_DEFAULT_IDLE, rt_queue_draw_idle_cb, rt, NULL); return FALSE; @@ -1864,7 +1864,7 @@ static void rt_scroll(void *renderer, gint x_off, gint y_off) rt_sync_scroll(rt); if (rt->stereo_mode & PR_STEREO_MIRROR) x_off = -x_off; - if (rt->stereo_mode & PR_STEREO_FLIP) y_off = -y_off; + if (rt->stereo_mode & PR_STEREO_FLIP) y_off = -y_off; gint w = pr->vis_width - abs(x_off); gint h = pr->vis_height - abs(y_off); @@ -2024,17 +2024,17 @@ static void renderer_update_viewport(void *renderer) rt->stereo_off_x = 0; rt->stereo_off_y = 0; - if (rt->stereo_mode & PR_STEREO_RIGHT) + if (rt->stereo_mode & PR_STEREO_RIGHT) { - if (rt->stereo_mode & PR_STEREO_HORIZ) + if (rt->stereo_mode & PR_STEREO_HORIZ) { rt->stereo_off_x = rt->pr->viewport_width; } - else if (rt->stereo_mode & PR_STEREO_VERT) + else if (rt->stereo_mode & PR_STEREO_VERT) { rt->stereo_off_y = rt->pr->viewport_height; } - else if (rt->stereo_mode & PR_STEREO_FIXED) + else if (rt->stereo_mode & PR_STEREO_FIXED) { rt->stereo_off_x = rt->pr->stereo_fixed_x_right; rt->stereo_off_y = rt->pr->stereo_fixed_y_right; @@ -2042,7 +2042,7 @@ static void renderer_update_viewport(void *renderer) } else { - if (rt->stereo_mode & PR_STEREO_FIXED) + if (rt->stereo_mode & PR_STEREO_FIXED) { rt->stereo_off_x = rt->pr->stereo_fixed_x_left; rt->stereo_off_y = rt->pr->stereo_fixed_y_left; diff --git a/src/thumb_standard.c b/src/thumb_standard.c index 83bb7804..f3cd252a 100644 --- a/src/thumb_standard.c +++ b/src/thumb_standard.c @@ -434,7 +434,7 @@ static GdkPixbuf *thumb_loader_std_finish(ThumbLoaderStd *tl, GdkPixbuf *pixbuf, /* do not save the thumbnail if the source file has changed meanwhile - the thumbnail is most probably broken */ - if (stat_utf8(tl->fd->path, &st) && + if (stat_utf8(tl->fd->path, &st) && tl->source_mtime == st.st_mtime && tl->source_size == st.st_size) { @@ -792,9 +792,9 @@ static void thumb_loader_std_thumb_file_validate_done_cb(ThumbLoaderStd *tl, gpo GdkPixbuf *pixbuf; gboolean valid = FALSE; - /* get the original thumbnail pixbuf (unrotated, with original options) + /* get the original thumbnail pixbuf (unrotated, with original options) this is called from image_loader done callback, so tv->tl->il must exist*/ - pixbuf = image_loader_get_pixbuf(tv->tl->il); + pixbuf = image_loader_get_pixbuf(tv->tl->il); if (pixbuf) { const gchar *uri; @@ -959,9 +959,9 @@ static void thumb_std_maint_move_validate_cb(const gchar *path, gboolean valid, TMaintMove *tm = data; GdkPixbuf *pixbuf; - /* get the original thumbnail pixbuf (unrotated, with original options) + /* get the original thumbnail pixbuf (unrotated, with original options) this is called from image_loader done callback, so tm->tl->il must exist*/ - pixbuf = image_loader_get_pixbuf(tm->tl->il); + pixbuf = image_loader_get_pixbuf(tm->tl->il); if (pixbuf) { const gchar *uri; diff --git a/src/ui_bookmark.c b/src/ui_bookmark.c index a2a63aaf..e000a1d6 100644 --- a/src/ui_bookmark.c +++ b/src/ui_bookmark.c @@ -485,7 +485,7 @@ static void bookmark_drag_set_data(GtkWidget *button, gchar **uris = uris_from_filelist(list); gboolean ret = gtk_selection_data_set_uris(selection_data, uris); - if (!ret) + if (!ret) { char *str = g_strjoinv("\r\n", uris); ret = gtk_selection_data_set_text(selection_data, str, -1); diff --git a/src/ui_fileops.c b/src/ui_fileops.c index f09219c6..f7ee88b2 100644 --- a/src/ui_fileops.c +++ b/src/ui_fileops.c @@ -547,7 +547,7 @@ gboolean copy_file(const gchar *s, const gchar *t) if (rename(randname, tl) < 0) { unlink(randname); - goto end; + goto end; } ret = copy_file_attributes(s, t, TRUE, TRUE); diff --git a/src/ui_pathsel.c b/src/ui_pathsel.c index 7abc511f..f0bc582f 100644 --- a/src/ui_pathsel.c +++ b/src/ui_pathsel.c @@ -346,7 +346,7 @@ static void dest_dnd_set_data(GtkWidget *view, gchar **uris = uris_from_filelist(list); gboolean ret = gtk_selection_data_set_uris(selection_data, uris); - if (!ret) + if (!ret) { char *str = g_strjoinv("\r\n", uris); ret = gtk_selection_data_set_text(selection_data, str, -1); diff --git a/src/uri_utils.c b/src/uri_utils.c index 5b81223c..42798e8b 100644 --- a/src/uri_utils.c +++ b/src/uri_utils.c @@ -51,7 +51,7 @@ gboolean uri_selection_data_set_uris_from_filelist(GtkSelectionData *selection_d { gchar **uris = uris_from_filelist(list); gboolean ret = gtk_selection_data_set_uris(selection_data, uris); - if (!ret) + if (!ret) { char *str = g_strjoinv("\r\n", uris); ret = gtk_selection_data_set_text(selection_data, str, -1); diff --git a/src/utilops.c b/src/utilops.c index 6c84f9b8..8636e2e7 100644 --- a/src/utilops.c +++ b/src/utilops.c @@ -571,7 +571,7 @@ static gint file_util_perform_ci_cb(gpointer resume_data, EditorFlags flags, GLi if (!EDITOR_ERRORS(flags)) /* files were successfully deleted, call the maint functions */ { - if (ud->with_sidecars) + if (ud->with_sidecars) file_data_sc_apply_ci(fd); else file_data_apply_ci(fd); @@ -584,7 +584,7 @@ static gint file_util_perform_ci_cb(gpointer resume_data, EditorFlags flags, GLi ud->finalize_func(fd); } - if (ud->with_sidecars) + if (ud->with_sidecars) file_data_sc_free_ci(fd); else file_data_free_ci(fd); @@ -611,7 +611,7 @@ static gboolean file_util_perform_ci_internal(gpointer data) { UtilityData *ud = data; - if (!ud->perform_idle_id) + if (!ud->perform_idle_id) { /* this function was called directly just setup idle callback and wait until we are called again @@ -633,7 +633,7 @@ static gboolean file_util_perform_ci_internal(gpointer data) gboolean last = !ud->flist->next; EditorFlags status = EDITOR_ERROR_STATUS; - if (ud->with_sidecars ? file_data_sc_perform_ci(single_entry->data) + if (ud->with_sidecars ? file_data_sc_perform_ci(single_entry->data) : file_data_perform_ci(single_entry->data)) status = 0; /* OK */ @@ -1741,7 +1741,7 @@ static void file_util_details_dialog_exclude(GenericDialog *gd, gpointer data, g if (discard && ud->discard_func) ud->discard_func(fd); /* all files were excluded, this has the same effect as pressing the cancel button in the confirmation dialog*/ - if (!ud->flist) + if (!ud->flist) { /* both dialogs will be closed anyway, the signals would cause duplicate calls */ g_signal_handlers_disconnect_by_func(ud->gd->dialog, G_CALLBACK(file_util_details_dialog_close_cb), gd->dialog); @@ -2619,7 +2619,7 @@ static void file_util_rename_dir_full(FileData *fd, const gchar *new_path, GtkWi ud = file_util_data_new(UTILITY_TYPE_RENAME_FOLDER); ud->phase = phase; - ud->with_sidecars = TRUE; /* does not matter, the directory should not have sidecars + ud->with_sidecars = TRUE; /* does not matter, the directory should not have sidecars and the content must be handled including sidecars */ ud->dir_fd = file_data_ref(fd); @@ -2651,7 +2651,7 @@ static void file_util_rename_dir_full(FileData *fd, const gchar *new_path, GtkWi static void file_util_create_dir_full(FileData *fd, const gchar *dest_path, GtkWidget *parent, UtilityPhase phase, FileUtilDoneFunc done_func, gpointer done_data) { - UtilityData *ud; + UtilityData *ud; ud = file_util_data_new(UTILITY_TYPE_CREATE_FOLDER); @@ -2742,7 +2742,7 @@ static gboolean file_util_write_metadata_first(UtilityType type, UtilityPhase ph FileData *fd = work->data; work = work->next; - if (fd->change) + if (fd->change) { filelist_free(unsaved); return FALSE; /* another op. in progress, let the caller handle it */ @@ -2782,7 +2782,7 @@ void file_util_delete(FileData *source_fd, GList *source_list, GtkWidget *parent void file_util_write_metadata(FileData *source_fd, GList *source_list, GtkWidget *parent, gboolean force_dialog, FileUtilDoneFunc done_func, gpointer done_data) { - file_util_write_metadata_full(source_fd, source_list, parent, + file_util_write_metadata_full(source_fd, source_list, parent, ((options->metadata.save_in_image_file && options->metadata.confirm_write) || force_dialog) ? UTILITY_PHASE_START : UTILITY_PHASE_ENTERING, done_func, done_data); } diff --git a/src/view_file.c b/src/view_file.c index f96aa128..ebbdba11 100644 --- a/src/view_file.c +++ b/src/view_file.c @@ -811,7 +811,7 @@ static gdouble vf_thumb_progress(ViewFile *vf) } static void vf_set_thumb_fd(ViewFile *vf, FileData *fd) -{ +{ switch (vf->type) { case FILEVIEW_LIST: vflist_set_thumb_fd(vf, fd); break; diff --git a/src/view_file_icon.c b/src/view_file_icon.c index d4226e73..b3d8a244 100644 --- a/src/view_file_icon.c +++ b/src/view_file_icon.c @@ -1966,7 +1966,7 @@ static gboolean vficon_refresh_real(ViewFile *vf, gboolean keep_position) /* not changed, go to next */ work = work->next; work_fd = work_fd->next; - if (id->selected & SELECTION_SELECTED) + if (id->selected & SELECTION_SELECTED) { VFICON(vf)->selection = g_list_prepend(VFICON(vf)->selection, id); } diff --git a/src/view_file_list.c b/src/view_file_list.c index 12de15d9..b0bd169e 100644 --- a/src/view_file_list.c +++ b/src/view_file_list.c @@ -1160,7 +1160,7 @@ gint vflist_index_by_fd(ViewFile *vf, FileData *fd) while (work2) { /* FIXME: return the same index also for sidecars - it is sufficient for next/prev navigation but it should be rewritten + it is sufficient for next/prev navigation but it should be rewritten without using indexes at all */ FileData *sidecar_fd = work2->data; @@ -1971,7 +1971,7 @@ void vflist_thumb_set(ViewFile *vf, gboolean enable) - no need to re-read the directory - force update because the formatted string has changed */ - if (vf->layout) + if (vf->layout) { vflist_populate_view(vf, TRUE); gtk_tree_view_columns_autosize(GTK_TREE_VIEW(vf->listview)); diff --git a/src/window.c b/src/window.c index 9dbf2fe5..863c75dd 100644 --- a/src/window.c +++ b/src/window.c @@ -187,7 +187,7 @@ static void help_browser_run(void) gchar *result = NULL; gint i; - i = 0; + i = 0; while (!result) { if ((name && *name) || (cmd && *cmd)) { -- 2.20.1