[anjuta/sdb-core-trans: 9/14] symbol-db: Get rid of useless queued-multi

[Massimo Cora' <mcora src gnome org>]

commit 48697b775a1d2db9767da7d305c15fd1bf9a29fe
Author: Naba Kumar <naba gnome org>
Date:   Sun Jun 20 00:25:36 2010 +0300

    symbol-db: Get rid of useless queued-multi

 libanjuta/interfaces/libanjuta.idl  |   13 +++++--------
 plugins/symbol-db/symbol-db-query.c |    6 ++----
 2 files changed, 7 insertions(+), 12 deletions(-)
---
diff --git a/libanjuta/interfaces/libanjuta.idl b/libanjuta/interfaces/libanjuta.idl
index abeaf94..8054d45 100644
--- a/libanjuta/interfaces/libanjuta.idl
+++ b/libanjuta/interfaces/libanjuta.idl
@@ -5439,13 +5439,11 @@ interface IAnjutaSymbolQuery
 	 * @IANJUTA_SYMBOL_QUERY_MODE_ASYNC: Asynchronous query. The search call
 	 *     return immediately and result delievered as a signal later. The actual
 	 *     query is done in a separate thread.
-	 * @IANJUTA_SYMBOL_QUERY_MODE_QUEUED_SINGLE: If the database is busy
-	 *     scanning, then return immediately without result, but query is performed
-	 *     later when database is ready and result delivered through signal. Only
-	 *     one query can stay active, so calling search multiple times would
+	 * @IANJUTA_SYMBOL_QUERY_MODE_QUEUED: If the database is busy
+	 *     scanning, then the query is performed later when database is ready.
+	 *     It returns NULL and result is delivered through async-result signal.
+	 *     Only query can stay queued, so calling search multiple times would
 	 *     result in only the last one being active.
-	 * @IANJUTA_SYMBOL_QUERY_MODE_QUEUED_MULTI: Equivalent to
-	 *     #IANJUTA_SYMBOL_QUERY_MODE_QUEUED_SINGLE, but all searches are queued.
 	 *
 	 * This parameter determines the mode of query execution. By default,
 	 * IANJUTA_SYMBOL_QUERY_MODE_SYNC is selected.
@@ -5454,8 +5452,7 @@ interface IAnjutaSymbolQuery
 	{
 		MODE_SYNC,
 		MODE_ASYNC,
-		MODE_QUEUED_SINGLE,
-		MODE_QUEUED_MULTI
+		MODE_QUEUED
 	}
 
 	/**
diff --git a/plugins/symbol-db/symbol-db-query.c b/plugins/symbol-db/symbol-db-query.c
index f9dfc2e..a37dfc1 100644
--- a/plugins/symbol-db/symbol-db-query.c
+++ b/plugins/symbol-db/symbol-db-query.c
@@ -624,7 +624,7 @@ on_sdb_query_dbe_scan_end (SymbolDBEngine *dbe, gint something,
 {
 	g_return_if_fail (SYMBOL_DB_IS_QUERY (query));
 	
-	if (query->priv->mode == IANJUTA_SYMBOL_QUERY_MODE_QUEUED_SINGLE &&
+	if (query->priv->mode == IANJUTA_SYMBOL_QUERY_MODE_QUEUED &&
 	    query->priv->query_queued &&
 	    !symbol_db_engine_is_scanning (query->priv->dbe_system) &&
 	    !symbol_db_engine_is_scanning (query->priv->dbe_project))
@@ -677,12 +677,10 @@ sdb_query_execute (SymbolDBQuery *query)
 			}
 			g_thread_create (sdb_query_async_run, query, FALSE, NULL);
 			return NULL;
-		case IANJUTA_SYMBOL_QUERY_MODE_QUEUED_SINGLE:
+		case IANJUTA_SYMBOL_QUERY_MODE_QUEUED:
 			query->priv->query_queued = TRUE;
 			on_sdb_query_dbe_scan_end (NULL, 0, query);
 			break;
-		case IANJUTA_SYMBOL_QUERY_MODE_QUEUED_MULTI:
-			/* FIXME */
 		default:
 			g_warn_if_reached ();
 	}