tracker r1231 - in trunk: . src/libtracker-common

[mr svn gnome org]

Author: mr
Date: Mon Mar 17 11:02:48 2008
New Revision: 1231
URL: http://svn.gnome.org/viewvc/tracker?rev=1231&view=rev

Log:
	* src/libtracker-common/tracker-log.c:
	(tracker_log_init): Safe guard initialising the tracker log more
	than once. Patch by Ivan Frade.


Modified:
   trunk/ChangeLog
   trunk/src/libtracker-common/tracker-log.c

Modified: trunk/src/libtracker-common/tracker-log.c
==============================================================================
--- trunk/src/libtracker-common/tracker-log.c	(original)
+++ trunk/src/libtracker-common/tracker-log.c	Mon Mar 17 11:02:48 2008
@@ -110,6 +110,11 @@
 {
 	g_return_if_fail (filename != NULL);
 	
+	if (log != NULL) {
+		tracker_error ("Logger already initialized (%s)", log->filename);
+		return;
+	}
+
 	log = g_new0 (TrackerLog, 1);
 
 	log->verbosity = verbosity;
@@ -129,6 +134,9 @@
 	g_free (log->filename);
 
 	g_free (log);
+
+	/* Reset the log pointer so we can re-initialise if we want */
+	log = NULL;
 }
 
 void