From 14f8eee012382f04090ea9277e9567d5f32e8bf0 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 28 May 2009 13:06:29 -0400 Subject: Whitespace cleanup. --- widgets/misc/a11y/ea-calendar-item.c | 4 ++-- widgets/misc/e-attachment-dialog.c | 2 +- widgets/misc/e-calendar.c | 12 ++++++------ widgets/misc/e-canvas.h | 2 +- widgets/misc/e-charset-picker.c | 2 +- widgets/misc/e-cursors.h | 2 +- widgets/misc/e-dateedit.c | 4 ++-- widgets/misc/e-filter-bar.c | 4 ++-- widgets/misc/e-filter-bar.h | 2 +- widgets/misc/e-icon-entry.c | 4 ++-- widgets/misc/e-image-chooser.h | 6 +++--- widgets/misc/e-map.c | 8 ++++---- widgets/misc/e-search-bar.c | 20 ++++++++++---------- widgets/misc/e-send-options.c | 14 +++++++------- widgets/misc/e-spinner.c | 14 +++++++------- 15 files changed, 50 insertions(+), 50 deletions(-) (limited to 'widgets/misc') diff --git a/widgets/misc/a11y/ea-calendar-item.c b/widgets/misc/a11y/ea-calendar-item.c index e1fb365aff..56a01b510b 100644 --- a/widgets/misc/a11y/ea-calendar-item.c +++ b/widgets/misc/a11y/ea-calendar-item.c @@ -280,7 +280,7 @@ ea_calendar_item_get_name (AtkObject *accessible) g_obj = atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE(accessible)); if (!g_obj) - return NULL; + return NULL; g_return_val_if_fail (E_IS_CALENDAR_ITEM (g_obj), NULL); calitem = E_CALENDAR_ITEM (g_obj); @@ -1192,7 +1192,7 @@ e_calendar_item_get_day_extents (ECalendarItem *calitem, month_y = item->y1 + ythickness + month_row * calitem->month_height; month_cell_x = month_x + E_CALENDAR_ITEM_XPAD_BEFORE_WEEK_NUMBERS - + calitem->month_lpad + E_CALENDAR_ITEM_XPAD_BEFORE_CELLS; + + calitem->month_lpad + E_CALENDAR_ITEM_XPAD_BEFORE_CELLS; text_y = month_y + ythickness * 2 + E_CALENDAR_ITEM_YPAD_ABOVE_MONTH_NAME + char_height + E_CALENDAR_ITEM_YPAD_BELOW_MONTH_NAME diff --git a/widgets/misc/e-attachment-dialog.c b/widgets/misc/e-attachment-dialog.c index e1037ae175..45c2103e3d 100644 --- a/widgets/misc/e-attachment-dialog.c +++ b/widgets/misc/e-attachment-dialog.c @@ -407,7 +407,7 @@ e_attachment_dialog_new (GtkWindow *parent, EAttachment *attachment) { if (parent != NULL) - g_return_val_if_fail (GTK_IS_WINDOW (parent), NULL); + g_return_val_if_fail (GTK_IS_WINDOW (parent), NULL); if (attachment != NULL) g_return_val_if_fail (E_IS_ATTACHMENT (attachment), NULL); diff --git a/widgets/misc/e-calendar.c b/widgets/misc/e-calendar.c index 88e59b87db..a0adf46cf5 100644 --- a/widgets/misc/e-calendar.c +++ b/widgets/misc/e-calendar.c @@ -83,7 +83,7 @@ static void e_calendar_drag_leave (GtkWidget *widget, guint time); static gboolean e_calendar_button_has_focus (ECalendar *cal); static gboolean e_calendar_focus (GtkWidget *widget, - GtkDirectionType direction); + GtkDirectionType direction); static void e_calendar_on_prev_pressed (ECalendar *cal); static void e_calendar_on_prev_released (ECalendar *cal); @@ -113,11 +113,11 @@ e_calendar_class_init (ECalendarClass *class) widget_class->realize = e_calendar_realize; widget_class->style_set = e_calendar_style_set; - widget_class->size_request = e_calendar_size_request; - widget_class->size_allocate = e_calendar_size_allocate; + widget_class->size_request = e_calendar_size_request; + widget_class->size_allocate = e_calendar_size_allocate; widget_class->drag_motion = e_calendar_drag_motion; widget_class->drag_leave = e_calendar_drag_leave; - widget_class->focus = e_calendar_focus; + widget_class->focus = e_calendar_focus; } @@ -351,7 +351,7 @@ e_calendar_size_allocate (GtkWidget *widget, gnome_canvas_item_set (cal->prev_item, "x", (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL) ? new_x2 + 1 - xthickness * 2 - E_CALENDAR_ARROW_BUTTON_X_PAD - - arrow_button_size + - arrow_button_size : xthickness * 2 + E_CALENDAR_ARROW_BUTTON_X_PAD, "y", ythickness * 2 + E_CALENDAR_ARROW_BUTTON_Y_PAD, @@ -363,7 +363,7 @@ e_calendar_size_allocate (GtkWidget *widget, "x", (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL) ? xthickness * 2 + E_CALENDAR_ARROW_BUTTON_X_PAD : new_x2 + 1 - xthickness * 2 - E_CALENDAR_ARROW_BUTTON_X_PAD - - arrow_button_size, + - arrow_button_size, "y", ythickness * 2 + E_CALENDAR_ARROW_BUTTON_Y_PAD, "width", arrow_button_size, diff --git a/widgets/misc/e-canvas.h b/widgets/misc/e-canvas.h index e23d29f057..5f60fc4046 100644 --- a/widgets/misc/e-canvas.h +++ b/widgets/misc/e-canvas.h @@ -42,7 +42,7 @@ extern "C" { #define E_IS_CANVAS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), E_CANVAS_TYPE)) typedef void (*ECanvasItemReflowFunc) (GnomeCanvasItem *item, - gint flags); + gint flags); typedef void (*ECanvasItemSelectionFunc) (GnomeCanvasItem *item, gint flags, diff --git a/widgets/misc/e-charset-picker.c b/widgets/misc/e-charset-picker.c index 34e9c63545..593df6b651 100644 --- a/widgets/misc/e-charset-picker.c +++ b/widgets/misc/e-charset-picker.c @@ -256,7 +256,7 @@ activate_other (GtkWidget *item, gpointer menu) if (gtk_dialog_run (dialog) == GTK_RESPONSE_OK) { new_charset = (gchar *)gtk_entry_get_text (GTK_ENTRY (entry)); - if (*new_charset) { + if (*new_charset) { if (add_other_charset (menu, item, new_charset)) { gtk_widget_destroy (GTK_WIDGET (dialog)); g_object_unref (dialog); diff --git a/widgets/misc/e-cursors.h b/widgets/misc/e-cursors.h index 7df3404092..23ac7c0899 100644 --- a/widgets/misc/e-cursors.h +++ b/widgets/misc/e-cursors.h @@ -51,7 +51,7 @@ void e_cursors_shutdown (void); #define e_cursor_set(win, c) \ G_STMT_START { \ - if (win) \ + if (win) \ gdk_window_set_cursor (win, e_cursor_get (c)); \ } G_STMT_END diff --git a/widgets/misc/e-dateedit.c b/widgets/misc/e-dateedit.c index e8034eb487..b9ae1ad901 100644 --- a/widgets/misc/e-dateedit.c +++ b/widgets/misc/e-dateedit.c @@ -1247,7 +1247,7 @@ position_date_popup (EDateEdit *dedit) x += win_x; y += win_y; - screen_width = gdk_screen_width (); + screen_width = gdk_screen_width (); screen_height = gdk_screen_height (); x = CLAMP (x, 0, MAX (0, screen_width - cal_req.width)); @@ -1326,7 +1326,7 @@ on_date_popup_key_press (GtkWidget *widget, EDateEdit *dedit) { if (event->keyval != GDK_Escape) { - gdk_keyboard_grab (dedit->priv->cal_popup->window, TRUE, GDK_CURRENT_TIME); + gdk_keyboard_grab (dedit->priv->cal_popup->window, TRUE, GDK_CURRENT_TIME); return FALSE; } diff --git a/widgets/misc/e-filter-bar.c b/widgets/misc/e-filter-bar.c index 77c20d506b..1bc183dbe5 100644 --- a/widgets/misc/e-filter-bar.c +++ b/widgets/misc/e-filter-bar.c @@ -875,7 +875,7 @@ e_filter_bar_lite_new (RuleContext *context, bar = g_object_new (e_filter_bar_get_type (), NULL); ((ESearchBar *)bar)->lite = TRUE; - e_filter_bar_new_construct (context, systemrules, userrules, config, data, bar); + e_filter_bar_new_construct (context, systemrules, userrules, config, data, bar); return bar; } @@ -901,7 +901,7 @@ e_filter_bar_new_construct (RuleContext *context, bar->all_account_search_vf = NULL; bar->account_search_vf = NULL; - bar->account_search_cancel = NULL; + bar->account_search_cancel = NULL; g_signal_connect (context, "changed", G_CALLBACK (context_changed), bar); g_signal_connect (context, "rule_removed", G_CALLBACK (context_rule_removed), bar); diff --git a/widgets/misc/e-filter-bar.h b/widgets/misc/e-filter-bar.h index 859a21b6c9..30c3ac5585 100644 --- a/widgets/misc/e-filter-bar.h +++ b/widgets/misc/e-filter-bar.h @@ -140,7 +140,7 @@ EFilterBar *e_filter_bar_lite_new (RuleContext *context, gpointer data); void -e_filter_bar_new_construct (RuleContext *context, +e_filter_bar_new_construct (RuleContext *context, const gchar *systemrules, const gchar *userrules, EFilterBarConfigRule config, diff --git a/widgets/misc/e-icon-entry.c b/widgets/misc/e-icon-entry.c index fb11c98323..6da15943e4 100644 --- a/widgets/misc/e-icon-entry.c +++ b/widgets/misc/e-icon-entry.c @@ -99,8 +99,8 @@ icon_entry_create_proxy (GtkAction *action) } static gboolean icon_entry_focus_change_cb (GtkWidget *widget, - GdkEventFocus *event, - GtkWidget *entry) + GdkEventFocus *event, + GtkWidget *entry) { gtk_widget_queue_draw (entry); diff --git a/widgets/misc/e-image-chooser.h b/widgets/misc/e-image-chooser.h index a3972bd26d..be2d427291 100644 --- a/widgets/misc/e-image-chooser.h +++ b/widgets/misc/e-image-chooser.h @@ -28,10 +28,10 @@ G_BEGIN_DECLS -#define E_TYPE_IMAGE_CHOOSER (e_image_chooser_get_type ()) -#define E_IMAGE_CHOOSER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_IMAGE_CHOOSER, EImageChooser)) +#define E_TYPE_IMAGE_CHOOSER (e_image_chooser_get_type ()) +#define E_IMAGE_CHOOSER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_IMAGE_CHOOSER, EImageChooser)) #define E_IMAGE_CHOOSER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), E_TYPE_IMAGE_CHOOSER, EImageChooserClass)) -#define E_IS_IMAGE_CHOOSER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_IMAGE_CHOOSER)) +#define E_IS_IMAGE_CHOOSER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_IMAGE_CHOOSER)) #define E_IS_IMAGE_CHOOSER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), E_TYPE_IMAGE_CHOOSER)) typedef struct _EImageChooser EImageChooser; diff --git a/widgets/misc/e-map.c b/widgets/misc/e-map.c index c44e75886b..f35335f37d 100644 --- a/widgets/misc/e-map.c +++ b/widgets/misc/e-map.c @@ -345,7 +345,7 @@ e_map_unrealize (GtkWidget *widget) g_return_if_fail (IS_E_MAP (widget)); if (GTK_WIDGET_CLASS (parent_class)->unrealize) - (*GTK_WIDGET_CLASS (parent_class)->unrealize) (widget); + (*GTK_WIDGET_CLASS (parent_class)->unrealize) (widget); } @@ -882,7 +882,7 @@ e_map_point_is_in_view (EMap *map, EMapPoint *point) if (x >= 0 && x < GTK_WIDGET (map)->allocation.width && y >= 0 && y < GTK_WIDGET (map)->allocation.height) - return TRUE; + return TRUE; return FALSE; } @@ -1011,8 +1011,8 @@ update_render_pixbuf (EMap *map, GdkInterpType interp, gboolean render_overlays) if (width > 1 && height > 1) { gdk_pixbuf_scale (priv->map_pixbuf, priv->map_render_pixbuf, 0, 0, /* Dest (x, y) */ - width, height, 0, 0, /* Offset (x, y) */ - zoom, zoom, /* Scale (x, y) */ + width, height, 0, 0, /* Offset (x, y) */ + zoom, zoom, /* Scale (x, y) */ interp); } diff --git a/widgets/misc/e-search-bar.c b/widgets/misc/e-search-bar.c index 849825e160..83f4fda189 100644 --- a/widgets/misc/e-search-bar.c +++ b/widgets/misc/e-search-bar.c @@ -610,13 +610,13 @@ search_bar_dispose (GObject *object) /* static gpointer / /* option_item_destroy_cb (GtkObject *object, gpointer data) */ /* { */ -/* /\* ESearchBarSubitem *subitems; *\/ */ +/* /\* ESearchBarSubitem *subitems; *\/ */ -/* /\* subitems = data; *\/ */ +/* /\* subitems = data; *\/ */ -/* /\* g_assert (subitems != NULL); *\/ */ -/* /\* free_subitems (subitems); *\/ */ -/* /\* g_object_set_data (G_OBJECT (object), "EsbChoiceSubitems", NULL); *\/ */ +/* /\* g_assert (subitems != NULL); *\/ */ +/* /\* free_subitems (subitems); *\/ */ +/* /\* g_object_set_data (G_OBJECT (object), "EsbChoiceSubitems", NULL); *\/ */ /* } */ static void @@ -939,10 +939,10 @@ e_search_bar_get_type (void) bonobo_object_unref (BONOBO_OBJECT (esb->ui_component)); esb->ui_component = NULL; } -/* if (esb->entry) { */ -/* g_object_unref (esb->entry); */ -/* esb->entry = NULL; */ -/* } */ +/* if (esb->entry) { */ +/* g_object_unref (esb->entry); */ +/* esb->entry = NULL; */ +/* } */ if (esb->suboption) { g_object_unref (esb->suboption); esb->suboption = NULL; @@ -1066,7 +1066,7 @@ e_search_bar_set_context (ESearchBar *search_bar, gtk_box_pack_start (GTK_BOX(search_bar->scopeoption_box), label, FALSE, FALSE, 0); search_bar->scopeoption = gtk_option_menu_new (); - /* g_signal_connect (GTK_OPTION_MENU (search_bar->scopeoption), "changed", scopeoption_changed_cb, search_bar); */ + /* g_signal_connect (GTK_OPTION_MENU (search_bar->scopeoption), "changed", scopeoption_changed_cb, search_bar); */ gtk_box_pack_start (GTK_BOX(search_bar->scopeoption_box), search_bar->scopeoption, FALSE, FALSE, 0); gtk_widget_show_all (search_bar->scopeoption_box); gtk_widget_hide (hbox); diff --git a/widgets/misc/e-send-options.c b/widgets/misc/e-send-options.c index b42630ebae..fa84e86cc8 100644 --- a/widgets/misc/e-send-options.c +++ b/widgets/misc/e-send-options.c @@ -397,7 +397,7 @@ init_widgets (ESendOptionsDialog *sod) g_signal_connect (priv->delay_until, "changed", G_CALLBACK (delay_until_date_changed_cb), sod); if (priv->global) - g_signal_connect (priv->notebook, "switch-page", G_CALLBACK (page_changed_cb), sod); + g_signal_connect (priv->notebook, "switch-page", G_CALLBACK (page_changed_cb), sod); } @@ -502,7 +502,7 @@ setup_widgets (ESendOptionsDialog *sod, Item_type type) gtk_label_set_mnemonic_widget (GTK_LABEL (priv->until_label), priv->delay_until); if (priv->global) { - GtkWidget *widget = gtk_label_new ("Calendar"); + GtkWidget *widget = gtk_label_new ("Calendar"); gtk_label_set_text (GTK_LABEL (priv->sopts_label), "Mail"); gtk_notebook_append_page (priv->notebook, priv->status, widget); gtk_widget_show (widget); @@ -514,7 +514,7 @@ setup_widgets (ESendOptionsDialog *sod, Item_type type) switch (type) { case E_ITEM_MAIL: - priv->help_section = g_strdup ("usage-mail"); + priv->help_section = g_strdup ("usage-mail"); gtk_widget_hide (priv->accepted_label); gtk_widget_hide (priv->when_accepted); gtk_widget_hide (priv->completed_label); @@ -522,11 +522,11 @@ setup_widgets (ESendOptionsDialog *sod, Item_type type) gtk_label_set_text_with_mnemonic (GTK_LABEL (priv->declined_label), (_("When de_leted:"))); break; case E_ITEM_CALENDAR: - priv->help_section = g_strdup ("usage-calendar"); + priv->help_section = g_strdup ("usage-calendar"); gtk_widget_hide (priv->completed_label); gtk_widget_hide (priv->when_completed); case E_ITEM_TASK: - priv->help_section = g_strdup ("usage-calendar-todo"); + priv->help_section = g_strdup ("usage-calendar-todo"); gtk_widget_hide (priv->security_label); gtk_widget_hide (priv->security); gtk_widget_set_sensitive (priv->autodelete, FALSE); @@ -606,7 +606,7 @@ static void e_send_options_cb (GtkDialog *dialog, gint state, gpointer func_data e_display_help ( GTK_WINDOW (priv->main), priv->help_section); - break; + break; } g_signal_emit (G_OBJECT (func_data), signals[SOD_RESPONSE], 0, state); @@ -821,7 +821,7 @@ GType e_sendoptions_dialog_get_type (void) sizeof (ESendOptionsDialog), 0, /* n_preallocs */ (GInstanceInitFunc) e_sendoptions_dialog_init, - NULL /* instance_init */ + NULL /* instance_init */ }; type = g_type_register_static (G_TYPE_OBJECT, "ESendOptionsDialogType", diff --git a/widgets/misc/e-spinner.c b/widgets/misc/e-spinner.c index 87e53dce8f..78303cc9ec 100644 --- a/widgets/misc/e-spinner.c +++ b/widgets/misc/e-spinner.c @@ -66,7 +66,7 @@ struct _ESpinnerClass #define E_TYPE_SPINNER_CACHE (e_spinner_cache_get_type()) #define E_SPINNER_CACHE(object) (G_TYPE_CHECK_INSTANCE_CAST((object), E_TYPE_SPINNER_CACHE, ESpinnerCache)) -#define E_SPINNER_CACHE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), E_TYPE_SPINNER_CACHE, ESpinnerCacheClass)) +#define E_SPINNER_CACHE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), E_TYPE_SPINNER_CACHE, ESpinnerCacheClass)) #define E_IS_SPINNER_CACHE(object) (G_TYPE_CHECK_INSTANCE_TYPE((object), E_TYPE_SPINNER_CACHE)) #define E_IS_SPINNER_CACHE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), E_TYPE_SPINNER_CACHE)) #define E_SPINNER_CACHE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), E_TYPE_SPINNER_CACHE, ESpinnerCacheClass)) @@ -275,7 +275,7 @@ e_spinner_images_load (GdkScreen *screen, /* Load the animation. The 'rest icon' is the 0th frame */ icon_info = gtk_icon_theme_lookup_icon (icon_theme, SPINNER_ICON_NAME, - requested_size, 0); + requested_size, 0); if (icon_info == NULL) { g_warning ("Throbber animation not found"); @@ -741,10 +741,10 @@ e_spinner_start (ESpinner *spinner) details->timer_task = g_timeout_add_full (G_PRIORITY_LOW, - details->timeout, - (GSourceFunc) bump_spinner_frame_cb, - spinner, - NULL); + details->timeout, + (GSourceFunc) bump_spinner_frame_cb, + spinner, + NULL); } } @@ -843,7 +843,7 @@ e_spinner_size_request (GtkWidget *widget, gtk_icon_size_lookup_for_settings (gtk_widget_get_settings (widget), details->size, &requisition->width, - &requisition->height); + &requisition->height); return; } -- cgit