[anjuta/sdb-queries: 48/48] Merge branch 'master' into sdb-queries

[Naba Kumar <naba src gnome org>]

commit 70abc86a8adb48824c2f91b10e82bc25b59c2d10
Merge: f0bc5cb 7cb60e7
Author: Naba Kumar <naba gnome org>
Date:   Tue Jun 8 19:56:06 2010 +0300

    Merge branch 'master' into sdb-queries
    
    Conflicts:
    	plugins/symbol-db/symbol-db-engine-core.c

 NEWS                                               |   29 +
 configure.in                                       |   20 +-
 libanjuta/anjuta-launcher.c                        |   14 +
 libanjuta/anjuta-status.c                          |    2 +-
 libanjuta/anjuta-tabber.c                          |   51 +-
 libanjuta/anjuta-utils.c                           |   88 +-
 libanjuta/anjuta-utils.h                           |    4 +-
 .../C/anjuta-build-tutorial.xml                    |   32 -
 plugins/Makefile.am                                |    3 +-
 plugins/build-basic-autotools/build-options.c      |    5 +-
 plugins/build-basic-autotools/plugin.c             |   14 +-
 plugins/class-gen/generator.c                      |    2 +-
 plugins/class-inheritance/class-inherit.c          |    6 +-
 plugins/debug-manager/data_view.c                  |    8 +-
 plugins/debug-manager/registers.c                  |    2 +-
 plugins/debug-manager/sparse_view.c                |    8 +-
 plugins/debug-manager/start.c                      |   14 +-
 plugins/document-manager/plugin.c                  |   12 +-
 plugins/document-manager/plugin.h                  |    2 +-
 plugins/file-manager/plugin.c                      |   30 +-
 plugins/file-manager/plugin.h                      |    3 +-
 plugins/file-wizard/file.c                         |    2 +-
 plugins/gbf-am/gbf-am-project.c                    |    2 +-
 plugins/gbf-mkfile/gbf-mkfile-project.c            |    4 +-
 plugins/gdb/debugger.c                             |   78 +-
 plugins/glade/Makefile.am                          |    2 +-
 plugins/glade/anjuta-glade.glade                   |  467 --
 .../glade/{anjuta-glade.ui => anjuta-glade.xml}    |    0
 plugins/glade/plugin.c                             |   11 +-
 plugins/gtodo/mcategory.c                          |    2 +-
 .../language-support-cpp-java/cpp-java-assist.c    |    6 +-
 plugins/language-support-cpp-java/plugin.c         |   18 +-
 plugins/language-support-vala/Makefile.am          |   64 +
 .../language-support-vala/anjuta-vala.plugin.in    |   10 +
 plugins/language-support-vala/libanjuta-1.0.deps   |    9 +
 plugins/language-support-vala/libanjuta-1.0.vapi   | 1790 +++++
 plugins/language-support-vala/locator.vala         |  105 +
 plugins/language-support-vala/plugin.vala          |  352 +
 plugins/language-support-vala/provider.vala        |  145 +
 plugins/language-support-vala/report.vala          |   92 +
 .../message-view/anjuta-message-manager-plugin.ui  |  246 +-
 plugins/message-view/plugin.c                      |    2 +-
 plugins/project-wizard/druid.c                     |   18 +-
 plugins/project-wizard/header.c                    |   34 +-
 plugins/project-wizard/header.h                    |    4 +-
 plugins/project-wizard/parser.c                    |  444 +-
 plugins/project-wizard/property.c                  |  117 +-
 plugins/project-wizard/property.h                  |    7 +-
 plugins/project-wizard/templates/Makefile.am       |   47 +-
 plugins/project-wizard/templates/anjuta-plugin.wiz |  123 -
 .../project-wizard/templates/anjuta-plugin.wiz.in  |  125 +
 .../templates/anjuta-plugin/configure.ac.tpl       |    3 -
 plugins/project-wizard/templates/cpp.wiz           |   94 -
 plugins/project-wizard/templates/cpp.wiz.in        |   96 +
 .../project-wizard/templates/cpp/configure.ac.tpl  |    3 -
 plugins/project-wizard/templates/django.wiz        |   27 -
 plugins/project-wizard/templates/django.wiz.in     |   29 +
 .../templates/extract-translatable-strings.pl      |   40 -
 plugins/project-wizard/templates/gcj.wiz           |  100 -
 plugins/project-wizard/templates/gcj.wiz.in        |  102 +
 plugins/project-wizard/templates/gnome-applet.wiz  |  102 -
 .../project-wizard/templates/gnome-applet.wiz.in   |  104 +
 .../templates/gnome-applet/configure.ac.tpl        |    3 -
 plugins/project-wizard/templates/gtk.wiz           |   96 -
 plugins/project-wizard/templates/gtk.wiz.in        |   98 +
 plugins/project-wizard/templates/gtkmm.wiz         |   95 -
 plugins/project-wizard/templates/gtkmm.wiz.in      |   97 +
 plugins/project-wizard/templates/java.wiz          |   89 -
 plugins/project-wizard/templates/java.wiz.in       |   91 +
 plugins/project-wizard/templates/js.wiz            |   56 -
 plugins/project-wizard/templates/js.wiz.in         |   58 +
 .../templates/js_minimal/configure.ac.tpl          |    3 -
 plugins/project-wizard/templates/library.wiz       |  100 -
 plugins/project-wizard/templates/library.wiz.in    |  102 +
 .../templates/library/configure.ac.tpl             |    3 -
 plugins/project-wizard/templates/minimal.wiz       |   73 -
 plugins/project-wizard/templates/minimal.wiz.in    |   76 +
 .../templates/minimal/configure.ac.tpl             |    3 -
 plugins/project-wizard/templates/mkfile.wiz        |   24 -
 plugins/project-wizard/templates/mkfile.wiz.in     |   26 +
 plugins/project-wizard/templates/python.wiz        |   89 -
 plugins/project-wizard/templates/python.wiz.in     |   91 +
 plugins/project-wizard/templates/sdl.wiz           |   85 -
 plugins/project-wizard/templates/sdl.wiz.in        |   87 +
 .../project-wizard/templates/sdl/configure.ac.tpl  |    3 -
 plugins/project-wizard/templates/terminal.wiz      |   85 -
 plugins/project-wizard/templates/terminal.wiz.in   |   87 +
 .../templates/terminal/configure.ac.tpl            |    3 -
 .../templates/translatable-strings.h               |  115 -
 plugins/project-wizard/templates/wxwin.wiz         |   88 -
 plugins/project-wizard/templates/wxwin.wiz.in      |   90 +
 .../templates/wxwin/configure.ac.tpl               |    3 -
 plugins/project-wizard/templates/xlib-dock.wiz     |   96 -
 plugins/project-wizard/templates/xlib-dock.wiz.in  |   98 +
 plugins/project-wizard/templates/xlib.wiz          |   91 -
 plugins/project-wizard/templates/xlib.wiz.in       |   93 +
 .../project-wizard/templates/xlib/configure.ac.tpl |    3 -
 plugins/search/search-replace_backend.c            |    2 +-
 plugins/symbol-db/anjuta-tags/Makefile.am          |    1 +
 plugins/symbol-db/benchmark/benchmark.c            |    2 +-
 plugins/symbol-db/plugin.c                         |    8 +-
 plugins/symbol-db/symbol-db-engine-core.c          | 1301 +++-
 plugins/symbol-db/symbol-db-engine-core.h          |    5 +-
 plugins/symbol-db/symbol-db-engine-priv.h          |   35 +-
 plugins/symbol-db/tables.sql                       |   11 -
 plugins/tools/execute.c                            |    2 +-
 po/POTFILES.in                                     |   21 +-
 po/en shaw po                                      |  456 +-
 po/es.po                                           | 1252 ++--
 po/gl.po                                           | 1228 ++--
 po/id.po                                           | 7974 ++++++++++----------
 po/nb.po                                           | 2759 ++++----
 src/anjuta-app.c                                   |    4 +-
 src/anjuta.c                                       |    1 +
 src/main.c                                         |    3 +-
 115 files changed, 13126 insertions(+), 9614 deletions(-)
