From e99e12428d46db3be2878f6c2ca63bd7510149f4 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 22 May 2008 17:27:48 +0000 Subject: ** Fixes bug #534360 2008-05-22 Matthew Barnes ** Fixes bug #534360 Migrate from deprecated GtkObject symbols to GObject equivalents. Touches over 150 files in all components; too many to list. svn path=/trunk/; revision=35526 --- widgets/table/ChangeLog | 13 +++++++++++++ widgets/table/e-table-memory-callbacks.c | 2 +- widgets/table/e-table-memory-store.c | 2 +- widgets/table/e-table-model.c | 14 +++++++------- widgets/table/e-table-simple.c | 2 +- widgets/table/e-tree-memory-callbacks.c | 2 +- widgets/table/e-tree-model.c | 18 +++++++++--------- widgets/table/e-tree-simple.c | 2 +- 8 files changed, 34 insertions(+), 21 deletions(-) (limited to 'widgets/table') diff --git a/widgets/table/ChangeLog b/widgets/table/ChangeLog index ae3ab90667..77d88894af 100644 --- a/widgets/table/ChangeLog +++ b/widgets/table/ChangeLog @@ -1,3 +1,16 @@ +2008-05-22 Matthew Barnes + + ** Fixes part of bug #534360 + + * e-table-memory-callbacks.c: + * e-table-memory-store.c: + * e-table-model.c: + * e-table-simple.c: + * e-tree-memory-callbacks.c: + * e-tree-model.c: + * e-tree-simple.c: + Migrate from deprecated GtkObject symbols to GObject equivalents. + 2008-04-30 Milan Crha ** Part of fix for bug #528288 diff --git a/widgets/table/e-table-memory-callbacks.c b/widgets/table/e-table-memory-callbacks.c index 4b05a42120..7998d4613b 100644 --- a/widgets/table/e-table-memory-callbacks.c +++ b/widgets/table/e-table-memory-callbacks.c @@ -174,7 +174,7 @@ e_table_memory_callbacks_init (ETableMemoryCalbacks *etmc) * This initializes a new ETableMemoryCalbacksModel object. ETableMemoryCalbacksModel is * an implementaiton of the abstract class ETableModel. The ETableMemoryCalbacksModel * is designed to allow people to easily create ETableModels without having - * to create a new GtkType derived from ETableModel every time they need one. + * to create a new GType derived from ETableModel every time they need one. * * Instead, ETableMemoryCalbacksModel uses a setup based in callback functions, every * callback function signature mimics the signature of each ETableModel method diff --git a/widgets/table/e-table-memory-store.c b/widgets/table/e-table-memory-store.c index 7ebbcbd70c..4cbf821cf1 100644 --- a/widgets/table/e-table-memory-store.c +++ b/widgets/table/e-table-memory-store.c @@ -286,7 +286,7 @@ e_table_memory_store_class_init (ETableMemoryStoreClass *klass) * This initializes a new ETableMemoryStoreModel object. ETableMemoryStoreModel is * an implementaiton of the abstract class ETableModel. The ETableMemoryStoreModel * is designed to allow people to easily create ETableModels without having - * to create a new GtkType derived from ETableModel every time they need one. + * to create a new GType derived from ETableModel every time they need one. * * Instead, ETableMemoryStoreModel uses a setup based in callback functions, every * callback function signature mimics the signature of each ETableModel method diff --git a/widgets/table/e-table-model.c b/widgets/table/e-table-model.c index 36dd691a86..01a49ce370 100644 --- a/widgets/table/e-table-model.c +++ b/widgets/table/e-table-model.c @@ -398,7 +398,7 @@ e_table_model_pre_change (ETableModel *e_table_model) return; d(print_tabs()); - d(g_print("Emitting pre_change on model 0x%p, a %s.\n", e_table_model, gtk_type_name (GTK_OBJECT(e_table_model)->klass->type))); + d(g_print("Emitting pre_change on model 0x%p, a %s.\n", e_table_model, g_type_name (GTK_OBJECT(e_table_model)->klass->type))); d(depth++); g_signal_emit (G_OBJECT (e_table_model), e_table_model_signals [MODEL_PRE_CHANGE], 0); @@ -428,7 +428,7 @@ e_table_model_no_change (ETableModel *e_table_model) return; d(print_tabs()); - d(g_print("Emitting model_no_change on model 0x%p, a %s.\n", e_table_model, gtk_type_name (GTK_OBJECT(e_table_model)->klass->type))); + d(g_print("Emitting model_no_change on model 0x%p, a %s.\n", e_table_model, g_type_name (GTK_OBJECT(e_table_model)->klass->type))); d(depth++); g_signal_emit (G_OBJECT (e_table_model), e_table_model_signals [MODEL_NO_CHANGE], 0); @@ -458,7 +458,7 @@ e_table_model_changed (ETableModel *e_table_model) return; d(print_tabs()); - d(g_print("Emitting model_changed on model 0x%p, a %s.\n", e_table_model, gtk_type_name (GTK_OBJECT(e_table_model)->klass->type))); + d(g_print("Emitting model_changed on model 0x%p, a %s.\n", e_table_model, g_type_name (GTK_OBJECT(e_table_model)->klass->type))); d(depth++); g_signal_emit (G_OBJECT (e_table_model), e_table_model_signals [MODEL_CHANGED], 0); @@ -485,7 +485,7 @@ e_table_model_row_changed (ETableModel *e_table_model, int row) return; d(print_tabs()); - d(g_print("Emitting row_changed on model 0x%p, a %s, row %d.\n", e_table_model, gtk_type_name (GTK_OBJECT(e_table_model)->klass->type), row)); + d(g_print("Emitting row_changed on model 0x%p, a %s, row %d.\n", e_table_model, g_type_name (GTK_OBJECT(e_table_model)->klass->type), row)); d(depth++); g_signal_emit (G_OBJECT (e_table_model), e_table_model_signals [MODEL_ROW_CHANGED], 0, row); @@ -513,7 +513,7 @@ e_table_model_cell_changed (ETableModel *e_table_model, int col, int row) return; d(print_tabs()); - d(g_print("Emitting cell_changed on model 0x%p, a %s, row %d, col %d.\n", e_table_model, gtk_type_name (GTK_OBJECT(e_table_model)->klass->type), row, col)); + d(g_print("Emitting cell_changed on model 0x%p, a %s, row %d, col %d.\n", e_table_model, g_type_name (GTK_OBJECT(e_table_model)->klass->type), row, col)); d(depth++); g_signal_emit (G_OBJECT (e_table_model), e_table_model_signals [MODEL_CELL_CHANGED], 0, col, row); @@ -541,7 +541,7 @@ e_table_model_rows_inserted (ETableModel *e_table_model, int row, int count) return; d(print_tabs()); - d(g_print("Emitting row_inserted on model 0x%p, a %s, row %d.\n", e_table_model, gtk_type_name (GTK_OBJECT(e_table_model)->klass->type), row)); + d(g_print("Emitting row_inserted on model 0x%p, a %s, row %d.\n", e_table_model, g_type_name (GTK_OBJECT(e_table_model)->klass->type), row)); d(depth++); g_signal_emit (G_OBJECT (e_table_model), e_table_model_signals [MODEL_ROWS_INSERTED], 0, row, count); @@ -584,7 +584,7 @@ e_table_model_rows_deleted (ETableModel *e_table_model, int row, int count) return; d(print_tabs()); - d(g_print("Emitting row_deleted on model 0x%p, a %s, row %d.\n", e_table_model, gtk_type_name (GTK_OBJECT(e_table_model)->klass->type), row)); + d(g_print("Emitting row_deleted on model 0x%p, a %s, row %d.\n", e_table_model, g_type_name (GTK_OBJECT(e_table_model)->klass->type), row)); d(depth++); g_signal_emit (G_OBJECT (e_table_model), e_table_model_signals [MODEL_ROWS_DELETED], 0, row, count); diff --git a/widgets/table/e-table-simple.c b/widgets/table/e-table-simple.c index 41ce63f943..acee2b3535 100644 --- a/widgets/table/e-table-simple.c +++ b/widgets/table/e-table-simple.c @@ -214,7 +214,7 @@ e_table_simple_init (ETableSimple *simple) * This initializes a new ETableSimpleModel object. ETableSimpleModel is * an implementaiton of the abstract class ETableModel. The ETableSimpleModel * is designed to allow people to easily create ETableModels without having - * to create a new GtkType derived from ETableModel every time they need one. + * to create a new GType derived from ETableModel every time they need one. * * Instead, ETableSimpleModel uses a setup based in callback functions, every * callback function signature mimics the signature of each ETableModel method diff --git a/widgets/table/e-tree-memory-callbacks.c b/widgets/table/e-tree-memory-callbacks.c index b10e14c262..4c1373865d 100644 --- a/widgets/table/e-tree-memory-callbacks.c +++ b/widgets/table/e-tree-memory-callbacks.c @@ -225,7 +225,7 @@ e_tree_memory_callbacks_init (ETreeMemoryCallbacks *etmc) * ETreeMemoryCallbacksModel is an implementaiton of the somewhat * abstract class ETreeMemory. The ETreeMemoryCallbacksModel is * designed to allow people to easily create ETreeMemorys without - * having to create a new GtkType derived from ETreeMemory every time + * having to create a new GType derived from ETreeMemory every time * they need one. * * Instead, ETreeMemoryCallbacksModel uses a setup based in callback functions, every diff --git a/widgets/table/e-tree-model.c b/widgets/table/e-tree-model.c index 54cece5d00..8ea4cb48be 100644 --- a/widgets/table/e-tree-model.c +++ b/widgets/table/e-tree-model.c @@ -216,7 +216,7 @@ e_tree_model_pre_change (ETreeModel *tree_model) g_return_if_fail (tree_model != NULL); g_return_if_fail (E_IS_TREE_MODEL (tree_model)); - d(g_print("Emitting pre_change on model 0x%p, a %s.\n", tree_model, gtk_type_name (GTK_OBJECT(tree_model)->klass->type))); + d(g_print("Emitting pre_change on model 0x%p, a %s.\n", tree_model, g_type_name (GTK_OBJECT(tree_model)->klass->type))); g_signal_emit (G_OBJECT (tree_model), e_tree_model_signals [PRE_CHANGE], 0); } @@ -236,7 +236,7 @@ e_tree_model_no_change (ETreeModel *tree_model) g_return_if_fail (tree_model != NULL); g_return_if_fail (E_IS_TREE_MODEL (tree_model)); - d(g_print("Emitting no_change on model 0x%p, a %s.\n", tree_model, gtk_type_name (GTK_OBJECT(tree_model)->klass->type))); + d(g_print("Emitting no_change on model 0x%p, a %s.\n", tree_model, g_type_name (GTK_OBJECT(tree_model)->klass->type))); g_signal_emit (G_OBJECT (tree_model), e_tree_model_signals [NO_CHANGE], 0); } @@ -256,7 +256,7 @@ e_tree_model_node_changed (ETreeModel *tree_model, ETreePath node) g_return_if_fail (tree_model != NULL); g_return_if_fail (E_IS_TREE_MODEL (tree_model)); - d(g_print("Emitting node_changed on model 0x%p, a %s.\n", tree_model, gtk_type_name (GTK_OBJECT(tree_model)->klass->type))); + d(g_print("Emitting node_changed on model 0x%p, a %s.\n", tree_model, g_type_name (GTK_OBJECT(tree_model)->klass->type))); g_signal_emit (G_OBJECT (tree_model), e_tree_model_signals [NODE_CHANGED], 0, node); } @@ -276,7 +276,7 @@ e_tree_model_node_data_changed (ETreeModel *tree_model, ETreePath node) g_return_if_fail (tree_model != NULL); g_return_if_fail (E_IS_TREE_MODEL (tree_model)); - d(g_print("Emitting node_data_changed on model 0x%p, a %s.\n", tree_model, gtk_type_name (GTK_OBJECT(tree_model)->klass->type))); + d(g_print("Emitting node_data_changed on model 0x%p, a %s.\n", tree_model, g_type_name (GTK_OBJECT(tree_model)->klass->type))); g_signal_emit (G_OBJECT (tree_model), e_tree_model_signals [NODE_DATA_CHANGED], 0, node); } @@ -296,7 +296,7 @@ e_tree_model_node_col_changed (ETreeModel *tree_model, ETreePath node, int col) g_return_if_fail (tree_model != NULL); g_return_if_fail (E_IS_TREE_MODEL (tree_model)); - d(g_print("Emitting node_col_changed on model 0x%p, a %s.\n", tree_model, gtk_type_name (GTK_OBJECT(tree_model)->klass->type))); + d(g_print("Emitting node_col_changed on model 0x%p, a %s.\n", tree_model, g_type_name (GTK_OBJECT(tree_model)->klass->type))); g_signal_emit (G_OBJECT (tree_model), e_tree_model_signals [NODE_COL_CHANGED], 0, node, col); } @@ -317,7 +317,7 @@ e_tree_model_node_inserted (ETreeModel *tree_model, g_return_if_fail (tree_model != NULL); g_return_if_fail (E_IS_TREE_MODEL (tree_model)); - d(g_print("Emitting node_inserted on model 0x%p, a %s.\n", tree_model, gtk_type_name (GTK_OBJECT(tree_model)->klass->type))); + d(g_print("Emitting node_inserted on model 0x%p, a %s.\n", tree_model, g_type_name (GTK_OBJECT(tree_model)->klass->type))); g_signal_emit (G_OBJECT (tree_model), e_tree_model_signals [NODE_INSERTED], 0, parent_node, inserted_node); @@ -337,7 +337,7 @@ e_tree_model_node_removed (ETreeModel *tree_model, ETreePath parent_node, ETree g_return_if_fail (tree_model != NULL); g_return_if_fail (E_IS_TREE_MODEL (tree_model)); - d(g_print("Emitting node_removed on model 0x%p, a %s.\n", tree_model, gtk_type_name (GTK_OBJECT(tree_model)->klass->type))); + d(g_print("Emitting node_removed on model 0x%p, a %s.\n", tree_model, g_type_name (GTK_OBJECT(tree_model)->klass->type))); g_signal_emit (G_OBJECT (tree_model), e_tree_model_signals [NODE_REMOVED], 0, parent_node, removed_node, old_position); @@ -356,7 +356,7 @@ e_tree_model_node_deleted (ETreeModel *tree_model, ETreePath deleted_node) g_return_if_fail (tree_model != NULL); g_return_if_fail (E_IS_TREE_MODEL (tree_model)); - d(g_print("Emitting node_deleted on model 0x%p, a %s.\n", tree_model, gtk_type_name (GTK_OBJECT(tree_model)->klass->type))); + d(g_print("Emitting node_deleted on model 0x%p, a %s.\n", tree_model, g_type_name (GTK_OBJECT(tree_model)->klass->type))); g_signal_emit (G_OBJECT (tree_model), e_tree_model_signals [NODE_DELETED], 0, deleted_node); } @@ -374,7 +374,7 @@ e_tree_model_node_request_collapse (ETreeModel *tree_model, ETreePath collapsed g_return_if_fail (tree_model != NULL); g_return_if_fail (E_IS_TREE_MODEL (tree_model)); - d(g_print("Emitting node_request_collapse on model 0x%p, a %s.\n", tree_model, gtk_type_name (GTK_OBJECT(tree_model)->klass->type))); + d(g_print("Emitting node_request_collapse on model 0x%p, a %s.\n", tree_model, g_type_name (GTK_OBJECT(tree_model)->klass->type))); g_signal_emit (G_OBJECT (tree_model), e_tree_model_signals [NODE_REQUEST_COLLAPSE], 0, collapsed_node); } diff --git a/widgets/table/e-tree-simple.c b/widgets/table/e-tree-simple.c index 8d77ca7078..23d85b0623 100644 --- a/widgets/table/e-tree-simple.c +++ b/widgets/table/e-tree-simple.c @@ -162,7 +162,7 @@ G_DEFINE_TYPE (ETreeSimple, e_tree_simple, E_TREE_MODEL_TYPE) * This initializes a new ETreeSimpleModel object. ETreeSimpleModel is * an implementaiton of the abstract class ETreeModel. The ETreeSimpleModel * is designed to allow people to easily create ETreeModels without having - * to create a new GtkType derived from ETreeModel every time they need one. + * to create a new GType derived from ETreeModel every time they need one. * * Instead, ETreeSimpleModel uses a setup based in callback functions, every * callback function signature mimics the signature of each ETreeModel method -- cgit v1.2.3