tracker-06-upgrade.diff revision 16214
16130N/Adiff -ur tracker-0.6.90-orig/src/libtracker-common/tracker-file-utils.c tracker-0.6.90/src/libtracker-common/tracker-file-utils.c
16130N/A--- tracker-0.6.90-orig/src/libtracker-common/tracker-file-utils.c 2009-02-24 13:33:44.919238000 +0800
16130N/A+++ tracker-0.6.90/src/libtracker-common/tracker-file-utils.c 2009-02-24 13:35:28.945355000 +0800
16130N/A@@ -834,7 +834,6 @@
16130N/A user_data_dir = g_getenv ("XDG_DATA_HOME");
16130N/A
16130N/A /* Check the default XDG_DATA_HOME location */
16130N/A- g_message (" XDG_DATA_HOME is '%s'", user_data_dir);
16130N/A
16130N/A if (user_data_dir && path_has_write_access_or_was_created (user_data_dir)) {
16130N/A return TRUE;
16130N/Adiff -ur tracker-0.6.90-orig/src/libtracker-common/tracker-hal.c tracker-0.6.90/src/libtracker-common/tracker-hal.c
16130N/A--- tracker-0.6.90-orig/src/libtracker-common/tracker-hal.c 2009-02-24 13:33:44.914250000 +0800
16130N/A+++ tracker-0.6.90/src/libtracker-common/tracker-hal.c 2009-02-24 13:42:56.527044000 +0800
16130N/A@@ -589,8 +589,6 @@
16130N/A return "LIBHAL_DRIVE_TYPE_JAZ";
16130N/A case LIBHAL_DRIVE_TYPE_FLASHKEY:
16130N/A return "LIBHAL_DRIVE_TYPE_FLASHKEY";
16130N/A- case LIBHAL_DRIVE_TYPE_MO:
16130N/A- return "LIBHAL_DRIVE_TYPE_MO";
16130N/A default:
16130N/A return "";
16130N/A }
16130N/Adiff -ur tracker-0.6.90-orig/src/tracker-indexer/Makefile.am tracker-0.6.90/src/tracker-indexer/Makefile.am
16130N/A--- tracker-0.6.90-orig/src/tracker-indexer/Makefile.am 2009-02-24 13:33:44.966292000 +0800
16130N/A+++ tracker-0.6.90/src/tracker-indexer/Makefile.am 2009-02-24 13:35:56.192634000 +0800
16130N/A@@ -3,7 +3,7 @@
16130N/A SUBDIRS = modules
16130N/A
16130N/A INCLUDES = \
16130N/A- -Wall \
16130N/A+ -w \
16130N/A -DSHAREDIR=\""$(datadir)"\" \
16130N/A -DLIBDIR=\""$(libdir)"\" \
16130N/A -DLOCALEDIR=\""$(localedir)"\" \
16214N/A
16214N/Adiff -ur tracker-0.6.91-old/src/trackerd/tracker-main.c tracker-0.6.91/src//trackerd/tracker-main.c
16214N/A--- tracker-0.6.91-old/src/trackerd/tracker-main.c Sun Mar 22 10:08:07 2009
16214N/A+++ tracker-0.6.91/src/trackerd/tracker-main.c Sun Mar 22 10:08:45 2009
16214N/A@@ -33,7 +33,9 @@
16214N/A #include <fcntl.h>
16214N/A #include <errno.h>
16214N/A #include <time.h>
16214N/A+#ifdef __linux
16214N/A #include <linux/sched.h>
16214N/A+#endif
16214N/A #include <sched.h>
16214N/A
16214N/A #include <glib.h>
16214N/A
16214N/A--- tracker-0.6.91-old/src/tracker-indexer/tracker-main.c Sun Mar 22 10:08:07 2009
16214N/A+++ tracker-0.6.91/src/tracker-indexer/tracker-main.c Sun Mar 22 10:18:29 2009
16214N/A@@ -26,7 +26,9 @@
16214N/A #include <errno.h>
16214N/A #include <sys/types.h>
16214N/A #include <unistd.h>
16214N/A+#ifdef __linux
16214N/A #include <linux/sched.h>
16214N/A+#endif
16214N/A #include <sched.h>
16214N/A
16214N/A #include <glib.h>
16214N/A
16214N/A--- tracker-0.6.91-old/src/libtracker-common/tracker-hal.c Sun Mar 22 10:08:07 2009
16214N/A+++ tracker-0.6.91/src/libtracker-common/tracker-hal.c Sun Mar 22 10:24:07 2009
16214N/A@@ -353,6 +353,7 @@
16214N/A continue;
16214N/A }
16214N/A
16214N/A+ /*
16214N/A g_debug ("HAL device:'%s' found:\n"
16214N/A " - udi : %s\n"
16214N/A " - mount point: %s\n"
16214N/A@@ -367,6 +368,7 @@
16214N/A libhal_volume_is_mounted (volume) ? "yes" : "no",
16214N/A libhal_volume_get_fstype (volume),
16214N/A libhal_volume_get_label (volume));
16214N/A+ */
16214N/A
16214N/A hal_device_add (hal, volume);
16214N/A libhal_volume_free (volume);
16214N/A--- tracker-0.6.91/src/libtracker-common/tracker-config.c.old Sun Mar 22 11:14:46 2009
16214N/A+++ tracker-0.6.91/src/libtracker-common/tracker-config.c Sun Mar 22 11:19:08 2009
16214N/A@@ -762,6 +762,9 @@
16299N/A const gchar *watch_directory_roots[2] = { NULL, NULL };
16299N/A const gchar *empty_string_list[] = { NULL };
16299N/A
16299N/A+ /* disable evolution index till we fix it */
16299N/A+ const gchar *disabled_modules_list[] = { "evolution" , NULL };
16299N/A+
16299N/A /* Get default values */
16299N/A language = tracker_language_get_default_code ();
16299N/A
16299N/A@@ -872,7 +875,7 @@
16299N/A
16299N/A if (overwrite || !g_key_file_has_key (key_file, GROUP_INDEXING, KEY_DISABLED_MODULES, NULL)) {
16299N/A g_key_file_set_string_list (key_file, GROUP_INDEXING, KEY_DISABLED_MODULES,
16299N/A- empty_string_list, 0);
16299N/A+ disabled_modules_list, 1);
16299N/A g_key_file_set_comment (key_file, GROUP_INDEXING, KEY_DISABLED_MODULES,
16299N/A " List of disabled modules (separator=;)\n"
16299N/A " The modules that are indexed are kept in $prefix/lib/tracker/indexer-modules",
16299N/A