diff options
Diffstat (limited to 'widgets/table/e-table-item.c')
| -rw-r--r-- | widgets/table/e-table-item.c | 74 |
1 files changed, 37 insertions, 37 deletions
diff --git a/widgets/table/e-table-item.c b/widgets/table/e-table-item.c index df2adedc01..afaf28586c 100644 --- a/widgets/table/e-table-item.c +++ b/widgets/table/e-table-item.c @@ -498,23 +498,23 @@ eti_remove_table_model (ETableItem *eti) if (!eti->table_model) return; - gtk_signal_disconnect (GTK_OBJECT (eti->table_model), + g_signal_handler_disconnect (G_OBJECT (eti->table_model), eti->table_model_pre_change_id); - gtk_signal_disconnect (GTK_OBJECT (eti->table_model), + g_signal_handler_disconnect (G_OBJECT (eti->table_model), eti->table_model_no_change_id); - gtk_signal_disconnect (GTK_OBJECT (eti->table_model), + g_signal_handler_disconnect (G_OBJECT (eti->table_model), eti->table_model_change_id); - gtk_signal_disconnect (GTK_OBJECT (eti->table_model), + g_signal_handler_disconnect (G_OBJECT (eti->table_model), eti->table_model_row_change_id); - gtk_signal_disconnect (GTK_OBJECT (eti->table_model), + g_signal_handler_disconnect (G_OBJECT (eti->table_model), eti->table_model_cell_change_id); - gtk_signal_disconnect (GTK_OBJECT (eti->table_model), + g_signal_handler_disconnect (G_OBJECT (eti->table_model), eti->table_model_rows_inserted_id); - gtk_signal_disconnect (GTK_OBJECT (eti->table_model), + g_signal_handler_disconnect (G_OBJECT (eti->table_model), eti->table_model_rows_deleted_id); - gtk_object_unref (GTK_OBJECT (eti->table_model)); + g_object_unref (G_OBJECT (eti->table_model)); if (eti->source_model) - gtk_object_unref (GTK_OBJECT (eti->source_model)); + g_object_unref (G_OBJECT (eti->source_model)); eti->table_model_pre_change_id = 0; eti->table_model_no_change_id = 0; @@ -999,7 +999,7 @@ eti_idle_show_cursor_cb (gpointer data) eti_check_cursor_bounds (eti); } - gtk_object_unref (GTK_OBJECT (eti)); + g_object_unref (G_OBJECT (eti)); return FALSE; } @@ -1008,7 +1008,7 @@ eti_idle_maybe_show_cursor(ETableItem *eti) { d(g_print ("%s: cursor on screen: %s\n", __FUNCTION__, eti->cursor_on_screen ? "TRUE" : "FALSE")); if (eti->cursor_on_screen) { - gtk_object_ref (GTK_OBJECT (eti)); + g_object_ref (G_OBJECT (eti)); g_idle_add (eti_idle_show_cursor_cb, eti); } } @@ -1237,35 +1237,35 @@ eti_add_table_model (ETableItem *eti, ETableModel *table_model) g_assert (eti->table_model == NULL); eti->table_model = table_model; - gtk_object_ref (GTK_OBJECT (eti->table_model)); + g_object_ref (G_OBJECT (eti->table_model)); - eti->table_model_pre_change_id = gtk_signal_connect ( - GTK_OBJECT (table_model), "model_pre_change", - GTK_SIGNAL_FUNC (eti_table_model_pre_change), eti); + eti->table_model_pre_change_id = g_signal_connect ( + G_OBJECT (table_model), "model_pre_change", + G_CALLBACK (eti_table_model_pre_change), eti); - eti->table_model_no_change_id = gtk_signal_connect ( - GTK_OBJECT (table_model), "model_no_change", - GTK_SIGNAL_FUNC (eti_table_model_no_change), eti); + eti->table_model_no_change_id = g_signal_connect ( + G_OBJECT (table_model), "model_no_change", + G_CALLBACK (eti_table_model_no_change), eti); - eti->table_model_change_id = gtk_signal_connect ( - GTK_OBJECT (table_model), "model_changed", - GTK_SIGNAL_FUNC (eti_table_model_changed), eti); + eti->table_model_change_id = g_signal_connect ( + G_OBJECT (table_model), "model_changed", + G_CALLBACK (eti_table_model_changed), eti); - eti->table_model_row_change_id = gtk_signal_connect ( - GTK_OBJECT (table_model), "model_row_changed", - GTK_SIGNAL_FUNC (eti_table_model_row_changed), eti); + eti->table_model_row_change_id = g_signal_connect ( + G_OBJECT (table_model), "model_row_changed", + G_CALLBACK (eti_table_model_row_changed), eti); - eti->table_model_cell_change_id = gtk_signal_connect ( - GTK_OBJECT (table_model), "model_cell_changed", - GTK_SIGNAL_FUNC (eti_table_model_cell_changed), eti); + eti->table_model_cell_change_id = g_signal_connect ( + G_OBJECT (table_model), "model_cell_changed", + G_CALLBACK (eti_table_model_cell_changed), eti); - eti->table_model_rows_inserted_id = gtk_signal_connect ( - GTK_OBJECT (table_model), "model_rows_inserted", - GTK_SIGNAL_FUNC (eti_table_model_rows_inserted), eti); + eti->table_model_rows_inserted_id = g_signal_connect ( + G_OBJECT (table_model), "model_rows_inserted", + G_CALLBACK (eti_table_model_rows_inserted), eti); - eti->table_model_rows_deleted_id = gtk_signal_connect ( - GTK_OBJECT (table_model), "model_rows_deleted", - GTK_SIGNAL_FUNC (eti_table_model_rows_deleted), eti); + eti->table_model_rows_deleted_id = g_signal_connect ( + G_OBJECT (table_model), "model_rows_deleted", + G_CALLBACK (eti_table_model_rows_deleted), eti); if (eti->header) { eti_detach_cell_views (eti); @@ -1276,7 +1276,7 @@ eti_add_table_model (ETableItem *eti, ETableModel *table_model) eti->uses_source_model = 1; eti->source_model = E_TABLE_SUBSET(table_model)->source; if (eti->source_model) - gtk_object_ref(GTK_OBJECT(eti->source_model)); + g_object_ref(G_OBJECT(eti->source_model)); } eti_freeze (eti); @@ -1290,7 +1290,7 @@ eti_add_selection_model (ETableItem *eti, ESelectionModel *selection) g_assert (eti->selection == NULL); eti->selection = selection; - gtk_object_ref (GTK_OBJECT (eti->selection)); + g_object_ref (G_OBJECT (eti->selection)); eti->selection_change_id = gtk_signal_connect ( GTK_OBJECT (selection), "selection_changed", @@ -3527,7 +3527,7 @@ static void e_table_item_printable_destroy (GtkObject *object, ETableItemPrintContext *itemcontext) { - gtk_object_unref(GTK_OBJECT(itemcontext->item)); + g_object_unref(G_OBJECT(itemcontext->item)); g_free(itemcontext); } @@ -3548,7 +3548,7 @@ e_table_item_get_printable (ETableItem *item) itemcontext = g_new(ETableItemPrintContext, 1); itemcontext->item = item; - gtk_object_ref(GTK_OBJECT(item)); + g_object_ref(G_OBJECT(item)); itemcontext->rows_printed = 0; gtk_signal_connect (GTK_OBJECT(printable), |