From c85109fc322137596bf34cffc5445d568223c60d Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 12 Jul 2012 08:02:18 -0400 Subject: Coding style and whitespace cleanup. --- addressbook/gui/widgets/e-addressbook-table-adapter.c | 2 +- addressbook/gui/widgets/e-minicard-label.c | 8 ++++---- addressbook/gui/widgets/e-minicard-view.c | 2 +- addressbook/gui/widgets/e-minicard.c | 10 +++++----- addressbook/gui/widgets/eab-contact-display.c | 2 +- addressbook/gui/widgets/eab-contact-formatter.c | 19 +++++++++---------- addressbook/gui/widgets/eab-contact-formatter.h | 4 ++-- 7 files changed, 23 insertions(+), 24 deletions(-) (limited to 'addressbook/gui/widgets') diff --git a/addressbook/gui/widgets/e-addressbook-table-adapter.c b/addressbook/gui/widgets/e-addressbook-table-adapter.c index c6775d4e5a..51886cf186 100644 --- a/addressbook/gui/widgets/e-addressbook-table-adapter.c +++ b/addressbook/gui/widgets/e-addressbook-table-adapter.c @@ -268,7 +268,7 @@ static gpointer addressbook_initialize_value (ETableModel *etc, gint col) { - return g_strdup(""); + return g_strdup (""); } static gboolean diff --git a/addressbook/gui/widgets/e-minicard-label.c b/addressbook/gui/widgets/e-minicard-label.c index 7eefdf8fc0..584ed9fe98 100644 --- a/addressbook/gui/widgets/e-minicard-label.c +++ b/addressbook/gui/widgets/e-minicard-label.c @@ -193,13 +193,13 @@ e_minicard_label_set_property (GObject *object, e_canvas_item_grab_focus (e_minicard_label->field, FALSE); break; case PROP_FIELD: - gnome_canvas_item_set( e_minicard_label->field, "text", g_value_get_string (value), NULL ); + gnome_canvas_item_set ( e_minicard_label->field, "text", g_value_get_string (value), NULL ); break; case PROP_FIELDNAME: - gnome_canvas_item_set( e_minicard_label->fieldname, "text", g_value_get_string (value), NULL ); + gnome_canvas_item_set ( e_minicard_label->fieldname, "text", g_value_get_string (value), NULL ); break; case PROP_TEXT_MODEL: - gnome_canvas_item_set( e_minicard_label->field, "model", g_value_get_object (value), NULL); + gnome_canvas_item_set ( e_minicard_label->field, "model", g_value_get_object (value), NULL); break; case PROP_MAX_FIELD_NAME_WIDTH: e_minicard_label->max_field_name_length = g_value_get_double (value); @@ -345,7 +345,7 @@ e_minicard_label_event (GnomeCanvasItem *item, case GDK_ENTER_NOTIFY: case GDK_LEAVE_NOTIFY: { gboolean return_val; - g_signal_emit_by_name(e_minicard_label->field, "event", event, &return_val); + g_signal_emit_by_name (e_minicard_label->field, "event", event, &return_val); return return_val; } default: diff --git a/addressbook/gui/widgets/e-minicard-view.c b/addressbook/gui/widgets/e-minicard-view.c index 690fe7796f..01899e8a57 100644 --- a/addressbook/gui/widgets/e-minicard-view.c +++ b/addressbook/gui/widgets/e-minicard-view.c @@ -397,7 +397,7 @@ e_minicard_view_event (GnomeCanvasItem *item, if (((GdkEventButton *) event)->button == 1) { gboolean editable; - g_object_get(view->adapter, "editable", &editable, NULL); + g_object_get (view->adapter, "editable", &editable, NULL); if (editable) e_minicard_view_create_contact (view); diff --git a/addressbook/gui/widgets/e-minicard.c b/addressbook/gui/widgets/e-minicard.c index 652851877b..d0af5117b0 100644 --- a/addressbook/gui/widgets/e-minicard.c +++ b/addressbook/gui/widgets/e-minicard.c @@ -330,7 +330,7 @@ e_minicard_set_property (GObject *object, } break; case PROP_HAS_CURSOR: - d(g_print("%s: PROP_HAS_CURSOR\n", G_STRFUNC)); + d (g_print ("%s: PROP_HAS_CURSOR\n", G_STRFUNC)); if (e_minicard->has_cursor != g_value_get_boolean (value)) set_has_cursor (e_minicard, g_value_get_boolean (value)); break; @@ -490,7 +490,7 @@ e_minicard_realize (GnomeCanvasItem *item) e_minicard->header_text = gnome_canvas_item_new ( group, e_text_get_type (), - "width", (double) MAX( e_minicard->width - 12, 0 ), + "width", (double) MAX ( e_minicard->width - 12, 0 ), "clip", TRUE, "use_ellipsis", TRUE, "fill_color_gdk", &style->fg[GTK_STATE_NORMAL], @@ -531,7 +531,7 @@ e_minicard_event (GnomeCanvasItem *item, case GDK_FOCUS_CHANGE: { GdkEventFocus *focus_event = (GdkEventFocus *) event; - d(g_print("%s: GDK_FOCUS_CHANGE: %s\n", G_STRFUNC, focus_event->in?"in":"out")); + d (g_print ("%s: GDK_FOCUS_CHANGE: %s\n", G_STRFUNC, focus_event->in?"in":"out")); if (focus_event->in) { /* Chris: When EMinicard gets the cursor, if it doesn't have the focus, it should take it. */ e_minicard->has_focus = TRUE; @@ -721,7 +721,7 @@ add_field (EMinicard *e_minicard, group = GNOME_CANVAS_GROUP ( e_minicard ); - name = g_strdup_printf("%s:", e_contact_pretty_name (field)); + name = g_strdup_printf ("%s:", e_contact_pretty_name (field)); string = e_contact_get (e_minicard->contact, field); new_item = e_minicard_label_new (group); @@ -871,7 +871,7 @@ get_left_width (EMinicard *e_minicard, if (field == E_CONTACT_FAMILY_NAME || field == E_CONTACT_GIVEN_NAME) continue; - name = g_strdup_printf("%s:", e_contact_pretty_name (field)); + name = g_strdup_printf ("%s:", e_contact_pretty_name (field)); pango_layout_set_text (layout, name, -1); pango_layout_get_pixel_size (layout, &this_width, NULL); if (width < this_width) diff --git a/addressbook/gui/widgets/eab-contact-display.c b/addressbook/gui/widgets/eab-contact-display.c index 6501bccc24..d6c4238e2f 100644 --- a/addressbook/gui/widgets/eab-contact-display.c +++ b/addressbook/gui/widgets/eab-contact-display.c @@ -517,7 +517,7 @@ eab_contact_display_class_init (EABContactDisplayClass *class) EAB_CONTACT_DISPLAY_RENDER_NORMAL, G_PARAM_READWRITE)); - g_object_class_install_property ( + g_object_class_install_property ( object_class, PROP_SHOW_MAPS, g_param_spec_boolean ( diff --git a/addressbook/gui/widgets/eab-contact-formatter.c b/addressbook/gui/widgets/eab-contact-formatter.c index 5b3021cc6c..d04cc07f04 100644 --- a/addressbook/gui/widgets/eab-contact-formatter.c +++ b/addressbook/gui/widgets/eab-contact-formatter.c @@ -1171,18 +1171,18 @@ eab_contact_formatter_class_init (EABContactFormatterClass *class) PROP_STYLE, g_param_spec_object ( "style", - NULL, - NULL, - GTK_TYPE_STYLE, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); + NULL, + NULL, + GTK_TYPE_STYLE, + G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); g_object_class_install_property ( object_class, PROP_STATE, g_param_spec_uint ( "state", - NULL, - NULL, + NULL, + NULL, 0, G_MAXUINT, 0, @@ -1201,7 +1201,7 @@ eab_contact_formatter_init (EABContactFormatter *formatter) EABContactFormatter * eab_contact_formatter_new (EABContactDisplayMode mode, - gboolean render_maps) + gboolean render_maps) { return g_object_new (EAB_TYPE_CONTACT_FORMATTER, "display-mode", mode, @@ -1209,7 +1209,6 @@ eab_contact_formatter_new (EABContactDisplayMode mode, NULL); } - void eab_contact_formatter_set_display_mode (EABContactFormatter *formatter, EABContactDisplayMode mode) @@ -1257,7 +1256,7 @@ eab_contact_formatter_get_render_maps (EABContactFormatter *formatter) void eab_contact_formatter_set_style (EABContactFormatter *formatter, - GtkStyle *style) + GtkStyle *style) { g_return_if_fail (EAB_IS_CONTACT_FORMATTER (formatter)); @@ -1284,7 +1283,7 @@ eab_contact_formatter_get_style (EABContactFormatter *formatter) void eab_contact_formatter_set_state (EABContactFormatter *formatter, - GtkStateType state) + GtkStateType state) { g_return_if_fail (EAB_IS_CONTACT_FORMATTER (formatter)); diff --git a/addressbook/gui/widgets/eab-contact-formatter.h b/addressbook/gui/widgets/eab-contact-formatter.h index 4773a7bb24..31104b1f9a 100644 --- a/addressbook/gui/widgets/eab-contact-formatter.h +++ b/addressbook/gui/widgets/eab-contact-formatter.h @@ -58,14 +58,14 @@ struct _EABContactFormatterClass { GType eab_contact_formatter_get_type (); -EABContactFormatter* +EABContactFormatter * eab_contact_formatter_new (EABContactDisplayMode mode, gboolean render_maps); void eab_contact_formatter_set_style (EABContactFormatter *formatter, GtkStyle *context); -GtkStyle* +GtkStyle * eab_contact_formatter_get_style (EABContactFormatter *formatter); -- cgit v1.2.3