[tracker] libtracker-common: Clean up source
- From: Martyn James Russell <mr src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [tracker] libtracker-common: Clean up source
- Date: Tue, 6 Oct 2009 14:26:30 +0000 (UTC)
commit dad86c0fcf46d552490fc14b4684073fd96c0ee1
Author: Martyn Russell <martyn lanedo com>
Date: Tue Oct 6 15:26:08 2009 +0100
libtracker-common: Clean up source
This involved:
- Copyright updates (dates/email addresses)
- Header alignments
- Consistent #ifndef statements
- Including config.h in .c files.
- Adding missing #error statements for single header includes
- Adding missing headers to tracker-common.h
- Moving common DBUS #defines to tracker-dbus.h
src/libtracker-common/tracker-class.c | 46 +-
src/libtracker-common/tracker-class.h | 41 +-
src/libtracker-common/tracker-common.h | 9 +-
src/libtracker-common/tracker-config-file.h | 22 +-
src/libtracker-common/tracker-dbus.c | 5 +-
src/libtracker-common/tracker-dbus.h | 61 +-
src/libtracker-common/tracker-file-utils.c | 5 +-
src/libtracker-common/tracker-file-utils.h | 16 +-
src/libtracker-common/tracker-ioprio.h | 7 +-
src/libtracker-common/tracker-keyfile-object.h | 12 +-
src/libtracker-common/tracker-language.c | 2 +-
src/libtracker-common/tracker-language.h | 6 +-
src/libtracker-common/tracker-log.c | 3 +-
src/libtracker-common/tracker-log.h | 3 +-
src/libtracker-common/tracker-module-config.c | 897 ---------------------
src/libtracker-common/tracker-module-config.h | 61 --
src/libtracker-common/tracker-namespace.c | 21 +-
src/libtracker-common/tracker-namespace.h | 32 +-
src/libtracker-common/tracker-ontology.h | 30 +-
src/libtracker-common/tracker-os-dependant-unix.c | 2 +-
src/libtracker-common/tracker-os-dependant-win.c | 2 +-
src/libtracker-common/tracker-os-dependant.h | 12 +-
src/libtracker-common/tracker-power.h | 23 +-
src/libtracker-common/tracker-property.c | 89 +-
src/libtracker-common/tracker-property.h | 109 ++--
src/libtracker-common/tracker-statement-list.c | 61 +-
src/libtracker-common/tracker-statement-list.h | 69 +-
src/libtracker-common/tracker-storage.h | 45 +-
src/libtracker-common/tracker-type-utils.c | 2 +-
src/libtracker-common/tracker-type-utils.h | 2 +-
src/libtracker-common/tracker-utils.c | 4 +-
src/libtracker-common/tracker-utils.h | 6 +-
src/plugins/kmail/tracker-kmail-common.h | 3 -
src/tracker-store/tracker-statistics.c | 2 -
34 files changed, 385 insertions(+), 1325 deletions(-)
---
diff --git a/src/libtracker-common/tracker-class.c b/src/libtracker-common/tracker-class.c
index 7b40582..548f7bd 100644
--- a/src/libtracker-common/tracker-class.c
+++ b/src/libtracker-common/tracker-class.c
@@ -19,6 +19,8 @@
* Boston, MA 02110-1301, USA.
*/
+#include "config.h"
+
#include <string.h>
#include <stdlib.h>
@@ -33,22 +35,22 @@
typedef struct _TrackerClassPriv TrackerClassPriv;
struct _TrackerClassPriv {
- gchar *uri;
- gchar *name;
- gint count;
+ gchar *uri;
+ gchar *name;
+ gint count;
- GArray *super_classes;
+ GArray *super_classes;
};
-static void class_finalize (GObject *object);
+static void class_finalize (GObject *object);
static void class_get_property (GObject *object,
- guint param_id,
- GValue *value,
- GParamSpec *pspec);
+ guint param_id,
+ GValue *value,
+ GParamSpec *pspec);
static void class_set_property (GObject *object,
- guint param_id,
- const GValue *value,
- GParamSpec *pspec);
+ guint param_id,
+ const GValue *value,
+ GParamSpec *pspec);
enum {
PROP_0,
@@ -121,10 +123,10 @@ class_finalize (GObject *object)
}
static void
-class_get_property (GObject *object,
- guint param_id,
- GValue *value,
- GParamSpec *pspec)
+class_get_property (GObject *object,
+ guint param_id,
+ GValue *value,
+ GParamSpec *pspec)
{
TrackerClassPriv *priv;
@@ -147,10 +149,10 @@ class_get_property (GObject *object,
}
static void
-class_set_property (GObject *object,
- guint param_id,
- const GValue *value,
- GParamSpec *pspec)
+class_set_property (GObject *object,
+ guint param_id,
+ const GValue *value,
+ GParamSpec *pspec)
{
switch (param_id) {
case PROP_URI:
@@ -227,7 +229,7 @@ tracker_class_get_super_classes (TrackerClass *service)
void
tracker_class_set_uri (TrackerClass *service,
- const gchar *value)
+ const gchar *value)
{
TrackerClassPriv *priv;
@@ -301,8 +303,8 @@ tracker_class_set_super_classes (TrackerClass *service,
}
void
-tracker_class_add_super_class (TrackerClass *service,
- TrackerClass *value)
+tracker_class_add_super_class (TrackerClass *service,
+ TrackerClass *value)
{
TrackerClassPriv *priv;
diff --git a/src/libtracker-common/tracker-class.h b/src/libtracker-common/tracker-class.h
index c822251..6900373 100644
--- a/src/libtracker-common/tracker-class.h
+++ b/src/libtracker-common/tracker-class.h
@@ -30,41 +30,38 @@ G_BEGIN_DECLS
#error "only <libtracker-common/tracker-common.h> must be included directly."
#endif
-#define TRACKER_TYPE_CLASS (tracker_class_get_type ())
-#define TRACKER_CLASS(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), TRACKER_TYPE_CLASS, TrackerClass))
+#define TRACKER_TYPE_CLASS (tracker_class_get_type ())
+#define TRACKER_CLASS(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), TRACKER_TYPE_CLASS, TrackerClass))
#define TRACKER_CLASS_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), TRACKER_TYPE_CLASS, TrackerClassClass))
-#define TRACKER_IS_CLASS(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), TRACKER_TYPE_CLASS))
+#define TRACKER_IS_CLASS(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), TRACKER_TYPE_CLASS))
#define TRACKER_IS_CLASS_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), TRACKER_TYPE_CLASS))
#define TRACKER_CLASS_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), TRACKER_TYPE_CLASS, TrackerClassClass))
-typedef struct _TrackerClass TrackerClass;
+typedef struct _TrackerClass TrackerClass;
typedef struct _TrackerClassClass TrackerClassClass;
struct _TrackerClass {
- GObject parent;
+ GObject parent;
};
struct _TrackerClassClass {
GObjectClass parent_class;
};
-GType tracker_class_get_type (void) G_GNUC_CONST;
-
-TrackerClass *tracker_class_new (void);
-
-const gchar * tracker_class_get_uri (TrackerClass *service);
-const gchar * tracker_class_get_name (TrackerClass *service);
-gint tracker_class_get_count (TrackerClass *service);
-TrackerClass **tracker_class_get_super_classes (TrackerClass *service);
-
-void tracker_class_set_uri (TrackerClass *service,
- const gchar *value);
-void tracker_class_set_count (TrackerClass *service,
- gint value);
-void tracker_class_set_super_classes (TrackerClass *self,
- TrackerClass **super_classes);
-void tracker_class_add_super_class (TrackerClass *self,
- TrackerClass *value);
+GType tracker_class_get_type (void) G_GNUC_CONST;
+TrackerClass * tracker_class_new (void);
+const gchar * tracker_class_get_uri (TrackerClass *service);
+const gchar * tracker_class_get_name (TrackerClass *service);
+gint tracker_class_get_count (TrackerClass *service);
+TrackerClass **tracker_class_get_super_classes (TrackerClass *service);
+void tracker_class_set_uri (TrackerClass *service,
+ const gchar *value);
+void tracker_class_set_count (TrackerClass *service,
+ gint value);
+void tracker_class_set_super_classes (TrackerClass *self,
+ TrackerClass **super_classes);
+void tracker_class_add_super_class (TrackerClass *self,
+ TrackerClass *value);
G_END_DECLS
diff --git a/src/libtracker-common/tracker-common.h b/src/libtracker-common/tracker-common.h
index 3aa86b7..d2d91d6 100644
--- a/src/libtracker-common/tracker-common.h
+++ b/src/libtracker-common/tracker-common.h
@@ -1,6 +1,5 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
- * Copyright (C) 2006, Mr Jamie McCracken (jamiemcc gnome org)
* Copyright (C) 2008, Nokia (urho konttori nokia com)
*
* This library is free software; you can redistribute it and/or
@@ -32,17 +31,21 @@ G_BEGIN_DECLS
#define __LIBTRACKER_COMMON_INSIDE__
-#include "tracker-dbus.h"
#include "tracker-class.h"
+#include "tracker-config-file.h"
+#include "tracker-dbus.h"
#include "tracker-file-utils.h"
#include "tracker-ioprio.h"
-#include "tracker-log.h"
+#include "tracker-keyfile-object.h"
#include "tracker-language.h"
+#include "tracker-log.h"
#include "tracker-namespace.h"
#include "tracker-ontology.h"
+#include "tracker-os-dependant.h"
#include "tracker-power.h"
#include "tracker-property.h"
#include "tracker-sparql-builder.h"
+#include "tracker-statement-list.h"
#include "tracker-storage.h"
#include "tracker-type-utils.h"
#include "tracker-utils.h"
diff --git a/src/libtracker-common/tracker-config-file.h b/src/libtracker-common/tracker-config-file.h
index 4901dde..8da05ce 100644
--- a/src/libtracker-common/tracker-config-file.h
+++ b/src/libtracker-common/tracker-config-file.h
@@ -1,6 +1,6 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
- * Copyright (C) 2009 Nokia
+ * Copyright (C) 2009 Nokia (urho konttori nokia com)
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -18,14 +18,18 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef __TRACKER_CONFIG_FILE_H__
-#define __TRACKER_CONFIG_FILE_H__
+#ifndef __LIBTRACKER_CONFIG_FILE_H__
+#define __LIBTRACKER_CONFIG_FILE_H__
#include <glib-object.h>
#include <gio/gio.h>
G_BEGIN_DECLS
+#if !defined (__LIBTRACKER_COMMON_INSIDE__) && !defined (TRACKER_COMPILATION)
+#error "only <libtracker-common/tracker-common.h> must be included directly."
+#endif
+
#define TRACKER_TYPE_CONFIG_FILE (tracker_config_file_get_type ())
#define TRACKER_CONFIG_FILE(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), TRACKER_TYPE_CONFIG_FILE, TrackerConfigFile))
#define TRACKER_CONFIG_FILE_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), TRACKER_TYPE_CONFIG_FILE, TrackerConfigFileClass))
@@ -33,18 +37,18 @@ G_BEGIN_DECLS
#define TRACKER_IS_CONFIG_FILE_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), TRACKER_TYPE_CONFIG_FILE))
#define TRACKER_CONFIG_FILE_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), TRACKER_TYPE_CONFIG_FILE, TrackerConfigFileClass))
-typedef struct _TrackerConfigFile TrackerConfigFile;
+typedef struct _TrackerConfigFile TrackerConfigFile;
typedef struct _TrackerConfigFileClass TrackerConfigFileClass;
struct _TrackerConfigFile {
- GObject parent;
+ GObject parent;
- GFile *file;
+ GFile *file;
GFileMonitor *monitor;
- gboolean file_exists;
+ gboolean file_exists;
- GKeyFile *key_file;
+ GKeyFile *key_file;
};
struct _TrackerConfigFileClass {
@@ -60,4 +64,4 @@ gboolean tracker_config_file_save (TrackerConfigFile *config);
G_END_DECLS
-#endif /* __TRACKER_CONFIG_FILE_H__ */
+#endif /* __LIBTRACKER_CONFIG_FILE_H__ */
diff --git a/src/libtracker-common/tracker-dbus.c b/src/libtracker-common/tracker-dbus.c
index 69394d7..c7c197b 100644
--- a/src/libtracker-common/tracker-dbus.c
+++ b/src/libtracker-common/tracker-dbus.c
@@ -1,7 +1,6 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
- * Copyright (C) 2006, Mr Jamie McCracken (jamiemcc gnome org)
- * Copyright (C) 2008, Nokia
+ * Copyright (C) 2008, Nokia (urho konttori nokia com)
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -19,6 +18,8 @@
* Boston, MA 02110-1301, USA.
*/
+#include "config.h"
+
#include <gio/gio.h>
#include "tracker-dbus.h"
diff --git a/src/libtracker-common/tracker-dbus.h b/src/libtracker-common/tracker-dbus.h
index ca90559..3464479 100644
--- a/src/libtracker-common/tracker-dbus.h
+++ b/src/libtracker-common/tracker-dbus.h
@@ -1,7 +1,6 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
- * Copyright (C) 2006, Mr Jamie McCracken (jamiemcc gnome org)
- * Copyright (C) 2008, Nokia
+ * Copyright (C) 2008, Nokia (urho konttori nokia com)
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -22,10 +21,6 @@
#ifndef __LIBTRACKER_COMMON_DBUS_H__
#define __LIBTRACKER_COMMON_DBUS_H__
-#if !defined (__LIBTRACKER_COMMON_INSIDE__) && !defined (TRACKER_COMPILATION)
-#error "only <libtracker-common/tracker-common.h> must be included directly."
-#endif
-
#include <glib/gi18n.h>
#include <dbus/dbus.h>
@@ -34,9 +29,23 @@
G_BEGIN_DECLS
+#if !defined (__LIBTRACKER_COMMON_INSIDE__) && !defined (TRACKER_COMPILATION)
+#error "only <libtracker-common/tracker-common.h> must be included directly."
+#endif
+
#define TRACKER_DBUS_ERROR_DOMAIN "TrackerDBus"
#define TRACKER_DBUS_ERROR tracker_dbus_error_quark()
+#define TRACKER_TYPE_EVENT_ARRAY \
+ dbus_g_type_get_collection ("GPtrArray", \
+ dbus_g_type_get_struct ("GValueArray", \
+ G_TYPE_STRING, \
+ G_TYPE_STRING, \
+ G_TYPE_INT, \
+ G_TYPE_INVALID))
+#define TRACKER_TYPE_G_STRV_ARRAY \
+ dbus_g_type_get_collection ("GPtrArray", G_TYPE_STRV)
+
#define tracker_dbus_async_return_if_fail(expr,context) \
G_STMT_START { \
if G_LIKELY(expr) { } else { \
@@ -55,31 +64,23 @@ G_BEGIN_DECLS
}; \
} G_STMT_END
-#define tracker_dbus_return_val_if_fail(expr,val,error) \
- G_STMT_START { \
- if G_LIKELY(expr) { } else { \
- g_set_error (error, \
- TRACKER_DBUS_ERROR, \
- 0, \
- _("Assertion `%s' failed"), \
- #expr); \
- \
- return val; \
- }; \
+#define tracker_dbus_return_val_if_fail(expr,val,error) \
+ G_STMT_START { \
+ if G_LIKELY(expr) { } else { \
+ g_set_error (error, \
+ TRACKER_DBUS_ERROR, \
+ 0, \
+ _("Assertion `%s' failed"), \
+ #expr); \
+ \
+ return val; \
+ }; \
} G_STMT_END
-typedef enum {
- TRACKER_DBUS_EVENTS_TYPE_ADD,
- TRACKER_DBUS_EVENTS_TYPE_UPDATE,
- TRACKER_DBUS_EVENTS_TYPE_DELETE
-} TrackerDBusEventsType;
-
-#define TRACKER_TYPE_EVENT_ARRAY dbus_g_type_get_collection ("GPtrArray", dbus_g_type_get_struct ("GValueArray", G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INT, G_TYPE_INVALID))
-
typedef struct TrackerDBusRequestHandler TrackerDBusRequestHandler;
-typedef void (*TrackerDBusRequestFunc) (guint request_id,
- gpointer user_data);
+typedef void (*TrackerDBusRequestFunc) (guint request_id,
+ gpointer user_data);
typedef struct {
guint id;
@@ -87,6 +88,12 @@ typedef struct {
gpointer data2;
} TrackerDBusData;
+typedef enum {
+ TRACKER_DBUS_EVENTS_TYPE_ADD,
+ TRACKER_DBUS_EVENTS_TYPE_UPDATE,
+ TRACKER_DBUS_EVENTS_TYPE_DELETE
+} TrackerDBusEventsType;
+
GQuark tracker_dbus_error_quark (void);
TrackerDBusData *tracker_dbus_data_new (const gpointer arg1,
const gpointer arg2);
diff --git a/src/libtracker-common/tracker-file-utils.c b/src/libtracker-common/tracker-file-utils.c
index f0e49fe..d9cc084 100644
--- a/src/libtracker-common/tracker-file-utils.c
+++ b/src/libtracker-common/tracker-file-utils.c
@@ -1,7 +1,7 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
* Copyright (C) 2006, Mr Jamie McCracken (jamiemcc gnome org)
- * Copyright (C) 2008, Nokia
+ * Copyright (C) 2008, Nokia (urho konttori nokia com)
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -18,6 +18,9 @@
* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301, USA.
*/
+
+#include "config.h"
+
#ifndef _GNU_SOURCE
#define _GNU_SOURCE
#endif
diff --git a/src/libtracker-common/tracker-file-utils.h b/src/libtracker-common/tracker-file-utils.h
index 4e5d380..b3b0c0d 100644
--- a/src/libtracker-common/tracker-file-utils.h
+++ b/src/libtracker-common/tracker-file-utils.h
@@ -1,7 +1,6 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
- * Copyright (C) 2006, Mr Jamie McCracken (jamiemcc gnome org)
- * Copyright (C) 2008, Nokia
+ * Copyright (C) 2008, Nokia (urho konttori nokia com)
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -22,14 +21,17 @@
#ifndef __LIBTRACKER_COMMON_FILE_UTILS_H__
#define __LIBTRACKER_COMMON_FILE_UTILS_H__
-#if !defined (__LIBTRACKER_COMMON_INSIDE__) && !defined (TRACKER_COMPILATION)
-#error "only <libtracker-common/tracker-common.h> must be included directly."
-#endif
-
#include <stdio.h>
+
#include <glib.h>
#include <gio/gio.h>
+G_BEGIN_DECLS
+
+#if !defined (__LIBTRACKER_COMMON_INSIDE__) && !defined (TRACKER_COMPILATION)
+#error "only <libtracker-common/tracker-common.h> must be included directly."
+#endif
+
FILE* tracker_file_open (const gchar *uri,
const gchar *how,
gboolean sequential);
@@ -50,4 +52,6 @@ gchar * tracker_path_evaluate_name (const gchar *uri);
gboolean tracker_env_check_xdg_dirs (void);
+G_END_DECLS
+
#endif /* __LIBTRACKER_COMMON_FILE_UTILS_H__ */
diff --git a/src/libtracker-common/tracker-ioprio.h b/src/libtracker-common/tracker-ioprio.h
index cc42795..f1b8366 100644
--- a/src/libtracker-common/tracker-ioprio.h
+++ b/src/libtracker-common/tracker-ioprio.h
@@ -1,6 +1,7 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
* Copyright (C) 2006, Anders Aagaard
+ * Copyright (C) 2008, Nokia (urho konttori nokia com)
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -18,8 +19,8 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef __LIBTRACKER_IOPRIO_H__
-#define __LIBTRACKER_IOPRIO_H__
+#ifndef __LIBTRACKER_COMMON_IOPRIO_H__
+#define __LIBTRACKER_COMMON_IOPRIO_H__
G_BEGIN_DECLS
@@ -31,4 +32,4 @@ void tracker_ioprio_init (void);
G_END_DECLS
-#endif /* __LIBTRACKER_IOPRIO_H__ */
+#endif /* __LIBTRACKER_COMMON_IOPRIO_H__ */
diff --git a/src/libtracker-common/tracker-keyfile-object.h b/src/libtracker-common/tracker-keyfile-object.h
index 010f253..b7b7393 100644
--- a/src/libtracker-common/tracker-keyfile-object.h
+++ b/src/libtracker-common/tracker-keyfile-object.h
@@ -1,6 +1,6 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
- * Copyright (C) 2009 Nokia
+ * Copyright (C) 2009 Nokia (urho konttori nokia com)
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -18,13 +18,17 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef __TRACKER_KEYFILE_OBJECT_H__
-#define __TRACKER_KEYFILE_OBJECT_H__
+#ifndef __LIBTRACKER_COMMON_KEYFILE_OBJECT_H__
+#define __LIBTRACKER_COMMON_KEYFILE_OBJECT_H__
#include <glib.h>
G_BEGIN_DECLS
+#if !defined (__LIBTRACKER_COMMON_INSIDE__) && !defined (TRACKER_COMPILATION)
+#error "only <libtracker-common/tracker-common.h> must be included directly."
+#endif
+
const gchar *tracker_keyfile_object_blurb (gpointer object,
const gchar *property);
gboolean tracker_keyfile_object_default_boolean (gpointer object,
@@ -78,4 +82,4 @@ void tracker_keyfile_object_save_string_list (gpointer object,
G_END_DECLS
-#endif /* __TRACKER_KEYFILE_OBJECT_H__ */
+#endif /* __LIBTRACKER_COMMON_KEYFILE_OBJECT_H__ */
diff --git a/src/libtracker-common/tracker-language.c b/src/libtracker-common/tracker-language.c
index 281c9da..a27bae7 100644
--- a/src/libtracker-common/tracker-language.c
+++ b/src/libtracker-common/tracker-language.c
@@ -1,7 +1,7 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
* Copyright (C) 2006, Mr Jamie McCracken (jamiemcc gnome org)
- * Copyright (C) 2008, Nokia
+ * Copyright (C) 2008, Nokia (urho konttori nokia com)
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
diff --git a/src/libtracker-common/tracker-language.h b/src/libtracker-common/tracker-language.h
index 7aedee2..99878e6 100644
--- a/src/libtracker-common/tracker-language.h
+++ b/src/libtracker-common/tracker-language.h
@@ -1,7 +1,7 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
* Copyright (C) 2006, Mr Jamie McCracken (jamiemcc gnome org)
- * Copyright (C) 2008, Nokia
+ * Copyright (C) 2008, Nokia (urho konttori nokia com)
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -37,11 +37,11 @@ G_BEGIN_DECLS
#define TRACKER_IS_LANGUAGE_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), TRACKER_TYPE_LANGUAGE))
#define TRACKER_LANGUAGE_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), TRACKER_TYPE_LANGUAGE, TrackerLanguageClass))
-typedef struct _TrackerLanguage TrackerLanguage;
+typedef struct _TrackerLanguage TrackerLanguage;
typedef struct _TrackerLanguageClass TrackerLanguageClass;
struct _TrackerLanguage {
- GObject parent;
+ GObject parent;
};
struct _TrackerLanguageClass {
diff --git a/src/libtracker-common/tracker-log.c b/src/libtracker-common/tracker-log.c
index 9131bba..a3dbac3 100644
--- a/src/libtracker-common/tracker-log.c
+++ b/src/libtracker-common/tracker-log.c
@@ -1,7 +1,6 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
- * Copyright (C) 2006, Mr Jamie McCracken (jamiemcc gnome org)
- * Copyright (C) 2008, Nokia
+ * Copyright (C) 2008, Nokia (urho konttori nokia com)
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
diff --git a/src/libtracker-common/tracker-log.h b/src/libtracker-common/tracker-log.h
index 5b5b9dd..e7b3d23 100644
--- a/src/libtracker-common/tracker-log.h
+++ b/src/libtracker-common/tracker-log.h
@@ -1,7 +1,6 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
- * Copyright (C) 2006, Mr Jamie McCracken (jamiemcc gnome org)
- * Copyright (C) 2008, Nokia
+ * Copyright (C) 2008, Nokia (urho konttori nokia com)
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
diff --git a/src/libtracker-common/tracker-namespace.c b/src/libtracker-common/tracker-namespace.c
index 0fbde9e..bcb0789 100644
--- a/src/libtracker-common/tracker-namespace.c
+++ b/src/libtracker-common/tracker-namespace.c
@@ -1,6 +1,5 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
- * Copyright (C) 2006, Mr Jamie McCracken (jamiemcc gnome org)
* Copyright (C) 2008, Nokia (urho konttori nokia com)
*
* This library is free software; you can redistribute it and/or
@@ -19,6 +18,8 @@
* Boston, MA 02110-1301, USA.
*/
+#include "config.h"
+
#include <string.h>
#include <stdlib.h>
@@ -31,19 +32,19 @@
typedef struct _TrackerNamespacePriv TrackerNamespacePriv;
struct _TrackerNamespacePriv {
- gchar *uri;
- gchar *prefix;
+ gchar *uri;
+ gchar *prefix;
};
-static void namespace_finalize (GObject *object);
+static void namespace_finalize (GObject *object);
static void namespace_get_property (GObject *object,
- guint param_id,
- GValue *value,
- GParamSpec *pspec);
+ guint param_id,
+ GValue *value,
+ GParamSpec *pspec);
static void namespace_set_property (GObject *object,
- guint param_id,
- const GValue *value,
- GParamSpec *pspec);
+ guint param_id,
+ const GValue *value,
+ GParamSpec *pspec);
enum {
PROP_0,
diff --git a/src/libtracker-common/tracker-namespace.h b/src/libtracker-common/tracker-namespace.h
index f9b47d8..57a6c35 100644
--- a/src/libtracker-common/tracker-namespace.h
+++ b/src/libtracker-common/tracker-namespace.h
@@ -1,7 +1,6 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
- * Copyright (C) 2006, Mr Jamie McCracken (jamiemcc gnome org)
- * Copyright (C) 2008, Nokia (urho konttori nokia com)
+ * Copyright (C) 2009, Nokia (urho konttori nokia com)
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -30,35 +29,32 @@ G_BEGIN_DECLS
#error "only <libtracker-common/tracker-common.h> must be included directly."
#endif
-#define TRACKER_TYPE_NAMESPACE (tracker_namespace_get_type ())
-#define TRACKER_NAMESPACE(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), TRACKER_TYPE_NAMESPACE, TrackerNamespace))
+#define TRACKER_TYPE_NAMESPACE (tracker_namespace_get_type ())
+#define TRACKER_NAMESPACE(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), TRACKER_TYPE_NAMESPACE, TrackerNamespace))
#define TRACKER_NAMESPACE_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), TRACKER_TYPE_NAMESPACE, TrackerNamespaceClass))
-#define TRACKER_IS_NAMESPACE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), TRACKER_TYPE_NAMESPACE))
+#define TRACKER_IS_NAMESPACE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), TRACKER_TYPE_NAMESPACE))
#define TRACKER_IS_NAMESPACE_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), TRACKER_TYPE_NAMESPACE))
#define TRACKER_NAMESPACE_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), TRACKER_TYPE_NAMESPACE, TrackerNamespaceClass))
-typedef struct _TrackerNamespace TrackerNamespace;
+typedef struct _TrackerNamespace TrackerNamespace;
typedef struct _TrackerNamespaceClass TrackerNamespaceClass;
struct _TrackerNamespace {
- GObject parent;
+ GObject parent;
};
struct _TrackerNamespaceClass {
GObjectClass parent_class;
};
-GType tracker_namespace_get_type (void) G_GNUC_CONST;
-
-TrackerNamespace *tracker_namespace_new (void);
-
-const gchar * tracker_namespace_get_uri (TrackerNamespace *namespace_);
-const gchar * tracker_namespace_get_prefix (TrackerNamespace *namespace_);
-
-void tracker_namespace_set_uri (TrackerNamespace *namespace_,
- const gchar *value);
-void tracker_namespace_set_prefix (TrackerNamespace *namespace_,
- const gchar *value);
+GType tracker_namespace_get_type (void) G_GNUC_CONST;
+TrackerNamespace *tracker_namespace_new (void);
+const gchar * tracker_namespace_get_uri (TrackerNamespace *namespace_);
+const gchar * tracker_namespace_get_prefix (TrackerNamespace *namespace_);
+void tracker_namespace_set_uri (TrackerNamespace *namespace_,
+ const gchar *value);
+void tracker_namespace_set_prefix (TrackerNamespace *namespace_,
+ const gchar *value);
G_END_DECLS
diff --git a/src/libtracker-common/tracker-ontology.h b/src/libtracker-common/tracker-ontology.h
index 1e63181..7f51e53 100644
--- a/src/libtracker-common/tracker-ontology.h
+++ b/src/libtracker-common/tracker-ontology.h
@@ -54,26 +54,26 @@ G_BEGIN_DECLS
/* Temporary */
#define TRACKER_NMM_PREFIX "http://www.tracker-project.org/temp/nmm#";
-#define TRACKER_DATASOURCE_URN_PREFIX "urn:nepomuk:datasource:"
-#define TRACKER_NON_REMOVABLE_MEDIA_DATASOURCE_URN TRACKER_DATASOURCE_URN_PREFIX "9291a450-1d49-11de-8c30-0800200c9a66"
+#define TRACKER_DATASOURCE_URN_PREFIX \
+ "urn:nepomuk:datasource:"
+#define TRACKER_NON_REMOVABLE_MEDIA_DATASOURCE_URN \
+ TRACKER_DATASOURCE_URN_PREFIX "9291a450-1d49-11de-8c30-0800200c9a66"
-void tracker_ontology_init (void);
-void tracker_ontology_shutdown (void);
+void tracker_ontology_init (void);
+void tracker_ontology_shutdown (void);
/* Service mechanics */
-void tracker_ontology_add_class (TrackerClass *service);
-TrackerClass *tracker_ontology_get_class_by_uri (const gchar *service_uri);
-
-TrackerNamespace **tracker_ontology_get_namespaces (void);
-TrackerClass **tracker_ontology_get_classes (void);
-TrackerProperty **tracker_ontology_get_properties (void);
+void tracker_ontology_add_class (TrackerClass *service);
+TrackerClass * tracker_ontology_get_class_by_uri (const gchar *service_uri);
+TrackerNamespace **tracker_ontology_get_namespaces (void);
+TrackerClass ** tracker_ontology_get_classes (void);
+TrackerProperty ** tracker_ontology_get_properties (void);
/* Field mechanics */
-void tracker_ontology_add_property (TrackerProperty *field);
-TrackerProperty * tracker_ontology_get_property_by_uri (const gchar *uri);
-
-void tracker_ontology_add_namespace (TrackerNamespace *namespace_);
-TrackerNamespace *tracker_ontology_get_namespace_by_uri (const gchar *namespace_uri);
+void tracker_ontology_add_property (TrackerProperty *field);
+TrackerProperty * tracker_ontology_get_property_by_uri (const gchar *uri);
+void tracker_ontology_add_namespace (TrackerNamespace *namespace_);
+TrackerNamespace * tracker_ontology_get_namespace_by_uri (const gchar *namespace_uri);
G_END_DECLS
diff --git a/src/libtracker-common/tracker-os-dependant-unix.c b/src/libtracker-common/tracker-os-dependant-unix.c
index d5899e3..fd8840e 100644
--- a/src/libtracker-common/tracker-os-dependant-unix.c
+++ b/src/libtracker-common/tracker-os-dependant-unix.c
@@ -1,7 +1,7 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
* Copyright (C) 2007, Mr Jamie McCracken (jamiemcc gnome org)
- * Copyright (C) 2008, Nokia
+ * Copyright (C) 2008, Nokia (urho konttori nokia com)
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
diff --git a/src/libtracker-common/tracker-os-dependant-win.c b/src/libtracker-common/tracker-os-dependant-win.c
index da5e96b..0ccb799 100644
--- a/src/libtracker-common/tracker-os-dependant-win.c
+++ b/src/libtracker-common/tracker-os-dependant-win.c
@@ -1,7 +1,7 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
* Copyright (C) 2007, Mr Jamie McCracken (jamiemcc gnome org)
- * Copyright (C) 2008, Nokia
+ * Copyright (C) 2008, Nokia (urho konttori nokia com)
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
diff --git a/src/libtracker-common/tracker-os-dependant.h b/src/libtracker-common/tracker-os-dependant.h
index 9604716..a225f4d 100644
--- a/src/libtracker-common/tracker-os-dependant.h
+++ b/src/libtracker-common/tracker-os-dependant.h
@@ -1,7 +1,7 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
* Copyright (C) 2007, Mr Jamie McCracken (jamiemcc gnome org)
- * Copyright (C) 2008, Nokia
+ * Copyright (C) 2008, Nokia (urho konttori nokia com)
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -22,13 +22,15 @@
#ifndef __LIBTRACKER_COMMON_OS_DEPENDANT_H__
#define __LIBTRACKER_COMMON_OS_DEPENDANT_H__
+#include <glib.h>
+#include <glib/gstdio.h>
+
+G_BEGIN_DECLS
+
#if !defined (__LIBTRACKER_COMMON_INSIDE__) && !defined (TRACKER_COMPILATION)
#error "only <libtracker-common/tracker-common.h> must be included directly."
#endif
-#include <glib.h>
-#include <glib/gstdio.h>
-
/* Process spawning */
gboolean tracker_spawn (gchar **argv,
gint timeout,
@@ -48,4 +50,6 @@ gchar * tracker_create_permission_string (struct stat finfo);
/* Memory limits */
gboolean tracker_memory_setrlimits (void);
+G_END_DECLS
+
#endif /* __LIBTRACKER_COMMON_OS_DEPENDANT_H__ */
diff --git a/src/libtracker-common/tracker-power.h b/src/libtracker-common/tracker-power.h
index 16176fd..fb7ef10 100644
--- a/src/libtracker-common/tracker-power.h
+++ b/src/libtracker-common/tracker-power.h
@@ -1,6 +1,5 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
- * Copyright (C) 2006, Mr Jamie McCracken (jamiemcc gnome org)
* Copyright (C) 2008, Nokia (urho konttori nokia com)
*
* This library is free software; you can redistribute it and/or
@@ -19,8 +18,8 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef __LIBTRACKER_POWER_H__
-#define __LIBTRACKER_POWER_H__
+#ifndef __LIBTRACKER_COMMON_POWER_H__
+#define __LIBTRACKER_COMMON_POWER_H__
#include <glib-object.h>
@@ -30,18 +29,18 @@ G_BEGIN_DECLS
#error "only <libtracker-common/tracker-common.h> must be included directly."
#endif
-#define TRACKER_TYPE_POWER (tracker_power_get_type ())
-#define TRACKER_POWER(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), TRACKER_TYPE_POWER, TrackerPower))
-#define TRACKER_POWER_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), TRACKER_TYPE_POWER, TrackerPowerClass))
-#define TRACKER_IS_POWER(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), TRACKER_TYPE_POWER))
-#define TRACKER_IS_POWER_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), TRACKER_TYPE_POWER))
-#define TRACKER_POWER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), TRACKER_TYPE_POWER, TrackerPowerClass))
+#define TRACKER_TYPE_POWER (tracker_power_get_type ())
+#define TRACKER_POWER(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), TRACKER_TYPE_POWER, TrackerPower))
+#define TRACKER_POWER_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), TRACKER_TYPE_POWER, TrackerPowerClass))
+#define TRACKER_IS_POWER(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), TRACKER_TYPE_POWER))
+#define TRACKER_IS_POWER_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), TRACKER_TYPE_POWER))
+#define TRACKER_POWER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), TRACKER_TYPE_POWER, TrackerPowerClass))
-typedef struct _TrackerPower TrackerPower;
+typedef struct _TrackerPower TrackerPower;
typedef struct _TrackerPowerClass TrackerPowerClass;
struct _TrackerPower {
- GObject parent;
+ GObject parent;
};
struct _TrackerPowerClass {
@@ -58,4 +57,4 @@ gdouble tracker_power_get_battery_percentage (TrackerPower *power);
G_END_DECLS
-#endif /* __LIBTRACKER_POWER_H__ */
+#endif /* __LIBTRACKER_COMMON_POWER_H__ */
diff --git a/src/libtracker-common/tracker-property.c b/src/libtracker-common/tracker-property.c
index a414757..a0b4b1d 100644
--- a/src/libtracker-common/tracker-property.c
+++ b/src/libtracker-common/tracker-property.c
@@ -1,7 +1,6 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
- * Copyright (C) 2006, Mr Jamie McCracken (jamiemcc gnome org)
- * Copyright (C) 2008, Nokia (urho konttori nokia com)
+ * Copyright (C) 2009, Nokia (urho konttori nokia com)
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -19,6 +18,8 @@
* Boston, MA 02110-1301, USA.
*/
+#include "config.h"
+
#include <string.h>
#include <stdlib.h>
@@ -28,12 +29,12 @@
#include "tracker-ontology.h"
#include "tracker-property.h"
-#define XSD_BOOLEAN TRACKER_XSD_PREFIX "boolean"
-#define XSD_DATE TRACKER_XSD_PREFIX "date"
+#define XSD_BOOLEAN TRACKER_XSD_PREFIX "boolean"
+#define XSD_DATE TRACKER_XSD_PREFIX "date"
#define XSD_DATETIME TRACKER_XSD_PREFIX "dateTime"
-#define XSD_DOUBLE TRACKER_XSD_PREFIX "double"
-#define XSD_INTEGER TRACKER_XSD_PREFIX "integer"
-#define XSD_STRING TRACKER_XSD_PREFIX "string"
+#define XSD_DOUBLE TRACKER_XSD_PREFIX "double"
+#define XSD_INTEGER TRACKER_XSD_PREFIX "integer"
+#define XSD_STRING TRACKER_XSD_PREFIX "string"
#define GET_PRIV(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), TRACKER_TYPE_PROPERTY, TrackerPropertyPriv))
@@ -59,13 +60,13 @@ struct _TrackerPropertyPriv {
static void property_finalize (GObject *object);
static void property_get_property (GObject *object,
- guint param_id,
- GValue *value,
- GParamSpec *pspec);
+ guint param_id,
+ GValue *value,
+ GParamSpec *pspec);
static void property_set_property (GObject *object,
- guint param_id,
- const GValue *value,
- GParamSpec *pspec);
+ guint param_id,
+ const GValue *value,
+ GParamSpec *pspec);
enum {
PROP_0,
@@ -128,7 +129,7 @@ G_DEFINE_TYPE (TrackerProperty, tracker_property, G_TYPE_OBJECT);
const gchar *
tracker_property_type_to_string (TrackerPropertyType fieldtype)
{
- GType type;
+ GType type;
GEnumClass *enum_class;
GEnumValue *enum_value;
@@ -275,9 +276,9 @@ property_finalize (GObject *object)
static void
property_get_property (GObject *object,
- guint param_id,
- GValue *value,
- GParamSpec *pspec)
+ guint param_id,
+ GValue *value,
+ GParamSpec *pspec)
{
TrackerPropertyPriv *priv;
@@ -327,10 +328,10 @@ property_get_property (GObject *object,
}
static void
-property_set_property (GObject *object,
- guint param_id,
- const GValue *value,
- GParamSpec *pspec)
+property_set_property (GObject *object,
+ guint param_id,
+ const GValue *value,
+ GParamSpec *pspec)
{
switch (param_id) {
case PROP_URI:
@@ -385,13 +386,13 @@ property_set_property (GObject *object,
static gboolean
field_int_validate (TrackerProperty *field,
- const gchar *property,
- gint value)
+ const gchar *property,
+ gint value)
{
#ifdef G_DISABLE_CHECKS
GParamSpec *spec;
- GValue value = { 0 };
- gboolean valid;
+ GValue value = { 0 };
+ gboolean valid;
spec = g_object_class_find_property (G_OBJECT_CLASS (field), property);
g_return_val_if_fail (spec != NULL, FALSE);
@@ -587,7 +588,7 @@ tracker_property_get_super_properties (TrackerProperty *property)
void
tracker_property_set_uri (TrackerProperty *field,
- const gchar *value)
+ const gchar *value)
{
TrackerPropertyPriv *priv;
@@ -601,8 +602,8 @@ tracker_property_set_uri (TrackerProperty *field,
priv->name = NULL;
if (value) {
- gchar *namespace_uri, *hash;
TrackerNamespace *namespace;
+ gchar *namespace_uri, *hash;
priv->uri = g_strdup (value);
@@ -630,7 +631,7 @@ tracker_property_set_uri (TrackerProperty *field,
void
tracker_property_set_transient (TrackerProperty *field,
- gboolean value)
+ gboolean value)
{
TrackerPropertyPriv *priv;
@@ -646,7 +647,7 @@ tracker_property_set_transient (TrackerProperty *field,
void
tracker_property_set_data_type (TrackerProperty *field,
- TrackerPropertyType value)
+ TrackerPropertyType value)
{
TrackerPropertyPriv *priv;
@@ -659,8 +660,8 @@ tracker_property_set_data_type (TrackerProperty *field,
}
void
-tracker_property_set_domain (TrackerProperty *field,
- TrackerClass *value)
+tracker_property_set_domain (TrackerProperty *field,
+ TrackerClass *value)
{
TrackerPropertyPriv *priv;
@@ -681,11 +682,11 @@ tracker_property_set_domain (TrackerProperty *field,
}
void
-tracker_property_set_range (TrackerProperty *property,
- TrackerClass *value)
+tracker_property_set_range (TrackerProperty *property,
+ TrackerClass *value)
{
TrackerPropertyPriv *priv;
- const gchar *range_uri;
+ const gchar *range_uri;
g_return_if_fail (TRACKER_IS_PROPERTY (property));
g_return_if_fail (TRACKER_IS_CLASS (value));
@@ -720,7 +721,7 @@ tracker_property_set_range (TrackerProperty *property,
void
tracker_property_set_weight (TrackerProperty *field,
- gint value)
+ gint value)
{
TrackerPropertyPriv *priv;
g_return_if_fail (TRACKER_IS_PROPERTY (field));
@@ -737,7 +738,7 @@ tracker_property_set_weight (TrackerProperty *field,
void
tracker_property_set_indexed (TrackerProperty *field,
- gboolean value)
+ gboolean value)
{
TrackerPropertyPriv *priv;
@@ -751,7 +752,7 @@ tracker_property_set_indexed (TrackerProperty *field,
void
tracker_property_set_fulltext_indexed (TrackerProperty *field,
- gboolean value)
+ gboolean value)
{
TrackerPropertyPriv *priv;
@@ -765,7 +766,7 @@ tracker_property_set_fulltext_indexed (TrackerProperty *field,
void
tracker_property_set_embedded (TrackerProperty *field,
- gboolean value)
+ gboolean value)
{
TrackerPropertyPriv *priv;
@@ -779,7 +780,7 @@ tracker_property_set_embedded (TrackerProperty *field,
void
tracker_property_set_multiple_values (TrackerProperty *field,
- gboolean value)
+ gboolean value)
{
TrackerPropertyPriv *priv;
@@ -798,7 +799,7 @@ tracker_property_set_multiple_values (TrackerProperty *field,
void
tracker_property_set_filtered (TrackerProperty *field,
- gboolean value)
+ gboolean value)
{
TrackerPropertyPriv *priv;
@@ -811,11 +812,11 @@ tracker_property_set_filtered (TrackerProperty *field,
}
void
-tracker_property_set_super_properties (TrackerProperty *property,
- TrackerProperty **value)
+tracker_property_set_super_properties (TrackerProperty *property,
+ TrackerProperty **value)
{
TrackerPropertyPriv *priv;
- TrackerProperty **super_property;
+ TrackerProperty **super_property;
g_return_if_fail (TRACKER_IS_PROPERTY (property));
@@ -831,7 +832,7 @@ tracker_property_set_super_properties (TrackerProperty *property,
void
tracker_property_add_super_property (TrackerProperty *property,
- TrackerProperty *value)
+ TrackerProperty *value)
{
TrackerPropertyPriv *priv;
diff --git a/src/libtracker-common/tracker-property.h b/src/libtracker-common/tracker-property.h
index e73d380..794e114 100644
--- a/src/libtracker-common/tracker-property.h
+++ b/src/libtracker-common/tracker-property.h
@@ -1,7 +1,6 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
- * Copyright (C) 2006, Mr Jamie McCracken (jamiemcc gnome org)
- * Copyright (C) 2008, Nokia (urho konttori nokia com)
+ * Copyright (C) 2009, Nokia (urho konttori nokia com)
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -32,10 +31,12 @@ G_BEGIN_DECLS
#error "only <libtracker-common/tracker-common.h> must be included directly."
#endif
+/*
+ * TrackerPropertyType
+ */
#define TRACKER_TYPE_PROPERTY_TYPE (tracker_property_type_get_type ())
typedef enum {
- /* metadata */
TRACKER_PROPERTY_TYPE_UNKNOWN,
TRACKER_PROPERTY_TYPE_STRING,
TRACKER_PROPERTY_TYPE_BOOLEAN,
@@ -49,71 +50,69 @@ typedef enum {
GType tracker_property_type_get_type (void) G_GNUC_CONST;
const gchar *tracker_property_type_to_string (TrackerPropertyType fieldtype);
-
-
-#define TRACKER_TYPE_PROPERTY (tracker_property_get_type ())
+/*
+ * TrackerProperty
+ */
+#define TRACKER_TYPE_PROPERTY (tracker_property_get_type ())
#define TRACKER_TYPE_PROPERTY_TYPE (tracker_property_type_get_type ())
-#define TRACKER_PROPERTY(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), TRACKER_TYPE_PROPERTY, TrackerProperty))
-#define TRACKER_PROPERTY_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), TRACKER_TYPE_PROPERTY, TrackerPropertyClass))
-#define TRACKER_IS_PROPERTY(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), TRACKER_TYPE_PROPERTY))
+#define TRACKER_PROPERTY(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), TRACKER_TYPE_PROPERTY, TrackerProperty))
+#define TRACKER_PROPERTY_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), TRACKER_TYPE_PROPERTY, TrackerPropertyClass))
+#define TRACKER_IS_PROPERTY(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), TRACKER_TYPE_PROPERTY))
#define TRACKER_IS_PROPERTY_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), TRACKER_TYPE_PROPERTY))
#define TRACKER_PROPERTY_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), TRACKER_TYPE_PROPERTY, TrackerPropertyClass))
-typedef struct _TrackerProperty TrackerProperty;
+typedef struct _TrackerProperty TrackerProperty;
typedef struct _TrackerPropertyClass TrackerPropertyClass;
struct _TrackerProperty {
- GObject parent;
+ GObject parent;
};
struct _TrackerPropertyClass {
GObjectClass parent_class;
};
-GType tracker_property_get_type (void) G_GNUC_CONST;
-
-TrackerProperty * tracker_property_new (void);
-
-const gchar * tracker_property_get_uri (TrackerProperty *property);
-const gchar * tracker_property_get_name (TrackerProperty *property);
-TrackerPropertyType tracker_property_get_data_type (TrackerProperty *property);
-TrackerClass * tracker_property_get_domain (TrackerProperty *property);
-TrackerClass * tracker_property_get_range (TrackerProperty *property);
-gint tracker_property_get_weight (TrackerProperty *property);
-gboolean tracker_property_get_indexed (TrackerProperty *property);
-gboolean tracker_property_get_fulltext_indexed(TrackerProperty *property);
-gboolean tracker_property_get_embedded (TrackerProperty *property);
-gboolean tracker_property_get_multiple_values (TrackerProperty *property);
-gboolean tracker_property_get_filtered (TrackerProperty *property);
-gboolean tracker_property_get_transient (TrackerProperty *property);
-TrackerProperty **tracker_property_get_super_properties (TrackerProperty *property);
-
-void tracker_property_set_uri (TrackerProperty *property,
- const gchar *value);
-void tracker_property_set_data_type (TrackerProperty *property,
- TrackerPropertyType value);
-void tracker_property_set_domain (TrackerProperty *property,
- TrackerClass *value);
-void tracker_property_set_range (TrackerProperty *property,
- TrackerClass *range);
-void tracker_property_set_weight (TrackerProperty *property,
- gint value);
-void tracker_property_set_indexed (TrackerProperty *property,
- gboolean value);
-void tracker_property_set_fulltext_indexed(TrackerProperty *property,
- gboolean value);
-void tracker_property_set_embedded (TrackerProperty *property,
- gboolean value);
-void tracker_property_set_multiple_values (TrackerProperty *property,
- gboolean value);
-void tracker_property_set_filtered (TrackerProperty *property,
- gboolean value);
-void tracker_property_set_transient (TrackerProperty *property,
- gboolean value);
-void tracker_property_set_super_properties (TrackerProperty *property,
- TrackerProperty **super_properties);
-void tracker_property_add_super_property (TrackerProperty *property,
- TrackerProperty *value);
+GType tracker_property_get_type (void) G_GNUC_CONST;
+TrackerProperty * tracker_property_new (void);
+const gchar * tracker_property_get_uri (TrackerProperty *property);
+const gchar * tracker_property_get_name (TrackerProperty *property);
+TrackerPropertyType tracker_property_get_data_type (TrackerProperty *property);
+TrackerClass * tracker_property_get_domain (TrackerProperty *property);
+TrackerClass * tracker_property_get_range (TrackerProperty *property);
+gint tracker_property_get_weight (TrackerProperty *property);
+gboolean tracker_property_get_indexed (TrackerProperty *property);
+gboolean tracker_property_get_fulltext_indexed (TrackerProperty *property);
+gboolean tracker_property_get_embedded (TrackerProperty *property);
+gboolean tracker_property_get_multiple_values (TrackerProperty *property);
+gboolean tracker_property_get_filtered (TrackerProperty *property);
+gboolean tracker_property_get_transient (TrackerProperty *property);
+TrackerProperty ** tracker_property_get_super_properties (TrackerProperty *property);
+void tracker_property_set_uri (TrackerProperty *property,
+ const gchar *value);
+void tracker_property_set_data_type (TrackerProperty *property,
+ TrackerPropertyType value);
+void tracker_property_set_domain (TrackerProperty *property,
+ TrackerClass *value);
+void tracker_property_set_range (TrackerProperty *property,
+ TrackerClass *range);
+void tracker_property_set_weight (TrackerProperty *property,
+ gint value);
+void tracker_property_set_indexed (TrackerProperty *property,
+ gboolean value);
+void tracker_property_set_fulltext_indexed (TrackerProperty *property,
+ gboolean value);
+void tracker_property_set_embedded (TrackerProperty *property,
+ gboolean value);
+void tracker_property_set_multiple_values (TrackerProperty *property,
+ gboolean value);
+void tracker_property_set_filtered (TrackerProperty *property,
+ gboolean value);
+void tracker_property_set_transient (TrackerProperty *property,
+ gboolean value);
+void tracker_property_set_super_properties (TrackerProperty *property,
+ TrackerProperty **super_properties);
+void tracker_property_add_super_property (TrackerProperty *property,
+ TrackerProperty *value);
G_END_DECLS
diff --git a/src/libtracker-common/tracker-statement-list.c b/src/libtracker-common/tracker-statement-list.c
index ccc3c94..27c0c6c 100644
--- a/src/libtracker-common/tracker-statement-list.c
+++ b/src/libtracker-common/tracker-statement-list.c
@@ -1,6 +1,6 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
- * Copyright (C) 2008, Nokia
+ * Copyright (C) 2008, Nokia (urho konttori nokia com)
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -16,9 +16,6 @@
* License along with this program; if not, write to the
* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301, USA.
- *
- * tracker_uri_vprintf_escaped, tracker_uri_printf_escaped got copied from
- * GLib's gmarkup.c
*/
#include "config.h"
@@ -30,11 +27,16 @@
#include <libtracker-common/tracker-statement-list.h>
+/* NOTE:
+ * tracker_uri_vprintf_escaped(), tracker_uri_printf_escaped() are
+ * copied from GLib's gmarkup.c.
+ */
+
void
tracker_statement_list_insert (TrackerSparqlBuilder *statements,
- const gchar *subject,
- const gchar *predicate,
- const gchar *value)
+ const gchar *subject,
+ const gchar *predicate,
+ const gchar *value)
{
g_return_if_fail (TRACKER_IS_SPARQL_BUILDER (statements));
g_return_if_fail (subject != NULL);
@@ -46,10 +48,9 @@ tracker_statement_list_insert (TrackerSparqlBuilder *statements,
tracker_sparql_builder_object_unvalidated (statements, value);
}
-
void
tracker_sparql_builder_object_unvalidated (TrackerSparqlBuilder *sparql,
- const gchar *value)
+ const gchar *value)
{
const gchar *end;
@@ -78,10 +79,10 @@ tracker_sparql_builder_object_unvalidated (TrackerSparqlBuilder *sparql,
}
void
-tracker_statement_list_insert_with_int64 (TrackerSparqlBuilder *statements,
- const gchar *subject,
- const gchar *predicate,
- gint64 value)
+tracker_statement_list_insert_with_int64 (TrackerSparqlBuilder *statements,
+ const gchar *subject,
+ const gchar *predicate,
+ gint64 value)
{
gchar *value_str;
@@ -91,10 +92,10 @@ tracker_statement_list_insert_with_int64 (TrackerSparqlBuilder *statements,
}
void
-tracker_statement_list_insert_with_uint (TrackerSparqlBuilder *statements,
- const gchar *subject,
- const gchar *predicate,
- guint32 value)
+tracker_statement_list_insert_with_uint (TrackerSparqlBuilder *statements,
+ const gchar *subject,
+ const gchar *predicate,
+ guint32 value)
{
gchar *value_str;
@@ -103,12 +104,11 @@ tracker_statement_list_insert_with_uint (TrackerSparqlBuilder *statements,
g_free (value_str);
}
-
void
-tracker_statement_list_insert_with_double (TrackerSparqlBuilder *statements,
- const gchar *subject,
- const gchar *predicate,
- gdouble value)
+tracker_statement_list_insert_with_double (TrackerSparqlBuilder *statements,
+ const gchar *subject,
+ const gchar *predicate,
+ gdouble value)
{
gchar *value_str;
@@ -117,12 +117,11 @@ tracker_statement_list_insert_with_double (TrackerSparqlBuilder *statements,
g_free (value_str);
}
-
void
-tracker_statement_list_insert_with_float (TrackerSparqlBuilder *statements,
- const gchar *subject,
- const gchar *predicate,
- gfloat value)
+tracker_statement_list_insert_with_float (TrackerSparqlBuilder *statements,
+ const gchar *subject,
+ const gchar *predicate,
+ gfloat value)
{
gchar *value_str;
@@ -132,10 +131,10 @@ tracker_statement_list_insert_with_float (TrackerSparqlBuilder *statements,
}
void
-tracker_statement_list_insert_with_int (TrackerSparqlBuilder *statements,
- const gchar *subject,
- const gchar *predicate,
- gint value)
+tracker_statement_list_insert_with_int (TrackerSparqlBuilder *statements,
+ const gchar *subject,
+ const gchar *predicate,
+ gint value)
{
gchar *value_str;
diff --git a/src/libtracker-common/tracker-statement-list.h b/src/libtracker-common/tracker-statement-list.h
index c9a1e20..42131dd 100644
--- a/src/libtracker-common/tracker-statement-list.h
+++ b/src/libtracker-common/tracker-statement-list.h
@@ -1,6 +1,6 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
- * Copyright (C) 2008, Nokia
+ * Copyright (C) 2009, Nokia (urho konttori nokia com)
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -18,45 +18,48 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef __TRACKER_STATEMENT_H__
-#define __TRACKER_STATEMENT_H__
+#ifndef __LIBTRACKER_COMMON_STATEMENT_H__
+#define __LIBTRACKER_COMMON_STATEMENT_H__
#include <glib.h>
-#include "tracker-sparql-builder.h"
-#define SHOULD_VALIDATE_UTF8
+#include "tracker-sparql-builder.h"
G_BEGIN_DECLS
-void tracker_sparql_builder_object_unvalidated (TrackerSparqlBuilder *sparql,
- const gchar *value);
-
-void tracker_statement_list_insert (TrackerSparqlBuilder *statements,
- const gchar *subject,
- const gchar *predicate,
- const gchar *value);
-void tracker_statement_list_insert_with_int (TrackerSparqlBuilder *statements,
- const gchar *subject,
- const gchar *predicate,
- gint value);
-void tracker_statement_list_insert_with_int64 (TrackerSparqlBuilder *statements,
- const gchar *subject,
- const gchar *predicate,
- gint64 value);
-void tracker_statement_list_insert_with_uint (TrackerSparqlBuilder *statements,
- const gchar *subject,
- const gchar *predicate,
- guint32 value);
-void tracker_statement_list_insert_with_double (TrackerSparqlBuilder *statements,
- const gchar *subject,
- const gchar *predicate,
- gdouble value);
-void tracker_statement_list_insert_with_float (TrackerSparqlBuilder *statements,
- const gchar *subject,
- const gchar *predicate,
- gfloat value);
+#if !defined (__LIBTRACKER_COMMON_INSIDE__) && !defined (TRACKER_COMPILATION)
+#error "only <libtracker-common/tracker-common.h> must be included directly."
+#endif
+
+#define SHOULD_VALIDATE_UTF8
+void tracker_sparql_builder_object_unvalidated (TrackerSparqlBuilder *sparql,
+ const gchar *value);
+void tracker_statement_list_insert (TrackerSparqlBuilder *statements,
+ const gchar *subject,
+ const gchar *predicate,
+ const gchar *value);
+void tracker_statement_list_insert_with_int (TrackerSparqlBuilder *statements,
+ const gchar *subject,
+ const gchar *predicate,
+ gint value);
+void tracker_statement_list_insert_with_int64 (TrackerSparqlBuilder *statements,
+ const gchar *subject,
+ const gchar *predicate,
+ gint64 value);
+void tracker_statement_list_insert_with_uint (TrackerSparqlBuilder *statements,
+ const gchar *subject,
+ const gchar *predicate,
+ guint32 value);
+void tracker_statement_list_insert_with_double (TrackerSparqlBuilder *statements,
+ const gchar *subject,
+ const gchar *predicate,
+ gdouble value);
+void tracker_statement_list_insert_with_float (TrackerSparqlBuilder *statements,
+ const gchar *subject,
+ const gchar *predicate,
+ gfloat value);
G_END_DECLS
-#endif /* __TRACKER_ESCAPE_H__ */
+#endif /* __LIBTRACKER_COMMON_STATEMENT_H__ */
diff --git a/src/libtracker-common/tracker-storage.h b/src/libtracker-common/tracker-storage.h
index 2074e24..976c961 100644
--- a/src/libtracker-common/tracker-storage.h
+++ b/src/libtracker-common/tracker-storage.h
@@ -1,6 +1,5 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
- * Copyright (C) 2006, Mr Jamie McCracken (jamiemcc gnome org)
* Copyright (C) 2008, Nokia (urho konttori nokia com)
*
* This library is free software; you can redistribute it and/or
@@ -19,8 +18,8 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef __LIBTRACKER_STORAGE_H__
-#define __LIBTRACKER_STORAGE_H__
+#ifndef __LIBTRACKER_COMMON_STORAGE_H__
+#define __LIBTRACKER_COMMON_STORAGE_H__
#include <glib-object.h>
#include <gio/gio.h>
@@ -38,11 +37,11 @@ G_BEGIN_DECLS
#define TRACKER_IS_STORAGE_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), TRACKER_TYPE_STORAGE))
#define TRACKER_STORAGE_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), TRACKER_TYPE_STORAGE, TrackerStorageClass))
-typedef struct _TrackerStorage TrackerStorage;
+typedef struct _TrackerStorage TrackerStorage;
typedef struct _TrackerStorageClass TrackerStorageClass;
struct _TrackerStorage {
- GObject parent;
+ GObject parent;
};
struct _TrackerStorageClass {
@@ -51,28 +50,24 @@ struct _TrackerStorageClass {
#ifdef HAVE_HAL
-GType tracker_storage_get_type (void) G_GNUC_CONST;
-
-TrackerStorage * tracker_storage_new (void);
-
-GList * tracker_storage_get_mounted_directory_roots (TrackerStorage *storage);
-GList * tracker_storage_get_removable_device_roots (TrackerStorage *storage);
-GList * tracker_storage_get_removable_device_udis (TrackerStorage *storage);
-
-const gchar *tracker_storage_udi_get_mount_point (TrackerStorage *storage,
- const gchar *udi);
-gboolean tracker_storage_udi_get_is_mounted (TrackerStorage *storage,
- const gchar *udi);
-gboolean tracker_storage_uri_is_on_removable_device (TrackerStorage *storage,
- const gchar *uri,
- gchar **mount_point,
- gboolean *available);
-
-const gchar* tracker_storage_get_volume_udi_for_file (TrackerStorage *storage,
- GFile *file);
+GType tracker_storage_get_type (void) G_GNUC_CONST;
+TrackerStorage *tracker_storage_new (void);
+GList * tracker_storage_get_mounted_directory_roots (TrackerStorage *storage);
+GList * tracker_storage_get_removable_device_roots (TrackerStorage *storage);
+GList * tracker_storage_get_removable_device_udis (TrackerStorage *storage);
+const gchar * tracker_storage_udi_get_mount_point (TrackerStorage *storage,
+ const gchar *udi);
+gboolean tracker_storage_udi_get_is_mounted (TrackerStorage *storage,
+ const gchar *udi);
+gboolean tracker_storage_uri_is_on_removable_device (TrackerStorage *storage,
+ const gchar *uri,
+ gchar **mount_point,
+ gboolean *available);
+const gchar* tracker_storage_get_volume_udi_for_file (TrackerStorage *storage,
+ GFile *file);
#endif /* HAVE_HAL */
G_END_DECLS
-#endif /* __LIBTRACKER_STORAGE_H__ */
+#endif /* __LIBTRACKER_COMMON_STORAGE_H__ */
diff --git a/src/libtracker-common/tracker-type-utils.c b/src/libtracker-common/tracker-type-utils.c
index 5e87c98..7f63a81 100644
--- a/src/libtracker-common/tracker-type-utils.c
+++ b/src/libtracker-common/tracker-type-utils.c
@@ -1,7 +1,7 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
* Copyright (C) 2006, Mr Jamie McCracken (jamiemcc gnome org)
- * Copyright (C) 2008, Nokia
+ * Copyright (C) 2008, Nokia (urho konttori nokia com)
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
diff --git a/src/libtracker-common/tracker-type-utils.h b/src/libtracker-common/tracker-type-utils.h
index b3a59b6..aa3f244 100644
--- a/src/libtracker-common/tracker-type-utils.h
+++ b/src/libtracker-common/tracker-type-utils.h
@@ -1,7 +1,7 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
* Copyright (C) 2006, Mr Jamie McCracken (jamiemcc gnome org)
- * Copyright (C) 2008, Nokia
+ * Copyright (C) 2008, Nokia (urho konttori nokia com)
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
diff --git a/src/libtracker-common/tracker-utils.c b/src/libtracker-common/tracker-utils.c
index 18a61e3..5006beb 100644
--- a/src/libtracker-common/tracker-utils.c
+++ b/src/libtracker-common/tracker-utils.c
@@ -1,7 +1,7 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
* Copyright (C) 2006, Mr Jamie McCracken (jamiemcc gnome org)
- * Copyright (C) 2008, Nokia
+ * Copyright (C) 2008, Nokia (urho konttori nokia com)
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -19,6 +19,8 @@
* Boston, MA 02110-1301, USA.
*/
+#include "config.h"
+
#include <string.h>
#include <locale.h>
diff --git a/src/libtracker-common/tracker-utils.h b/src/libtracker-common/tracker-utils.h
index 2f0cd29..ce6a837 100644
--- a/src/libtracker-common/tracker-utils.h
+++ b/src/libtracker-common/tracker-utils.h
@@ -1,7 +1,7 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
* Copyright (C) 2006, Mr Jamie McCracken (jamiemcc gnome org)
- * Copyright (C) 2008, Nokia
+ * Copyright (C) 2008, Nokia (urho konttori nokia com)
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -22,12 +22,12 @@
#ifndef __LIBTRACKER_COMMON_UTILS_H__
#define __LIBTRACKER_COMMON_UTILS_H__
+#include <glib.h>
+
#if !defined (__LIBTRACKER_COMMON_INSIDE__) && !defined (TRACKER_COMPILATION)
#error "only <libtracker-common/tracker-common.h> must be included directly."
#endif
-#include <glib.h>
-
gboolean tracker_is_empty_string (const char *str);
gboolean tracker_is_blank_string (const char *str);
gchar * tracker_string_replace (const gchar *haystack,
diff --git a/src/plugins/kmail/tracker-kmail-common.h b/src/plugins/kmail/tracker-kmail-common.h
index 3c1e457..e67efec 100644
--- a/src/plugins/kmail/tracker-kmail-common.h
+++ b/src/plugins/kmail/tracker-kmail-common.h
@@ -57,9 +57,6 @@
#define TRACKER_KMAIL_PREDICATE_SPAM "KMail:MessageSpam"
#define TRACKER_KMAIL_PREDICATE_HAM "KMail:MessageHam"
-
-#define TRACKER_TYPE_G_STRV_ARRAY (dbus_g_type_get_collection ("GPtrArray", G_TYPE_STRV))
-
#define dbus_async_return_if_fail(expr,context) \
G_STMT_START { \
if G_LIKELY(expr) { } else { \
diff --git a/src/tracker-store/tracker-statistics.c b/src/tracker-store/tracker-statistics.c
index 260f6d7..6626403 100644
--- a/src/tracker-store/tracker-statistics.c
+++ b/src/tracker-store/tracker-statistics.c
@@ -41,8 +41,6 @@
#define TRACKER_STATISTICS_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), TRACKER_TYPE_STATISTICS, TrackerStatisticsPrivate))
-#define TRACKER_TYPE_G_STRV_ARRAY (dbus_g_type_get_collection ("GPtrArray", G_TYPE_STRV))
-
/* In seconds (5 minutes for now) */
#define CACHE_LIFETIME 300
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
