# HG changeset patch # User zas_ # Date 1209039782 0 # Node ID f9bf33be53ff96e26c9125b9064a78414fe7c96c # Parent e21da52016c864d0c4d39ae6d26a530fb12edfe0 Remove whitespace between function name and first parenthesis for the sake of consistency. diff -r e21da52016c8 -r f9bf33be53ff src/bar_info.c --- a/src/bar_info.c Thu Apr 24 11:40:26 2008 +0000 +++ b/src/bar_info.c Thu Apr 24 12:23:02 2008 +0000 @@ -476,7 +476,7 @@ buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(textview)); gtk_text_buffer_get_bounds(buffer, &start, &end); - gtk_text_buffer_delete (buffer, &start, &end); + gtk_text_buffer_delete(buffer, &start, &end); while (list) { diff -r e21da52016c8 -r f9bf33be53ff src/bar_sort.c --- a/src/bar_sort.c Thu Apr 24 11:40:26 2008 +0000 +++ b/src/bar_sort.c Thu Apr 24 12:23:02 2008 +0000 @@ -140,7 +140,7 @@ { gtk_widget_hide(sd->collection_group); gtk_widget_show(sd->folder_group); - bookmark_list_set_key(sd->bookmarks, SORT_KEY_FOLDERS ); + bookmark_list_set_key(sd->bookmarks, SORT_KEY_FOLDERS); } else { diff -r e21da52016c8 -r f9bf33be53ff src/cache.c --- a/src/cache.c Thu Apr 24 11:40:26 2008 +0000 +++ b/src/cache.c Thu Apr 24 12:23:02 2008 +0000 @@ -173,7 +173,7 @@ cache_sim_write_md5sum(f, cd); cache_sim_write_similarity(f, cd); - fclose (f); + fclose(f); return TRUE; } diff -r e21da52016c8 -r f9bf33be53ff src/cellrenderericon.c --- a/src/cellrenderericon.c Thu Apr 24 11:40:26 2008 +0000 +++ b/src/cellrenderericon.c Thu Apr 24 12:23:02 2008 +0000 @@ -71,7 +71,7 @@ static gpointer parent_class; GType -gqv_cell_renderer_icon_get_type (void) +gqv_cell_renderer_icon_get_type(void) { static GType cell_icon_type = 0; @@ -79,13 +79,13 @@ { static const GTypeInfo cell_icon_info = { - sizeof (GQvCellRendererIconClass), + sizeof(GQvCellRendererIconClass), NULL, /* base_init */ NULL, /* base_finalize */ (GClassInitFunc) gqv_cell_renderer_icon_class_init, NULL, /* class_finalize */ NULL, /* class_data */ - sizeof (GQvCellRendererIcon), + sizeof(GQvCellRendererIcon), 0, /* n_preallocs */ (GInstanceInitFunc) gqv_cell_renderer_icon_init, }; @@ -99,14 +99,14 @@ } static void -gqv_cell_renderer_icon_init (GQvCellRendererIcon *cellicon) +gqv_cell_renderer_icon_init(GQvCellRendererIcon *cellicon) { GTK_CELL_RENDERER(cellicon)->xpad = 2; GTK_CELL_RENDERER(cellicon)->ypad = 2; } static void -gqv_cell_renderer_icon_class_init (GQvCellRendererIconClass *class) +gqv_cell_renderer_icon_class_init(GQvCellRendererIconClass *class) { GObjectClass *object_class = G_OBJECT_CLASS (class); GtkCellRendererClass *cell_class = GTK_CELL_RENDERER_CLASS (class); @@ -155,7 +155,7 @@ g_object_class_install_property(object_class, PROP_FOCUSED, - g_param_spec_boolean ("has_focus", + g_param_spec_boolean("has_focus", _("Focus"), _("Draw focus indicator"), FALSE, @@ -189,7 +189,7 @@ g_object_class_install_property(object_class, PROP_FOREGROUND_SET, - g_param_spec_boolean ("foreground_set", + g_param_spec_boolean("foreground_set", _("Foreground set"), _("Whether this tag affects the foreground color"), FALSE, @@ -205,15 +205,15 @@ } static void -gqv_cell_renderer_icon_finalize (GObject *object) +gqv_cell_renderer_icon_finalize(GObject *object) { - GQvCellRendererIcon *cellicon = GQV_CELL_RENDERER_ICON (object); + GQvCellRendererIcon *cellicon = GQV_CELL_RENDERER_ICON(object); if (cellicon->pixbuf) g_object_unref (cellicon->pixbuf); g_free(cellicon->text); - (* G_OBJECT_CLASS (parent_class)->finalize) (object); + (* G_OBJECT_CLASS (parent_class)->finalize)(object); } static void @@ -222,16 +222,16 @@ GValue *value, GParamSpec *pspec) { - GQvCellRendererIcon *cellicon = GQV_CELL_RENDERER_ICON (object); + GQvCellRendererIcon *cellicon = GQV_CELL_RENDERER_ICON(object); switch (param_id) { case PROP_PIXBUF: g_value_set_object(value, - cellicon->pixbuf ? G_OBJECT (cellicon->pixbuf) : NULL); + cellicon->pixbuf ? G_OBJECT(cellicon->pixbuf) : NULL); break; case PROP_TEXT: - g_value_set_string (value, cellicon->text); + g_value_set_string(value, cellicon->text); break; case PROP_BACKGROUND_GDK: { @@ -241,7 +241,7 @@ color.green = cellicon->background.green; color.blue = cellicon->background.blue; - g_value_set_boxed (value, &color); + g_value_set_boxed(value, &color); } break; case PROP_FOREGROUND_GDK: @@ -252,11 +252,11 @@ color.green = cellicon->foreground.green; color.blue = cellicon->foreground.blue; - g_value_set_boxed (value, &color); + g_value_set_boxed(value, &color); } break; case PROP_FOCUSED: - g_value_set_boolean (value, cellicon->focused); + g_value_set_boolean(value, cellicon->focused); break; case PROP_FIXED_WIDTH: g_value_set_int(value, cellicon->fixed_width); @@ -274,14 +274,14 @@ g_value_set_boolean(value, cellicon->show_text); break; default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec); + G_OBJECT_WARN_INVALID_PROPERTY_ID(object, param_id, pspec); break; } } static void -set_bg_color (GQvCellRendererIcon *cellicon, - GdkColor *color) +set_bg_color(GQvCellRendererIcon *cellicon, + GdkColor *color) { if (color) { @@ -305,8 +305,8 @@ } } -static void set_fg_color (GQvCellRendererIcon *cellicon, - GdkColor *color) +static void set_fg_color(GQvCellRendererIcon *cellicon, + GdkColor *color) { if (color) { @@ -386,7 +386,7 @@ cellicon->show_text = g_value_get_boolean(value); break; default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec); + G_OBJECT_WARN_INVALID_PROPERTY_ID(object, param_id, pspec); break; } } diff -r e21da52016c8 -r f9bf33be53ff src/cellrenderericon.h --- a/src/cellrenderericon.h Thu Apr 24 11:40:26 2008 +0000 +++ b/src/cellrenderericon.h Thu Apr 24 12:23:02 2008 +0000 @@ -64,10 +64,10 @@ GtkCellRendererClass parent_class; /* Padding for future expansion */ - void (*_gtk_reserved1) (void); - void (*_gtk_reserved2) (void); - void (*_gtk_reserved3) (void); - void (*_gtk_reserved4) (void); + void (*_gtk_reserved1)(void); + void (*_gtk_reserved2)(void); + void (*_gtk_reserved3)(void); + void (*_gtk_reserved4)(void); }; GType gqv_cell_renderer_icon_get_type (void); diff -r e21da52016c8 -r f9bf33be53ff src/collect-table.c --- a/src/collect-table.c Thu Apr 24 11:40:26 2008 +0000 +++ b/src/collect-table.c Thu Apr 24 12:23:02 2008 +0000 @@ -2385,8 +2385,8 @@ ct->scrolled = gtk_scrolled_window_new(NULL, NULL); gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(ct->scrolled), GTK_SHADOW_IN); - gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (ct->scrolled), - GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); + gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW (ct->scrolled), + GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); store = gtk_list_store_new(1, G_TYPE_POINTER); ct->listview = gtk_tree_view_new_with_model(GTK_TREE_MODEL(store)); diff -r e21da52016c8 -r f9bf33be53ff src/collect.c --- a/src/collect.c Thu Apr 24 11:40:26 2008 +0000 +++ b/src/collect.c Thu Apr 24 12:23:02 2008 +0000 @@ -980,7 +980,7 @@ if (!cw) return; cd = cw->cd; - gdk_window_get_position (cw->window->window, &cd->window_x, &cd->window_y); + gdk_window_get_position(cw->window->window, &cd->window_x, &cd->window_y); gdk_drawable_get_size(cw->window->window, &cd->window_w, &cd->window_h); cd->window_read = TRUE; } @@ -1212,7 +1212,7 @@ gtk_window_set_resizable(GTK_WINDOW(cw->window), TRUE); collection_window_update_title(cw); - gtk_container_set_border_width (GTK_CONTAINER (cw->window), 0); + gtk_container_set_border_width(GTK_CONTAINER (cw->window), 0); g_signal_connect(G_OBJECT(cw->window), "delete_event", G_CALLBACK(collection_window_delete), cw); diff -r e21da52016c8 -r f9bf33be53ff src/dupe.c --- a/src/dupe.c Thu Apr 24 11:40:26 2008 +0000 +++ b/src/dupe.c Thu Apr 24 12:23:02 2008 +0000 @@ -3129,7 +3129,7 @@ gtk_window_set_default_size(GTK_WINDOW(dw->window), DUPE_DEF_WIDTH, DUPE_DEF_HEIGHT); gtk_window_set_resizable(GTK_WINDOW(dw->window), TRUE); - gtk_container_set_border_width (GTK_CONTAINER (dw->window), 0); + gtk_container_set_border_width(GTK_CONTAINER (dw->window), 0); g_signal_connect(G_OBJECT(dw->window), "delete_event", G_CALLBACK(dupe_window_delete), dw); diff -r e21da52016c8 -r f9bf33be53ff src/fullscreen.c --- a/src/fullscreen.c Thu Apr 24 11:40:26 2008 +0000 +++ b/src/fullscreen.c Thu Apr 24 12:23:02 2008 +0000 @@ -43,12 +43,12 @@ GdkCursor *cursor; cursor = gdk_cursor_new(GDK_WATCH); - gdk_window_set_cursor (widget->window, cursor); + gdk_window_set_cursor(widget->window, cursor); gdk_cursor_unref(cursor); } else if (state & FULLSCREEN_CURSOR_NORMAL) { - gdk_window_set_cursor (widget->window, NULL); + gdk_window_set_cursor(widget->window, NULL); } else { @@ -62,7 +62,7 @@ &widget->style->bg[GTK_STATE_ACTIVE], 0, 0); - gdk_window_set_cursor (widget->window, cursor); + gdk_window_set_cursor(widget->window, cursor); gdk_cursor_unref(cursor); g_object_unref(p); @@ -190,7 +190,7 @@ if (found) { - system (XSCREENSAVER_COMMAND); + system(XSCREENSAVER_COMMAND); } } diff -r e21da52016c8 -r f9bf33be53ff src/image.c --- a/src/image.c Thu Apr 24 11:40:26 2008 +0000 +++ b/src/image.c Thu Apr 24 12:23:02 2008 +0000 @@ -1098,18 +1098,18 @@ if (has_focus) { - gtk_paint_focus (widget->style, widget->window, GTK_STATE_ACTIVE, + gtk_paint_focus(widget->style, widget->window, GTK_STATE_ACTIVE, + area, widget, "image_window", + widget->allocation.x, widget->allocation.y, + widget->allocation.width - 1, widget->allocation.height - 1); + } + else + { + gtk_paint_shadow(widget->style, widget->window, GTK_STATE_NORMAL, GTK_SHADOW_IN, area, widget, "image_window", widget->allocation.x, widget->allocation.y, widget->allocation.width - 1, widget->allocation.height - 1); } - else - { - gtk_paint_shadow (widget->style, widget->window, GTK_STATE_NORMAL, GTK_SHADOW_IN, - area, widget, "image_window", - widget->allocation.x, widget->allocation.y, - widget->allocation.width - 1, widget->allocation.height - 1); - } } static gint image_focus_expose(GtkWidget *widget, GdkEventExpose *event, gpointer data) @@ -1833,7 +1833,7 @@ pb = gdk_pixbuf_scale_simple(pixbuf, width, height, (GdkInterpType)options->image.zoom_quality); - gdk_pixbuf_render_pixmap_and_mask (pb, &pixmap, NULL, 128); + gdk_pixbuf_render_pixmap_and_mask(pb, &pixmap, NULL, 128); gdk_window_set_back_pixmap(rootwindow, pixmap, FALSE); gdk_window_clear(rootwindow); g_object_unref(pb); @@ -1865,12 +1865,12 @@ if (selectable) { gtk_frame_set_shadow_type(GTK_FRAME(imd->frame), GTK_SHADOW_NONE); - gtk_container_set_border_width (GTK_CONTAINER (imd->frame), 4); + gtk_container_set_border_width(GTK_CONTAINER (imd->frame), 4); } else { gtk_frame_set_shadow_type(GTK_FRAME(imd->frame), GTK_SHADOW_NONE); - gtk_container_set_border_width (GTK_CONTAINER (imd->frame), 0); + gtk_container_set_border_width(GTK_CONTAINER (imd->frame), 0); } } } @@ -1947,12 +1947,12 @@ image_free(imd); } -gboolean selectable_frame_expose_cb (GtkWidget *widget, GdkEventExpose *event, gpointer data) +gboolean selectable_frame_expose_cb(GtkWidget *widget, GdkEventExpose *event, gpointer data) { gtk_paint_flat_box(widget->style, widget->window, widget->state, - GTK_FRAME (widget)->shadow_type, + (GTK_FRAME(widget))->shadow_type, NULL, widget, NULL, @@ -1979,8 +1979,8 @@ if (imd->has_frame != -1) gtk_container_remove(GTK_CONTAINER(imd->widget), imd->pr); gtk_container_add(GTK_CONTAINER(imd->frame), imd->pr); gtk_widget_unref(imd->pr); - g_signal_connect (G_OBJECT (imd->frame), "expose_event", - G_CALLBACK (selectable_frame_expose_cb), NULL); + g_signal_connect(G_OBJECT(imd->frame), "expose_event", + G_CALLBACK(selectable_frame_expose_cb), NULL); GTK_WIDGET_SET_FLAGS(imd->frame, GTK_CAN_FOCUS); g_signal_connect(G_OBJECT(imd->frame), "focus_in_event", diff -r e21da52016c8 -r f9bf33be53ff src/img-view.c --- a/src/img-view.c Thu Apr 24 11:40:26 2008 +0000 +++ b/src/img-view.c Thu Apr 24 12:23:02 2008 +0000 @@ -612,7 +612,7 @@ break; case MOUSE_BUTTON_RIGHT: menu = view_popup_menu(vw); - gtk_menu_popup (GTK_MENU(menu), NULL, NULL, NULL, NULL, 3, time); + gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, NULL, 3, time); break; default: break; @@ -1571,15 +1571,15 @@ g_list_free(list); if (text) { - gtk_selection_data_set (selection_data, selection_data->target, - 8, (guchar *)text, len); + gtk_selection_data_set(selection_data, selection_data->target, + 8, (guchar *)text, len); g_free(text); } } else { - gtk_selection_data_set (selection_data, selection_data->target, - 8, NULL, 0); + gtk_selection_data_set(selection_data, selection_data->target, + 8, NULL, 0); } } diff -r e21da52016c8 -r f9bf33be53ff src/layout_image.c --- a/src/layout_image.c Thu Apr 24 11:40:26 2008 +0000 +++ b/src/layout_image.c Thu Apr 24 12:23:02 2008 +0000 @@ -967,15 +967,15 @@ g_list_free(list); if (text) { - gtk_selection_data_set (selection_data, selection_data->target, - 8, (guchar *)text, len); + gtk_selection_data_set(selection_data, selection_data->target, + 8, (guchar *)text, len); g_free(text); } } else { - gtk_selection_data_set (selection_data, selection_data->target, - 8, NULL, 0); + gtk_selection_data_set(selection_data, selection_data->target, + 8, NULL, 0); } } @@ -1857,7 +1857,7 @@ { gdouble sx, sy; image_change_fd(lw->split_images[1], - image_get_fd(lw->image), image_zoom_get(lw->image)); + image_get_fd(lw->image), image_zoom_get(lw->image)); image_get_scroll_center(lw->image, &sx, &sy); image_set_scroll_center(lw->split_images[1], sx, sy); } @@ -1887,15 +1887,15 @@ /* horizontal split means vpaned and vice versa */ if (horizontal) - paned = gtk_vpaned_new (); + paned = gtk_vpaned_new(); else - paned = gtk_hpaned_new (); + paned = gtk_hpaned_new(); - gtk_paned_pack1 (GTK_PANED (paned), lw->split_images[0]->widget, TRUE, TRUE); - gtk_paned_pack2 (GTK_PANED (paned), lw->split_images[1]->widget, TRUE, TRUE); + gtk_paned_pack1(GTK_PANED(paned), lw->split_images[0]->widget, TRUE, TRUE); + gtk_paned_pack2(GTK_PANED(paned), lw->split_images[1]->widget, TRUE, TRUE); - gtk_widget_show (lw->split_images[0]->widget); - gtk_widget_show (lw->split_images[1]->widget); + gtk_widget_show(lw->split_images[0]->widget); + gtk_widget_show(lw->split_images[1]->widget); lw->split_image_widget = paned; @@ -1963,24 +1963,25 @@ layout_image_activate(lw, 0); } - hpaned = gtk_hpaned_new (); - vpaned1 = gtk_vpaned_new (); - vpaned2 = gtk_vpaned_new (); + hpaned = gtk_hpaned_new(); + vpaned1 = gtk_vpaned_new(); + vpaned2 = gtk_vpaned_new(); - gtk_paned_pack1 (GTK_PANED (vpaned1), lw->split_images[0]->widget, TRUE, TRUE); - gtk_paned_pack2 (GTK_PANED (vpaned1), lw->split_images[2]->widget, TRUE, TRUE); + gtk_paned_pack1(GTK_PANED(vpaned1), lw->split_images[0]->widget, TRUE, TRUE); + gtk_paned_pack2(GTK_PANED(vpaned1), lw->split_images[2]->widget, TRUE, TRUE); - gtk_paned_pack1 (GTK_PANED (vpaned2), lw->split_images[1]->widget, TRUE, TRUE); - gtk_paned_pack2 (GTK_PANED (vpaned2), lw->split_images[3]->widget, TRUE, TRUE); + gtk_paned_pack1(GTK_PANED(vpaned2), lw->split_images[1]->widget, TRUE, TRUE); + gtk_paned_pack2(GTK_PANED(vpaned2), lw->split_images[3]->widget, TRUE, TRUE); - gtk_paned_pack1 (GTK_PANED (hpaned), vpaned1, TRUE, TRUE); - gtk_paned_pack2 (GTK_PANED (hpaned), vpaned2, TRUE, TRUE); + gtk_paned_pack1(GTK_PANED(hpaned), vpaned1, TRUE, TRUE); + gtk_paned_pack2(GTK_PANED(hpaned), vpaned2, TRUE, TRUE); for (i=0; i < 4; i++) - gtk_widget_show (lw->split_images[i]->widget); - gtk_widget_show (vpaned1); - gtk_widget_show (vpaned2); + gtk_widget_show(lw->split_images[i]->widget); + + gtk_widget_show(vpaned1); + gtk_widget_show(vpaned2); lw->split_image_widget = hpaned; diff -r e21da52016c8 -r f9bf33be53ff src/layout_util.c --- a/src/layout_util.c Thu Apr 24 11:40:26 2008 +0000 +++ b/src/layout_util.c Thu Apr 24 12:23:02 2008 +0000 @@ -1387,9 +1387,9 @@ error = NULL; if (!gtk_ui_manager_add_ui_from_string(lw->ui_manager, desc->str, -1, &error)) { - g_message ("building menus failed: %s", error->message); - g_error_free (error); - exit (EXIT_FAILURE); + g_message("building menus failed: %s", error->message); + g_error_free(error); + exit(EXIT_FAILURE); } g_string_free(desc, TRUE); } @@ -1424,9 +1424,9 @@ error = NULL; if (!gtk_ui_manager_add_ui_from_string(lw->ui_manager, menu_ui_description, -1, &error)) { - g_message ("building menus failed: %s", error->message); - g_error_free (error); - exit (EXIT_FAILURE); + g_message("building menus failed: %s", error->message); + g_error_free(error); + exit(EXIT_FAILURE); } layout_actions_setup_marks(lw); diff -r e21da52016c8 -r f9bf33be53ff src/main.c --- a/src/main.c Thu Apr 24 11:40:26 2008 +0000 +++ b/src/main.c Thu Apr 24 12:23:02 2008 +0000 @@ -992,7 +992,7 @@ strcmp(cmd_line, "--remote-help") == 0) { remote_help(); - exit (0); + exit(0); } else if (strcmp(cmd_line, "--blank") == 0) { @@ -1002,7 +1002,7 @@ strcmp(cmd_line, "--version") == 0) { printf("%s %s\n", GQ_APPNAME, VERSION); - exit (0); + exit(0); } else if (strcmp(cmd_line, "--alternate") == 0) { @@ -1036,7 +1036,7 @@ print_term( " --alternate use alternate similarity algorithm\n"); #endif - exit (0); + exit(0); } else if (!remote_do) { @@ -1341,7 +1341,7 @@ parse_command_line(argc, argv, &cmd_path, &cmd_file, &cmd_list, &collection_list, &geometry); - gtk_init (&argc, &argv); + gtk_init(&argc, &argv); if (gtk_major_version < GTK_MAJOR_VERSION || (gtk_major_version == GTK_MAJOR_VERSION && gtk_minor_version < GTK_MINOR_VERSION) ) @@ -1497,6 +1497,6 @@ remote_server_subscribe(remote_connection, remote_cb, NULL); g_free(buf); - gtk_main (); + gtk_main(); return 0; } diff -r e21da52016c8 -r f9bf33be53ff src/md5-util.c --- a/src/md5-util.c Thu Apr 24 11:40:26 2008 +0000 +++ b/src/md5-util.c Thu Apr 24 12:23:02 2008 +0000 @@ -46,7 +46,7 @@ * Note: this code is harmless on little-endian machines. */ static void -_byte_reverse (guchar *buf, guint32 longs) +_byte_reverse(guchar *buf, guint32 longs) { guint32 t; do { @@ -65,7 +65,7 @@ * **/ void -md5_init (MD5Context *ctx) +md5_init(MD5Context *ctx) { ctx->buf[0] = 0x67452301; ctx->buf[1] = 0xefcdab89; @@ -85,7 +85,7 @@ /** * md5_update: add a buffer to md5 hash computation - * @ctx: conetxt object used for md5 computaion + * @ctx: context object used for md5 computaion * @buf: buffer to add * @len: buffer length * @@ -93,7 +93,7 @@ * of bytes. Use this to progressively construct an md5 hash. **/ void -md5_update (MD5Context *ctx, const guchar *buf, guint32 len) +md5_update(MD5Context *ctx, const guchar *buf, guint32 len) { guint32 t; @@ -113,36 +113,33 @@ t = 64 - t; if (len < t) { - memcpy (p, buf, len); + memcpy(p, buf, len); return; } - memcpy (p, buf, t); + memcpy(p, buf, t); if (ctx->doByteReverse) - _byte_reverse (ctx->in, 16); - md5_transform (ctx->buf, (guint32 *) ctx->in); + _byte_reverse(ctx->in, 16); + md5_transform(ctx->buf, (guint32 *) ctx->in); buf += t; len -= t; } /* Process data in 64-byte chunks */ while (len >= 64) { - memcpy (ctx->in, buf, 64); + memcpy(ctx->in, buf, 64); if (ctx->doByteReverse) - _byte_reverse (ctx->in, 16); - md5_transform (ctx->buf, (guint32 *) ctx->in); + _byte_reverse(ctx->in, 16); + md5_transform(ctx->buf, (guint32 *) ctx->in); buf += 64; len -= 64; } /* Handle any remaining bytes of data. */ - memcpy (ctx->in, buf, len); + memcpy(ctx->in, buf, len); } - - - /* * Final wrapup - pad to 64-byte boundary with the bit pattern * 1 0* (64-bit count of bits processed, MSB-first) @@ -155,7 +152,7 @@ * copy the final md5 hash to a bufer **/ void -md5_final (MD5Context *ctx, guchar digest[16]) +md5_final(MD5Context *ctx, guchar digest[16]) { guint32 count; guchar *p; @@ -174,28 +171,28 @@ /* Pad out to 56 mod 64 */ if (count < 8) { /* Two lots of padding: Pad the first block to 64 bytes */ - memset (p, 0, count); + memset(p, 0, count); if (ctx->doByteReverse) - _byte_reverse (ctx->in, 16); - md5_transform (ctx->buf, (guint32 *) ctx->in); + _byte_reverse(ctx->in, 16); + md5_transform(ctx->buf, (guint32 *) ctx->in); /* Now fill the next block with 56 bytes */ - memset (ctx->in, 0, 56); + memset(ctx->in, 0, 56); } else { /* Pad block to 56 bytes */ - memset (p, 0, count - 8); + memset(p, 0, count - 8); } if (ctx->doByteReverse) - _byte_reverse (ctx->in, 14); + _byte_reverse(ctx->in, 14); /* Append length in bits and transform */ ((guint32 *) ctx->in)[14] = ctx->bits[0]; ((guint32 *) ctx->in)[15] = ctx->bits[1]; - md5_transform (ctx->buf, (guint32 *) ctx->in); + md5_transform(ctx->buf, (guint32 *) ctx->in); if (ctx->doByteReverse) - _byte_reverse ((guchar *) ctx->buf, 4); - memcpy (digest, ctx->buf, 16); + _byte_reverse((guchar *) ctx->buf, 4); + memcpy(digest, ctx->buf, 16); } @@ -219,7 +216,7 @@ * the data and converts bytes into longwords for this routine. */ static void -md5_transform (guint32 buf[4], const guint32 in[16]) +md5_transform(guint32 buf[4], const guint32 in[16]) { register guint32 a, b, c, d; @@ -228,73 +225,73 @@ c = buf[2]; d = buf[3]; - MD5STEP (F1, a, b, c, d, in[0] + 0xd76aa478, 7); - MD5STEP (F1, d, a, b, c, in[1] + 0xe8c7b756, 12); - MD5STEP (F1, c, d, a, b, in[2] + 0x242070db, 17); - MD5STEP (F1, b, c, d, a, in[3] + 0xc1bdceee, 22); - MD5STEP (F1, a, b, c, d, in[4] + 0xf57c0faf, 7); - MD5STEP (F1, d, a, b, c, in[5] + 0x4787c62a, 12); - MD5STEP (F1, c, d, a, b, in[6] + 0xa8304613, 17); - MD5STEP (F1, b, c, d, a, in[7] + 0xfd469501, 22); - MD5STEP (F1, a, b, c, d, in[8] + 0x698098d8, 7); - MD5STEP (F1, d, a, b, c, in[9] + 0x8b44f7af, 12); - MD5STEP (F1, c, d, a, b, in[10] + 0xffff5bb1, 17); - MD5STEP (F1, b, c, d, a, in[11] + 0x895cd7be, 22); - MD5STEP (F1, a, b, c, d, in[12] + 0x6b901122, 7); - MD5STEP (F1, d, a, b, c, in[13] + 0xfd987193, 12); - MD5STEP (F1, c, d, a, b, in[14] + 0xa679438e, 17); - MD5STEP (F1, b, c, d, a, in[15] + 0x49b40821, 22); + MD5STEP(F1, a, b, c, d, in[0] + 0xd76aa478, 7); + MD5STEP(F1, d, a, b, c, in[1] + 0xe8c7b756, 12); + MD5STEP(F1, c, d, a, b, in[2] + 0x242070db, 17); + MD5STEP(F1, b, c, d, a, in[3] + 0xc1bdceee, 22); + MD5STEP(F1, a, b, c, d, in[4] + 0xf57c0faf, 7); + MD5STEP(F1, d, a, b, c, in[5] + 0x4787c62a, 12); + MD5STEP(F1, c, d, a, b, in[6] + 0xa8304613, 17); + MD5STEP(F1, b, c, d, a, in[7] + 0xfd469501, 22); + MD5STEP(F1, a, b, c, d, in[8] + 0x698098d8, 7); + MD5STEP(F1, d, a, b, c, in[9] + 0x8b44f7af, 12); + MD5STEP(F1, c, d, a, b, in[10] + 0xffff5bb1, 17); + MD5STEP(F1, b, c, d, a, in[11] + 0x895cd7be, 22); + MD5STEP(F1, a, b, c, d, in[12] + 0x6b901122, 7); + MD5STEP(F1, d, a, b, c, in[13] + 0xfd987193, 12); + MD5STEP(F1, c, d, a, b, in[14] + 0xa679438e, 17); + MD5STEP(F1, b, c, d, a, in[15] + 0x49b40821, 22); - MD5STEP (F2, a, b, c, d, in[1] + 0xf61e2562, 5); - MD5STEP (F2, d, a, b, c, in[6] + 0xc040b340, 9); - MD5STEP (F2, c, d, a, b, in[11] + 0x265e5a51, 14); - MD5STEP (F2, b, c, d, a, in[0] + 0xe9b6c7aa, 20); - MD5STEP (F2, a, b, c, d, in[5] + 0xd62f105d, 5); - MD5STEP (F2, d, a, b, c, in[10] + 0x02441453, 9); - MD5STEP (F2, c, d, a, b, in[15] + 0xd8a1e681, 14); - MD5STEP (F2, b, c, d, a, in[4] + 0xe7d3fbc8, 20); - MD5STEP (F2, a, b, c, d, in[9] + 0x21e1cde6, 5); - MD5STEP (F2, d, a, b, c, in[14] + 0xc33707d6, 9); - MD5STEP (F2, c, d, a, b, in[3] + 0xf4d50d87, 14); - MD5STEP (F2, b, c, d, a, in[8] + 0x455a14ed, 20); - MD5STEP (F2, a, b, c, d, in[13] + 0xa9e3e905, 5); - MD5STEP (F2, d, a, b, c, in[2] + 0xfcefa3f8, 9); - MD5STEP (F2, c, d, a, b, in[7] + 0x676f02d9, 14); - MD5STEP (F2, b, c, d, a, in[12] + 0x8d2a4c8a, 20); + MD5STEP(F2, a, b, c, d, in[1] + 0xf61e2562, 5); + MD5STEP(F2, d, a, b, c, in[6] + 0xc040b340, 9); + MD5STEP(F2, c, d, a, b, in[11] + 0x265e5a51, 14); + MD5STEP(F2, b, c, d, a, in[0] + 0xe9b6c7aa, 20); + MD5STEP(F2, a, b, c, d, in[5] + 0xd62f105d, 5); + MD5STEP(F2, d, a, b, c, in[10] + 0x02441453, 9); + MD5STEP(F2, c, d, a, b, in[15] + 0xd8a1e681, 14); + MD5STEP(F2, b, c, d, a, in[4] + 0xe7d3fbc8, 20); + MD5STEP(F2, a, b, c, d, in[9] + 0x21e1cde6, 5); + MD5STEP(F2, d, a, b, c, in[14] + 0xc33707d6, 9); + MD5STEP(F2, c, d, a, b, in[3] + 0xf4d50d87, 14); + MD5STEP(F2, b, c, d, a, in[8] + 0x455a14ed, 20); + MD5STEP(F2, a, b, c, d, in[13] + 0xa9e3e905, 5); + MD5STEP(F2, d, a, b, c, in[2] + 0xfcefa3f8, 9); + MD5STEP(F2, c, d, a, b, in[7] + 0x676f02d9, 14); + MD5STEP(F2, b, c, d, a, in[12] + 0x8d2a4c8a, 20); - MD5STEP (F3, a, b, c, d, in[5] + 0xfffa3942, 4); - MD5STEP (F3, d, a, b, c, in[8] + 0x8771f681, 11); - MD5STEP (F3, c, d, a, b, in[11] + 0x6d9d6122, 16); - MD5STEP (F3, b, c, d, a, in[14] + 0xfde5380c, 23); - MD5STEP (F3, a, b, c, d, in[1] + 0xa4beea44, 4); - MD5STEP (F3, d, a, b, c, in[4] + 0x4bdecfa9, 11); - MD5STEP (F3, c, d, a, b, in[7] + 0xf6bb4b60, 16); - MD5STEP (F3, b, c, d, a, in[10] + 0xbebfbc70, 23); - MD5STEP (F3, a, b, c, d, in[13] + 0x289b7ec6, 4); - MD5STEP (F3, d, a, b, c, in[0] + 0xeaa127fa, 11); - MD5STEP (F3, c, d, a, b, in[3] + 0xd4ef3085, 16); - MD5STEP (F3, b, c, d, a, in[6] + 0x04881d05, 23); - MD5STEP (F3, a, b, c, d, in[9] + 0xd9d4d039, 4); - MD5STEP (F3, d, a, b, c, in[12] + 0xe6db99e5, 11); - MD5STEP (F3, c, d, a, b, in[15] + 0x1fa27cf8, 16); - MD5STEP (F3, b, c, d, a, in[2] + 0xc4ac5665, 23); + MD5STEP(F3, a, b, c, d, in[5] + 0xfffa3942, 4); + MD5STEP(F3, d, a, b, c, in[8] + 0x8771f681, 11); + MD5STEP(F3, c, d, a, b, in[11] + 0x6d9d6122, 16); + MD5STEP(F3, b, c, d, a, in[14] + 0xfde5380c, 23); + MD5STEP(F3, a, b, c, d, in[1] + 0xa4beea44, 4); + MD5STEP(F3, d, a, b, c, in[4] + 0x4bdecfa9, 11); + MD5STEP(F3, c, d, a, b, in[7] + 0xf6bb4b60, 16); + MD5STEP(F3, b, c, d, a, in[10] + 0xbebfbc70, 23); + MD5STEP(F3, a, b, c, d, in[13] + 0x289b7ec6, 4); + MD5STEP(F3, d, a, b, c, in[0] + 0xeaa127fa, 11); + MD5STEP(F3, c, d, a, b, in[3] + 0xd4ef3085, 16); + MD5STEP(F3, b, c, d, a, in[6] + 0x04881d05, 23); + MD5STEP(F3, a, b, c, d, in[9] + 0xd9d4d039, 4); + MD5STEP(F3, d, a, b, c, in[12] + 0xe6db99e5, 11); + MD5STEP(F3, c, d, a, b, in[15] + 0x1fa27cf8, 16); + MD5STEP(F3, b, c, d, a, in[2] + 0xc4ac5665, 23); - MD5STEP (F4, a, b, c, d, in[0] + 0xf4292244, 6); - MD5STEP (F4, d, a, b, c, in[7] + 0x432aff97, 10); - MD5STEP (F4, c, d, a, b, in[14] + 0xab9423a7, 15); - MD5STEP (F4, b, c, d, a, in[5] + 0xfc93a039, 21); - MD5STEP (F4, a, b, c, d, in[12] + 0x655b59c3, 6); - MD5STEP (F4, d, a, b, c, in[3] + 0x8f0ccc92, 10); - MD5STEP (F4, c, d, a, b, in[10] + 0xffeff47d, 15); - MD5STEP (F4, b, c, d, a, in[1] + 0x85845dd1, 21); - MD5STEP (F4, a, b, c, d, in[8] + 0x6fa87e4f, 6); - MD5STEP (F4, d, a, b, c, in[15] + 0xfe2ce6e0, 10); - MD5STEP (F4, c, d, a, b, in[6] + 0xa3014314, 15); - MD5STEP (F4, b, c, d, a, in[13] + 0x4e0811a1, 21); - MD5STEP (F4, a, b, c, d, in[4] + 0xf7537e82, 6); - MD5STEP (F4, d, a, b, c, in[11] + 0xbd3af235, 10); - MD5STEP (F4, c, d, a, b, in[2] + 0x2ad7d2bb, 15); - MD5STEP (F4, b, c, d, a, in[9] + 0xeb86d391, 21); + MD5STEP(F4, a, b, c, d, in[0] + 0xf4292244, 6); + MD5STEP(F4, d, a, b, c, in[7] + 0x432aff97, 10); + MD5STEP(F4, c, d, a, b, in[14] + 0xab9423a7, 15); + MD5STEP(F4, b, c, d, a, in[5] + 0xfc93a039, 21); + MD5STEP(F4, a, b, c, d, in[12] + 0x655b59c3, 6); + MD5STEP(F4, d, a, b, c, in[3] + 0x8f0ccc92, 10); + MD5STEP(F4, c, d, a, b, in[10] + 0xffeff47d, 15); + MD5STEP(F4, b, c, d, a, in[1] + 0x85845dd1, 21); + MD5STEP(F4, a, b, c, d, in[8] + 0x6fa87e4f, 6); + MD5STEP(F4, d, a, b, c, in[15] + 0xfe2ce6e0, 10); + MD5STEP(F4, c, d, a, b, in[6] + 0xa3014314, 15); + MD5STEP(F4, b, c, d, a, in[13] + 0x4e0811a1, 21); + MD5STEP(F4, a, b, c, d, in[4] + 0xf7537e82, 6); + MD5STEP(F4, d, a, b, c, in[11] + 0xbd3af235, 10); + MD5STEP(F4, c, d, a, b, in[2] + 0x2ad7d2bb, 15); + MD5STEP(F4, b, c, d, a, in[9] + 0xeb86d391, 21); buf[0] += a; buf[1] += b; @@ -315,13 +312,13 @@ * the 16 bytes buffer @digest . **/ void -md5_get_digest (const guchar *buffer, gint buffer_size, guchar digest[16]) +md5_get_digest(const guchar *buffer, gint buffer_size, guchar digest[16]) { MD5Context ctx; - md5_init (&ctx); - md5_update (&ctx, buffer, buffer_size); - md5_final (&ctx, digest); + md5_init(&ctx); + md5_update(&ctx, buffer, buffer_size); + md5_final(&ctx, digest); } @@ -349,16 +346,16 @@ md5_init(&ctx); - while ((nb_bytes_read = fread (tmp_buf, sizeof (guchar), sizeof(tmp_buf), fp)) > 0) + while ((nb_bytes_read = fread(tmp_buf, sizeof (guchar), sizeof(tmp_buf), fp)) > 0) { - md5_update (&ctx, tmp_buf, nb_bytes_read); + md5_update(&ctx, tmp_buf, nb_bytes_read); } success = (ferror(fp) == 0); fclose(fp); if (!success) return FALSE; - md5_final (&ctx, digest); + md5_final(&ctx, digest); return TRUE; } @@ -406,8 +403,8 @@ for (i = 0; i < 16; i++) { if (text[2*i] == '\0' || text[2*i+1] == '\0') return FALSE; - digest[i] = g_ascii_xdigit_value (text[2*i]) << 4 | - g_ascii_xdigit_value (text[2*i + 1]); + digest[i] = g_ascii_xdigit_value(text[2*i]) << 4 | + g_ascii_xdigit_value(text[2*i + 1]); } return TRUE; diff -r e21da52016c8 -r f9bf33be53ff src/menu.c --- a/src/menu.c Thu Apr 24 11:40:26 2008 +0000 +++ b/src/menu.c Thu Apr 24 12:23:02 2008 +0000 @@ -42,7 +42,7 @@ GtkWidget *item; item = gtk_menu_item_new_with_label(label); - gtk_widget_add_accelerator (item, "activate", accel_group, accel_key, accel_mods, GTK_ACCEL_VISIBLE); + gtk_widget_add_accelerator(item, "activate", accel_group, accel_key, accel_mods, GTK_ACCEL_VISIBLE); g_signal_connect(G_OBJECT(item), "activate", func, data); gtk_menu_shell_append(GTK_MENU_SHELL(menu), item); gtk_widget_show(item); diff -r e21da52016c8 -r f9bf33be53ff src/pan-view.c --- a/src/pan-view.c Thu Apr 24 11:40:26 2008 +0000 +++ b/src/pan-view.c Thu Apr 24 12:23:02 2008 +0000 @@ -2053,7 +2053,7 @@ case MOUSE_BUTTON_RIGHT: pan_info_update(pw, pi); menu = pan_popup_menu(pw); - gtk_menu_popup (GTK_MENU(menu), NULL, NULL, NULL, NULL, 3, event->time); + gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, NULL, 3, event->time); break; default: break; @@ -2944,15 +2944,15 @@ g_list_free(list); if (text) { - gtk_selection_data_set (selection_data, selection_data->target, - 8, (guchar *)text, len); + gtk_selection_data_set(selection_data, selection_data->target, + 8, (guchar *)text, len); g_free(text); } } else { - gtk_selection_data_set (selection_data, selection_data->target, - 8, NULL, 0); + gtk_selection_data_set(selection_data, selection_data->target, + 8, NULL, 0); } } diff -r e21da52016c8 -r f9bf33be53ff src/pixbuf-renderer.c --- a/src/pixbuf-renderer.c Thu Apr 24 11:40:26 2008 +0000 +++ b/src/pixbuf-renderer.c Thu Apr 24 12:23:02 2008 +0000 @@ -1016,7 +1016,7 @@ attributes_mask = 0; od->window = gdk_window_new(GTK_WIDGET(pr)->window, &attributes, attributes_mask); - gdk_window_set_user_data (od->window, pr); + gdk_window_set_user_data(od->window, pr); gdk_window_move(od->window, px, py); gdk_window_show(od->window); diff -r e21da52016c8 -r f9bf33be53ff src/pixbuf-renderer.h --- a/src/pixbuf-renderer.h Thu Apr 24 11:40:26 2008 +0000 +++ b/src/pixbuf-renderer.h Thu Apr 24 12:23:02 2008 +0000 @@ -157,12 +157,12 @@ { GtkEventBoxClass parent_class; - void (* zoom) (PixbufRenderer *pr, gdouble zoom); - void (* clicked) (PixbufRenderer *pr, GdkEventButton *event); - void (* scroll_notify) (PixbufRenderer *pr); + void (*zoom)(PixbufRenderer *pr, gdouble zoom); + void (*clicked)(PixbufRenderer *pr, GdkEventButton *event); + void (*scroll_notify)(PixbufRenderer *pr); - void (* render_complete)(PixbufRenderer *pr); - void (* drag) (PixbufRenderer *pr, GdkEventButton *event); + void (*render_complete)(PixbufRenderer *pr); + void (*drag)(PixbufRenderer *pr, GdkEventButton *event); }; diff -r e21da52016c8 -r f9bf33be53ff src/preferences.c --- a/src/preferences.c Thu Apr 24 11:40:26 2008 +0000 +++ b/src/preferences.c Thu Apr 24 12:23:02 2008 +0000 @@ -845,7 +845,7 @@ gtk_container_set_border_width(GTK_CONTAINER(vbox), PREF_PAD_BORDER); gtk_widget_show(vbox); label = gtk_label_new(_("General")); - gtk_notebook_append_page (GTK_NOTEBOOK(notebook), vbox, label); + gtk_notebook_append_page(GTK_NOTEBOOK(notebook), vbox, label); group = pref_group_new(vbox, FALSE, _("Startup"), GTK_ORIENTATION_VERTICAL); @@ -921,7 +921,7 @@ gtk_container_set_border_width(GTK_CONTAINER(vbox), PREF_PAD_BORDER); gtk_widget_show(vbox); label = gtk_label_new(_("Image")); - gtk_notebook_append_page (GTK_NOTEBOOK(notebook), vbox, label); + gtk_notebook_append_page(GTK_NOTEBOOK(notebook), vbox, label); group = pref_group_new(vbox, FALSE, _("Zoom"), GTK_ORIENTATION_VERTICAL); @@ -1574,7 +1574,7 @@ } notebook = gtk_notebook_new(); - gtk_notebook_set_tab_pos (GTK_NOTEBOOK(notebook), GTK_POS_TOP); + gtk_notebook_set_tab_pos(GTK_NOTEBOOK(notebook), GTK_POS_TOP); gtk_box_pack_start(GTK_BOX(win_vbox), notebook, TRUE, TRUE, 0); config_tab_general(notebook); diff -r e21da52016c8 -r f9bf33be53ff src/print.c --- a/src/print.c Thu Apr 24 11:40:26 2008 +0000 +++ b/src/print.c Thu Apr 24 12:23:02 2008 +0000 @@ -978,11 +978,11 @@ pe->error = &pipe_handler_error; new_action.sa_handler = pipe_handler_sigpipe_cb; - sigemptyset (&new_action.sa_mask); + sigemptyset(&new_action.sa_mask); new_action.sa_flags = 0; /* setup our signal handler */ - sigaction (SIGPIPE, &new_action, &pe->old_action); + sigaction(SIGPIPE, &new_action, &pe->old_action); pipe_handler_data = pe; return pe; @@ -994,7 +994,7 @@ if (pe != pipe_handler_data) printf("warning SIGPIPE handler not closing same data\n"); /* restore the original signal handler */ - sigaction (SIGPIPE, &pe->old_action, NULL); + sigaction(SIGPIPE, &pe->old_action, NULL); pipe_handler_data = NULL; g_free(pe); diff -r e21da52016c8 -r f9bf33be53ff src/remote.c --- a/src/remote.c Thu Apr 24 11:40:26 2008 +0000 +++ b/src/remote.c Thu Apr 24 12:23:02 2008 +0000 @@ -288,11 +288,11 @@ sigpipe_occured = FALSE; new_action.sa_handler = sighandler_sigpipe; - sigemptyset (&new_action.sa_mask); + sigemptyset(&new_action.sa_mask); new_action.sa_flags = 0; /* setup our signal handler */ - sigaction (SIGPIPE, &new_action, &old_action); + sigaction(SIGPIPE, &new_action, &old_action); if (write(rc->fd, text, strlen(text)) == -1 || write(rc->fd, "\n", 1) == -1) @@ -313,7 +313,7 @@ } /* restore the original signal handler */ - sigaction (SIGPIPE, &old_action, NULL); + sigaction(SIGPIPE, &old_action, NULL); return ret; } diff -r e21da52016c8 -r f9bf33be53ff src/similar.c --- a/src/similar.c Thu Apr 24 11:40:26 2008 +0000 +++ b/src/similar.c Thu Apr 24 12:23:02 2008 +0000 @@ -128,7 +128,7 @@ p++; } - qsort (buf, len, sizeof(gint) * 2, image_sim_channel_eq_sort_cb); + qsort(buf, len, sizeof(gint) * 2, image_sim_channel_eq_sort_cb); p = 0; for (i = 0; i < len; i++) diff -r e21da52016c8 -r f9bf33be53ff src/thumb.c --- a/src/thumb.c Thu Apr 24 11:40:26 2008 +0000 +++ b/src/thumb.c Thu Apr 24 12:23:02 2008 +0000 @@ -112,7 +112,7 @@ { struct utimbuf ut; - fclose (f); + fclose(f); ut.actime = ut.modtime = filetime(tl->path); if (ut.modtime > 0) diff -r e21da52016c8 -r f9bf33be53ff src/ui_pathsel.c --- a/src/ui_pathsel.c Thu Apr 24 11:40:26 2008 +0000 +++ b/src/ui_pathsel.c Thu Apr 24 12:23:02 2008 +0000 @@ -1084,8 +1084,8 @@ scrolled = gtk_scrolled_window_new(NULL, NULL); gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolled), GTK_SHADOW_IN); - gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled), - GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS); + gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW (scrolled), + GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS); gtk_box_pack_start(GTK_BOX(hbox2), scrolled, TRUE, TRUE, 0); gtk_widget_show(scrolled); @@ -1156,8 +1156,8 @@ scrolled = gtk_scrolled_window_new(NULL, NULL); gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolled), GTK_SHADOW_IN); - gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled), - GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS); + gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW (scrolled), + GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS); if (paned) { gtk_paned_add2(GTK_PANED(paned), scrolled); diff -r e21da52016c8 -r f9bf33be53ff src/ui_utildlg.c --- a/src/ui_utildlg.c Thu Apr 24 11:40:26 2008 +0000 +++ b/src/ui_utildlg.c Thu Apr 24 12:23:02 2008 +0000 @@ -146,7 +146,7 @@ button = pref_button_new(NULL, stock_id, text, FALSE, G_CALLBACK(generic_dialog_click_cb), gd); - GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT); + GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); g_object_set_data(G_OBJECT(button), "dialog_function", func_cb); gtk_container_add(GTK_CONTAINER(gd->hbox), button); diff -r e21da52016c8 -r f9bf33be53ff src/view_dir.c --- a/src/view_dir.c Thu Apr 24 11:40:26 2008 +0000 +++ b/src/view_dir.c Thu Apr 24 12:23:02 2008 +0000 @@ -670,8 +670,8 @@ } if (uritext) { - gtk_selection_data_set (selection_data, selection_data->target, - 8, (guchar *)uritext, length); + gtk_selection_data_set(selection_data, selection_data->target, + 8, (guchar *)uritext, length); g_free(uritext); } } diff -r e21da52016c8 -r f9bf33be53ff src/view_dir_tree.c --- a/src/view_dir_tree.c Thu Apr 24 11:40:26 2008 +0000 +++ b/src/view_dir_tree.c Thu Apr 24 12:23:02 2008 +0000 @@ -57,8 +57,8 @@ if (!widget || !widget->window) return; - if (cursor_type > -1) cursor = gdk_cursor_new (cursor_type); - gdk_window_set_cursor (widget->window, cursor); + if (cursor_type > -1) cursor = gdk_cursor_new(cursor_type); + gdk_window_set_cursor(widget->window, cursor); if (cursor) gdk_cursor_unref(cursor); gdk_flush(); } diff -r e21da52016c8 -r f9bf33be53ff src/view_file_list.c --- a/src/view_file_list.c Thu Apr 24 11:40:26 2008 +0000 +++ b/src/view_file_list.c Thu Apr 24 12:23:02 2008 +0000 @@ -1874,8 +1874,8 @@ } gtk_tree_view_column_set_cell_data_func(column, renderer, vflist_listview_color_cb, vfl, NULL); - g_object_set_data (G_OBJECT (column), "column_store_idx", GUINT_TO_POINTER(n)); - g_object_set_data (G_OBJECT (renderer), "column_store_idx", GUINT_TO_POINTER(n)); + g_object_set_data(G_OBJECT(column), "column_store_idx", GUINT_TO_POINTER(n)); + g_object_set_data(G_OBJECT(renderer), "column_store_idx", GUINT_TO_POINTER(n)); gtk_tree_view_append_column(GTK_TREE_VIEW(vfl->listview), column); } @@ -1916,8 +1916,8 @@ column = gtk_tree_view_column_new_with_attributes(title, renderer, "active", n, NULL); gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_FIXED); - g_object_set_data (G_OBJECT (column), "column_store_idx", GUINT_TO_POINTER(n)); - g_object_set_data (G_OBJECT (renderer), "column_store_idx", GUINT_TO_POINTER(n)); + g_object_set_data(G_OBJECT(column), "column_store_idx", GUINT_TO_POINTER(n)); + g_object_set_data(G_OBJECT(renderer), "column_store_idx", GUINT_TO_POINTER(n)); index = gtk_tree_view_append_column(GTK_TREE_VIEW(vfl->listview), column); gtk_tree_view_column_set_fixed_width(column, 16); @@ -2044,7 +2044,7 @@ g_signal_connect(G_OBJECT(vfl->listview), "key_press_event", G_CALLBACK(vflist_press_key_cb), vfl); - gtk_container_add (GTK_CONTAINER(vfl->widget), vfl->listview); + gtk_container_add(GTK_CONTAINER(vfl->widget), vfl->listview); gtk_widget_show(vfl->listview); vflist_dnd_init(vfl);