From 33d137c42ea397e4d954173b1796443b6c759880 Mon Sep 17 00:00:00 2001 From: Ettore Perazzoli Date: Mon, 11 Nov 2002 19:09:23 +0000 Subject: Replace gtk_object_(un)?ref() with g_object_(un)?ref(). Likewise. * gal/e-table/e-cell-popup.c: Replace gtk_object_(un)?ref() with g_object_(un)?ref(). * gal/e-table/e-cell-text.c: Likewise. * gal/e-table/e-cell-tree.c: Likewise. * gal/e-table/e-cell-vbox.c: Likewise. * gal/e-table/e-table-click-to-add.c: Likewise. * gal/e-table/e-table-config-field.c: Likewise. * gal/e-table/e-table-field-chooser-dialog.c: Likewise. * gal/e-table/e-table-field-chooser-item.c: Likewise. * gal/e-table/e-table-field-chooser.c: Likewise. * gal/e-table/e-table-group-container.c: Likewise. * gal/e-table/e-table-item.c: Likewise. * gal/e-table/e-table-without.c: Likewise. svn path=/trunk/; revision=18702 --- widgets/table/e-cell-popup.c | 6 +-- widgets/table/e-cell-text.c | 4 +- widgets/table/e-cell-tree.c | 4 +- widgets/table/e-cell-vbox.c | 4 +- widgets/table/e-table-click-to-add.c | 14 +++---- widgets/table/e-table-config-field.c | 8 ++-- widgets/table/e-table-field-chooser-dialog.c | 12 +++--- widgets/table/e-table-field-chooser-item.c | 8 ++-- widgets/table/e-table-field-chooser.c | 14 +++---- widgets/table/e-table-group-container.c | 56 ++++++++++++++-------------- widgets/table/e-table-item.c | 2 +- widgets/table/e-table-without.c | 2 +- 12 files changed, 67 insertions(+), 67 deletions(-) diff --git a/widgets/table/e-cell-popup.c b/widgets/table/e-cell-popup.c index 8b7ed04679..3e9296bcc5 100644 --- a/widgets/table/e-cell-popup.c +++ b/widgets/table/e-cell-popup.c @@ -176,7 +176,7 @@ e_cell_popup_dispose (GObject *object) ECellPopup *ecp = E_CELL_POPUP (object); if (ecp->child) - gtk_object_unref (GTK_OBJECT (ecp->child)); + g_object_unref (ecp->child); ecp->child = NULL; G_OBJECT_CLASS (parent_class)->dispose (object); @@ -479,10 +479,10 @@ e_cell_popup_set_child (ECellPopup *ecp, g_return_if_fail (E_IS_CELL_POPUP (ecp)); if (ecp->child) - gtk_object_unref (GTK_OBJECT (ecp->child)); + g_object_unref (ecp->child); ecp->child = child; - gtk_object_ref (GTK_OBJECT (child)); + g_object_ref (child); } diff --git a/widgets/table/e-cell-text.c b/widgets/table/e-cell-text.c index 3e67923095..6c49eabca8 100644 --- a/widgets/table/e-cell-text.c +++ b/widgets/table/e-cell-text.c @@ -283,7 +283,7 @@ ect_stop_editing (ECellTextView *text_view, gboolean commit) g_object_weak_unref (G_OBJECT (edit->invisible), invisible_finalize, edit); } if (edit->tep) - gtk_object_unref (GTK_OBJECT(edit->tep)); + g_object_unref (edit->tep); if (edit->primary_selection) g_free (edit->primary_selection); if (edit->clipboard_selection) @@ -2201,7 +2201,7 @@ _get_tep (CellEdit *edit) { if (!edit->tep) { edit->tep = e_text_event_processor_emacs_like_new (); - gtk_object_ref (GTK_OBJECT (edit->tep)); + g_object_ref (edit->tep); gtk_object_sink (GTK_OBJECT (edit->tep)); gtk_signal_connect (GTK_OBJECT(edit->tep), "command", diff --git a/widgets/table/e-cell-tree.c b/widgets/table/e-cell-tree.c index d5ccbd2e8c..479e7a1a8d 100644 --- a/widgets/table/e-cell-tree.c +++ b/widgets/table/e-cell-tree.c @@ -664,7 +664,7 @@ ect_destroy (GtkObject *object) /* destroy our subcell */ if (ect->subcell) - gtk_object_unref (GTK_OBJECT (ect->subcell)); + g_object_unref (ect->subcell); ect->subcell = NULL; if (ect->open_pixbuf) @@ -726,7 +726,7 @@ e_cell_tree_construct (ECellTree *ect, { ect->subcell = subcell; if (subcell) { - gtk_object_ref (GTK_OBJECT (subcell)); + g_object_ref (subcell); gtk_object_sink (GTK_OBJECT (subcell)); } if (open_pixbuf) diff --git a/widgets/table/e-cell-vbox.c b/widgets/table/e-cell-vbox.c index a854c2dae1..5e6d651bbe 100644 --- a/widgets/table/e-cell-vbox.c +++ b/widgets/table/e-cell-vbox.c @@ -408,7 +408,7 @@ ecv_destroy (GtkObject *object) /* destroy our subcell */ for (i = 0; i < ecv->subcell_count; i++) if (ecv->subcells[i]) - gtk_object_unref (GTK_OBJECT (ecv->subcells[i])); + g_object_unref (ecv->subcells[i]); g_free (ecv->subcells); ecv->subcells = NULL; ecv->subcell_count = 0; @@ -485,5 +485,5 @@ e_cell_vbox_append (ECellVbox *vbox, ECell *subcell, int model_col) vbox->model_cols[vbox->subcell_count - 1] = model_col; if (subcell) - gtk_object_ref (GTK_OBJECT (subcell)); + g_object_ref (subcell); } diff --git a/widgets/table/e-table-click-to-add.c b/widgets/table/e-table-click-to-add.c index 4e1294c36f..a2e4f82bf1 100644 --- a/widgets/table/e-table-click-to-add.c +++ b/widgets/table/e-table-click-to-add.c @@ -99,7 +99,7 @@ etcta_add_one (ETableClickToAdd *etcta, ETableModel *one) { etcta->one = one; if (etcta->one) - gtk_object_ref (GTK_OBJECT(etcta->one)); + g_object_ref (etcta->one); if (etcta->row) gnome_canvas_item_set(GNOME_CANVAS_ITEM(etcta->row), "ETableModel", one, @@ -114,7 +114,7 @@ etcta_drop_one (ETableClickToAdd *etcta) { if (!etcta->one) return; - gtk_object_unref (GTK_OBJECT(etcta->one)); + g_object_unref (etcta->one); etcta->one = NULL; gtk_object_set(GTK_OBJECT(etcta->selection), "model", NULL, @@ -126,7 +126,7 @@ etcta_add_model (ETableClickToAdd *etcta, ETableModel *model) { etcta->model = model; if (etcta->model) - gtk_object_ref (GTK_OBJECT(etcta->model)); + g_object_ref (etcta->model); } static void @@ -135,7 +135,7 @@ etcta_drop_model (ETableClickToAdd *etcta) etcta_drop_one (etcta); if (!etcta->model) return; - gtk_object_unref (GTK_OBJECT(etcta->model)); + g_object_unref (etcta->model); etcta->model = NULL; } @@ -162,7 +162,7 @@ etcta_destroy (GtkObject *object) etcta_drop_model (etcta); etcta_drop_message (etcta); if (etcta->selection) - gtk_object_unref (GTK_OBJECT(etcta->selection)); + g_object_unref (etcta->selection); etcta->selection = NULL; if (GTK_OBJECT_CLASS (etcta_parent_class)->destroy) @@ -312,7 +312,7 @@ finish_editing (ETableClickToAdd *etcta) one = e_table_one_new(etcta->model); etcta_add_one (etcta, one); - gtk_object_unref(GTK_OBJECT(one)); + g_object_unref (one); e_selection_model_clear(E_SELECTION_MODEL(etcta->selection)); @@ -357,7 +357,7 @@ etcta_event (GnomeCanvasItem *item, GdkEvent *e) one = e_table_one_new(etcta->model); etcta_add_one (etcta, one); - gtk_object_unref(GTK_OBJECT(one)); + g_object_unref (one); e_selection_model_clear(E_SELECTION_MODEL(etcta->selection)); diff --git a/widgets/table/e-table-config-field.c b/widgets/table/e-table-config-field.c index 5bcd5456a7..020f316643 100644 --- a/widgets/table/e-table-config-field.c +++ b/widgets/table/e-table-config-field.c @@ -39,11 +39,11 @@ etcf_destroy (GtkObject *object) ETableConfigField *etcf = E_TABLE_CONFIG_FIELD (object); if (etct->spec) - gtk_object_unref(GTK_OBJECT(etcf->spec)); + g_object_unref (etcf->spec); etct->spec = NULL; if (etct->sort_info) - gtk_object_unref(GTK_OBJECT(etcf->sort_info)); + g_object_unref (etcf->sort_info); etct->sort_info = NULL; GTK_OBJECT_CLASS (etcf_parent_class)->destroy (object); @@ -238,10 +238,10 @@ e_table_config_field_construct_nth (ETableConfigField *etcf, GtkWidget *internal_vbox2; etcf->spec = spec; - gtk_object_ref(GTK_OBJECT(spec)); + g_object_ref (spec); etcf->sort_info = sort_info; - gtk_object_ref(GTK_OBJECT(sort_info)); + g_object_ref (sort_info); etcf->grouping = grouping; etcf->n = n; diff --git a/widgets/table/e-table-field-chooser-dialog.c b/widgets/table/e-table-field-chooser-dialog.c index 906dadc52a..e4116f101d 100644 --- a/widgets/table/e-table-field-chooser-dialog.c +++ b/widgets/table/e-table-field-chooser-dialog.c @@ -142,11 +142,11 @@ e_table_field_chooser_dialog_destroy (GtkObject *object) etfcd->dnd_code = NULL; if (etfcd->full_header) - gtk_object_unref(GTK_OBJECT(etfcd->full_header)); + g_object_unref (etfcd->full_header); etfcd->full_header = NULL; if (etfcd->header) - gtk_object_unref(GTK_OBJECT(etfcd->header)); + g_object_unref (etfcd->header); etfcd->header = NULL; } @@ -165,13 +165,13 @@ e_table_field_chooser_dialog_set_arg (GtkObject *object, GtkArg *arg, guint arg_ break; case ARG_FULL_HEADER: if (etfcd->full_header) - gtk_object_unref(GTK_OBJECT(etfcd->full_header)); + g_object_unref (etfcd->full_header); if (GTK_VALUE_OBJECT(*arg)) etfcd->full_header = E_TABLE_HEADER(GTK_VALUE_OBJECT(*arg)); else etfcd->full_header = NULL; if (etfcd->full_header) - gtk_object_ref(GTK_OBJECT(etfcd->full_header)); + g_object_ref (etfcd->full_header); if (etfcd->etfc) gtk_object_set(GTK_OBJECT(etfcd->etfc), "full_header", etfcd->full_header, @@ -179,13 +179,13 @@ e_table_field_chooser_dialog_set_arg (GtkObject *object, GtkArg *arg, guint arg_ break; case ARG_HEADER: if (etfcd->header) - gtk_object_unref(GTK_OBJECT(etfcd->header)); + g_object_unref (etfcd->header); if (GTK_VALUE_OBJECT(*arg)) etfcd->header = E_TABLE_HEADER(GTK_VALUE_OBJECT(*arg)); else etfcd->header = NULL; if (etfcd->header) - gtk_object_ref(GTK_OBJECT(etfcd->header)); + g_object_ref (etfcd->header); if (etfcd->etfc) gtk_object_set(GTK_OBJECT(etfcd->etfc), "header", etfcd->header, diff --git a/widgets/table/e-table-field-chooser-item.c b/widgets/table/e-table-field-chooser-item.c index b4555685cb..ccfba4c56e 100644 --- a/widgets/table/e-table-field-chooser-item.c +++ b/widgets/table/e-table-field-chooser-item.c @@ -80,7 +80,7 @@ etfci_destroy (GtkObject *object) etfci_drop_full_header (etfci); if (etfci->combined_header) - gtk_object_unref (GTK_OBJECT (etfci->combined_header)); + g_object_unref (etfci->combined_header); etfci->combined_header = NULL; if (etfci->font) @@ -123,7 +123,7 @@ etfci_rebuild_combined (ETableFieldChooserItem *etfci) int i; if (etfci->combined_header != NULL) - gtk_object_unref (GTK_OBJECT (etfci->combined_header)); + g_object_unref (etfci->combined_header); etfci->combined_header = e_table_header_new (); @@ -270,7 +270,7 @@ static void etfci_add_full_header (ETableFieldChooserItem *etfci, ETableHeader *header) { etfci->full_header = header; - gtk_object_ref (GTK_OBJECT (etfci->full_header)); + g_object_ref (etfci->full_header); etfci->full_header_structure_change_id = gtk_signal_connect ( GTK_OBJECT (header), "structure_change", @@ -320,7 +320,7 @@ static void etfci_add_table_header (ETableFieldChooserItem *etfci, ETableHeader *header) { etfci->header = header; - gtk_object_ref (GTK_OBJECT (etfci->header)); + g_object_ref (etfci->header); etfci->table_header_structure_change_id = gtk_signal_connect ( GTK_OBJECT (header), "structure_change", diff --git a/widgets/table/e-table-field-chooser.c b/widgets/table/e-table-field-chooser.c index 5a74ae788c..4bbdd251a8 100644 --- a/widgets/table/e-table-field-chooser.c +++ b/widgets/table/e-table-field-chooser.c @@ -191,15 +191,15 @@ e_table_field_chooser_destroy (GtkObject *object) etfc->dnd_code = NULL; if (etfc->full_header) - gtk_object_unref(GTK_OBJECT(etfc->full_header)); + g_object_unref (etfc->full_header); etfc->full_header = NULL; if (etfc->header) - gtk_object_unref(GTK_OBJECT(etfc->header)); + g_object_unref (etfc->header); etfc->header = NULL; if (etfc->gui) - gtk_object_unref(GTK_OBJECT(etfc->gui)); + g_object_unref (etfc->gui); etfc->gui = NULL; if (GTK_OBJECT_CLASS (parent_class)->destroy) @@ -229,13 +229,13 @@ e_table_field_chooser_set_arg (GtkObject *object, GtkArg *arg, guint arg_id) break; case ARG_FULL_HEADER: if (etfc->full_header) - gtk_object_unref(GTK_OBJECT(etfc->full_header)); + g_object_unref (etfc->full_header); if (GTK_VALUE_OBJECT(*arg)) etfc->full_header = E_TABLE_HEADER(GTK_VALUE_OBJECT(*arg)); else etfc->full_header = NULL; if (etfc->full_header) - gtk_object_ref(GTK_OBJECT(etfc->full_header)); + g_object_ref (etfc->full_header); if (etfc->item) gtk_object_set(GTK_OBJECT(etfc->item), "full_header", etfc->full_header, @@ -243,13 +243,13 @@ e_table_field_chooser_set_arg (GtkObject *object, GtkArg *arg, guint arg_id) break; case ARG_HEADER: if (etfc->header) - gtk_object_unref(GTK_OBJECT(etfc->header)); + g_object_unref (etfc->header); if (GTK_VALUE_OBJECT(*arg)) etfc->header = E_TABLE_HEADER(GTK_VALUE_OBJECT(*arg)); else etfc->header = NULL; if (etfc->header) - gtk_object_ref(GTK_OBJECT(etfc->header)); + g_object_ref (etfc->header); if (etfc->item) gtk_object_set(GTK_OBJECT(etfc->item), "header", etfc->header, diff --git a/widgets/table/e-table-group-container.c b/widgets/table/e-table-group-container.c index 87e5e40a14..9f477ff941 100644 --- a/widgets/table/e-table-group-container.c +++ b/widgets/table/e-table-group-container.c @@ -112,15 +112,15 @@ etgc_destroy (GtkObject *object) etgc->font = NULL; if (etgc->ecol) - gtk_object_unref (GTK_OBJECT(etgc->ecol)); + g_object_unref (etgc->ecol); etgc->ecol = NULL; if (etgc->sort_info) - gtk_object_unref (GTK_OBJECT(etgc->sort_info)); + g_object_unref (etgc->sort_info); etgc->sort_info = NULL; if (etgc->selection_model) - gtk_object_unref (GTK_OBJECT(etgc->selection_model)); + g_object_unref (etgc->selection_model); etgc->selection_model = NULL; if (etgc->rect) @@ -159,9 +159,9 @@ e_table_group_container_construct (GnomeCanvasGroup *parent, ETableGroupContaine e_table_group_construct (parent, E_TABLE_GROUP (etgc), full_header, header, model); etgc->ecol = col; - gtk_object_ref (GTK_OBJECT(etgc->ecol)); + g_object_ref (etgc->ecol); etgc->sort_info = sort_info; - gtk_object_ref (GTK_OBJECT(etgc->sort_info)); + g_object_ref (etgc->sort_info); etgc->n = n; etgc->ascending = column.ascending; @@ -778,10 +778,10 @@ etgc_set_arg (GtkObject *object, GtkArg *arg, guint arg_id) case ARG_SELECTION_MODEL: if (etgc->selection_model) - gtk_object_unref(GTK_OBJECT(etgc->selection_model)); + g_object_unref (etgc->selection_model); etgc->selection_model = E_SELECTION_MODEL(GTK_VALUE_OBJECT (*arg)); if (etgc->selection_model) - gtk_object_ref(GTK_OBJECT(etgc->selection_model)); + g_object_ref (etgc->selection_model); for (list = etgc->children; list; list = g_list_next (list)) { ETableGroupContainerChildNode *child_node = (ETableGroupContainerChildNode *)list->data; gtk_object_set (GTK_OBJECT(child_node->child), @@ -1037,7 +1037,7 @@ e_table_group_apply_to_leafs (ETableGroup *etg, ETableGroupLeafFn fn, void *clos GList *list = etgc->children; /* Protect from unrefs in the callback functions */ - gtk_object_ref (GTK_OBJECT (etg)); + g_object_ref (etg); for (list = etgc->children; list; list = list->next){ ETableGroupContainerChildNode *child_node = list->data; @@ -1045,7 +1045,7 @@ e_table_group_apply_to_leafs (ETableGroup *etg, ETableGroupLeafFn fn, void *clos e_table_group_apply_to_leafs (child_node->child, fn, closure); } - gtk_object_unref (GTK_OBJECT (etg)); + g_object_unref (etg); } else if (E_IS_TABLE_GROUP_LEAF (etg)){ (*fn) (E_TABLE_GROUP_LEAF (etg)->item, closure); } else { @@ -1116,7 +1116,7 @@ e_table_group_container_print_page (EPrintable *ep, child_node = child->data; else child_node = NULL; - gtk_object_ref(GTK_OBJECT(child_printable)); + g_object_ref (child_printable); } else { if (!child) { return; @@ -1124,7 +1124,7 @@ e_table_group_container_print_page (EPrintable *ep, child_node = child->data; child_printable = e_table_group_get_printable(child_node->child); if (child_printable) - gtk_object_ref(GTK_OBJECT(child_printable)); + g_object_ref (child_printable); e_printable_reset(child_printable); } } @@ -1228,17 +1228,17 @@ e_table_group_container_print_page (EPrintable *ep, child_node = child->data; if (child_printable) - gtk_object_unref(GTK_OBJECT(child_printable)); + g_object_unref (child_printable); child_printable = e_table_group_get_printable(child_node->child); if (child_printable) - gtk_object_ref(GTK_OBJECT(child_printable)); + g_object_ref (child_printable); e_printable_reset(child_printable); } gp_draw_rect(context, 0, height, width, 1); if (groupcontext->child_printable) - gtk_object_unref(GTK_OBJECT(groupcontext->child_printable)); + g_object_unref (groupcontext->child_printable); groupcontext->child_printable = child_printable; groupcontext->child = child; @@ -1258,7 +1258,7 @@ e_table_group_container_reset (EPrintable *ep, { groupcontext->child = groupcontext->etgc->children; if (groupcontext->child_printable) - gtk_object_unref(GTK_OBJECT(groupcontext->child_printable)); + g_object_unref (groupcontext->child_printable); groupcontext->child_printable = NULL; } @@ -1281,7 +1281,7 @@ e_table_group_container_height (EPrintable *ep, child = groupcontext->child; if (child_printable) - gtk_object_ref(GTK_OBJECT(child_printable)); + g_object_ref (child_printable); else { if (!child) { gtk_signal_emit_stop_by_name(GTK_OBJECT(ep), "height"); @@ -1290,7 +1290,7 @@ e_table_group_container_height (EPrintable *ep, child_node = child->data; child_printable = e_table_group_get_printable(child_node->child); if (child_printable) - gtk_object_ref(GTK_OBJECT(child_printable)); + g_object_ref (child_printable); e_printable_reset(child_printable); } } @@ -1318,14 +1318,14 @@ e_table_group_container_height (EPrintable *ep, child_node = child->data; if (child_printable) - gtk_object_unref(GTK_OBJECT(child_printable)); + g_object_unref (child_printable); child_printable = e_table_group_get_printable(child_node->child); if (child_printable) - gtk_object_ref(GTK_OBJECT(child_printable)); + g_object_ref (child_printable); e_printable_reset(child_printable); } if (child_printable) - gtk_object_unref(GTK_OBJECT(child_printable)); + g_object_unref (child_printable); gtk_signal_emit_stop_by_name(GTK_OBJECT(ep), "height"); return height; } @@ -1349,7 +1349,7 @@ e_table_group_container_will_fit (EPrintable *ep, child = groupcontext->child; if (child_printable) - gtk_object_ref(GTK_OBJECT(child_printable)); + g_object_ref (child_printable); else { if (!child) { gtk_signal_emit_stop_by_name(GTK_OBJECT(ep), "will_fit"); @@ -1358,7 +1358,7 @@ e_table_group_container_will_fit (EPrintable *ep, child_node = child->data; child_printable = e_table_group_get_printable(child_node->child); if (child_printable) - gtk_object_ref(GTK_OBJECT(child_printable)); + g_object_ref (child_printable); e_printable_reset(child_printable); } } @@ -1385,16 +1385,16 @@ e_table_group_container_will_fit (EPrintable *ep, child_node = child->data; if (child_printable) - gtk_object_unref(GTK_OBJECT(child_printable)); + g_object_unref (child_printable); child_printable = e_table_group_get_printable(child_node->child); if (child_printable) - gtk_object_ref(GTK_OBJECT(child_printable)); + g_object_ref (child_printable); e_printable_reset(child_printable); } } if (child_printable) - gtk_object_unref(GTK_OBJECT(child_printable)); + g_object_unref (child_printable); gtk_signal_emit_stop_by_name(GTK_OBJECT(ep), "will_fit"); return will_fit; @@ -1404,9 +1404,9 @@ static void e_table_group_container_printable_destroy (GtkObject *object, ETGCPrintContext *groupcontext) { - gtk_object_unref(GTK_OBJECT(groupcontext->etgc)); + g_object_unref (groupcontext->etgc); if (groupcontext->child_printable) - gtk_object_ref(GTK_OBJECT(groupcontext->child_printable)); + g_object_ref (groupcontext->child_printable); g_free(groupcontext); } @@ -1419,7 +1419,7 @@ etgc_get_printable (ETableGroup *etg) groupcontext = g_new(ETGCPrintContext, 1); groupcontext->etgc = etgc; - gtk_object_ref(GTK_OBJECT(etgc)); + g_object_ref (etgc); groupcontext->child = etgc->children; groupcontext->child_printable = NULL; diff --git a/widgets/table/e-table-item.c b/widgets/table/e-table-item.c index 1c6f7e36f9..0bb5ccd3b3 100644 --- a/widgets/table/e-table-item.c +++ b/widgets/table/e-table-item.c @@ -547,7 +547,7 @@ eti_remove_selection_model (ETableItem *eti) eti->cursor_change_id); gtk_signal_disconnect (GTK_OBJECT (eti->selection), eti->cursor_activated_id); - gtk_object_unref (GTK_OBJECT (eti->selection)); + g_object_unref (eti->selection); eti->selection_change_id = 0; eti->selection_row_change_id = 0; diff --git a/widgets/table/e-table-without.c b/widgets/table/e-table-without.c index 8691796062..88f14c63cb 100644 --- a/widgets/table/e-table-without.c +++ b/widgets/table/e-table-without.c @@ -300,7 +300,7 @@ e_table_without_new (ETableModel *source, free_duplicated_key_func, closure) == NULL) { - gtk_object_unref (GTK_OBJECT (etw)); + g_object_unref (etw); return NULL; } -- cgit v1.2.3