From 66368a189dea7ab666cb4089ee30b6ba04ba5132 Mon Sep 17 00:00:00 2001 From: rbuj Date: Sun, 16 Jun 2019 13:21:30 +0200 Subject: Remove trailing whitespaces find . -regextype posix-extended -regex '.*\.(c|h|ac)' -exec sed --in-place 's/[[:space:]]\+$//' {} \+ --- font-viewer/font-model.c | 6 +++--- font-viewer/font-thumbnailer.c | 2 +- font-viewer/font-view.c | 18 +++++++++--------- font-viewer/gd-main-toolbar.c | 8 ++++---- font-viewer/gd-main-toolbar.h | 6 +++--- font-viewer/sushi-font-widget.c | 6 +++--- font-viewer/totem-resources.c | 2 +- font-viewer/totem-resources.h | 2 +- 8 files changed, 25 insertions(+), 25 deletions(-) (limited to 'font-viewer') diff --git a/font-viewer/font-model.c b/font-viewer/font-model.c index f0d6fdf7..8cbc7ae0 100644 --- a/font-viewer/font-model.c +++ b/font-viewer/font-model.c @@ -1,5 +1,5 @@ /* -*- mode: C; c-basic-offset: 4 -*- - * mate-font-view: + * mate-font-view: * * Copyright (C) 2012 Cosimo Cecchi * @@ -7,7 +7,7 @@ * * fontilus - a collection of font utilities for MATE * Copyright (C) 2002-2003 James Henstridge - * + * * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -627,7 +627,7 @@ font_view_model_class_init (FontViewModelClass *klass) GObjectClass *oclass = G_OBJECT_CLASS (klass); oclass->finalize = font_view_model_finalize; - signals[CONFIG_CHANGED] = + signals[CONFIG_CHANGED] = g_signal_new ("config-changed", FONT_VIEW_TYPE_MODEL, G_SIGNAL_RUN_FIRST, diff --git a/font-viewer/font-thumbnailer.c b/font-viewer/font-thumbnailer.c index e2a2d3be..9e9d344c 100644 --- a/font-viewer/font-thumbnailer.c +++ b/font-viewer/font-thumbnailer.c @@ -289,7 +289,7 @@ main (int argc, scale = MIN (scale_x, scale_y); cairo_scale (cr, scale, scale); - cairo_translate (cr, + cairo_translate (cr, PADDING_HORIZONTAL - text_extents.x_bearing + (thumb_size - scale * text_extents.width) / 2.0, PADDING_VERTICAL - text_extents.y_bearing + (thumb_size - scale * text_extents.height) / 2.0); diff --git a/font-viewer/font-view.c b/font-viewer/font-view.c index 041d9a29..f24a7d8e 100644 --- a/font-viewer/font-view.c +++ b/font-viewer/font-view.c @@ -185,7 +185,7 @@ add_row (GtkWidget *grid, } gtk_label_set_max_width_chars (GTK_LABEL (label), 64); - gtk_grid_attach_next_to (GTK_GRID (grid), label, + gtk_grid_attach_next_to (GTK_GRID (grid), label, name_w, GTK_POS_RIGHT, 1, 1); } @@ -559,14 +559,14 @@ font_view_application_do_open (FontViewApplication *self, font_view_ensure_model (self); self->info_button = gd_main_toolbar_add_button (GD_MAIN_TOOLBAR (self->toolbar), - NULL, _("Info"), + NULL, _("Info"), FALSE); g_signal_connect (self->info_button, "clicked", G_CALLBACK (info_button_clicked_cb), self); /* add install button */ self->install_button = gd_main_toolbar_add_button (GD_MAIN_TOOLBAR (self->toolbar), - NULL, _("Install"), + NULL, _("Install"), FALSE); g_signal_connect (self->install_button, "clicked", G_CALLBACK (install_button_clicked_cb), self); @@ -701,7 +701,7 @@ font_view_application_do_overview (FontViewApplication *self) gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (icon_view), cell, FALSE); gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (icon_view), cell, "pixbuf", COLUMN_ICON); - + cell = gtk_cell_renderer_text_new (); g_object_set (cell, "alignment", PANGO_ALIGN_CENTER, @@ -787,7 +787,7 @@ action_about (GSimpleAction *action, "license-type", GTK_LICENSE_GPL_2_0, "wrap-license", TRUE, NULL); - + } static GActionEntry action_entries[] = { @@ -812,7 +812,7 @@ font_view_application_startup (GApplication *application) G_APPLICATION_CLASS (font_view_application_parent_class)->startup (application); - g_action_map_add_action_entries (G_ACTION_MAP (self), action_entries, + g_action_map_add_action_entries (G_ACTION_MAP (self), action_entries, G_N_ELEMENTS (action_entries), self); builder = gtk_builder_new (); gtk_builder_add_from_string (builder, app_menu, -1, NULL); @@ -840,7 +840,7 @@ font_view_application_startup (GApplication *application) self->toolbar = gd_main_toolbar_new (); gtk_style_context_add_class (gtk_widget_get_style_context (self->toolbar), "menubar"); self->search_button = gd_main_toolbar_add_toggle (GD_MAIN_TOOLBAR (self->toolbar), - NULL, _("Search"), + NULL, _("Search"), FALSE); gtk_container_add (GTK_CONTAINER (self->main_grid), self->toolbar); @@ -864,11 +864,11 @@ font_view_application_startup (GApplication *application) self->search_bar = gtk_search_bar_new(); gtk_container_add (GTK_CONTAINER (self->main_grid), self->search_bar); - + self->entry = gtk_search_entry_new(); gtk_entry_set_width_chars (GTK_ENTRY (self->entry), 40); gtk_container_add (GTK_CONTAINER (self->search_bar), self->entry); - + g_object_bind_property (self->search_bar, "search-mode-enabled", self->search_button, "active", G_BINDING_BIDIRECTIONAL); diff --git a/font-viewer/gd-main-toolbar.c b/font-viewer/gd-main-toolbar.c index 0a67ca4e..6d9e9c42 100644 --- a/font-viewer/gd-main-toolbar.c +++ b/font-viewer/gd-main-toolbar.c @@ -2,16 +2,16 @@ * Copyright (c) 2011, 2012 Red Hat, Inc. * * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by + * it under the terms of the GNU Lesser General Public License as published by * the Free Software Foundation; either version 2 of the License, or (at your * option) any later version. * * This program is distributed in the hope that it will be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY - * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public * License for more details. * - * You should have received a copy of the GNU Lesser General Public License + * You should have received a copy of the GNU Lesser General Public License * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA * @@ -365,7 +365,7 @@ gd_main_toolbar_clear (GdMainToolbar *self) (GtkCallback) gtk_widget_destroy, self); gtk_container_foreach (GTK_CONTAINER (self->priv->modes_box), (GtkCallback) gtk_widget_destroy, self); - gtk_container_foreach (GTK_CONTAINER (self->priv->right_grid), + gtk_container_foreach (GTK_CONTAINER (self->priv->right_grid), (GtkCallback) gtk_widget_destroy, self); } diff --git a/font-viewer/gd-main-toolbar.h b/font-viewer/gd-main-toolbar.h index 4fa7b532..9be2ddba 100644 --- a/font-viewer/gd-main-toolbar.h +++ b/font-viewer/gd-main-toolbar.h @@ -2,16 +2,16 @@ * Copyright (c) 2011, 2012 Red Hat, Inc. * * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by + * it under the terms of the GNU Lesser General Public License as published by * the Free Software Foundation; either version 2 of the License, or (at your * option) any later version. * * This program is distributed in the hope that it will be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY - * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public * License for more details. * - * You should have received a copy of the GNU Lesser General Public License + * You should have received a copy of the GNU Lesser General Public License * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA * diff --git a/font-viewer/sushi-font-widget.c b/font-viewer/sushi-font-widget.c index ef778579..bad2ffee 100644 --- a/font-viewer/sushi-font-widget.c +++ b/font-viewer/sushi-font-widget.c @@ -154,7 +154,7 @@ build_charlist_for_face (FT_Face face, GString *string; gulong c; guint glyph; - gint total_chars = 0; + gint total_chars = 0; string = g_string_new (NULL); @@ -254,7 +254,7 @@ build_strings_for_face (SushiFontWidget *self) self->priv->font_name = NULL; if (self->priv->face->family_name != NULL) { - gchar *font_name = + gchar *font_name = g_strconcat (self->priv->face->family_name, " ", self->priv->face->style_name, NULL); @@ -387,7 +387,7 @@ sushi_font_widget_size_request (GtkWidget *drawing_area, if (self->priv->lowercase_text != NULL) { cairo_text_extents (cr, self->priv->lowercase_text, &extents); - pixmap_height += font_extents.ascent + font_extents.descent + + pixmap_height += font_extents.ascent + font_extents.descent + extents.y_advance + LINE_SPACING; pixmap_width = MAX (pixmap_width, extents.width + padding.left + padding.right); } diff --git a/font-viewer/totem-resources.c b/font-viewer/totem-resources.c index 96e90524..2f572598 100644 --- a/font-viewer/totem-resources.c +++ b/font-viewer/totem-resources.c @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2007 Bastien Nocera * * This program is free software; you can redistribute it and/or modify diff --git a/font-viewer/totem-resources.h b/font-viewer/totem-resources.h index 421a03ca..40833ba1 100644 --- a/font-viewer/totem-resources.h +++ b/font-viewer/totem-resources.h @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2007 Bastien Nocera * * This program is free software; you can redistribute it and/or modify -- cgit v1.2.1