[tracker] tracker-extract: Use own error domain/codes
- From: Carlos Garnacho <carlosg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [tracker] tracker-extract: Use own error domain/codes
- Date: Tue, 17 Mar 2015 20:51:43 +0000 (UTC)
commit aed992cc6c5bb2958a821fef8d0fdea002eff1dc
Author: Carlos Garnacho <carlosg gnome org>
Date: Tue Mar 17 19:45:03 2015 +0100
tracker-extract: Use own error domain/codes
It doesn't make much sense to reuse TRACKER_DBUS_ERROR for these
purposes.
src/tracker-extract/tracker-extract.c | 19 ++++++++++++-------
src/tracker-extract/tracker-extract.h | 7 +++++++
2 files changed, 19 insertions(+), 7 deletions(-)
---
diff --git a/src/tracker-extract/tracker-extract.c b/src/tracker-extract/tracker-extract.c
index b5c60af..60e750c 100644
--- a/src/tracker-extract/tracker-extract.c
+++ b/src/tracker-extract/tracker-extract.c
@@ -43,6 +43,8 @@
#define TRACKER_EXTRACT_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), TRACKER_TYPE_EXTRACT,
TrackerExtractPrivate))
+G_DEFINE_QUARK (TrackerExtractError, tracker_extract_error)
+
extern gboolean debug;
typedef struct {
@@ -512,7 +514,7 @@ get_metadata (TrackerExtractTask *task)
if (task->cancellable &&
g_cancellable_is_cancelled (task->cancellable)) {
g_simple_async_result_set_error ((GSimpleAsyncResult *) task->res,
- TRACKER_DBUS_ERROR, 0,
+ G_IO_ERROR, G_IO_ERROR_CANCELLED,
"Extraction of '%s' was cancelled",
task->file);
@@ -575,16 +577,17 @@ dispatch_task_cb (TrackerExtractTask *task)
priv = TRACKER_EXTRACT_GET_PRIVATE (task->extract);
if (!task->mimetype) {
- error = g_error_new (TRACKER_DBUS_ERROR, 0,
- "No mimetype for '%s'",
- task->file);
+ error = g_error_new (tracker_extract_error_quark (),
+ TRACKER_EXTRACT_ERROR_NO_MIMETYPE,
+ "No mimetype for '%s'", task->file);
} else {
if (!task->mimetype_handlers) {
/* First iteration for task, get the mimetype handlers */
task->mimetype_handlers = tracker_extract_module_manager_get_mimetype_handlers
(task->mimetype);
if (!task->mimetype_handlers) {
- error = g_error_new (TRACKER_DBUS_ERROR, 0,
+ error = g_error_new (tracker_extract_error_quark (),
+ TRACKER_EXTRACT_ERROR_NO_EXTRACTOR,
"No mimetype extractor handlers for uri:'%s' and
mime:'%s'",
task->file, task->mimetype);
}
@@ -595,7 +598,8 @@ dispatch_task_cb (TrackerExtractTask *task)
if (!tracker_mimetype_info_iter_next (task->mimetype_handlers)) {
g_message ("There's no next extractor");
- error = g_error_new (TRACKER_DBUS_ERROR, 0,
+ error = g_error_new (tracker_extract_error_quark (),
+ TRACKER_EXTRACT_ERROR_NO_EXTRACTOR,
"Could not get any metadata for uri:'%s' and mime:'%s'",
task->file, task->mimetype);
} else {
@@ -626,7 +630,8 @@ dispatch_task_cb (TrackerExtractTask *task)
case TRACKER_MODULE_NONE:
/* Error out */
g_simple_async_result_set_error ((GSimpleAsyncResult *) task->res,
- TRACKER_DBUS_ERROR, 0,
+ tracker_extract_error_quark (),
+ TRACKER_EXTRACT_ERROR_NO_EXTRACTOR,
"Module '%s' initialization failed",
g_module_name (module));
g_simple_async_result_complete_in_idle ((GSimpleAsyncResult *) task->res);
diff --git a/src/tracker-extract/tracker-extract.h b/src/tracker-extract/tracker-extract.h
index 0679e99..bcb8cd2 100644
--- a/src/tracker-extract/tracker-extract.h
+++ b/src/tracker-extract/tracker-extract.h
@@ -30,6 +30,7 @@
G_BEGIN_DECLS
+#define TRACKER_EXTRACT_ERROR (tracker_extract_error_quark ())
#define TRACKER_TYPE_EXTRACT (tracker_extract_get_type ())
#define TRACKER_EXTRACT(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), TRACKER_TYPE_EXTRACT,
TrackerExtract))
#define TRACKER_EXTRACT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TRACKER_TYPE_EXTRACT,
TrackerExtractClass))
@@ -40,6 +41,11 @@ G_BEGIN_DECLS
typedef struct TrackerExtract TrackerExtract;
typedef struct TrackerExtractClass TrackerExtractClass;
+typedef enum {
+ TRACKER_EXTRACT_ERROR_NO_MIMETYPE,
+ TRACKER_EXTRACT_ERROR_NO_EXTRACTOR
+} TrackerExtractError;
+
struct TrackerExtract {
GObject parent;
};
@@ -48,6 +54,7 @@ struct TrackerExtractClass {
GObjectClass parent;
};
+GQuark tracker_extract_error_quark (void);
GType tracker_extract_get_type (void);
TrackerExtract *tracker_extract_new (gboolean disable_shutdown,
const gchar *force_module);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]