---
diff --cc plugins/symbol-db/symbol-db-engine-core.c
index 6a94740,706d3ee..da28a47
--- a/plugins/symbol-db/symbol-db-engine-core.c
+++ b/plugins/symbol-db/symbol-db-engine-core.c
@@@ -1705,9 -1894,21 +1894,22 @@@ sdb_engine_timeout_trigger_signals (gpo
  		
  				case SCAN_END:
  				{
+ 					/* perform flush on db of the tablemaps, if this is the 1st scan */
+ 					if (priv->is_first_population == TRUE)
+ 					{
+ 						/* ok, set the flag to false. We're done with it */
+ 						priv->is_first_population = FALSE;
+ 					}
+ 
+ 					/* were we forced to use tablemaps? Ok, reset the flag to true */
+ 					if (priv->is_tablemaps_forced == TRUE)
+ 					{
+ 						priv->is_first_population = TRUE;
+ 					}
+ 					
  					/* get the process id from the queue */
  					gint int_tmp = GPOINTER_TO_INT(g_async_queue_pop (priv->scan_process_id_queue));
 +					priv->scanning--;
  					g_signal_emit (dbe, signals[SCAN_END], 0, int_tmp);
  				}
  					break;
@@@ -1978,9 -2178,14 +2179,15 @@@ sdb_engine_scan_files_1 (SymbolDBEngin
  		sdb_engine_ctags_launcher_create (dbe);
  	}
  
 +	priv->scanning++; /* Enter scanning state */
+ 	DEBUG_PRINT ("%s", "EMITTING scan begin.");
  	g_signal_emit_by_name (dbe, "scan-begin",
  	                       anjuta_launcher_get_child_pid (priv->ctags_launcher));
+ 
+ #ifdef DEBUG	
+ 	if (priv->first_scan_timer_DEBUG == NULL)
+ 		priv->first_scan_timer_DEBUG = g_timer_new ();
+ #endif	
  	
  	/* create the shared memory file */
  	if (priv->shared_mem_file == 0)
@@@ -3020,15 -3207,9 +3209,16 @@@ symbol_db_engine_is_connected (SymbolDB
  		gda_connection_is_opened (priv->db_connection );
  }
  
 +gboolean
 +symbol_db_engine_is_scanning (SymbolDBEngine *dbe)
 +{
 +	g_return_val_if_fail (SYMBOL_IS_DB_ENGINE (dbe), FALSE);
 +	return (dbe->priv->scanning > 0);
 +}
 +
  /**
   * Creates required tables for the database to work.
+  * Sets is_first_population flag to TRUE.
   * @param tables_sql_file File containing sql code.
   */
  static gboolean