[anjuta/sdb-core-trans: 18/21] Merge branch 'master' into sdb-core-trans

[Massimo Cora' <mcora src gnome org>]

commit ec129ae24bd443c6b677a8c814adfa6d848e20b8
Merge: df4ca43 6eec7a1
Author: Massimo Corà <mcora src gnome org>
Date:   Wed Jun 30 22:37:56 2010 +0200

    Merge branch 'master' into sdb-core-trans

 configure.in                              |  172 ++++++++---------------------
 launcher/Makefile.am                      |    4 +-
 libanjuta/Makefile.am                     |   13 +--
 libanjuta/interfaces/libanjuta.idl        |   14 ---
 libfoocanvas/Makefile.am                  |    8 +-
 plugins/symbol-db/anjuta-tags/Makefile.am |    8 +-
 plugins/symbol-db/benchmark/Makefile.am   |    5 +-
 plugins/symbol-db/plugin.c                |   23 +---
 plugins/symbol-db/symbol-db-query.c       |    3 +-
 9 files changed, 64 insertions(+), 186 deletions(-)
---
diff --cc plugins/symbol-db/plugin.c
index a8076e2,1a4e661..138ed63
--- a/plugins/symbol-db/plugin.c
+++ b/plugins/symbol-db/plugin.c
@@@ -1592,11 -1591,10 +1591,9 @@@ on_project_root_added (AnjutaPlugin *pl
  		anjuta_cache_path = anjuta_util_get_user_cache_file_path (".", NULL);
  		if (symbol_db_engine_open_db (sdb_plugin->sdbe_globals, 
  							  anjuta_cache_path, 
 -							  PROJECT_GLOBALS,
 -		    				  FALSE) == DB_OPEN_STATUS_FATAL)
 +							  PROJECT_GLOBALS) == DB_OPEN_STATUS_FATAL)
  		{
- 			g_critical ("Opening global project under %s", anjuta_cache_path);
- 			g_free (anjuta_cache_path);
- 			return;
+ 			g_error ("Opening global project under %s", anjuta_cache_path);
  		}
  		g_free (anjuta_cache_path);
  	
@@@ -2005,10 -1994,10 +1993,9 @@@ symbol_db_activate (AnjutaPlugin *plugi
  	anjuta_cache_path = anjuta_util_get_user_cache_file_path (".", NULL);
  	if (symbol_db_engine_open_db (sdb_plugin->sdbe_globals, 
  							  anjuta_cache_path, 
 -							  PROJECT_GLOBALS,
 -	    					  TRUE) == DB_OPEN_STATUS_FATAL)
 +							  PROJECT_GLOBALS) == DB_OPEN_STATUS_FATAL)
  	{
- 		g_critical ("Opening global project under %s", anjuta_cache_path);
- 		return FALSE;
+ 		g_error ("Opening global project under %s", anjuta_cache_path);
  	}
  	
  	g_free (anjuta_cache_path);