[tracker] libtracker-miner: Fixed #ifndef and #define statements to be consistent
- From: Martyn James Russell <mr src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [tracker] libtracker-miner: Fixed #ifndef and #define statements to be consistent
- Date: Thu, 18 Mar 2010 13:56:58 +0000 (UTC)
commit 9fd3b63ca1cc052bfe2d05b457b654661b95d645
Author: Martyn Russell <martyn lanedo com>
Date: Wed Mar 17 12:00:22 2010 +0000
libtracker-miner: Fixed #ifndef and #define statements to be consistent
src/libtracker-miner/tracker-crawler.h | 6 +-
src/libtracker-miner/tracker-dbus.h | 6 +-
src/libtracker-miner/tracker-miner-dbus.h | 62 +++++++++++-----------
src/libtracker-miner/tracker-miner-fs.h | 48 ++++++++---------
src/libtracker-miner/tracker-miner-manager.h | 7 +--
src/libtracker-miner/tracker-miner-web-dbus.h | 6 +-
src/libtracker-miner/tracker-miner-web.h | 7 ++-
src/libtracker-miner/tracker-miner.h | 6 +-
src/libtracker-miner/tracker-monitor.h | 6 +-
src/libtracker-miner/tracker-password-provider.h | 6 +-
src/libtracker-miner/tracker-thumbnailer.h | 6 +-
src/libtracker-miner/tracker-utils.h | 6 +-
12 files changed, 84 insertions(+), 88 deletions(-)
---
diff --git a/src/libtracker-miner/tracker-crawler.h b/src/libtracker-miner/tracker-crawler.h
index 1506dbc..5b674a7 100644
--- a/src/libtracker-miner/tracker-crawler.h
+++ b/src/libtracker-miner/tracker-crawler.h
@@ -17,8 +17,8 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef __LIBTRACKERMINER_CRAWLER_H__
-#define __LIBTRACKERMINER_CRAWLER_H__
+#ifndef __LIBTRACKER_MINER_CRAWLER_H__
+#define __LIBTRACKER_MINER_CRAWLER_H__
#include <glib-object.h>
#include <gio/gio.h>
@@ -79,4 +79,4 @@ void tracker_crawler_set_throttle (TrackerCrawler *crawler,
G_END_DECLS
-#endif /* __LIBTRACKERMINER_CRAWLER_H__ */
+#endif /* __LIBTRACKER_MINER_CRAWLER_H__ */
diff --git a/src/libtracker-miner/tracker-dbus.h b/src/libtracker-miner/tracker-dbus.h
index 0189eae..fc7020b 100644
--- a/src/libtracker-miner/tracker-dbus.h
+++ b/src/libtracker-miner/tracker-dbus.h
@@ -18,8 +18,8 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef __TRACKER_MINER_DBUS_HELPER_H__
-#define __TRACKER_MINER_DBUS_HELPER_H__
+#ifndef __LIBTRACKER_MINER_DBUS_H__
+#define __LIBTRACKER_MINER_DBUS_H__
#include <libtracker-common/tracker-dbus.h>
#include "tracker-miner.h"
@@ -35,4 +35,4 @@ void tracker_miner_dbus_add_name_watch (TrackerMiner *miner,
const gchar *name,
TrackerMinerDBusNameFunc func);
-#endif /* __TRACKER_MINER_DBUS_HELPER_H__ */
+#endif /* __LIBTRACKER_MINER_DBUS_H__ */
diff --git a/src/libtracker-miner/tracker-miner-dbus.h b/src/libtracker-miner/tracker-miner-dbus.h
index 86c1df7..3f37e3a 100644
--- a/src/libtracker-miner/tracker-miner-dbus.h
+++ b/src/libtracker-miner/tracker-miner-dbus.h
@@ -17,8 +17,8 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef __LIBTRACKERMINER_DBUS_H__
-#define __LIBTRACKERMINER_DBUS_H__
+#ifndef __LIBTRACKER_MINER_MINER_DBUS_H__
+#define __LIBTRACKER_MINER_MINER_DBUS_H__
#include <glib-object.h>
@@ -30,35 +30,35 @@ G_BEGIN_DECLS
#define TRACKER_MINER_DBUS_NAME_PREFIX "org.freedesktop.Tracker1.Miner."
#define TRACKER_MINER_DBUS_PATH_PREFIX "/org/freedesktop/Tracker1/Miner/"
-void tracker_miner_dbus_get_name (TrackerMiner *miner,
- DBusGMethodInvocation *context,
- GError **error);
-void tracker_miner_dbus_get_description (TrackerMiner *miner,
- DBusGMethodInvocation *context,
- GError **error);
-void tracker_miner_dbus_get_status (TrackerMiner *miner,
- DBusGMethodInvocation *context,
- GError **error);
-void tracker_miner_dbus_get_progress (TrackerMiner *miner,
- DBusGMethodInvocation *context,
- GError **error);
-void tracker_miner_dbus_get_pause_details (TrackerMiner *miner,
- DBusGMethodInvocation *context,
- GError **error);
-void tracker_miner_dbus_pause (TrackerMiner *miner,
- const gchar *application,
- const gchar *name,
- DBusGMethodInvocation *context,
- GError **error);
-void tracker_miner_dbus_resume (TrackerMiner *miner,
- gint cookie,
- DBusGMethodInvocation *context,
- GError **error);
-void tracker_miner_dbus_ignore_next_update(TrackerMiner *miner,
- const GStrv subjects,
- DBusGMethodInvocation *context,
- GError **error);
+void tracker_miner_dbus_get_name (TrackerMiner *miner,
+ DBusGMethodInvocation *context,
+ GError **error);
+void tracker_miner_dbus_get_description (TrackerMiner *miner,
+ DBusGMethodInvocation *context,
+ GError **error);
+void tracker_miner_dbus_get_status (TrackerMiner *miner,
+ DBusGMethodInvocation *context,
+ GError **error);
+void tracker_miner_dbus_get_progress (TrackerMiner *miner,
+ DBusGMethodInvocation *context,
+ GError **error);
+void tracker_miner_dbus_get_pause_details (TrackerMiner *miner,
+ DBusGMethodInvocation *context,
+ GError **error);
+void tracker_miner_dbus_pause (TrackerMiner *miner,
+ const gchar *application,
+ const gchar *name,
+ DBusGMethodInvocation *context,
+ GError **error);
+void tracker_miner_dbus_resume (TrackerMiner *miner,
+ gint cookie,
+ DBusGMethodInvocation *context,
+ GError **error);
+void tracker_miner_dbus_ignore_next_update (TrackerMiner *miner,
+ const GStrv subjects,
+ DBusGMethodInvocation *context,
+ GError **error);
G_END_DECLS
-#endif /* __LIBTRACKERMINER_DBUS_H__ */
+#endif /* __LIBTRACKER_MINER_MINER_DBUS_H__ */
diff --git a/src/libtracker-miner/tracker-miner-fs.h b/src/libtracker-miner/tracker-miner-fs.h
index 4ff2ab2..fc82354 100644
--- a/src/libtracker-miner/tracker-miner-fs.h
+++ b/src/libtracker-miner/tracker-miner-fs.h
@@ -17,8 +17,8 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef __LIBTRACKERMINER_MINER_FS_H__
-#define __LIBTRACKERMINER_MINER_FS_H__
+#ifndef __LIBTRACKER_MINER_MINER_FS_H__
+#define __LIBTRACKER_MINER_MINER_FS_H__
#include <glib-object.h>
#include <gio/gio.h>
@@ -88,30 +88,26 @@ typedef struct {
void (* finished) (TrackerMinerFS *fs);
} TrackerMinerFSClass;
-GType tracker_miner_fs_get_type (void) G_GNUC_CONST;
-
-void tracker_miner_fs_directory_add (TrackerMinerFS *fs,
- GFile *file,
- gboolean recurse);
-gboolean tracker_miner_fs_directory_remove (TrackerMinerFS *fs,
- GFile *file);
-void tracker_miner_fs_file_add (TrackerMinerFS *fs,
- GFile *file);
-void tracker_miner_fs_file_notify (TrackerMinerFS *fs,
- GFile *file,
- const GError *error);
-void tracker_miner_fs_set_throttle (TrackerMinerFS *fs,
- gdouble throttle);
-gdouble tracker_miner_fs_get_throttle (TrackerMinerFS *fs);
-
-G_CONST_RETURN gchar * tracker_miner_fs_get_urn (TrackerMinerFS *fs,
- GFile *file);
-G_CONST_RETURN gchar * tracker_miner_fs_get_parent_urn (TrackerMinerFS *fs,
- GFile *file);
-
-void tracker_miner_fs_force_recheck (TrackerMinerFS *fs);
-
+GType tracker_miner_fs_get_type (void) G_GNUC_CONST;
+void tracker_miner_fs_directory_add (TrackerMinerFS *fs,
+ GFile *file,
+ gboolean recurse);
+gboolean tracker_miner_fs_directory_remove (TrackerMinerFS *fs,
+ GFile *file);
+void tracker_miner_fs_file_add (TrackerMinerFS *fs,
+ GFile *file);
+void tracker_miner_fs_file_notify (TrackerMinerFS *fs,
+ GFile *file,
+ const GError *error);
+void tracker_miner_fs_set_throttle (TrackerMinerFS *fs,
+ gdouble throttle);
+gdouble tracker_miner_fs_get_throttle (TrackerMinerFS *fs);
+G_CONST_RETURN gchar *tracker_miner_fs_get_urn (TrackerMinerFS *fs,
+ GFile *file);
+G_CONST_RETURN gchar *tracker_miner_fs_get_parent_urn (TrackerMinerFS *fs,
+ GFile *file);
+void tracker_miner_fs_force_recheck (TrackerMinerFS *fs);
G_END_DECLS
-#endif /* __LIBTRACKERMINER_MINER_FS_H__ */
+#endif /* __LIBTRACKER_MINER_MINER_FS_H__ */
diff --git a/src/libtracker-miner/tracker-miner-manager.h b/src/libtracker-miner/tracker-miner-manager.h
index ca66ab4..efc3bc8 100644
--- a/src/libtracker-miner/tracker-miner-manager.h
+++ b/src/libtracker-miner/tracker-miner-manager.h
@@ -17,8 +17,8 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef __LIBTRACKERMINER_MANAGER_H__
-#define __LIBTRACKERMINER_MANAGER_H__
+#ifndef __LIBTRACKER_MINER_MANAGER_H__
+#define __LIBTRACKER_MINER_MANAGER_H__
#include <glib-object.h>
@@ -100,7 +100,6 @@ const gchar * tracker_miner_manager_get_display_name (TrackerMinerManager *manag
const gchar * tracker_miner_manager_get_description (TrackerMinerManager *manager,
const gchar *miner);
-
G_END_DECLS
-#endif /* __LIBTRACKERMINER_MANAGER_H__ */
+#endif /* __LIBTRACKER_MINER_MANAGER_H__ */
diff --git a/src/libtracker-miner/tracker-miner-web-dbus.h b/src/libtracker-miner/tracker-miner-web-dbus.h
index 7faa16d..3477bc9 100644
--- a/src/libtracker-miner/tracker-miner-web-dbus.h
+++ b/src/libtracker-miner/tracker-miner-web-dbus.h
@@ -18,8 +18,8 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef __LIBTRACKERMINER_WEB_DBUS_H__
-#define __LIBTRACKERMINER_WEB_DBUS_H__
+#ifndef __LIBTRACKER_MINER_WEB_DBUS_H__
+#define __LIBTRACKER_MINER_WEB_DBUS_H__
#include <glib-object.h>
@@ -44,4 +44,4 @@ void tracker_miner_web_dbus_dissociate (TrackerMinerWeb *miner,
G_END_DECLS
-#endif /* __LIBTRACKERMINER_DBUS_H__ */
+#endif /* __LIBTRACKER_MINER_DBUS_H__ */
diff --git a/src/libtracker-miner/tracker-miner-web.h b/src/libtracker-miner/tracker-miner-web.h
index 6552674..8e2ba2b 100644
--- a/src/libtracker-miner/tracker-miner-web.h
+++ b/src/libtracker-miner/tracker-miner-web.h
@@ -18,8 +18,8 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef __TRACKER_MINER_WEB_H__
-#define __TRACKER_MINER_WEB_H__
+#ifndef __LIBTRACKER_MINER_WEB_H__
+#define __LIBTRACKER_MINER_WEB_H__
#include <libtracker-miner/tracker-miner.h>
@@ -59,6 +59,7 @@ typedef enum {
TRACKER_MINER_WEB_ERROR_SERVICE,
TRACKER_MINER_WEB_ERROR_TRACKER
} TrackerMinerWebError;
+
#define TRACKER_MINER_WEB_ERROR tracker_miner_web_error_quark ()
#define TRACKER_MINER_WEB_ERROR_DOMAIN "TrackerMinerWeb"
@@ -133,4 +134,4 @@ void tracker_miner_web_dissociate (TrackerMinerWeb *miner
G_END_DECLS
-#endif /* __TRACKER_MINER_WEB_H__ */
+#endif /* __LIBTRACKER_MINER_WEB_H__ */
diff --git a/src/libtracker-miner/tracker-miner.h b/src/libtracker-miner/tracker-miner.h
index 361fa3a..ea3faf7 100644
--- a/src/libtracker-miner/tracker-miner.h
+++ b/src/libtracker-miner/tracker-miner.h
@@ -17,8 +17,8 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef __LIBTRACKERMINER_MINER_H__
-#define __LIBTRACKERMINER_MINER_H__
+#ifndef __LIBTRACKER_MINER_MINER_H__
+#define __LIBTRACKER_MINER_MINER_H__
#include <glib-object.h>
#include <gio/gio.h>
@@ -131,4 +131,4 @@ void tracker_miner_commit_finish (TrackerMiner
G_END_DECLS
-#endif /* __LIBTRACKERMINER_MINER_H__ */
+#endif /* __LIBTRACKER_MINER_MINER_H__ */
diff --git a/src/libtracker-miner/tracker-monitor.h b/src/libtracker-miner/tracker-monitor.h
index 0632e0e..f8e8d54 100644
--- a/src/libtracker-miner/tracker-monitor.h
+++ b/src/libtracker-miner/tracker-monitor.h
@@ -17,8 +17,8 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef __LIBTRACKERMINER_MONITOR_H__
-#define __LIBTRACKERMINER_MONITOR_H__
+#ifndef __LIBTRACKER_MINER_MONITOR_H__
+#define __LIBTRACKER_MINER_MONITOR_H__
#include <glib-object.h>
#include <gio/gio.h>
@@ -73,4 +73,4 @@ guint tracker_monitor_get_ignored (TrackerMonitor *monitor);
G_END_DECLS
-#endif /* __LIBTRACKERMINER_MONITOR_H__ */
+#endif /* __LIBTRACKER_MINER_MONITOR_H__ */
diff --git a/src/libtracker-miner/tracker-password-provider.h b/src/libtracker-miner/tracker-password-provider.h
index 87db402..5f44f6e 100644
--- a/src/libtracker-miner/tracker-password-provider.h
+++ b/src/libtracker-miner/tracker-password-provider.h
@@ -17,8 +17,8 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef __TRACKER_PASSWORD_PROVIDER_H__
-#define __TRACKER_PASSWORD_PROVIDER_H__
+#ifndef __LIBTRACKER_MINER_PASSWORD_PROVIDER_H__
+#define __LIBTRACKER_MINER_PASSWORD_PROVIDER_H__
#include <glib-object.h>
@@ -85,4 +85,4 @@ gchar* tracker_password_provider_strdup_mlock (const gchar *sour
G_END_DECLS
-#endif
+#endif /* __LIBTRACKER_MINER_PASSWORD_PROVIDER_H__ */
diff --git a/src/libtracker-miner/tracker-thumbnailer.h b/src/libtracker-miner/tracker-thumbnailer.h
index 86fa1b3..1d1ffe0 100644
--- a/src/libtracker-miner/tracker-thumbnailer.h
+++ b/src/libtracker-miner/tracker-thumbnailer.h
@@ -19,8 +19,8 @@
* Author: Philip Van Hoof <philip codeminded be>
*/
-#ifndef __TRACKER_MINER_FS_THUMBNAILER_H__
-#define __TRACKER_MINER_FS_THUMBNAILER_H__
+#ifndef __LIBTRACKER_MINER_THUMBNAILER_H__
+#define __LIBTRACKER_MINER_THUMBNAILER_H__
G_BEGIN_DECLS
@@ -36,4 +36,4 @@ gboolean tracker_thumbnailer_cleanup (const gchar *uri_prefix);
G_END_DECLS
-#endif /* __TRACKER_MINER_FS_THUMBNAILER_H__ */
+#endif /* __LIBTRACKER_MINER_THUMBNAILER_H__ */
diff --git a/src/libtracker-miner/tracker-utils.h b/src/libtracker-miner/tracker-utils.h
index 483b9d1..1bd8fb7 100644
--- a/src/libtracker-miner/tracker-utils.h
+++ b/src/libtracker-miner/tracker-utils.h
@@ -17,8 +17,8 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef __LIBTRACKERMINER_UTILS_H__
-#define __LIBTRACKERMINER_UTILS_H__
+#ifndef __LIBTRACKER_MINER_UTILS_H__
+#define __LIBTRACKER_MINER_UTILS_H__
#include <glib-object.h>
@@ -31,4 +31,4 @@ gboolean tracker_accumulator_check_file (GSignalInvocationHint *hint,
G_END_DECLS
-#endif /* __LIBTRACKERMINER_UTILS_H__ */
+#endif /* __LIBTRACKER_MINER_UTILS_H__ */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
