remove ref/unref G_OBJECT masks ditto ditto ditto ditto ditto ditto ditto

2002-11-05  Mike Kestner  <mkestner@ximian.com>

	* e-cell-text.c : remove ref/unref G_OBJECT masks
	* e-table-extras.c : ditto
	* e-table-header-item.c : ditto
	* e-table-item.c : ditto
	* e-table-memory-store.c : ditto
	* e-table-one.c : ditto
	* e-tree-sorted.c : ditto
	* e-tree-table-adapter.c : ditto
	* e-tree.c : ditto

svn path=/trunk/; revision=18572

9 files changed, 63 insertions, 63 deletions

diff --git a/widgets/table/e-cell-text.c b/widgets/table/e-cell-text.c
index c72e5248b4..3e67923095 100644
--- a/widgets/table/e-cell-text.c
+++ b/widgets/table/e-cell-text.c
@@ -704,7 +704,7 @@ ect_draw (ECellView *ecell_view, GdkDrawable *drawable,
 		}
 	}
 
-	g_object_unref (G_OBJECT (layout));
+	g_object_unref (layout);
 }
 
 /*
diff --git a/widgets/table/e-table-extras.c b/widgets/table/e-table-extras.c
index 4429db98a3..d439da2398 100644
--- a/widgets/table/e-table-extras.c
+++ b/widgets/table/e-table-extras.c
@@ -44,7 +44,7 @@ cell_hash_free(gchar	*key,
 {
 	g_free(key);
 	if (cell)
-		gtk_object_unref( GTK_OBJECT (cell));
+		g_object_unref(cell);
 }
 
 static void
@@ -200,11 +200,11 @@ e_table_extras_add_cell     (ETableExtras *extras,
 		g_hash_table_remove (extras->cells, old_key);
 		g_free (old_key);
 		if (old_cell)
-			gtk_object_unref (GTK_OBJECT(old_cell));
+			g_object_unref (old_cell);
 	}
 
 	if (cell) {
-		gtk_object_ref (GTK_OBJECT (cell));
+		g_object_ref (cell);
 		gtk_object_sink (GTK_OBJECT (cell));
 	}
 	g_hash_table_insert (extras->cells, g_strdup(id), cell);
diff --git a/widgets/table/e-table-header-item.c b/widgets/table/e-table-header-item.c
index 0d2d7375a0..e06eb0b683 100644
--- a/widgets/table/e-table-header-item.c
+++ b/widgets/table/e-table-header-item.c
@@ -137,7 +137,7 @@ ethi_destroy (GtkObject *object){
 	}
 
 	if (ethi->full_header)
-		g_object_unref (G_OBJECT(ethi->full_header));
+		g_object_unref (ethi->full_header);
 	ethi->full_header = NULL;
 
 	if (ethi->config)
@@ -288,7 +288,7 @@ static void
 ethi_add_table_header (ETableHeaderItem *ethi, ETableHeader *header)
 {
 	ethi->eth = header;
-	g_object_ref (G_OBJECT (ethi->eth));
+	g_object_ref (ethi->eth);
 
 	ethi->height = e_table_header_item_get_height (ethi);
 
@@ -351,7 +351,7 @@ ethi_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)
 				g_signal_handler_disconnect (
 					G_OBJECT(ethi->sort_info),
 					ethi->group_info_changed_id);
-			g_object_unref (G_OBJECT(ethi->sort_info));
+			g_object_unref (ethi->sort_info);
 		}
 		ethi->sort_info = GTK_VALUE_POINTER (*arg);
 		g_object_ref (ethi->sort_info);
diff --git a/widgets/table/e-table-item.c b/widgets/table/e-table-item.c
index afaf28586c..1c6f7e36f9 100644
--- a/widgets/table/e-table-item.c
+++ b/widgets/table/e-table-item.c
@@ -512,9 +512,9 @@ eti_remove_table_model (ETableItem *eti)
 			       eti->table_model_rows_inserted_id);
 	g_signal_handler_disconnect (G_OBJECT (eti->table_model),
 			       eti->table_model_rows_deleted_id);
-	g_object_unref (G_OBJECT (eti->table_model));
+	g_object_unref (eti->table_model);
 	if (eti->source_model)
-		g_object_unref (G_OBJECT (eti->source_model));
+		g_object_unref (eti->source_model);
 
 	eti->table_model_pre_change_id = 0;
 	eti->table_model_no_change_id = 0;
@@ -577,7 +577,7 @@ eti_remove_header_model (ETableItem *eti)
 		eti_unrealize_cell_views (eti);
 		eti_detach_cell_views (eti);
 	}
-	g_object_unref (G_OBJECT (eti->header));
+	g_object_unref (eti->header);
 
 
 	eti->header_structure_change_id = 0;
@@ -999,7 +999,7 @@ eti_idle_show_cursor_cb (gpointer data)
 		eti_check_cursor_bounds (eti);
 	}
 
-	g_object_unref (G_OBJECT (eti));
+	g_object_unref (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) {
-		g_object_ref (G_OBJECT (eti));
+		g_object_ref (eti);
 		g_idle_add (eti_idle_show_cursor_cb, eti);
 	}
 }
@@ -1237,7 +1237,7 @@ eti_add_table_model (ETableItem *eti, ETableModel *table_model)
 	g_assert (eti->table_model == NULL);
 	
 	eti->table_model = table_model;
-	g_object_ref (G_OBJECT (eti->table_model));
+	g_object_ref (eti->table_model);
 
 	eti->table_model_pre_change_id = g_signal_connect (
 		G_OBJECT (table_model), "model_pre_change",
@@ -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)
-			g_object_ref(G_OBJECT(eti->source_model));
+			g_object_ref(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;
-	g_object_ref (G_OBJECT (eti->selection));
+	g_object_ref (eti->selection);
 
 	eti->selection_change_id = gtk_signal_connect (
 		GTK_OBJECT (selection), "selection_changed",
@@ -1366,7 +1366,7 @@ eti_add_header_model (ETableItem *eti, ETableHeader *header)
 	g_assert (eti->header == NULL);
 	
 	eti->header = header;
-	g_object_ref (G_OBJECT (header));
+	g_object_ref (header);
 
 	eti_header_structure_changed (header, eti);
 	
@@ -3527,7 +3527,7 @@ static void
 e_table_item_printable_destroy (GtkObject *object,
 				ETableItemPrintContext *itemcontext)
 {
-	g_object_unref(G_OBJECT(itemcontext->item));
+	g_object_unref(itemcontext->item);
 	g_free(itemcontext);
 }
 
@@ -3548,7 +3548,7 @@ e_table_item_get_printable (ETableItem *item)
 
 	itemcontext = g_new(ETableItemPrintContext, 1);
 	itemcontext->item = item;
-	g_object_ref(G_OBJECT(item));
+	g_object_ref(item);
 	itemcontext->rows_printed = 0;
 
 	gtk_signal_connect (GTK_OBJECT(printable),
diff --git a/widgets/table/e-table-memory-store.c b/widgets/table/e-table-memory-store.c
index 128be8efd3..1d310ddd2f 100644
--- a/widgets/table/e-table-memory-store.c
+++ b/widgets/table/e-table-memory-store.c
@@ -301,7 +301,7 @@ e_table_memory_store_new (ETableMemoryStoreColumnInfo *columns)
 	if (e_table_memory_store_construct (et, columns)) {
 		return (ETableModel *) et;
 	} else {
-		g_object_unref (G_OBJECT (et));
+		g_object_unref (et);
 		return NULL;
 	}
 }
diff --git a/widgets/table/e-table-one.c b/widgets/table/e-table-one.c
index e25b13c263..24ea978f19 100644
--- a/widgets/table/e-table-one.c
+++ b/widgets/table/e-table-one.c
@@ -157,7 +157,7 @@ one_dispose (GObject *object)
 	ETableOne *one = E_TABLE_ONE (object);
 	
 	if (one->source)
-		g_object_unref(G_OBJECT(one->source));
+		g_object_unref(one->source);
 	one->source = NULL;
 
 	G_OBJECT_CLASS (parent_class)->dispose (object);
@@ -214,7 +214,7 @@ e_table_one_new (ETableModel *source)
 	}
 	
 	if (source)
-		g_object_ref(G_OBJECT(source));
+		g_object_ref(source);
 	
 	return (ETableModel *) eto;
 }
diff --git a/widgets/table/e-tree-sorted.c b/widgets/table/e-tree-sorted.c
index 8acd093b9d..20ecdad63f 100644
--- a/widgets/table/e-tree-sorted.c
+++ b/widgets/table/e-tree-sorted.c
@@ -616,7 +616,7 @@ ets_dispose (GObject *object)
 		g_signal_handler_disconnect (G_OBJECT (priv->source),
 				             priv->tree_model_node_request_collapse_id);
 
-		g_object_unref (G_OBJECT (priv->source));
+		g_object_unref (priv->source);
 		priv->source = NULL;
 
 		priv->tree_model_pre_change_id = 0;
@@ -635,7 +635,7 @@ ets_dispose (GObject *object)
 				             priv->sort_info_changed_id);
 		priv->sort_info_changed_id = 0;
 
-		g_object_unref (G_OBJECT (priv->sort_info));
+		g_object_unref (priv->sort_info);
 		priv->sort_info = NULL;
 	}
 
@@ -646,7 +646,7 @@ ets_dispose (GObject *object)
 	}
 
 	if (priv->full_header)
-		g_object_unref(G_OBJECT(priv->full_header));
+		g_object_unref(priv->full_header);
 
 }
 
@@ -1260,11 +1260,11 @@ e_tree_sorted_construct (ETreeSorted *ets, ETreeModel *source, ETableHeader *ful
 {
 	ets->priv->source                              = source;
 	if (source)
-		g_object_ref(G_OBJECT(source));
+		g_object_ref(source);
 
 	ets->priv->full_header                         = full_header;
 	if (full_header)
-		g_object_ref(G_OBJECT(full_header));
+		g_object_ref(full_header);
 
 	e_tree_sorted_set_sort_info (ets, sort_info);
 
@@ -1368,12 +1368,12 @@ e_tree_sorted_set_sort_info (ETreeSorted *ets, ETableSortInfo *sort_info)
 			g_signal_handler_disconnect (G_OBJECT (ets->priv->sort_info),
 						     ets->priv->sort_info_changed_id);
 		ets->priv->sort_info_changed_id = 0;
-		g_object_unref (G_OBJECT (ets->priv->sort_info));
+		g_object_unref (ets->priv->sort_info);
 	}
 
 	ets->priv->sort_info = sort_info;
 	if (sort_info) {
-		g_object_ref(G_OBJECT(sort_info));
+		g_object_ref(sort_info);
 		ets->priv->sort_info_changed_id = g_signal_connect (G_OBJECT (ets->priv->sort_info), "sort_info_changed",
 								    G_CALLBACK (ets_sort_info_changed), ets);
 	}
diff --git a/widgets/table/e-tree-table-adapter.c b/widgets/table/e-tree-table-adapter.c
index 44c0b537d4..d56e5bdef1 100644
--- a/widgets/table/e-tree-table-adapter.c
+++ b/widgets/table/e-tree-table-adapter.c
@@ -424,7 +424,7 @@ etta_dispose (GObject *object)
 		g_signal_handler_disconnect (G_OBJECT (etta->priv->source),
 				             etta->priv->tree_model_node_request_collapse_id);
 
-		g_object_unref (G_OBJECT (etta->priv->source));
+		g_object_unref (etta->priv->source);
 		etta->priv->source = NULL;
 
 		etta->priv->tree_model_pre_change_id = 0;
@@ -868,7 +868,7 @@ e_tree_table_adapter_construct (ETreeTableAdapter *etta, ETreeModel *source)
 	ETreePath root;
 
 	etta->priv->source = source;
-	g_object_ref (G_OBJECT (source));
+	g_object_ref (source);
 
 	if (e_tree_model_has_save_id(source))
 		etta->priv->attributes = g_hash_table_new(g_str_hash, g_str_equal);
diff --git a/widgets/table/e-tree.c b/widgets/table/e-tree.c
index cb5d5fa3ba..3e7158fec1 100644
--- a/widgets/table/e-tree.c
+++ b/widgets/table/e-tree.c
@@ -333,9 +333,9 @@ disconnect_header (ETree *e_tree)
 			g_signal_handler_disconnect (G_OBJECT (e_tree->priv->sort_info),
 					             e_tree->priv->group_info_change_id);
 
-		g_object_unref(G_OBJECT(e_tree->priv->sort_info));
+		g_object_unref(e_tree->priv->sort_info);
 	}
-	g_object_unref(G_OBJECT(e_tree->priv->header));
+	g_object_unref(e_tree->priv->header);
 	e_tree->priv->header = NULL;
 	e_tree->priv->sort_info = NULL;
 }
@@ -389,7 +389,7 @@ et_destroy (GtkObject *object)
 			if (et->priv->search_accept_id)
 				g_signal_handler_disconnect (G_OBJECT (et->priv->search),
 						     	      et->priv->search_accept_id);
-			g_object_unref (G_OBJECT (et->priv->search));
+			g_object_unref (et->priv->search);
 		}
 
 		if (et->priv->reflow_idle_id)
@@ -402,18 +402,18 @@ et_destroy (GtkObject *object)
 
 		et_disconnect_from_etta (et);
 
-		g_object_unref (G_OBJECT (et->priv->etta));
-		g_object_unref (G_OBJECT (et->priv->model));
-		g_object_unref (G_OBJECT (et->priv->sorted));
-		g_object_unref (G_OBJECT (et->priv->full_header));
+		g_object_unref (et->priv->etta);
+		g_object_unref (et->priv->model);
+		g_object_unref (et->priv->sorted);
+		g_object_unref (et->priv->full_header);
 		disconnect_header (et);
-		g_object_unref (G_OBJECT (et->priv->selection));
+		g_object_unref (et->priv->selection);
 		if (et->priv->spec)
-			g_object_unref (G_OBJECT (et->priv->spec));
+			g_object_unref (et->priv->spec);
 		et->priv->spec = NULL;
 
 		if (et->priv->sorter)
-			g_object_unref (G_OBJECT (et->priv->sorter));
+			g_object_unref (et->priv->sorter);
 		et->priv->sorter = NULL;
 
 		if (et->priv->header_canvas)
@@ -1191,7 +1191,7 @@ e_tree_set_state (ETree      *e_tree,
 	if (state->col_count > 0)
 		e_tree_set_state_object(e_tree, state);
 
-	g_object_unref(G_OBJECT(state));
+	g_object_unref(state);
 }
 
 /**
@@ -1218,7 +1218,7 @@ e_tree_load_state (ETree      *e_tree,
 	if (state->col_count > 0)
 		e_tree_set_state_object(e_tree, state);
 
-	g_object_unref(G_OBJECT(state));
+	g_object_unref(state);
 }
 
 /**
@@ -1241,7 +1241,7 @@ e_tree_get_state_object (ETree *e_tree)
 	state = e_table_state_new();
 	state->sort_info = e_tree->priv->sort_info;
 	if (state->sort_info)
-		g_object_ref(G_OBJECT(state->sort_info));
+		g_object_ref(state->sort_info);
 
 	state->col_count = e_table_header_count (e_tree->priv->header);
 	full_col_count = e_table_header_count (e_tree->priv->full_header);
@@ -1280,7 +1280,7 @@ e_tree_get_state (ETree *e_tree)
 
 	state = e_tree_get_state_object(e_tree);
 	string = e_table_state_save_to_string(state);
-	g_object_unref(G_OBJECT(state));
+	g_object_unref(state);
 	return string;
 }
 
@@ -1300,7 +1300,7 @@ e_tree_save_state (ETree      *e_tree,
 
 	state = e_tree_get_state_object(e_tree);
 	e_table_state_save_to_file(state, filename);
-	g_object_unref(G_OBJECT(state));
+	g_object_unref(state);
 }
 
 /**
@@ -1376,7 +1376,7 @@ et_real_construct (ETree *e_tree, ETreeModel *etm, ETableExtras *ete,
 	int i, col_count;
 
 	if (ete)
-		g_object_ref(G_OBJECT(ete));
+		g_object_ref(ete);
 	else
 		ete = e_table_extras_new();
 
@@ -1392,7 +1392,7 @@ et_real_construct (ETree *e_tree, ETreeModel *etm, ETableExtras *ete,
 	e_tree->priv->horizontal_scrolling = specification->horizontal_scrolling;
 
 	e_tree->priv->model = etm;
-	g_object_ref (G_OBJECT (etm));
+	g_object_ref (etm);
 
 	e_tree->priv->sorted = e_tree_sorted_new(etm, e_tree->priv->full_header, e_tree->priv->sort_info);
 
@@ -1450,7 +1450,7 @@ et_real_construct (ETree *e_tree, ETreeModel *etm, ETableExtras *ete,
 
 	gtk_widget_pop_colormap ();
 
-	g_object_unref(G_OBJECT(ete));
+	g_object_unref(ete);
 
 	return e_tree;
 }
@@ -1489,19 +1489,19 @@ e_tree_construct (ETree *e_tree, ETreeModel *etm, ETableExtras *ete,
 		state = e_table_state_new();
 		e_table_state_load_from_string(state, state_str);
 		if (state->col_count <= 0) {
-			g_object_unref(G_OBJECT(state));
+			g_object_unref(state);
 			state = specification->state;
-			g_object_ref(G_OBJECT(state));
+			g_object_ref(state);
 		}
 	} else {
 		state = specification->state;
-		g_object_ref(G_OBJECT(state));
+		g_object_ref(state);
 	}
 
 	e_tree = et_real_construct (e_tree, etm, ete, specification, state);
 
 	e_tree->priv->spec = specification;
-	g_object_unref(G_OBJECT(state));
+	g_object_unref(state);
 
 	return e_tree;
 }
@@ -1537,31 +1537,31 @@ e_tree_construct_from_spec_file (ETree *e_tree, ETreeModel *etm, ETableExtras *e
 
 	specification = e_table_specification_new();
 	if (!e_table_specification_load_from_file(specification, spec_fn)) {
-		g_object_unref(G_OBJECT(specification));
+		g_object_unref(specification);
 		return NULL;
 	}
 
 	if (state_fn) {
 		state = e_table_state_new();
 		if (!e_table_state_load_from_file(state, state_fn)) {
-			g_object_unref(G_OBJECT(state));
+			g_object_unref(state);
 			state = specification->state;
-			g_object_ref(G_OBJECT(state));
+			g_object_ref(state);
 		}
 		if (state->col_count <= 0) {
-			g_object_unref(G_OBJECT(state));
+			g_object_unref(state);
 			state = specification->state;
-			g_object_ref(G_OBJECT(state));
+			g_object_ref(state);
 		}
 	} else {
 		state = specification->state;
-		g_object_ref(G_OBJECT(state));
+		g_object_ref(state);
 	}
 
 	e_tree = et_real_construct (e_tree, etm, ete, specification, state);
 
 	e_tree->priv->spec = specification;
-	g_object_unref(G_OBJECT(state));
+	g_object_unref(state);
 
 	return e_tree;
 }
@@ -1602,7 +1602,7 @@ e_tree_new (ETreeModel *etm, ETableExtras *ete, const char *spec, const char *st
 	ret_val = e_tree_construct (e_tree, etm, ete, spec, state);
 
 	if (ret_val == NULL) {
-		g_object_unref (G_OBJECT (e_tree));
+		g_object_unref (e_tree);
 	}
 
 	return (GtkWidget *) ret_val;
@@ -1643,7 +1643,7 @@ e_tree_new_from_spec_file (ETreeModel *etm, ETableExtras *ete, const char *spec_
 	ret_val = e_tree_construct_from_spec_file (e_tree, etm, ete, spec_fn, state_fn);
 
 	if (ret_val == NULL) {
-		g_object_unref (G_OBJECT (e_tree));
+		g_object_unref (e_tree);
 	}
 
 	return (GtkWidget *) ret_val;
@@ -2846,14 +2846,14 @@ context_destroyed (gpointer data)
 		scroll_off (et);
 		hover_off (et);
 	}
-	g_object_unref (G_OBJECT (et));
+	g_object_unref (et);
 }
 
 static void
 context_connect (ETree *et, GdkDragContext *context)
 {
 	if (g_dataset_get_data (context, "e-tree") == NULL) {
-		g_object_ref (G_OBJECT (et));
+		g_object_ref (et);
 		g_dataset_set_data_full (context, "e-tree", et, context_destroyed);
 	}
 }