anjuta r4012 - in trunk: . plugins/file-manager plugins/project-manager

[jhs svn gnome org]

Author: jhs
Date: Fri Jun 13 22:16:38 2008
New Revision: 4012
URL: http://svn.gnome.org/viewvc/anjuta?rev=4012&view=rev

Log:
2008-06-13  Massimo Cora\'  <maxcvs email it>
 
	* plugins/project-manager/plugin.c (on_close_project_idle),
 	(project_manager_plugin_deactivate_plugin):
 	removed a forced anjuta_plugin_deactivate () that caused a critical-warning. 

Modified:
   trunk/ChangeLog
   trunk/plugins/file-manager/file-view.c
   trunk/plugins/project-manager/plugin.c

Modified: trunk/plugins/file-manager/file-view.c
==============================================================================
--- trunk/plugins/file-manager/file-view.c	(original)
+++ trunk/plugins/file-manager/file-view.c	Fri Jun 13 22:16:38 2008
@@ -53,7 +53,6 @@
 	
 	GList* saved_paths;
 	GtkTreeRowReference* current_selection;
-	GtkCellRenderer* renderer_display;
 };
 
 #define ANJUTA_FILE_VIEW_GET_PRIVATE(o) \
@@ -300,11 +299,10 @@
 	
 	filename = file_model_get_filename (FILE_MODEL (file_model), &real_iter);
 	gtk_tooltip_set_text (tooltip, filename);
-	gtk_tree_view_set_tooltip_cell (GTK_TREE_VIEW (view),
-									tooltip,
-									path,
-									NULL,
-									priv->renderer_display);
+	gtk_tree_view_set_tooltip_row (GTK_TREE_VIEW (view),
+								   tooltip,
+								   path);
+	
 	g_free (filename);
 	gtk_tree_path_free (path);
 	
@@ -353,6 +351,7 @@
 file_view_init (AnjutaFileView *object)
 {
 	GtkCellRenderer* renderer_pixbuf;
+	GtkCellRenderer* renderer_display;
 	GtkTreeViewColumn* column;
 	GtkTreeSelection* selection;
 	GtkTreeModel* sort_model;
@@ -371,15 +370,15 @@
 											 NULL);
 	
 	renderer_pixbuf = gtk_cell_renderer_pixbuf_new ();
-	priv->renderer_display = gtk_cell_renderer_text_new ();
+	renderer_display = gtk_cell_renderer_text_new ();
 	
 	column = gtk_tree_view_column_new ();
 	gtk_tree_view_column_set_title (column, _("Filename"));
 	gtk_tree_view_column_pack_start (column, renderer_pixbuf, FALSE);
-	gtk_tree_view_column_pack_start (column, priv->renderer_display, FALSE);
+	gtk_tree_view_column_pack_start (column, renderer_display, FALSE);
 	gtk_tree_view_column_set_attributes (column, renderer_pixbuf,
 										 "pixbuf", COLUMN_PIXBUF, NULL);
-	gtk_tree_view_column_set_attributes (column, priv->renderer_display,
+	gtk_tree_view_column_set_attributes (column, renderer_display,
 										 "markup", COLUMN_DISPLAY, NULL);
 	gtk_tree_view_append_column (GTK_TREE_VIEW (object), column);
 	

Modified: trunk/plugins/project-manager/plugin.c
==============================================================================
--- trunk/plugins/project-manager/plugin.c	(original)
+++ trunk/plugins/project-manager/plugin.c	Fri Jun 13 22:16:38 2008
@@ -170,8 +170,6 @@
 {
 	project_manager_plugin_close (ANJUTA_PLUGIN_PROJECT_MANAGER (plugin));
 	ANJUTA_PLUGIN_PROJECT_MANAGER(plugin)->close_project_idle = -1;
-	/* Self destruct */
-	anjuta_plugin_deactivate (ANJUTA_PLUGIN (plugin));
 	
 	return FALSE;
 }
@@ -1484,9 +1482,11 @@
 	AnjutaProfileManager *profile_manager;
 	ProjectManagerPlugin *pm_plugin;
 	pm_plugin = ANJUTA_PLUGIN_PROJECT_MANAGER (plugin);
-	
+
 	if (pm_plugin->close_project_idle > -1)
+	{
 		g_source_remove (pm_plugin->close_project_idle);
+	}
 
 	/* Close project if it's open */
 	if (pm_plugin->project_root_uri)