Fix usage of sink, fixing many recently introduced leaks.

The conversion away from gtk_object_sink was done wrongly
causing lots of leaks. fix this.

8 files changed, 9 insertions, 8 deletions

diff --git a/src/file-manager/fm-list-view.c b/src/file-manager/fm-list-view.c
index aec3963f5..2a1c8b8dd 100644
--- a/src/file-manager/fm-list-view.c
+++ b/src/file-manager/fm-list-view.c
@@ -1444,7 +1444,7 @@ create_and_set_up_tree_view (FMListView *view)
 			view->details->pixbuf_cell = (GtkCellRendererPixbuf *)cell;
 			
 			view->details->file_name_column = gtk_tree_view_column_new ();
-			g_object_ref (view->details->file_name_column);
+			g_object_ref_sink (view->details->file_name_column);
 			view->details->file_name_column_num = column_num;
 			
 			g_hash_table_insert (view->details->columns,
@@ -1482,7 +1482,7 @@ create_and_set_up_tree_view (FMListView *view)
 									   cell,
 									   "text", column_num,
 									   NULL);
-			g_object_ref (column);
+			g_object_ref_sink (column);
 			gtk_tree_view_column_set_sort_column_id (column, column_num);
 			g_hash_table_insert (view->details->columns, 
 					     g_strdup (name), 
diff --git a/src/file-manager/fm-tree-view.c b/src/file-manager/fm-tree-view.c
index 47e8cc03d..1dff46675 100644
--- a/src/file-manager/fm-tree-view.c
+++ b/src/file-manager/fm-tree-view.c
@@ -1705,7 +1705,7 @@ fm_tree_view_create (NautilusSidebarProvider *provider,
 	
 	sidebar = g_object_new (fm_tree_view_get_type (), NULL);
 	fm_tree_view_set_parent_window (sidebar, window);
-	g_object_ref (sidebar);
+	g_object_ref_sink (sidebar);
 
 	return NAUTILUS_SIDEBAR (sidebar);
 }
diff --git a/src/nautilus-emblem-sidebar.c b/src/nautilus-emblem-sidebar.c
index 6049351a6..3a5cb182f 100644
--- a/src/nautilus-emblem-sidebar.c
+++ b/src/nautilus-emblem-sidebar.c
@@ -1076,7 +1076,7 @@ nautilus_emblem_sidebar_create (NautilusSidebarProvider *provider,
 	
 	sidebar = g_object_new (nautilus_emblem_sidebar_get_type (), NULL);
 	nautilus_emblem_sidebar_set_parent_window (sidebar, window);
-	g_object_ref (sidebar);
+	g_object_ref_sink (sidebar);
 
 	return NAUTILUS_SIDEBAR (sidebar);
 }
diff --git a/src/nautilus-history-sidebar.c b/src/nautilus-history-sidebar.c
index 444b9fe2c..17d72e84b 100644
--- a/src/nautilus-history-sidebar.c
+++ b/src/nautilus-history-sidebar.c
@@ -383,7 +383,7 @@ nautilus_history_sidebar_create (NautilusSidebarProvider *provider,
 	
 	sidebar = g_object_new (nautilus_history_sidebar_get_type (), NULL);
 	nautilus_history_sidebar_set_parent_window (sidebar, window);
-	g_object_ref (sidebar);
+	g_object_ref_sink (sidebar);
 
 	return NAUTILUS_SIDEBAR (sidebar);
 }
diff --git a/src/nautilus-information-panel.c b/src/nautilus-information-panel.c
index 505015145..ce162ef30 100644
--- a/src/nautilus-information-panel.c
+++ b/src/nautilus-information-panel.c
@@ -1171,7 +1171,7 @@ nautilus_information_panel_create (NautilusSidebarProvider *provider,
 	
 	panel = g_object_new (nautilus_information_panel_get_type (), NULL);
 	nautilus_information_panel_set_parent_window (panel, window);
-	g_object_ref (panel);
+	g_object_ref_sink (panel);
 
 	return NAUTILUS_SIDEBAR (panel);
 }
diff --git a/src/nautilus-notes-viewer.c b/src/nautilus-notes-viewer.c
index e71f39307..6caafe148 100644
--- a/src/nautilus-notes-viewer.c
+++ b/src/nautilus-notes-viewer.c
@@ -448,7 +448,7 @@ nautilus_notes_viewer_create_sidebar (NautilusSidebarProvider *provider,
 	
 	sidebar = g_object_new (nautilus_notes_viewer_get_type (), NULL);
 	nautilus_notes_viewer_set_parent_window (sidebar, window);
-	g_object_ref (sidebar);
+	g_object_ref_sink (sidebar);
 
 	return NAUTILUS_SIDEBAR (sidebar);
 }
diff --git a/src/nautilus-places-sidebar.c b/src/nautilus-places-sidebar.c
index 144dab60a..ce1c549a7 100644
--- a/src/nautilus-places-sidebar.c
+++ b/src/nautilus-places-sidebar.c
@@ -2687,7 +2687,7 @@ nautilus_places_sidebar_create (NautilusSidebarProvider *provider,
 	
 	sidebar = g_object_new (nautilus_places_sidebar_get_type (), NULL);
 	nautilus_places_sidebar_set_parent_window (sidebar, window);
-	g_object_ref (sidebar);
+	g_object_ref_sink (sidebar);
 
 	return NAUTILUS_SIDEBAR (sidebar);
 }
diff --git a/src/nautilus-spatial-window.c b/src/nautilus-spatial-window.c
index 852d11967..3e289549e 100644
--- a/src/nautilus-spatial-window.c
+++ b/src/nautilus-spatial-window.c
@@ -744,6 +744,7 @@ location_button_clicked_callback (GtkWidget             *widget,
 	gtk_grab_remove (popup);
 	g_main_loop_unref (loop);
 	g_object_ref_sink (popup);
+	g_object_unref (popup);
 }
 
 static int