# HG changeset patch # User zas_ # Date 1209041229 0 # Node ID 985fdfebd89e71aabfa4cea331d6dea08cfda2e2 # Parent f9bf33be53ff96e26c9125b9064a78414fe7c96c Remove whitespace between function name and first parenthesis for the sake of consistency. (pass 2) diff -r f9bf33be53ff -r 985fdfebd89e src/cellrenderericon.c --- a/src/cellrenderericon.c Thu Apr 24 12:23:02 2008 +0000 +++ b/src/cellrenderericon.c Thu Apr 24 12:47:09 2008 +0000 @@ -108,10 +108,10 @@ static void gqv_cell_renderer_icon_class_init(GQvCellRendererIconClass *class) { - GObjectClass *object_class = G_OBJECT_CLASS (class); - GtkCellRendererClass *cell_class = GTK_CELL_RENDERER_CLASS (class); + GObjectClass *object_class = G_OBJECT_CLASS(class); + GtkCellRendererClass *cell_class = GTK_CELL_RENDERER_CLASS(class); - parent_class = g_type_class_peek_parent (class); + parent_class = g_type_class_peek_parent(class); object_class->finalize = gqv_cell_renderer_icon_finalize; @@ -209,11 +209,11 @@ { GQvCellRendererIcon *cellicon = GQV_CELL_RENDERER_ICON(object); - if (cellicon->pixbuf) g_object_unref (cellicon->pixbuf); + 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 @@ -336,7 +336,7 @@ const GValue *value, GParamSpec *pspec) { - GQvCellRendererIcon *cellicon = GQV_CELL_RENDERER_ICON (object); + GQvCellRendererIcon *cellicon = GQV_CELL_RENDERER_ICON(object); switch (param_id) { @@ -344,9 +344,9 @@ { GdkPixbuf *pixbuf; - pixbuf = (GdkPixbuf*) g_value_get_object (value); - if (pixbuf) g_object_ref (pixbuf); - if (cellicon->pixbuf) g_object_unref (cellicon->pixbuf); + pixbuf = (GdkPixbuf*) g_value_get_object(value); + if (pixbuf) g_object_ref(pixbuf); + if (cellicon->pixbuf) g_object_unref(cellicon->pixbuf); cellicon->pixbuf = pixbuf; } break; @@ -505,12 +505,12 @@ if (x_offset) { *x_offset = (cell->xalign * (cell_area->width - calc_width - 2 * cell->xpad)); - *x_offset = MAX (*x_offset, 0) + cell->xpad; + *x_offset = MAX(*x_offset, 0) + cell->xpad; } if (y_offset) { *y_offset = (cell->yalign * (cell_area->height - calc_height - 2 * cell->ypad)); - *y_offset = MAX (*y_offset, 0) + cell->ypad; + *y_offset = MAX(*y_offset, 0) + cell->ypad; } } diff -r f9bf33be53ff -r 985fdfebd89e src/collect-table.c --- a/src/collect-table.c Thu Apr 24 12:23:02 2008 +0000 +++ b/src/collect-table.c Thu Apr 24 12:47:09 2008 +0000 @@ -2385,7 +2385,7 @@ 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_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(ct->scrolled), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); store = gtk_list_store_new(1, G_TYPE_POINTER); diff -r f9bf33be53ff -r 985fdfebd89e src/collect.c --- a/src/collect.c Thu Apr 24 12:23:02 2008 +0000 +++ b/src/collect.c Thu Apr 24 12:47:09 2008 +0000 @@ -1212,12 +1212,12 @@ 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); - g_signal_connect(G_OBJECT(cw->window),"key_press_event", + g_signal_connect(G_OBJECT(cw->window), "key_press_event", G_CALLBACK(collection_window_keypress), cw); vbox = gtk_vbox_new(FALSE, 0); diff -r f9bf33be53ff -r 985fdfebd89e src/dupe.c --- a/src/dupe.c Thu Apr 24 12:23:02 2008 +0000 +++ b/src/dupe.c Thu Apr 24 12:47:09 2008 +0000 @@ -223,7 +223,7 @@ } else { - cursor = gdk_cursor_new (icon); + cursor = gdk_cursor_new(icon); } gdk_window_set_cursor(widget->window, cursor); @@ -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 f9bf33be53ff -r 985fdfebd89e src/filelist.c --- a/src/filelist.c Thu Apr 24 12:23:02 2008 +0000 +++ b/src/filelist.c Thu Apr 24 12:47:09 2008 +0000 @@ -771,7 +771,7 @@ DEBUG_2("file_data_new: '%s' %d", path_utf8, check_sidecars); if (!file_data_pool) - file_data_pool = g_hash_table_new (g_str_hash, g_str_equal); + file_data_pool = g_hash_table_new(g_str_hash, g_str_equal); fd = g_hash_table_lookup(file_data_pool, path_utf8); if (fd) diff -r f9bf33be53ff -r 985fdfebd89e src/image.c --- a/src/image.c Thu Apr 24 12:23:02 2008 +0000 +++ b/src/image.c Thu Apr 24 12:47:09 2008 +0000 @@ -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); } } } diff -r f9bf33be53ff -r 985fdfebd89e src/layout_config.c --- a/src/layout_config.c Thu Apr 24 12:23:02 2008 +0000 +++ b/src/layout_config.c Thu Apr 24 12:47:09 2008 +0000 @@ -53,7 +53,7 @@ { LAYOUT_TOP, LAYOUT_LEFT | LAYOUT_BOTTOM, LAYOUT_RIGHT | LAYOUT_BOTTOM } }; -static gint layout_config_style_count = sizeof(layout_config_styles) / sizeof (LayoutStyle); +static gint layout_config_style_count = sizeof(layout_config_styles) / sizeof(LayoutStyle); static gchar *layout_titles[] = { N_("Tools"), N_("Files"), N_("Image") }; diff -r f9bf33be53ff -r 985fdfebd89e src/layout_util.c --- a/src/layout_util.c Thu Apr 24 12:23:02 2008 +0000 +++ b/src/layout_util.c Thu Apr 24 12:47:09 2008 +0000 @@ -1400,7 +1400,7 @@ if (lw->ui_manager) return; - lw->action_group = gtk_action_group_new ("MenuActions"); + lw->action_group = gtk_action_group_new("MenuActions"); gtk_action_group_set_translate_func(lw->action_group, menu_translate, NULL, NULL); gtk_action_group_add_actions(lw->action_group, diff -r f9bf33be53ff -r 985fdfebd89e src/pixbuf-renderer.c --- a/src/pixbuf-renderer.c Thu Apr 24 12:23:02 2008 +0000 +++ b/src/pixbuf-renderer.c Thu Apr 24 12:47:09 2008 +0000 @@ -715,7 +715,7 @@ } else { - cursor = gdk_cursor_new (icon); + cursor = gdk_cursor_new(icon); } gdk_window_set_cursor(widget->window, cursor); @@ -1665,8 +1665,8 @@ stx = floor((double)st->x * scale_x); sty = floor((double)st->y * scale_y); - stw = ceil ((double)(st->x + pr->source_tile_width) * scale_x) - stx; - sth = ceil ((double)(st->y + pr->source_tile_height) * scale_y) - sty; + stw = ceil((double)(st->x + pr->source_tile_width) * scale_x) - stx; + sth = ceil((double)(st->y + pr->source_tile_height) * scale_y) - sty; if (pr_clip_region(stx, sty, stw, sth, it->x + x, it->y + y, w, h, diff -r f9bf33be53ff -r 985fdfebd89e src/pixbuf_util.c --- a/src/pixbuf_util.c Thu Apr 24 12:23:02 2008 +0000 +++ b/src/pixbuf_util.c Thu Apr 24 12:47:09 2008 +0000 @@ -25,7 +25,7 @@ *----------------------------------------------------------------------------- */ -gboolean pixbuf_to_file_as_png (GdkPixbuf *pixbuf, const char *filename) +gboolean pixbuf_to_file_as_png(GdkPixbuf *pixbuf, const char *filename) { GError *error = NULL; gint ret; diff -r f9bf33be53ff -r 985fdfebd89e src/preferences.c --- a/src/preferences.c Thu Apr 24 12:23:02 2008 +0000 +++ b/src/preferences.c Thu Apr 24 12:47:09 2008 +0000 @@ -1043,7 +1043,7 @@ GtkTreeViewColumn *column; vbox = gtk_vbox_new(FALSE, 0); - gtk_container_set_border_width(GTK_CONTAINER (vbox), PREF_PAD_BORDER); + gtk_container_set_border_width(GTK_CONTAINER(vbox), PREF_PAD_BORDER); gtk_widget_show(vbox); label = gtk_label_new(_("Filtering")); gtk_notebook_append_page(GTK_NOTEBOOK(notebook), vbox, label); @@ -1077,7 +1077,7 @@ 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(group), scrolled, TRUE, TRUE, 0); gtk_widget_show(scrolled); @@ -1194,7 +1194,7 @@ gtk_misc_set_alignment(GTK_MISC(entry), 0.0, 0.5); } - gtk_table_attach(GTK_TABLE (table), entry, 1, 2, i+1, i+2, + gtk_table_attach(GTK_TABLE(table), entry, 1, 2, i+1, i+2, GTK_FILL | GTK_SHRINK, 0, 0, 0); gtk_widget_show(entry); editor_name_entry[i] = entry; @@ -1205,7 +1205,7 @@ tab_completion_add_to_entry(entry, NULL, NULL); if (options->editor_command[i]) gtk_entry_set_text(GTK_ENTRY(entry), options->editor_command[i]); - gtk_table_attach(GTK_TABLE (table), entry, 2, 3, i+1, i+2, + gtk_table_attach(GTK_TABLE(table), entry, 2, 3, i+1, i+2, GTK_FILL | GTK_EXPAND, 0, 0, 0); gtk_widget_show(entry); editor_command_entry[i] = entry; @@ -1531,7 +1531,7 @@ configwindow = window_new(GTK_WINDOW_TOPLEVEL, "preferences", PIXBUF_INLINE_ICON_CONFIG, NULL, _("Preferences")); gtk_window_set_type_hint(GTK_WINDOW(configwindow), GDK_WINDOW_TYPE_HINT_DIALOG); - g_signal_connect(G_OBJECT (configwindow), "delete_event", + g_signal_connect(G_OBJECT(configwindow), "delete_event", G_CALLBACK(config_window_delete), NULL); gtk_window_set_default_size(GTK_WINDOW(configwindow), CONFIG_WINDOW_DEF_WIDTH, CONFIG_WINDOW_DEF_HEIGHT); gtk_window_set_resizable(GTK_WINDOW(configwindow), TRUE); diff -r f9bf33be53ff -r 985fdfebd89e src/slideshow.c --- a/src/slideshow.c Thu Apr 24 12:23:02 2008 +0000 +++ b/src/slideshow.c Thu Apr 24 12:47:09 2008 +0000 @@ -109,7 +109,7 @@ while(ss->list && i < start_index) { - ss->list_done = g_list_prepend (ss->list_done, ss->list->data); + ss->list_done = g_list_prepend(ss->list_done, ss->list->data); ss->list = g_list_remove(ss->list, ss->list->data); i++; } @@ -166,7 +166,7 @@ if (!ss->list) return TRUE; row = GPOINTER_TO_INT(ss->list->data); - ss->list_done = g_list_prepend (ss->list_done, ss->list->data); + ss->list_done = g_list_prepend(ss->list_done, ss->list->data); ss->list = g_list_remove(ss->list, ss->list->data); } else diff -r f9bf33be53ff -r 985fdfebd89e src/ui_help.c --- a/src/ui_help.c Thu Apr 24 12:23:02 2008 +0000 +++ b/src/ui_help.c Thu Apr 24 12:47:09 2008 +0000 @@ -245,7 +245,7 @@ gtk_widget_show(hbox); button = gtk_button_new_from_stock(GTK_STOCK_CLOSE); - g_signal_connect(G_OBJECT (button), "clicked", + g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(help_window_close), window); gtk_container_add(GTK_CONTAINER(hbox), button); GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); diff -r f9bf33be53ff -r 985fdfebd89e src/ui_menu.c --- a/src/ui_menu.c Thu Apr 24 12:23:02 2008 +0000 +++ b/src/ui_menu.c Thu Apr 24 12:47:09 2008 +0000 @@ -55,7 +55,7 @@ GtkWidget *image; item = gtk_image_menu_item_new_with_mnemonic(label); - image = gtk_image_new_from_stock (stock_id, GTK_ICON_SIZE_MENU); + image = gtk_image_new_from_stock(stock_id, GTK_ICON_SIZE_MENU); gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item), image); gtk_widget_show(image); menu_item_finish(menu, item, func, data); diff -r f9bf33be53ff -r 985fdfebd89e src/ui_misc.c --- a/src/ui_misc.c Thu Apr 24 12:23:02 2008 +0000 +++ b/src/ui_misc.c Thu Apr 24 12:47:09 2008 +0000 @@ -259,7 +259,7 @@ GtkWidget *align; GtkWidget *hbox; - hbox = gtk_hbox_new (FALSE, PREF_PAD_BUTTON_ICON_GAP); + hbox = gtk_hbox_new(FALSE, PREF_PAD_BUTTON_ICON_GAP); align = gtk_alignment_new(0.5, 0.5, 0.0, 0.0); gtk_container_add(GTK_CONTAINER(button), align); diff -r f9bf33be53ff -r 985fdfebd89e src/ui_pathsel.c --- a/src/ui_pathsel.c Thu Apr 24 12:23:02 2008 +0000 +++ b/src/ui_pathsel.c Thu Apr 24 12:47:09 2008 +0000 @@ -1084,7 +1084,7 @@ 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_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,7 +1156,7 @@ 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_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled), GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS); if (paned) { diff -r f9bf33be53ff -r 985fdfebd89e src/ui_spinner.c --- a/src/ui_spinner.c Thu Apr 24 12:23:02 2008 +0000 +++ b/src/ui_spinner.c Thu Apr 24 12:47:09 2008 +0000 @@ -149,7 +149,7 @@ gint n; gint w, h; - pb = gdk_pixbuf_new_from_inline (-1, icon_spinner, FALSE, NULL); + pb = gdk_pixbuf_new_from_inline(-1, icon_spinner, FALSE, NULL); w = gdk_pixbuf_get_width(pb); h = gdk_pixbuf_get_height(pb) / SPINNER_FRAMES; for (n = 0; n < SPINNER_FRAMES; n++) diff -r f9bf33be53ff -r 985fdfebd89e src/ui_tree_edit.c --- a/src/ui_tree_edit.c Thu Apr 24 12:23:02 2008 +0000 +++ b/src/ui_tree_edit.c Thu Apr 24 12:47:09 2008 +0000 @@ -640,7 +640,7 @@ if (!list || link == list) return g_list_prepend(list, data); if (!link) return g_list_append(list, data); - new_list = g_list_alloc (); + new_list = g_list_alloc(); new_list->data = data; if (link->prev) diff -r f9bf33be53ff -r 985fdfebd89e src/utilops.c --- a/src/utilops.c Thu Apr 24 12:23:02 2008 +0000 +++ b/src/utilops.c Thu Apr 24 12:47:09 2008 +0000 @@ -2602,7 +2602,7 @@ 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_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled), GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS); gtk_paned_pack1(GTK_PANED(pane), scrolled, TRUE, TRUE); gtk_widget_show(scrolled); @@ -3110,7 +3110,7 @@ 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_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled), GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS); gtk_box_pack_start(GTK_BOX(box), scrolled, TRUE, TRUE, 0); gtk_widget_show(scrolled); diff -r f9bf33be53ff -r 985fdfebd89e src/view_file_list.c --- a/src/view_file_list.c Thu Apr 24 12:23:02 2008 +0000 +++ b/src/view_file_list.c Thu Apr 24 12:47:09 2008 +0000 @@ -725,7 +725,7 @@ &tpath, &column, NULL, NULL)) { GtkTreeModel *store; - col_idx = GPOINTER_TO_INT(g_object_get_data (G_OBJECT(column), "column_store_idx")); + col_idx = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(column), "column_store_idx")); if (bevent->button == MOUSE_BUTTON_LEFT && col_idx >= FILE_COLUMN_MARKS && col_idx <= FILE_COLUMN_MARKS_LAST) @@ -1891,7 +1891,7 @@ if (!path || !gtk_tree_model_get_iter(GTK_TREE_MODEL(store), &iter, path)) return; - col_idx = GPOINTER_TO_INT(g_object_get_data (G_OBJECT(cell), "column_store_idx")); + col_idx = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(cell), "column_store_idx")); g_assert(col_idx >= FILE_COLUMN_MARKS && col_idx <= FILE_COLUMN_MARKS_LAST); @@ -2097,7 +2097,7 @@ while (work) { GtkTreeViewColumn *column = work->data; - gint col_idx = GPOINTER_TO_INT(g_object_get_data (G_OBJECT(column), "column_store_idx")); + gint col_idx = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(column), "column_store_idx")); work = work->next; if (col_idx <= FILE_COLUMN_MARKS_LAST && col_idx >= FILE_COLUMN_MARKS)