anjuta r4726 - in trunk: . plugins/symbol-db

[mcora svn gnome org]

Author: mcora
Date: Mon Feb  9 22:55:10 2009
New Revision: 4726
URL: http://svn.gnome.org/viewvc/anjuta?rev=4726&view=rev

Log:
	* plugins/symbol-db/plugin.c (on_session_load),
	(isymbol_manager_search_system):
	* plugins/symbol-db/symbol-db-engine-core.c
	(symbol_db_engine_close_db):
	* plugins/symbol-db/symbol-db-view-locals.c
	(symbol_db_view_locals_clear_cache):
	fixed some warnings like GDA_IS_CONNECTION (cnc) when the project was
	closing as the same time as the local tab was populating with symbols.

Modified:
   trunk/ChangeLog
   trunk/plugins/symbol-db/plugin.c
   trunk/plugins/symbol-db/symbol-db-engine-core.c
   trunk/plugins/symbol-db/symbol-db-view-locals.c

Modified: trunk/plugins/symbol-db/plugin.c
==============================================================================
--- trunk/plugins/symbol-db/plugin.c	(original)
+++ trunk/plugins/symbol-db/plugin.c	Mon Feb  9 22:55:10 2009
@@ -1707,10 +1707,11 @@
 		gboolean parallel_scan = anjuta_preferences_get_int (sdb_plugin->prefs, 
 															 PARALLEL_SCAN); 
 		
-		if (parallel_scan == TRUE)
+		if (parallel_scan == TRUE && 
+			symbol_db_engine_is_connected (sdb_plugin->sdbe_globals) == TRUE)
 		{
 			/* we simulate a project-import-end signal received */
-			do_import_system_sources (sdb_plugin);		
+			do_import_system_sources (sdb_plugin);
 		}
 	}	
 	else if (phase == ANJUTA_SESSION_PHASE_END)
@@ -2803,7 +2804,7 @@
 					exact_match,
 					filter_array,
 					include_types,
-					TRUE,
+					1,
 					sdb_plugin->session_packages,
 					results_limit,
 					results_offset,

Modified: trunk/plugins/symbol-db/symbol-db-engine-core.c
==============================================================================
--- trunk/plugins/symbol-db/symbol-db-engine-core.c	(original)
+++ trunk/plugins/symbol-db/symbol-db-engine-core.c	Mon Feb  9 22:55:10 2009
@@ -2906,18 +2906,21 @@
 symbol_db_engine_close_db (SymbolDBEngine *dbe)
 {
 	SymbolDBEnginePriv *priv;
-
+	gboolean ret;
 	g_return_val_if_fail (dbe != NULL, FALSE);
 	
 	priv = dbe->priv;
-	
+
 	/* terminate threads, if ever they're running... */
 	g_thread_pool_free (priv->thread_pool, TRUE, TRUE);
+	priv->thread_pool = NULL;
+	ret = sdb_engine_disconnect_from_db (dbe);
+	
 	priv->thread_pool = g_thread_pool_new (sdb_engine_ctags_output_thread,
 										   dbe, THREADS_MAX_CONCURRENT,
 										   FALSE, NULL);
 	
-	return sdb_engine_disconnect_from_db (dbe);
+	return ret;
 }
 
 gboolean

Modified: trunk/plugins/symbol-db/symbol-db-view-locals.c
==============================================================================
--- trunk/plugins/symbol-db/symbol-db-view-locals.c	(original)
+++ trunk/plugins/symbol-db/symbol-db-view-locals.c	Mon Feb  9 22:55:10 2009
@@ -187,6 +187,12 @@
 	
 	priv = dbvl->priv;
 		
+	if (priv->insertion_idle_handler > 0)
+	{				
+		g_source_remove (priv->insertion_idle_handler);
+		priv->insertion_idle_handler = 0;
+	}
+	
 	/*DEBUG_PRINT ("%s", "symbol_db_view_locals_clear_cache ()");*/
 	/* check whether we already have the view status saved on hash table or not.
 	 * If we saved that then don't remove it, or there may be a memory leak