tracker r1327 - in branches/indexer-split: . src/trackerd
- From: mr svn gnome org
- To: svn-commits-list gnome org
- Subject: tracker r1327 - in branches/indexer-split: . src/trackerd
- Date: Tue, 29 Apr 2008 16:59:00 +0100 (BST)
Author: mr
Date: Tue Apr 29 15:58:59 2008
New Revision: 1327
URL: http://svn.gnome.org/viewvc/tracker?rev=1327&view=rev
Log:
* src/trackerd/Makefile.am:
* src/trackerd/tracker-action.[ch]: Added to handle TrackerAction
type.
* src/trackerd/tracker-db-sqlite.h:
* src/trackerd/tracker-db.[ch]:
* src/trackerd/tracker-dbus-files.c:
* src/trackerd/tracker-fam.c:
* src/trackerd/tracker-inotify.c:
* src/trackerd/tracker-process-files.c:
* src/trackerd/tracker-utils.[ch]:
* src/trackerd/tracker-win-fs-changes.c: Renamed
TrackerChangeAction to TrackerAction and moved it to
tracker-action.[ch].
Added:
branches/indexer-split/src/trackerd/tracker-action.c
branches/indexer-split/src/trackerd/tracker-action.h
Modified:
branches/indexer-split/ChangeLog
branches/indexer-split/src/trackerd/Makefile.am
branches/indexer-split/src/trackerd/tracker-db-sqlite.h
branches/indexer-split/src/trackerd/tracker-db.c
branches/indexer-split/src/trackerd/tracker-db.h
branches/indexer-split/src/trackerd/tracker-dbus-files.c
branches/indexer-split/src/trackerd/tracker-fam.c
branches/indexer-split/src/trackerd/tracker-inotify.c
branches/indexer-split/src/trackerd/tracker-process-files.c
branches/indexer-split/src/trackerd/tracker-utils.c
branches/indexer-split/src/trackerd/tracker-utils.h
branches/indexer-split/src/trackerd/tracker-win-fs-changes.c
Modified: branches/indexer-split/src/trackerd/Makefile.am
==============================================================================
--- branches/indexer-split/src/trackerd/Makefile.am (original)
+++ branches/indexer-split/src/trackerd/Makefile.am Tue Apr 29 15:58:59 2008
@@ -91,6 +91,8 @@
$(hal_sources) \
$(db_sources) \
trackerd.c \
+ tracker-action.c \
+ tracker-action.h \
tracker-apps.c \
tracker-apps.h \
tracker-db.c \
Added: branches/indexer-split/src/trackerd/tracker-action.c
==============================================================================
--- (empty file)
+++ branches/indexer-split/src/trackerd/tracker-action.c Tue Apr 29 15:58:59 2008
@@ -0,0 +1,138 @@
+/* Tracker - indexer and metadata database engine
+ * Copyright (C) 2008, Mr Jamie McCracken (jamiemcc gnome org)
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#include "config.h"
+
+#include "tracker-action.h"
+
+GType
+tracker_action_get_type (void)
+{
+ static GType etype = 0;
+
+ if (etype == 0) {
+ static const GEnumValue values[] = {
+ { TRACKER_ACTION_IGNORE,
+ "TRACKER_ACTION_IGNORE",
+ "Ignoring" },
+ { TRACKER_ACTION_CHECK,
+ "TRACKER_ACTION_CHECK",
+ "Checking" },
+ { TRACKER_ACTION_DELETE,
+ "TRACKER_ACTION_DELETE",
+ "Deleting" },
+ { TRACKER_ACTION_DELETE_SELF,
+ "TRACKER_ACTION_DELETE_SELF",
+ "Deleting Self" },
+ { TRACKER_ACTION_CREATE,
+ "TRACKER_ACTION_CREATE",
+ "Creating" },
+ { TRACKER_ACTION_MOVED_FROM,
+ "TRACKER_ACTION_MOVED_FROM",
+ "Moved From" },
+ { TRACKER_ACTION_MOVED_TO,
+ "TRACKER_ACTION_MOVED_TO",
+ "Moved To" },
+ { TRACKER_ACTION_FILE_CHECK,
+ "TRACKER_ACTION_FILE_CHECK",
+ "File Check" },
+ { TRACKER_ACTION_FILE_CHANGED,
+ "TRACKER_ACTION_FILE_CHANGED",
+ "File Changed" },
+ { TRACKER_ACTION_FILE_DELETED,
+ "TRACKER_ACTION_FILE_DELETED",
+ "File Deleted" },
+ { TRACKER_ACTION_FILE_CREATED,
+ "TRACKER_ACTION_FILE_CREATED",
+ "File Created" },
+ { TRACKER_ACTION_FILE_MOVED_FROM,
+ "TRACKER_ACTION_FILE_MOVED_FROM",
+ "File Moved From" },
+ { TRACKER_ACTION_FILE_MOVED_TO,
+ "TRACKER_ACTION_FILE_MOVED_TO",
+ "File Moved To" },
+ { TRACKER_ACTION_WRITABLE_FILE_CLOSED,
+ "TRACKER_ACTION_WRITABLE_FILE_CLOSED",
+ "Writable File Closed" },
+ { TRACKER_ACTION_DIRECTORY_CHECK,
+ "TRACKER_ACTION_DIRECTORY_CHECK",
+ "Directory Check" },
+ { TRACKER_ACTION_DIRECTORY_CREATED,
+ "TRACKER_ACTION_DIRECTORY_CREATED",
+ "Directory Created" },
+ { TRACKER_ACTION_DIRECTORY_UNMOUNTED,
+ "TRACKER_ACTION_DIRECTORY_UNMOUNTED",
+ "Directory Unmounted" },
+ { TRACKER_ACTION_DIRECTORY_DELETED,
+ "TRACKER_ACTION_DIRECTORY_DELETED",
+ "Directory Deleted" },
+ { TRACKER_ACTION_DIRECTORY_MOVED_FROM,
+ "TRACKER_ACTION_DIRECTORY_MOVED_FROM",
+ "Directory Moved From" },
+ { TRACKER_ACTION_DIRECTORY_MOVED_TO,
+ "TRACKER_ACTION_DIRECTORY_MOVED_TO",
+ "Directory Moved To" },
+ { TRACKER_ACTION_DIRECTORY_REFRESH,
+ "TRACKER_ACTION_DIRECTORY_REFRESH",
+ "Directory Refresh" },
+ { TRACKER_ACTION_EXTRACT_METADATA,
+ "TRACKER_ACTION_EXTRACT_METADATA",
+ "Extract Metadata" },
+ { TRACKER_ACTION_FORCE_REFRESH,
+ "TRACKER_ACTION_FORCE_REFRESH",
+ "Forcing Refresh" },
+ { 0, NULL, NULL }
+ };
+
+ etype = g_enum_register_static ("TrackerAction", values);
+
+ /* Since we don't reference this enum anywhere, we do
+ * it here to make sure it exists when we call
+ * g_type_class_peek(). This wouldn't be necessary if
+ * it was a param in a GObject for example.
+ *
+ * This does mean that we are leaking by 1 reference
+ * here and should clean it up, but it doesn't grow so
+ * this is acceptable.
+ */
+
+ g_type_class_ref (etype);
+ }
+
+ return etype;
+}
+
+const gchar *
+tracker_action_to_string (TrackerAction action)
+{
+ GType type;
+ GEnumClass *enum_class;
+ GEnumValue *enum_value;
+
+ type = tracker_action_get_type ();
+ enum_class = G_ENUM_CLASS (g_type_class_peek (type));
+ enum_value = g_enum_get_value (enum_class, action);
+
+ if (!enum_value) {
+ enum_value = g_enum_get_value (enum_class, TRACKER_ACTION_IGNORE);
+ }
+
+ return enum_value->value_nick;
+}
+
Added: branches/indexer-split/src/trackerd/tracker-action.h
==============================================================================
--- (empty file)
+++ branches/indexer-split/src/trackerd/tracker-action.h Tue Apr 29 15:58:59 2008
@@ -0,0 +1,56 @@
+/* Tracker - indexer and metadata database engine
+ * Copyright (C) 2008, Mr Jamie McCracken (jamiemcc gnome org)
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef __TRACKER_ACTION_H__
+#define __TRACKER_ACTION_H__
+
+#include <glib-object.h>
+
+#define TRACKER_TYPE_ACTION (tracker_action_get_type ())
+
+typedef enum {
+ TRACKER_ACTION_IGNORE,
+ TRACKER_ACTION_CHECK,
+ TRACKER_ACTION_DELETE,
+ TRACKER_ACTION_DELETE_SELF,
+ TRACKER_ACTION_CREATE,
+ TRACKER_ACTION_MOVED_FROM,
+ TRACKER_ACTION_MOVED_TO,
+ TRACKER_ACTION_FILE_CHECK,
+ TRACKER_ACTION_FILE_CHANGED,
+ TRACKER_ACTION_FILE_DELETED,
+ TRACKER_ACTION_FILE_CREATED,
+ TRACKER_ACTION_FILE_MOVED_FROM,
+ TRACKER_ACTION_FILE_MOVED_TO,
+ TRACKER_ACTION_WRITABLE_FILE_CLOSED,
+ TRACKER_ACTION_DIRECTORY_CHECK,
+ TRACKER_ACTION_DIRECTORY_CREATED,
+ TRACKER_ACTION_DIRECTORY_UNMOUNTED,
+ TRACKER_ACTION_DIRECTORY_DELETED,
+ TRACKER_ACTION_DIRECTORY_MOVED_FROM,
+ TRACKER_ACTION_DIRECTORY_MOVED_TO,
+ TRACKER_ACTION_DIRECTORY_REFRESH,
+ TRACKER_ACTION_EXTRACT_METADATA,
+ TRACKER_ACTION_FORCE_REFRESH
+} TrackerAction;
+
+GType tracker_action_get_type (void) G_GNUC_CONST;
+const gchar *tracker_action_to_string (TrackerAction action);
+
+#endif /* __TRACKER_ACTION_H__ */
Modified: branches/indexer-split/src/trackerd/tracker-db-sqlite.h
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-db-sqlite.h (original)
+++ branches/indexer-split/src/trackerd/tracker-db-sqlite.h Tue Apr 29 15:58:59 2008
@@ -161,7 +161,7 @@
void tracker_db_move_directory (DBConnection *db_con, const char *moved_from_uri, const char *moved_to_uri);
guint32 tracker_db_get_file_id (DBConnection *db_con, const char *uri);
-void tracker_db_insert_pending_file (DBConnection *db_con, guint32 file_id, const char *uri, const char *moved_to_uri, const char *mime, int counter, TrackerChangeAction action, gboolean is_directory, gboolean is_new, int service_type_id);
+void tracker_db_insert_pending_file (DBConnection *db_con, guint32 file_id, const char *uri, const char *moved_to_uri, const char *mime, int counter, TrackerAction action, gboolean is_directory, gboolean is_new, int service_type_id);
gboolean tracker_db_has_pending_files (DBConnection *db_con);
gboolean tracker_db_has_pending_metadata (DBConnection *db_con);
Modified: branches/indexer-split/src/trackerd/tracker-db.c
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-db.c (original)
+++ branches/indexer-split/src/trackerd/tracker-db.c Tue Apr 29 15:58:59 2008
@@ -406,7 +406,7 @@
static void
-make_pending_file (DBConnection *db_con, guint32 file_id, const char *uri, const char *moved_to_uri, const char *mime, int counter, TrackerChangeAction action, gboolean is_directory, gboolean is_new, int service_type_id)
+make_pending_file (DBConnection *db_con, guint32 file_id, const char *uri, const char *moved_to_uri, const char *mime, int counter, TrackerAction action, gboolean is_directory, gboolean is_new, int service_type_id)
{
char *str_file_id, *str_action, *str_counter;
@@ -478,7 +478,7 @@
void
-tracker_db_update_pending_file (DBConnection *db_con, const char *uri, int counter, TrackerChangeAction action)
+tracker_db_update_pending_file (DBConnection *db_con, const char *uri, int counter, TrackerAction action)
{
char *str_counter, *str_action;
@@ -685,7 +685,7 @@
}
void
-tracker_db_insert_pending_file (DBConnection *db_con, guint32 file_id, const char *uri, const char *moved_to_uri, const char *mime, int counter, TrackerChangeAction action, gboolean is_directory, gboolean is_new, int service_type_id)
+tracker_db_insert_pending_file (DBConnection *db_con, guint32 file_id, const char *uri, const char *moved_to_uri, const char *mime, int counter, TrackerAction action, gboolean is_directory, gboolean is_new, int service_type_id)
{
FileInfo *info;
Modified: branches/indexer-split/src/trackerd/tracker-db.h
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-db.h (original)
+++ branches/indexer-split/src/trackerd/tracker-db.h Tue Apr 29 15:58:59 2008
@@ -39,7 +39,7 @@
void tracker_db_free_field_def (FieldDef *def);
gboolean tracker_metadata_is_date (DBConnection *db_con, const char *meta);
FileInfo * tracker_db_get_pending_file (DBConnection *db_con, const char *uri);
-void tracker_db_update_pending_file (DBConnection *db_con, const char *uri, int counter, TrackerChangeAction action);
+void tracker_db_update_pending_file (DBConnection *db_con, const char *uri, int counter, TrackerAction action);
void tracker_db_add_to_extract_queue (DBConnection *db_con, FileInfo *info);
gboolean tracker_db_has_pending_files (DBConnection *db_con);
gboolean tracker_db_has_pending_metadata (DBConnection *db_con);
Modified: branches/indexer-split/src/trackerd/tracker-dbus-files.c
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-dbus-files.c (original)
+++ branches/indexer-split/src/trackerd/tracker-dbus-files.c Tue Apr 29 15:58:59 2008
@@ -337,7 +337,7 @@
gchar *name;
gchar *path;
gboolean is_directory;
- TrackerChangeAction action;
+ TrackerAction action;
request_id = tracker_dbus_get_next_request_id ();
Modified: branches/indexer-split/src/trackerd/tracker-fam.c
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-fam.c (original)
+++ branches/indexer-split/src/trackerd/tracker-fam.c Tue Apr 29 15:58:59 2008
@@ -109,7 +109,7 @@
static gboolean
-is_delete_event (TrackerChangeAction event_type)
+is_delete_event (TrackerAction event_type)
{
return (event_type == TRACKER_ACTION_DELETE ||
event_type == TRACKER_ACTION_DELETE_SELF ||
@@ -128,9 +128,9 @@
counter = 1;
while (FAMPending (&fc)) {
- FAMEvent ev;
- DirWatch *watch;
- TrackerChangeAction event_type;
+ FAMEvent ev;
+ DirWatch *watch;
+ TrackerAction event_type;
if (FAMNextEvent (&fc, &ev) != 1) {
tracker_end_watching ();
Modified: branches/indexer-split/src/trackerd/tracker-inotify.c
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-inotify.c (original)
+++ branches/indexer-split/src/trackerd/tracker-inotify.c Tue Apr 29 15:58:59 2008
@@ -38,6 +38,7 @@
#include "tracker-watch.h"
#include "tracker-process-files.h"
+#include "tracker-action.h"
#define INOTIFY_WATCH_LIMIT "/proc/sys/fs/inotify/max_user_watches"
@@ -84,7 +85,7 @@
static gboolean
-is_delete_event (TrackerChangeAction event_type)
+is_delete_event (TrackerAction event_type)
{
return (event_type == TRACKER_ACTION_DELETE ||
event_type == TRACKER_ACTION_DELETE_SELF ||
@@ -95,7 +96,7 @@
static void
-process_event (const char *uri, gboolean is_dir, TrackerChangeAction action, guint32 cookie)
+process_event (const char *uri, gboolean is_dir, TrackerAction action, guint32 cookie)
{
FileInfo *info;
@@ -209,7 +210,9 @@
}
- tracker_log ("WARNING: not processing event %s for uri %s", tracker_actions[info->action], info->uri);
+ tracker_log ("WARNING: not processing event %s for uri %s",
+ tracker_action_to_string (info->action),
+ info->uri);
tracker_free_file_info (info);
}
@@ -261,7 +264,7 @@
}
-static TrackerChangeAction
+static TrackerAction
get_event (guint32 event_type)
{
if (event_type & IN_DELETE) {
@@ -319,10 +322,10 @@
{
while (g_queue_get_length (inotify_queue) > 0) {
TrackerDBResultSet *result_set;
- TrackerChangeAction action_type;
+ TrackerAction action_type;
char *str = NULL, *filename = NULL, *monitor_name = NULL, *str_wd;
char *file_utf8_uri = NULL, *dir_utf8_uri = NULL;
- guint cookie;
+ guint cookie;
struct inotify_event *event;
Modified: branches/indexer-split/src/trackerd/tracker-process-files.c
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-process-files.c (original)
+++ branches/indexer-split/src/trackerd/tracker-process-files.c Tue Apr 29 15:58:59 2008
@@ -1365,7 +1365,7 @@
tracker_debug ("Processing %s with action %s and counter %d ",
info->uri,
- tracker_actions[info->action],
+ tracker_action_to_string (info->action),
info->counter);
/* Preprocess ambiguous actions when we need to work
@@ -1631,9 +1631,9 @@
tracker_status_set (TRACKER_STATUS_PENDING);
while (valid) {
- FileInfo *info_tmp;
- TrackerChangeAction tmp_action;
- gchar *uri;
+ FileInfo *info_tmp;
+ TrackerAction tmp_action;
+ gchar *uri;
if (!tracker->is_running) {
g_object_unref (result_set);
Modified: branches/indexer-split/src/trackerd/tracker-utils.c
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-utils.c (original)
+++ branches/indexer-split/src/trackerd/tracker-utils.c Tue Apr 29 15:58:59 2008
@@ -63,15 +63,6 @@
extern Tracker *tracker;
-char *tracker_actions[] = {
- "TRACKER_ACTION_IGNORE", "TRACKER_ACTION_CHECK", "TRACKER_ACTION_DELETE", "TRACKER_ACTION_DELETE_SELF", "TRACKER_ACTION_CREATE","TRACKER_ACTION_MOVED_FROM",
- "TRACKER_ACTION_MOVED_TO","TRACKER_ACTION_FILE_CHECK", "TRACKER_ACTION_FILE_CHANGED","TRACKER_ACTION_FILE_DELETED", "TRACKER_ACTION_FILE_CREATED",
- "TRACKER_ACTION_FILE_MOVED_FROM", "TRACKER_ACTION_FILE_MOVED_TO", "TRACKER_ACTION_WRITABLE_FILE_CLOSED","TRACKER_ACTION_DIRECTORY_CHECK",
- "TRACKER_ACTION_DIRECTORY_CREATED","TRACKER_ACTION_DIRECTORY_DELETED","TRACKER_ACTION_DIRECTORY_UNMOUNTED", "TRACKER_ACTION_DIRECTORY_MOVED_FROM",
- "TRACKER_ACTION_DIRECTORY_MOVED_TO", "TRACKER_ACTION_DIRECTORY_REFRESH", "TRACKER_ACTION_EXTRACT_METADATA",
- NULL};
-
-
#define ZLIBBUFSIZ 8192
#define TEXT_SNIFF_SIZE 4096
#define MAX_INDEX_FILE_SIZE 2000000000
@@ -79,11 +70,6 @@
static int info_allocated = 0;
static int info_deallocated = 0;
-
-
-
-
-
char *
tracker_get_radix_by_suffix (const char *str, const char *suffix)
{
@@ -269,7 +255,7 @@
FileInfo *
-tracker_create_file_info (const char *uri, TrackerChangeAction action, int counter, WatchTypes watch)
+tracker_create_file_info (const char *uri, TrackerAction action, int counter, WatchTypes watch)
{
FileInfo *info;
@@ -380,7 +366,7 @@
FileInfo *
-tracker_get_pending_file_info (guint32 file_id, const char *uri, const char *mime, int counter, TrackerChangeAction action, gboolean is_directory)
+tracker_get_pending_file_info (guint32 file_id, const char *uri, const char *mime, int counter, TrackerAction action, gboolean is_directory)
{
FileInfo *info;
Modified: branches/indexer-split/src/trackerd/tracker-utils.h
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-utils.h (original)
+++ branches/indexer-split/src/trackerd/tracker-utils.h Tue Apr 29 15:58:59 2008
@@ -28,13 +28,12 @@
extern char *service_metadata_table_names[];
extern char *service_metadata_join_names[];
-extern char *tracker_actions[];
-
#include <time.h>
#include <glib.h>
#include "config.h"
#include "tracker-parser.h"
+#include "tracker-action.h"
#define MAX_HITS_FOR_WORD 30000
@@ -303,45 +302,6 @@
} Tracker;
-
-/* Actions can represent events from FAM/iNotify or be artificially created */
-typedef enum {
-
- TRACKER_ACTION_IGNORE, /* do nothing for this action */
-
- /* actions for when we dont know whether they are on a file or a directory */
- TRACKER_ACTION_CHECK,
- TRACKER_ACTION_DELETE,
- TRACKER_ACTION_DELETE_SELF, /* actual file/dir being watched was deleted */
- TRACKER_ACTION_CREATE,
- TRACKER_ACTION_MOVED_FROM, /* file or dir was moved from (must be a pair with MOVED_TO action)*/
- TRACKER_ACTION_MOVED_TO, /* file or dir was moved to */
-//6
- /* file specific actions */
- TRACKER_ACTION_FILE_CHECK, /* checks file is up to date and indexed */
- TRACKER_ACTION_FILE_CHANGED, /* Inotify must ignore this - see below */
- TRACKER_ACTION_FILE_DELETED,
- TRACKER_ACTION_FILE_CREATED,
- TRACKER_ACTION_FILE_MOVED_FROM,
- TRACKER_ACTION_FILE_MOVED_TO,
- TRACKER_ACTION_WRITABLE_FILE_CLOSED, /* inotify should use this instead of File Changed action*/
-//13
- /* directory specific actions */
- TRACKER_ACTION_DIRECTORY_CHECK,
- TRACKER_ACTION_DIRECTORY_CREATED,
- TRACKER_ACTION_DIRECTORY_DELETED,
- TRACKER_ACTION_DIRECTORY_UNMOUNTED,
- TRACKER_ACTION_DIRECTORY_MOVED_FROM,
- TRACKER_ACTION_DIRECTORY_MOVED_TO,
- TRACKER_ACTION_DIRECTORY_REFRESH, /* re checks all files in folder */
-
- TRACKER_ACTION_EXTRACT_METADATA,
-
- TRACKER_ACTION_FORCE_REFRESH
-
-} TrackerChangeAction;
-
-
/* service type that the file represents */
typedef enum {
FILE_ORDINARY,
@@ -371,7 +331,7 @@
char *uri;
guint32 file_id;
- TrackerChangeAction action;
+ TrackerAction action;
guint32 cookie;
int counter;
FileTypes file_type;
@@ -428,7 +388,7 @@
char * tracker_get_service_for_uri (const char *uri);
gboolean tracker_is_service_file (const char *uri);
-FileInfo * tracker_create_file_info (const char *uri, TrackerChangeAction action, int counter, WatchTypes watch);
+FileInfo * tracker_create_file_info (const char *uri, TrackerAction action, int counter, WatchTypes watch);
FileInfo * tracker_get_file_info (FileInfo *info);
FileInfo * tracker_copy_file_info (FileInfo *info);
FileInfo * tracker_inc_info_ref (FileInfo *info);
Modified: branches/indexer-split/src/trackerd/tracker-win-fs-changes.c
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-win-fs-changes.c (original)
+++ branches/indexer-split/src/trackerd/tracker-win-fs-changes.c Tue Apr 29 15:58:59 2008
@@ -117,11 +117,11 @@
FILE_NOTIFY_INFORMATION *p = (FILE_NOTIFY_INFORMATION *) buffer[callback_dir_id];
- TrackerChangeAction event_type = TRACKER_ACTION_IGNORE;
+ TrackerAction event_type = TRACKER_ACTION_IGNORE;
int counter = 1;
while (p) {
- TrackerChangeAction event_type;
+ TrackerAction event_type;
switch (p->Action) {
case FILE_ACTION_MODIFIED:
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]