tracker r2751 - in trunk: . src/libinotify src/libtracker src/libtracker-common src/libtracker-data src/libtracker-db src/libtracker-gtk src/tracker-extract src/tracker-indexer src/tracker-indexer/modules src/tracker-utils src/trackerd
- From: pvanhoof svn gnome org
- To: svn-commits-list gnome org
- Subject: tracker r2751 - in trunk: . src/libinotify src/libtracker src/libtracker-common src/libtracker-data src/libtracker-db src/libtracker-gtk src/tracker-extract src/tracker-indexer src/tracker-indexer/modules src/tracker-utils src/trackerd
- Date: Tue, 30 Dec 2008 11:09:01 +0000 (UTC)
Author: pvanhoof
Date: Tue Dec 30 11:09:01 2008
New Revision: 2751
URL: http://svn.gnome.org/viewvc/tracker?rev=2751&view=rev
Log:
2008-12-30 Philip Van Hoof <philip codeminded be>
* src/libtracker/tracker.h
* src/libtracker/tracker.c
* src/tracker-indexer/tracker-dbus.c
* src/tracker-indexer/modules/evolution.c
* src/tracker-indexer/modules/evolution-imap-db.c
* src/tracker-indexer/tracker-indexer.c
* src/tracker-indexer/tracker-module-metadata-utils.c
* src/tracker-utils/tracker-meta-folder.c
* src/libtracker-data/tracker-data-schema.c
* src/libtracker-data/tracker-data-search.c
* src/libtracker-data/tracker-data-query.c
* src/libtracker-data/tracker-rdf-query.c
* src/libtracker-data/tracker-turtle.c
* src/libtracker-data/tracker-xesam-query.c
* src/libtracker-data/tracker-data-update.c
* src/libtracker-data/tracker-query-tree.c
* src/trackerd/tracker-keywords.c
* src/trackerd/tracker-processor.c
* src/trackerd/tracker-main.c
* src/trackerd/tracker-backup.c
* src/trackerd/tracker-monitor.c
* src/trackerd/tracker-cleanup.c
* src/trackerd/tracker-dbus.c
* src/tracker-extract/tracker-albumart.c
* src/tracker-extract/tracker-extract-mp3.c
* src/tracker-extract/tracker-extract-oasis.c
* src/tracker-extract/tracker-extract-ps.c
* src/tracker-extract/tracker-extract-png.c
* src/tracker-extract/tracker-extract-gstreamer.c
* src/libtracker-gtk/tracker-metadata-tile.c
* src/libtracker-db/tracker-db-dbus.c
* src/libtracker-db/tracker-db-interface-sqlite.c
* src/libtracker-db/tracker-db-manager.c
* src/libtracker-db/tracker-db-index-manager.c
* src/libtracker-common/tracker-thumbnailer.c
* src/libtracker-common/tracker-file-utils.c
* src/libtracker-common/tracker-dbus.h
* src/libinotify/inotify-log.h
* src/libinotify/inotify-monitor.c: Compilation warning fixes
Modified:
trunk/ChangeLog
trunk/src/libinotify/inotify-log.h
trunk/src/libinotify/inotify-monitor.c
trunk/src/libtracker-common/tracker-dbus.h
trunk/src/libtracker-common/tracker-file-utils.c
trunk/src/libtracker-common/tracker-thumbnailer.c
trunk/src/libtracker-data/tracker-data-query.c
trunk/src/libtracker-data/tracker-data-schema.c
trunk/src/libtracker-data/tracker-data-search.c
trunk/src/libtracker-data/tracker-data-update.c
trunk/src/libtracker-data/tracker-query-tree.c
trunk/src/libtracker-data/tracker-rdf-query.c
trunk/src/libtracker-data/tracker-turtle.c
trunk/src/libtracker-data/tracker-xesam-query.c
trunk/src/libtracker-db/tracker-db-dbus.c
trunk/src/libtracker-db/tracker-db-index-manager.c
trunk/src/libtracker-db/tracker-db-interface-sqlite.c
trunk/src/libtracker-db/tracker-db-manager.c
trunk/src/libtracker-gtk/tracker-metadata-tile.c
trunk/src/libtracker/tracker.c
trunk/src/libtracker/tracker.h
trunk/src/tracker-extract/tracker-albumart.c
trunk/src/tracker-extract/tracker-extract-gstreamer.c
trunk/src/tracker-extract/tracker-extract-mp3.c
trunk/src/tracker-extract/tracker-extract-oasis.c
trunk/src/tracker-extract/tracker-extract-png.c
trunk/src/tracker-extract/tracker-extract-ps.c
trunk/src/tracker-indexer/modules/evolution-imap-db.c
trunk/src/tracker-indexer/modules/evolution.c
trunk/src/tracker-indexer/tracker-dbus.c
trunk/src/tracker-indexer/tracker-indexer.c
trunk/src/tracker-indexer/tracker-module-metadata-utils.c
trunk/src/tracker-utils/tracker-meta-folder.c
trunk/src/trackerd/tracker-backup.c
trunk/src/trackerd/tracker-cleanup.c
trunk/src/trackerd/tracker-dbus.c
trunk/src/trackerd/tracker-keywords.c
trunk/src/trackerd/tracker-main.c
trunk/src/trackerd/tracker-monitor.c
trunk/src/trackerd/tracker-processor.c
Modified: trunk/src/libinotify/inotify-log.h
==============================================================================
--- trunk/src/libinotify/inotify-log.h (original)
+++ trunk/src/libinotify/inotify-log.h Tue Dec 30 11:09:01 2008
@@ -30,7 +30,7 @@
# define inotify_debug(x, ...) g_log("libinotify", G_LOG_LEVEL_DEBUG, \
x, ## __VA_ARGS__)
#else
-# define inotify_debug(x, ...) 0
+# define inotify_debug(x, ...)
#endif
#define inotify_warn(x, ...) g_log("libinotify", G_LOG_LEVEL_WARNING, \
Modified: trunk/src/libinotify/inotify-monitor.c
==============================================================================
--- trunk/src/libinotify/inotify-monitor.c (original)
+++ trunk/src/libinotify/inotify-monitor.c Tue Dec 30 11:09:01 2008
@@ -257,6 +257,9 @@
inotify_monitor_remove_raw( child );
break;
+ default:
+ break;
+
}
return;
@@ -289,6 +292,8 @@
/* Then unregister our watch with the kernel. */
inotify_monitor_remove_raw( child );
break;
+ default:
+ break;
}
}
@@ -318,17 +323,17 @@
else
{
const char *parent = g_path_get_dirname( filename );
- unsigned long flags;
- guint32 mask;
+ unsigned long lflags;
+ guint32 lmask;
- flags = IN_FLAG_FILE_BASED | IN_FLAG_SYNTH_CREATE;
- mask = IN_MOVED_FROM | IN_MOVED_TO | IN_CREATE | IN_DELETE |
+ lflags = IN_FLAG_FILE_BASED | IN_FLAG_SYNTH_CREATE;
+ lmask = IN_MOVED_FROM | IN_MOVED_TO | IN_CREATE | IN_DELETE |
IN_DELETE_SELF | IN_MOVE_SELF | IN_SYNTHETIC;
inotify_debug( "Adding internal callback %p for %p(%s)",
inotify_internal_callback, inh, parent );
- pinh = inotify_monitor_add( parent, mask, flags,
+ pinh = inotify_monitor_add( parent, lmask, lflags,
inotify_internal_callback, inh );
inotify_handle_set_parent( inh, pinh );
Modified: trunk/src/libtracker-common/tracker-dbus.h
==============================================================================
--- trunk/src/libtracker-common/tracker-dbus.h (original)
+++ trunk/src/libtracker-common/tracker-dbus.h Tue Dec 30 11:09:01 2008
@@ -41,22 +41,22 @@
#define TRACKER_DBUS_ERROR_DOMAIN "TrackerDBus"
#define TRACKER_DBUS_ERROR tracker_dbus_error_quark()
-#define tracker_dbus_async_return_if_fail(expr,context) \
- G_STMT_START { \
- if G_LIKELY(expr) { } else { \
- GError *error = NULL; \
- \
- g_set_error (&error, \
- TRACKER_DBUS_ERROR, \
- 0, \
- _("Assertion `%s' failed"), \
- #expr); \
- \
- dbus_g_method_return_error (context, error); \
- g_clear_error (&error); \
- \
- return; \
- }; \
+#define tracker_dbus_async_return_if_fail(expr,context) \
+ G_STMT_START { \
+ if G_LIKELY(expr) { } else { \
+ GError *assert_error = NULL; \
+ \
+ g_set_error (&assert_error, \
+ TRACKER_DBUS_ERROR, \
+ 0, \
+ _("Assertion `%s' failed"), \
+ #expr); \
+ \
+ dbus_g_method_return_error (context, assert_error); \
+ g_clear_error (&assert_error); \
+ \
+ return; \
+ }; \
} G_STMT_END
#define tracker_dbus_return_val_if_fail(expr,val,error) \
Modified: trunk/src/libtracker-common/tracker-file-utils.c
==============================================================================
--- trunk/src/libtracker-common/tracker-file-utils.c (original)
+++ trunk/src/libtracker-common/tracker-file-utils.c Tue Dec 30 11:09:01 2008
@@ -41,7 +41,7 @@
gint
tracker_file_open (const gchar *uri,
- gboolean readahead)
+ gboolean lreadahead)
{
gint fd;
@@ -60,7 +60,7 @@
}
#ifdef HAVE_POSIX_FADVISE
- if (readahead) {
+ if (lreadahead) {
posix_fadvise (fd, 0, 0, POSIX_FADV_SEQUENTIAL);
} else {
posix_fadvise (fd, 0, 0, POSIX_FADV_RANDOM);
@@ -574,22 +574,22 @@
}
if (basename_exception_prefix) {
- gchar *basename;
+ gchar *lbasename;
gboolean has_prefix = FALSE;
- basename = g_path_get_basename (path);
- if (!g_str_has_prefix (basename, basename_exception_prefix)) {
- g_free (basename);
+ lbasename = g_path_get_basename (path);
+ if (!g_str_has_prefix (lbasename, basename_exception_prefix)) {
+ g_free (lbasename);
- basename = g_path_get_basename (in_path);
- if (g_str_has_prefix (basename, basename_exception_prefix)) {
+ lbasename = g_path_get_basename (in_path);
+ if (g_str_has_prefix (lbasename, basename_exception_prefix)) {
has_prefix = TRUE;
}
} else {
has_prefix = TRUE;
}
- g_free (basename);
+ g_free (lbasename);
/* This is so we can ignore this check
* on files which prefix with ".".
Modified: trunk/src/libtracker-common/tracker-thumbnailer.c
==============================================================================
--- trunk/src/libtracker-common/tracker-thumbnailer.c (original)
+++ trunk/src/libtracker-common/tracker-thumbnailer.c Tue Dec 30 11:09:01 2008
@@ -69,7 +69,7 @@
private_free (gpointer data)
{
TrackerThumbnailerPrivate *private;
- gint i;
+ guint i;
private = data;
Modified: trunk/src/libtracker-data/tracker-data-query.c
==============================================================================
--- trunk/src/libtracker-data/tracker-data-query.c (original)
+++ trunk/src/libtracker-data/tracker-data-query.c Tue Dec 30 11:09:01 2008
@@ -82,6 +82,9 @@
break;
default:
+ case TRACKER_FIELD_TYPE_BLOB:
+ case TRACKER_FIELD_TYPE_STRUCT:
+ case TRACKER_FIELD_TYPE_LINK:
g_warning ("Metadata could not be retrieved as type:%d is not supported",
tracker_field_get_data_type (def));
return NULL;
Modified: trunk/src/libtracker-data/tracker-data-schema.c
==============================================================================
--- trunk/src/libtracker-data/tracker-data-schema.c (original)
+++ trunk/src/libtracker-data/tracker-data-schema.c Tue Dec 30 11:09:01 2008
@@ -190,6 +190,9 @@
return "ServiceKeywordMetaData";
default:
+ case TRACKER_FIELD_TYPE_FULLTEXT:
+ case TRACKER_FIELD_TYPE_STRUCT:
+ case TRACKER_FIELD_TYPE_LINK:
break;
}
Modified: trunk/src/libtracker-data/tracker-data-search.c
==============================================================================
--- trunk/src/libtracker-data/tracker-data-search.c (original)
+++ trunk/src/libtracker-data/tracker-data-search.c Tue Dec 30 11:09:01 2008
@@ -134,26 +134,26 @@
if (result_set) {
gchar *path;
- guint columns, i;
+ guint columns, t;
tracker_db_result_set_get (result_set, 0, &path, -1);
columns = tracker_db_result_set_get_n_columns (result_set);
if (G_UNLIKELY (!result)) {
- guint columns;
+ guint lcolumns;
- columns = tracker_db_result_set_get_n_columns (result_set);
- result = _tracker_db_result_set_new (columns);
+ lcolumns = tracker_db_result_set_get_n_columns (result_set);
+ result = _tracker_db_result_set_new (lcolumns);
}
_tracker_db_result_set_append (result);
- for (i = 0; i < columns; i++) {
+ for (t = 0; t < columns; t++) {
GValue value = { 0, };
- _tracker_db_result_set_get_value (result_set, i, &value);
- _tracker_db_result_set_set_value (result, i, &value);
+ _tracker_db_result_set_get_value (result_set, t, &value);
+ _tracker_db_result_set_set_value (result, t, &value);
g_value_unset (&value);
}
@@ -579,7 +579,7 @@
{
TrackerDBResultSet *result_set;
gint i;
- gchar *service;
+ const gchar *service;
gchar *query;
GString *str;
@@ -1539,7 +1539,7 @@
TrackerDBResultSet *result_set;
const gchar **p;
GString *search;
- GString *select;
+ GString *lselect;
GString *where;
gchar *related_metadata;
gchar *query;
@@ -1569,10 +1569,10 @@
}
/* Create select string */
- select = g_string_new (" Select distinct S.Path || '");
- select = g_string_append (select, G_DIR_SEPARATOR_S);
- select = g_string_append (select,
- "' || S.Name as EntityName from Services AS S, ServiceKeywordMetaData AS M ");
+ lselect = g_string_new (" Select distinct S.Path || '");
+ lselect = g_string_append (lselect, G_DIR_SEPARATOR_S);
+ lselect = g_string_append (lselect,
+ "' || S.Name as EntityName from Services AS S, ServiceKeywordMetaData AS M ");
/* Create where string */
related_metadata = tracker_data_schema_metadata_field_get_related_names (iface, "User:Keywords");
@@ -1597,8 +1597,8 @@
max_hits);
/* Finalize query */
- query = g_strconcat (select->str, where->str, NULL);
- g_string_free (select, TRUE);
+ query = g_strconcat (lselect->str, where->str, NULL);
+ g_string_free (lselect, TRUE);
g_string_free (where, TRUE);
g_debug ("%s", query);
Modified: trunk/src/libtracker-data/tracker-data-update.c
==============================================================================
--- trunk/src/libtracker-data/tracker-data-update.c (original)
+++ trunk/src/libtracker-data/tracker-data-update.c Tue Dec 30 11:09:01 2008
@@ -615,7 +615,7 @@
gpointer value,
ForeachInMetadataInfo *info)
{
- TrackerDBIndex *index;
+ TrackerDBIndex *lindex;
gchar *parsed_value;
gchar **arr;
gint service_id;
@@ -642,10 +642,10 @@
arr = g_strsplit (parsed_value, " ", -1);
service_id = tracker_service_get_id (info->service);
- index = tracker_db_index_manager_get_index_by_service_id (service_id);
+ lindex = tracker_db_index_manager_get_index_by_service_id (service_id);
for (i = 0; arr[i]; i++) {
- tracker_db_index_add_word (index,
+ tracker_db_index_add_word (lindex,
arr[i],
info->iid_value,
tracker_service_get_id (info->service),
Modified: trunk/src/libtracker-data/tracker-query-tree.c
==============================================================================
--- trunk/src/libtracker-data/tracker-query-tree.c (original)
+++ trunk/src/libtracker-data/tracker-query-tree.c Tue Dec 30 11:09:01 2008
@@ -91,8 +91,6 @@
PROP_SERVICES
};
-static void tracker_query_tree_class_init (TrackerQueryTreeClass *class);
-static void tracker_query_tree_init (TrackerQueryTree *tree);
static void tracker_query_tree_finalize (GObject *object);
static void tracker_query_tree_set_property (GObject *object,
guint prop_id,
@@ -373,6 +371,7 @@
last_element_is_term = FALSE;
break;
default:
+ case OP_NONE:
/* search term */
parsed_str = tracker_parser_text_to_string (strings[i],
priv->language,
@@ -406,6 +405,7 @@
g_queue_push_head (stack, node);
break;
default:
+ case OP_NONE:
g_queue_push_head (stack, node);
break;
}
Modified: trunk/src/libtracker-data/tracker-rdf-query.c
==============================================================================
--- trunk/src/libtracker-data/tracker-rdf-query.c (original)
+++ trunk/src/libtracker-data/tracker-rdf-query.c Tue Dec 30 11:09:01 2008
@@ -889,6 +889,7 @@
break;
default:
+ case OP_NONE:
break;
}
@@ -1080,8 +1081,7 @@
data->current_value = g_strstrip (g_strndup (text, text_len));
break;
-
- default :
+ default:
break;
}
}
@@ -1218,7 +1218,7 @@
table = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
- for (keyword=0; keyword<keyword_count; keyword++) {
+ for (keyword = 0; keyword < (guint) keyword_count; keyword++) {
gchar *full;
gchar *sep;
gchar *value;
@@ -1555,7 +1555,7 @@
const gchar *value)
{
TrackerField *field_def;
- gchar *rdf_type = NULL;
+ const gchar *rdf_type = NULL;
gchar *rdf_query;
field_def = tracker_ontology_get_field_by_name (field);
@@ -1578,6 +1578,7 @@
rdf_type = "rdf:Integer";
break;
+ default:
case TRACKER_FIELD_TYPE_BLOB:
case TRACKER_FIELD_TYPE_STRUCT:
case TRACKER_FIELD_TYPE_LINK:
Modified: trunk/src/libtracker-data/tracker-turtle.c
==============================================================================
--- trunk/src/libtracker-data/tracker-turtle.c (original)
+++ trunk/src/libtracker-data/tracker-turtle.c Tue Dec 30 11:09:01 2008
@@ -80,7 +80,7 @@
{
raptor_statement *statement;
TurtleOptimizerInfo *item = user_data;
- const gchar *about_uri = item->last_subject;
+ const guchar *about_uri = (const guchar *) item->last_subject;
raptor_serializer *serializer = item->serializer;
statement = g_new0 (raptor_statement, 1);
@@ -172,7 +172,7 @@
{
raptor_statement *statement;
TrackerTurtleMetadataItem *item = user_data;
- const gchar *about_uri = item->about_uri;
+ const guchar *about_uri = (const guchar *) item->about_uri;
TurtleFile *turtle = item->turtle;
raptor_serializer *serializer = turtle->serializer;
@@ -190,7 +190,7 @@
statement->subject = (void *) raptor_new_uri (about_uri);
statement->subject_type = RAPTOR_IDENTIFIER_TYPE_RESOURCE;
- statement->predicate = (void *) raptor_new_uri (tracker_field_get_name (field));
+ statement->predicate = (void *) raptor_new_uri ((unsigned char *) tracker_field_get_name (field));
statement->predicate_type = RAPTOR_IDENTIFIER_TYPE_RESOURCE;
statement->object = (unsigned char *) g_strdup (value);
@@ -213,11 +213,11 @@
TurtleFile *
tracker_turtle_open (const gchar *turtle_file)
{
- g_return_val_if_fail (initialized, NULL);
-
#ifdef HAVE_RAPTOR
TurtleFile *turtle;
+ g_return_val_if_fail (initialized, NULL);
+
turtle = g_new0 (TurtleFile, 1);
turtle->file = g_fopen (turtle_file, "a");
@@ -226,12 +226,14 @@
turtle->file = g_fopen (turtle_file, "w");
turtle->serializer = raptor_new_serializer ("turtle");
- turtle->uri = raptor_new_uri ("/");
+ turtle->uri = raptor_new_uri ((unsigned char *) "/");
raptor_serialize_start_to_file_handle (turtle->serializer,
turtle->uri, turtle->file);
return turtle;
#else
+ g_return_val_if_fail (initialized, NULL);
+
return NULL;
#endif
}
@@ -321,7 +323,7 @@
void *user_data)
{
#ifdef HAVE_RAPTOR
- unsigned char *uri_string;
+ unsigned char *uri_string;
raptor_uri *uri, *buri;
raptor_parser *parser;
#endif
@@ -340,7 +342,7 @@
uri_string = raptor_uri_filename_to_uri_string (turtle_file);
uri = raptor_new_uri (uri_string);
- buri = raptor_new_uri (base_uri);
+ buri = raptor_new_uri ((unsigned char *) base_uri);
raptor_parse_file (parser, uri, buri);
@@ -384,7 +386,7 @@
info = g_slice_new0 (TurtleOptimizerInfo);
info->serializer = raptor_new_serializer ("turtle");
- suri = raptor_new_uri ("/");
+ suri = raptor_new_uri ((unsigned char *) "/");
base_uri = g_strdup_printf ("file://%s", turtle_file);
Modified: trunk/src/libtracker-data/tracker-xesam-query.c
==============================================================================
--- trunk/src/libtracker-data/tracker-xesam-query.c (original)
+++ trunk/src/libtracker-data/tracker-xesam-query.c Tue Dec 30 11:09:01 2008
@@ -1152,6 +1152,7 @@
break;
default:
+ case OP_NONE:
break;
}
@@ -1384,7 +1385,7 @@
static gboolean inited = FALSE;
ParserData data;
gchar *result;
- gchar *table_name;
+ const gchar *table_name;
g_return_if_fail (TRACKER_IS_DB_INTERFACE (iface));
g_return_if_fail (query != NULL);
Modified: trunk/src/libtracker-db/tracker-db-dbus.c
==============================================================================
--- trunk/src/libtracker-db/tracker-db-dbus.c (original)
+++ trunk/src/libtracker-db/tracker-db-dbus.c Tue Dec 30 11:09:01 2008
@@ -46,9 +46,9 @@
}
static inline void
-row_insert (GPtrArray *row, gchar *value, guint index)
+row_insert (GPtrArray *row, gchar *value, guint lindex)
{
- OneElem *elem = g_ptr_array_index (row, index);
+ OneElem *elem = g_ptr_array_index (row, lindex);
GSList *list = elem->value;
GSList *iter;
Modified: trunk/src/libtracker-db/tracker-db-index-manager.c
==============================================================================
--- trunk/src/libtracker-db/tracker-db-index-manager.c (original)
+++ trunk/src/libtracker-db/tracker-db-index-manager.c Tue Dec 30 11:09:01 2008
@@ -290,6 +290,14 @@
case TRACKER_DB_TYPE_EMAIL:
index_type = TRACKER_DB_INDEX_EMAIL;
break;
+ case TRACKER_DB_TYPE_UNKNOWN:
+ case TRACKER_DB_TYPE_DATA:
+ case TRACKER_DB_TYPE_INDEX:
+ case TRACKER_DB_TYPE_CONTENT:
+ case TRACKER_DB_TYPE_COMMON:
+ case TRACKER_DB_TYPE_XESAM:
+ case TRACKER_DB_TYPE_CACHE:
+ case TRACKER_DB_TYPE_USER:
default:
/* How do we handle XESAM? and others? default to files? */
index_type = TRACKER_DB_INDEX_UNKNOWN;
@@ -322,6 +330,14 @@
case TRACKER_DB_TYPE_EMAIL:
index_type = TRACKER_DB_INDEX_EMAIL;
break;
+ case TRACKER_DB_TYPE_UNKNOWN:
+ case TRACKER_DB_TYPE_DATA:
+ case TRACKER_DB_TYPE_INDEX:
+ case TRACKER_DB_TYPE_CONTENT:
+ case TRACKER_DB_TYPE_COMMON:
+ case TRACKER_DB_TYPE_XESAM:
+ case TRACKER_DB_TYPE_CACHE:
+ case TRACKER_DB_TYPE_USER:
default:
/* How do we handle XESAM? and others? default to files? */
index_type = TRACKER_DB_INDEX_UNKNOWN;
Modified: trunk/src/libtracker-db/tracker-db-interface-sqlite.c
==============================================================================
--- trunk/src/libtracker-db/tracker-db-interface-sqlite.c (original)
+++ trunk/src/libtracker-db/tracker-db-interface-sqlite.c Tue Dec 30 11:09:01 2008
@@ -417,6 +417,8 @@
add_row (result_set, stmt);
break;
+ default:
+ break;
}
}
Modified: trunk/src/libtracker-db/tracker-db-manager.c
==============================================================================
--- trunk/src/libtracker-db/tracker-db-manager.c (original)
+++ trunk/src/libtracker-db/tracker-db-manager.c Tue Dec 30 11:09:01 2008
@@ -598,7 +598,7 @@
load_service_file_xesam_insert (TrackerDBInterface *iface,
const gchar *sql_format,
const gchar *data_to_split,
- const gchar *data_to_insert)
+ const gchar *data_to_insert)
{
gchar **parents;
gchar **parent;
@@ -2774,7 +2774,7 @@
TrackerDBInterface *iface;
TrackerDB db;
gboolean dbs_are_open = FALSE;
- gint i;
+ guint i;
g_return_if_fail (initialized != FALSE);
Modified: trunk/src/libtracker-gtk/tracker-metadata-tile.c
==============================================================================
--- trunk/src/libtracker-gtk/tracker-metadata-tile.c (original)
+++ trunk/src/libtracker-gtk/tracker-metadata-tile.c Tue Dec 30 11:09:01 2008
@@ -92,7 +92,7 @@
/* structs & enums */
-static char *default_keys[] =
+static const char *default_keys[] =
{
"File:Name",
"File:Path",
@@ -113,7 +113,7 @@
DEFAULT_N_KEYS
};
-static char *doc_keys[] =
+static const char *doc_keys[] =
{
"File:Name",
"Doc:Subject",
@@ -138,7 +138,7 @@
-static char *email_keys[] =
+static const char *email_keys[] =
{
"Email:Sender",
"Email:Subject",
@@ -159,7 +159,7 @@
EMAIL_N_KEYS
};
-static char *webhistory_keys[] =
+static const char *webhistory_keys[] =
{
"Doc:URL",
"Doc:Title",
@@ -179,7 +179,7 @@
};
-static char *app_keys[] =
+static const char *app_keys[] =
{
"App:DisplayName",
"App:GenericName",
@@ -197,7 +197,7 @@
};
-static char *audio_keys[] =
+static const char *audio_keys[] =
{
"Audio:Title",
"Audio:Artist",
@@ -224,7 +224,7 @@
AUDIO_N_KEYS
};
-static char *image_keys[] =
+static const char *image_keys[] =
{
"File:Name",
"Image:Height",
@@ -253,7 +253,7 @@
IMAGE_N_KEYS
};
-static char *video_keys[] =
+static const char *video_keys[] =
{
"File:Name",
"Video:Height",
@@ -1043,10 +1043,10 @@
static void
tracker_metadata_tile_show (TrackerMetadataTile *tile)
{
- g_return_if_fail (TRACKER_IS_METADATA_TILE (tile));
-
TrackerMetadataTilePrivate *priv;
+ g_return_if_fail (TRACKER_IS_METADATA_TILE (tile));
+
priv = TRACKER_METADATA_TILE_GET_PRIVATE (tile);
if (priv->expanded) {
@@ -1091,6 +1091,11 @@
GtkStyle *style;
GdkColor step1;
GdkColor step2;
+ cairo_pattern_t *pat;
+ cairo_text_extents_t extents;
+ double x,y;
+ int font_slant = CAIRO_FONT_SLANT_NORMAL;
+ int font_weight = CAIRO_FONT_WEIGHT_NORMAL;
tile = TRACKER_METADATA_TILE (widget);
priv = TRACKER_METADATA_TILE_GET_PRIVATE (tile);
@@ -1110,7 +1115,6 @@
cairo_move_to(cr, 0, 0);
cairo_set_line_width(cr, 1.0);
- cairo_pattern_t *pat;
cairo_set_operator (cr, CAIRO_OPERATOR_OVER);
/* main gradient */
@@ -1158,10 +1162,6 @@
if (priv->type == NULL)
return;
- cairo_text_extents_t extents;
- double x,y;
- int font_slant = CAIRO_FONT_SLANT_NORMAL;
- int font_weight = CAIRO_FONT_WEIGHT_NORMAL;
cairo_select_font_face (cr, "Sans",font_slant, font_weight);
cairo_set_font_size (cr, 40);
Modified: trunk/src/libtracker/tracker.c
==============================================================================
--- trunk/src/libtracker/tracker.c (original)
+++ trunk/src/libtracker/tracker.c Tue Dec 30 11:09:01 2008
@@ -76,43 +76,43 @@
} VoidCallBackStruct;
-char *tracker_service_types[] = {
-"Files",
-"Folders",
-"Documents",
-"Images",
-"Music",
-"Videos",
-"Text",
-"Development",
-"Other",
-"VFS",
-"VFSFolders",
-"VFSDocuments",
-"VFSImages",
-"VFSMusic",
-"VFSVideos",
-"VFSText",
-"VFSDevelopment",
-"VFSOther",
-"Conversations",
-"Playlists",
-"Applications",
-"Contacts",
-"Emails",
-"EmailAttachments",
-"Appointments",
-"Tasks",
-"Bookmarks",
-"WebHistory",
-"Projects",
-NULL
+const char *tracker_service_types[] = {
+ "Files",
+ "Folders",
+ "Documents",
+ "Images",
+ "Music",
+ "Videos",
+ "Text",
+ "Development",
+ "Other",
+ "VFS",
+ "VFSFolders",
+ "VFSDocuments",
+ "VFSImages",
+ "VFSMusic",
+ "VFSVideos",
+ "VFSText",
+ "VFSDevelopment",
+ "VFSOther",
+ "Conversations",
+ "Playlists",
+ "Applications",
+ "Contacts",
+ "Emails",
+ "EmailAttachments",
+ "Appointments",
+ "Tasks",
+ "Bookmarks",
+ "WebHistory",
+ "Projects",
+ NULL
};
-char *metadata_types[] = {
+const char *metadata_types[] = {
"index",
"string",
"numeric",
@@ -124,8 +124,7 @@
ServiceType
tracker_service_name_to_type (const char *service)
{
-
- char **st;
+ const char **st;
int i = 0;
for (st=tracker_service_types; *st; st++) {
@@ -430,12 +429,12 @@
char **
-tracker_metadata_get (TrackerClient *client, ServiceType service, const char *id, char **keys, GError **error)
+tracker_metadata_get (TrackerClient *client, ServiceType service, const char *id, const char **keys, GError **error)
{
char **array = NULL;
- char *service_str = tracker_service_types[service];
+ const char *service_str = tracker_service_types[service];
- if (!org_freedesktop_Tracker_Metadata_get (client->proxy_metadata, service_str, id, (const char **)keys, &array, &*error)) {
+ if (!org_freedesktop_Tracker_Metadata_get (client->proxy_metadata, service_str, id, keys, &array, &*error)) {
return NULL;
}
@@ -445,7 +444,7 @@
GPtrArray *
tracker_metadata_get_all (TrackerClient *client, ServiceType service, const gchar *uri, GError **error)
{
- gchar *service_str = tracker_service_types[service];
+ const gchar *service_str = tracker_service_types[service];
GPtrArray *response = NULL;
if (!org_freedesktop_Tracker_Metadata_get_all (client->proxy_metadata, service_str, uri, &response, &*error)) {
@@ -456,11 +455,11 @@
}
void
-tracker_metadata_set (TrackerClient *client, ServiceType service, const char *id, char **keys, char **values, GError **error)
+tracker_metadata_set (TrackerClient *client, ServiceType service, const char *id, const char **keys, char **values, GError **error)
{
- char *service_str = tracker_service_types[service];
+ const char *service_str = tracker_service_types[service];
- org_freedesktop_Tracker_Metadata_set (client->proxy_metadata, service_str, id, (const char **)keys, (const char **)values, &*error);
+ org_freedesktop_Tracker_Metadata_set (client->proxy_metadata, service_str, id, keys, (const char **)values, &*error);
}
@@ -530,7 +529,7 @@
tracker_metadata_get_unique_values (TrackerClient *client, ServiceType service, char **meta_types, char *query, gboolean descending, int offset, int max_hits, GError **error)
{
GPtrArray *table;
- char *service_str = tracker_service_types[service];
+ const char *service_str = tracker_service_types[service];
if (!org_freedesktop_Tracker_Metadata_get_unique_values (client->proxy_metadata, service_str, (const char **)meta_types, query, descending, offset, max_hits, &table, &*error)) {
return NULL;
@@ -543,8 +542,7 @@
tracker_metadata_get_sum (TrackerClient *client, ServiceType service, char *field, char *query, GError **error)
{
int sum;
-
- char *service_str = tracker_service_types[service];
+ const char *service_str = tracker_service_types[service];
if (!org_freedesktop_Tracker_Metadata_get_sum (client->proxy_metadata, service_str, field, query, &sum, &*error)) {
return -1;
@@ -557,8 +555,7 @@
tracker_metadata_get_count (TrackerClient *client, ServiceType service, char *field, char *query, GError **error)
{
int count;
-
- char *service_str = tracker_service_types[service];
+ const char *service_str = tracker_service_types[service];
if (!org_freedesktop_Tracker_Metadata_get_count (client->proxy_metadata, service_str, field, query, &count, &*error)) {
return -1;
@@ -572,7 +569,7 @@
tracker_metadata_get_unique_values_with_count (TrackerClient *client, ServiceType service, char **meta_types, char *query, char *count, gboolean descending, int offset, int max_hits, GError **error)
{
GPtrArray *table;
- char *service_str = tracker_service_types[service];
+ const char *service_str = tracker_service_types[service];
if (!org_freedesktop_Tracker_Metadata_get_unique_values_with_count (client->proxy_metadata, service_str, (const char **)meta_types, query, count, descending, offset, max_hits, &table, &*error)) {
return NULL;
@@ -585,7 +582,7 @@
tracker_metadata_get_unique_values_with_count_and_sum (TrackerClient *client, ServiceType service, char **meta_types, char *query, char *count, char *sum, gboolean descending, int offset, int max_hits, GError **error)
{
GPtrArray *table;
- char *service_str = tracker_service_types[service];
+ const char *service_str = tracker_service_types[service];
if (!org_freedesktop_Tracker_Metadata_get_unique_values_with_count_and_sum (client->proxy_metadata, service_str, (const char **)meta_types, query, count, sum, descending, offset, max_hits, &table, &*error)) {
return NULL;
@@ -599,7 +596,7 @@
tracker_keywords_get_list (TrackerClient *client, ServiceType service, GError **error)
{
GPtrArray *table;
- char *service_str = tracker_service_types[service];
+ const char *service_str = tracker_service_types[service];
if (!org_freedesktop_Tracker_Keywords_get_list (client->proxy_keywords,service_str, &table, &*error)) {
return NULL;
@@ -615,7 +612,7 @@
tracker_keywords_get (TrackerClient *client, ServiceType service, const char *id, GError **error)
{
char **array = NULL;
- char *service_str = tracker_service_types[service];
+ const char *service_str = tracker_service_types[service];
if (!org_freedesktop_Tracker_Keywords_get (client->proxy_keywords, service_str, id, &array, &*error)) {
return NULL;
@@ -629,7 +626,8 @@
void
tracker_keywords_add (TrackerClient *client, ServiceType service, const char *id, char **values, GError **error)
{
- char *service_str = tracker_service_types[service];
+ const char *service_str = tracker_service_types[service];
+
org_freedesktop_Tracker_Keywords_add (client->proxy_keywords, service_str, id, (const char **)values, &*error);
}
@@ -638,7 +636,7 @@
void
tracker_keywords_remove (TrackerClient *client, ServiceType service, const char *id, char **values, GError **error)
{
- char *service_str = tracker_service_types[service];
+ const char *service_str = tracker_service_types[service];
org_freedesktop_Tracker_Keywords_remove (client->proxy_keywords, service_str, id, (const char **)values, &*error);
}
@@ -648,7 +646,7 @@
void
tracker_keywords_remove_all (TrackerClient *client, ServiceType service, const char *id, GError **error)
{
- char *service_str = tracker_service_types[service];
+ const char *service_str = tracker_service_types[service];
org_freedesktop_Tracker_Keywords_remove_all (client->proxy_keywords, service_str, id, &*error);
}
@@ -658,7 +656,7 @@
tracker_keywords_search (TrackerClient *client, int live_query_id, ServiceType service, char **keywords, int offset, int max_hits, GError **error)
{
char **array = NULL;
- char *service_str = tracker_service_types[service];
+ const char *service_str = tracker_service_types[service];
if (!org_freedesktop_Tracker_Keywords_search (client->proxy_keywords, live_query_id, service_str, (const char **)keywords, offset, max_hits, &array, &*error)) {
return NULL;
@@ -674,7 +672,7 @@
{
int count = 0;
- char *service_str = tracker_service_types[service];
+ const char *service_str = tracker_service_types[service];
if (!org_freedesktop_Tracker_Search_get_hit_count (client->proxy_search, service_str, search_text, &count, &*error)) {
return 0;
@@ -703,7 +701,7 @@
tracker_search_text (TrackerClient *client, int live_query_id, ServiceType service, const char *search_text, int offset, int max_hits, GError **error)
{
char **array = NULL;
- char *service_str = tracker_service_types[service];
+ const char *service_str = tracker_service_types[service];
if (!org_freedesktop_Tracker_Search_text (client->proxy_search, live_query_id, service_str, search_text, offset, max_hits, &array, &*error)) {
return NULL;
@@ -716,7 +714,7 @@
tracker_search_text_detailed (TrackerClient *client, int live_query_id, ServiceType service, const char *search_text, int offset, int max_hits, GError **error)
{
GPtrArray *array;
- char *service_str = tracker_service_types[service];
+ const char *service_str = tracker_service_types[service];
if (!org_freedesktop_Tracker_Search_text_detailed (client->proxy_search, live_query_id, service_str, search_text, offset, max_hits, &array, &*error)) {
return NULL;
@@ -729,7 +727,7 @@
tracker_search_get_snippet (TrackerClient *client, ServiceType service, const char *uri, const char *search_text, GError **error)
{
char *result;
- char *service_str = tracker_service_types[service];
+ const char *service_str = tracker_service_types[service];
if (!org_freedesktop_Tracker_Search_get_snippet (client->proxy_search, service_str, uri, search_text, &result, &*error)) {
return NULL;
@@ -746,7 +744,7 @@
tracker_search_metadata (TrackerClient *client, ServiceType service, const char *field, const char* search_text, int offset, int max_hits, GError **error)
{
char **array = NULL;
- char *service_str = tracker_service_types[service];
+ const char *service_str = tracker_service_types[service];
if (!org_freedesktop_Tracker_Search_metadata (client->proxy_search, service_str, field, search_text, offset, max_hits, &array, &*error)) {
return NULL;
@@ -761,7 +759,7 @@
tracker_search_query (TrackerClient *client, int live_query_id, ServiceType service, char **fields, const char *search_text, char **keywords, const char *query, int offset, int max_hits, gboolean sort_by_service, char **sort_fields, gboolean sort_descending, GError **error)
{
GPtrArray *table;
- char *service_str = tracker_service_types[service];
+ const char *service_str = tracker_service_types[service];
if (!org_freedesktop_Tracker_Search_query (client->proxy_search, live_query_id, service_str, (const char **)fields, search_text, (const char **)keywords, query, sort_by_service, (const char **)sort_fields, sort_descending, offset, max_hits , &table, &*error)) {
return NULL;
@@ -829,7 +827,7 @@
tracker_files_get_by_service_type (TrackerClient *client, int live_query_id, ServiceType service, int offset, int max_hits, GError **error)
{
char **array = NULL;
- char *service_str = tracker_service_types[service];
+ const char *service_str = tracker_service_types[service];
if (!org_freedesktop_Tracker_Files_get_by_service_type (client->proxy_files, live_query_id, service_str, offset, max_hits, &array, &*error)) {
return NULL;
@@ -1070,35 +1068,36 @@
void
-tracker_metadata_get_async (TrackerClient *client, ServiceType service, const char *id, char **keys, TrackerArrayReply callback, gpointer user_data)
+tracker_metadata_get_async (TrackerClient *client, ServiceType service, const char *id, const char **keys, TrackerArrayReply callback, gpointer user_data)
{
ArrayCallBackStruct *callback_struct;
+ const char *service_str;
callback_struct = g_new (ArrayCallBackStruct, 1);
callback_struct->callback = callback;
callback_struct->data = user_data;
- char *service_str = tracker_service_types[service];
+ service_str = tracker_service_types[service];
- client->last_pending_call = org_freedesktop_Tracker_Metadata_get_async (client->proxy_metadata, service_str, id, (const char**)keys, tracker_array_reply, callback_struct);
+ client->last_pending_call = org_freedesktop_Tracker_Metadata_get_async (client->proxy_metadata, service_str, id, keys, tracker_array_reply, callback_struct);
}
void
-tracker_metadata_set_async (TrackerClient *client, ServiceType service, const char *id, char **keys, char **values, TrackerVoidReply callback, gpointer user_data)
+tracker_metadata_set_async (TrackerClient *client, ServiceType service, const char *id, const char **keys, char **values, TrackerVoidReply callback, gpointer user_data)
{
VoidCallBackStruct *callback_struct;
+ const char *service_str;
callback_struct = g_new (VoidCallBackStruct, 1);
callback_struct->callback = callback;
callback_struct->data = user_data;
+ service_str = tracker_service_types[service];
- char *service_str = tracker_service_types[service];
-
- client->last_pending_call = org_freedesktop_Tracker_Metadata_set_async (client->proxy_metadata, service_str, id, (const char **)keys, (const char **)values, tracker_void_reply, callback_struct);
+ client->last_pending_call = org_freedesktop_Tracker_Metadata_set_async (client->proxy_metadata, service_str, id, keys, (const char **)values, tracker_void_reply, callback_struct);
}
@@ -1177,7 +1176,7 @@
{
GPtrArrayCallBackStruct *callback_struct;
- char *service_str = tracker_service_types[service];
+ const char *service_str = tracker_service_types[service];
callback_struct = g_new (GPtrArrayCallBackStruct, 1);
callback_struct->callback = callback;
@@ -1191,7 +1190,7 @@
tracker_metadata_get_sum_async (TrackerClient *client, ServiceType service, char *field, char *query, TrackerIntReply callback, gpointer user_data)
{
IntCallBackStruct *callback_struct;
- char *service_str = tracker_service_types[service];
+ const char *service_str = tracker_service_types[service];
callback_struct = g_new (IntCallBackStruct, 1);
callback_struct->callback = callback;
@@ -1205,7 +1204,7 @@
tracker_metadata_get_count_async (TrackerClient *client, ServiceType service, char *field, char *query, TrackerIntReply callback, gpointer user_data)
{
IntCallBackStruct *callback_struct;
- char *service_str = tracker_service_types[service];
+ const char *service_str = tracker_service_types[service];
callback_struct = g_new (IntCallBackStruct, 1);
callback_struct->callback = callback;
@@ -1219,7 +1218,7 @@
{
GPtrArrayCallBackStruct *callback_struct;
- char *service_str = tracker_service_types[service];
+ const char *service_str = tracker_service_types[service];
callback_struct = g_new (GPtrArrayCallBackStruct, 1);
callback_struct->callback = callback;
@@ -1234,7 +1233,7 @@
{
GPtrArrayCallBackStruct *callback_struct;
- char *service_str = tracker_service_types[service];
+ const char *service_str = tracker_service_types[service];
callback_struct = g_new (GPtrArrayCallBackStruct, 1);
callback_struct->callback = callback;
@@ -1250,13 +1249,14 @@
{
GPtrArrayCallBackStruct *callback_struct;
+ const char *service_str;
callback_struct = g_new (GPtrArrayCallBackStruct, 1);
callback_struct->callback = callback;
callback_struct->data = user_data;
- char *service_str = tracker_service_types[service];
+ service_str = tracker_service_types[service];
client->last_pending_call = org_freedesktop_Tracker_Keywords_get_list_async (client->proxy_keywords, service_str, tracker_GPtrArray_reply, callback_struct);
@@ -1269,12 +1269,13 @@
{
ArrayCallBackStruct *callback_struct;
+ const char *service_str;
callback_struct = g_new (ArrayCallBackStruct, 1);
callback_struct->callback = callback;
callback_struct->data = user_data;
- char *service_str = tracker_service_types[service];
+ service_str = tracker_service_types[service];
client->last_pending_call = org_freedesktop_Tracker_Keywords_get_async (client->proxy_keywords, service_str, id, tracker_array_reply, callback_struct);
@@ -1287,12 +1288,13 @@
{
VoidCallBackStruct *callback_struct;
+ const char *service_str;
callback_struct = g_new (VoidCallBackStruct, 1);
callback_struct->callback = callback;
callback_struct->data = user_data;
- char *service_str = tracker_service_types[service];
+ service_str = tracker_service_types[service];
client->last_pending_call = org_freedesktop_Tracker_Keywords_add_async (client->proxy_keywords, service_str, id, (const char **)values, tracker_void_reply, callback_struct);
}
@@ -1303,12 +1305,13 @@
{
VoidCallBackStruct *callback_struct;
+ const char *service_str;
callback_struct = g_new (VoidCallBackStruct, 1);
callback_struct->callback = callback;
callback_struct->data = user_data;
- char *service_str = tracker_service_types[service];
+ service_str = tracker_service_types[service];
client->last_pending_call = org_freedesktop_Tracker_Keywords_remove_async (client->proxy_keywords, service_str, id, (const char **)values, tracker_void_reply, callback_struct);
}
@@ -1320,12 +1323,13 @@
{
VoidCallBackStruct *callback_struct;
+ const char *service_str;
callback_struct = g_new (VoidCallBackStruct, 1);
callback_struct->callback = callback;
callback_struct->data = user_data;
- char *service_str = tracker_service_types[service];
+ service_str = tracker_service_types[service];
client->last_pending_call = org_freedesktop_Tracker_Keywords_remove_all_async (client->proxy_keywords, service_str, id, tracker_void_reply, callback_struct);
}
@@ -1336,12 +1340,13 @@
{
ArrayCallBackStruct *callback_struct;
+ const char *service_str;
callback_struct = g_new (ArrayCallBackStruct, 1);
callback_struct->callback = callback;
callback_struct->data = user_data;
- char *service_str = tracker_service_types[service];
+ service_str = tracker_service_types[service];
client->last_pending_call = org_freedesktop_Tracker_Keywords_search_async (client->proxy_keywords, live_query_id, service_str, (const char **)keywords, offset, max_hits, tracker_array_reply, callback_struct);
@@ -1351,8 +1356,7 @@
void
tracker_search_text_get_hit_count_async (TrackerClient *client, ServiceType service, const char *search_text, TrackerIntReply callback, gpointer user_data)
{
- char *service_str = tracker_service_types[service];
-
+ const char *service_str = tracker_service_types[service];
IntCallBackStruct *callback_struct;
callback_struct = g_new (IntCallBackStruct, 1);
@@ -1385,12 +1389,13 @@
{
ArrayCallBackStruct *callback_struct;
+ const char *service_str;
callback_struct = g_new (ArrayCallBackStruct, 1);
callback_struct->callback = callback;
callback_struct->data = user_data;
- char *service_str = tracker_service_types[service];
+ service_str = tracker_service_types[service];
client->last_pending_call = org_freedesktop_Tracker_Search_text_async (client->proxy_search, live_query_id, service_str, search_text, offset, max_hits, tracker_array_reply, callback_struct);
@@ -1402,12 +1407,13 @@
{
GPtrArrayCallBackStruct *callback_struct;
+ const char *service_str;
callback_struct = g_new (GPtrArrayCallBackStruct, 1);
callback_struct->callback = callback;
callback_struct->data = user_data;
- char *service_str = tracker_service_types[service];
+ service_str = tracker_service_types[service];
client->last_pending_call = org_freedesktop_Tracker_Search_text_detailed_async (client->proxy_search, live_query_id, service_str, search_text, offset, max_hits, tracker_GPtrArray_reply, callback_struct);
@@ -1418,12 +1424,13 @@
tracker_search_get_snippet_async (TrackerClient *client, ServiceType service, const char *uri, const char *search_text, TrackerStringReply callback, gpointer user_data)
{
StringCallBackStruct *callback_struct;
+ const char *service_str;
callback_struct = g_new (StringCallBackStruct, 1);
callback_struct->callback = callback;
callback_struct->data = user_data;
- char *service_str = tracker_service_types[service];
+ service_str = tracker_service_types[service];
client->last_pending_call = org_freedesktop_Tracker_Search_get_snippet_async (client->proxy_search, service_str, uri, search_text, tracker_string_reply, callback_struct);
@@ -1433,14 +1440,14 @@
void
tracker_search_metadata_async (TrackerClient *client, ServiceType service, const char *field, const char* search_text, int offset, int max_hits, TrackerArrayReply callback, gpointer user_data)
{
-
ArrayCallBackStruct *callback_struct;
+ const char *service_str;
callback_struct = g_new (ArrayCallBackStruct, 1);
callback_struct->callback = callback;
callback_struct->data = user_data;
- char *service_str = tracker_service_types[service];
+ service_str = tracker_service_types[service];
org_freedesktop_Tracker_Search_metadata_async (client->proxy_search, service_str, field, search_text, offset, max_hits, tracker_array_reply, callback_struct);
@@ -1450,12 +1457,13 @@
tracker_search_query_async (TrackerClient *client, int live_query_id, ServiceType service, char **fields, const char *search_text, char **keywords, const char *query, int offset, int max_hits, gboolean sort_by_service, char **sort_fields, gboolean sort_descending, TrackerGPtrArrayReply callback, gpointer user_data)
{
GPtrArrayCallBackStruct *callback_struct;
+ const char *service_str;
callback_struct = g_new (GPtrArrayCallBackStruct, 1);
callback_struct->callback = callback;
callback_struct->data = user_data;
- char *service_str = tracker_service_types[service];
+ service_str = tracker_service_types[service];
client->last_pending_call = org_freedesktop_Tracker_Search_query_async (client->proxy_search, live_query_id, service_str, (const char **)fields, search_text, (const char **)keywords, query, sort_by_service, (const char **)sort_fields, sort_descending, offset, max_hits, tracker_GPtrArray_reply, callback_struct);
@@ -1540,12 +1548,13 @@
tracker_files_get_by_service_type_async (TrackerClient *client, int live_query_id, ServiceType service, int offset, int max_hits, TrackerArrayReply callback, gpointer user_data)
{
ArrayCallBackStruct *callback_struct;
+ const char *service_str;
callback_struct = g_new (ArrayCallBackStruct, 1);
callback_struct->callback = callback;
callback_struct->data = user_data;
- char *service_str = tracker_service_types[service];
+ service_str = tracker_service_types[service];
client->last_pending_call = org_freedesktop_Tracker_Files_get_by_service_type_async (client->proxy_files, live_query_id, service_str, offset, max_hits, tracker_array_reply, callback_struct);
}
@@ -1616,14 +1625,13 @@
tracker_search_metadata_by_text_async (TrackerClient *client, const char *query, TrackerArrayReply callback, gpointer user_data)
{
ArrayCallBackStruct *callback_struct;
+ char *metadata;
+ char *keywords[2];
callback_struct = g_new (ArrayCallBackStruct, 1);
callback_struct->callback = callback;
callback_struct->data = user_data;
- char *metadata;
- char *keywords[2];
-
if (strchr (query, ':') != NULL) {
metadata = strtok ((char *)query, ":");
if(strcoll(metadata,"tag") == 0){
Modified: trunk/src/libtracker/tracker.h
==============================================================================
--- trunk/src/libtracker/tracker.h (original)
+++ trunk/src/libtracker/tracker.h Tue Dec 30 11:09:01 2008
@@ -118,9 +118,9 @@
void tracker_shutdown (TrackerClient *client, gboolean reindex, GError **error);
void tracker_prompt_index_signals (TrackerClient *client, GError **error);
-char ** tracker_metadata_get (TrackerClient *client, ServiceType service, const char *id, char **keys, GError **error);
+char ** tracker_metadata_get (TrackerClient *client, ServiceType service, const char *id, const char **keys, GError **error);
GPtrArray * tracker_metadata_get_all (TrackerClient *client, ServiceType service, const gchar *uri, GError **error);
-void tracker_metadata_set (TrackerClient *client, ServiceType service, const char *id, char **keys, char **values, GError **error);
+void tracker_metadata_set (TrackerClient *client, ServiceType service, const char *id, const char **keys, char **values, GError **error);
void tracker_metadata_register_type (TrackerClient *client, const char *name, MetadataTypes type, GError **error);
MetaDataTypeDetails * tracker_metadata_get_type_details (TrackerClient *client, const char *name, GError **error);
char ** tracker_metadata_get_registered_types (TrackerClient *client, const char *classname, GError **error);
@@ -184,8 +184,8 @@
void tracker_shutdown_async (TrackerClient *client, gboolean reindex, TrackerVoidReply callback, gpointer user_data);
void tracker_prompt_index_signals_async (TrackerClient *client, TrackerVoidReply callback, gpointer user_data);
-void tracker_metadata_get_async (TrackerClient *client, ServiceType service, const char *id, char **keys, TrackerArrayReply callback, gpointer user_data);
-void tracker_metadata_set_async (TrackerClient *client, ServiceType service, const char *id, char **keys, char **values, TrackerVoidReply callback, gpointer user_data);
+void tracker_metadata_get_async (TrackerClient *client, ServiceType service, const char *id, const char **keys, TrackerArrayReply callback, gpointer user_data);
+void tracker_metadata_set_async (TrackerClient *client, ServiceType service, const char *id, const char **keys, char **values, TrackerVoidReply callback, gpointer user_data);
void tracker_metadata_register_type_async (TrackerClient *client, const char *name, MetadataTypes type, TrackerVoidReply callback, gpointer user_data);
void tracker_metadata_get_registered_types_async (TrackerClient *client, const char *classname, TrackerArrayReply callback, gpointer user_data);
void tracker_metadata_get_writeable_types_async (TrackerClient *client, const char *classname, TrackerArrayReply callback, gpointer user_data);
Modified: trunk/src/tracker-extract/tracker-albumart.c
==============================================================================
--- trunk/src/tracker-extract/tracker-albumart.c (original)
+++ trunk/src/tracker-extract/tracker-albumart.c Tue Dec 30 11:09:01 2008
@@ -240,8 +240,6 @@
GList *removable_roots, *l;
gboolean on_removable_device = FALSE;
guint flen;
- gchar **as_uri;
- gchar **hints;
if (!filename)
return;
@@ -571,14 +569,14 @@
if (!a || *a == '\0')
f_a = g_strdup (" ");
else if (strlen (a) == 1)
- f_a = g_strconcat (a, " ");
+ f_a = g_strconcat (a, " ", NULL);
else
f_a = strip_characters (a);
if (!b || *b == '\0')
f_b = g_strdup (" ");
else if (strlen (b) == 1)
- f_b = g_strconcat (b, " ");
+ f_b = g_strconcat (b, " ", NULL);
else
f_b = strip_characters (b);
Modified: trunk/src/tracker-extract/tracker-extract-gstreamer.c
==============================================================================
--- trunk/src/tracker-extract/tracker-extract-gstreamer.c (original)
+++ trunk/src/tracker-extract/tracker-extract-gstreamer.c Tue Dec 30 11:09:01 2008
@@ -276,14 +276,14 @@
switch (msg_type) {
case GST_MESSAGE_ERROR: {
- GstMessage *message = NULL;
+ GstMessage *messag = NULL;
GError *gsterror = NULL;
gchar *debug = NULL;
- gst_message_parse_error (message, &gsterror, &debug);
+ gst_message_parse_error (messag, &gsterror, &debug);
g_warning ("Error: %s (%s)", gsterror->message, debug);
- gst_message_unref (message);
+ gst_message_unref (messag);
g_error_free (gsterror);
g_free (debug);
}
@@ -531,12 +531,12 @@
get_embedded_album_art(MetadataExtractor *extractor)
{
const GValue *value;
- guint index;
+ guint lindex;
- index = 0;
+ lindex = 0;
do {
- value = gst_tag_list_get_value_index (extractor->tagcache, GST_TAG_IMAGE, index);
+ value = gst_tag_list_get_value_index (extractor->tagcache, GST_TAG_IMAGE, lindex);
if (value) {
GstBuffer *buffer;
@@ -563,7 +563,7 @@
gst_object_unref (caps);
- index++;
+ lindex++;
}
} while (value);
}
Modified: trunk/src/tracker-extract/tracker-extract-mp3.c
==============================================================================
--- trunk/src/tracker-extract/tracker-extract-mp3.c (original)
+++ trunk/src/tracker-extract/tracker-extract-mp3.c Tue Dec 30 11:09:01 2008
@@ -54,8 +54,8 @@
#define VBR_THRESHOLD 64
typedef struct {
- gchar *text;
- gchar *type;
+ const gchar *text;
+ const gchar *type;
} Matches;
typedef struct {
@@ -273,7 +273,7 @@
{32000, 16000, 8000}
};
-static TrackerExtractorData data[] = {
+static TrackerExtractorData extractor_data[] = {
{ "audio/mpeg", extract_mp3 },
{ "audio/x-mp3", extract_mp3 },
{ NULL, NULL }
@@ -325,7 +325,7 @@
"ISO-8859-1",
NULL, NULL, NULL);
pos += 30;
- id3->genre = "";
+ id3->genre = (char *) "";
if ((guint) pos[0] < G_N_ELEMENTS (genre_names)) {
id3->genre = g_strdup (genre_names[(unsigned) pos[0]]);
@@ -407,6 +407,8 @@
g_strdup ("2.5"));
mpeg_ver = MPEG_V25;
break;
+ default:
+ break;
}
switch (header&mpeg_layer_mask) {
@@ -421,6 +423,8 @@
break;
case 0:
layer_ver = LAYER_ERR;
+ default:
+ break;
}
if (!layer_ver || !mpeg_ver) {
@@ -1313,12 +1317,12 @@
/* Check that we have the minimum data. FIXME We should not need to do this */
if (!g_hash_table_lookup (metadata, "Audio:Title")) {
- gchar *basename = g_filename_display_basename(filename);
- gchar **parts = g_strsplit (basename, ".", -1);
+ gchar *basenam = g_filename_display_basename(filename);
+ gchar **parts = g_strsplit (basenam, ".", -1);
gchar *title = g_strdup(parts[0]);
g_strfreev (parts);
- g_free (basename);
+ g_free (basenam);
title = g_strdelimit (title, "_", ' ');
title = g_strstrip (title);
@@ -1370,5 +1374,5 @@
TrackerExtractorData *
tracker_get_extractor_data (void)
{
- return data;
+ return extractor_data;
}
Modified: trunk/src/tracker-extract/tracker-extract-oasis.c
==============================================================================
--- trunk/src/tracker-extract/tracker-extract-oasis.c (original)
+++ trunk/src/tracker-extract/tracker-extract-oasis.c Tue Dec 30 11:09:01 2008
@@ -63,7 +63,7 @@
static void extract_oasis (const gchar *filename,
GHashTable *metadata);
-static TrackerExtractorData data[] = {
+static TrackerExtractorData extractor_data[] = {
{ "application/vnd.oasis.opendocument.*", extract_oasis },
{ NULL, NULL }
};
@@ -238,6 +238,7 @@
break;
default:
+ case READ_STATS:
break;
}
}
@@ -245,5 +246,5 @@
TrackerExtractorData *
tracker_get_extractor_data (void)
{
- return data;
+ return extractor_data;
}
Modified: trunk/src/tracker-extract/tracker-extract-png.c
==============================================================================
--- trunk/src/tracker-extract/tracker-extract-png.c (original)
+++ trunk/src/tracker-extract/tracker-extract-png.c Tue Dec 30 11:09:01 2008
@@ -48,8 +48,8 @@
typedef gchar * (*PostProcessor) (gchar *);
typedef struct {
- gchar *name;
- gchar *type;
+ const gchar *name;
+ const gchar *type;
PostProcessor post;
} TagProcessors;
Modified: trunk/src/tracker-extract/tracker-extract-ps.c
==============================================================================
--- trunk/src/tracker-extract/tracker-extract-ps.c (original)
+++ trunk/src/tracker-extract/tracker-extract-ps.c Tue Dec 30 11:09:01 2008
@@ -292,7 +292,7 @@
gchar *gunzipped;
gint fdz;
gint fd;
- gboolean stat;
+ gboolean ptat;
const gchar *argv[4];
fd = g_file_open_tmp ("tracker-extract-ps-gunzipped.XXXXXX",
@@ -309,7 +309,7 @@
argv[2] = filename;
argv[3] = NULL;
- stat = g_spawn_async_with_pipes (g_get_tmp_dir (),
+ ptat = g_spawn_async_with_pipes (g_get_tmp_dir (),
(gchar **) argv,
NULL,
G_SPAWN_SEARCH_PATH | G_SPAWN_STDERR_TO_DEV_NULL,
@@ -321,7 +321,7 @@
NULL,
&error);
- if (!stat) {
+ if (!ptat) {
g_unlink (gunzipped);
g_clear_error (&error);
return;
Modified: trunk/src/tracker-indexer/modules/evolution-imap-db.c
==============================================================================
--- trunk/src/tracker-indexer/modules/evolution-imap-db.c (original)
+++ trunk/src/tracker-indexer/modules/evolution-imap-db.c Tue Dec 30 11:09:01 2008
@@ -322,7 +322,7 @@
-1, &self->stmt, NULL);
if (self->stmt) {
result = sqlite3_step (self->stmt);
- self->cur_message_uid = g_strdup (sqlite3_column_text (self->stmt, 0));
+ self->cur_message_uid = g_strdup ((const gchar *) sqlite3_column_text (self->stmt, 0));
self->cur_message = 1;
}
}
@@ -698,11 +698,11 @@
deleted = sqlite3_column_int (self->stmt, 1);
/* hasattach = sqlite3_column_int (self->stmt, 2); */
- date = g_strdup (sqlite3_column_text (self->stmt, 3));
- subject = g_strdup (sqlite3_column_text (self->stmt, 4));
- from = g_strdup (sqlite3_column_text (self->stmt, 5));
- to = g_strdup (sqlite3_column_text (self->stmt, 6));
- cc = g_strdup (sqlite3_column_text (self->stmt, 7));
+ date = g_strdup ((const gchar *) sqlite3_column_text (self->stmt, 3));
+ subject = g_strdup ((const gchar *) sqlite3_column_text (self->stmt, 4));
+ from = g_strdup ((const gchar *) sqlite3_column_text (self->stmt, 5));
+ to = g_strdup ((const gchar *) sqlite3_column_text (self->stmt, 6));
+ cc = g_strdup ((const gchar *) sqlite3_column_text (self->stmt, 7));
if (!deleted) {
metadata = tracker_module_metadata_new ();
@@ -852,7 +852,7 @@
g_free (self->cur_message_uid);
self->cur_message_uid = NULL;
- self->cur_message_uid = g_strdup (sqlite3_column_text (self->stmt, 0));
+ self->cur_message_uid = g_strdup ((const gchar *) sqlite3_column_text (self->stmt, 0));
sqlite3_step (self->stmt);
self->cur_message++;
Modified: trunk/src/tracker-indexer/modules/evolution.c
==============================================================================
--- trunk/src/tracker-indexer/modules/evolution.c (original)
+++ trunk/src/tracker-indexer/modules/evolution.c Tue Dec 30 11:09:01 2008
@@ -65,17 +65,17 @@
get_mail_storage_type_from_path (const gchar *path)
{
MailStorageType type = MAIL_STORAGE_NONE;
- gchar *basename;
+ gchar *basenam;
- basename = g_path_get_basename (path);
+ basenam = g_path_get_basename (path);
if (g_str_has_prefix (path, local_dir) &&
- strchr (basename, '.') == NULL) {
+ strchr (basenam, '.') == NULL) {
type = MAIL_STORAGE_LOCAL;
} else if (g_str_has_prefix (path, imap_dir)) {
- if (strcmp (basename, "summary") == 0) {
+ if (strcmp (basenam, "summary") == 0) {
type = MAIL_STORAGE_IMAP;
- } else if (strcmp (basename, "folders.db") == 0) {
+ } else if (strcmp (basenam, "folders.db") == 0) {
type = MAIL_STORAGE_IMAP_DB;
}
}
@@ -90,7 +90,7 @@
type = MAIL_STORAGE_NONE;
}
- g_free (basename);
+ g_free (basenam);
return type;
}
Modified: trunk/src/tracker-indexer/tracker-dbus.c
==============================================================================
--- trunk/src/tracker-indexer/tracker-dbus.c (original)
+++ trunk/src/tracker-indexer/tracker-dbus.c Tue Dec 30 11:09:01 2008
@@ -30,7 +30,7 @@
#include "tracker-indexer-glue.h"
static DBusGConnection *connection;
-static DBusGProxy *proxy;
+static DBusGProxy *gproxy;
static gboolean
dbus_register_service (DBusGProxy *proxy,
@@ -114,7 +114,7 @@
return FALSE;
}
- if (proxy) {
+ if (gproxy) {
g_critical ("The DBusGProxy is already set, have we already initialized?");
return FALSE;
}
@@ -131,13 +131,13 @@
/* The definitions below (DBUS_SERVICE_DBUS, etc) are
* predefined for us to just use (dbus_g_proxy_...)
*/
- proxy = dbus_g_proxy_new_for_name (connection,
- DBUS_SERVICE_DBUS,
- DBUS_PATH_DBUS,
- DBUS_INTERFACE_DBUS);
+ gproxy = dbus_g_proxy_new_for_name (connection,
+ DBUS_SERVICE_DBUS,
+ DBUS_PATH_DBUS,
+ DBUS_INTERFACE_DBUS);
/* Register the service name for org.freedesktop.Tracker */
- if (!dbus_register_service (proxy, TRACKER_INDEXER_SERVICE)) {
+ if (!dbus_register_service (gproxy, TRACKER_INDEXER_SERVICE)) {
return FALSE;
}
@@ -148,7 +148,7 @@
tracker_dbus_init (void)
{
/* Don't reinitialize */
- if (connection && proxy) {
+ if (connection && gproxy) {
return TRUE;
}
@@ -163,9 +163,9 @@
void
tracker_dbus_shutdown (void)
{
- if (proxy) {
- g_object_unref (proxy);
- proxy = NULL;
+ if (gproxy) {
+ g_object_unref (gproxy);
+ gproxy = NULL;
}
connection = NULL;
@@ -174,7 +174,7 @@
gboolean
tracker_dbus_register_object (GObject *object)
{
- if (!connection || !proxy) {
+ if (!connection || !gproxy) {
g_critical ("DBus support must be initialized before registering objects!");
return FALSE;
}
@@ -182,7 +182,7 @@
if (TRACKER_IS_INDEXER (object)) {
return dbus_register_object (object,
connection,
- proxy,
+ gproxy,
&dbus_glib_tracker_indexer_object_info,
TRACKER_INDEXER_PATH);
} else {
Modified: trunk/src/tracker-indexer/tracker-indexer.c
==============================================================================
--- trunk/src/tracker-indexer/tracker-indexer.c (original)
+++ trunk/src/tracker-indexer/tracker-indexer.c Tue Dec 30 11:09:01 2008
@@ -876,7 +876,7 @@
tracker_indexer_init (TrackerIndexer *indexer)
{
TrackerIndexerPrivate *priv;
- TrackerDBIndex *index;
+ TrackerDBIndex *lindex;
priv = indexer->private = TRACKER_INDEXER_GET_PRIVATE (indexer);
@@ -923,11 +923,11 @@
tracker_indexer_load_modules (indexer);
/* Set up indexer */
- index = tracker_db_index_manager_get_index (TRACKER_DB_INDEX_FILE);
- priv->file_index = g_object_ref (index);
+ lindex = tracker_db_index_manager_get_index (TRACKER_DB_INDEX_FILE);
+ priv->file_index = g_object_ref (lindex);
- index = tracker_db_index_manager_get_index (TRACKER_DB_INDEX_EMAIL);
- priv->email_index = g_object_ref (index);
+ lindex = tracker_db_index_manager_get_index (TRACKER_DB_INDEX_EMAIL);
+ priv->email_index = g_object_ref (lindex);
/* Set up databases, these pointers are mostly used to
* start/stop transactions, since TrackerDBManager treats
@@ -973,7 +973,7 @@
const gchar *value,
MetadataForeachData *data)
{
- TrackerDBIndex *index;
+ TrackerDBIndex *lindex;
gchar *parsed_value;
gchar **arr;
gint service_id;
@@ -1000,10 +1000,10 @@
arr = g_strsplit (parsed_value, " ", -1);
service_id = tracker_service_get_id (data->service);
- index = tracker_db_index_manager_get_index_by_service_id (service_id);
+ lindex = tracker_db_index_manager_get_index_by_service_id (service_id);
for (i = 0; arr[i]; i++) {
- tracker_db_index_add_word (index,
+ tracker_db_index_add_word (lindex,
arr[i],
data->id,
tracker_service_get_id (data->service),
@@ -1101,7 +1101,7 @@
gboolean full_parsing,
gint weight_factor)
{
- TrackerDBIndex *index;
+ TrackerDBIndex *lindex;
GHashTable *parsed;
GHashTableIter iter;
gpointer key, value;
@@ -1131,10 +1131,10 @@
g_hash_table_iter_init (&iter, parsed);
- index = tracker_db_index_manager_get_index_by_service_id (service_type);
+ lindex = tracker_db_index_manager_get_index_by_service_id (service_type);
while (g_hash_table_iter_next (&iter, &key, &value)) {
- tracker_db_index_add_word (index,
+ tracker_db_index_add_word (lindex,
key,
service_id,
service_type,
@@ -1209,7 +1209,7 @@
gpointer value,
gpointer user_data)
{
- TrackerDBIndex *index;
+ TrackerDBIndex *lindex;
UpdateWordsForeachData *data;
gchar *word;
gint score;
@@ -1219,9 +1219,9 @@
data = user_data;
- index = tracker_db_index_manager_get_index_by_service_id (data->service_type_id);
+ lindex = tracker_db_index_manager_get_index_by_service_id (data->service_type_id);
- tracker_db_index_add_word (index,
+ tracker_db_index_add_word (lindex,
word,
data->service_id,
data->service_type_id,
Modified: trunk/src/tracker-indexer/tracker-module-metadata-utils.c
==============================================================================
--- trunk/src/tracker-indexer/tracker-module-metadata-utils.c (original)
+++ trunk/src/tracker-indexer/tracker-module-metadata-utils.c Tue Dec 30 11:09:01 2008
@@ -383,15 +383,15 @@
if (tracker_field_get_multiple_values (field)) {
GStrv arr;
- guint i;
+ guint t;
arr = g_strsplit (value, "|",-1);
- for (i = 0; arr[i]; i++) {
- if (!g_utf8_validate (arr[i], -1, NULL)) {
- utf_value = g_locale_to_utf8 (arr[i], -1, NULL, NULL, NULL);
+ for (t = 0; arr[t]; t++) {
+ if (!g_utf8_validate (arr[t], -1, NULL)) {
+ utf_value = g_locale_to_utf8 (arr[t], -1, NULL, NULL, NULL);
} else {
- utf_value = g_strdup (arr[i]);
+ utf_value = g_strdup (arr[t]);
}
if (utf_value) {
Modified: trunk/src/tracker-utils/tracker-meta-folder.c
==============================================================================
--- trunk/src/tracker-utils/tracker-meta-folder.c (original)
+++ trunk/src/tracker-utils/tracker-meta-folder.c Tue Dec 30 11:09:01 2008
@@ -91,14 +91,17 @@
{
gchar **meta;
gchar **p;
- gchar **fields;
+ /* Compilaton warning fix Dec. 30 2008
+ * If the global variable was to be used here, then this was wrong
+ * if not, then this variable was unused.
+ * gchar **fields; */
gchar *basename;
gint i;
gint len;
gint cols;
meta = data;
- fields = user_data;
+ /* fields = user_data; */
basename = g_path_get_basename (*meta);
len = g_utf8_strlen (basename, -1);
@@ -112,10 +115,10 @@
basename);
if (len > MAX_FILENAME_WIDTH) {
- gint i = 0;
+ gint t = 0;
g_print ("\n");
- while (i++ < MAX_FILENAME_WIDTH + 2) {
+ while (t++ < MAX_FILENAME_WIDTH + 2) {
g_print (" ");
}
}
Modified: trunk/src/trackerd/tracker-backup.c
==============================================================================
--- trunk/src/trackerd/tracker-backup.c (original)
+++ trunk/src/trackerd/tracker-backup.c Tue Dec 30 11:09:01 2008
@@ -20,16 +20,18 @@
*/
#include "config.h"
-#include "tracker-backup.h"
-
-#include <libtracker-data/tracker-data-query.h>
-#include <libtracker-data/tracker-turtle.h>
#include <glib.h>
+#include <glib/gstdio.h>
#ifdef HAVE_RAPTOR
#include <raptor.h>
#endif
+#include <libtracker-data/tracker-data-query.h>
+#include <libtracker-data/tracker-turtle.h>
+
+#include "tracker-backup.h"
+
/*
* (uri, metadataid, value)
*/
@@ -39,11 +41,9 @@
TrackerField *field;
gint metadata_id;
gboolean valid = TRUE;
- TrackerDataMetadata *metadata;
while (valid) {
GValue transform = {0, };
- GValue value = {0, };
gchar *str = NULL;
gchar *uri;
gchar *service_type;
Modified: trunk/src/trackerd/tracker-cleanup.c
==============================================================================
--- trunk/src/trackerd/tracker-cleanup.c (original)
+++ trunk/src/trackerd/tracker-cleanup.c Tue Dec 30 11:09:01 2008
@@ -24,6 +24,9 @@
#include <libtracker-db/tracker-db-manager.h>
#include <libtracker-data/tracker-data-update.h>
+#include <libtracker-common/tracker-thumbnailer.h>
+
+#include "tracker-cleanup.h"
/* Deals with cleaning up resident data after longer timeouts (days,
* sessions).
Modified: trunk/src/trackerd/tracker-dbus.c
==============================================================================
--- trunk/src/trackerd/tracker-dbus.c (original)
+++ trunk/src/trackerd/tracker-dbus.c Tue Dec 30 11:09:01 2008
@@ -52,7 +52,7 @@
#define INDEXER_PAUSE_TIME_FOR_REQUESTS 10 /* seconds */
static DBusGConnection *connection;
-static DBusGProxy *proxy;
+static DBusGProxy *gproxy;
static DBusGProxy *proxy_for_indexer;
static GSList *objects;
static guint indexer_resume_timeout_id;
@@ -91,7 +91,7 @@
}
static void
-dbus_register_object (DBusGConnection *connection,
+dbus_register_object (DBusGConnection *lconnection,
DBusGProxy *proxy,
GObject *object,
const DBusGObjectInfo *info,
@@ -102,7 +102,7 @@
g_message (" Type:'%s'", G_OBJECT_TYPE_NAME (object));
dbus_g_object_type_install_info (G_OBJECT_TYPE (object), info);
- dbus_g_connection_register_g_object (connection, path, object);
+ dbus_g_connection_register_g_object (lconnection, path, object);
}
static void
@@ -122,7 +122,7 @@
return FALSE;
}
- if (proxy) {
+ if (gproxy) {
g_critical ("The DBusGProxy is already set, have we already initialized?");
return FALSE;
}
@@ -139,19 +139,19 @@
/* The definitions below (DBUS_SERVICE_DBUS, etc) are
* predefined for us to just use (dbus_g_proxy_...)
*/
- proxy = dbus_g_proxy_new_for_name (connection,
- DBUS_SERVICE_DBUS,
- DBUS_PATH_DBUS,
- DBUS_INTERFACE_DBUS);
+ gproxy = dbus_g_proxy_new_for_name (connection,
+ DBUS_SERVICE_DBUS,
+ DBUS_PATH_DBUS,
+ DBUS_INTERFACE_DBUS);
/* Register the service name for org.freedesktop.Tracker */
- if (!dbus_register_service (proxy, TRACKER_DAEMON_SERVICE)) {
+ if (!dbus_register_service (gproxy, TRACKER_DAEMON_SERVICE)) {
return FALSE;
}
/* Register the service name for org.freedesktop.xesam if XESAM is enabled */
if (tracker_config_get_enable_xesam (config)) {
- if (!dbus_register_service (proxy, TRACKER_XESAM_SERVICE)) {
+ if (!dbus_register_service (gproxy, TRACKER_XESAM_SERVICE)) {
return FALSE;
}
}
@@ -297,9 +297,9 @@
objects = NULL;
}
- if (proxy) {
- g_object_unref (proxy);
- proxy = NULL;
+ if (gproxy) {
+ g_object_unref (gproxy);
+ gproxy = NULL;
}
if (proxy_for_indexer) {
@@ -324,7 +324,7 @@
g_return_val_if_fail (TRACKER_IS_DB_INDEX (file_index), FALSE);
g_return_val_if_fail (TRACKER_IS_DB_INDEX (email_index), FALSE);
- if (!connection || !proxy) {
+ if (!connection || !gproxy) {
g_critical ("DBus support must be initialized before registering objects!");
return FALSE;
}
@@ -337,7 +337,7 @@
}
dbus_register_object (connection,
- proxy,
+ gproxy,
G_OBJECT (object),
&dbus_glib_tracker_daemon_object_info,
TRACKER_DAEMON_PATH);
@@ -351,7 +351,7 @@
}
dbus_register_object (connection,
- proxy,
+ gproxy,
G_OBJECT (object),
&dbus_glib_tracker_files_object_info,
TRACKER_FILES_PATH);
@@ -365,7 +365,7 @@
}
dbus_register_object (connection,
- proxy,
+ gproxy,
G_OBJECT (object),
&dbus_glib_tracker_keywords_object_info,
TRACKER_KEYWORDS_PATH);
@@ -379,7 +379,7 @@
}
dbus_register_object (connection,
- proxy,
+ gproxy,
G_OBJECT (object),
&dbus_glib_tracker_metadata_object_info,
TRACKER_METADATA_PATH);
@@ -393,7 +393,7 @@
}
dbus_register_object (connection,
- proxy,
+ gproxy,
G_OBJECT (object),
&dbus_glib_tracker_search_object_info,
TRACKER_SEARCH_PATH);
@@ -408,17 +408,17 @@
}
dbus_register_object (connection,
- proxy,
+ gproxy,
G_OBJECT (object),
&dbus_glib_tracker_xesam_object_info,
TRACKER_XESAM_PATH);
objects = g_slist_prepend (objects, object);
- dbus_g_proxy_add_signal (proxy, "NameOwnerChanged",
+ dbus_g_proxy_add_signal (gproxy, "NameOwnerChanged",
G_TYPE_STRING, G_TYPE_STRING,
G_TYPE_STRING, G_TYPE_INVALID);
- dbus_g_proxy_connect_signal (proxy, "NameOwnerChanged",
+ dbus_g_proxy_connect_signal (gproxy, "NameOwnerChanged",
G_CALLBACK (tracker_xesam_name_owner_changed),
g_object_ref (G_OBJECT (object)),
dbus_name_owner_changed);
Modified: trunk/src/trackerd/tracker-keywords.c
==============================================================================
--- trunk/src/trackerd/tracker-keywords.c (original)
+++ trunk/src/trackerd/tracker-keywords.c Tue Dec 30 11:09:01 2008
@@ -248,6 +248,8 @@
guint request_id;
gchar *id;
GError *actual_error = NULL;
+ gchar **check;
+ gchar *stripped_value;
request_id = tracker_dbus_get_next_request_id ();
@@ -290,9 +292,7 @@
g_error_free (actual_error);
return;
}
-
- gchar **check;
- gchar *stripped_value;
+
for (check = keywords; *check != NULL; check++) {
stripped_value = g_strstrip (g_strdup (*check));
Modified: trunk/src/trackerd/tracker-main.c
==============================================================================
--- trunk/src/trackerd/tracker-main.c (original)
+++ trunk/src/trackerd/tracker-main.c Tue Dec 30 11:09:01 2008
@@ -53,6 +53,8 @@
#include <libtracker-db/tracker-db-index.h>
#include <libtracker-db/tracker-db-index-manager.h>
+#include <libtracker-data/tracker-turtle.h>
+
#include "tracker-crawler.h"
#include "tracker-dbus.h"
#include "tracker-indexer-client.h"
@@ -321,7 +323,6 @@
gpointer user_data)
{
TrackerMainPrivate *private;
- GError *error = NULL;
private = g_static_private_get (&private_key);
@@ -343,7 +344,6 @@
gpointer user_data)
{
TrackerMainPrivate *private;
- GError *error = NULL;
private = g_static_private_get (&private_key);
@@ -1084,6 +1084,8 @@
case TRACKER_RUNNING_MAIN_INSTANCE:
tracker_status_set_is_readonly (FALSE);
break;
+ default:
+ break;
}
if (!initialize_databases ()) {
Modified: trunk/src/trackerd/tracker-monitor.c
==============================================================================
--- trunk/src/trackerd/tracker-monitor.c (original)
+++ trunk/src/trackerd/tracker-monitor.c Tue Dec 30 11:09:01 2008
@@ -733,6 +733,8 @@
key,
is_directory);
break;
+ default:
+ break;
}
#else /* USE_LIBINOTIFY */
g_signal_emit (monitor,
@@ -1066,8 +1068,9 @@
event->file,
is_directory);
break;
+ default:
+ break;
}
-
/* Clean up */
g_hash_table_iter_remove (&iter);
}
@@ -1197,8 +1200,9 @@
is_directory);
break;
+ default:
+ break;
}
-
/* Clean up */
g_hash_table_iter_remove (&iter);
}
@@ -1503,6 +1507,8 @@
* MOVE_TO and MOVE_FROM already.
*/
break;
+ default:
+ break;
}
if (set_up_cache_timeout &&
Modified: trunk/src/trackerd/tracker-processor.c
==============================================================================
--- trunk/src/trackerd/tracker-processor.c (original)
+++ trunk/src/trackerd/tracker-processor.c Tue Dec 30 11:09:01 2008
@@ -30,6 +30,7 @@
#include <libtracker-db/tracker-db-index.h>
#include <libtracker-db/tracker-db-index-manager.h>
+#include <libtracker-db/tracker-db-manager.h>
#include "tracker-processor.h"
#include "tracker-crawler.h"
@@ -466,29 +467,29 @@
crawler = TRACKER_CRAWLER (data);
if (crawler) {
- guint signals;
+ guint lsignals;
- signals = g_signal_handlers_disconnect_matched (crawler,
- G_SIGNAL_MATCH_FUNC,
- 0,
- 0,
- NULL,
- G_CALLBACK (crawler_processing_file_cb),
- NULL);
- signals = g_signal_handlers_disconnect_matched (crawler,
- G_SIGNAL_MATCH_FUNC,
- 0,
- 0,
- NULL,
- G_CALLBACK (crawler_processing_directory_cb),
- NULL);
- signals = g_signal_handlers_disconnect_matched (crawler,
- G_SIGNAL_MATCH_FUNC,
- 0,
- 0,
- NULL,
- G_CALLBACK (crawler_finished_cb),
- NULL);
+ lsignals = g_signal_handlers_disconnect_matched (crawler,
+ G_SIGNAL_MATCH_FUNC,
+ 0,
+ 0,
+ NULL,
+ G_CALLBACK (crawler_processing_file_cb),
+ NULL);
+ lsignals = g_signal_handlers_disconnect_matched (crawler,
+ G_SIGNAL_MATCH_FUNC,
+ 0,
+ 0,
+ NULL,
+ G_CALLBACK (crawler_processing_directory_cb),
+ NULL);
+ lsignals = g_signal_handlers_disconnect_matched (crawler,
+ G_SIGNAL_MATCH_FUNC,
+ 0,
+ 0,
+ NULL,
+ G_CALLBACK (crawler_finished_cb),
+ NULL);
g_object_unref (crawler);
}
@@ -1005,7 +1006,7 @@
gpointer user_data)
{
TrackerProcessor *processor;
- TrackerDBIndex *index;
+ TrackerDBIndex *lindex;
GQueue *queue;
GFile *file;
gchar *path = NULL;
@@ -1046,11 +1047,11 @@
* module_name->index type so we don't do this for both
* every time:
*/
- index = tracker_db_index_manager_get_index (TRACKER_DB_INDEX_FILE);
- tracker_db_index_set_reload (index, TRUE);
+ lindex = tracker_db_index_manager_get_index (TRACKER_DB_INDEX_FILE);
+ tracker_db_index_set_reload (lindex, TRUE);
- index = tracker_db_index_manager_get_index (TRACKER_DB_INDEX_EMAIL);
- tracker_db_index_set_reload (index, TRUE);
+ lindex = tracker_db_index_manager_get_index (TRACKER_DB_INDEX_EMAIL);
+ tracker_db_index_set_reload (lindex, TRUE);
/* Message to the console about state */
str1 = tracker_seconds_estimate_to_string (seconds_elapsed,
@@ -1078,7 +1079,7 @@
gpointer user_data)
{
TrackerProcessor *processor;
- TrackerDBIndex *index;
+ TrackerDBIndex *lindex;
GObject *object;
gchar *str;
@@ -1103,11 +1104,11 @@
* module_name->index type so we don't do this for both
* every time:
*/
- index = tracker_db_index_manager_get_index (TRACKER_DB_INDEX_FILE);
- tracker_db_index_set_reload (index, TRUE);
+ lindex = tracker_db_index_manager_get_index (TRACKER_DB_INDEX_FILE);
+ tracker_db_index_set_reload (lindex, TRUE);
- index = tracker_db_index_manager_get_index (TRACKER_DB_INDEX_EMAIL);
- tracker_db_index_set_reload (index, TRUE);
+ lindex = tracker_db_index_manager_get_index (TRACKER_DB_INDEX_EMAIL);
+ tracker_db_index_set_reload (lindex, TRUE);
/* Message to the console about state */
str = tracker_seconds_to_string (seconds_elapsed, FALSE);
@@ -1447,7 +1448,6 @@
{
TrackerProcessor *processor;
GFile *file;
- const gchar *module_name = "files";
processor = user_data;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
