tracker r1221 - in trunk: . src/libtracker-common src/trackerd

[mr svn gnome org]

Author: mr
Date: Mon Mar 10 15:10:08 2008
New Revision: 1221
URL: http://svn.gnome.org/viewvc/tracker?rev=1221&view=rev

Log:
	* src/libtracker-common/tracker-log.c: (tracker_log_term):
	* src/libtracker-common/tracker-log.h:
	* src/trackerd/trackerd.c: Remove the dependency on tracker-config
	by the tracker-log module.


Modified:
   trunk/ChangeLog
   trunk/src/libtracker-common/tracker-log.c
   trunk/src/libtracker-common/tracker-log.h
   trunk/src/trackerd/trackerd.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 10 15:10:08 2008
@@ -41,12 +41,10 @@
 #include "tracker-log.h"
 
 typedef struct {
-	TrackerConfig *config;
-
-	gchar         *filename;
-
-	GMutex        *mutex;
-	gboolean       abort_on_error;
+	GMutex   *mutex;
+	gchar    *filename;
+	gint      verbosity;
+	gboolean  abort_on_error;
 } TrackerLog;
 
 static TrackerLog *log = NULL;
@@ -106,16 +104,15 @@
 }
 
 void
-tracker_log_init (TrackerConfig *config,
-		  const gchar   *filename, 
+tracker_log_init (const gchar   *filename, 
+		  gint           verbosity,
                   gboolean       abort_on_error) 
 {
-	g_return_if_fail (TRACKER_IS_CONFIG (config));
 	g_return_if_fail (filename != NULL);
 	
 	log = g_new0 (TrackerLog, 1);
 
-	log->config = g_object_ref (config);
+	log->verbosity = verbosity;
 
 	log->filename = g_strdup (filename);
 
@@ -131,27 +128,9 @@
 	g_mutex_free (log->mutex);
 	g_free (log->filename);
 
-	g_object_unref (log->config);
-
 	g_free (log);
 }
 
-void 
-tracker_log_set_abort_on_error (gboolean abort) 
-{
-	g_return_if_fail (log != NULL);
-
-	log->abort_on_error = abort;
-}
-
-gboolean
-tracker_log_get_abort_on_error (void) 
-{
-	g_return_val_if_fail (log != NULL, FALSE);
-
-	return log->abort_on_error;
-}
-
 void
 tracker_log (const char *message, ...)
 {
@@ -160,7 +139,7 @@
 
 	g_return_if_fail (log != NULL);
 
-	if (tracker_config_get_verbosity (log->config) < 1) {
+	if (log->verbosity < 1) {
 		return;
 	}
 
@@ -180,7 +159,7 @@
 
 	g_return_if_fail (log != NULL);
 
-	if (tracker_config_get_verbosity (log->config) < 2) {
+	if (log->verbosity < 2) {
 		return;
 	}
 
@@ -200,7 +179,7 @@
 
 	g_return_if_fail (log != NULL);
 
-	if (tracker_config_get_verbosity (log->config) < 3) {
+	if (log->verbosity < 3) {
 		return;
 	}
 

Modified: trunk/src/libtracker-common/tracker-log.h
==============================================================================
--- trunk/src/libtracker-common/tracker-log.h	(original)
+++ trunk/src/libtracker-common/tracker-log.h	Mon Mar 10 15:10:08 2008
@@ -24,16 +24,12 @@
 
 #include <glib.h>
 
-#include "tracker-config.h"
-
 G_BEGIN_DECLS
 
-void     tracker_log_init               (TrackerConfig *config,
-                                         const char    *filename,
+void     tracker_log_init               (const char    *filename,
+					 gint           verbosity, 
                                          gboolean       abort_on_error);
 void     tracker_log_term               (void);
-void     tracker_log_set_abort_on_error (gboolean       abort);
-gboolean tracker_log_get_abort_on_error (void);
 void     tracker_log                    (const char    *message,
                                          ...);
 void     tracker_info                   (const char    *message,

Modified: trunk/src/trackerd/trackerd.c
==============================================================================
--- trunk/src/trackerd/trackerd.c	(original)
+++ trunk/src/trackerd/trackerd.c	Mon Mar 10 15:10:08 2008
@@ -2497,7 +2497,9 @@
 	log_filename = g_build_filename (tracker->root_dir, "tracker.log", NULL);
 	tracker_unlink (log_filename);
 
-	tracker_log_init (tracker->config, log_filename, fatal_errors);
+	tracker_log_init (log_filename, 
+                          tracker_config_get_verbosity (tracker->config), 
+                          fatal_errors);
 	tracker_log ("Starting log");
 
         /* Set up the DBus IPC */