diff options
Diffstat (limited to 'widgets/table')
23 files changed, 228 insertions, 228 deletions
diff --git a/widgets/table/e-cell-date-edit.c b/widgets/table/e-cell-date-edit.c index 770ac77f0a..fc81d59cfd 100644 --- a/widgets/table/e-cell-date-edit.c +++ b/widgets/table/e-cell-date-edit.c @@ -234,11 +234,11 @@ e_cell_date_edit_init (ECellDateEdit *ecde) vbox = gtk_vbox_new (FALSE, 0); gtk_container_add (GTK_CONTAINER (frame), vbox); - gtk_widget_show (vbox); + gtk_widget_show (vbox); hbox = gtk_hbox_new (FALSE, 4); gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0); - gtk_widget_show (hbox); + gtk_widget_show (hbox); ecde->calendar = e_calendar_new (); gnome_canvas_item_set (GNOME_CANVAS_ITEM (E_CALENDAR (ecde->calendar)->calitem), @@ -249,7 +249,7 @@ e_cell_date_edit_init (ECellDateEdit *ecde) vbox2 = gtk_vbox_new (FALSE, 2); gtk_box_pack_start (GTK_BOX (hbox), vbox2, TRUE, TRUE, 0); - gtk_widget_show (vbox2); + gtk_widget_show (vbox2); ecde->time_entry = gtk_entry_new (); gtk_widget_set_size_request (ecde->time_entry, 50, -1); @@ -295,11 +295,11 @@ e_cell_date_edit_init (ECellDateEdit *ecde) gtk_container_set_border_width (GTK_CONTAINER (bbox), 4); gtk_box_set_spacing (GTK_BOX (bbox), 2); gtk_box_pack_start (GTK_BOX (vbox), bbox, FALSE, FALSE, 0); - gtk_widget_show (bbox); + gtk_widget_show (bbox); now_button = gtk_button_new_with_label (_("Now")); gtk_container_add (GTK_CONTAINER (bbox), now_button); - gtk_widget_show (now_button); + gtk_widget_show (now_button); g_signal_connect((now_button), "clicked", G_CALLBACK (e_cell_date_edit_on_now_clicked), ecde); @@ -307,7 +307,7 @@ e_cell_date_edit_init (ECellDateEdit *ecde) today_button = gtk_button_new_with_label (_("Today")); gtk_container_add (GTK_CONTAINER (bbox), today_button); - gtk_widget_show (today_button); + gtk_widget_show (today_button); g_signal_connect((today_button), "clicked", G_CALLBACK (e_cell_date_edit_on_today_clicked), ecde); @@ -316,7 +316,7 @@ e_cell_date_edit_init (ECellDateEdit *ecde) /* Translators: "None" as a label of a button to unset date in a date table cell */ none_button = gtk_button_new_with_label (C_("table-date", "None")); gtk_container_add (GTK_CONTAINER (bbox), none_button); - gtk_widget_show (none_button); + gtk_widget_show (none_button); g_signal_connect((none_button), "clicked", G_CALLBACK (e_cell_date_edit_on_none_clicked), ecde); @@ -324,7 +324,7 @@ e_cell_date_edit_init (ECellDateEdit *ecde) ok_button = gtk_button_new_with_label (_("OK")); gtk_container_add (GTK_CONTAINER (bbox), ok_button); - gtk_widget_show (ok_button); + gtk_widget_show (ok_button); g_signal_connect((ok_button), "clicked", G_CALLBACK (e_cell_date_edit_on_ok_clicked), ecde); diff --git a/widgets/table/e-cell-hbox.c b/widgets/table/e-cell-hbox.c index 48547e037b..6710f60bd5 100644 --- a/widgets/table/e-cell-hbox.c +++ b/widgets/table/e-cell-hbox.c @@ -57,8 +57,8 @@ ecv_new_view (ECell *ecell, ETableModel *table_model, gpointer e_table_item_view hbox_view->cell_view.ecell = ecell; hbox_view->cell_view.e_table_model = table_model; hbox_view->cell_view.e_table_item_view = e_table_item_view; - hbox_view->cell_view.kill_view_cb = NULL; - hbox_view->cell_view.kill_view_cb_data = NULL; + hbox_view->cell_view.kill_view_cb = NULL; + hbox_view->cell_view.kill_view_cb_data = NULL; /* create our subcell view */ hbox_view->subcell_view_count = ecv->subcell_count; @@ -84,11 +84,11 @@ ecv_kill_view (ECellView *ecv) ECellHboxView *hbox_view = (ECellHboxView *) ecv; gint i; - if (hbox_view->cell_view.kill_view_cb) - (hbox_view->cell_view.kill_view_cb)(ecv, hbox_view->cell_view.kill_view_cb_data); + if (hbox_view->cell_view.kill_view_cb) + (hbox_view->cell_view.kill_view_cb)(ecv, hbox_view->cell_view.kill_view_cb_data); - if (hbox_view->cell_view.kill_view_cb_data) - g_list_free (hbox_view->cell_view.kill_view_cb_data); + if (hbox_view->cell_view.kill_view_cb_data) + g_list_free (hbox_view->cell_view.kill_view_cb_data); /* kill our subcell view */ for (i = 0; i < hbox_view->subcell_view_count; i++) diff --git a/widgets/table/e-cell-pixbuf.c b/widgets/table/e-cell-pixbuf.c index e25cb2dc63..9687e7d392 100644 --- a/widgets/table/e-cell-pixbuf.c +++ b/widgets/table/e-cell-pixbuf.c @@ -87,11 +87,11 @@ pixbuf_kill_view (ECellView *ecell_view) ECellPixbufView *pixbuf_view = (ECellPixbufView *) ecell_view; if (pixbuf_view->cell_view.kill_view_cb) - pixbuf_view->cell_view.kill_view_cb ( - ecell_view, pixbuf_view->cell_view.kill_view_cb_data); + pixbuf_view->cell_view.kill_view_cb ( + ecell_view, pixbuf_view->cell_view.kill_view_cb_data); if (pixbuf_view->cell_view.kill_view_cb_data) - g_list_free (pixbuf_view->cell_view.kill_view_cb_data); + g_list_free (pixbuf_view->cell_view.kill_view_cb_data); g_free (pixbuf_view); } @@ -111,7 +111,7 @@ pixbuf_draw (ECellView *ecell_view, cairo_t *cr, /* we can't make sure we really got a pixbuf since, well, it's a Gdk thing */ if (x2 - x1 == 0) - return; + return; if (!cell_pixbuf) return; @@ -121,17 +121,17 @@ pixbuf_draw (ECellView *ecell_view, cairo_t *cr, /* We center the pixbuf within our allocated space */ if (x2 - x1 > pix_w) { - gint diff = (x2 - x1) - pix_w; - real_x = x1 + diff/2; + gint diff = (x2 - x1) - pix_w; + real_x = x1 + diff/2; } else { - real_x = x1; + real_x = x1; } if (y2 - y1 > pix_h) { - gint diff = (y2 - y1) - pix_h; - real_y = y1 + diff/2; + gint diff = (y2 - y1) - pix_h; + real_y = y1 + diff/2; } else { - real_y = y1; + real_y = y1; } cairo_save (cr); @@ -156,7 +156,7 @@ pixbuf_height (ECellView *ecell_view, gint model_col, gint view_col, gint row) GdkPixbuf *pixbuf; if (row == -1) { if (e_table_model_row_count (ecell_view->e_table_model) > 0) { - row = 0; + row = 0; } else { return 6; } @@ -164,7 +164,7 @@ pixbuf_height (ECellView *ecell_view, gint model_col, gint view_col, gint row) pixbuf = (GdkPixbuf *) e_table_model_value_at (ecell_view->e_table_model, 1, row); if (!pixbuf) - return 0; + return 0; /* We give ourselves 3 pixels of padding on either side */ return gdk_pixbuf_get_height (pixbuf) + 6; @@ -225,21 +225,21 @@ pixbuf_max_width (ECellView *ecell_view, gint model_col, gint view_col) gint max_width = -1; if (model_col == 0) { - num_rows = e_table_model_row_count (ecell_view->e_table_model); - - for (i = 0; i <= num_rows; i++) { - GdkPixbuf *pixbuf = (GdkPixbuf *) e_table_model_value_at - (ecell_view->e_table_model, - 1, - i); - if (!pixbuf) - continue; - pw = gdk_pixbuf_get_width (pixbuf); - if (max_width < pw) - max_width = pw; - } + num_rows = e_table_model_row_count (ecell_view->e_table_model); + + for (i = 0; i <= num_rows; i++) { + GdkPixbuf *pixbuf = (GdkPixbuf *) e_table_model_value_at + (ecell_view->e_table_model, + 1, + i); + if (!pixbuf) + continue; + pw = gdk_pixbuf_get_width (pixbuf); + if (max_width < pw) + max_width = pw; + } } else { - return -1; + return -1; } return max_width; diff --git a/widgets/table/e-cell-popup.c b/widgets/table/e-cell-popup.c index abfe61e206..334e6be77a 100644 --- a/widgets/table/e-cell-popup.c +++ b/widgets/table/e-cell-popup.c @@ -130,8 +130,8 @@ e_cell_popup_class_init (ECellPopupClass *class) ecc->get_bg_color = ecp_get_bg_color; gal_a11y_e_cell_registry_add_cell_type (NULL, - E_TYPE_CELL_POPUP, - gal_a11y_e_cell_popup_new); + E_TYPE_CELL_POPUP, + gal_a11y_e_cell_popup_new); } static void @@ -183,8 +183,8 @@ ecp_new_view (ECell *ecell, ETableModel *table_model, gpointer e_table_item_view ecp_view->cell_view.ecell = ecell; ecp_view->cell_view.e_table_model = table_model; ecp_view->cell_view.e_table_item_view = e_table_item_view; - ecp_view->cell_view.kill_view_cb = NULL; - ecp_view->cell_view.kill_view_cb_data = NULL; + ecp_view->cell_view.kill_view_cb = NULL; + ecp_view->cell_view.kill_view_cb_data = NULL; ecp_view->child_view = e_cell_new_view (ecp->child, table_model, e_table_item_view); diff --git a/widgets/table/e-cell-text.c b/widgets/table/e-cell-text.c index 245f894067..d79c826b5c 100644 --- a/widgets/table/e-cell-text.c +++ b/widgets/table/e-cell-text.c @@ -326,7 +326,7 @@ ect_new_view (ECell *ecell, ETableModel *table_model, gpointer e_table_item_view text_view->cell_view.e_table_model = table_model; text_view->cell_view.e_table_item_view = e_table_item_view; text_view->cell_view.kill_view_cb = NULL; - text_view->cell_view.kill_view_cb_data = NULL; + text_view->cell_view.kill_view_cb_data = NULL; text_view->canvas = canvas; @@ -345,7 +345,7 @@ ect_kill_view (ECellView *ecv) ECellTextView *text_view = (ECellTextView *) ecv; if (text_view->cell_view.kill_view_cb) - (text_view->cell_view.kill_view_cb)(ecv, text_view->cell_view.kill_view_cb_data); + (text_view->cell_view.kill_view_cb)(ecv, text_view->cell_view.kill_view_cb_data); if (text_view->cell_view.kill_view_cb_data) g_list_free (text_view->cell_view.kill_view_cb_data); @@ -722,8 +722,8 @@ ect_draw (ECellView *ecell_view, cairo_t *cr, x_origin = x1 + ect->x + text_view->xofs - (edit ? edit->xofs_edit : 0); y_origin = y1 + ect->y + text_view->yofs - (edit ? edit->yofs_edit : 0); - cairo_rectangle (cr, x1, y1, x2 - x1, y2 - y1); - cairo_clip (cr); + cairo_rectangle (cr, x1, y1, x2 - x1, y2 - y1); + cairo_clip (cr); layout = generate_layout (text_view, model_col, view_col, row, x2 - x1); @@ -731,33 +731,33 @@ ect_draw (ECellView *ecell_view, cairo_t *cr, layout = layout_with_preedit (text_view, row, edit->text ? edit->text : "?", x2 - x1); } - cairo_move_to (cr, x_origin, y_origin); + cairo_move_to (cr, x_origin, y_origin); pango_cairo_show_layout (cr, layout); if (edit && edit->view_col == view_col && edit->row == row) { if (edit->selection_start != edit->selection_end) { cairo_region_t *clip_region; - gint indices[2]; - GtkStateType state; + gint indices[2]; + GtkStateType state; - state = edit->has_selection ? GTK_STATE_SELECTED : GTK_STATE_ACTIVE; + state = edit->has_selection ? GTK_STATE_SELECTED : GTK_STATE_ACTIVE; indices[0] = MIN (edit->selection_start, edit->selection_end); indices[1] = MAX (edit->selection_start, edit->selection_end); - clip_region = gdk_pango_layout_get_clip_region (layout, - x_origin, y_origin, - indices, 1); - gdk_cairo_region (cr, clip_region); - cairo_clip (cr); + clip_region = gdk_pango_layout_get_clip_region (layout, + x_origin, y_origin, + indices, 1); + gdk_cairo_region (cr, clip_region); + cairo_clip (cr); cairo_region_destroy (clip_region); - gdk_cairo_set_source_color (cr, &style->base[state]); - cairo_paint (cr); + gdk_cairo_set_source_color (cr, &style->base[state]); + cairo_paint (cr); - gdk_cairo_set_source_color (cr, &style->text[state]); - cairo_move_to (cr, x_origin, y_origin); - pango_cairo_show_layout (cr, layout); + gdk_cairo_set_source_color (cr, &style->text[state]); + cairo_move_to (cr, x_origin, y_origin); + pango_cairo_show_layout (cr, layout); } else { if (edit->show_cursor) { PangoRectangle strong_pos, weak_pos; diff --git a/widgets/table/e-cell-tree.c b/widgets/table/e-cell-tree.c index 1a4b00bb4c..e75c973d57 100644 --- a/widgets/table/e-cell-tree.c +++ b/widgets/table/e-cell-tree.c @@ -742,7 +742,7 @@ e_cell_tree_class_init (ECellTreeClass *class) 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); + gal_a11y_e_cell_registry_add_cell_type (NULL, E_TYPE_CELL_TREE, gal_a11y_e_cell_tree_new); } static void diff --git a/widgets/table/e-cell-vbox.c b/widgets/table/e-cell-vbox.c index 1e5875b2b1..5d0c5989a5 100644 --- a/widgets/table/e-cell-vbox.c +++ b/widgets/table/e-cell-vbox.c @@ -53,8 +53,8 @@ ecv_new_view (ECell *ecell, ETableModel *table_model, gpointer e_table_item_view vbox_view->cell_view.ecell = ecell; vbox_view->cell_view.e_table_model = table_model; vbox_view->cell_view.e_table_item_view = e_table_item_view; - vbox_view->cell_view.kill_view_cb = NULL; - vbox_view->cell_view.kill_view_cb_data = NULL; + vbox_view->cell_view.kill_view_cb = NULL; + vbox_view->cell_view.kill_view_cb_data = NULL; /* create our subcell view */ vbox_view->subcell_view_count = ecv->subcell_count; @@ -78,11 +78,11 @@ ecv_kill_view (ECellView *ecv) ECellVboxView *vbox_view = (ECellVboxView *) ecv; gint i; - if (vbox_view->cell_view.kill_view_cb) + if (vbox_view->cell_view.kill_view_cb) (vbox_view->cell_view.kill_view_cb)(ecv, vbox_view->cell_view.kill_view_cb_data); - if (vbox_view->cell_view.kill_view_cb_data) - g_list_free (vbox_view->cell_view.kill_view_cb_data); + if (vbox_view->cell_view.kill_view_cb_data) + g_list_free (vbox_view->cell_view.kill_view_cb_data); /* kill our subcell view */ for (i = 0; i < vbox_view->subcell_view_count; i++) diff --git a/widgets/table/e-table-field-chooser-item.c b/widgets/table/e-table-field-chooser-item.c index 91a77c83c5..dafd0b79fe 100644 --- a/widgets/table/e-table-field-chooser-item.c +++ b/widgets/table/e-table-field-chooser-item.c @@ -190,7 +190,7 @@ etfci_update (GnomeCanvasItem *item, x2 = etfci->width; y2 = etfci->height; - gnome_canvas_matrix_transform_rect (i2c, &x1, &y1, &x2, &y2); + gnome_canvas_matrix_transform_rect (i2c, &x1, &y1, &x2, &y2); if (item->x1 != x1 || item->y1 != y1 || diff --git a/widgets/table/e-table-group-container.c b/widgets/table/e-table-group-container.c index f9c12b2a9a..7f4352a6d5 100644 --- a/widgets/table/e-table-group-container.c +++ b/widgets/table/e-table-group-container.c @@ -1032,7 +1032,7 @@ etgc_reflow (GnomeCanvasItem *item, gint flags) ETableGroupContainer *etgc = E_TABLE_GROUP_CONTAINER (item); gboolean frozen; - g_object_get (etgc, + g_object_get (etgc, "frozen", &frozen, NULL); diff --git a/widgets/table/e-table-header-item.c b/widgets/table/e-table-header-item.c index 0c56b59ea2..e6371b01b6 100644 --- a/widgets/table/e-table-header-item.c +++ b/widgets/table/e-table-header-item.c @@ -176,7 +176,7 @@ ethi_update (GnomeCanvasItem *item, gint flags) { ETableHeaderItem *ethi = E_TABLE_HEADER_ITEM (item); - double x1, y1, x2, y2; + double x1, y1, x2, y2; if (GNOME_CANVAS_ITEM_CLASS (ethi_parent_class)->update) GNOME_CANVAS_ITEM_CLASS (ethi_parent_class)->update ( @@ -197,7 +197,7 @@ ethi_update (GnomeCanvasItem *item, x2 = ethi->width; y2 = ethi->height; - gnome_canvas_matrix_transform_rect (i2c, &x1, &y1, &x2, &y2); + gnome_canvas_matrix_transform_rect (i2c, &x1, &y1, &x2, &y2); if (item->x1 != x1 || item->y1 != y1 || diff --git a/widgets/table/e-table-item.c b/widgets/table/e-table-item.c index 75a8f44d5d..f51c741127 100644 --- a/widgets/table/e-table-item.c +++ b/widgets/table/e-table-item.c @@ -439,7 +439,7 @@ eti_bounds (GnomeCanvasItem *item, gdouble *x1, gdouble *y1, gdouble *x2, gdoubl *y2 = eti->height; gnome_canvas_item_i2c_matrix (GNOME_CANVAS_ITEM (eti), &i2c); - gnome_canvas_matrix_transform_rect (&i2c, x1, y1, x2, y2); + gnome_canvas_matrix_transform_rect (&i2c, x1, y1, x2, y2); } static void @@ -477,7 +477,7 @@ static void eti_update (GnomeCanvasItem *item, const cairo_matrix_t *i2c, gint flags) { ETableItem *eti = E_TABLE_ITEM (item); - double x1, x2, y1, y2; + double x1, x2, y1, y2; if (GNOME_CANVAS_ITEM_CLASS (eti_parent_class)->update) (*GNOME_CANVAS_ITEM_CLASS (eti_parent_class)->update)(item, i2c, flags); @@ -1324,7 +1324,7 @@ eti_add_selection_model (ETableItem *eti, ESelectionModel *selection) G_CALLBACK (eti_cursor_activated), eti); eti_selection_change (selection, eti); - g_signal_emit_by_name (G_OBJECT (eti), + g_signal_emit_by_name (G_OBJECT (eti), "selection_model_added", eti->selection); } @@ -1640,7 +1640,7 @@ eti_realize (GnomeCanvasItem *item) GtkStyle *style; if (GNOME_CANVAS_ITEM_CLASS (eti_parent_class)->realize) - (*GNOME_CANVAS_ITEM_CLASS (eti_parent_class)->realize)(item); + (*GNOME_CANVAS_ITEM_CLASS (eti_parent_class)->realize)(item); eti->rows = e_table_model_row_count (eti->table_model); @@ -1707,23 +1707,23 @@ eti_unrealize (GnomeCanvasItem *item) eti->height = 0; if (GNOME_CANVAS_ITEM_CLASS (eti_parent_class)->unrealize) - (*GNOME_CANVAS_ITEM_CLASS (eti_parent_class)->unrealize)(item); + (*GNOME_CANVAS_ITEM_CLASS (eti_parent_class)->unrealize)(item); } static void eti_draw_grid_line (ETableItem *eti, cairo_t *cr, GtkStyle *style, gint x1, gint y1, gint x2, gint y2) { - cairo_save (cr); + cairo_save (cr); - cairo_set_line_width (cr, 1.0); - gdk_cairo_set_source_color (cr, &style->dark[GTK_STATE_NORMAL]); + cairo_set_line_width (cr, 1.0); + gdk_cairo_set_source_color (cr, &style->dark[GTK_STATE_NORMAL]); - cairo_move_to (cr, x1 + 0.5, y1 + 0.5); - cairo_line_to (cr, x2 + 0.5, y2 + 0.5); - cairo_stroke (cr); + cairo_move_to (cr, x1 + 0.5, y1 + 0.5); + cairo_line_to (cr, x2 + 0.5, y2 + 0.5); + cairo_stroke (cr); - cairo_restore (cr); + cairo_restore (cr); } static void @@ -1741,7 +1741,7 @@ eti_draw (GnomeCanvasItem *item, cairo_t *cr, gint x, gint y, gint width, gint h cairo_matrix_t i2c; gdouble eti_base_x, eti_base_y, lower_right_y, lower_right_x; GtkWidget *canvas = GTK_WIDGET (item->canvas); - GtkStyle *style = gtk_widget_get_style (canvas); + GtkStyle *style = gtk_widget_get_style (canvas); gint height_extra = eti->horizontal_draw_grid ? 1 : 0; /* @@ -1750,11 +1750,11 @@ eti_draw (GnomeCanvasItem *item, cairo_t *cr, gint x, gint y, gint width, gint h gnome_canvas_item_i2c_matrix (item, &i2c); eti_base_x = 0; eti_base_y = 0; - cairo_matrix_transform_point (&i2c, &eti_base_x, &eti_base_y); + cairo_matrix_transform_point (&i2c, &eti_base_x, &eti_base_y); lower_right_x = eti->width; lower_right_y = eti->height; - cairo_matrix_transform_point (&i2c, &lower_right_x, &lower_right_y); + cairo_matrix_transform_point (&i2c, &lower_right_x, &lower_right_y); /* * First column to draw, last column to draw @@ -2005,18 +2005,18 @@ eti_draw (GnomeCanvasItem *item, cairo_t *cr, gint x, gint y, gint width, gint h * Draw focus */ if (eti->draw_focus && f_found) { - static const double dash[] = { 1.0, 1.0 }; - cairo_set_line_width (cr, 1.0); - cairo_rectangle (cr, - f_x1 + 0.5, f_x2 + 0.5, - f_x2 - f_x1 - 1, f_y2 - f_y1); + static const double dash[] = { 1.0, 1.0 }; + cairo_set_line_width (cr, 1.0); + cairo_rectangle (cr, + f_x1 + 0.5, f_x2 + 0.5, + f_x2 - f_x1 - 1, f_y2 - f_y1); - gdk_cairo_set_source_color (cr, &style->bg[GTK_STATE_NORMAL]); - cairo_stroke_preserve (cr); + gdk_cairo_set_source_color (cr, &style->bg[GTK_STATE_NORMAL]); + cairo_stroke_preserve (cr); - cairo_set_dash (cr, dash, G_N_ELEMENTS (dash), 0.0); - gdk_cairo_set_source_color (cr, &style->fg[GTK_STATE_NORMAL]); - cairo_stroke (cr); + cairo_set_dash (cr, dash, G_N_ELEMENTS (dash), 0.0); + gdk_cairo_set_source_color (cr, &style->fg[GTK_STATE_NORMAL]); + cairo_stroke (cr); } } @@ -3239,7 +3239,7 @@ e_table_item_compute_location (ETableItem *eti, gint *col) { /* Save the grabbed row but make sure that we don't get flawed - results because the cursor is grabbed. */ + results because the cursor is grabbed. */ gint grabbed_row = eti->grabbed_row; eti->grabbed_row = -1; @@ -3264,7 +3264,7 @@ e_table_item_compute_mouse_over (ETableItem *eti, { gdouble realx, realy; /* Save the grabbed row but make sure that we don't get flawed - results because the cursor is grabbed. */ + results because the cursor is grabbed. */ gint grabbed_row = eti->grabbed_row; eti->grabbed_row = -1; diff --git a/widgets/table/e-table.c b/widgets/table/e-table.c index 5028a48a6b..c7e955efba 100644 --- a/widgets/table/e-table.c +++ b/widgets/table/e-table.c @@ -1381,9 +1381,9 @@ e_table_setup_table (ETable *e_table, ETableHeader *full_header, ETableHeader *h g_signal_connect ( G_OBJECT (e_table->click_to_add), "event", G_CALLBACK (click_to_add_event), e_table); - g_signal_connect ( + g_signal_connect ( G_OBJECT (e_table->click_to_add), "cursor_change", - G_CALLBACK (click_to_add_cursor_change), e_table); + G_CALLBACK (click_to_add_cursor_change), e_table); } } @@ -3269,8 +3269,8 @@ e_table_class_init (ETableClass *class) 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->get_preferred_width = et_get_preferred_width; + widget_class->get_preferred_height = et_get_preferred_height; widget_class->focus = et_focus; diff --git a/widgets/table/e-tree-selection-model.c b/widgets/table/e-tree-selection-model.c index cc8a1fcd6a..cd438a77e2 100644 --- a/widgets/table/e-tree-selection-model.c +++ b/widgets/table/e-tree-selection-model.c @@ -501,7 +501,7 @@ static void etsm_invert_selection (ESelectionModel *selection) { ETreeSelectionModel *etsm = E_TREE_SELECTION_MODEL (selection); - gint count = etsm_row_count (selection); + gint count = etsm_row_count (selection); gint i; for (i = 0; i < count; i++) { diff --git a/widgets/table/e-tree-table-adapter.c b/widgets/table/e-tree-table-adapter.c index d529a6e045..4ca80d97a0 100644 --- a/widgets/table/e-tree-table-adapter.c +++ b/widgets/table/e-tree-table-adapter.c @@ -116,10 +116,10 @@ lookup_gnode (ETreeTableAdapter *etta, ETreePath path) static void resize_map (ETreeTableAdapter *etta, gint size) { - if (size > etta->priv->n_vals_allocated) { - etta->priv->n_vals_allocated = MAX (etta->priv->n_vals_allocated + INCREMENT_AMOUNT, size); - etta->priv->map_table = g_renew (node_t *, etta->priv->map_table, etta->priv->n_vals_allocated); - } + if (size > etta->priv->n_vals_allocated) { + etta->priv->n_vals_allocated = MAX (etta->priv->n_vals_allocated + INCREMENT_AMOUNT, size); + etta->priv->map_table = g_renew (node_t *, etta->priv->map_table, etta->priv->n_vals_allocated); + } etta->priv->n_map = size; } diff --git a/widgets/table/gal-a11y-e-cell-toggle.c b/widgets/table/gal-a11y-e-cell-toggle.c index 660a0ebd9a..c57d7083e6 100644 --- a/widgets/table/gal-a11y-e-cell-toggle.c +++ b/widgets/table/gal-a11y-e-cell-toggle.c @@ -57,16 +57,16 @@ gal_a11y_e_cell_toggle_get_type (void) { static const GTypeInfo tinfo = { - sizeof (GalA11yECellToggleClass), - (GBaseInitFunc) NULL, /* base init */ - (GBaseFinalizeFunc) NULL, /* base finalize */ - (GClassInitFunc) gal_a11y_e_cell_toggle_class_init, /* class init */ - (GClassFinalizeFunc) NULL, /* class finalize */ - NULL, /* class data */ - sizeof (GalA11yECellToggle), /* instance size */ - 0, /* nb preallocs */ - NULL, /* instance init */ - NULL /* value table */ + sizeof (GalA11yECellToggleClass), + (GBaseInitFunc) NULL, /* base init */ + (GBaseFinalizeFunc) NULL, /* base finalize */ + (GClassInitFunc) gal_a11y_e_cell_toggle_class_init, /* class init */ + (GClassFinalizeFunc) NULL, /* class finalize */ + NULL, /* class data */ + sizeof (GalA11yECellToggle), /* instance size */ + 0, /* nb preallocs */ + NULL, /* instance init */ + NULL /* value table */ }; type = g_type_register_static (GAL_A11Y_TYPE_E_CELL, @@ -108,10 +108,10 @@ toggle_cell_action (GalA11yECell *cell) event.type = GDK_BUTTON_PRESS; event.window = gtk_layout_get_bin_window (layout); - event.button = 1; - event.send_event = TRUE; - event.time = GDK_CURRENT_TIME; - event.axes = NULL; + event.button = 1; + event.send_event = TRUE; + event.time = GDK_CURRENT_TIME; + event.axes = NULL; g_signal_emit_by_name (cell->item, "event", &event, &finished); } @@ -130,7 +130,7 @@ model_change_cb (ETableModel *etm, e_table_model_value_at (cell->cell_view->e_table_model, cell->model_col, cell->row)); /* Cheat gnopernicus, or it will ignore the state change signal */ - atk_focus_tracker_notify (ATK_OBJECT (cell)); + atk_focus_tracker_notify (ATK_OBJECT (cell)); if (value) gal_a11y_e_cell_add_state (cell, ATK_STATE_CHECKED, TRUE); @@ -160,13 +160,13 @@ gal_a11y_e_cell_toggle_new (ETableItem *item, toggle_cell = GAL_A11Y_E_CELL_TOGGLE (a11y); a11y->role = ATK_ROLE_TABLE_CELL; - gal_a11y_e_cell_construct (a11y, - item, - cell_view, - parent, - model_col, - view_col, - row); + gal_a11y_e_cell_construct (a11y, + item, + cell_view, + parent, + model_col, + view_col, + row); gal_a11y_e_cell_add_action (cell, "toggle", @@ -182,7 +182,7 @@ gal_a11y_e_cell_toggle_new (ETableItem *item, value = GPOINTER_TO_INT ( e_table_model_value_at (cell->cell_view->e_table_model, - cell->model_col, cell->row)); + cell->model_col, cell->row)); if (value) gal_a11y_e_cell_add_state (cell, ATK_STATE_CHECKED, FALSE); else diff --git a/widgets/table/gal-a11y-e-cell-tree.c b/widgets/table/gal-a11y-e-cell-tree.c index 1a95c46a90..ee06f6e025 100644 --- a/widgets/table/gal-a11y-e-cell-tree.c +++ b/widgets/table/gal-a11y-e-cell-tree.c @@ -69,28 +69,28 @@ static void kill_view_cb (ECellView *subcell_view, gpointer psubcell_a11ies) { - GList *node; + GList *node; GList *subcell_a11ies = (GList *) psubcell_a11ies; - GalA11yECell *subcell; + GalA11yECell *subcell; - for (node = subcell_a11ies; node != NULL; node = g_list_next (node)) - { - subcell = GAL_A11Y_E_CELL (node->data); - if (subcell && subcell->cell_view == subcell_view) - { + for (node = subcell_a11ies; node != NULL; node = g_list_next (node)) + { + subcell = GAL_A11Y_E_CELL (node->data); + if (subcell && subcell->cell_view == subcell_view) + { d(fprintf(stderr, "subcell_view %p deleted before the a11y object %p\n", subcell_view, subcell)); - subcell->cell_view = NULL; - } - } + subcell->cell_view = NULL; + } + } } static void ectr_subcell_weak_ref (GalA11yECellTree *a11y, GalA11yECell *subcell_a11y) { - ECellView *subcell_view = subcell_a11y ? subcell_a11y->cell_view : NULL; - if (subcell_a11y && subcell_view && subcell_view->kill_view_cb_data) - subcell_view->kill_view_cb_data = g_list_remove (subcell_view->kill_view_cb_data, subcell_a11y); + ECellView *subcell_view = subcell_a11y ? subcell_a11y->cell_view : NULL; + if (subcell_a11y && subcell_view && subcell_view->kill_view_cb_data) + subcell_view->kill_view_cb_data = g_list_remove (subcell_view->kill_view_cb_data, subcell_a11y); g_signal_handler_disconnect (GAL_A11Y_E_CELL (a11y)->item->table_model, a11y->model_row_changed_id); @@ -102,11 +102,11 @@ ectr_do_action_expand (AtkAction *action) { GalA11yECell *a11y; ETableModel *table_model; - ETreePath node; + ETreePath node; ETreeModel *tree_model; - ETreeTableAdapter *tree_table_adapter; + ETreeTableAdapter *tree_table_adapter; - a11y = GAL_A11Y_E_CELL (action); + a11y = GAL_A11Y_E_CELL (action); table_model = a11y->item->table_model; node = e_table_model_value_at (table_model, -1, a11y->row); tree_model = e_table_model_value_at (table_model, -2, a11y->row); @@ -125,15 +125,15 @@ ectr_do_action_collapse (AtkAction *action) { GalA11yECell *a11y; ETableModel *table_model; - ETreePath node; + ETreePath node; ETreeModel *tree_model; - ETreeTableAdapter *tree_table_adapter; + ETreeTableAdapter *tree_table_adapter; - a11y = GAL_A11Y_E_CELL (action); + a11y = GAL_A11Y_E_CELL (action); table_model = a11y->item->table_model; - node = e_table_model_value_at (table_model, -1, a11y->row); + node = e_table_model_value_at (table_model, -1, a11y->row); tree_model = e_table_model_value_at (table_model, -2, a11y->row); - tree_table_adapter = e_table_model_value_at (table_model, -3, a11y->row); + tree_table_adapter = e_table_model_value_at (table_model, -3, a11y->row); if (e_tree_model_node_is_expandable (tree_model, node)) { e_tree_table_adapter_node_set_expanded (tree_table_adapter, @@ -191,9 +191,9 @@ gal_a11y_e_cell_tree_new (ETableItem *item, AtkObject *subcell_a11y; GalA11yECellTree *a11y; - ETreePath node; - ETreeModel *tree_model; - ETreeTableAdapter *tree_table_adapter; + ETreePath node; + ETreeModel *tree_model; + ETreeTableAdapter *tree_table_adapter; ECellView *subcell_view; subcell_view = e_cell_tree_view_get_subcell_view (cell_view); @@ -249,12 +249,12 @@ gal_a11y_e_cell_tree_new (ETableItem *item, G_CALLBACK (ectr_model_row_changed_cb), subcell_a11y); - if (subcell_a11y && subcell_view) - { - subcell_view->kill_view_cb = kill_view_cb; - if (!g_list_find (subcell_view->kill_view_cb_data, subcell_a11y)) - subcell_view->kill_view_cb_data = g_list_append (subcell_view->kill_view_cb_data, subcell_a11y); - } + if (subcell_a11y && subcell_view) + { + subcell_view->kill_view_cb = kill_view_cb; + if (!g_list_find (subcell_view->kill_view_cb_data, subcell_a11y)) + subcell_view->kill_view_cb_data = g_list_append (subcell_view->kill_view_cb_data, subcell_a11y); + } g_object_weak_ref (G_OBJECT (subcell_a11y), (GWeakNotify) ectr_subcell_weak_ref, a11y); diff --git a/widgets/table/gal-a11y-e-cell.c b/widgets/table/gal-a11y-e-cell.c index 65a1fe9759..17f9b8f166 100644 --- a/widgets/table/gal-a11y-e-cell.c +++ b/widgets/table/gal-a11y-e-cell.c @@ -105,7 +105,7 @@ static G_CONST_RETURN gchar * gal_a11y_e_cell_get_name (AtkObject * a11y) { GalA11yECell *cell = GAL_A11Y_E_CELL (a11y); - ETableCol *ecol; + ETableCol *ecol; if (a11y->name != NULL && strcmp (a11y->name, "")) return a11y->name; diff --git a/widgets/table/gal-a11y-e-table-click-to-add-factory.c b/widgets/table/gal-a11y-e-table-click-to-add-factory.c index e13e6599b4..9c9390a9c2 100644 --- a/widgets/table/gal-a11y-e-table-click-to-add-factory.c +++ b/widgets/table/gal-a11y-e-table-click-to-add-factory.c @@ -40,7 +40,7 @@ static AtkObjectFactoryClass *parent_class; static GType gal_a11y_e_table_click_to_add_factory_get_accessible_type (void) { - return GAL_A11Y_TYPE_E_TABLE_CLICK_TO_ADD; + return GAL_A11Y_TYPE_E_TABLE_CLICK_TO_ADD; } static AtkObject* diff --git a/widgets/table/gal-a11y-e-table-click-to-add.c b/widgets/table/gal-a11y-e-table-click-to-add.c index 05f145f6ed..1b7ce531e2 100644 --- a/widgets/table/gal-a11y-e-table-click-to-add.c +++ b/widgets/table/gal-a11y-e-table-click-to-add.c @@ -188,9 +188,9 @@ etcta_class_init (GalA11yETableClickToAddClass *class) parent_class = g_type_class_ref (PARENT_TYPE); atk_object_class->get_name = etcta_get_name; - atk_object_class->get_n_children = etcta_get_n_children; - atk_object_class->ref_child = etcta_ref_child; - atk_object_class->ref_state_set = etcta_ref_state_set; + atk_object_class->get_n_children = etcta_get_n_children; + atk_object_class->ref_child = etcta_ref_child; + atk_object_class->ref_state_set = etcta_ref_state_set; } static void @@ -234,14 +234,14 @@ gal_a11y_e_table_click_to_add_get_type (void) NULL }; - factory = atk_registry_get_factory (atk_get_default_registry (), GNOME_TYPE_CANVAS_ITEM); + factory = atk_registry_get_factory (atk_get_default_registry (), GNOME_TYPE_CANVAS_ITEM); parent_type = atk_object_factory_get_accessible_type (factory); - type = gal_a11y_type_register_static_with_private (PARENT_TYPE, + type = gal_a11y_type_register_static_with_private (PARENT_TYPE, "GalA11yETableClickToAdd", &info, 0, sizeof (GalA11yETableClickToAddPrivate), &priv_offset); - g_type_add_interface_static (type, ATK_TYPE_ACTION, &atk_action_info); + g_type_add_interface_static (type, ATK_TYPE_ACTION, &atk_action_info); } @@ -251,7 +251,7 @@ gal_a11y_e_table_click_to_add_get_type (void) static gboolean etcta_event (GnomeCanvasItem *item, GdkEvent *e, gpointer data) { - ETableClickToAdd *etcta = E_TABLE_CLICK_TO_ADD (item); + ETableClickToAdd *etcta = E_TABLE_CLICK_TO_ADD (item); GalA11yETableClickToAdd *a11y; GalA11yETableClickToAddPrivate *priv; diff --git a/widgets/table/gal-a11y-e-table-factory.c b/widgets/table/gal-a11y-e-table-factory.c index face3ad06b..5d9c4bbdb8 100644 --- a/widgets/table/gal-a11y-e-table-factory.c +++ b/widgets/table/gal-a11y-e-table-factory.c @@ -34,7 +34,7 @@ static AtkObjectFactoryClass *parent_class; static GType gal_a11y_e_table_factory_get_accessible_type (void) { - return GAL_A11Y_TYPE_E_TABLE; + return GAL_A11Y_TYPE_E_TABLE; } static AtkObject* diff --git a/widgets/table/gal-a11y-e-table-item-factory.c b/widgets/table/gal-a11y-e-table-item-factory.c index c987b0068a..fb1b3a9966 100644 --- a/widgets/table/gal-a11y-e-table-item-factory.c +++ b/widgets/table/gal-a11y-e-table-item-factory.c @@ -40,7 +40,7 @@ static AtkObjectFactoryClass *parent_class; static GType gal_a11y_e_table_item_factory_get_accessible_type (void) { - return GAL_A11Y_TYPE_E_TABLE_ITEM; + return GAL_A11Y_TYPE_E_TABLE_ITEM; } static AtkObject* diff --git a/widgets/table/gal-a11y-e-table-item.c b/widgets/table/gal-a11y-e-table-item.c index 218265ecdd..eb0c9be127 100644 --- a/widgets/table/gal-a11y-e-table-item.c +++ b/widgets/table/gal-a11y-e-table-item.c @@ -87,9 +87,9 @@ eti_ref_state_set (AtkObject *accessible) { GalA11yETableItemPrivate *priv = GET_PRIVATE (accessible); - g_object_ref (priv->state_set); + g_object_ref (priv->state_set); - return priv->state_set; + return priv->state_set; } inline static gint @@ -329,10 +329,10 @@ cell_destroyed (gpointer data) g_return_if_fail (cell->item && G_IS_OBJECT (cell->item)); - if (cell->item) { - g_object_unref (cell->item); - cell->item = NULL; - } + if (cell->item) { + g_object_unref (cell->item); + cell->item = NULL; + } } @@ -693,7 +693,7 @@ eti_rows_inserted (ETableModel * model, gint row, gint count, g_return_if_fail (table_item); item_a11y = GAL_A11Y_E_TABLE_ITEM (table_item); - n_cols = atk_table_get_n_columns (ATK_TABLE (table_item)); + n_cols = atk_table_get_n_columns (ATK_TABLE (table_item)); n_rows = atk_table_get_n_rows (ATK_TABLE (table_item)); old_nrows = GET_PRIVATE (item_a11y)->rows; @@ -706,13 +706,13 @@ eti_rows_inserted (ETableModel * model, gint row, gint count, g_signal_emit_by_name (table_item, "row-inserted", row, count, NULL); - for (i = row; i < (row + count); i++) { - for (j = 0; j < n_cols; j++) { + for (i = row; i < (row + count); i++) { + for (j = 0; j < n_cols; j++) { g_signal_emit_by_name (table_item, "children_changed::add", - ( ((i + 1)*n_cols) + j), NULL, NULL); + ( ((i + 1)*n_cols) + j), NULL, NULL); } - } + } g_signal_emit_by_name (table_item, "visible-data-changed"); } @@ -727,7 +727,7 @@ eti_rows_deleted (ETableModel * model, gint row, gint count, ATK_GOBJECT_ACCESSIBLE (table_item))); n_rows = atk_table_get_n_rows (ATK_TABLE (table_item)); - n_cols = atk_table_get_n_columns (ATK_TABLE (table_item)); + n_cols = atk_table_get_n_columns (ATK_TABLE (table_item)); old_nrows = GET_PRIVATE (table_item)->rows; @@ -738,13 +738,13 @@ eti_rows_deleted (ETableModel * model, gint row, gint count, g_signal_emit_by_name (table_item, "row-deleted", row, count, NULL); - for (i = row; i < (row + count); i++) { - for (j = 0; j < n_cols; j++) { + for (i = row; i < (row + count); i++) { + for (j = 0; j < n_cols; j++) { g_signal_emit_by_name (table_item, "children_changed::remove", - ( ((i + 1)*n_cols) + j), NULL, NULL); + ( ((i + 1)*n_cols) + j), NULL, NULL); } - } + } g_signal_emit_by_name (table_item, "visible-data-changed"); eti_a11y_reset_focus_object ((GalA11yETableItem *)table_item, item, TRUE); } @@ -781,67 +781,67 @@ static void eti_header_structure_changed (ETableHeader *eth, AtkObject *a11y) { - gboolean reorder_found=FALSE, added_found=FALSE, removed_found=FALSE; - GalA11yETableItem * a11y_item; - ETableCol ** cols, **prev_cols; - GalA11yETableItemPrivate *priv; - gint *state = NULL, *prev_state = NULL, *reorder = NULL; - gint i,j,n_rows,n_cols, prev_n_cols; + gboolean reorder_found=FALSE, added_found=FALSE, removed_found=FALSE; + GalA11yETableItem * a11y_item; + ETableCol ** cols, **prev_cols; + GalA11yETableItemPrivate *priv; + gint *state = NULL, *prev_state = NULL, *reorder = NULL; + gint i,j,n_rows,n_cols, prev_n_cols; - a11y_item = GAL_A11Y_E_TABLE_ITEM (a11y); - priv = GET_PRIVATE (a11y_item); + a11y_item = GAL_A11Y_E_TABLE_ITEM (a11y); + priv = GET_PRIVATE (a11y_item); /* Assume rows do not changed. */ - n_rows = priv->rows; + n_rows = priv->rows; - prev_n_cols = priv->cols; - prev_cols = priv->columns; + prev_n_cols = priv->cols; + prev_cols = priv->columns; - cols = e_table_header_get_columns (eth); + cols = e_table_header_get_columns (eth); n_cols = eth->col_count; - g_return_if_fail (cols && prev_cols && n_cols > 0); + g_return_if_fail (cols && prev_cols && n_cols > 0); /* Init to ETI_HEADER_UNCHANGED. */ - state = g_malloc0 (sizeof (gint) * n_cols); - prev_state = g_malloc0 (sizeof (gint) * prev_n_cols); - reorder = g_malloc0 (sizeof (gint) * n_cols); + state = g_malloc0 (sizeof (gint) * n_cols); + prev_state = g_malloc0 (sizeof (gint) * prev_n_cols); + reorder = g_malloc0 (sizeof (gint) * n_cols); /* Compare with previously saved column headers. */ - for (i = 0; i < n_cols && cols[i]; i++) { - for (j = 0; j < prev_n_cols && prev_cols[j]; j++) { - if (prev_cols[j] == cols[i] && i != j) { + for (i = 0; i < n_cols && cols[i]; i++) { + for (j = 0; j < prev_n_cols && prev_cols[j]; j++) { + if (prev_cols[j] == cols[i] && i != j) { - reorder_found = TRUE; - state[i] = ETI_HEADER_REORDERED; + reorder_found = TRUE; + state[i] = ETI_HEADER_REORDERED; reorder[i] = j; - break; - } else if (prev_cols[j] == cols[i]) { + break; + } else if (prev_cols[j] == cols[i]) { /* OK, this column is not changed. */ - break; - } - } + break; + } + } /* cols[i] is new added column. */ - if (j == prev_n_cols) { + if (j == prev_n_cols) { added_found = TRUE; - state[i] = ETI_HEADER_NEW_ADDED; - } - } + state[i] = ETI_HEADER_NEW_ADDED; + } + } /* Now try to find if there are removed columns. */ - for (i = 0; i < prev_n_cols && prev_cols[i]; i++) { - for (j = 0; j < n_cols && cols[j]; j++) - if (prev_cols[j] == cols[i]) + for (i = 0; i < prev_n_cols && prev_cols[i]; i++) { + for (j = 0; j < n_cols && cols[j]; j++) + if (prev_cols[j] == cols[i]) break; /* Removed columns found. */ - if (j == n_cols) { + if (j == n_cols) { removed_found = TRUE; prev_state[j] = ETI_HEADER_REMOVED; - } - } + } + } /* If nothing interesting just return. */ if (!reorder_found && !added_found && !removed_found) @@ -1064,9 +1064,9 @@ gal_a11y_e_table_item_new (ETableItem *item) GET_PRIVATE (a11y)->cols = item->cols; GET_PRIVATE (a11y)->rows = item->rows; - GET_PRIVATE (a11y)->columns = e_table_header_get_columns (item->header); - if ( GET_PRIVATE (a11y)->columns == NULL) - return NULL; + GET_PRIVATE (a11y)->columns = e_table_header_get_columns (item->header); + if ( GET_PRIVATE (a11y)->columns == NULL) + return NULL; if (item) { g_signal_connect (G_OBJECT(item), "selection_model_removed", diff --git a/widgets/table/gal-a11y-e-tree-factory.c b/widgets/table/gal-a11y-e-tree-factory.c index cf864ca283..8d1951580d 100644 --- a/widgets/table/gal-a11y-e-tree-factory.c +++ b/widgets/table/gal-a11y-e-tree-factory.c @@ -33,7 +33,7 @@ static AtkObjectFactoryClass *parent_class; static GType gal_a11y_e_tree_factory_get_accessible_type (void) { - return GAL_A11Y_TYPE_E_TREE; + return GAL_A11Y_TYPE_E_TREE; } static AtkObject* |