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

[Massimo Cora' <mcora src gnome org>]

commit df4ca431e576a4242a1aa04d0f7356d20275bb09
Merge: 228cb68 ec82284
Author: Massimo Corà <mcora src gnome org>
Date:   Tue Jun 29 00:25:17 2010 +0200

    Merge branch 'master' into sdb-core-trans

 README                                             |   14 +-
 anjuta.doap                                        |    2 +-
 configure.in                                       |   11 +-
 libanjuta/Makefile.am                              |   50 +-
 libanjuta/anjuta-project.h                         |    4 +-
 libanjuta/anjuta-utils.c                           |    4 +-
 libanjuta/interfaces/libanjuta.idl                 |   15 +
 manuals/anjuta-manual/Makefile.am                  |    2 +-
 .../fr/figures/Capture-Rechercher et remplacer.png |  Bin 0 -> 40936 bytes
 .../anjuta-manual/fr/figures/add_edit_macro.png    |  Bin 0 -> 27507 bytes
 .../anjuta-manual/fr/figures/anjuta-in-action.png  |  Bin 0 -> 238789 bytes
 manuals/anjuta-manual/fr/figures/attach.png        |  Bin 0 -> 49484 bytes
 manuals/anjuta-manual/fr/figures/brk_add.png       |  Bin 0 -> 16686 bytes
 manuals/anjuta-manual/fr/figures/brk_dlg.png       |  Bin 0 -> 19938 bytes
 manuals/anjuta-manual/fr/figures/display_macro.png |  Bin 0 -> 35133 bytes
 manuals/anjuta-manual/fr/figures/editor_guides.png |  Bin 0 -> 23702 bytes
 manuals/anjuta-manual/fr/figures/file_menu.png     |  Bin 0 -> 21652 bytes
 manuals/anjuta-manual/fr/figures/keyword_macro.png |  Bin 0 -> 21130 bytes
 .../anjuta-manual/fr/figures/local_variables.png   |  Bin 0 -> 31769 bytes
 manuals/anjuta-manual/fr/figures/menubar.png       |  Bin 0 -> 6162 bytes
 .../anjuta-manual/fr/figures/new_file_wizard.png   |  Bin 0 -> 33319 bytes
 manuals/anjuta-manual/fr/figures/open_file.png     |  Bin 0 -> 108012 bytes
 .../fr/figures/open_file_multiple.png              |  Bin 0 -> 109680 bytes
 manuals/anjuta-manual/fr/figures/prefs_print.png   |  Bin 0 -> 49417 bytes
 manuals/anjuta-manual/fr/figures/print_dlg.png     |  Bin 0 -> 35827 bytes
 manuals/anjuta-manual/fr/figures/print_preview.png |  Bin 0 -> 129153 bytes
 .../anjuta-manual/fr/figures/project-window.png    |  Bin 0 -> 26812 bytes
 manuals/anjuta-manual/fr/figures/project_group.png |  Bin 0 -> 37257 bytes
 manuals/anjuta-manual/fr/figures/project_info.png  |  Bin 0 -> 37849 bytes
 .../anjuta-manual/fr/figures/project_target.png    |  Bin 0 -> 27051 bytes
 .../fr/figures/project_target_details.png          |  Bin 0 -> 28648 bytes
 manuals/anjuta-manual/fr/figures/save_as_file.png  |  Bin 0 -> 74958 bytes
 manuals/anjuta-manual/fr/figures/search_expr.png   |  Bin 0 -> 34589 bytes
 .../fr/figures/search_file_pattern.png             |  Bin 0 -> 52446 bytes
 .../anjuta-manual/fr/figures/search_replace.png    |  Bin 0 -> 35154 bytes
 .../anjuta-manual/fr/figures/search_setting.png    |  Bin 0 -> 28089 bytes
 manuals/anjuta-manual/fr/figures/search_target.png |  Bin 0 -> 34377 bytes
 .../fr/figures/search_target_action.png            |  Bin 0 -> 38117 bytes
 .../anjuta-manual/fr/figures/search_target_in.png  |  Bin 0 -> 37234 bytes
 manuals/anjuta-manual/fr/figures/sharedlibs.png    |  Bin 0 -> 22249 bytes
 manuals/anjuta-manual/fr/figures/signals.png       |  Bin 0 -> 36275 bytes
 manuals/anjuta-manual/fr/figures/stack.png         |  Bin 0 -> 21778 bytes
 .../anjuta-manual/fr/figures/symbol_browser.png    |  Bin 0 -> 24258 bytes
 manuals/anjuta-manual/fr/fr.po                     | 5523 ++++++++++++++++++++
 plugins/debug-manager/command.c                    |    5 +-
 plugins/debug-manager/debug_tree.c                 |    4 +-
 plugins/gdb/Makefile.am                            |    6 +-
 plugins/gdb/anjuta-gdb.plugin.in                   |    2 +-
 plugins/gdb/anjuta-gdb.ui                          |  124 +
 plugins/gdb/debugger.c                             |  122 +-
 plugins/gdb/debugger.h                             |   11 +-
 plugins/gdb/plugin.c                               |   66 +-
 plugins/gdb/preferences.c                          |  467 ++
 plugins/gdb/preferences.h                          |   48 +
 plugins/js-debugger/debugger-js.c                  |    2 +
 plugins/language-support-js/Makefile.am            |    2 +-
 plugins/run-program/execute.c                      |   16 +-
 plugins/symbol-db/plugin.c                         |   23 +-
 plugins/symbol-db/symbol-db-query-result.c         |    8 +-
 plugins/symbol-db/symbol-db-query.c                |    3 +-
 plugins/terminal/terminal.c                        |   72 +-
 po/es.po                                           |  207 +-
 src/anjuta-app.c                                   |   28 +-
 63 files changed, 6653 insertions(+), 188 deletions(-)
---
diff --cc plugins/symbol-db/plugin.c
index 138ed63,06054a8..a8076e2
--- a/plugins/symbol-db/plugin.c
+++ b/plugins/symbol-db/plugin.c
@@@ -1591,9 -1592,12 +1592,11 @@@ 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_error ("Opening global project under %s", anjuta_cache_path);
+ 			g_critical ("Opening global project under %s", anjuta_cache_path);
+ 			g_free (anjuta_cache_path);
+ 			return;
  		}
  		g_free (anjuta_cache_path);
  	
@@@ -1993,9 -2006,11 +2005,10 @@@ 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_error ("Opening global project under %s", anjuta_cache_path);
+ 		g_critical ("Opening global project under %s", anjuta_cache_path);
+ 		return FALSE;
  	}
  	
  	g_free (anjuta_cache_path);