[anjuta: 39/40] symbol-db: misc fixes.

[Massimo Cora' <mcora src gnome org>]

commit bb605a26600a9a6d124d1b7aaec8a00c916cd2ed
Author: Massimo Corà <mcora src gnome org>
Date:   Mon Jul 12 17:09:21 2010 +0200

    symbol-db: misc fixes.

 plugins/symbol-db/plugin.c                |   10 ++++------
 plugins/symbol-db/symbol-db-engine-core.c |    4 ----
 plugins/symbol-db/symbol-db-model.c       |    8 +++++---
 plugins/symbol-db/symbol-db-query.c       |   14 ++++++++++----
 4 files changed, 19 insertions(+), 17 deletions(-)
---
diff --git a/plugins/symbol-db/plugin.c b/plugins/symbol-db/plugin.c
index 138ed63..0ab5a2c 100644
--- a/plugins/symbol-db/plugin.c
+++ b/plugins/symbol-db/plugin.c
@@ -1367,18 +1367,16 @@ do_check_offline_files_changed (SymbolDBPlugin *sdb_plugin)
 		if ((filename = g_file_get_path (gfile)) == NULL || 
 			g_strcmp0 (filename, "") == 0)
 		{
-			g_object_unref (gfile);
-			/* FIXME here */
-			/*DEBUG_PRINT ("hey, filename (uri %s) is NULL", uri);*/
+			if (gfile)
+				g_object_unref (gfile);
 			continue;
 		}
 		
 		/* test its existence */
 		if (g_file_query_exists (gfile, NULL) == FALSE) 
 		{
-			/* FIXME here */
-			/*DEBUG_PRINT ("hey, filename %s (uri %s) does NOT exist", filename, uri);*/
-			g_object_unref (gfile);
+			if (gfile)
+				g_object_unref (gfile);
 			continue;
 		}
 
diff --git a/plugins/symbol-db/symbol-db-engine-core.c b/plugins/symbol-db/symbol-db-engine-core.c
index 006624d..582ae45 100644
--- a/plugins/symbol-db/symbol-db-engine-core.c
+++ b/plugins/symbol-db/symbol-db-engine-core.c
@@ -1044,10 +1044,6 @@ sdb_engine_timeout_trigger_signals (gpointer user_data)
 		gpointer sign = NULL;
 		gsize real_signal;
 
-
-
-
-		
 		while (priv->signals_queue != NULL &&  
 		    (sign = g_async_queue_try_pop (priv->signals_queue)) != NULL)  
 		{
diff --git a/plugins/symbol-db/symbol-db-model.c b/plugins/symbol-db/symbol-db-model.c
index 6236417..a8348e0 100644
--- a/plugins/symbol-db/symbol-db-model.c
+++ b/plugins/symbol-db/symbol-db-model.c
@@ -569,9 +569,11 @@ sdb_model_page_fault (SymbolDBModel *model,
 			}
 		}
 	}
-	
-	g_object_unref (data_iter);
-	g_object_unref (data_model);
+
+	if (data_iter)
+		g_object_unref (data_iter);
+	if (data_model)
+		g_object_unref (data_model);
 	return page;
 }
 
diff --git a/plugins/symbol-db/symbol-db-query.c b/plugins/symbol-db/symbol-db-query.c
index 0b84451..5a5ca9c 100644
--- a/plugins/symbol-db/symbol-db-query.c
+++ b/plugins/symbol-db/symbol-db-query.c
@@ -463,7 +463,8 @@ sdb_query_update (SymbolDBQuery *query)
 	/* Prepare statement */
 	g_free (priv->sql_stmt);
 	priv->sql_stmt = sql->str;
-	if (priv->stmt) g_object_unref (priv->stmt);
+	if (priv->stmt) 
+		g_object_unref (priv->stmt);
 
 	/* If database is not connected, defer the statement compilation for later,
 	 * otherwise compile it now.
@@ -525,11 +526,15 @@ sdb_query_handle_result (SymbolDBQuery *query, SymbolDBQueryResult *result)
 	}
 	else
 	{
-		if (symbol_db_query_result_is_empty (result))
+		if (result == NULL || symbol_db_query_result_is_empty (result))
+		{
 			g_signal_emit_by_name (query, "async-result", NULL);
+		}
 		else
+		{			
 			g_signal_emit_by_name (query, "async-result", result);
-		g_object_unref (result);
+			g_object_unref (result);
+		}
 	}
 }
 
@@ -668,7 +673,8 @@ sdb_query_execute (SymbolDBQuery *query)
 			/* Empty resultset is useless for us. Return NULL instead */
 			if (result == NULL || symbol_db_query_result_is_empty (result))
 			{
-				g_object_unref (result);
+				if (result != NULL)
+					g_object_unref (result);
 				return NULL;
 			}
 			return IANJUTA_ITERABLE (result);