diff options
Diffstat (limited to 'e-util')
93 files changed, 1042 insertions, 973 deletions
diff --git a/e-util/e-attachment-button.c b/e-util/e-attachment-button.c index a04b85db38..5d38a213d8 100644 --- a/e-util/e-attachment-button.c +++ b/e-util/e-attachment-button.c @@ -45,7 +45,7 @@ struct _EAttachmentButtonPrivate { GtkWidget *popup_menu; guint expandable : 1; - guint expanded : 1; + guint expanded : 1; }; enum { diff --git a/e-util/e-attachment.c b/e-util/e-attachment.c index b7c59779e1..06018e8130 100644 --- a/e-util/e-attachment.c +++ b/e-util/e-attachment.c @@ -69,9 +69,9 @@ struct _EAttachmentPrivate { gint64 last_percent_notify; /* to avoid excessive notifications */ guint can_show : 1; - guint loading : 1; - guint saving : 1; - guint shown : 1; + guint loading : 1; + guint saving : 1; + guint shown : 1; camel_cipher_validity_encrypt_t encrypted; camel_cipher_validity_sign_t signed_; diff --git a/e-util/e-buffer-tagger.c b/e-util/e-buffer-tagger.c index d79ef2f32e..7866c88296 100644 --- a/e-util/e-buffer-tagger.c +++ b/e-util/e-buffer-tagger.c @@ -33,21 +33,19 @@ #include "e-misc-utils.h" -enum EBufferTaggerState -{ - E_BUFFER_TAGGER_STATE_NONE = 0, - E_BUFFER_TAGGER_STATE_INSDEL = 1 << 0, /* set when was called insert or delete of a text */ - E_BUFFER_TAGGER_STATE_CHANGED = 1 << 1, /* remark of the buffer is scheduled */ - E_BUFFER_TAGGER_STATE_IS_HOVERING = 1 << 2, /* mouse is over the link */ +enum EBufferTaggerState { + E_BUFFER_TAGGER_STATE_NONE = 0, + E_BUFFER_TAGGER_STATE_INSDEL = 1 << 0, /* set when was called insert or delete of a text */ + E_BUFFER_TAGGER_STATE_CHANGED = 1 << 1, /* remark of the buffer is scheduled */ + E_BUFFER_TAGGER_STATE_IS_HOVERING = 1 << 2, /* mouse is over the link */ E_BUFFER_TAGGER_STATE_IS_HOVERING_TOOLTIP = 1 << 3, /* mouse is over the link and the tooltip can be shown */ - E_BUFFER_TAGGER_STATE_CTRL_DOWN = 1 << 4 /* Ctrl key is down */ + E_BUFFER_TAGGER_STATE_CTRL_DOWN = 1 << 4 /* Ctrl key is down */ }; #define E_BUFFER_TAGGER_DATA_STATE "EBufferTagger::state" #define E_BUFFER_TAGGER_LINK_TAG "EBufferTagger::link" -struct _MagicInsertMatch -{ +struct _MagicInsertMatch { const gchar *regex; regex_t *preg; const gchar *prefix; diff --git a/e-util/e-calendar-item.c b/e-util/e-calendar-item.c index 2d5f895251..8f58b6d1e6 100644 --- a/e-util/e-calendar-item.c +++ b/e-util/e-calendar-item.c @@ -1957,7 +1957,7 @@ e_calendar_item_selection_add_days (ECalendarItem *calitem, g_date_compare (calitem->selecting_axis, &gdate_end) == 0) || (days_between == 0 && n_days < 0)) { if (days_between - n_days > calitem->max_days_selected - 1) - n_days = days_between + 1 - calitem->max_days_selected; + n_days = days_between + 1 - calitem->max_days_selected; g_date_add_days (&gdate_start, n_days); } else { diff --git a/e-util/e-calendar.c b/e-util/e-calendar.c index 14bc4c141c..cb989bf72f 100644 --- a/e-util/e-calendar.c +++ b/e-util/e-calendar.c @@ -40,9 +40,9 @@ #define E_CALENDAR_SMALL_FONT_PTSIZE 6 -#define E_CALENDAR_SMALL_FONT \ +#define E_CALENDAR_SMALL_FONT \ "-adobe-utopia-regular-r-normal-*-*-100-*-*-p-*-iso8859-*" -#define E_CALENDAR_SMALL_FONT_FALLBACK \ +#define E_CALENDAR_SMALL_FONT_FALLBACK \ "-adobe-helvetica-medium-r-normal-*-*-80-*-*-p-*-iso8859-*" /* The space between the arrow buttons and the edge of the widget. */ @@ -125,14 +125,14 @@ e_calendar_class_init (ECalendarClass *class) object_class->dispose = e_calendar_dispose; - widget_class->realize = e_calendar_realize; - widget_class->style_set = e_calendar_style_set; - widget_class->get_preferred_width = e_calendar_get_preferred_width; + widget_class->realize = e_calendar_realize; + widget_class->style_set = e_calendar_style_set; + widget_class->get_preferred_width = e_calendar_get_preferred_width; widget_class->get_preferred_height = e_calendar_get_preferred_height; - 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->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; } static void diff --git a/e-util/e-canvas-background.c b/e-util/e-canvas-background.c index d2ba1d0763..af0ddb688a 100644 --- a/e-util/e-canvas-background.c +++ b/e-util/e-canvas-background.c @@ -191,8 +191,8 @@ ecb_draw (GnomeCanvasItem *item, cr, ((ecb->priv->rgba >> 24) & 0xff) / 255.0, ((ecb->priv->rgba >> 16) & 0xff) / 255.0, - ((ecb->priv->rgba >> 8) & 0xff) / 255.0, - ( ecb->priv->rgba & 0xff) / 255.0); + ((ecb->priv->rgba >> 8) & 0xff) / 255.0, + ( ecb->priv->rgba & 0xff) / 255.0); cairo_paint (cr); cairo_restore (cr); } @@ -225,15 +225,15 @@ ecb_class_init (ECanvasBackgroundClass *ecb_class) g_type_class_add_private (ecb_class, sizeof (ECanvasBackgroundPrivate)); - object_class->set_property = ecb_set_property; - object_class->get_property = ecb_get_property; + object_class->set_property = ecb_set_property; + object_class->get_property = ecb_get_property; - item_class->update = ecb_update; - item_class->draw = ecb_draw; - item_class->point = ecb_point; - item_class->bounds = ecb_bounds; + item_class->update = ecb_update; + item_class->draw = ecb_draw; + item_class->point = ecb_point; + item_class->bounds = ecb_bounds; - ecb_class->style_set = ecb_style_set; + ecb_class->style_set = ecb_style_set; g_object_class_install_property ( object_class, diff --git a/e-util/e-canvas-vbox.c b/e-util/e-canvas-vbox.c index c6b319ec6c..a7bcbc967c 100644 --- a/e-util/e-canvas-vbox.c +++ b/e-util/e-canvas-vbox.c @@ -69,16 +69,16 @@ e_canvas_vbox_class_init (ECanvasVboxClass *class) object_class = (GObjectClass *) class; item_class = (GnomeCanvasItemClass *) class; - class->add_item = e_canvas_vbox_real_add_item; + class->add_item = e_canvas_vbox_real_add_item; class->add_item_start = e_canvas_vbox_real_add_item_start; object_class->set_property = e_canvas_vbox_set_property; object_class->get_property = e_canvas_vbox_get_property; - object_class->dispose = e_canvas_vbox_dispose; + object_class->dispose = e_canvas_vbox_dispose; /* GnomeCanvasItem method overrides */ - item_class->event = e_canvas_vbox_event; - item_class->realize = e_canvas_vbox_realize; + item_class->event = e_canvas_vbox_event; + item_class->realize = e_canvas_vbox_realize; g_object_class_install_property ( object_class, @@ -386,7 +386,7 @@ e_canvas_vbox_reflow (GnomeCanvasItem *item, e_canvas_vbox->height = running_height; e_canvas_vbox->width = max_width; if (old_height != e_canvas_vbox->height || - old_width != e_canvas_vbox->width) + old_width != e_canvas_vbox->width) e_canvas_item_request_parent_reflow (item); } } diff --git a/e-util/e-canvas.c b/e-util/e-canvas.c index 2b3b3a3d4b..2183b3d628 100644 --- a/e-util/e-canvas.c +++ b/e-util/e-canvas.c @@ -223,16 +223,16 @@ pick_current_item (GnomeCanvas *canvas, (event->type == GDK_BUTTON_RELEASE)) { /* these fields have the same offsets in both types of events */ - canvas->pick_event.crossing.type = GDK_ENTER_NOTIFY; - canvas->pick_event.crossing.window = event->motion.window; + canvas->pick_event.crossing.type = GDK_ENTER_NOTIFY; + canvas->pick_event.crossing.window = event->motion.window; canvas->pick_event.crossing.send_event = event->motion.send_event; - canvas->pick_event.crossing.subwindow = NULL; - canvas->pick_event.crossing.x = event->motion.x; - canvas->pick_event.crossing.y = event->motion.y; - canvas->pick_event.crossing.mode = GDK_CROSSING_NORMAL; - canvas->pick_event.crossing.detail = GDK_NOTIFY_NONLINEAR; - canvas->pick_event.crossing.focus = FALSE; - canvas->pick_event.crossing.state = event->motion.state; + canvas->pick_event.crossing.subwindow = NULL; + canvas->pick_event.crossing.x = event->motion.x; + canvas->pick_event.crossing.y = event->motion.y; + canvas->pick_event.crossing.mode = GDK_CROSSING_NORMAL; + canvas->pick_event.crossing.detail = GDK_NOTIFY_NONLINEAR; + canvas->pick_event.crossing.focus = FALSE; + canvas->pick_event.crossing.state = event->motion.state; /* these fields don't have the same offsets in both types of events */ diff --git a/e-util/e-canvas.h b/e-util/e-canvas.h index 23f502dbd6..3666958cb7 100644 --- a/e-util/e-canvas.h +++ b/e-util/e-canvas.h @@ -71,7 +71,7 @@ typedef struct _ECanvasClass ECanvasClass; /* Object flags for items */ enum { - E_CANVAS_ITEM_NEEDS_REFLOW = 1 << 13, + E_CANVAS_ITEM_NEEDS_REFLOW = 1 << 13, E_CANVAS_ITEM_DESCENDENT_NEEDS_REFLOW = 1 << 14 }; diff --git a/e-util/e-cell-combo.c b/e-util/e-cell-combo.c index e761869232..34384293c7 100644 --- a/e-util/e-cell-combo.c +++ b/e-util/e-cell-combo.c @@ -480,7 +480,7 @@ e_cell_combo_get_popup_pos (ECellCombo *ecc, canvas = GTK_WIDGET (GNOME_CANVAS_ITEM (eti)->canvas); /* This code is practically copied from GtkCombo. */ - popup = GTK_SCROLLED_WINDOW (ecc->popup_scrolled_window); + popup = GTK_SCROLLED_WINDOW (ecc->popup_scrolled_window); popwin = GTK_BIN (ecc->popup_window); window = gtk_widget_get_window (canvas); diff --git a/e-util/e-cell-date-edit.c b/e-util/e-cell-date-edit.c index 52414013a0..6efe6f8204 100644 --- a/e-util/e-cell-date-edit.c +++ b/e-util/e-cell-date-edit.c @@ -773,7 +773,7 @@ e_cell_date_edit_rebuild_time_list (ECellDateEdit *ecde) tmp_tm.tm_year = 2000; tmp_tm.tm_mon = 0; tmp_tm.tm_mday = 1; - tmp_tm.tm_sec = 0; + tmp_tm.tm_sec = 0; tmp_tm.tm_isdst = 0; for (hour = ecde->lower_hour; hour <= ecde->upper_hour; hour++) { @@ -789,7 +789,7 @@ e_cell_date_edit_rebuild_time_list (ECellDateEdit *ecde) GtkTreeIter iter; tmp_tm.tm_hour = hour; - tmp_tm.tm_min = min; + tmp_tm.tm_min = min; e_time_format_time (&tmp_tm, ecde->use_24_hour_format, FALSE, buffer, sizeof (buffer)); diff --git a/e-util/e-cell-date.c b/e-util/e-cell-date.c index 77dd7b6bea..e6c4d33505 100644 --- a/e-util/e-cell-date.c +++ b/e-util/e-cell-date.c @@ -72,7 +72,7 @@ e_cell_date_class_init (ECellDateClass *class) { ECellTextClass *ectc = E_CELL_TEXT_CLASS (class); - ectc->get_text = ecd_get_text; + ectc->get_text = ecd_get_text; ectc->free_text = ecd_free_text; } diff --git a/e-util/e-cell-hbox.c b/e-util/e-cell-hbox.c index ca11158a74..74a78717b3 100644 --- a/e-util/e-cell-hbox.c +++ b/e-util/e-cell-hbox.c @@ -296,15 +296,15 @@ e_cell_hbox_class_init (ECellHboxClass *class) object_class->dispose = ecv_dispose; - ecc->new_view = ecv_new_view; - ecc->kill_view = ecv_kill_view; - ecc->realize = ecv_realize; - ecc->unrealize = ecv_unrealize; - ecc->draw = ecv_draw; - ecc->event = ecv_event; - ecc->height = ecv_height; + ecc->new_view = ecv_new_view; + ecc->kill_view = ecv_kill_view; + ecc->realize = ecv_realize; + ecc->unrealize = ecv_unrealize; + ecc->draw = ecv_draw; + ecc->event = ecv_event; + ecc->height = ecv_height; - ecc->max_width = ecv_max_width; + ecc->max_width = ecv_max_width; /* gal_a11y_e_cell_registry_add_cell_type (NULL, E_TYPE_CELL_HBOX, gal_a11y_e_cell_hbox_new); */ } @@ -339,9 +339,9 @@ e_cell_hbox_append (ECellHbox *hbox, { hbox->subcell_count++; - hbox->subcells = g_renew (ECell *, hbox->subcells, hbox->subcell_count); - hbox->model_cols = g_renew (int, hbox->model_cols, hbox->subcell_count); - hbox->def_size_cols = g_renew (int, hbox->def_size_cols, hbox->subcell_count); + hbox->subcells = g_renew (ECell *, hbox->subcells, hbox->subcell_count); + hbox->model_cols = g_renew (int, hbox->model_cols, hbox->subcell_count); + hbox->def_size_cols = g_renew (int, hbox->def_size_cols, hbox->subcell_count); hbox->subcells[hbox->subcell_count - 1] = subcell; hbox->model_cols[hbox->subcell_count - 1] = model_col; diff --git a/e-util/e-cell-number.c b/e-util/e-cell-number.c index 43f9c6437d..c83063a324 100644 --- a/e-util/e-cell-number.c +++ b/e-util/e-cell-number.c @@ -59,7 +59,7 @@ e_cell_number_class_init (ECellNumberClass *class) { ECellTextClass *ectc = E_CELL_TEXT_CLASS (class); - ectc->get_text = ecn_get_text; + ectc->get_text = ecn_get_text; ectc->free_text = ecn_free_text; } diff --git a/e-util/e-cell-percent.c b/e-util/e-cell-percent.c index 9d1b278e8e..668899ad88 100644 --- a/e-util/e-cell-percent.c +++ b/e-util/e-cell-percent.c @@ -124,7 +124,7 @@ e_cell_percent_class_init (ECellPercentClass *ecpc) { ECellTextClass *ectc = (ECellTextClass *) ecpc; - ectc->get_text = ecp_get_text; + ectc->get_text = ecp_get_text; ectc->free_text = ecp_free_text; ectc->set_value = ecp_set_value; } diff --git a/e-util/e-cell-popup.c b/e-util/e-cell-popup.c index bfbfcabfaa..1b311d26bd 100644 --- a/e-util/e-cell-popup.c +++ b/e-util/e-cell-popup.c @@ -114,18 +114,18 @@ e_cell_popup_class_init (ECellPopupClass *class) G_OBJECT_CLASS (class)->dispose = e_cell_popup_dispose; - ecc->new_view = ecp_new_view; - ecc->kill_view = ecp_kill_view; - ecc->realize = ecp_realize; - ecc->unrealize = ecp_unrealize; - ecc->draw = ecp_draw; - ecc->event = ecp_event; - ecc->height = ecp_height; - ecc->enter_edit = ecp_enter_edit; - ecc->leave_edit = ecp_leave_edit; - ecc->print = ecp_print; + ecc->new_view = ecp_new_view; + ecc->kill_view = ecp_kill_view; + ecc->realize = ecp_realize; + ecc->unrealize = ecp_unrealize; + ecc->draw = ecp_draw; + ecc->event = ecp_event; + ecc->height = ecp_height; + ecc->enter_edit = ecp_enter_edit; + ecc->leave_edit = ecp_leave_edit; + ecc->print = ecp_print; ecc->print_height = ecp_print_height; - ecc->max_width = ecp_max_width; + ecc->max_width = ecp_max_width; ecc->get_bg_color = ecp_get_bg_color; gal_a11y_e_cell_registry_add_cell_type ( diff --git a/e-util/e-cell-renderer-color.c b/e-util/e-cell-renderer-color.c index 4105fe7cee..dad3992c0b 100644 --- a/e-util/e-cell-renderer-color.c +++ b/e-util/e-cell-renderer-color.c @@ -52,7 +52,7 @@ cell_renderer_color_get_size (GtkCellRenderer *cell, gint *width, gint *height) { - gint color_width = 16; + gint color_width = 16; gint color_height = 16; gint calc_width; gint calc_height; @@ -65,7 +65,7 @@ cell_renderer_color_get_size (GtkCellRenderer *cell, cell, "xalign", &xalign, "yalign", &yalign, "xpad", &xpad, "ypad", &ypad, NULL); - calc_width = (gint) xpad * 2 + color_width; + calc_width = (gint) xpad * 2 + color_width; calc_height = (gint) ypad * 2 + color_height; if (cell_area && color_width > 0 && color_height > 0) { diff --git a/e-util/e-cell-size.c b/e-util/e-cell-size.c index 4fe2b00765..19bd49177e 100644 --- a/e-util/e-cell-size.c +++ b/e-util/e-cell-size.c @@ -64,7 +64,7 @@ e_cell_size_class_init (ECellSizeClass *class) { ECellTextClass *ectc = E_CELL_TEXT_CLASS (class); - ectc->get_text = ecd_get_text; + ectc->get_text = ecd_get_text; ectc->free_text = ecd_free_text; } diff --git a/e-util/e-cell-text.c b/e-util/e-cell-text.c index 9e97e4916f..5a05da5128 100644 --- a/e-util/e-cell-text.c +++ b/e-util/e-cell-text.c @@ -1096,7 +1096,7 @@ ect_enter_edit (ECellView *ecell_view, edit = g_new0 (CellEdit, 1); text_view->edit = edit; - edit->im_context = E_CANVAS (text_view->canvas)->im_context; + edit->im_context = E_CANVAS (text_view->canvas)->im_context; edit->need_im_reset = FALSE; edit->im_context_signals_registered = FALSE; edit->view_col = -1; @@ -1336,7 +1336,7 @@ ect_print (ECellView *ecell_view, font_metrics = pango_context_get_metrics ( pango_context, style->font_desc, pango_context_get_language (pango_context)); - ty = (gdouble)(text_height - + ty = (gdouble)(text_height - pango_font_metrics_get_ascent (font_metrics) - pango_font_metrics_get_descent (font_metrics)) / 2.0 /(gdouble) PANGO_SCALE; @@ -1579,19 +1579,19 @@ e_cell_text_class_init (ECellTextClass *class) object_class->finalize = ect_finalize; - ecc->new_view = ect_new_view; - ecc->kill_view = ect_kill_view; - ecc->realize = ect_realize; - ecc->unrealize = ect_unrealize; - ecc->draw = ect_draw; - ecc->event = ect_event; - ecc->height = ect_height; + ecc->new_view = ect_new_view; + ecc->kill_view = ect_kill_view; + ecc->realize = ect_realize; + ecc->unrealize = ect_unrealize; + ecc->draw = ect_draw; + ecc->event = ect_event; + ecc->height = ect_height; ecc->enter_edit = ect_enter_edit; ecc->leave_edit = ect_leave_edit; ecc->save_state = ect_save_state; ecc->load_state = ect_load_state; ecc->free_state = ect_free_state; - ecc->print = ect_print; + ecc->print = ect_print; ecc->print_height = ect_print_height; ecc->max_width = ect_max_width; ecc->max_width_by_row = ect_max_width_by_row; diff --git a/e-util/e-cell-tree.c b/e-util/e-cell-tree.c index 477d470a24..ba5b132568 100644 --- a/e-util/e-cell-tree.c +++ b/e-util/e-cell-tree.c @@ -776,19 +776,19 @@ e_cell_tree_class_init (ECellTreeClass *class) object_class->dispose = ect_dispose; - ecc->new_view = ect_new_view; - ecc->kill_view = ect_kill_view; - ecc->realize = ect_realize; - ecc->unrealize = ect_unrealize; - ecc->draw = ect_draw; - ecc->event = ect_event; - ecc->height = ect_height; - ecc->enter_edit = ect_enter_edit; - ecc->leave_edit = ect_leave_edit; - ecc->print = ect_print; - ecc->print_height = ect_print_height; - ecc->max_width = ect_max_width; - ecc->get_bg_color = ect_get_bg_color; + ecc->new_view = ect_new_view; + ecc->kill_view = ect_kill_view; + ecc->realize = ect_realize; + ecc->unrealize = ect_unrealize; + ecc->draw = ect_draw; + ecc->event = ect_event; + ecc->height = ect_height; + ecc->enter_edit = ect_enter_edit; + ecc->leave_edit = ect_leave_edit; + ecc->print = ect_print; + ecc->print_height = ect_print_height; + ecc->max_width = ect_max_width; + ecc->get_bg_color = ect_get_bg_color; gal_a11y_e_cell_registry_add_cell_type (NULL, E_TYPE_CELL_TREE, gal_a11y_e_cell_tree_new); } diff --git a/e-util/e-cell-vbox.c b/e-util/e-cell-vbox.c index e877063e91..49265e3e8b 100644 --- a/e-util/e-cell-vbox.c +++ b/e-util/e-cell-vbox.c @@ -288,14 +288,14 @@ e_cell_vbox_class_init (ECellVboxClass *class) object_class->dispose = ecv_dispose; object_class->finalize = ecv_finalize; - ecc->new_view = ecv_new_view; - ecc->kill_view = ecv_kill_view; - ecc->realize = ecv_realize; - ecc->unrealize = ecv_unrealize; - ecc->draw = ecv_draw; - ecc->event = ecv_event; - ecc->height = ecv_height; - ecc->max_width = ecv_max_width; + ecc->new_view = ecv_new_view; + ecc->kill_view = ecv_kill_view; + ecc->realize = ecv_realize; + ecc->unrealize = ecv_unrealize; + ecc->draw = ecv_draw; + ecc->event = ecv_event; + ecc->height = ecv_height; + ecc->max_width = ecv_max_width; gal_a11y_e_cell_registry_add_cell_type (NULL, E_TYPE_CELL_VBOX, gal_a11y_e_cell_vbox_new); } @@ -329,7 +329,7 @@ e_cell_vbox_append (ECellVbox *vbox, { vbox->subcell_count++; - vbox->subcells = g_renew (ECell *, vbox->subcells, vbox->subcell_count); + vbox->subcells = g_renew (ECell *, vbox->subcells, vbox->subcell_count); vbox->model_cols = g_renew (int, vbox->model_cols, vbox->subcell_count); vbox->subcells[vbox->subcell_count - 1] = subcell; diff --git a/e-util/e-cell.h b/e-util/e-cell.h index 67ac731db7..8d5e306c79 100644 --- a/e-util/e-cell.h +++ b/e-util/e-cell.h @@ -63,29 +63,29 @@ typedef gboolean (*ETableSearchFunc) (gconstpointer haystack, const gchar *needle); typedef enum { - E_CELL_SELECTED = 1 << 0, + E_CELL_SELECTED = 1 << 0, - E_CELL_JUSTIFICATION = 3 << 1, + E_CELL_JUSTIFICATION = 3 << 1, E_CELL_JUSTIFY_CENTER = 0 << 1, - E_CELL_JUSTIFY_LEFT = 1 << 1, - E_CELL_JUSTIFY_RIGHT = 2 << 1, - E_CELL_JUSTIFY_FILL = 3 << 1, + E_CELL_JUSTIFY_LEFT = 1 << 1, + E_CELL_JUSTIFY_RIGHT = 2 << 1, + E_CELL_JUSTIFY_FILL = 3 << 1, - E_CELL_ALIGN_LEFT = 1 << 1, - E_CELL_ALIGN_RIGHT = 1 << 2, + E_CELL_ALIGN_LEFT = 1 << 1, + E_CELL_ALIGN_RIGHT = 1 << 2, - E_CELL_FOCUSED = 1 << 3, + E_CELL_FOCUSED = 1 << 3, - E_CELL_EDITING = 1 << 4, + E_CELL_EDITING = 1 << 4, - E_CELL_CURSOR = 1 << 5, + E_CELL_CURSOR = 1 << 5, - E_CELL_PREEDIT = 1 << 6 + E_CELL_PREEDIT = 1 << 6 } ECellFlags; typedef enum { - E_CELL_GRAB = 1 << 0, - E_CELL_UNGRAB = 1 << 1 + E_CELL_GRAB = 1 << 0, + E_CELL_UNGRAB = 1 << 1 } ECellActions; struct _ECellView { diff --git a/e-util/e-charset-combo-box.c b/e-util/e-charset-combo-box.c index ececac3c1a..240c28582f 100644 --- a/e-util/e-charset-combo-box.c +++ b/e-util/e-charset-combo-box.c @@ -220,32 +220,6 @@ charset_combo_box_get_property (GObject *object, } static void -charset_combo_box_constructed (GObject *object) -{ - ECharsetComboBoxPrivate *priv; - GtkRadioAction *radio_action; - GSList *group; - - priv = E_CHARSET_COMBO_BOX_GET_PRIVATE (object); - - /* Chain up to parent's constructed() method. */ - G_OBJECT_CLASS (e_charset_combo_box_parent_class)->constructed (object); - - radio_action = priv->other_action; - group = gtk_radio_action_get_group (radio_action); - - e_action_combo_box_set_action ( - E_ACTION_COMBO_BOX (object), radio_action); - - e_action_combo_box_add_separator_after ( - E_ACTION_COMBO_BOX (object), g_slist_length (group)); - - g_signal_connect ( - object, "notify::charset", - G_CALLBACK (charset_combo_box_notify_charset_cb), NULL); -} - -static void charset_combo_box_dispose (GObject *object) { ECharsetComboBoxPrivate *priv; @@ -282,6 +256,32 @@ charset_combo_box_finalize (GObject *object) } static void +charset_combo_box_constructed (GObject *object) +{ + ECharsetComboBoxPrivate *priv; + GtkRadioAction *radio_action; + GSList *group; + + priv = E_CHARSET_COMBO_BOX_GET_PRIVATE (object); + + /* Chain up to parent's constructed() method. */ + G_OBJECT_CLASS (e_charset_combo_box_parent_class)->constructed (object); + + radio_action = priv->other_action; + group = gtk_radio_action_get_group (radio_action); + + e_action_combo_box_set_action ( + E_ACTION_COMBO_BOX (object), radio_action); + + e_action_combo_box_add_separator_after ( + E_ACTION_COMBO_BOX (object), g_slist_length (group)); + + g_signal_connect ( + object, "notify::charset", + G_CALLBACK (charset_combo_box_notify_charset_cb), NULL); +} + +static void charset_combo_box_changed (GtkComboBox *combo_box) { ECharsetComboBoxPrivate *priv; @@ -308,9 +308,9 @@ e_charset_combo_box_class_init (ECharsetComboBoxClass *class) object_class = G_OBJECT_CLASS (class); object_class->set_property = charset_combo_box_set_property; object_class->get_property = charset_combo_box_get_property; - object_class->constructed = charset_combo_box_constructed; object_class->dispose = charset_combo_box_dispose; object_class->finalize = charset_combo_box_finalize; + object_class->constructed = charset_combo_box_constructed; combo_box_class = GTK_COMBO_BOX_CLASS (class); combo_box_class->changed = charset_combo_box_changed; diff --git a/e-util/e-contact-store.c b/e-util/e-contact-store.c index 68dd1d09d9..b2b36db527 100644 --- a/e-util/e-contact-store.c +++ b/e-util/e-contact-store.c @@ -189,18 +189,18 @@ e_contact_store_class_init (EContactStoreClass *class) static void e_contact_store_tree_model_init (GtkTreeModelIface *iface) { - iface->get_flags = e_contact_store_get_flags; - iface->get_n_columns = e_contact_store_get_n_columns; + iface->get_flags = e_contact_store_get_flags; + iface->get_n_columns = e_contact_store_get_n_columns; iface->get_column_type = e_contact_store_get_column_type; - iface->get_iter = e_contact_store_get_iter; - iface->get_path = e_contact_store_get_path; - iface->get_value = e_contact_store_get_value; - iface->iter_next = e_contact_store_iter_next; - iface->iter_children = e_contact_store_iter_children; - iface->iter_has_child = e_contact_store_iter_has_child; + iface->get_iter = e_contact_store_get_iter; + iface->get_path = e_contact_store_get_path; + iface->get_value = e_contact_store_get_value; + iface->iter_next = e_contact_store_iter_next; + iface->iter_children = e_contact_store_iter_children; + iface->iter_has_child = e_contact_store_iter_has_child; iface->iter_n_children = e_contact_store_iter_n_children; - iface->iter_nth_child = e_contact_store_iter_nth_child; - iface->iter_parent = e_contact_store_iter_parent; + iface->iter_nth_child = e_contact_store_iter_nth_child; + iface->iter_parent = e_contact_store_iter_parent; } static void @@ -428,7 +428,7 @@ find_contact_by_view_and_uid (EContactStore *contact_store, for (i = 0; i < contacts->len; i++) { EContact *contact = g_ptr_array_index (contacts, i); - const gchar *uid = e_contact_get_const (contact, E_CONTACT_UID); + const gchar *uid = e_contact_get_const (contact, E_CONTACT_UID); if (uid && !strcmp (find_uid, uid)) return i; @@ -452,7 +452,7 @@ find_contact_by_uid (EContactStore *contact_store, for (j = 0; j < source->contacts->len; j++) { EContact *contact = g_ptr_array_index (source->contacts, j); - const gchar *uid = e_contact_get_const (contact, E_CONTACT_UID); + const gchar *uid = e_contact_get_const (contact, E_CONTACT_UID); if (!strcmp (find_uid, uid)) return get_contact_source_offset (contact_store, i) + j; @@ -573,7 +573,7 @@ view_contacts_removed (EContactStore *contact_store, for (l = uids; l; l = g_slist_next (l)) { const gchar *uid = l->data; - gint n = find_contact_by_view_and_uid (contact_store, client_view, uid); + gint n = find_contact_by_view_and_uid (contact_store, client_view, uid); EContact *contact; if (n < 0) { @@ -619,8 +619,8 @@ view_contacts_modified (EContactStore *contact_store, for (l = contacts; l; l = g_slist_next (l)) { EContact *cached_contact; EContact *contact = l->data; - const gchar *uid = e_contact_get_const (contact, E_CONTACT_UID); - gint n = find_contact_by_view_and_uid (contact_store, client_view, uid); + const gchar *uid = e_contact_get_const (contact, E_CONTACT_UID); + gint n = find_contact_by_view_and_uid (contact_store, client_view, uid); if (n < 0) { g_warning ("EContactStore got change notification on unknown contact!"); @@ -671,7 +671,7 @@ view_complete (EContactStore *contact_store, /* Deletions */ for (i = 0; i < source->contacts->len; i++) { EContact *old_contact = g_ptr_array_index (source->contacts, i); - const gchar *old_uid = e_contact_get_const (old_contact, E_CONTACT_UID); + const gchar *old_uid = e_contact_get_const (old_contact, E_CONTACT_UID); gint result; result = find_contact_by_view_and_uid (contact_store, source->client_view_pending, old_uid); @@ -687,7 +687,7 @@ view_complete (EContactStore *contact_store, /* Insertions */ for (i = 0; i < source->contacts_pending->len; i++) { EContact *new_contact = g_ptr_array_index (source->contacts_pending, i); - const gchar *new_uid = e_contact_get_const (new_contact, E_CONTACT_UID); + const gchar *new_uid = e_contact_get_const (new_contact, E_CONTACT_UID); gint result; result = find_contact_by_view_and_uid (contact_store, source->client_view, new_uid); @@ -837,7 +837,7 @@ clear_contact_source (EContactStore *contact_store, free_contact_ptrarray (source->contacts_pending); source->client_view_pending = NULL; - source->contacts_pending = NULL; + source->contacts_pending = NULL; } } diff --git a/e-util/e-dateedit.c b/e-util/e-dateedit.c index 63e19c80ee..d9decd353f 100644 --- a/e-util/e-dateedit.c +++ b/e-util/e-dateedit.c @@ -543,7 +543,7 @@ create_children (EDateEdit *dedit) priv = dedit->priv; - priv->date_entry = gtk_entry_new (); + priv->date_entry = gtk_entry_new (); a11y = gtk_widget_get_accessible (priv->date_entry); atk_object_set_description (a11y, _("Text entry to input date")); atk_object_set_name (a11y, _("Date")); @@ -1688,8 +1688,8 @@ hide_date_popup (EDateEdit *dedit) } /* some locales may not define am/pm equivalents for '%p', - thus force 24 hour format for these, otherwise the am/pm - time clashes */ + * thus force 24 hour format for these, otherwise the am/pm + * time clashes */ static gboolean date_edit_use_24_hour_format (gboolean use_24_hour_format) { @@ -1703,16 +1703,16 @@ date_edit_use_24_hour_format (gboolean use_24_hour_format) tmp_tm.tm_year = 2000; tmp_tm.tm_mon = 0; tmp_tm.tm_mday = 1; - tmp_tm.tm_sec = 0; + tmp_tm.tm_sec = 0; tmp_tm.tm_isdst = 0; tmp_tm.tm_hour = 1; - tmp_tm.tm_min = 0; + tmp_tm.tm_min = 0; if (e_utf8_strftime (buffer, sizeof (buffer), "%p", &tmp_tm) == 0) return TRUE; tmp_tm.tm_hour = 13; - tmp_tm.tm_min = 0; + tmp_tm.tm_min = 0; if (e_utf8_strftime (buffer, sizeof (buffer), "%p", &tmp_tm) == 0) return TRUE; @@ -1744,7 +1744,7 @@ rebuild_time_popup (EDateEdit *dedit) tmp_tm.tm_year = 2000; tmp_tm.tm_mon = 0; tmp_tm.tm_mday = 1; - tmp_tm.tm_sec = 0; + tmp_tm.tm_sec = 0; tmp_tm.tm_isdst = 0; use_24_hour_format = date_edit_use_24_hour_format (priv->use_24_hour_format); @@ -1761,7 +1761,7 @@ rebuild_time_popup (EDateEdit *dedit) min == 0 || (min < 60 && hour != priv->upper_hour); min += 30) { tmp_tm.tm_hour = hour; - tmp_tm.tm_min = min; + tmp_tm.tm_min = min; e_time_format_time ( &tmp_tm, use_24_hour_format, 0, diff --git a/e-util/e-destination-store.c b/e-util/e-destination-store.c index 7a983cf1ce..0b705e1190 100644 --- a/e-util/e-destination-store.c +++ b/e-util/e-destination-store.c @@ -139,18 +139,18 @@ e_destination_store_class_init (EDestinationStoreClass *class) static void e_destination_store_tree_model_init (GtkTreeModelIface *iface) { - iface->get_flags = e_destination_store_get_flags; - iface->get_n_columns = e_destination_store_get_n_columns; + iface->get_flags = e_destination_store_get_flags; + iface->get_n_columns = e_destination_store_get_n_columns; iface->get_column_type = e_destination_store_get_column_type; - iface->get_iter = e_destination_store_get_iter; - iface->get_path = e_destination_store_get_path; - iface->get_value = e_destination_store_get_value; - iface->iter_next = e_destination_store_iter_next; - iface->iter_children = e_destination_store_iter_children; - iface->iter_has_child = e_destination_store_iter_has_child; + iface->get_iter = e_destination_store_get_iter; + iface->get_path = e_destination_store_get_path; + iface->get_value = e_destination_store_get_value; + iface->iter_next = e_destination_store_iter_next; + iface->iter_children = e_destination_store_iter_children; + iface->iter_has_child = e_destination_store_iter_has_child; iface->iter_n_children = e_destination_store_iter_n_children; - iface->iter_nth_child = e_destination_store_iter_nth_child; - iface->iter_parent = e_destination_store_iter_parent; + iface->iter_nth_child = e_destination_store_iter_nth_child; + iface->iter_parent = e_destination_store_iter_parent; } static void diff --git a/e-util/e-dialog-widgets.c b/e-util/e-dialog-widgets.c index 1a64b4b1b9..1386002973 100644 --- a/e-util/e-dialog-widgets.c +++ b/e-util/e-dialog-widgets.c @@ -147,7 +147,7 @@ e_dialog_combo_box_get (GtkWidget *widget, **/ GtkWidget * e_dialog_button_new_with_icon (const gchar *icon_name, - const gchar *label) + const gchar *label) { GtkIconSize icon_size = GTK_ICON_SIZE_BUTTON; GtkWidget *button; @@ -160,7 +160,8 @@ e_dialog_button_new_with_icon (const gchar *icon_name, } if (icon_name) - gtk_button_set_image (GTK_BUTTON (button), + gtk_button_set_image ( + GTK_BUTTON (button), gtk_image_new_from_icon_name (icon_name, icon_size)); gtk_widget_show (button); diff --git a/e-util/e-filter-input.c b/e-util/e-filter-input.c index 512cf2dce1..6dbcc7e88a 100644 --- a/e-util/e-filter-input.c +++ b/e-util/e-filter-input.c @@ -169,7 +169,7 @@ filter_input_eq (EFilterElement *element_a, static void filter_input_xml_create (EFilterElement *element, - xmlNodePtr node) + xmlNodePtr node) { EFilterInput *input = E_FILTER_INPUT (element); gchar *allow_empty; diff --git a/e-util/e-focus-tracker.c b/e-util/e-focus-tracker.c index 42cd634202..0879a16c1d 100644 --- a/e-util/e-focus-tracker.c +++ b/e-util/e-focus-tracker.c @@ -100,8 +100,8 @@ focus_tracker_disable_actions (EFocusTracker *focus_tracker) static void focus_tracker_update_undo_redo (EFocusTracker *focus_tracker, - GtkWidget *widget, - gboolean can_edit_text) + GtkWidget *widget, + gboolean can_edit_text) { GtkAction *action; gboolean sensitive; @@ -198,12 +198,11 @@ focus_tracker_editable_update_actions (EFocusTracker *focus_tracker, focus_tracker_update_undo_redo (focus_tracker, GTK_WIDGET (editable), can_edit_text); } - static void focus_tracker_text_view_update_actions (EFocusTracker *focus_tracker, - GtkTextView *text_view, - GdkAtom *targets, - gint n_targets) + GtkTextView *text_view, + GdkAtom *targets, + gint n_targets) { GtkAction *action; GtkTextBuffer *buffer; @@ -332,7 +331,6 @@ focus_tracker_targets_received_cb (GtkClipboard *clipboard, focus_tracker, GTK_TEXT_VIEW (focus), targets, n_targets); - g_object_unref (focus_tracker); } @@ -973,7 +971,7 @@ e_focus_tracker_get_undo_action (EFocusTracker *focus_tracker) void e_focus_tracker_set_undo_action (EFocusTracker *focus_tracker, - GtkAction *undo) + GtkAction *undo) { g_return_if_fail (E_IS_FOCUS_TRACKER (focus_tracker)); @@ -1011,7 +1009,7 @@ e_focus_tracker_get_redo_action (EFocusTracker *focus_tracker) void e_focus_tracker_set_redo_action (EFocusTracker *focus_tracker, - GtkAction *redo) + GtkAction *redo) { g_return_if_fail (E_IS_FOCUS_TRACKER (focus_tracker)); @@ -1065,20 +1063,26 @@ e_focus_tracker_cut_clipboard (EFocusTracker *focus_tracker) focus = e_focus_tracker_get_focus (focus_tracker); - if (E_IS_SELECTABLE (focus)) + if (E_IS_SELECTABLE (focus)) { e_selectable_cut_clipboard (E_SELECTABLE (focus)); - else if (GTK_IS_EDITABLE (focus)) + } else if (GTK_IS_EDITABLE (focus)) { gtk_editable_cut_clipboard (GTK_EDITABLE (focus)); - else if (GTK_IS_TEXT_VIEW (focus)) { - GtkTextView *text_view = GTK_TEXT_VIEW (focus); - GtkTextBuffer *buffer = gtk_text_view_get_buffer (text_view); - gboolean is_editable = gtk_text_view_get_editable (text_view); + } else if (GTK_IS_TEXT_VIEW (focus)) { + GtkClipboard *clipboard; + GtkTextView *text_view; + GtkTextBuffer *buffer; + gboolean is_editable; - gtk_text_buffer_cut_clipboard (buffer, - gtk_widget_get_clipboard (focus, GDK_SELECTION_CLIPBOARD), - is_editable); + clipboard = gtk_widget_get_clipboard ( + focus, GDK_SELECTION_CLIPBOARD); + + text_view = GTK_TEXT_VIEW (focus); + buffer = gtk_text_view_get_buffer (text_view); + is_editable = gtk_text_view_get_editable (text_view); + + gtk_text_buffer_cut_clipboard (buffer, clipboard, is_editable); } } @@ -1091,17 +1095,24 @@ e_focus_tracker_copy_clipboard (EFocusTracker *focus_tracker) focus = e_focus_tracker_get_focus (focus_tracker); - if (E_IS_SELECTABLE (focus)) + if (E_IS_SELECTABLE (focus)) { e_selectable_copy_clipboard (E_SELECTABLE (focus)); - else if (GTK_IS_EDITABLE (focus)) + } else if (GTK_IS_EDITABLE (focus)) { gtk_editable_copy_clipboard (GTK_EDITABLE (focus)); - else if (GTK_IS_TEXT_VIEW (focus)) { - GtkTextBuffer *buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (focus)); + } else if (GTK_IS_TEXT_VIEW (focus)) { + GtkClipboard *clipboard; + GtkTextView *text_view; + GtkTextBuffer *buffer; + + clipboard = gtk_widget_get_clipboard ( + focus, GDK_SELECTION_CLIPBOARD); + + text_view = GTK_TEXT_VIEW (focus); + buffer = gtk_text_view_get_buffer (text_view); - gtk_text_buffer_copy_clipboard (buffer, - gtk_widget_get_clipboard (focus, GDK_SELECTION_CLIPBOARD)); + gtk_text_buffer_copy_clipboard (buffer, clipboard); } } @@ -1114,20 +1125,27 @@ e_focus_tracker_paste_clipboard (EFocusTracker *focus_tracker) focus = e_focus_tracker_get_focus (focus_tracker); - if (E_IS_SELECTABLE (focus)) + if (E_IS_SELECTABLE (focus)) { e_selectable_paste_clipboard (E_SELECTABLE (focus)); - else if (GTK_IS_EDITABLE (focus)) + } else if (GTK_IS_EDITABLE (focus)) { gtk_editable_paste_clipboard (GTK_EDITABLE (focus)); - else if (GTK_IS_TEXT_VIEW (focus)) { + } else if (GTK_IS_TEXT_VIEW (focus)) { + GtkClipboard *clipboard; GtkTextView *text_view = GTK_TEXT_VIEW (focus); GtkTextBuffer *buffer = gtk_text_view_get_buffer (text_view); gboolean is_editable = gtk_text_view_get_editable (text_view); - gtk_text_buffer_paste_clipboard (buffer, - gtk_widget_get_clipboard (focus, GDK_SELECTION_CLIPBOARD), - NULL, is_editable); + clipboard = gtk_widget_get_clipboard ( + focus, GDK_SELECTION_CLIPBOARD); + + text_view = GTK_TEXT_VIEW (focus); + buffer = gtk_text_view_get_buffer (text_view); + is_editable = gtk_text_view_get_editable (text_view); + + gtk_text_buffer_paste_clipboard ( + buffer, clipboard, NULL, is_editable); } } @@ -1140,16 +1158,20 @@ e_focus_tracker_delete_selection (EFocusTracker *focus_tracker) focus = e_focus_tracker_get_focus (focus_tracker); - if (E_IS_SELECTABLE (focus)) + if (E_IS_SELECTABLE (focus)) { e_selectable_delete_selection (E_SELECTABLE (focus)); - else if (GTK_IS_EDITABLE (focus)) + } else if (GTK_IS_EDITABLE (focus)) { gtk_editable_delete_selection (GTK_EDITABLE (focus)); - else if (GTK_IS_TEXT_VIEW (focus)) { - GtkTextView *text_view = GTK_TEXT_VIEW (focus); - GtkTextBuffer *buffer = gtk_text_view_get_buffer (text_view); - gboolean is_editable = gtk_text_view_get_editable (text_view); + } else if (GTK_IS_TEXT_VIEW (focus)) { + GtkTextView *text_view; + GtkTextBuffer *buffer; + gboolean is_editable; + + text_view = GTK_TEXT_VIEW (focus); + buffer = gtk_text_view_get_buffer (text_view); + is_editable = gtk_text_view_get_editable (text_view); gtk_text_buffer_delete_selection (buffer, TRUE, is_editable); } @@ -1164,16 +1186,20 @@ e_focus_tracker_select_all (EFocusTracker *focus_tracker) focus = e_focus_tracker_get_focus (focus_tracker); - if (E_IS_SELECTABLE (focus)) + if (E_IS_SELECTABLE (focus)) { e_selectable_select_all (E_SELECTABLE (focus)); - else if (GTK_IS_EDITABLE (focus)) + } else if (GTK_IS_EDITABLE (focus)) { gtk_editable_select_region (GTK_EDITABLE (focus), 0, -1); - else if (GTK_IS_TEXT_VIEW (focus)) { - GtkTextBuffer *buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (focus)); + } else if (GTK_IS_TEXT_VIEW (focus)) { + GtkTextView *text_view; + GtkTextBuffer *buffer; GtkTextIter start, end; + text_view = GTK_TEXT_VIEW (focus); + buffer = gtk_text_view_get_buffer (text_view); + gtk_text_buffer_get_bounds (buffer, &start, &end); gtk_text_buffer_select_range (buffer, &start, &end); } diff --git a/e-util/e-map.c b/e-util/e-map.c index 2451e4bd6a..ae472eb863 100644 --- a/e-util/e-map.c +++ b/e-util/e-map.c @@ -1308,8 +1308,8 @@ update_render_point (EMap *map, cr, ((point->rgba >> 24) & 0xff) / 255.0, ((point->rgba >> 16) & 0xff) / 255.0, - ((point->rgba >> 8) & 0xff) / 255.0, - ( point->rgba & 0xff) / 255.0); + ((point->rgba >> 8) & 0xff) / 255.0, + ( point->rgba & 0xff) / 255.0); mask = cairo_image_surface_create_for_data (mask2, CAIRO_FORMAT_A8, 3, 3, 4); cairo_mask_surface (cr, mask, px - 1, py - 1); cairo_surface_destroy (mask); diff --git a/e-util/e-menu-tool-action.c b/e-util/e-menu-tool-action.c index 29fe4d5a74..bc4e9b23c9 100644 --- a/e-util/e-menu-tool-action.c +++ b/e-util/e-menu-tool-action.c @@ -52,6 +52,8 @@ e_menu_tool_action_new (const gchar *name, return g_object_new ( E_TYPE_MENU_TOOL_ACTION, - "name", name, "label", label, "tooltip", - tooltip, NULL); + "name", name, + "label", label, + "tooltip", tooltip, + NULL); } diff --git a/e-util/e-misc-utils.h b/e-util/e-misc-utils.h index 54c8d157dc..cb262c7f76 100644 --- a/e-util/e-misc-utils.h +++ b/e-util/e-misc-utils.h @@ -45,7 +45,7 @@ typedef enum { } EFocus; typedef enum { - E_RESTORE_WINDOW_SIZE = 1 << 0, + E_RESTORE_WINDOW_SIZE = 1 << 0, E_RESTORE_WINDOW_POSITION = 1 << 1 } ERestoreWindowFlags; diff --git a/e-util/e-name-selector-dialog.c b/e-util/e-name-selector-dialog.c index e045a067e1..8bc9131594 100644 --- a/e-util/e-name-selector-dialog.c +++ b/e-util/e-name-selector-dialog.c @@ -946,8 +946,8 @@ add_section (ENameSelectorDialog *name_selector_dialog, "valign", GTK_ALIGN_FILL, NULL); section.label = GTK_LABEL (gtk_label_new_with_mnemonic (pretty_name)); - section.transfer_button = GTK_BUTTON (gtk_button_new ()); - section.remove_button = GTK_BUTTON (gtk_button_new ()); + section.transfer_button = GTK_BUTTON (gtk_button_new ()); + section.remove_button = GTK_BUTTON (gtk_button_new ()); section.destination_view = make_tree_view_for_section (name_selector_dialog, destination_store); gtk_label_set_mnemonic_widget (GTK_LABEL (section.label), GTK_WIDGET (section.destination_view)); diff --git a/e-util/e-name-selector-entry.c b/e-util/e-name-selector-entry.c index b45e16efcb..0f872e718f 100644 --- a/e-util/e-name-selector-entry.c +++ b/e-util/e-name-selector-entry.c @@ -93,10 +93,10 @@ G_DEFINE_TYPE_WITH_CODE ( /* 1/20 of a second to wait until show the completion results */ #define SHOW_RESULT_TIMEOUT 50 -#define re_set_timeout(id,func,ptr,tout) G_STMT_START { \ - if (id) \ - g_source_remove (id); \ - id = e_named_timeout_add (tout, func, ptr); \ +#define re_set_timeout(id,func,ptr,tout) G_STMT_START { \ + if (id) \ + g_source_remove (id); \ + id = e_named_timeout_add (tout, func, ptr); \ } G_STMT_END static void destination_row_inserted (ENameSelectorEntry *name_selector_entry, GtkTreePath *path, GtkTreeIter *iter); @@ -459,9 +459,9 @@ get_range_at_position (const gchar *string, gint *end_pos) { const gchar *p; - gboolean quoted = FALSE; + gboolean quoted = FALSE; gint local_start_pos = 0; - gint local_end_pos = 0; + gint local_end_pos = 0; gint i; if (!string || !*string) @@ -523,7 +523,7 @@ get_index_at_position (const gchar *string, { const gchar *p; gboolean quoted = FALSE; - gint n = 0; + gint n = 0; gint i; for (p = string, i = 0; *p && i < pos; p = g_utf8_next_char (p), i++) { @@ -577,7 +577,7 @@ get_address_at_position (const gchar *string, return NULL; start_p = g_utf8_offset_to_pointer (string, start_pos); - end_p = g_utf8_offset_to_pointer (string, end_pos); + end_p = g_utf8_offset_to_pointer (string, end_pos); return g_strndup (start_p, end_p - start_p); } @@ -766,10 +766,10 @@ set_completion_query (ENameSelectorEntry *name_selector_entry, return; } - encoded_cue_str = escape_sexp_string (cue_str); + encoded_cue_str = escape_sexp_string (cue_str); full_name_query_str = name_style_query ("full_name", cue_str); - file_as_query_str = name_style_query ("file_as", cue_str); - user_fields_str = ens_util_populate_user_query_fields (priv->user_query_fields, cue_str, encoded_cue_str); + file_as_query_str = name_style_query ("file_as", cue_str); + user_fields_str = ens_util_populate_user_query_fields (priv->user_query_fields, cue_str, encoded_cue_str); query_str = g_strdup_printf ( "(or " @@ -834,7 +834,7 @@ static gchar * build_textrep_for_contact (EContact *contact, EContactField cue_field) { - gchar *name = NULL; + gchar *name = NULL; gchar *email = NULL; gchar *textrep; @@ -842,7 +842,7 @@ build_textrep_for_contact (EContact *contact, case E_CONTACT_FULL_NAME: case E_CONTACT_NICKNAME: case E_CONTACT_FILE_AS: - name = e_contact_get (contact, cue_field); + name = e_contact_get (contact, cue_field); email = e_contact_get (contact, E_CONTACT_EMAIL_1); break; @@ -947,7 +947,7 @@ find_existing_completion (ENameSelectorEntry *name_selector_entry, EBookClient **book_client) { GtkTreeIter iter; - EContact *best_contact = NULL; + EContact *best_contact = NULL; gint best_field_rank = G_MAXINT; EContactField best_field = 0; EBookClient *best_book_client = NULL; @@ -974,9 +974,9 @@ find_existing_completion (ENameSelectorEntry *name_selector_entry, matches = contact_match_cue (name_selector_entry, current_contact, cue_str, ¤t_field, ¤t_field_rank); if (matches && current_field_rank < best_field_rank) { - best_contact = current_contact; + best_contact = current_contact; best_field_rank = current_field_rank; - best_field = current_field; + best_field = current_field; best_book_client = e_contact_store_get_client (name_selector_entry->priv->contact_store, &iter); } } while (gtk_tree_model_iter_next (GTK_TREE_MODEL (name_selector_entry->priv->contact_store), &iter)); @@ -1062,8 +1062,8 @@ type_ahead_complete (ENameSelectorEntry *name_selector_entry) EDestination *destination; gint cursor_pos; gint range_start = 0; - gint range_end = 0; - gint pos = 0; + gint range_end = 0; + gint pos = 0; gchar *textrep; gint textrep_len; gint range_len; @@ -1098,7 +1098,7 @@ type_ahead_complete (ENameSelectorEntry *name_selector_entry) textrep = temp_str; textrep_len = g_utf8_strlen (textrep, -1); - pos = range_start; + pos = range_start; g_signal_handlers_block_by_func ( name_selector_entry, @@ -1171,9 +1171,9 @@ update_completion_model (ENameSelectorEntry *name_selector_entry) const gchar *text; gint cursor_pos; gint range_start = 0; - gint range_end = 0; + gint range_end = 0; - text = gtk_entry_get_text (GTK_ENTRY (name_selector_entry)); + text = gtk_entry_get_text (GTK_ENTRY (name_selector_entry)); cursor_pos = gtk_editable_get_position (GTK_EDITABLE (name_selector_entry)); if (cursor_pos >= 0) @@ -1423,7 +1423,7 @@ insert_unichar (ENameSelectorEntry *name_selector_entry, gint start_pos; gint end_pos; gboolean at_start = FALSE; - gboolean at_end = FALSE; + gboolean at_end = FALSE; if (str_context[1] == ',' || str_context[1] == '\0') return 0; @@ -1579,7 +1579,7 @@ user_delete_text (ENameSelectorEntry *name_selector_entry, } index_start = get_index_at_position (text, start_pos); - index_end = get_index_at_position (text, end_pos); + index_end = get_index_at_position (text, end_pos); g_signal_stop_emission_by_name (name_selector_entry, "delete_text"); @@ -1631,7 +1631,7 @@ user_delete_text (ENameSelectorEntry *name_selector_entry, /* Do the actual deletion */ - if (end_pos == start_pos +1 && index_end == index_start) { + if (end_pos == start_pos +1 && index_end == index_start) { /* We could be just deleting the empty text */ gchar *c; @@ -1643,7 +1643,7 @@ user_delete_text (ENameSelectorEntry *name_selector_entry, del_space = TRUE; } g_free (c); - } else if (end_pos == start_pos +1 && index_end == index_start + 1) { + } else if (end_pos == start_pos +1 && index_end == index_start + 1) { /* We could be just deleting the empty text */ gchar *c; @@ -1663,9 +1663,9 @@ user_delete_text (ENameSelectorEntry *name_selector_entry, /* If we have deleted the last comma, let us autocomplete normally */ - if (dest && len - end_pos != 0) { + if (dest && len - end_pos != 0) { - EDestination *destination1 = find_destination_by_index (name_selector_entry, index_start); + EDestination *destination1 = find_destination_by_index (name_selector_entry, index_start); gchar *ttext; const gchar *email = NULL; @@ -2061,7 +2061,7 @@ contact_layout_pixbuffer (GtkCellLayout *cell_layout, return; } - photo = e_contact_get (contact, E_CONTACT_PHOTO); + photo = e_contact_get (contact, E_CONTACT_PHOTO); if (photo && photo->type == E_CONTACT_PHOTO_TYPE_INLINED) { guint max_height = entry_height (GTK_WIDGET (name_selector_entry)); GdkPixbufLoader *loader; @@ -2378,7 +2378,7 @@ destination_row_inserted (ENameSelectorEntry *name_selector_entry, const gchar *entry_text; gchar *text; gboolean comma_before = FALSE; - gboolean comma_after = FALSE; + gboolean comma_after = FALSE; gint range_start, range_end; gint insert_pos; gint n; @@ -2676,7 +2676,7 @@ eab_parse_qp_email (const gchar *string, return FALSE; /* report success only when we have filled both name and email address */ - if (address->type == CAMEL_HEADER_ADDRESS_NAME && address->name && *address->name && address->v.addr && *address->v.addr) { + if (address->type == CAMEL_HEADER_ADDRESS_NAME && address->name && *address->name && address->v.addr && *address->v.addr) { *name = g_strdup (address->name); *email = g_strdup (address->v.addr); res = TRUE; diff --git a/e-util/e-name-selector-list.c b/e-util/e-name-selector-list.c index f2d2a064bc..7375c47d4e 100644 --- a/e-util/e-name-selector-list.c +++ b/e-util/e-name-selector-list.c @@ -294,7 +294,7 @@ enl_entry_key_press_event (ENameSelectorList *list, entry = E_NAME_SELECTOR_ENTRY (list); store = e_name_selector_entry_peek_destination_store (entry); - if ( (event->state & GDK_CONTROL_MASK) && (event->keyval == GDK_KEY_Down)) { + if ( (event->state & GDK_CONTROL_MASK) && (event->keyval == GDK_KEY_Down)) { enl_popup_position (list); gtk_widget_show_all (GTK_WIDGET (list->priv->popup)); enl_popup_grab (list, (GdkEvent *) event); @@ -751,7 +751,7 @@ e_name_selector_list_init (ENameSelectorList *list) gtk_widget_set_vexpand (scroll, TRUE); gtk_widget_set_valign (scroll, GTK_ALIGN_FILL); - list->priv->popup = GTK_WINDOW (gtk_window_new (GTK_WINDOW_POPUP)); + list->priv->popup = GTK_WINDOW (gtk_window_new (GTK_WINDOW_POPUP)); gtk_window_set_resizable (GTK_WINDOW (list->priv->popup), FALSE); popup_frame = gtk_frame_new (NULL); diff --git a/e-util/e-name-selector-model.c b/e-util/e-name-selector-model.c index 48d79e8923..5b3690d6e4 100644 --- a/e-util/e-name-selector-model.c +++ b/e-util/e-name-selector-model.c @@ -75,8 +75,8 @@ e_name_selector_model_init (ENameSelectorModel *name_selector_model) name_selector_model->priv = E_NAME_SELECTOR_MODEL_GET_PRIVATE (name_selector_model); - name_selector_model->priv->sections = g_array_new (FALSE, FALSE, sizeof (Section)); - name_selector_model->priv->contact_store = e_contact_store_new (); + name_selector_model->priv->sections = g_array_new (FALSE, FALSE, sizeof (Section)); + name_selector_model->priv->contact_store = e_contact_store_new (); name_selector_model->priv->contact_filter = e_tree_model_generator_new (GTK_TREE_MODEL (name_selector_model->priv->contact_store)); @@ -478,8 +478,8 @@ e_name_selector_model_add_section (ENameSelectorModel *name_selector_model, memset (§ion, 0, sizeof (Section)); - section.name = g_strdup (name); - section.pretty_name = g_strdup (pretty_name); + section.name = g_strdup (name); + section.pretty_name = g_strdup (pretty_name); if (destination_store) section.destination_store = g_object_ref (destination_store); diff --git a/e-util/e-paned.c b/e-util/e-paned.c index c52c5455fe..f56a06796c 100644 --- a/e-util/e-paned.c +++ b/e-util/e-paned.c @@ -41,9 +41,9 @@ struct _EPanedPrivate { gulong wse_handler_id; - guint fixed_resize : 1; - guint sync_request : 2; - guint toplevel_ready : 1; + guint fixed_resize : 1; + guint sync_request : 2; + guint toplevel_ready : 1; }; enum { diff --git a/e-util/e-reflow-model.c b/e-util/e-reflow-model.c index dcb543a07a..6af3c46f06 100644 --- a/e-util/e-reflow-model.c +++ b/e-util/e-reflow-model.c @@ -214,17 +214,17 @@ e_reflow_model_class_init (EReflowModelClass *class) { GObjectClass *object_class = G_OBJECT_CLASS (class); - class->set_width = NULL; - class->count = NULL; - class->height = NULL; - class->incarnate = NULL; - class->reincarnate = NULL; - - class->model_changed = NULL; - class->comparison_changed = NULL; + class->set_width = NULL; + class->count = NULL; + class->height = NULL; + class->incarnate = NULL; + class->reincarnate = NULL; + + class->model_changed = NULL; + class->comparison_changed = NULL; class->model_items_inserted = NULL; - class->model_item_removed = NULL; - class->model_item_changed = NULL; + class->model_item_removed = NULL; + class->model_item_changed = NULL; signals[MODEL_CHANGED] = g_signal_new ( "model_changed", diff --git a/e-util/e-reflow.c b/e-util/e-reflow.c index d0707c1eac..0d0be54d80 100644 --- a/e-util/e-reflow.c +++ b/e-util/e-reflow.c @@ -619,12 +619,12 @@ disconnect_model (EReflow *reflow) reflow->model_item_changed_id); g_object_unref (reflow->model); - reflow->model_changed_id = 0; - reflow->comparison_changed_id = 0; + reflow->model_changed_id = 0; + reflow->comparison_changed_id = 0; reflow->model_items_inserted_id = 0; - reflow->model_item_removed_id = 0; - reflow->model_item_changed_id = 0; - reflow->model = NULL; + reflow->model_item_removed_id = 0; + reflow->model_item_changed_id = 0; + reflow->model = NULL; } static void @@ -647,7 +647,7 @@ disconnect_selection (EReflow *reflow) reflow->selection_changed_id = 0; reflow->selection_row_changed_id = 0; reflow->cursor_changed_id = 0; - reflow->selection = NULL; + reflow->selection = NULL; } static void @@ -879,10 +879,10 @@ e_reflow_dispose (GObject *object) g_free (reflow->heights); g_free (reflow->columns); - reflow->items = NULL; - reflow->heights = NULL; - reflow->columns = NULL; - reflow->count = 0; + reflow->items = NULL; + reflow->heights = NULL; + reflow->columns = NULL; + reflow->count = 0; reflow->allocated_count = 0; if (reflow->incarnate_idle_id) @@ -1571,17 +1571,17 @@ e_reflow_class_init (EReflowClass *class) object_class = (GObjectClass *) class; item_class = (GnomeCanvasItemClass *) class; - object_class->set_property = e_reflow_set_property; - object_class->get_property = e_reflow_get_property; - object_class->dispose = e_reflow_dispose; + object_class->set_property = e_reflow_set_property; + object_class->get_property = e_reflow_get_property; + object_class->dispose = e_reflow_dispose; /* GnomeCanvasItem method overrides */ - item_class->event = e_reflow_event; - item_class->realize = e_reflow_realize; - item_class->unrealize = e_reflow_unrealize; - item_class->draw = e_reflow_draw; - item_class->update = e_reflow_update; - item_class->point = e_reflow_point; + item_class->event = e_reflow_event; + item_class->realize = e_reflow_realize; + item_class->unrealize = e_reflow_unrealize; + item_class->draw = e_reflow_draw; + item_class->update = e_reflow_update; + item_class->point = e_reflow_point; class->selection_event = e_reflow_selection_event_real; class->column_width_changed = NULL; @@ -1671,44 +1671,44 @@ e_reflow_class_init (EReflowClass *class) static void e_reflow_init (EReflow *reflow) { - reflow->model = NULL; - reflow->items = NULL; - reflow->heights = NULL; - reflow->count = 0; + reflow->model = NULL; + reflow->items = NULL; + reflow->heights = NULL; + reflow->count = 0; - reflow->columns = NULL; - reflow->column_count = 0; + reflow->columns = NULL; + reflow->column_count = 0; - reflow->empty_text = NULL; - reflow->empty_message = NULL; + reflow->empty_text = NULL; + reflow->empty_message = NULL; - reflow->minimum_width = 10; - reflow->width = 10; - reflow->height = 10; + reflow->minimum_width = 10; + reflow->width = 10; + reflow->height = 10; - reflow->column_width = 150; + reflow->column_width = 150; - reflow->column_drag = FALSE; + reflow->column_drag = FALSE; - reflow->need_height_update = FALSE; - reflow->need_column_resize = FALSE; - reflow->need_reflow_columns = FALSE; + reflow->need_height_update = FALSE; + reflow->need_column_resize = FALSE; + reflow->need_reflow_columns = FALSE; - reflow->maybe_did_something = FALSE; - reflow->maybe_in_drag = FALSE; + reflow->maybe_did_something = FALSE; + reflow->maybe_in_drag = FALSE; - reflow->default_cursor_shown = TRUE; - reflow->arrow_cursor = NULL; - reflow->default_cursor = NULL; + reflow->default_cursor_shown = TRUE; + reflow->arrow_cursor = NULL; + reflow->default_cursor = NULL; - reflow->cursor_row = -1; + reflow->cursor_row = -1; - reflow->incarnate_idle_id = 0; - reflow->do_adjustment_idle_id = 0; + reflow->incarnate_idle_id = 0; + reflow->do_adjustment_idle_id = 0; reflow->set_scroll_adjustments_id = 0; - reflow->selection = E_SELECTION_MODEL (e_selection_model_simple_new ()); - reflow->sorter = e_sorter_array_new (er_create_cmp_cache, er_compare, reflow); + reflow->selection = E_SELECTION_MODEL (e_selection_model_simple_new ()); + reflow->sorter = e_sorter_array_new (er_create_cmp_cache, er_compare, reflow); g_object_set ( reflow->selection, diff --git a/e-util/e-rule-context.h b/e-util/e-rule-context.h index 604b49eb24..0c35958449 100644 --- a/e-util/e-rule-context.h +++ b/e-util/e-rule-context.h @@ -60,7 +60,7 @@ typedef struct _ERuleContextPrivate ERuleContextPrivate; /* backend capabilities, this is a hack since we don't support nested rules */ enum { - E_RULE_CONTEXT_GROUPING = 1 << 0, + E_RULE_CONTEXT_GROUPING = 1 << 0, E_RULE_CONTEXT_THREADING = 1 << 1 }; diff --git a/e-util/e-selection-model-array.c b/e-util/e-selection-model-array.c index 71ecfa9f81..05b570d2fa 100644 --- a/e-util/e-selection-model-array.c +++ b/e-util/e-selection-model-array.c @@ -537,24 +537,24 @@ e_selection_model_array_class_init (ESelectionModelArrayClass *class) object_class->get_property = esma_get_property; object_class->set_property = esma_set_property; - esm_class->is_row_selected = esma_is_row_selected; - esm_class->foreach = esma_foreach; - esm_class->clear = esma_clear; - esm_class->selected_count = esma_selected_count; - esm_class->select_all = esma_select_all; - esm_class->row_count = esma_row_count; - - esm_class->change_one_row = esma_change_one_row; - esm_class->change_cursor = esma_change_cursor; - esm_class->cursor_row = esma_cursor_row; - esm_class->cursor_col = esma_cursor_col; - - esm_class->select_single_row = esma_select_single_row; - esm_class->toggle_single_row = esma_toggle_single_row; + esm_class->is_row_selected = esma_is_row_selected; + esm_class->foreach = esma_foreach; + esm_class->clear = esma_clear; + esm_class->selected_count = esma_selected_count; + esm_class->select_all = esma_select_all; + esm_class->row_count = esma_row_count; + + esm_class->change_one_row = esma_change_one_row; + esm_class->change_cursor = esma_change_cursor; + esm_class->cursor_row = esma_cursor_row; + esm_class->cursor_col = esma_cursor_col; + + esm_class->select_single_row = esma_select_single_row; + esm_class->toggle_single_row = esma_toggle_single_row; esm_class->move_selection_end = esma_move_selection_end; - esm_class->set_selection_end = esma_set_selection_end; + esm_class->set_selection_end = esma_set_selection_end; - class->get_row_count = NULL; + class->get_row_count = NULL; g_object_class_install_property ( object_class, diff --git a/e-util/e-send-options.c b/e-util/e-send-options.c index 0b56969167..ab6ba3da55 100644 --- a/e-util/e-send-options.c +++ b/e-util/e-send-options.c @@ -684,7 +684,7 @@ e_send_options_dialog_run (ESendOptionsDialog *sod, setup_widgets (sod, type); - toplevel = gtk_widget_get_toplevel (priv->main); + toplevel = gtk_widget_get_toplevel (priv->main); if (parent) gtk_window_set_transient_for (GTK_WINDOW (toplevel), GTK_WINDOW (parent)); diff --git a/e-util/e-source-selector.c b/e-util/e-source-selector.c index 5d180acb75..e540248047 100644 --- a/e-util/e-source-selector.c +++ b/e-util/e-source-selector.c @@ -103,16 +103,16 @@ typedef GtkCellRendererToggle ECellRendererSafeToggle; typedef GtkCellRendererToggleClass ECellRendererSafeToggleClass; /* Forward Declarations */ -GType e_cell_renderer_safe_toggle_get_type (void); +GType e_cell_renderer_safe_toggle_get_type + (void) G_GNUC_CONST; +static void selection_changed_callback (GtkTreeSelection *selection, + ESourceSelector *selector); G_DEFINE_TYPE ( ECellRendererSafeToggle, e_cell_renderer_safe_toggle, GTK_TYPE_CELL_RENDERER_TOGGLE) -static void selection_changed_callback (GtkTreeSelection *selection, - ESourceSelector *selector); - static gboolean safe_toggle_activate (GtkCellRenderer *cell, GdkEvent *event, @@ -365,7 +365,8 @@ source_selector_build_model (ESourceSelector *selector) selected = e_source_selector_ref_primary_selection (selector); selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (selector)); - /* Signal is blocked to avoid "primary-selection-changed" signal on model clear */ + /* Signal is blocked to avoid "primary-selection-changed" signal + * on model clear. */ g_signal_handlers_block_matched ( selection, G_SIGNAL_MATCH_FUNC, 0, 0, NULL, selection_changed_callback, NULL); @@ -414,8 +415,9 @@ source_selector_build_model (ESourceSelector *selector) g_object_unref (selected); } - /* If the first succeeded, then there is no selection change, thus no need - for notification; notify about the change in ay other cases */ + /* If the first succeeded, then there is no selection change, + * thus no need for notification; notify about the change in + * any other cases. */ g_signal_handlers_unblock_matched ( selection, G_SIGNAL_MATCH_FUNC, 0, 0, NULL, selection_changed_callback, NULL); @@ -464,7 +466,11 @@ source_selector_source_added_cb (ESourceRegistry *registry, const gchar *extension_name; extension_name = e_source_selector_get_extension_name (selector); - if (!extension_name || !e_source_has_extension (source, extension_name)) + + if (extension_name == NULL) + return; + + if (!e_source_has_extension (source, extension_name)) return; source_selector_build_model (selector); @@ -480,7 +486,11 @@ source_selector_source_changed_cb (ESourceRegistry *registry, const gchar *extension_name; extension_name = e_source_selector_get_extension_name (selector); - if (!extension_name || !e_source_has_extension (source, extension_name)) + + if (extension_name == NULL) + return; + + if (!e_source_has_extension (source, extension_name)) return; source_selector_cancel_write (selector, source); @@ -496,7 +506,11 @@ source_selector_source_removed_cb (ESourceRegistry *registry, const gchar *extension_name; extension_name = e_source_selector_get_extension_name (selector); - if (!extension_name || !e_source_has_extension (source, extension_name)) + + if (extension_name == NULL) + return; + + if (!e_source_has_extension (source, extension_name)) return; source_selector_build_model (selector); @@ -510,7 +524,11 @@ source_selector_source_enabled_cb (ESourceRegistry *registry, const gchar *extension_name; extension_name = e_source_selector_get_extension_name (selector); - if (!extension_name || !e_source_has_extension (source, extension_name)) + + if (extension_name == NULL) + return; + + if (!e_source_has_extension (source, extension_name)) return; source_selector_build_model (selector); @@ -526,7 +544,11 @@ source_selector_source_disabled_cb (ESourceRegistry *registry, const gchar *extension_name; extension_name = e_source_selector_get_extension_name (selector); - if (!extension_name || !e_source_has_extension (source, extension_name)) + + if (extension_name == NULL) + return; + + if (!e_source_has_extension (source, extension_name)) return; source_selector_build_model (selector); @@ -938,7 +960,7 @@ source_selector_button_press_event (GtkWidget *widget, gtk_tree_model_get (model, &iter, COLUMN_SOURCE, &source, -1); } - if (path) + if (path != NULL) gtk_tree_path_free (path); if (source == NULL) @@ -1279,7 +1301,7 @@ e_source_selector_class_init (ESourceSelectorClass *class) object_class = G_OBJECT_CLASS (class); object_class->set_property = source_selector_set_property; object_class->get_property = source_selector_get_property; - object_class->dispose = source_selector_dispose; + object_class->dispose = source_selector_dispose; object_class->finalize = source_selector_finalize; object_class->constructed = source_selector_constructed; diff --git a/e-util/e-table-click-to-add.c b/e-util/e-table-click-to-add.c index 34766ddbe3..b0af6eaac6 100644 --- a/e-util/e-table-click-to-add.c +++ b/e-util/e-table-click-to-add.c @@ -552,15 +552,15 @@ e_table_click_to_add_class_init (ETableClickToAddClass *class) GObjectClass *object_class = G_OBJECT_CLASS (class); class->cursor_change = NULL; - class->style_set = etcta_style_set; + class->style_set = etcta_style_set; - object_class->dispose = etcta_dispose; + object_class->dispose = etcta_dispose; object_class->set_property = etcta_set_property; object_class->get_property = etcta_get_property; - item_class->realize = etcta_realize; - item_class->unrealize = etcta_unrealize; - item_class->event = etcta_event; + item_class->realize = etcta_realize; + item_class->unrealize = etcta_unrealize; + item_class->event = etcta_event; g_object_class_install_property ( object_class, diff --git a/e-util/e-table-column-specification.c b/e-util/e-table-column-specification.c index 186c123578..befde720f4 100644 --- a/e-util/e-table-column-specification.c +++ b/e-util/e-table-column-specification.c @@ -70,20 +70,20 @@ e_table_column_specification_class_init (ETableColumnSpecificationClass *class) static void e_table_column_specification_init (ETableColumnSpecification *specification) { - specification->model_col = 0; - specification->compare_col = 0; - specification->title = g_strdup (""); - specification->pixbuf = NULL; + specification->model_col = 0; + specification->compare_col = 0; + specification->title = g_strdup (""); + specification->pixbuf = NULL; - specification->expansion = 0; + specification->expansion = 0; specification->minimum_width = 0; - specification->resizable = FALSE; - specification->disabled = FALSE; + specification->resizable = FALSE; + specification->disabled = FALSE; - specification->cell = NULL; - specification->compare = NULL; - specification->search = NULL; - specification->priority = 0; + specification->cell = NULL; + specification->compare = NULL; + specification->search = NULL; + specification->priority = 0; } ETableColumnSpecification * diff --git a/e-util/e-table-config.c b/e-util/e-table-config.c index 4d6be20531..73f4e2e0a2 100644 --- a/e-util/e-table-config.c +++ b/e-util/e-table-config.c @@ -124,7 +124,7 @@ e_table_config_class_init (ETableConfigClass *class) { GObjectClass *object_class = G_OBJECT_CLASS (class); - class->changed = NULL; + class->changed = NULL; object_class->finalize = config_finalize; object_class->get_property = config_get_property; @@ -966,7 +966,7 @@ setup_gui (ETableConfig *config) GTK_WINDOW (config->dialog_toplevel), config->header); - config->dialog_group_by = e_builder_get_widget ( + config->dialog_group_by = e_builder_get_widget ( builder, "dialog-group-by"); config->dialog_sort = e_builder_get_widget ( builder, "dialog-sort"); diff --git a/e-util/e-table-extras.c b/e-util/e-table-extras.c index b8c2c61fbd..b631dbd6e9 100644 --- a/e-util/e-table-extras.c +++ b/e-util/e-table-extras.c @@ -174,15 +174,15 @@ e_table_str_case_compare (gconstpointer x, return x ? -1 : 1; } - #define prepare_value(_z, _cz) \ - _cz = e_table_sorting_utils_lookup_cmp_cache (cmp_cache, _z); \ - if (!_cz) { \ - gchar *tmp = g_utf8_casefold (_z, -1); \ - _cz = g_utf8_collate_key (tmp, -1); \ - g_free (tmp); \ - \ - e_table_sorting_utils_add_to_cmp_cache ( \ - cmp_cache, _z, (gchar *) _cz); \ + #define prepare_value(_z, _cz) \ + _cz = e_table_sorting_utils_lookup_cmp_cache (cmp_cache, _z); \ + if (!_cz) { \ + gchar *tmp = g_utf8_casefold (_z, -1); \ + _cz = g_utf8_collate_key (tmp, -1); \ + g_free (tmp); \ + \ + e_table_sorting_utils_add_to_cmp_cache ( \ + cmp_cache, _z, (gchar *) _cz); \ } prepare_value (x, cx); @@ -210,13 +210,13 @@ e_table_collate_compare (gconstpointer x, return x ? -1 : 1; } - #define prepare_value(_z, _cz) \ - _cz = e_table_sorting_utils_lookup_cmp_cache (cmp_cache, _z); \ - if (!_cz) { \ - _cz = g_utf8_collate_key (_z, -1); \ - \ - e_table_sorting_utils_add_to_cmp_cache ( \ - cmp_cache, _z, (gchar *) _cz); \ + #define prepare_value(_z, _cz) \ + _cz = e_table_sorting_utils_lookup_cmp_cache (cmp_cache, _z); \ + if (!_cz) { \ + _cz = g_utf8_collate_key (_z, -1); \ + \ + e_table_sorting_utils_add_to_cmp_cache ( \ + cmp_cache, _z, (gchar *) _cz); \ } prepare_value (x, cx); diff --git a/e-util/e-table-field-chooser-item.c b/e-util/e-table-field-chooser-item.c index 3d2aaa8a9a..a12ddc6ff7 100644 --- a/e-util/e-table-field-chooser-item.c +++ b/e-util/e-table-field-chooser-item.c @@ -670,12 +670,12 @@ e_table_field_chooser_item_class_init (ETableFieldChooserItemClass *class) object_class->set_property = etfci_set_property; object_class->get_property = etfci_get_property; - item_class->update = etfci_update; - item_class->realize = etfci_realize; - item_class->unrealize = etfci_unrealize; - item_class->draw = etfci_draw; - item_class->point = etfci_point; - item_class->event = etfci_event; + item_class->update = etfci_update; + item_class->realize = etfci_realize; + item_class->unrealize = etfci_unrealize; + item_class->draw = etfci_draw; + item_class->point = etfci_point; + item_class->event = etfci_event; g_object_class_install_property ( object_class, diff --git a/e-util/e-table-field-chooser.c b/e-util/e-table-field-chooser.c index 2dd37c0479..feebe8b267 100644 --- a/e-util/e-table-field-chooser.c +++ b/e-util/e-table-field-chooser.c @@ -58,7 +58,7 @@ e_table_field_chooser_class_init (ETableFieldChooserClass *class) object_class->set_property = e_table_field_chooser_set_property; object_class->get_property = e_table_field_chooser_get_property; - object_class->dispose = e_table_field_chooser_dispose; + object_class->dispose = e_table_field_chooser_dispose; g_object_class_install_property ( object_class, diff --git a/e-util/e-table-group-container.c b/e-util/e-table-group-container.c index 4be28d6379..aa8366a8e4 100644 --- a/e-util/e-table-group-container.c +++ b/e-util/e-table-group-container.c @@ -230,36 +230,36 @@ etgc_event (GnomeCanvasItem *item, event->key.keyval == GDK_KEY_KP_Tab || event->key.keyval == GDK_KEY_ISO_Left_Tab) { change_focus = TRUE; - use_col = TRUE; - start_col = (event->key.state & GDK_SHIFT_MASK) ? -1 : 0; - direction = (event->key.state & GDK_SHIFT_MASK) ? E_FOCUS_END : E_FOCUS_START; + use_col = TRUE; + start_col = (event->key.state & GDK_SHIFT_MASK) ? -1 : 0; + direction = (event->key.state & GDK_SHIFT_MASK) ? E_FOCUS_END : E_FOCUS_START; } else if (event->key.keyval == GDK_KEY_Left || event->key.keyval == GDK_KEY_KP_Left) { change_focus = TRUE; - use_col = TRUE; - start_col = -1; - direction = E_FOCUS_END; + use_col = TRUE; + start_col = -1; + direction = E_FOCUS_END; } else if (event->key.keyval == GDK_KEY_Right || event->key.keyval == GDK_KEY_KP_Right) { change_focus = TRUE; - use_col = TRUE; + use_col = TRUE; start_col = 0; direction = E_FOCUS_START; } else if (event->key.keyval == GDK_KEY_Down || event->key.keyval == GDK_KEY_KP_Down) { change_focus = TRUE; - use_col = FALSE; - direction = E_FOCUS_START; + use_col = FALSE; + direction = E_FOCUS_START; } else if (event->key.keyval == GDK_KEY_Up || event->key.keyval == GDK_KEY_KP_Up) { change_focus = TRUE; - use_col = FALSE; - direction = E_FOCUS_END; + use_col = FALSE; + direction = E_FOCUS_END; } else if (event->key.keyval == GDK_KEY_Return || event->key.keyval == GDK_KEY_KP_Enter) { change_focus = TRUE; - use_col = FALSE; - direction = E_FOCUS_START; + use_col = FALSE; + direction = E_FOCUS_START; } if (change_focus) { GList *list; @@ -268,7 +268,7 @@ etgc_event (GnomeCanvasItem *item, ETableGroup *child; child_node = (ETableGroupContainerChildNode *) list->data; - child = child_node->child; + child = child_node->child; if (e_table_group_get_focus (child)) { old_col = e_table_group_get_focus_column (child); @@ -1033,10 +1033,10 @@ e_table_group_container_class_init (ETableGroupContainerClass *class) e_group_class->add_array = etgc_add_array; e_group_class->add_all = etgc_add_all; e_group_class->remove = etgc_remove; - e_group_class->increment = etgc_increment; - e_group_class->decrement = etgc_decrement; - e_group_class->row_count = etgc_row_count; - e_group_class->set_focus = etgc_set_focus; + e_group_class->increment = etgc_increment; + e_group_class->decrement = etgc_decrement; + e_group_class->row_count = etgc_row_count; + e_group_class->set_focus = etgc_set_focus; e_group_class->get_focus_column = etgc_get_focus_column; e_group_class->get_printable = etgc_get_printable; e_group_class->compute_location = etgc_compute_location; diff --git a/e-util/e-table-group-leaf.c b/e-util/e-table-group-leaf.c index fb6b3268d7..4cb5f18374 100644 --- a/e-util/e-table-group-leaf.c +++ b/e-util/e-table-group-leaf.c @@ -695,10 +695,10 @@ e_table_group_leaf_class_init (ETableGroupLeafClass *class) e_group_class->add_array = etgl_add_array; e_group_class->add_all = etgl_add_all; e_group_class->remove = etgl_remove; - e_group_class->increment = etgl_increment; - e_group_class->decrement = etgl_decrement; - e_group_class->row_count = etgl_row_count; - e_group_class->set_focus = etgl_set_focus; + e_group_class->increment = etgl_increment; + e_group_class->decrement = etgl_decrement; + e_group_class->row_count = etgl_row_count; + e_group_class->set_focus = etgl_set_focus; e_group_class->get_focus_column = etgl_get_focus_column; e_group_class->get_printable = etgl_get_printable; e_group_class->compute_location = etgl_compute_location; diff --git a/e-util/e-table-group.c b/e-util/e-table-group.c index 013967c9ca..32c4aaead4 100644 --- a/e-util/e-table-group.c +++ b/e-util/e-table-group.c @@ -678,10 +678,10 @@ e_table_group_class_init (ETableGroupClass *class) class->add_array = NULL; class->add_all = NULL; class->remove = NULL; - class->row_count = NULL; - class->increment = NULL; - class->decrement = NULL; - class->set_focus = NULL; + class->row_count = NULL; + class->increment = NULL; + class->decrement = NULL; + class->set_focus = NULL; class->get_focus = etg_get_focus; class->get_printable = NULL; class->compute_location = NULL; diff --git a/e-util/e-table-header-item.c b/e-util/e-table-header-item.c index 06c3f7e784..1f139a67f7 100644 --- a/e-util/e-table-header-item.c +++ b/e-util/e-table-header-item.c @@ -501,7 +501,7 @@ ethi_add_drop_marker (ETableHeaderItem *ethi, x += ethi->group_indent_width; if (!arrow_up) { - arrow_up = make_shaped_window_from_xpm (arrow_up_xpm); + arrow_up = make_shaped_window_from_xpm (arrow_up_xpm); arrow_down = make_shaped_window_from_xpm (arrow_down_xpm); } @@ -685,9 +685,9 @@ context_destroyed (gpointer data) { ETableHeaderItem *ethi = data; - ethi->last_drop_x = 0; - ethi->last_drop_y = 0; - ethi->last_drop_time = 0; + ethi->last_drop_x = 0; + ethi->last_drop_y = 0; + ethi->last_drop_time = 0; ethi->last_drop_context = NULL; scroll_off (ethi); @@ -817,7 +817,7 @@ ethi_drag_data_received (GtkWidget *canvas, for (i = 0; i < count; i++) { ETableCol *ecol; - ecol = e_table_header_get_column ( + ecol = e_table_header_get_column ( ethi->full_header, i); if (ecol->spec->model_col == column) { @@ -2130,12 +2130,12 @@ ethi_class_init (ETableHeaderItemClass *class) object_class->set_property = ethi_set_property; object_class->get_property = ethi_get_property; - item_class->update = ethi_update; - item_class->realize = ethi_realize; - item_class->unrealize = ethi_unrealize; - item_class->draw = ethi_draw; - item_class->point = ethi_point; - item_class->event = ethi_event; + item_class->update = ethi_update; + item_class->realize = ethi_realize; + item_class->unrealize = ethi_unrealize; + item_class->draw = ethi_draw; + item_class->point = ethi_point; + item_class->event = ethi_event; g_object_class_install_property ( object_class, diff --git a/e-util/e-table-header.c b/e-util/e-table-header.c index 8fc4496df7..f9c50b5553 100644 --- a/e-util/e-table-header.c +++ b/e-util/e-table-header.c @@ -350,18 +350,18 @@ e_table_header_class_init (ETableHeaderClass *class) static void e_table_header_init (ETableHeader *eth) { - eth->col_count = 0; - eth->width = 0; + eth->col_count = 0; + eth->width = 0; - eth->sort_info = NULL; + eth->sort_info = NULL; eth->sort_info_group_change_id = 0; - eth->columns = NULL; + eth->columns = NULL; - eth->change_queue = NULL; - eth->change_tail = NULL; + eth->change_queue = NULL; + eth->change_tail = NULL; - eth->width_extras = 0; + eth->width_extras = 0; } /** diff --git a/e-util/e-table-item.c b/e-util/e-table-item.c index 936cf69509..c265c98125 100644 --- a/e-util/e-table-item.c +++ b/e-util/e-table-item.c @@ -134,9 +134,9 @@ e_hsv_tweak (GdkColor *color, { gdouble h, s, v, r, g, b; - r = color->red / 65535.0f; + r = color->red / 65535.0f; g = color->green / 65535.0f; - b = color->blue / 65535.0f; + b = color->blue / 65535.0f; gtk_rgb_to_hsv (r, g, b, &h, &s, &v); @@ -160,9 +160,9 @@ e_hsv_tweak (GdkColor *color, gtk_hsv_to_rgb (h, s, v, &r, &g, &b); - color->red = r * 65535.0f; + color->red = r * 65535.0f; color->green = g * 65535.0f; - color->blue = b * 65535.0f; + color->blue = b * 65535.0f; } inline static gint @@ -1372,9 +1372,9 @@ e_table_item_redraw_range (ETableItem *eti, NULL); if ((start_col == cursor_col) || - (end_col == cursor_col) || + (end_col == cursor_col) || (view_to_model_row (eti, start_row) == cursor_row) || - (view_to_model_row (eti, end_row) == cursor_row)) + (view_to_model_row (eti, end_row) == cursor_row)) border = 2; else border = 0; @@ -1712,69 +1712,69 @@ eti_get_property (GObject *object, static void e_table_item_init (ETableItem *eti) { - eti->motion_row = -1; - eti->motion_col = -1; - eti->editing_col = -1; - eti->editing_row = -1; - eti->height = 0; - eti->width = 0; - eti->minimum_width = 0; + eti->motion_row = -1; + eti->motion_col = -1; + eti->editing_col = -1; + eti->editing_row = -1; + eti->height = 0; + eti->width = 0; + eti->minimum_width = 0; - eti->save_col = -1; - eti->save_row = -1; - eti->save_state = NULL; + eti->save_col = -1; + eti->save_row = -1; + eti->save_state = NULL; - eti->click_count = 0; + eti->click_count = 0; - eti->height_cache = NULL; - eti->height_cache_idle_id = 0; - eti->height_cache_idle_count = 0; + eti->height_cache = NULL; + eti->height_cache_idle_id = 0; + eti->height_cache_idle_count = 0; - eti->length_threshold = -1; - eti->uniform_row_height = FALSE; + eti->length_threshold = -1; + eti->uniform_row_height = FALSE; - eti->uses_source_model = 0; - eti->source_model = NULL; + eti->uses_source_model = 0; + eti->source_model = NULL; - eti->row_guess = -1; - eti->cursor_mode = E_CURSOR_SIMPLE; + eti->row_guess = -1; + eti->cursor_mode = E_CURSOR_SIMPLE; - eti->selection_change_id = 0; - eti->selection_row_change_id = 0; - eti->cursor_change_id = 0; - eti->cursor_activated_id = 0; - eti->selection = NULL; + eti->selection_change_id = 0; + eti->selection_row_change_id = 0; + eti->cursor_change_id = 0; + eti->cursor_activated_id = 0; + eti->selection = NULL; - eti->old_cursor_row = -1; + eti->old_cursor_row = -1; - eti->needs_redraw = 0; - eti->needs_compute_height = 0; + eti->needs_redraw = 0; + eti->needs_compute_height = 0; - eti->in_key_press = 0; + eti->in_key_press = 0; - eti->maybe_did_something = TRUE; + eti->maybe_did_something = TRUE; - eti->grabbed_count = 0; - eti->gtk_grabbed = 0; + eti->grabbed_count = 0; + eti->gtk_grabbed = 0; - eti->in_drag = 0; - eti->maybe_in_drag = 0; - eti->grabbed = 0; + eti->in_drag = 0; + eti->maybe_in_drag = 0; + eti->grabbed = 0; - eti->grabbed_col = -1; - eti->grabbed_row = -1; + eti->grabbed_col = -1; + eti->grabbed_row = -1; - eti->cursor_on_screen = FALSE; - eti->cursor_x1 = -1; - eti->cursor_y1 = -1; - eti->cursor_x2 = -1; - eti->cursor_y2 = -1; + eti->cursor_on_screen = FALSE; + eti->cursor_x1 = -1; + eti->cursor_y1 = -1; + eti->cursor_x2 = -1; + eti->cursor_y2 = -1; - eti->rows = -1; - eti->cols = -1; + eti->rows = -1; + eti->cols = -1; - eti->frozen_count = 0; - eti->queue_show_cursor = FALSE; + eti->frozen_count = 0; + eti->queue_show_cursor = FALSE; e_canvas_item_set_reflow_callback (GNOME_CANVAS_ITEM (eti), eti_reflow); } @@ -1955,8 +1955,8 @@ eti_draw (GnomeCanvasItem *item, * Compute row span. */ if (eti->uniform_row_height) { - first_row = (y - floor (eti_base_y) - height_extra) / (ETI_ROW_HEIGHT (eti, -1) + height_extra); - last_row = (y + height - floor (eti_base_y) ) / (ETI_ROW_HEIGHT (eti, -1) + height_extra) + 1; + first_row = (y - floor (eti_base_y) - height_extra) / (ETI_ROW_HEIGHT (eti, -1) + height_extra); + last_row = (y + height - floor (eti_base_y) ) / (ETI_ROW_HEIGHT (eti, -1) + height_extra) + 1; if (first_row > last_row) return; y_offset = floor (eti_base_y) - y + height_extra + first_row * (ETI_ROW_HEIGHT (eti, -1) + height_extra); @@ -2511,12 +2511,12 @@ eti_event (GnomeCanvasItem *item, event_device = gdk_event_get_device (event); eti->maybe_in_drag = TRUE; - eti->drag_row = new_cursor_row; - eti->drag_col = new_cursor_col; - eti->drag_x = event_x_item; - eti->drag_y = event_y_item; - eti->drag_state = event_state; - eti->grabbed = TRUE; + eti->drag_row = new_cursor_row; + eti->drag_col = new_cursor_col; + eti->drag_x = event_x_item; + eti->drag_y = event_y_item; + eti->drag_state = event_state; + eti->grabbed = TRUE; d (g_print ("%s: eti_grab\n", G_STRFUNC)); eti_grab (eti, event_device, event_time); } @@ -3067,8 +3067,8 @@ eti_event (GnomeCanvasItem *item, if (eti_editing (eti)) { eti_free_save_state (eti); - eti->save_row = eti->editing_row; - eti->save_col = eti->editing_col; + eti->save_row = eti->editing_row; + eti->save_col = eti->editing_col; eti->save_state = e_cell_save_state ( eti->cell_views[eti->editing_col], view_to_model_col (eti, eti->editing_col), eti->editing_col, eti->editing_row, eti->edit_ctx); @@ -3121,25 +3121,25 @@ e_table_item_class_init (ETableItemClass *class) GnomeCanvasItemClass *item_class = GNOME_CANVAS_ITEM_CLASS (class); GObjectClass *object_class = G_OBJECT_CLASS (class); - object_class->dispose = eti_dispose; - object_class->set_property = eti_set_property; - object_class->get_property = eti_get_property; + object_class->dispose = eti_dispose; + object_class->set_property = eti_set_property; + object_class->get_property = eti_get_property; - item_class->update = eti_update; - item_class->realize = eti_realize; - item_class->unrealize = eti_unrealize; - item_class->draw = eti_draw; - item_class->point = eti_point; - item_class->event = eti_event; + item_class->update = eti_update; + item_class->realize = eti_realize; + item_class->unrealize = eti_unrealize; + item_class->draw = eti_draw; + item_class->point = eti_point; + item_class->event = eti_event; - class->cursor_change = NULL; + class->cursor_change = NULL; class->cursor_activated = NULL; - class->double_click = NULL; - class->right_click = NULL; - class->click = NULL; - class->key_press = NULL; - class->start_drag = NULL; - class->style_set = eti_style_set; + class->double_click = NULL; + class->right_click = NULL; + class->click = NULL; + class->key_press = NULL; + class->start_drag = NULL; + class->style_set = eti_style_set; class->selection_model_removed = NULL; class->selection_model_added = NULL; diff --git a/e-util/e-table-selection-model.c b/e-util/e-table-selection-model.c index fd661771e8..56cc1b398b 100644 --- a/e-util/e-table-selection-model.c +++ b/e-util/e-table-selection-model.c @@ -331,10 +331,10 @@ e_table_selection_model_class_init (ETableSelectionModelClass *class) GObjectClass *object_class; ESelectionModelArrayClass *esma_class; - object_class = G_OBJECT_CLASS (class); - esma_class = E_SELECTION_MODEL_ARRAY_CLASS (class); + object_class = G_OBJECT_CLASS (class); + esma_class = E_SELECTION_MODEL_ARRAY_CLASS (class); - object_class->dispose = etsm_dispose; + object_class->dispose = etsm_dispose; object_class->get_property = etsm_get_property; object_class->set_property = etsm_set_property; diff --git a/e-util/e-table-specification.c b/e-util/e-table-specification.c index cff94d28e0..d6a35071a2 100644 --- a/e-util/e-table-specification.c +++ b/e-util/e-table-specification.c @@ -574,18 +574,18 @@ e_table_specification_init (ETableSpecification *specification) (GDestroyNotify) g_object_unref); specification->alternating_row_colors = TRUE; - specification->no_headers = FALSE; - specification->click_to_add = FALSE; - specification->click_to_add_end = FALSE; - specification->horizontal_draw_grid = FALSE; - specification->vertical_draw_grid = FALSE; - specification->draw_focus = TRUE; - specification->horizontal_scrolling = FALSE; - specification->horizontal_resize = FALSE; - specification->allow_grouping = TRUE; - - specification->cursor_mode = E_CURSOR_SIMPLE; - specification->selection_mode = GTK_SELECTION_MULTIPLE; + specification->no_headers = FALSE; + specification->click_to_add = FALSE; + specification->click_to_add_end = FALSE; + specification->horizontal_draw_grid = FALSE; + specification->vertical_draw_grid = FALSE; + specification->draw_focus = TRUE; + specification->horizontal_scrolling = FALSE; + specification->horizontal_resize = FALSE; + specification->allow_grouping = TRUE; + + specification->cursor_mode = E_CURSOR_SIMPLE; + specification->selection_mode = GTK_SELECTION_MULTIPLE; } /** diff --git a/e-util/e-table-state.c b/e-util/e-table-state.c index 4df6e488f4..98a429725c 100644 --- a/e-util/e-table-state.c +++ b/e-util/e-table-state.c @@ -111,7 +111,7 @@ table_state_parser_start_column (GMarkupParseContext *context, g_return_if_fail (index_str != NULL); index = g_ascii_strtoll (index_str, NULL, 10); - if (expansion_str != NULL) + if (expansion_str != NULL) expansion = g_ascii_strtod (expansion_str, NULL); g_variant_builder_add ( diff --git a/e-util/e-table-subset-variable.c b/e-util/e-table-subset-variable.c index f6f8f33c54..e88ec3dd12 100644 --- a/e-util/e-table-subset-variable.c +++ b/e-util/e-table-subset-variable.c @@ -134,10 +134,10 @@ etssv_remove (ETableSubsetVariable *etssv, static void e_table_subset_variable_class_init (ETableSubsetVariableClass *class) { - class->add = etssv_add; + class->add = etssv_add; class->add_array = etssv_add_array; class->add_all = etssv_add_all; - class->remove = etssv_remove; + class->remove = etssv_remove; } static void diff --git a/e-util/e-table.c b/e-util/e-table.c index 4a28656dea..e32ba3a1a0 100644 --- a/e-util/e-table.c +++ b/e-util/e-table.c @@ -537,7 +537,7 @@ init_search (ETable *e_table) if (e_table->search != NULL) return; - e_table->search = e_table_search_new (); + e_table->search = e_table_search_new (); e_table->search_search_id = g_signal_connect ( e_table->search, "search", @@ -568,55 +568,55 @@ e_table_init (ETable *e_table) gtk_table_set_homogeneous (GTK_TABLE (e_table), FALSE); - e_table->sort_info = NULL; - e_table->group_info_change_id = 0; - e_table->sort_info_change_id = 0; - e_table->structure_change_id = 0; - e_table->expansion_change_id = 0; - e_table->dimension_change_id = 0; - e_table->reflow_idle_id = 0; - e_table->scroll_idle_id = 0; + e_table->sort_info = NULL; + e_table->group_info_change_id = 0; + e_table->sort_info_change_id = 0; + e_table->structure_change_id = 0; + e_table->expansion_change_id = 0; + e_table->dimension_change_id = 0; + e_table->reflow_idle_id = 0; + e_table->scroll_idle_id = 0; e_table->alternating_row_colors = 1; - e_table->horizontal_draw_grid = 1; - e_table->vertical_draw_grid = 1; - e_table->draw_focus = 1; - e_table->cursor_mode = E_CURSOR_SIMPLE; - e_table->length_threshold = 200; - e_table->uniform_row_height = FALSE; + e_table->horizontal_draw_grid = 1; + e_table->vertical_draw_grid = 1; + e_table->draw_focus = 1; + e_table->cursor_mode = E_CURSOR_SIMPLE; + e_table->length_threshold = 200; + e_table->uniform_row_height = FALSE; - e_table->need_rebuild = 0; - e_table->rebuild_idle_id = 0; + e_table->need_rebuild = 0; + e_table->rebuild_idle_id = 0; - e_table->horizontal_scrolling = FALSE; - e_table->horizontal_resize = FALSE; + e_table->horizontal_scrolling = FALSE; + e_table->horizontal_resize = FALSE; - e_table->click_to_add_message = NULL; - e_table->domain = NULL; + e_table->click_to_add_message = NULL; + e_table->domain = NULL; - e_table->drop_row = -1; - e_table->drop_col = -1; - e_table->site = NULL; + e_table->drop_row = -1; + e_table->drop_col = -1; + e_table->site = NULL; - e_table->do_drag = 0; + e_table->do_drag = 0; - e_table->sorter = NULL; - e_table->selection = e_table_selection_model_new (); - e_table->cursor_loc = E_TABLE_CURSOR_LOC_NONE; - e_table->spec = NULL; + e_table->sorter = NULL; + e_table->selection = e_table_selection_model_new (); + e_table->cursor_loc = E_TABLE_CURSOR_LOC_NONE; + e_table->spec = NULL; - e_table->always_search = g_getenv ("GAL_ALWAYS_SEARCH") ? TRUE : FALSE; + e_table->always_search = g_getenv ("GAL_ALWAYS_SEARCH") ? TRUE : FALSE; - e_table->search = NULL; - e_table->search_search_id = 0; - e_table->search_accept_id = 0; + e_table->search = NULL; + e_table->search_search_id = 0; + e_table->search_accept_id = 0; - e_table->current_search_col = NULL; + e_table->current_search_col = NULL; - e_table->header_width = 0; + e_table->header_width = 0; - e_table->state_changed = FALSE; - e_table->state_change_freeze = 0; + e_table->state_changed = FALSE; + e_table->state_change_freeze = 0; } /* Grab_focus handler for the ETable */ @@ -3001,9 +3001,9 @@ context_destroyed (gpointer data) /* if (!G_OBJECT_DESTROYED (et)) */ /* FIXME: */ { - et->last_drop_x = 0; - et->last_drop_y = 0; - et->last_drop_time = 0; + et->last_drop_x = 0; + et->last_drop_y = 0; + et->last_drop_time = 0; et->last_drop_context = NULL; scroll_off (et); } @@ -3134,40 +3134,40 @@ e_table_class_init (ETableClass *class) GObjectClass *object_class; GtkWidgetClass *widget_class; - object_class = (GObjectClass *) class; - widget_class = (GtkWidgetClass *) class; + object_class = (GObjectClass *) class; + widget_class = (GtkWidgetClass *) class; - object_class->dispose = et_dispose; - object_class->finalize = et_finalize; - object_class->set_property = et_set_property; - object_class->get_property = et_get_property; + object_class->dispose = et_dispose; + object_class->finalize = et_finalize; + object_class->set_property = et_set_property; + object_class->get_property = et_get_property; - widget_class->grab_focus = et_grab_focus; - widget_class->unrealize = et_unrealize; + widget_class->grab_focus = et_grab_focus; + widget_class->unrealize = et_unrealize; widget_class->get_preferred_width = et_get_preferred_width; widget_class->get_preferred_height = et_get_preferred_height; - widget_class->focus = et_focus; - - class->cursor_change = NULL; - class->cursor_activated = NULL; - class->selection_change = NULL; - class->double_click = NULL; - class->right_click = NULL; - class->click = NULL; - class->key_press = NULL; - class->start_drag = et_real_start_drag; - class->state_change = NULL; - class->white_space_event = NULL; - - class->table_drag_begin = NULL; - class->table_drag_end = NULL; - class->table_drag_data_get = NULL; - class->table_drag_data_delete = NULL; - - class->table_drag_leave = NULL; - class->table_drag_motion = NULL; - class->table_drag_drop = NULL; + widget_class->focus = et_focus; + + class->cursor_change = NULL; + class->cursor_activated = NULL; + class->selection_change = NULL; + class->double_click = NULL; + class->right_click = NULL; + class->click = NULL; + class->key_press = NULL; + class->start_drag = et_real_start_drag; + class->state_change = NULL; + class->white_space_event = NULL; + + class->table_drag_begin = NULL; + class->table_drag_end = NULL; + class->table_drag_data_get = NULL; + class->table_drag_data_delete = NULL; + + class->table_drag_leave = NULL; + class->table_drag_motion = NULL; + class->table_drag_drop = NULL; class->table_drag_data_received = NULL; et_signals[CURSOR_CHANGE] = g_signal_new ( diff --git a/e-util/e-text-model.c b/e-util/e-text-model.c index 0920f83335..a6fecdbf0b 100644 --- a/e-util/e-text-model.c +++ b/e-util/e-text-model.c @@ -137,23 +137,23 @@ e_text_model_class_init (ETextModelClass *class) G_TYPE_NONE, 0); /* No default signal handlers. */ - class->changed = NULL; - class->reposition = NULL; + class->changed = NULL; + class->reposition = NULL; class->object_activated = NULL; - class->validate_pos = e_text_model_real_validate_position; + class->validate_pos = e_text_model_real_validate_position; - class->get_text = e_text_model_real_get_text; - class->get_text_len = e_text_model_real_get_text_length; - class->set_text = e_text_model_real_set_text; - class->insert = e_text_model_real_insert; + class->get_text = e_text_model_real_get_text; + class->get_text_len = e_text_model_real_get_text_length; + class->set_text = e_text_model_real_set_text; + class->insert = e_text_model_real_insert; class->insert_length = e_text_model_real_insert_length; - class->delete = e_text_model_real_delete; + class->delete = e_text_model_real_delete; /* We explicitly don't define default handlers for these. */ - class->objectify = NULL; - class->obj_count = NULL; - class->get_nth_obj = NULL; + class->objectify = NULL; + class->obj_count = NULL; + class->get_nth_obj = NULL; } static void @@ -291,8 +291,8 @@ e_text_model_real_delete (ETextModel *model, e_text_model_changed (model); repos.model = model; - repos.pos = position; - repos.len = length; + repos.pos = position; + repos.len = length; e_text_model_reposition (model, e_repos_delete_shift, &repos); } diff --git a/e-util/e-text.c b/e-util/e-text.c index b1c1af6c42..a6dfc9d870 100644 --- a/e-util/e-text.c +++ b/e-util/e-text.c @@ -434,7 +434,7 @@ e_text_text_model_changed (ETextModel *model, /* Make sure our selection doesn't extend past the bounds of our text. */ text->selection_start = CLAMP (text->selection_start, 0, model_len); - text->selection_end = CLAMP (text->selection_end, 0, model_len); + text->selection_end = CLAMP (text->selection_end, 0, model_len); text->needs_reset_layout = 1; text->needs_split_into_lines = 1; @@ -455,12 +455,12 @@ e_text_text_model_reposition (ETextModel *model, gint model_len = e_text_model_get_text_length (model); text->selection_start = fn (text->selection_start, repos_data); - text->selection_end = fn (text->selection_end, repos_data); + text->selection_end = fn (text->selection_end, repos_data); /* Our repos function should make sure we don't overrun the buffer, but it never * hurts to be paranoid. */ text->selection_start = CLAMP (text->selection_start, 0, model_len); - text->selection_end = CLAMP (text->selection_end, 0, model_len); + text->selection_end = CLAMP (text->selection_end, 0, model_len); if (text->selection_start > text->selection_end) { gint tmp = text->selection_start; @@ -1232,8 +1232,8 @@ e_text_draw (GnomeCanvasItem *item, cr, ((text->rgba >> 24) & 0xff) / 255.0, ((text->rgba >> 16) & 0xff) / 255.0, - ((text->rgba >> 8) & 0xff) / 255.0, - ( text->rgba & 0xff) / 255.0); + ((text->rgba >> 8) & 0xff) / 255.0, + ( text->rgba & 0xff) / 255.0); } /* Insert preedit text only when im_context signals are connected & @@ -1880,7 +1880,7 @@ e_text_delete_selection (EText *text) gint sel_start, sel_end; sel_start = MIN (text->selection_start, text->selection_end); - sel_end = MAX (text->selection_start, text->selection_end); + sel_end = MAX (text->selection_start, text->selection_end); if (sel_start != sel_end) e_text_model_delete (text->model, sel_start, sel_end - sel_start); @@ -1928,7 +1928,7 @@ primary_get_cb (GtkClipboard *clipboard, gint sel_start, sel_end; sel_start = MIN (text->selection_start, text->selection_end); - sel_end = MAX (text->selection_start, text->selection_end); + sel_end = MAX (text->selection_start, text->selection_end); /* convert sel_start/sel_end to byte indices */ sel_start = g_utf8_offset_to_pointer (text->text, sel_start) - text->text; @@ -2069,7 +2069,8 @@ popup_targets_received (GtkClipboard *clipboard, /* cut menu item */ menuitem = gtk_image_menu_item_new_with_mnemonic (_("Cu_t")); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), + gtk_image_menu_item_set_image ( + GTK_IMAGE_MENU_ITEM (menuitem), gtk_image_new_from_icon_name ("edit-cut", GTK_ICON_SIZE_MENU)); gtk_widget_show (menuitem); gtk_menu_shell_append (GTK_MENU_SHELL (popup_menu), menuitem); @@ -2082,7 +2083,8 @@ popup_targets_received (GtkClipboard *clipboard, /* copy menu item */ menuitem = gtk_image_menu_item_new_with_mnemonic (_("_Copy")); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), + gtk_image_menu_item_set_image ( + GTK_IMAGE_MENU_ITEM (menuitem), gtk_image_new_from_icon_name ("edit-copy", GTK_ICON_SIZE_MENU)); gtk_widget_show (menuitem); gtk_menu_shell_append (GTK_MENU_SHELL (popup_menu), menuitem); @@ -2093,7 +2095,8 @@ popup_targets_received (GtkClipboard *clipboard, /* paste menu item */ menuitem = gtk_image_menu_item_new_with_mnemonic (_("_Paste")); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), + gtk_image_menu_item_set_image ( + GTK_IMAGE_MENU_ITEM (menuitem), gtk_image_new_from_icon_name ("edit-paste", GTK_ICON_SIZE_MENU)); gtk_widget_show (menuitem); gtk_menu_shell_append (GTK_MENU_SHELL (popup_menu), menuitem); @@ -2565,7 +2568,7 @@ _get_position (EText *text, while (p && *p) { unival = g_utf8_get_char (p); if (g_unichar_isspace (unival)) { - new_pos = g_utf8_pointer_to_offset (text->text, p); + new_pos = g_utf8_pointer_to_offset (text->text, p); break; } else p = g_utf8_next_char (p); @@ -3277,13 +3280,13 @@ e_text_class_init (ETextClass *class) static void e_text_init (EText *text) { - text->model = e_text_model_new (); - text->text = e_text_model_get_text (text->model); - text->preedit_len = 0; - text->preedit_pos = 0; - text->layout = NULL; + text->model = e_text_model_new (); + text->text = e_text_model_get_text (text->model); + text->preedit_len = 0; + text->preedit_pos = 0; + text->layout = NULL; - text->revert = NULL; + text->revert = NULL; text->model_changed_signal_id = g_signal_connect ( text->model, "changed", @@ -3293,62 +3296,62 @@ e_text_init (EText *text) text->model, "reposition", G_CALLBACK (e_text_text_model_reposition), text); - text->justification = GTK_JUSTIFY_LEFT; - text->clip_width = -1.0; - text->clip_height = -1.0; - text->xofs = 0.0; - text->yofs = 0.0; + text->justification = GTK_JUSTIFY_LEFT; + text->clip_width = -1.0; + text->clip_height = -1.0; + text->xofs = 0.0; + text->yofs = 0.0; - text->ellipsis = NULL; - text->use_ellipsis = FALSE; - text->ellipsis_width = 0; + text->ellipsis = NULL; + text->use_ellipsis = FALSE; + text->ellipsis_width = 0; - text->editable = FALSE; - text->editing = FALSE; - text->xofs_edit = 0; - text->yofs_edit = 0; + text->editable = FALSE; + text->editing = FALSE; + text->xofs_edit = 0; + text->yofs_edit = 0; - text->selection_start = 0; - text->selection_end = 0; - text->select_by_word = FALSE; + text->selection_start = 0; + text->selection_end = 0; + text->select_by_word = FALSE; - text->timeout_id = 0; - text->timer = NULL; + text->timeout_id = 0; + text->timer = NULL; - text->lastx = 0; - text->lasty = 0; - text->last_state = 0; + text->lastx = 0; + text->lasty = 0; + text->last_state = 0; - text->scroll_start = 0; - text->show_cursor = TRUE; - text->button_down = FALSE; + text->scroll_start = 0; + text->show_cursor = TRUE; + text->button_down = FALSE; - text->tep = NULL; - text->tep_command_id = 0; + text->tep = NULL; + text->tep_command_id = 0; - text->pointer_in = FALSE; - text->default_cursor_shown = TRUE; - text->line_wrap = FALSE; - text->break_characters = NULL; - text->max_lines = -1; - text->dbl_timeout = 0; - text->tpl_timeout = 0; + text->pointer_in = FALSE; + text->default_cursor_shown = TRUE; + text->line_wrap = FALSE; + text->break_characters = NULL; + text->max_lines = -1; + text->dbl_timeout = 0; + text->tpl_timeout = 0; - text->bold = FALSE; - text->strikeout = FALSE; + text->bold = FALSE; + text->strikeout = FALSE; - text->allow_newlines = TRUE; + text->allow_newlines = TRUE; - text->last_type_request = -1; - text->last_time_request = 0; - text->queued_requests = NULL; + text->last_type_request = -1; + text->last_time_request = 0; + text->queued_requests = NULL; - text->im_context = NULL; - text->need_im_reset = FALSE; + text->im_context = NULL; + text->need_im_reset = FALSE; text->im_context_signals_registered = FALSE; - text->handle_popup = FALSE; - text->rgba_set = FALSE; + text->handle_popup = FALSE; + text->rgba_set = FALSE; e_canvas_item_set_reflow_callback (GNOME_CANVAS_ITEM (text), e_text_reflow); } diff --git a/e-util/e-timezone-dialog.c b/e-util/e-timezone-dialog.c index acf9f70000..bb2aa21fcf 100644 --- a/e-util/e-timezone-dialog.c +++ b/e-util/e-timezone-dialog.c @@ -123,7 +123,7 @@ e_timezone_dialog_class_init (ETimezoneDialogClass *class) g_type_class_add_private (class, sizeof (ETimezoneDialogPrivate)); object_class = G_OBJECT_CLASS (class); - object_class->dispose = e_timezone_dialog_dispose; + object_class->dispose = e_timezone_dialog_dispose; } /* Object initialization function for the event editor */ diff --git a/e-util/e-tree-model-generator.c b/e-util/e-tree-model-generator.c index 7e88f30009..f035d120f6 100644 --- a/e-util/e-tree-model-generator.c +++ b/e-util/e-tree-model-generator.c @@ -225,18 +225,18 @@ e_tree_model_generator_class_init (ETreeModelGeneratorClass *class) static void e_tree_model_generator_tree_model_init (GtkTreeModelIface *iface) { - iface->get_flags = e_tree_model_generator_get_flags; - iface->get_n_columns = e_tree_model_generator_get_n_columns; + iface->get_flags = e_tree_model_generator_get_flags; + iface->get_n_columns = e_tree_model_generator_get_n_columns; iface->get_column_type = e_tree_model_generator_get_column_type; - iface->get_iter = e_tree_model_generator_get_iter; - iface->get_path = e_tree_model_generator_get_path; - iface->get_value = e_tree_model_generator_get_value; - iface->iter_next = e_tree_model_generator_iter_next; - iface->iter_children = e_tree_model_generator_iter_children; - iface->iter_has_child = e_tree_model_generator_iter_has_child; + iface->get_iter = e_tree_model_generator_get_iter; + iface->get_path = e_tree_model_generator_get_path; + iface->get_value = e_tree_model_generator_get_value; + iface->iter_next = e_tree_model_generator_iter_next; + iface->iter_children = e_tree_model_generator_iter_children; + iface->iter_has_child = e_tree_model_generator_iter_has_child; iface->iter_n_children = e_tree_model_generator_iter_n_children; - iface->iter_nth_child = e_tree_model_generator_iter_nth_child; - iface->iter_parent = e_tree_model_generator_iter_parent; + iface->iter_nth_child = e_tree_model_generator_iter_nth_child; + iface->iter_parent = e_tree_model_generator_iter_parent; } static void @@ -245,7 +245,7 @@ e_tree_model_generator_init (ETreeModelGenerator *tree_model_generator) tree_model_generator->priv = E_TREE_MODEL_GENERATOR_GET_PRIVATE (tree_model_generator); - tree_model_generator->priv->stamp = g_random_int (); + tree_model_generator->priv->stamp = g_random_int (); tree_model_generator->priv->root_nodes = g_array_new (FALSE, FALSE, sizeof (Node)); } @@ -304,7 +304,7 @@ generated_offset_to_child_offset (GArray *group, gint offset, gint *internal_offset) { - gboolean success = FALSE; + gboolean success = FALSE; gint accum_offset = 0; gint i; @@ -549,8 +549,8 @@ create_node_at_child_path (ETreeModelGenerator *tree_model_generator, node = &g_array_index (group, Node, index); node->parent_group = parent_group; node->parent_index = parent_index; - node->n_generated = 0; - node->child_nodes = NULL; + node->n_generated = 0; + node->child_nodes = NULL; ETMG_DEBUG ( g_print ("Created node at offset %d, parent_group = %p, parent_index = %d\n", @@ -791,7 +791,7 @@ e_tree_model_generator_set_generate_func (ETreeModelGenerator *tree_model_genera { g_return_if_fail (E_IS_TREE_MODEL_GENERATOR (tree_model_generator)); - tree_model_generator->priv->generate_func = func; + tree_model_generator->priv->generate_func = func; tree_model_generator->priv->generate_func_data = data; } @@ -815,7 +815,7 @@ e_tree_model_generator_set_modify_func (ETreeModelGenerator *tree_model_generato { g_return_if_fail (E_IS_TREE_MODEL_GENERATOR (tree_model_generator)); - tree_model_generator->priv->modify_func = func; + tree_model_generator->priv->modify_func = func; tree_model_generator->priv->modify_func_data = data; } diff --git a/e-util/e-tree-table-adapter.c b/e-util/e-tree-table-adapter.c index 7fd12bb317..b7efb05996 100644 --- a/e-util/e-tree-table-adapter.c +++ b/e-util/e-tree-table-adapter.c @@ -394,7 +394,7 @@ generate_tree (ETreeTableAdapter *etta, resort_node (etta, gnode, TRUE); etta->priv->root = gnode; - size = etta->priv->root_visible ? node->num_visible_children + 1 : node->num_visible_children; + size = etta->priv->root_visible ? node->num_visible_children + 1 : node->num_visible_children; resize_map (etta, size); fill_map (etta, 0, gnode); e_table_model_changed (E_TABLE_MODEL (etta)); diff --git a/e-util/e-tree.c b/e-util/e-tree.c index 8c5744d093..fbcdbe91f2 100644 --- a/e-util/e-tree.c +++ b/e-util/e-tree.c @@ -2595,9 +2595,9 @@ context_destroyed (gpointer data, { ETree *tree = data; if (tree->priv) { - tree->priv->last_drop_x = 0; - tree->priv->last_drop_y = 0; - tree->priv->last_drop_time = 0; + tree->priv->last_drop_x = 0; + tree->priv->last_drop_y = 0; + tree->priv->last_drop_time = 0; tree->priv->last_drop_context = NULL; collapse_drag (tree, NULL); scroll_off (tree); diff --git a/e-util/e-util-enums.h b/e-util/e-util-enums.h index 5a50e2741a..9913e4d938 100644 --- a/e-util/e-util-enums.h +++ b/e-util/e-util-enums.h @@ -95,13 +95,13 @@ typedef enum { /* XXX Be pedantic with the value assignments to ensure compatibility. */ typedef enum { E_DATE_BAD_WEEKDAY = G_DATE_BAD_WEEKDAY, - E_DATE_MONDAY = G_DATE_MONDAY, - E_DATE_TUESDAY = G_DATE_TUESDAY, - E_DATE_WEDNESDAY = G_DATE_WEDNESDAY, - E_DATE_THURSDAY = G_DATE_THURSDAY, - E_DATE_FRIDAY = G_DATE_FRIDAY, - E_DATE_SATURDAY = G_DATE_SATURDAY, - E_DATE_SUNDAY = G_DATE_SUNDAY + E_DATE_MONDAY = G_DATE_MONDAY, + E_DATE_TUESDAY = G_DATE_TUESDAY, + E_DATE_WEDNESDAY = G_DATE_WEDNESDAY, + E_DATE_THURSDAY = G_DATE_THURSDAY, + E_DATE_FRIDAY = G_DATE_FRIDAY, + E_DATE_SATURDAY = G_DATE_SATURDAY, + E_DATE_SUNDAY = G_DATE_SUNDAY } EDateWeekday; /** diff --git a/e-util/e-web-view-gtkhtml.c b/e-util/e-web-view-gtkhtml.c index 0dd6bce99b..5b6db0d504 100644 --- a/e-util/e-web-view-gtkhtml.c +++ b/e-util/e-web-view-gtkhtml.c @@ -54,7 +54,7 @@ struct _EWebViewGtkHTMLPrivate { GtkTargetList *paste_target_list; /* Lockdown Options */ - guint disable_printing : 1; + guint disable_printing : 1; guint disable_save_to_disk : 1; }; diff --git a/e-util/e-widget-undo.c b/e-util/e-widget-undo.c index 4cb933f544..f2a3ec7d17 100644 --- a/e-util/e-widget-undo.c +++ b/e-util/e-widget-undo.c @@ -111,7 +111,7 @@ reset_redos (EUndoData *data) static void push_undo (EUndoData *data, - EUndoInfo *info) + EUndoInfo *info) { gint index; @@ -130,9 +130,9 @@ push_undo (EUndoData *data, static gboolean can_merge_insert_undos (EUndoInfo *current_info, - const gchar *text, - gint text_len, - gint position) + const gchar *text, + gint text_len, + gint position) { gint len; @@ -158,9 +158,9 @@ can_merge_insert_undos (EUndoInfo *current_info, static void push_insert_undo (GObject *object, - const gchar *text, - gint text_len, - gint position) + const gchar *text, + gint text_len, + gint position) { EUndoData *data; EUndoInfo *info; @@ -195,9 +195,9 @@ push_insert_undo (GObject *object, static void push_delete_undo (GObject *object, - gchar *text, /* takes ownership of the 'text' */ - gint position_start, - gint position_end) + gchar *text, /* takes ownership of the 'text' */ + gint position_start, + gint position_end) { EUndoData *data; EUndoInfo *info; @@ -250,27 +250,27 @@ push_delete_undo (GObject *object, static void editable_undo_insert_text_cb (GtkEditable *editable, - gchar *text, - gint text_length, - gint *position, - gpointer user_data) + gchar *text, + gint text_length, + gint *position, + gpointer user_data) { push_insert_undo (G_OBJECT (editable), text, text_length, *position); } static void editable_undo_delete_text_cb (GtkEditable *editable, - gint start_pos, - gint end_pos, - gpointer user_data) + gint start_pos, + gint end_pos, + gpointer user_data) { push_delete_undo (G_OBJECT (editable), gtk_editable_get_chars (editable, start_pos, end_pos), start_pos, end_pos); } static void editable_undo_insert_text (GObject *object, - const gchar *text, - gint position) + const gchar *text, + gint position) { g_return_if_fail (GTK_IS_EDITABLE (object)); @@ -279,8 +279,8 @@ editable_undo_insert_text (GObject *object, static void editable_undo_delete_text (GObject *object, - gint position_start, - gint position_end) + gint position_start, + gint position_end) { g_return_if_fail (GTK_IS_EDITABLE (object)); @@ -289,21 +289,22 @@ editable_undo_delete_text (GObject *object, static void text_buffer_undo_insert_text_cb (GtkTextBuffer *text_buffer, - GtkTextIter *location, - gchar *text, - gint text_length, - gpointer user_data) + GtkTextIter *location, + gchar *text, + gint text_length, + gpointer user_data) { push_insert_undo (G_OBJECT (text_buffer), text, text_length, gtk_text_iter_get_offset (location)); } static void text_buffer_undo_delete_range_cb (GtkTextBuffer *text_buffer, - GtkTextIter *start, - GtkTextIter *end, - gpointer user_data) + GtkTextIter *start, + GtkTextIter *end, + gpointer user_data) { - push_delete_undo (G_OBJECT (text_buffer), + push_delete_undo ( + G_OBJECT (text_buffer), gtk_text_iter_get_text (start, end), gtk_text_iter_get_offset (start), gtk_text_iter_get_offset (end)); @@ -311,8 +312,8 @@ text_buffer_undo_delete_range_cb (GtkTextBuffer *text_buffer, static void text_buffer_undo_insert_text (GObject *object, - const gchar *text, - gint position) + const gchar *text, + gint position) { GtkTextBuffer *text_buffer; GtkTextIter iter; @@ -327,8 +328,8 @@ text_buffer_undo_insert_text (GObject *object, static void text_buffer_undo_delete_text (GObject *object, - gint position_start, - gint position_end) + gint position_start, + gint position_end) { GtkTextBuffer *text_buffer; GtkTextIter start_iter, end_iter; @@ -344,7 +345,7 @@ text_buffer_undo_delete_text (GObject *object, static void widget_undo_place_cursor_at (GObject *object, - gint char_pos) + gint char_pos) { if (GTK_IS_EDITABLE (object)) gtk_editable_set_position (GTK_EDITABLE (object), char_pos); @@ -361,9 +362,13 @@ widget_undo_place_cursor_at (GObject *object, static void undo_do_something (GObject *object, - EUndoDoType todo, - void (* insert_func) (GObject *object, const gchar *text, gint position), - void (* delete_func) (GObject *object, gint position_start, gint position_end)) + EUndoDoType todo, + void (* insert_func) (GObject *object, + const gchar *text, + gint position), + void (* delete_func) (GObject *object, + gint position_start, + gint position_end)) { EUndoData *data; EUndoInfo *info = NULL; @@ -394,12 +399,12 @@ undo_do_something (GObject *object, widget_undo_place_cursor_at (object, info->position_start); } else { insert_func (object, info->text, info->position_start); - widget_undo_place_cursor_at (object, info->position_start + g_utf8_strlen (info->text, -1)); + widget_undo_place_cursor_at (object, info->position_start + g_utf8_strlen (info->text, -1)); } } else if (info->type == E_UNDO_DELETE) { if (todo == E_UNDO_DO_UNDO) { insert_func (object, info->text, info->position_start); - widget_undo_place_cursor_at (object, info->position_start + g_utf8_strlen (info->text, -1)); + widget_undo_place_cursor_at (object, info->position_start + g_utf8_strlen (info->text, -1)); } else { delete_func (object, info->position_start, info->position_end); widget_undo_place_cursor_at (object, info->position_start); @@ -414,7 +419,7 @@ undo_do_something (GObject *object, static gchar * undo_describe_info (EUndoInfo *info, - EUndoDoType undo_type) + EUndoDoType undo_type) { if (!info) return NULL; @@ -430,7 +435,7 @@ undo_describe_info (EUndoInfo *info, else return g_strdup_printf (_("Redo 'Insert '%.12s...''"), info->text); } - + * if (undo_type == E_UNDO_DO_UNDO) return g_strdup_printf (_("Undo 'Insert '%s''"), info->text); else @@ -446,7 +451,7 @@ undo_describe_info (EUndoInfo *info, else return g_strdup_printf (_("Redo 'Delete '%.12s...''"), info->text); } - + * if (undo_type == E_UNDO_DO_UNDO) return g_strdup_printf (_("Undo 'Delete '%s''"), info->text); else @@ -458,7 +463,7 @@ undo_describe_info (EUndoInfo *info, static gboolean undo_check_undo (GObject *object, - gchar **description) + gchar **description) { EUndoData *data; @@ -477,7 +482,7 @@ undo_check_undo (GObject *object, static gboolean undo_check_redo (GObject *object, - gchar **description) + gchar **description) { EUndoData *data; @@ -509,7 +514,7 @@ undo_reset (GObject *object) static void widget_undo_popup_activate_cb (GObject *menu_item, - GtkWidget *widget) + GtkWidget *widget) { EUndoDoType undo_type = GPOINTER_TO_INT (g_object_get_data (menu_item, UNDO_DATA_KEY)); @@ -521,9 +526,9 @@ widget_undo_popup_activate_cb (GObject *menu_item, static gboolean widget_undo_prepend_popup (GtkWidget *widget, - GtkMenuShell *menu, - EUndoDoType undo_type, - gboolean already_added) + GtkMenuShell *menu, + EUndoDoType undo_type, + gboolean already_added) { gchar *description = NULL; const gchar *icon_name = NULL; @@ -565,8 +570,8 @@ widget_undo_prepend_popup (GtkWidget *widget, static void widget_undo_populate_popup_cb (GtkWidget *widget, - GtkWidget *popup, - gpointer user_data) + GtkWidget *popup, + gpointer user_data) { GtkMenuShell *menu; gboolean added = FALSE; @@ -600,7 +605,7 @@ widget_undo_populate_popup_cb (GtkWidget *widget, **/ void e_widget_undo_attach (GtkWidget *widget, - EFocusTracker *focus_tracker) + EFocusTracker *focus_tracker) { EUndoData *data; @@ -614,17 +619,21 @@ e_widget_undo_attach (GtkWidget *widget, g_object_set_data_full (G_OBJECT (widget), UNDO_DATA_KEY, data, free_undo_data); - data->insert_handler_id = g_signal_connect (widget, "insert-text", + data->insert_handler_id = g_signal_connect ( + widget, "insert-text", G_CALLBACK (editable_undo_insert_text_cb), NULL); - data->delete_handler_id = g_signal_connect (widget, "delete-text", + data->delete_handler_id = g_signal_connect ( + widget, "delete-text", G_CALLBACK (editable_undo_delete_text_cb), NULL); if (focus_tracker) - g_signal_connect_swapped (widget, "changed", + g_signal_connect_swapped ( + widget, "changed", G_CALLBACK (e_focus_tracker_update_actions), focus_tracker); if (GTK_IS_ENTRY (widget)) - g_signal_connect (widget, "populate-popup", + g_signal_connect ( + widget, "populate-popup", G_CALLBACK (widget_undo_populate_popup_cb), NULL); } else if (GTK_IS_TEXT_VIEW (widget)) { GtkTextBuffer *text_buffer; @@ -637,16 +646,20 @@ e_widget_undo_attach (GtkWidget *widget, g_object_set_data_full (G_OBJECT (text_buffer), UNDO_DATA_KEY, data, free_undo_data); - data->insert_handler_id = g_signal_connect (text_buffer, "insert-text", + data->insert_handler_id = g_signal_connect ( + text_buffer, "insert-text", G_CALLBACK (text_buffer_undo_insert_text_cb), NULL); - data->delete_handler_id = g_signal_connect (text_buffer, "delete-range", + data->delete_handler_id = g_signal_connect ( + text_buffer, "delete-range", G_CALLBACK (text_buffer_undo_delete_range_cb), NULL); if (focus_tracker) - g_signal_connect_swapped (text_buffer, "changed", + g_signal_connect_swapped ( + text_buffer, "changed", G_CALLBACK (e_focus_tracker_update_actions), focus_tracker); - g_signal_connect (widget, "populate-popup", + g_signal_connect ( + widget, "populate-popup", G_CALLBACK (widget_undo_populate_popup_cb), NULL); } } @@ -817,7 +830,8 @@ void e_widget_undo_do_undo (GtkWidget *widget) { if (GTK_IS_EDITABLE (widget)) { - undo_do_something (G_OBJECT (widget), + undo_do_something ( + G_OBJECT (widget), E_UNDO_DO_UNDO, editable_undo_insert_text, editable_undo_delete_text); @@ -826,7 +840,8 @@ e_widget_undo_do_undo (GtkWidget *widget) text_buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (widget)); - undo_do_something (G_OBJECT (text_buffer), + undo_do_something ( + G_OBJECT (text_buffer), E_UNDO_DO_UNDO, text_buffer_undo_insert_text, text_buffer_undo_delete_text); @@ -850,7 +865,8 @@ void e_widget_undo_do_redo (GtkWidget *widget) { if (GTK_IS_EDITABLE (widget)) { - undo_do_something (G_OBJECT (widget), + undo_do_something ( + G_OBJECT (widget), E_UNDO_DO_REDO, editable_undo_insert_text, editable_undo_delete_text); @@ -859,7 +875,8 @@ e_widget_undo_do_redo (GtkWidget *widget) text_buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (widget)); - undo_do_something (G_OBJECT (text_buffer), + undo_do_something ( + G_OBJECT (text_buffer), E_UNDO_DO_REDO, text_buffer_undo_insert_text, text_buffer_undo_delete_text); diff --git a/e-util/ea-calendar-cell.c b/e-util/ea-calendar-cell.c index 500b2c9c60..38c68b38c0 100644 --- a/e-util/ea-calendar-cell.c +++ b/e-util/ea-calendar-cell.c @@ -318,7 +318,7 @@ atk_component_interface_init (AtkComponentIface *iface) g_return_if_fail (iface != NULL); iface->get_extents = component_interface_get_extents; - iface->grab_focus = component_interface_grab_focus; + iface->grab_focus = component_interface_grab_focus; } static void diff --git a/e-util/ea-calendar-item.c b/e-util/ea-calendar-item.c index fad2b7ce4d..fe52134891 100644 --- a/e-util/ea-calendar-item.c +++ b/e-util/ea-calendar-item.c @@ -333,11 +333,11 @@ ea_calendar_item_get_name (AtkObject *accessible) gint year1, year2, month1, month2, day1, day2; year1 = g_date_get_year (&select_start); - month1 = g_date_get_month (&select_start); + month1 = g_date_get_month (&select_start); day1 = g_date_get_day (&select_start); year2 = g_date_get_year (&select_end); - month2 = g_date_get_month (&select_end); + month2 = g_date_get_month (&select_end); day2 = g_date_get_day (&select_end); sprintf ( diff --git a/e-util/ea-factory.h b/e-util/ea-factory.h index 3264c3f9d3..72cb7689ba 100644 --- a/e-util/ea-factory.h +++ b/e-util/ea-factory.h @@ -32,86 +32,86 @@ #include <atk/atkobject.h> -#define EA_FACTORY_PARTA_GOBJECT(type, type_as_function, opt_create_accessible) \ -static AtkObject * \ -type_as_function ## _factory_create_accessible (GObject *obj) \ -{ \ - AtkObject *accessible; \ - g_return_val_if_fail (G_IS_OBJECT (obj), NULL); \ - accessible = opt_create_accessible (G_OBJECT (obj)); \ - return accessible; \ +#define EA_FACTORY_PARTA_GOBJECT(type, type_as_function, opt_create_accessible) \ +static AtkObject * \ +type_as_function ## _factory_create_accessible (GObject *obj) \ +{ \ + AtkObject *accessible; \ + g_return_val_if_fail (G_IS_OBJECT (obj), NULL); \ + accessible = opt_create_accessible (G_OBJECT (obj)); \ + return accessible; \ } -#define EA_FACTORY_PARTA(type, type_as_function, opt_create_accessible) \ -static AtkObject * \ -type_as_function ## _factory_create_accessible (GObject *obj) \ -{ \ - GtkWidget *widget; \ - AtkObject *accessible; \ - \ - g_return_val_if_fail (GTK_IS_WIDGET (obj), NULL); \ - \ - widget = GTK_WIDGET (obj); \ - \ - accessible = opt_create_accessible (widget); \ - return accessible; \ +#define EA_FACTORY_PARTA(type, type_as_function, opt_create_accessible) \ +static AtkObject * \ +type_as_function ## _factory_create_accessible (GObject *obj) \ +{ \ + GtkWidget *widget; \ + AtkObject *accessible; \ + \ + g_return_val_if_fail (GTK_IS_WIDGET (obj), NULL); \ + \ + widget = GTK_WIDGET (obj); \ + \ + accessible = opt_create_accessible (widget); \ + return accessible; \ } -#define EA_FACTORY_PARTB(type, type_as_function, opt_create_accessible) \ - \ -static GType \ -type_as_function ## _factory_get_accessible_type (void) \ -{ \ - return type; \ -} \ - \ - \ -static void \ -type_as_function ## _factory_class_init (AtkObjectFactoryClass *klass) \ -{ \ - klass->create_accessible = type_as_function ## _factory_create_accessible; \ +#define EA_FACTORY_PARTB(type, type_as_function, opt_create_accessible) \ + \ +static GType \ +type_as_function ## _factory_get_accessible_type (void) \ +{ \ + return type; \ +} \ + \ + \ +static void \ +type_as_function ## _factory_class_init (AtkObjectFactoryClass *klass) \ +{ \ + klass->create_accessible = type_as_function ## _factory_create_accessible; \ klass->get_accessible_type = type_as_function ## _factory_get_accessible_type;\ -} \ - \ -static GType \ -type_as_function ## _factory_get_type (void) \ -{ \ - static GType t = 0; \ - \ - if (!t) \ - { \ - gchar *name; \ - static const GTypeInfo tinfo = \ - { \ - sizeof (AtkObjectFactoryClass), \ - NULL, NULL, (GClassInitFunc) type_as_function ## _factory_class_init, \ - NULL, NULL, sizeof (AtkObjectFactory), 0, NULL, NULL \ - }; \ - \ - name = g_strconcat (g_type_name (type), "Factory", NULL); \ - t = g_type_register_static ( \ - ATK_TYPE_OBJECT_FACTORY, name, &tinfo, 0); \ - g_free (name); \ - } \ - \ - return t; \ +} \ + \ +static GType \ +type_as_function ## _factory_get_type (void) \ +{ \ + static GType t = 0; \ + \ + if (!t) \ + { \ + gchar *name; \ + static const GTypeInfo tinfo = \ + { \ + sizeof (AtkObjectFactoryClass), \ + NULL, NULL, (GClassInitFunc) type_as_function ## _factory_class_init, \ + NULL, NULL, sizeof (AtkObjectFactory), 0, NULL, NULL \ + }; \ + \ + name = g_strconcat (g_type_name (type), "Factory", NULL); \ + t = g_type_register_static ( \ + ATK_TYPE_OBJECT_FACTORY, name, &tinfo, 0); \ + g_free (name); \ + } \ + \ + return t; \ } -#define EA_FACTORY(type, type_as_function, opt_create_accessible) \ - EA_FACTORY_PARTA (type, type_as_function, opt_create_accessible) \ +#define EA_FACTORY(type, type_as_function, opt_create_accessible) \ + EA_FACTORY_PARTA (type, type_as_function, opt_create_accessible) \ EA_FACTORY_PARTB (type, type_as_function, opt_create_accessible) -#define EA_FACTORY_GOBJECT(type, type_as_function, opt_create_accessible) \ - EA_FACTORY_PARTA_GOBJECT (type, type_as_function, opt_create_accessible) \ +#define EA_FACTORY_GOBJECT(type, type_as_function, opt_create_accessible) \ + EA_FACTORY_PARTA_GOBJECT (type, type_as_function, opt_create_accessible) \ EA_FACTORY_PARTB (type, type_as_function, opt_create_accessible) -#define EA_SET_FACTORY(obj_type, type_as_function) \ -{ \ - if (atk_get_root ()) { \ - atk_registry_set_factory_type (atk_get_default_registry (), \ - obj_type, \ +#define EA_SET_FACTORY(obj_type, type_as_function) \ +{ \ + if (atk_get_root ()) { \ + atk_registry_set_factory_type (atk_get_default_registry (), \ + obj_type, \ type_as_function ## _factory_get_type ());\ - } \ + } \ } #endif /* _EA_FACTORY_H__ */ diff --git a/e-util/gal-a11y-e-cell-popup.c b/e-util/gal-a11y-e-cell-popup.c index df05ea4f84..2744a1cbc5 100644 --- a/e-util/gal-a11y-e-cell-popup.c +++ b/e-util/gal-a11y-e-cell-popup.c @@ -128,7 +128,7 @@ gal_a11y_e_cell_popup_new (ETableItem *item, "<Alt>Down", /* action keybinding */ popup_cell_action); - a11y->role = ATK_ROLE_TABLE_CELL; + a11y->role = ATK_ROLE_TABLE_CELL; return a11y; } diff --git a/e-util/gal-a11y-e-cell-toggle.c b/e-util/gal-a11y-e-cell-toggle.c index 8c26d45391..88e2716f90 100644 --- a/e-util/gal-a11y-e-cell-toggle.c +++ b/e-util/gal-a11y-e-cell-toggle.c @@ -85,8 +85,8 @@ gal_a11y_e_cell_toggle_class_init (GalA11yECellToggleClass *class) { GObjectClass *object_class = G_OBJECT_CLASS (class); - object_class->dispose = gal_a11y_e_cell_toggle_dispose; - parent_class = g_type_class_ref (PARENT_TYPE); + object_class->dispose = gal_a11y_e_cell_toggle_dispose; + parent_class = g_type_class_ref (PARENT_TYPE); } static void @@ -161,7 +161,7 @@ gal_a11y_e_cell_toggle_new (ETableItem *item, cell = GAL_A11Y_E_CELL (a11y); toggle_cell = GAL_A11Y_E_CELL_TOGGLE (a11y); - a11y->role = ATK_ROLE_TABLE_CELL; + a11y->role = ATK_ROLE_TABLE_CELL; gal_a11y_e_cell_construct ( a11y, diff --git a/e-util/gal-a11y-e-cell-tree.c b/e-util/gal-a11y-e-cell-tree.c index 69ea7cd0d7..ce32ed3748 100644 --- a/e-util/gal-a11y-e-cell-tree.c +++ b/e-util/gal-a11y-e-cell-tree.c @@ -146,7 +146,7 @@ ectr_do_action_collapse (AtkAction *action) static void ectr_class_init (GalA11yECellTreeClass *class) { - a11y_parent_class = g_type_class_ref (A11Y_PARENT_TYPE); + a11y_parent_class = g_type_class_ref (A11Y_PARENT_TYPE); } static void diff --git a/e-util/gal-a11y-e-cell-vbox.c b/e-util/gal-a11y-e-cell-vbox.c index 1f05d34a3f..c998eedb9d 100644 --- a/e-util/gal-a11y-e-cell-vbox.c +++ b/e-util/gal-a11y-e-cell-vbox.c @@ -155,12 +155,12 @@ ecv_class_init (GalA11yECellVboxClass *class) { GObjectClass *object_class = G_OBJECT_CLASS (class); AtkObjectClass *a11y_class = ATK_OBJECT_CLASS (class); - parent_class = g_type_class_ref (PARENT_TYPE); + parent_class = g_type_class_ref (PARENT_TYPE); - object_class->dispose = ecv_dispose; + object_class->dispose = ecv_dispose; a11y_class->get_n_children = ecv_get_n_children; - a11y_class->ref_child = ecv_ref_child; + a11y_class->ref_child = ecv_ref_child; } static void @@ -171,7 +171,7 @@ ecv_init (GalA11yECellVbox *a11y) static void ecv_atk_component_iface_init (AtkComponentIface *iface) { - component_parent_iface = g_type_interface_peek_parent (iface); + component_parent_iface = g_type_interface_peek_parent (iface); iface->ref_accessible_at_point = ecv_ref_accessible_at_point; } diff --git a/e-util/gal-a11y-e-cell.c b/e-util/gal-a11y-e-cell.c index c4d84268a8..3d21f732ad 100644 --- a/e-util/gal-a11y-e-cell.c +++ b/e-util/gal-a11y-e-cell.c @@ -230,7 +230,7 @@ static void gal_a11y_e_cell_atk_component_iface_init (AtkComponentIface *iface) { iface->get_extents = gal_a11y_e_cell_get_extents; - iface->grab_focus = gal_a11y_e_cell_grab_focus; + iface->grab_focus = gal_a11y_e_cell_grab_focus; } static void @@ -239,14 +239,14 @@ gal_a11y_e_cell_class_init (GalA11yECellClass *class) AtkObjectClass *atk_object_class = ATK_OBJECT_CLASS (class); GObjectClass *object_class = G_OBJECT_CLASS (class); - parent_class = g_type_class_ref (PARENT_TYPE); + parent_class = g_type_class_ref (PARENT_TYPE); - object_class->dispose = gal_a11y_e_cell_dispose; + object_class->dispose = gal_a11y_e_cell_dispose; - atk_object_class->get_parent = gal_a11y_e_cell_get_parent; + atk_object_class->get_parent = gal_a11y_e_cell_get_parent; atk_object_class->get_index_in_parent = gal_a11y_e_cell_get_index_in_parent; - atk_object_class->ref_state_set = gal_a11y_e_cell_ref_state_set; - atk_object_class->get_name = gal_a11y_e_cell_get_name; + atk_object_class->ref_state_set = gal_a11y_e_cell_ref_state_set; + atk_object_class->get_name = gal_a11y_e_cell_get_name; } static void @@ -628,13 +628,13 @@ gal_a11y_e_cell_construct (AtkObject *object, gint row) { GalA11yECell *a11y = GAL_A11Y_E_CELL (object); - a11y->item = item; + a11y->item = item; a11y->cell_view = cell_view; - a11y->parent = parent; + a11y->parent = parent; a11y->model_col = model_col; - a11y->view_col = view_col; - a11y->row = row; - ATK_OBJECT (a11y) ->role = ATK_ROLE_TABLE_CELL; + a11y->view_col = view_col; + a11y->row = row; + ATK_OBJECT (a11y) ->role = ATK_ROLE_TABLE_CELL; if (item) g_object_ref (item); diff --git a/e-util/gal-a11y-e-table-click-to-add-factory.c b/e-util/gal-a11y-e-table-click-to-add-factory.c index 3630474c92..e3c0b38355 100644 --- a/e-util/gal-a11y-e-table-click-to-add-factory.c +++ b/e-util/gal-a11y-e-table-click-to-add-factory.c @@ -63,7 +63,7 @@ gal_a11y_e_table_click_to_add_factory_class_init (GalA11yETableClickToAddFactory parent_class = g_type_class_ref (PARENT_TYPE); - factory_class->create_accessible = gal_a11y_e_table_click_to_add_factory_create_accessible; + factory_class->create_accessible = gal_a11y_e_table_click_to_add_factory_create_accessible; factory_class->get_accessible_type = gal_a11y_e_table_click_to_add_factory_get_accessible_type; } diff --git a/e-util/gal-a11y-e-table-click-to-add.c b/e-util/gal-a11y-e-table-click-to-add.c index 8139e699de..6fabe31627 100644 --- a/e-util/gal-a11y-e-table-click-to-add.c +++ b/e-util/gal-a11y-e-table-click-to-add.c @@ -158,7 +158,7 @@ etcta_ref_child (AtkObject *accessible, if (i != 0) return NULL; - etcta = E_TABLE_CLICK_TO_ADD ( + etcta = E_TABLE_CLICK_TO_ADD ( atk_gobject_accessible_get_object ( ATK_GOBJECT_ACCESSIBLE (accessible))); diff --git a/e-util/gal-a11y-e-table-column-header.c b/e-util/gal-a11y-e-table-column-header.c index 9977843f77..7fb225005a 100644 --- a/e-util/gal-a11y-e-table-column-header.c +++ b/e-util/gal-a11y-e-table-column-header.c @@ -223,7 +223,7 @@ gal_a11y_e_table_column_header_new (ETableCol *ecol, g_return_val_if_fail (E_IS_TABLE_COL (ecol), NULL); a11y = g_object_new (gal_a11y_e_table_column_header_get_type (), NULL); - accessible = ATK_OBJECT (a11y); + accessible = ATK_OBJECT (a11y); atk_object_initialize (accessible, ecol); GET_PRIVATE (a11y)->item = item; diff --git a/e-util/gal-a11y-e-table-factory.c b/e-util/gal-a11y-e-table-factory.c index dd4d843606..f6885c12e0 100644 --- a/e-util/gal-a11y-e-table-factory.c +++ b/e-util/gal-a11y-e-table-factory.c @@ -55,7 +55,7 @@ gal_a11y_e_table_factory_class_init (GalA11yETableFactoryClass *class) parent_class = g_type_class_ref (PARENT_TYPE); - factory_class->create_accessible = gal_a11y_e_table_factory_create_accessible; + factory_class->create_accessible = gal_a11y_e_table_factory_create_accessible; factory_class->get_accessible_type = gal_a11y_e_table_factory_get_accessible_type; } diff --git a/e-util/gal-a11y-e-table-item-factory.c b/e-util/gal-a11y-e-table-item-factory.c index 604fe94bef..65b449a98a 100644 --- a/e-util/gal-a11y-e-table-item-factory.c +++ b/e-util/gal-a11y-e-table-item-factory.c @@ -62,7 +62,7 @@ gal_a11y_e_table_item_factory_class_init (GalA11yETableItemFactoryClass *class) parent_class = g_type_class_ref (PARENT_TYPE); - factory_class->create_accessible = gal_a11y_e_table_item_factory_create_accessible; + factory_class->create_accessible = gal_a11y_e_table_item_factory_create_accessible; factory_class->get_accessible_type = gal_a11y_e_table_item_factory_get_accessible_type; } diff --git a/e-util/gal-a11y-e-table-item.c b/e-util/gal-a11y-e-table-item.c index b703b07317..bcdd585974 100644 --- a/e-util/gal-a11y-e-table-item.c +++ b/e-util/gal-a11y-e-table-item.c @@ -737,10 +737,10 @@ eti_atk_table_iface_init (AtkTableIface *iface) static void eti_atk_component_iface_init (AtkComponentIface *iface) { - component_parent_iface = g_type_interface_peek_parent (iface); + component_parent_iface = g_type_interface_peek_parent (iface); iface->ref_accessible_at_point = eti_ref_accessible_at_point; - iface->get_extents = eti_get_extents; + iface->get_extents = eti_get_extents; } static void @@ -1129,7 +1129,7 @@ gal_a11y_e_table_item_new (ETableItem *item) atk_state_set_add_state (GET_PRIVATE (a11y)->state_set, ATK_STATE_SHOWING); atk_state_set_add_state (GET_PRIVATE (a11y)->state_set, ATK_STATE_VISIBLE); - accessible = ATK_OBJECT (a11y); + accessible = ATK_OBJECT (a11y); GET_PRIVATE (a11y)->item = item; /* Initialize cell data. */ diff --git a/e-util/gal-a11y-e-table.c b/e-util/gal-a11y-e-table.c index de430fd19c..dc79f5f0f8 100644 --- a/e-util/gal-a11y-e-table.c +++ b/e-util/gal-a11y-e-table.c @@ -93,7 +93,7 @@ init_child_item (GalA11yETable *a11y) table = E_TABLE (gtk_accessible_get_widget (GTK_ACCESSIBLE (a11y))); if (table && gtk_widget_get_mapped (GTK_WIDGET (table)) && table->group && E_IS_TABLE_GROUP_CONTAINER (table->group)) { - ETableGroupContainer *etgc = (ETableGroupContainer *) table->group; + ETableGroupContainer *etgc = (ETableGroupContainer *) table->group; GList *list; for (list = etgc->children; list; list = g_list_next (list)) { @@ -168,12 +168,12 @@ et_ref_child (AtkObject *accessible, return aeti; } else if (E_IS_TABLE_GROUP_CONTAINER (et->group)) { - ETableGroupContainer *etgc = (ETableGroupContainer *) et->group; + ETableGroupContainer *etgc = (ETableGroupContainer *) et->group; ETableGroupContainerChildNode *child_node = g_list_nth_data (etgc->children, i); if (child_node) { ETableGroup *child = child_node->child; ETableItem * eti = find_first_table_item (child); - AtkObject *aeti = eti_get_accessible (eti, accessible); + AtkObject *aeti = eti_get_accessible (eti, accessible); if (aeti) g_object_ref (aeti); return aeti; @@ -205,10 +205,10 @@ et_class_init (GalA11yETableClass *class) { AtkObjectClass *atk_object_class = ATK_OBJECT_CLASS (class); - parent_class = g_type_class_ref (PARENT_TYPE); + parent_class = g_type_class_ref (PARENT_TYPE); - atk_object_class->get_n_children = et_get_n_children; - atk_object_class->ref_child = et_ref_child; + atk_object_class->get_n_children = et_get_n_children; + atk_object_class->ref_child = et_ref_child; } static void diff --git a/e-util/gal-a11y-e-text-factory.c b/e-util/gal-a11y-e-text-factory.c index 0c0e24d2c2..9b7d3fc6a3 100644 --- a/e-util/gal-a11y-e-text-factory.c +++ b/e-util/gal-a11y-e-text-factory.c @@ -58,7 +58,7 @@ gal_a11y_e_text_factory_class_init (GalA11yETextFactoryClass *class) parent_class = g_type_class_ref (PARENT_TYPE); - factory_class->create_accessible = gal_a11y_e_text_factory_create_accessible; + factory_class->create_accessible = gal_a11y_e_text_factory_create_accessible; factory_class->get_accessible_type = gal_a11y_e_text_factory_get_accessible_type; } diff --git a/e-util/gal-a11y-e-text.c b/e-util/gal-a11y-e-text.c index 3dc8e3b77e..950b923f88 100644 --- a/e-util/gal-a11y-e-text.c +++ b/e-util/gal-a11y-e-text.c @@ -660,7 +660,7 @@ static gint et_get_n_selections (AtkText *text) { EText *etext; - GObject *obj = atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE (text)); + GObject *obj = atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE (text)); if (obj == NULL) return -1; @@ -940,35 +940,35 @@ et_atk_component_iface_init (AtkComponentIface *iface) static void et_atk_text_iface_init (AtkTextIface *iface) { - iface->get_text = et_get_text; - iface->get_text_after_offset = et_get_text_after_offset; - iface->get_text_at_offset = et_get_text_at_offset; + iface->get_text = et_get_text; + iface->get_text_after_offset = et_get_text_after_offset; + iface->get_text_at_offset = et_get_text_at_offset; iface->get_character_at_offset = et_get_character_at_offset; - iface->get_text_before_offset = et_get_text_before_offset; - iface->get_caret_offset = et_get_caret_offset; - iface->get_run_attributes = et_get_run_attributes; - iface->get_default_attributes = et_get_default_attributes; - iface->get_character_extents = et_get_character_extents; - iface->get_character_count = et_get_character_count; - iface->get_offset_at_point = et_get_offset_at_point; - iface->get_n_selections = et_get_n_selections; - iface->get_selection = et_get_selection; - iface->add_selection = et_add_selection; - iface->remove_selection = et_remove_selection; - iface->set_selection = et_set_selection; - iface->set_caret_offset = et_set_caret_offset; + iface->get_text_before_offset = et_get_text_before_offset; + iface->get_caret_offset = et_get_caret_offset; + iface->get_run_attributes = et_get_run_attributes; + iface->get_default_attributes = et_get_default_attributes; + iface->get_character_extents = et_get_character_extents; + iface->get_character_count = et_get_character_count; + iface->get_offset_at_point = et_get_offset_at_point; + iface->get_n_selections = et_get_n_selections; + iface->get_selection = et_get_selection; + iface->add_selection = et_add_selection; + iface->remove_selection = et_remove_selection; + iface->set_selection = et_set_selection; + iface->set_caret_offset = et_set_caret_offset; } static void et_atk_editable_text_iface_init (AtkEditableTextIface *iface) { iface->set_run_attributes = et_set_run_attributes; - iface->set_text_contents = et_set_text_contents; - iface->insert_text = et_insert_text; - iface->copy_text = et_copy_text; - iface->cut_text = et_cut_text; - iface->delete_text = et_delete_text; - iface->paste_text = et_paste_text; + iface->set_text_contents = et_set_text_contents; + iface->insert_text = et_insert_text; + iface->copy_text = et_copy_text; + iface->cut_text = et_cut_text; + iface->delete_text = et_delete_text; + iface->paste_text = et_paste_text; } static void diff --git a/e-util/gal-a11y-e-tree-factory.c b/e-util/gal-a11y-e-tree-factory.c index 7410191da6..f218052b11 100644 --- a/e-util/gal-a11y-e-tree-factory.c +++ b/e-util/gal-a11y-e-tree-factory.c @@ -54,7 +54,7 @@ gal_a11y_e_tree_factory_class_init (GalA11yETreeFactoryClass *class) parent_class = g_type_class_ref (PARENT_TYPE); - factory_class->create_accessible = gal_a11y_e_tree_factory_create_accessible; + factory_class->create_accessible = gal_a11y_e_tree_factory_create_accessible; factory_class->get_accessible_type = gal_a11y_e_tree_factory_get_accessible_type; } diff --git a/e-util/gal-a11y-e-tree.c b/e-util/gal-a11y-e-tree.c index 60f7efb920..6b40b05841 100644 --- a/e-util/gal-a11y-e-tree.c +++ b/e-util/gal-a11y-e-tree.c @@ -100,10 +100,10 @@ et_class_init (GalA11yETreeClass *class) { AtkObjectClass *atk_object_class = ATK_OBJECT_CLASS (class); - parent_class = g_type_class_ref (PARENT_TYPE); + parent_class = g_type_class_ref (PARENT_TYPE); - atk_object_class->get_n_children = et_get_n_children; - atk_object_class->ref_child = et_ref_child; + atk_object_class->get_n_children = et_get_n_children; + atk_object_class->ref_child = et_ref_child; } static void diff --git a/e-util/gal-a11y-factory.h b/e-util/gal-a11y-factory.h index a261c308ac..191a9e4296 100644 --- a/e-util/gal-a11y-factory.h +++ b/e-util/gal-a11y-factory.h @@ -31,58 +31,58 @@ #include <atk/atkobject.h> #include <atk/atkobjectfactory.h> -#define GAL_A11Y_FACTORY(type, type_as_function, opt_create_accessible) \ - \ -static GType \ -type_as_function ## _factory_get_accessible_type (void) \ -{ \ - return type; \ -} \ - \ -static AtkObject * \ -type_as_function ## _factory_create_accessible (GObject *obj) \ -{ \ - GtkWidget *widget; \ - AtkObject *accessible; \ - \ - g_return_val_if_fail (GTK_IS_WIDGET (obj), NULL); \ - \ - widget = GTK_WIDGET (obj); \ - \ - accessible = opt_create_accessible (widget); \ - \ - return accessible; \ -} \ - \ -static void \ -type_as_function ## _factory_class_init (AtkObjectFactoryClass *klass) \ -{ \ - klass->create_accessible = type_as_function ## _factory_create_accessible; \ +#define GAL_A11Y_FACTORY(type, type_as_function, opt_create_accessible) \ + \ +static GType \ +type_as_function ## _factory_get_accessible_type (void) \ +{ \ + return type; \ +} \ + \ +static AtkObject * \ +type_as_function ## _factory_create_accessible (GObject *obj) \ +{ \ + GtkWidget *widget; \ + AtkObject *accessible; \ + \ + g_return_val_if_fail (GTK_IS_WIDGET (obj), NULL); \ + \ + widget = GTK_WIDGET (obj); \ + \ + accessible = opt_create_accessible (widget); \ + \ + return accessible; \ +} \ + \ +static void \ +type_as_function ## _factory_class_init (AtkObjectFactoryClass *klass) \ +{ \ + klass->create_accessible = type_as_function ## _factory_create_accessible; \ klass->get_accessible_type = type_as_function ## _factory_get_accessible_type;\ -} \ - \ -static GType \ -type_as_function ## _factory_get_type (void) \ -{ \ - static GType t = 0; \ - \ - if (!t) \ - { \ - gchar *name; \ - static const GTypeInfo tinfo = \ - { \ - sizeof (AtkObjectFactoryClass), \ - NULL, NULL, (GClassInitFunc) type_as_function ## _factory_class_init, \ - NULL, NULL, sizeof (AtkObjectFactory), 0, NULL, NULL \ - }; \ - \ - name = g_strconcat (g_type_name (type), "Factory", NULL); \ - t = g_type_register_static ( \ - ATK_TYPE_OBJECT_FACTORY, name, &tinfo, 0); \ - g_free (name); \ - } \ - \ - return t; \ +} \ + \ +static GType \ +type_as_function ## _factory_get_type (void) \ +{ \ + static GType t = 0; \ + \ + if (!t) \ + { \ + gchar *name; \ + static const GTypeInfo tinfo = \ + { \ + sizeof (AtkObjectFactoryClass), \ + NULL, NULL, (GClassInitFunc) type_as_function ## _factory_class_init, \ + NULL, NULL, sizeof (AtkObjectFactory), 0, NULL, NULL \ + }; \ + \ + name = g_strconcat (g_type_name (type), "Factory", NULL); \ + t = g_type_register_static ( \ + ATK_TYPE_OBJECT_FACTORY, name, &tinfo, 0); \ + g_free (name); \ + } \ + \ + return t; \ } #endif /* _GAL_A11Y_FACTORY_H__ */ diff --git a/e-util/gal-view-collection.c b/e-util/gal-view-collection.c index 6d8ccf896c..98b7e2eab5 100644 --- a/e-util/gal-view-collection.c +++ b/e-util/gal-view-collection.c @@ -404,7 +404,7 @@ gal_view_collection_dispose (GObject *object) for (ii = 0; ii < priv->removed_view_count; ii++) gal_view_collection_item_free (priv->removed_view_data[ii]); g_free (priv->removed_view_data); - priv->removed_view_data = NULL; + priv->removed_view_data = NULL; priv->removed_view_count = 0; /* Chain up to parent's dispose() method. */ diff --git a/e-util/gal-view-etable.c b/e-util/gal-view-etable.c index de73a0204b..06e80093d8 100644 --- a/e-util/gal-view-etable.c +++ b/e-util/gal-view-etable.c @@ -114,7 +114,7 @@ gal_view_etable_clone (GalView *view) gve = GAL_VIEW_ETABLE (view); /* do this before setting state_filename, to not overwrite current - state changes in the 'attach' function */ + * state changes in the 'attach' function */ if (gve->priv->table) gal_view_etable_attach_table (GAL_VIEW_ETABLE (clone), gve->priv->table); else if (gve->priv->tree) diff --git a/e-util/gal-view-instance-save-as-dialog.c b/e-util/gal-view-instance-save-as-dialog.c index d5febb4acc..c29d719a56 100644 --- a/e-util/gal-view-instance-save-as-dialog.c +++ b/e-util/gal-view-instance-save-as-dialog.c @@ -229,7 +229,7 @@ gal_view_instance_save_as_dialog_class_init (GalViewInstanceSaveAsDialogClass *c object_class->set_property = gal_view_instance_save_as_dialog_set_property; object_class->get_property = gal_view_instance_save_as_dialog_get_property; - object_class->dispose = gal_view_instance_save_as_dialog_dispose; + object_class->dispose = gal_view_instance_save_as_dialog_dispose; g_object_class_install_property ( object_class, diff --git a/e-util/gal-view-instance.c b/e-util/gal-view-instance.c index a645150a08..d74dc8db9f 100644 --- a/e-util/gal-view-instance.c +++ b/e-util/gal-view-instance.c @@ -218,25 +218,25 @@ gal_view_instance_class_init (GalViewInstanceClass *class) G_TYPE_NONE, 0); class->display_view = NULL; - class->changed = NULL; + class->changed = NULL; } static void gal_view_instance_init (GalViewInstance *instance) { - instance->collection = NULL; + instance->collection = NULL; - instance->instance_id = NULL; - instance->custom_filename = NULL; + instance->instance_id = NULL; + instance->custom_filename = NULL; instance->current_view_filename = NULL; - instance->current_title = NULL; - instance->current_type = NULL; - instance->current_id = NULL; - instance->current_view = NULL; + instance->current_title = NULL; + instance->current_type = NULL; + instance->current_id = NULL; + instance->current_view = NULL; - instance->view_changed_id = 0; - instance->collection_changed_id = 0; + instance->view_changed_id = 0; + instance->collection_changed_id = 0; instance->loaded = FALSE; instance->default_view = NULL; |