tracker r3072 - in trunk: . src/trackerd

[mr svn gnome org]

Author: mr
Date: Fri Mar 13 11:21:44 2009
New Revision: 3072
URL: http://svn.gnome.org/viewvc/tracker?rev=3072&view=rev

Log:
	* src/trackerd/Makefile.am:
	* src/trackerd/tracker-cleanup.[ch]:
	* src/trackerd/tracker-main.c:
	* src/trackerd/tracker-volume-cleanup.[ch]: Renamed
	tracker-cleanup to tracker-volume-cleanup so the name makes more sense.


Added:
   trunk/src/trackerd/tracker-volume-cleanup.c   (contents, props changed)
      - copied, changed from r3071, /trunk/src/trackerd/tracker-cleanup.c
   trunk/src/trackerd/tracker-volume-cleanup.h   (contents, props changed)
      - copied, changed from r3070, /trunk/src/trackerd/tracker-cleanup.h
Removed:
   trunk/src/trackerd/tracker-cleanup.c
   trunk/src/trackerd/tracker-cleanup.h
Modified:
   trunk/ChangeLog
   trunk/src/trackerd/Makefile.am
   trunk/src/trackerd/tracker-main.c

Modified: trunk/src/trackerd/Makefile.am
==============================================================================
--- trunk/src/trackerd/Makefile.am	(original)
+++ trunk/src/trackerd/Makefile.am	Fri Mar 13 11:21:44 2009
@@ -60,8 +60,8 @@
 	tracker-status.h						\
 	tracker-utils.c							\
 	tracker-utils.h							\
-	tracker-cleanup.c						\
-	tracker-cleanup.h						\
+	tracker-volume-cleanup.c					\
+	tracker-volume-cleanup.h					\
 	tracker-push.c							\
 	tracker-push.h							\
 	tracker-push-registrar.c					\

Modified: trunk/src/trackerd/tracker-main.c
==============================================================================
--- trunk/src/trackerd/tracker-main.c	(original)
+++ trunk/src/trackerd/tracker-main.c	Fri Mar 13 11:21:44 2009
@@ -68,7 +68,7 @@
 #include "tracker-monitor.h"
 #include "tracker-processor.h"
 #include "tracker-status.h"
-#include "tracker-cleanup.h"
+#include "tracker-volume-cleanup.h"
 #include "tracker-backup.h"
 #include "tracker-daemon.h"
 
@@ -1095,7 +1095,7 @@
 	}
 
 	tracker_data_manager_init (config, language, file_index, email_index);
-	tracker_cleanup_init ();
+	tracker_volume_cleanup_init ();
 
 #ifdef HAVE_HAL
 	/* We set up the throttle and mount points here. For the mount
@@ -1182,7 +1182,7 @@
 
 	tracker_push_shutdown ();
 
-	tracker_cleanup_shutdown ();
+	tracker_volume_cleanup_shutdown ();
 	tracker_dbus_shutdown ();
 	tracker_db_manager_shutdown ();
 	tracker_db_index_manager_shutdown ();

Copied: trunk/src/trackerd/tracker-volume-cleanup.c (from r3071, /trunk/src/trackerd/tracker-cleanup.c)
==============================================================================
--- /trunk/src/trackerd/tracker-cleanup.c	(original)
+++ trunk/src/trackerd/tracker-volume-cleanup.c	Fri Mar 13 11:21:44 2009
@@ -28,7 +28,7 @@
 #include <libtracker-data/tracker-data-update.h>
 #include <libtracker-common/tracker-thumbnailer.h>
 
-#include "tracker-cleanup.h"
+#include "tracker-volume-cleanup.h"
 
 /* Deals with cleaning up resident data after longer timeouts (days,
  * sessions).
@@ -41,6 +41,20 @@
 
 static GStaticPrivate private_key = G_STATIC_PRIVATE_INIT;
 
+static void
+private_free (gpointer data)
+{
+	TrackerCleanupPrivate *private;
+
+	private = data;
+
+	if (private->timeout_id) {
+		g_source_remove (private->timeout_id);
+	}
+
+	g_free (private);
+}
+
 static gboolean
 check_for_volumes_to_cleanup (gpointer user_data)
 {
@@ -95,22 +109,8 @@
 	return TRUE;
 }
 
-static void
-private_free (gpointer data)
-{
-	TrackerCleanupPrivate *private;
-
-	private = data;
-
-	if (private->timeout_id) {
-		g_source_remove (private->timeout_id);
-	}
-
-	g_free (private);
-}
-
 void 
-tracker_cleanup_init (void)
+tracker_volume_cleanup_init (void)
 {
 	TrackerCleanupPrivate *private;
 
@@ -133,7 +133,7 @@
 }
 
 void 
-tracker_cleanup_shutdown (void)
+tracker_volume_cleanup_shutdown (void)
 {
 	g_static_private_set (&private_key, NULL, NULL);
 }

Copied: trunk/src/trackerd/tracker-volume-cleanup.h (from r3070, /trunk/src/trackerd/tracker-cleanup.h)
==============================================================================
--- /trunk/src/trackerd/tracker-cleanup.h	(original)
+++ trunk/src/trackerd/tracker-volume-cleanup.h	Fri Mar 13 11:21:44 2009
@@ -18,14 +18,14 @@
  * Boston, MA  02110-1301, USA.
  */
 
-#ifndef __TRACKERD_CLEANUP_H__
-#define __TRACKERD_CLEANUP_H__
+#ifndef __TRACKERD_VOLUME_CLEANUP_H__
+#define __TRACKERD_VOLUME_CLEANUP_H__
 
 G_BEGIN_DECLS
 
-void tracker_cleanup_init     (void);
-void tracker_cleanup_shutdown (void);
+void tracker_volume_cleanup_init     (void);
+void tracker_volume_cleanup_shutdown (void);
 
 G_END_DECLS
 
-#endif /* __TRACKERD_CLEANUP_H__ */
+#endif /* __TRACKERD_VOLUME_CLEANUP_H__ */